[evolution] Update German translation



commit 0a59cd0d35e2d341bf76b9347b0376135c793e14
Author: Tim Sabsch <tim sabsch com>
Date:   Fri Aug 23 18:30:20 2019 +0000

    Update German translation

 po/de.po | 5723 +++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 3212 insertions(+), 2511 deletions(-)
---
diff --git a/po/de.po b/po/de.po
index 214b461479..d5c748822e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -32,9 +32,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/evolution/issues\n";
-"POT-Creation-Date: 2019-03-11 09:00+0000\n"
-"PO-Revision-Date: 2019-03-12 11:06+0100\n"
-"Last-Translator: Tim Sabsch <tim sabsch com>\n"
+"POT-Creation-Date: 2019-08-21 15:40+0000\n"
+"PO-Revision-Date: 2019-08-22 23:21+0200\n"
+"Last-Translator: Christian Kirbach <christian kirbach gmail com>\n"
 "Language-Team: Deutsch <gnome-de gnome org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -959,13 +959,17 @@ msgstr ""
 "Direkte Bearbeitung der Ereigniszusammenfassung erlauben, wenn in der Tages-, "
 "Arbeitswochen-, Wochen- oder Monatsansicht darauf geklickt wird."
 
-# »Samstag« wird auch in Österreich und in der Schweiz verstanden ;)
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
+msgid "User-defined reminder times, in minutes"
+msgstr "Benutzerdefinierte Erinnerungszeiten, in Minuten"
+
+# »Samstag« wird auch in Österreich und in der Schweiz verstanden ;)
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
 msgid "(Deprecated) First day of the week, from Sunday (0) to Saturday (6)"
 msgstr ""
 "(Veraltet) Wochentag von Sonntag (»0«) bis Samstag (»6«), mit dem die Woche beginnt"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:157
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use “week-"
 "start-day-name” instead."
@@ -973,11 +977,11 @@ msgstr ""
 "Dieser Schlüssel ist seit Version 3.10 veraltet und sollte nicht mehr verwendet "
 "werden. Verwenden Sie stattdessen »week-start-day-name«."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:158
 msgid "(Deprecated) Work days"
 msgstr "(Veraltet) Arbeitstage"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:159
 msgid ""
 "Days on which the start and end of work hours should be indicated. (This key was "
 "deprecated in version 3.10 and should no longer be used. Use the “work-day-"
@@ -1959,7 +1963,7 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 msgid "Sort accounts alphabetically in a folder tree"
-msgstr "Konten alphabetisch in einem Ordnerbau sortieren"
+msgstr "Konten alphabetisch in einem Ordnerbaum sortieren"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 msgid ""
@@ -2731,10 +2735,23 @@ msgstr ""
 "deaktiviert."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:293
+msgid "Whether display delivery notification parts inline."
+msgstr "Legt fest, ob Empfangsbestätigungen eingebettet angezeigt werden."
+
+# https://de.wikipedia.org/wiki/Empfangsbest%C3%A4tigung
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:294
+msgid ""
+"If enabled, the message/delivery-status and message/disposition-notification parts "
+"are shown automatically inline."
+msgstr ""
+"Wenn aktiviert, werden Empfangsbestätigungen (»message/delivery-status« und "
+"»message/disposition-notification«) automatisch eingebettet angezeigt."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:295
 msgid "(Deprecated) Default forward style"
 msgstr "(Veraltet) Standard-Weiterleitungsstil"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:294
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:296
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use “forward-"
 "style-name” instead."
@@ -2742,11 +2759,11 @@ msgstr ""
 "Dieser Schlüssel ist seit Version 3.10 veraltet und sollte nicht mehr verwendet "
 "werden. Verwenden Sie stattdessen »forward-style-name«."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:295
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:297
 msgid "(Deprecated) Default reply style"
 msgstr "(Veraltet) Standard-Antwortmethode"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:296
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:298
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use “reply-"
 "style-name” instead."
@@ -2754,12 +2771,12 @@ msgstr ""
 "Dieser Schlüssel ist seit Version 3.10 veraltet und sollte nicht mehr verwendet "
 "werden. Verwenden Sie stattdessen »reply-style-name«."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:297
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:299
 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:298
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:300
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use “show-"
 "headers” instead."
@@ -2767,11 +2784,11 @@ msgstr ""
 "Dieser Schlüssel ist seit Version 3.10 veraltet und sollte nicht mehr verwendet "
 "werden. Verwenden Sie stattdessen »show-headers«."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:299
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:301
 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:300
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:302
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use “image-"
 "loading-policy” instead."
@@ -2779,7 +2796,7 @@ msgstr ""
 "Dieser Schlüssel ist seit Version 3.10 veraltet und sollte nicht mehr verwendet "
 "werden. Verwenden Sie stattdessen »image-loading-policy«."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:301
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:303
 msgid ""
 "(Deprecated) Asks whether to close the message window when the user forwards or "
 "replies to the message shown in the window"
@@ -2787,7 +2804,7 @@ msgstr ""
 "(Veraltet) Nachfragen, ob das Nachrichtenfenster geschlossen werden soll, wenn die "
 "Nachricht im Nachrichtenfenster weitergeleitet oder beantwortet wird."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:302
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:304
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use “browser-"
 "close-on-reply-policy” instead."
@@ -2940,6 +2957,14 @@ msgstr "Löschen wurde ausgeführt"
 msgid "Whether to delete processed iTip objects"
 msgstr "Sollen verarbeitete iTip-Objekte gelöscht werden?"
 
+#: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:3
+msgid "Preserve exiting reminder by default"
+msgstr "Vorhandene Erinnerungen standardmäßig aufbewahren"
+
+#: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:4
+msgid "Whether to preset option to preserve existing reminder by default"
+msgstr "Legt fest, ob vorhandene Erinnerungen standardmäßig aufbewahrt werden sollen"
+
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:1
 msgid "Notify new messages for Inbox only."
 msgstr "Nur über neue Nachrichten im Eingangsordner benachrichtigen."
@@ -3130,7 +3155,7 @@ msgstr ""
 "Der Filter, der beim Komprimieren von angehängten Ordnern mit Autoar verwendet "
 "wird."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11 ../src/shell/main.c:318
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11 ../src/shell/main.c:331
 msgid "Start in offline mode"
 msgstr "Im Offline-Modus starten"
 
@@ -3393,11 +3418,11 @@ msgid "Contacts"
 msgstr "Kontakte"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:9
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:845
-#: ../src/e-util/e-collection-account-wizard.c:784 ../src/e-util/e-send-options.c:544
-#: ../src/e-util/e-webdav-browser.c:469
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:954
+#: ../src/e-util/e-collection-account-wizard.c:816 ../src/e-util/e-send-options.c:544
+#: ../src/e-util/e-webdav-browser.c:470
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:199
-#: ../src/modules/calendar/e-cal-shell-view.c:604
+#: ../src/modules/calendar/e-cal-shell-view.c:599
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:22
 msgid "Calendar"
 msgstr "Kalender"
@@ -3406,14 +3431,14 @@ msgstr "Kalender"
 #: ../src/mail/importers/elm-importer.c:330
 #: ../src/mail/importers/kmail-importer.c:251
 #: ../src/mail/importers/pine-importer.c:423
-#: ../src/modules/mail/e-mail-shell-view.c:1489
+#: ../src/modules/mail/e-mail-shell-view.c:1493
 #: ../src/smime/gui/certificate-manager.c:1666
 msgid "Mail"
 msgstr "E-Mail"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:11
-#: ../src/calendar/gui/e-memo-table.c:374 ../src/e-util/e-webdav-browser.c:459
-#: ../src/modules/calendar/e-cal-shell-content.c:1736
+#: ../src/calendar/gui/e-memo-table.c:457 ../src/e-util/e-webdav-browser.c:460
+#: ../src/modules/calendar/e-cal-shell-content.c:1763
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:196
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:211
 #: ../src/modules/calendar/e-memo-shell-view.c:335
@@ -3421,18 +3446,258 @@ msgid "Memos"
 msgstr "Notizen"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:12
-#: ../src/calendar/gui/e-task-table.c:697 ../src/calendar/gui/print.c:2417
+#: ../src/calendar/gui/e-task-table.c:624 ../src/calendar/gui/print.c:2426
 #: ../src/calendar/importers/icalendar-importer.c:77
-#: ../src/calendar/importers/icalendar-importer.c:1109
-#: ../src/e-util/e-webdav-browser.c:460
+#: ../src/calendar/importers/icalendar-importer.c:1141
+#: ../src/e-util/e-webdav-browser.c:461
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:71
-#: ../src/modules/calendar/e-cal-shell-content.c:1696
+#: ../src/modules/calendar/e-cal-shell-content.c:1723
 #: ../src/modules/calendar/e-task-shell-view-actions.c:220
 #: ../src/modules/calendar/e-task-shell-view-actions.c:235
-#: ../src/modules/calendar/e-task-shell-view.c:507
+#: ../src/modules/calendar/e-task-shell-view.c:508
 msgid "Tasks"
 msgstr "Aufgaben"
 
+#: ../data/ui/evolution-shortcuts.ui.h:1
+msgctxt "shortcut window"
+msgid "Keyboard Shortcuts"
+msgstr "Tastaturkürzel"
+
+#: ../data/ui/evolution-shortcuts.ui.h:2
+msgctxt "shortcut window"
+msgid "General"
+msgstr "Allgemein"
+
+#: ../data/ui/evolution-shortcuts.ui.h:3
+msgctxt "shortcut window"
+msgid "Select Mail component"
+msgstr "E-Mail-Komponente auswählen."
+
+#: ../data/ui/evolution-shortcuts.ui.h:4
+msgctxt "shortcut window"
+msgid "Select Contacts component"
+msgstr "Kontakte-Komponente auswählen."
+
+#: ../data/ui/evolution-shortcuts.ui.h:5
+msgctxt "shortcut window"
+msgid "Select Calendar component"
+msgstr "Kalender-Komponente auswählen."
+
+#: ../data/ui/evolution-shortcuts.ui.h:6
+msgctxt "shortcut window"
+msgid "Select Tasks component"
+msgstr "Aufgaben-Komponente auswählen."
+
+#: ../data/ui/evolution-shortcuts.ui.h:7
+msgctxt "shortcut window"
+msgid "Select Memos component"
+msgstr "Notizen-Komponente auswählen."
+
+#: ../data/ui/evolution-shortcuts.ui.h:8
+msgctxt "shortcut window"
+msgid "Create a new item in current component"
+msgstr "Einen neuen Eintrag in der aktuellen Komponente anlegen."
+
+#: ../data/ui/evolution-shortcuts.ui.h:9
+msgctxt "shortcut window"
+msgid "Cycle focus between panes"
+msgstr "Zwischen Teilfenstern wechseln."
+
+#: ../data/ui/evolution-shortcuts.ui.h:10
+msgctxt "shortcut window"
+msgid "Open the Evolution user guide"
+msgstr "Das Benutzerhandbuch von Evolution öffnen"
+
+#: ../data/ui/evolution-shortcuts.ui.h:11
+msgctxt "shortcut window"
+msgid "Clear search bar"
+msgstr "Suchfeld leeren"
+
+#: ../data/ui/evolution-shortcuts.ui.h:12
+msgctxt "shortcut window"
+msgid "Move mails or contacts to folder"
+msgstr "E-Mails oder Kontakte in einen Ordner verschieben."
+
+#: ../data/ui/evolution-shortcuts.ui.h:13
+msgctxt "shortcut window"
+msgid "Copy mails or contacts to folder"
+msgstr "E-Mails oder Kontakte in einen Ordner kopieren."
+
+#: ../data/ui/evolution-shortcuts.ui.h:14
+msgctxt "shortcut window"
+msgid "Preferences"
+msgstr "Einstellungen"
+
+#: ../data/ui/evolution-shortcuts.ui.h:15
+msgctxt "shortcut window"
+msgid "Open new window"
+msgstr "Neues Fenster öffnen"
+
+#: ../data/ui/evolution-shortcuts.ui.h:16
+msgctxt "shortcut window"
+msgid "Close window"
+msgstr "Fenster schließen"
+
+#: ../data/ui/evolution-shortcuts.ui.h:17
+msgctxt "shortcut window"
+msgid "Quit Evolution"
+msgstr "Evolution beenden"
+
+#: ../data/ui/evolution-shortcuts.ui.h:18
+msgctxt "shortcut window"
+msgid "Mail"
+msgstr "E-Mail"
+
+#: ../data/ui/evolution-shortcuts.ui.h:19
+msgctxt "shortcut window"
+msgid "Create a new message"
+msgstr "Eine neue Nachricht verfassen"
+
+#: ../data/ui/evolution-shortcuts.ui.h:20
+msgctxt "shortcut window"
+msgid "Send and receive messages"
+msgstr "Nachrichten senden und abrufen"
+
+#: ../data/ui/evolution-shortcuts.ui.h:21
+msgctxt "shortcut window"
+msgid "Apply filters to selection"
+msgstr "Filter auf die Auswahl anwenden"
+
+#: ../data/ui/evolution-shortcuts.ui.h:22
+msgctxt "shortcut window"
+msgid "Open selection in new window"
+msgstr "Auswahl in einem neuen Fenster öffnen"
+
+#: ../data/ui/evolution-shortcuts.ui.h:23
+msgctxt "shortcut window"
+msgid "Go to folder"
+msgstr "In Ordner wechseln"
+
+#: ../data/ui/evolution-shortcuts.ui.h:24
+msgctxt "shortcut window"
+msgid "Mark selected messages as read"
+msgstr "Ausgewählte Nachrichten als gelesen markieren"
+
+#: ../data/ui/evolution-shortcuts.ui.h:25
+msgctxt "shortcut window"
+msgid "Mark selected messages as unread"
+msgstr "Ausgewählte Nachrichten als ungelesen markieren"
+
+#: ../data/ui/evolution-shortcuts.ui.h:26
+msgctxt "shortcut window"
+msgid "Jump to the next unread message"
+msgstr "Zur nächsten ungelesenen Nachricht wechseln"
+
+#: ../data/ui/evolution-shortcuts.ui.h:27
+msgctxt "shortcut window"
+msgid "Jump to the previous unread message"
+msgstr "Zur vorhergehenden ungelesenen Nachricht wechseln"
+
+#: ../data/ui/evolution-shortcuts.ui.h:28
+msgctxt "shortcut window"
+msgid "Forward selected messages"
+msgstr "Ausgewählte Nachrichten weiterleiten"
+
+#: ../data/ui/evolution-shortcuts.ui.h:29
+msgctxt "shortcut window"
+msgid "Reply to sender"
+msgstr "Antwort an Absender"
+
+#: ../data/ui/evolution-shortcuts.ui.h:30
+msgctxt "shortcut window"
+msgid "Reply to list"
+msgstr "Antwort an Liste"
+
+#: ../data/ui/evolution-shortcuts.ui.h:31
+msgctxt "shortcut window"
+msgid "Reply to all recipients"
+msgstr "Antwort an alle Empfänger"
+
+#: ../data/ui/evolution-shortcuts.ui.h:32
+msgctxt "shortcut window"
+msgid "Scroll up"
+msgstr "Hochrollen"
+
+#: ../data/ui/evolution-shortcuts.ui.h:33
+msgctxt "shortcut window"
+msgid "Scroll down"
+msgstr "Runterrollen"
+
+#: ../data/ui/evolution-shortcuts.ui.h:34
+msgctxt "shortcut window"
+msgid "Calendar"
+msgstr "Kalender"
+
+#: ../data/ui/evolution-shortcuts.ui.h:35
+msgctxt "shortcut window"
+msgid "Create a new appointment"
+msgstr "Einen neuen Termin anlegen"
+
+#: ../data/ui/evolution-shortcuts.ui.h:36
+msgctxt "shortcut window"
+msgid "Create a new meeting"
+msgstr "Eine neue Besprechung anlegen"
+
+#: ../data/ui/evolution-shortcuts.ui.h:37
+msgctxt "shortcut window"
+msgid "Create a new task"
+msgstr "Eine neue Aufgabe anlegen"
+
+#: ../data/ui/evolution-shortcuts.ui.h:38
+msgctxt "shortcut window"
+msgid "Create a new memo"
+msgstr "Eine neue Notiz anlegen"
+
+#: ../data/ui/evolution-shortcuts.ui.h:39
+msgctxt "shortcut window"
+msgid "Go to today"
+msgstr "Zu heutigem Tag wechseln"
+
+#: ../data/ui/evolution-shortcuts.ui.h:40
+msgctxt "shortcut window"
+msgid "Go to date"
+msgstr "Zu Datum wechseln"
+
+#: ../data/ui/evolution-shortcuts.ui.h:41
+msgctxt "shortcut window"
+msgid "Day View"
+msgstr "Tagesansicht"
+
+#: ../data/ui/evolution-shortcuts.ui.h:42
+msgctxt "shortcut window"
+msgid "Work Week View"
+msgstr "Arbeitswochenansicht"
+
+#: ../data/ui/evolution-shortcuts.ui.h:43
+msgctxt "shortcut window"
+msgid "Week View"
+msgstr "Wochenansicht"
+
+#: ../data/ui/evolution-shortcuts.ui.h:44
+msgctxt "shortcut window"
+msgid "Month View"
+msgstr "Monatsansicht"
+
+#: ../data/ui/evolution-shortcuts.ui.h:45
+msgctxt "shortcut window"
+msgid "List View"
+msgstr "Listenansicht"
+
+#: ../data/ui/evolution-shortcuts.ui.h:46
+msgctxt "shortcut window"
+msgid "Contacts"
+msgstr "Kontakte"
+
+#: ../data/ui/evolution-shortcuts.ui.h:47
+msgctxt "shortcut window"
+msgid "Create a new contact"
+msgstr "Einen neuen Kontakt anlegen"
+
+#: ../data/ui/evolution-shortcuts.ui.h:48
+msgctxt "shortcut window"
+msgid "Create a new contact list"
+msgstr "Eine neue Kontaktliste anlegen"
+
 #: ../data/views/addressbook/galview.xml.h:1
 msgid "_Address Cards"
 msgstr "_Adresskarten"
@@ -3494,11 +3759,11 @@ msgstr "Für _breite Ansicht"
 msgid "As Sent Folder for Wi_de View"
 msgstr "Als Verschickt-Ordner für _breite Ansicht"
 
-#: ../data/views/memos/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2439
+#: ../data/views/memos/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2448
 msgid "_Memos"
 msgstr "_Notizen"
 
-#: ../data/views/tasks/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2443
+#: ../data/views/tasks/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2452
 #: ../src/plugins/pst-import/pst-importer.c:571
 msgid "_Tasks"
 msgstr "_Aufgaben"
@@ -3620,30 +3885,34 @@ msgstr ""
 "speichern?"
 
 #: ../src/addressbook/addressbook.error.xml.h:24
+msgid "An expected image size is up to 96 x 96 pixels."
+msgstr "Eine erwartete Bildgröße liegt bei bis zu 96x96 Pixel."
+
+#: ../src/addressbook/addressbook.error.xml.h:25
 msgid "_Resize"
 msgstr "_Größe verändern"
 
-#: ../src/addressbook/addressbook.error.xml.h:25
+#: ../src/addressbook/addressbook.error.xml.h:26
 msgid "_Use as it is"
 msgstr "_Wie es ist benutzen"
 
-#: ../src/addressbook/addressbook.error.xml.h:26
+#: ../src/addressbook/addressbook.error.xml.h:27
 msgid "_Do not save"
 msgstr "_Nicht speichern"
 
-#: ../src/addressbook/addressbook.error.xml.h:27
+#: ../src/addressbook/addressbook.error.xml.h:28
 msgid "Unable to save {0}."
 msgstr "{0} kann nicht gespeichert werden."
 
-#: ../src/addressbook/addressbook.error.xml.h:28
+#: ../src/addressbook/addressbook.error.xml.h:29
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Fehler beim Speichern von {0} in {1}: {2}"
 
-#: ../src/addressbook/addressbook.error.xml.h:29
+#: ../src/addressbook/addressbook.error.xml.h:30
 msgid "Address “{0}” already exists."
 msgstr "Adresse »{0}« existiert bereits."
 
-#: ../src/addressbook/addressbook.error.xml.h:30
+#: ../src/addressbook/addressbook.error.xml.h:31
 msgid ""
 "A contact already exists with this address. Would you like to add a new card with "
 "the same address anyway?"
@@ -3651,29 +3920,29 @@ msgstr ""
 "Ein Kontakt mit dieser Adresse existiert bereits. Soll trotzdem eine neue Karte "
 "mit der gleichen Adresse hinzugefügt werden?"
 
-#: ../src/addressbook/addressbook.error.xml.h:31
+#: ../src/addressbook/addressbook.error.xml.h:32
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:721
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1505
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:751
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1525
 #: ../src/e-util/e-accounts-window.c:1563
 #: ../src/e-util/e-mail-signature-manager.c:328
-#: ../src/e-util/e-name-selector-dialog.c:1033 ../src/e-util/filter.ui.h:25
-#: ../src/mail/e-mail-account-manager.c:719 ../src/mail/e-mail-label-manager.c:371
-#: ../src/mail/em-folder-properties.c:1044 ../src/mail/em-vfolder-editor-rule.c:408
+#: ../src/e-util/e-name-selector-dialog.c:1029 ../src/e-util/filter.ui.h:25
+#: ../src/mail/e-mail-account-manager.c:721 ../src/mail/e-mail-label-manager.c:371
+#: ../src/mail/em-folder-properties.c:1330 ../src/mail/em-vfolder-editor-rule.c:408
 #: ../src/mail/em-vfolder-editor-rule.c:637 ../src/mail/mail-config.ui.h:63
 #: ../src/modules/mail/em-composer-prefs.c:423
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:544
-#: ../src/plugins/email-custom-header/email-custom-header.c:838
+#: ../src/plugins/email-custom-header/email-custom-header.c:839
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:33
 #: ../src/plugins/templates/templates.c:464
 msgid "_Add"
 msgstr "_Hinzufügen"
 
-#: ../src/addressbook/addressbook.error.xml.h:32
+#: ../src/addressbook/addressbook.error.xml.h:33
 msgid "Some addresses already exist in this contact list."
 msgstr "Einige Adressen existieren bereits in dieser Kontaktliste."
 
-#: ../src/addressbook/addressbook.error.xml.h:33
+#: ../src/addressbook/addressbook.error.xml.h:34
 msgid ""
 "You are trying to add addresses that are part of this list already. Would you like "
 "to add them anyway?"
@@ -3681,19 +3950,19 @@ msgstr ""
 "Sie versuchen Adressen hinzuzufügen, die bereits in dieser Liste enthalten sind. "
 "Sollen sie dennoch hinzugefügt werden?"
 
-#: ../src/addressbook/addressbook.error.xml.h:34
+#: ../src/addressbook/addressbook.error.xml.h:35
 msgid "Skip duplicates"
 msgstr "Duplikate überspringen"
 
-#: ../src/addressbook/addressbook.error.xml.h:35
+#: ../src/addressbook/addressbook.error.xml.h:36
 msgid "Add with duplicates"
 msgstr "Mit Duplikaten hinzufügen"
 
-#: ../src/addressbook/addressbook.error.xml.h:36
+#: ../src/addressbook/addressbook.error.xml.h:37
 msgid "List “{0}” is already in this contact list."
 msgstr "Liste »{0}« existiert bereits in dieser Kontaktliste."
 
-#: ../src/addressbook/addressbook.error.xml.h:37
+#: ../src/addressbook/addressbook.error.xml.h:38
 msgid ""
 "A contact list named “{0}” is already in this contact list. Would you like to add "
 "it anyway?"
@@ -3701,22 +3970,22 @@ msgstr ""
 "Eine Kontaktliste namens »{0}« existiert bereits in diesem Ordner. Soll sie "
 "dennoch hinzugefügt werden?"
 
-#: ../src/addressbook/addressbook.error.xml.h:38
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1280
+#: ../src/addressbook/addressbook.error.xml.h:39
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1241
 msgid "Failed to delete contact"
 msgstr "Kontakt konnte nicht gelöscht werden"
 
-#: ../src/addressbook/addressbook.error.xml.h:39
+#: ../src/addressbook/addressbook.error.xml.h:40
 msgid "You do not have permission to delete contacts in this address book."
 msgstr ""
 "Sie haben keine ausreichenden Rechte um Kontakte in diesem Adressbuch zu löschen."
 
-#: ../src/addressbook/addressbook.error.xml.h:40
+#: ../src/addressbook/addressbook.error.xml.h:41
 msgid "Cannot add new contact"
 msgstr "Neuer Kontakt kann nicht hinzugefügt werden"
 
 #. For Translators: {0} is the name of the address book source
-#: ../src/addressbook/addressbook.error.xml.h:42
+#: ../src/addressbook/addressbook.error.xml.h:43
 msgid ""
 "“{0}” is a read-only address book and cannot be modified. Please select a "
 "different address book from the side bar in the Contacts view."
@@ -3724,13 +3993,13 @@ msgstr ""
 "»{0}« ist ein schreibgeschütztes Adressbuch. Wechseln Sie zur Kontakte-Ansicht und "
 "wählen Sie ein anderes Adressbuch aus."
 
-#: ../src/addressbook/addressbook.error.xml.h:43
+#: ../src/addressbook/addressbook.error.xml.h:44
 msgid "Cannot save a contact, address book is still opening"
 msgstr ""
 "Kontakt kann nicht gespeichert werden. Das Adressbuch wird noch immer geöffnet"
 
 #. For Translators: {0} is the name of the address book source
-#: ../src/addressbook/addressbook.error.xml.h:45
+#: ../src/addressbook/addressbook.error.xml.h:46
 msgid ""
 "Cannot save a contact to the address book “{0}”, because it is still opening. "
 "Either wait till it’s opened, or select a different address book."
@@ -3739,11 +4008,11 @@ msgstr ""
 "noch immer geöffnet. Warten Sie, bis es entweder geöffnet ist, oder wählen Sie ein "
 "anderes Adressbuch."
 
-#: ../src/addressbook/addressbook.error.xml.h:46
+#: ../src/addressbook/addressbook.error.xml.h:47
 msgid "Something has gone wrong when displaying the contact"
 msgstr "Bei der Anzeige des Kontakts ist ein Fehler aufgetreten"
 
-#: ../src/addressbook/addressbook.error.xml.h:47
+#: ../src/addressbook/addressbook.error.xml.h:48
 msgid ""
 "A WebKitWebProcess crashed when displaying the contact. You can try again by "
 "moving to another contact and back. If the issue persists, please file a bug "
@@ -3754,19 +4023,19 @@ msgstr ""
 "springen. Falls das Problem weiterhin besteht, erstellen Sie bitte einen "
 "Fehlerbericht im GNOME Gitlab."
 
-#: ../src/addressbook/addressbook.error.xml.h:48
+#: ../src/addressbook/addressbook.error.xml.h:49
 msgid "Failed to refresh list of account address books"
 msgstr "Liste der Adressbücher des Kontos konnte nicht aktualisiert werden"
 
-#: ../src/addressbook/addressbook.error.xml.h:49
+#: ../src/addressbook/addressbook.error.xml.h:50
 msgid "Do you want to unset contact image?"
 msgstr "Möchten Sie das Kontaktbild zurücksetzen?"
 
-#: ../src/addressbook/addressbook.error.xml.h:50
+#: ../src/addressbook/addressbook.error.xml.h:51
 msgid "Do _Not Unset"
 msgstr "_Nicht zurücksetzen"
 
-#: ../src/addressbook/addressbook.error.xml.h:51
+#: ../src/addressbook/addressbook.error.xml.h:52
 msgid "_Unset"
 msgstr "_Zurücksetzen"
 
@@ -3784,7 +4053,7 @@ msgstr "Sofortnachrichten anzeigen"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:4
 msgid "Show Web Addresses"
-msgstr "Web-Adressen anzeigen"
+msgstr "Internetadressen anzeigen"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:5
 msgid "Show Job section"
@@ -3815,14 +4084,14 @@ msgid "Show Certificates"
 msgstr "Zertifikate zeigen"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:726
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:748
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3109
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:724
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:746
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3115
 msgid "Contact Editor"
 msgstr "Kontakteditor"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:13
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1985
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2353
 #: ../src/mail/mail-config.ui.h:40
 msgid "Options"
 msgstr "Optionen"
@@ -3830,29 +4099,29 @@ msgstr "Optionen"
 #. This is only shown if the EActivity has a GCancellable.
 #. no flags
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:14
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3272
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3502
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4334
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3278
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3508
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4340
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4346
 #: ../src/addressbook/gui/contact-editor/e-contact-editor-fullname.c:220
 #: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:453
 #: ../src/addressbook/gui/contact-editor/fullname.ui.h:14
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:472
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:716
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:510
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:746
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:316
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1360
-#: ../src/calendar/gui/e-cal-dialogs.c:694
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:301
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1321
+#: ../src/calendar/gui/e-cal-dialogs.c:689
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:304
 #: ../src/composer/e-composer-actions.c:228 ../src/e-util/e-activity-bar.c:357
 #: ../src/e-util/e-attachment-dialog.c:309 ../src/e-util/e-attachment-store.c:658
 #: ../src/e-util/e-attachment-store.c:668 ../src/e-util/e-attachment-store.c:848
 #: ../src/e-util/e-attachment-store.c:854 ../src/e-util/e-attachment-view.c:301
-#: ../src/e-util/e-categories-dialog.c:80 ../src/e-util/e-category-editor.c:171
-#: ../src/e-util/e-category-editor.c:259 ../src/e-util/e-charset-combo-box.c:99
-#: ../src/e-util/e-collection-account-wizard.c:231
-#: ../src/e-util/e-collection-account-wizard.c:1801
-#: ../src/e-util/e-collection-account-wizard.c:2037
+#: ../src/e-util/e-categories-dialog.c:80 ../src/e-util/e-category-editor.c:169
+#: ../src/e-util/e-category-editor.c:257 ../src/e-util/e-charset-combo-box.c:99
+#: ../src/e-util/e-collection-account-wizard.c:238
+#: ../src/e-util/e-collection-account-wizard.c:1838
+#: ../src/e-util/e-collection-account-wizard.c:2074
 #: ../src/e-util/e-color-chooser-widget.c:125 ../src/e-util/e-filter-datespec.c:300
 #: ../src/e-util/e-html-editor-actions.c:304
 #: ../src/e-util/e-html-editor-actions.c:348
@@ -3864,10 +4133,10 @@ msgstr "Optionen"
 #: ../src/e-util/e-send-options.ui.h:16 ../src/e-util/e-source-config-dialog.c:360
 #: ../src/e-util/e-source-selector-dialog.c:370 ../src/e-util/e-table-config.c:548
 #: ../src/e-util/e-table-config.ui.h:3 ../src/e-util/e-timezone-dialog.ui.h:2
-#: ../src/e-util/evolution-source-viewer.c:835 ../src/e-util/e-web-view.c:4318
+#: ../src/e-util/evolution-source-viewer.c:835 ../src/e-util/e-web-view.c:4347
 #: ../src/e-util/gal-view-instance-save-as-dialog.c:267
 #: ../src/mail/e-mail-config-window.c:334 ../src/mail/e-mail-label-dialog.c:194
-#: ../src/mail/e-mail-tag-editor.c:160 ../src/mail/em-composer-utils.c:4175
+#: ../src/mail/e-mail-tag-editor.c:160 ../src/mail/em-composer-utils.c:4047
 #: ../src/mail/em-folder-selector.c:318 ../src/mail/mail-config.ui.h:2
 #: ../src/mail/mail.error.xml.h:16 ../src/mail/mail-send-recv.c:874
 #: ../src/mail/mail-send-recv.c:955 ../src/mail/mail-vfolder-ui.c:149
@@ -3875,7 +4144,7 @@ msgstr "Optionen"
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:277
 #: ../src/modules/backup-restore/evolution-backup-tool.c:936
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:409
-#: ../src/modules/calendar/e-cal-attachment-handler.c:283
+#: ../src/modules/calendar/e-cal-attachment-handler.c:281
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
 #: ../src/plugins/face/face.c:298
 #: ../src/plugins/publish-calendar/publish-calendar.c:789
@@ -3892,14 +4161,14 @@ msgid "_Cancel"
 msgstr "A_bbrechen"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:15
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3502
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3508
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:719
-#: ../src/calendar/calendar.error.xml.h:47 ../src/calendar/gui/e-comp-editor.c:2115
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:749
+#: ../src/calendar/calendar.error.xml.h:47 ../src/calendar/gui/e-comp-editor.c:2158
 #: ../src/composer/e-composer-actions.c:228 ../src/composer/e-composer-actions.c:340
 #: ../src/e-util/e-attachment-store.c:848 ../src/e-util/e-attachment-store.c:855
 #: ../src/e-util/e-mail-signature-script-dialog.c:370
-#: ../src/e-util/e-webdav-browser.c:2467 ../src/e-util/e-web-view.c:4318
+#: ../src/e-util/e-webdav-browser.c:2476 ../src/e-util/e-web-view.c:4347
 #: ../src/e-util/gal-view-instance-save-as-dialog.c:268
 #: ../src/shell/e-shell-content.c:642 ../src/shell/e-shell-utils.c:133
 #: ../src/smime/gui/certificate-manager.c:651
@@ -3908,15 +4177,15 @@ msgid "_Save"
 msgstr "_Speichern"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:16
-#: ../src/calendar/gui/e-comp-editor.c:2012 ../src/calendar/gui/e-comp-editor.c:2084
+#: ../src/calendar/gui/e-comp-editor.c:2055 ../src/calendar/gui/e-comp-editor.c:2127
 #: ../src/e-util/e-preferences-window.c:390 ../src/e-util/e-send-options.ui.h:15
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
-#: ../src/shell/e-shell.c:1474 ../src/shell/e-shell-window-actions.c:994
+#: ../src/shell/e-shell.c:1474 ../src/shell/e-shell-window-actions.c:1019
 msgid "_Help"
 msgstr "_Hilfe"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:17
-#: ../src/e-util/e-misc-utils.c:3575
+#: ../src/e-util/e-misc-utils.c:3573
 msgid "Image"
 msgstr "Grafik"
 
@@ -3942,8 +4211,8 @@ msgid "Full _Name..."
 msgstr "_Voller Name …"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:23
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:762
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1181
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:835
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1291
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Email"
 msgstr "E-Mail"
@@ -3974,8 +4243,8 @@ msgid "_Home Page:"
 msgstr "_Homepage:"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:30
-#: ../src/calendar/gui/e-comp-editor-event.c:835
-#: ../src/modules/itip-formatter/itip-view.c:2076
+#: ../src/calendar/gui/e-comp-editor-event.c:870
+#: ../src/modules/itip-formatter/itip-view.c:2071
 msgid "_Calendar:"
 msgstr "_Kalender:"
 
@@ -4015,7 +4284,7 @@ msgstr "Blog:"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "Web Addresses"
-msgstr "Web-Adressen"
+msgstr "Internetadressen"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Profession:"
@@ -4063,16 +4332,16 @@ msgid "_Anniversary:"
 msgstr "_Jahrestag:"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:52
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:893
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1001
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:47
-#: ../src/calendar/gui/e-calendar-view.c:2079
+#: ../src/calendar/gui/e-calendar-view.c:2098
 msgid "Anniversary"
 msgstr "Jahrestag"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:53
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:892
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1000
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:46
-#: ../src/calendar/gui/e-calendar-view.c:2078
+#: ../src/calendar/gui/e-calendar-view.c:2097
 msgid "Birthday"
 msgstr "Geburtstag"
 
@@ -4121,16 +4390,16 @@ msgstr "Privat"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:63
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:82
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:860
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:969
 #: ../src/addressbook/gui/widgets/e-contact-map.c:380
 msgid "Work"
 msgstr "Geschäftlich"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:64
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:84
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:525
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:927
-#: ../src/calendar/gui/e-cal-model.c:3827
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:526
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1035
+#: ../src/calendar/gui/e-cal-model.c:3792
 msgid "Other"
 msgstr "Weitere"
 
@@ -4154,16 +4423,16 @@ msgstr "_X.509 hinzufügen"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:69
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:11
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1521
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1541
 #: ../src/e-util/e-attachment-view.c:355 ../src/e-util/e-filter-rule.c:409
 #: ../src/e-util/e-mail-signature-manager.c:368
-#: ../src/e-util/e-name-selector-dialog.c:1037 ../src/e-util/filter.error.xml.h:18
-#: ../src/e-util/filter.ui.h:27 ../src/mail/e-mail-config-identity-page.c:871
+#: ../src/e-util/e-name-selector-dialog.c:1033 ../src/e-util/filter.error.xml.h:18
+#: ../src/e-util/filter.ui.h:27 ../src/mail/e-mail-config-identity-page.c:872
 #: ../src/mail/e-mail-label-manager.c:389 ../src/mail/em-filter-rule.c:678
-#: ../src/mail/em-folder-properties.c:1050 ../src/mail/em-vfolder-editor-rule.c:642
+#: ../src/mail/em-folder-properties.c:1336 ../src/mail/em-vfolder-editor-rule.c:642
 #: ../src/mail/mail-config.ui.h:64
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:554
-#: ../src/plugins/email-custom-header/email-custom-header.c:848
+#: ../src/plugins/email-custom-header/email-custom-header.c:849
 #: ../src/plugins/publish-calendar/publish-calendar.c:790
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:35
 #: ../src/plugins/templates/templates.c:474
@@ -4184,22 +4453,22 @@ msgid "Certificates"
 msgstr "Zertifikate"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:261
-#: ../src/calendar/gui/e-comp-editor.c:2047 ../src/e-util/e-html-editor-actions.c:945
+#: ../src/calendar/gui/e-comp-editor.c:2090 ../src/e-util/e-html-editor-actions.c:945
 msgid "_Undo"
 msgstr "_Rückgängig"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:263
-#: ../src/calendar/gui/e-comp-editor.c:2049 ../src/e-util/e-focus-tracker.c:120
+#: ../src/calendar/gui/e-comp-editor.c:2092 ../src/e-util/e-focus-tracker.c:120
 msgid "Undo"
 msgstr "Rückgängig"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:268
-#: ../src/calendar/gui/e-comp-editor.c:2054 ../src/e-util/e-html-editor-actions.c:931
+#: ../src/calendar/gui/e-comp-editor.c:2097 ../src/e-util/e-html-editor-actions.c:931
 msgid "_Redo"
 msgstr "_Wiederholen"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:270
-#: ../src/calendar/gui/e-comp-editor.c:2056 ../src/e-util/e-focus-tracker.c:136
+#: ../src/calendar/gui/e-comp-editor.c:2099 ../src/e-util/e-focus-tracker.c:136
 msgid "Redo"
 msgstr "Wiederherstellen"
 
@@ -4216,38 +4485,38 @@ msgstr "Fehler beim Ändern eines Kontakts"
 msgid "Error removing contact"
 msgstr "Fehler beim Entfernen eines Kontakts"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:742
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3103
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:740
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3109
 #, c-format
 msgid "Contact Editor — %s"
 msgstr "Kontakteditor – %s"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3239
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3245
 msgid "X.509 certificates"
 msgstr "X.509-Zertifikate"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3244
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3250
 msgid "PGP keys"
 msgstr "PGP-Schlüssel"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3250
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3256
 #: ../src/smime/gui/certificate-manager.c:672
 #: ../src/smime/gui/certificate-manager.c:961
 msgid "All files"
 msgstr "Alle Dateien"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3270
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3276
 msgid "Open PGP key"
 msgstr "OpenPGP-Schlüssel"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3270
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3276
 msgid "Open X.509 certificate"
 msgstr "X.509-Zertifikat öffnen"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3272
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4334
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4341
-#: ../src/e-util/e-attachment-store.c:666 ../src/e-util/e-category-editor.c:179
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3278
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4340
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4347
+#: ../src/e-util/e-attachment-store.c:666 ../src/e-util/e-category-editor.c:177
 #: ../src/e-util/e-html-editor-actions.c:304
 #: ../src/e-util/e-html-editor-actions.c:348
 #: ../src/e-util/e-html-editor-actions.c:430
@@ -4256,49 +4525,49 @@ msgstr "X.509-Zertifikat öffnen"
 msgid "_Open"
 msgstr "Ö_ffnen"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3287
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3515
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3293
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3521
 msgid "Chosen file is not a local file."
 msgstr "Gewählte Datei ist keine lokale Datei."
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3300
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3306
 #, c-format
 msgid "Failed to load certificate: %s"
 msgstr "Laden des Zertifikats schlug fehl: %s"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3329
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3335
 msgctxt "cert-kind"
 msgid "X.509"
 msgstr "X.509"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3329
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3335
 msgctxt "cert-kind"
 msgid "PGP"
 msgstr "PGP"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3500
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3506
 msgid "Save PGP key"
 msgstr "PGP-Schlüssel speichern"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3500
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3506
 msgid "Save X.509 certificate"
 msgstr "X.509-Zertifikat speichern"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3527
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3533
 #, c-format
 msgid "Failed to save certificate: %s"
 msgstr "Speichern des Zertifikats schlug fehl: %s"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4331
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4337
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4343
 msgid "Please select an image for this contact"
 msgstr "Bitte wählen Sie ein Bild für diesen Kontakt"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4342
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4348
 msgid "_No image"
 msgstr "_Kein Bild"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4702
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4708
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -4306,28 +4575,28 @@ msgstr ""
 "Die Kontaktdaten sind ungültig:\n"
 "\n"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4708
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4714
 #, c-format
 msgid "“%s” has an invalid format"
 msgstr "»%s« hat ein ungültiges Format"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4716
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4722
 #, c-format
 msgid "“%s” cannot be a future date"
 msgstr "»%s« darf kein zukünftiges Datum sein"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4724
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4730
 #, c-format
 msgid "%s“%s” has an invalid format"
 msgstr "%s»%s« hat ein ungültiges Format"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4737
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4751
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4743
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4757
 #, c-format
 msgid "%s“%s” is empty"
 msgstr "%s»%s« ist leer"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4766
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4772
 msgid "Invalid contact."
 msgstr "Kontakt ungültig."
 
@@ -4335,11 +4604,11 @@ msgstr "Kontakt ungültig."
 #: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:454
 #: ../src/addressbook/gui/contact-editor/fullname.ui.h:13
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:317
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:302
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:305
 #: ../src/e-util/e-attachment-dialog.c:311 ../src/e-util/e-categories-dialog.c:81
-#: ../src/e-util/e-category-editor.c:260 ../src/e-util/e-charset-combo-box.c:100
+#: ../src/e-util/e-category-editor.c:258 ../src/e-util/e-charset-combo-box.c:100
 #: ../src/e-util/e-color-chooser-widget.c:126 ../src/e-util/e-filter-datespec.c:301
-#: ../src/e-util/e-html-editor-link-dialog.c:255 ../src/e-util/e-passwords.c:469
+#: ../src/e-util/e-html-editor-link-dialog.c:243 ../src/e-util/e-passwords.c:469
 #: ../src/e-util/e-rule-context.c:817 ../src/e-util/e-rule-editor.c:188
 #: ../src/e-util/e-rule-editor.c:299 ../src/e-util/e-rule-editor.c:934
 #: ../src/e-util/e-send-options.ui.h:17 ../src/e-util/e-source-config-dialog.c:361
@@ -4493,12 +4762,12 @@ msgid "_Top"
 msgstr "_Oben"
 
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:16
-#: ../src/e-util/e-source-selector.c:3474 ../src/e-util/filter.ui.h:29
+#: ../src/e-util/e-source-selector.c:3475 ../src/e-util/filter.ui.h:29
 msgid "_Up"
 msgstr "_Hoch"
 
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:17
-#: ../src/e-util/e-source-selector.c:3475 ../src/e-util/filter.ui.h:30
+#: ../src/e-util/e-source-selector.c:3476 ../src/e-util/filter.ui.h:30
 msgid "_Down"
 msgstr "_Runter"
 
@@ -4541,9 +4810,9 @@ msgstr "E-Mail-Adresse beginnt mit"
 #: ../src/calendar/gui/caltypes.xml.in.h:26 ../src/calendar/gui/memotypes.xml.in.h:19
 #: ../src/calendar/gui/tasktypes.xml.in.h:30
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1295
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1740
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:809
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1017
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1692
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:807
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1015
 msgid "Any field contains"
 msgstr "Ein beliebiges Feld enthält"
 
@@ -4564,7 +4833,7 @@ msgstr "E-Mail-Adresse in die Zwischenablage kopieren"
 
 #: ../src/addressbook/gui/widgets/eab-contact-display.c:192
 #: ../src/e-util/e-web-view.c:440
-msgid "_Send New Message To..."
+msgid "_Send New Message To…"
 msgstr "Neue Nachricht _schicken an …"
 
 #: ../src/addressbook/gui/widgets/eab-contact-display.c:194
@@ -4573,7 +4842,7 @@ msgid "Send a mail message to this address"
 msgstr "Eine Nachricht an diese Adresse senden"
 
 #: ../src/addressbook/gui/widgets/eab-contact-display.c:321
-#: ../src/e-util/e-web-view.c:1441
+#: ../src/e-util/e-web-view.c:1446
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klicken Sie hier, um eine E-Mail an %s zu verfassen"
@@ -4587,178 +4856,169 @@ msgstr "Klicken Sie hier, um die Karte für %s zu öffnen"
 msgid "Open map"
 msgstr "Karte öffnen"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:450
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:451
 msgid "SIP"
 msgstr "SIP"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:694
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:690
 msgid "List Members:"
 msgstr "Listenmitglieder:"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:766
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:769
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:956
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:997
+msgid "Phone"
+msgstr "Telefon"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:875
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Nickname"
 msgstr "Spitzname"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:767
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:876
 msgid "AIM"
 msgstr "AIM"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:768
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:877
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:769
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:878
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:770
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:879
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:771
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:880
 msgid "MSN"
 msgstr "MSN"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:772
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:881
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:773
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:882
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:774
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:883
 msgid "Skype"
 msgstr "Skype"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:775
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:884
 msgid "Twitter"
 msgstr "Twitter"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:837
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:946
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Company"
 msgstr "Firma"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:838
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:947
 msgid "Department"
 msgstr "Abteilung"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:839
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:948
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Office"
 msgstr "Büro"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:840
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:949
 msgid "Profession"
 msgstr "Beruf"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:841
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:950
 msgid "Position"
 msgstr "Position"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:842
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:951
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Manager"
 msgstr "Vorgesetzter"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:843
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:952
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Assistant"
 msgstr "Assistent"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:844
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:953
 msgid "Video Chat"
 msgstr "Video-Chat"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:846
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:955
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Free/Busy"
 msgstr "Verfügbarkeit"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:847
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:888
-msgid "Phone"
-msgstr "Telefon"
-
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:848
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:957
 msgid "Fax"
 msgstr "Fax"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:850
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:891
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:917
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:959
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:999
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1025
 msgid "Address"
 msgstr "Adresse"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:886
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:995
 msgid "Home Page"
 msgstr "Homepage"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:887
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:996
 msgid "Web Log"
 msgstr "Weblog"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:889
-#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-msgid "Mobile Phone"
-msgstr "Mobiltelefon"
-
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:894
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1002
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 msgid "Spouse"
 msgstr "Ehepartner"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:904
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1012
 msgid "Personal"
 msgstr "Persönlich"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:949
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1057
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Note"
 msgstr "Notiz"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1145
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1253
 msgid "List Members"
 msgstr "Listenmitglieder"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1166
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1276
 msgid "Job Title"
 msgstr "Tätigkeit"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1207
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1317
 msgid "Home page"
 msgstr "Homepage"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1217
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1327
 msgid "Blog"
 msgstr "Blog"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:259
-#: ../src/calendar/gui/e-cal-component-preview.c:322
-#: ../src/calendar/gui/e-cal-model-tasks.c:272
-#: ../src/calendar/gui/e-cal-model-tasks.c:526 ../src/calendar/gui/e-task-table.c:210
-#: ../src/calendar/gui/e-task-table.c:225 ../src/calendar/gui/e-task-table.c:635
-#: ../src/calendar/gui/print.c:3600 ../src/calendar/gui/tasktypes.xml.in.h:14
-#: ../src/mail/mail-send-recv.c:1146
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:299
+#: ../src/calendar/gui/tasktypes.xml.in.h:14 ../src/mail/mail-send-recv.c:1146
 msgid "Cancelled"
 msgstr "Abgebrochen"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:455
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:489
 msgid "Merge Contact"
 msgstr "Kontakte zusammenführen"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:473
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:722
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:511
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:752
 msgid "_Merge"
 msgstr "_Zusammenführen"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:711
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:741
 msgid "Duplicate Contact Detected"
 msgstr "Mehrfach existierender Kontakt entdeckt"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:769
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:799
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder. Would you like to save the changes anyway?"
@@ -4766,7 +5026,7 @@ msgstr ""
 "Der Name oder die E-Mail-Adresse dieses Kontakts existiert bereits in diesem "
 "Ordner. Wollen Sie die Änderungen dennoch speichern?"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:772
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:802
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder. Would you like to add it anyway?"
@@ -4774,19 +5034,19 @@ msgstr ""
 "Der Namen oder die E-Mail-Adresse dieses Kontakts existiert\n"
 "bereits in diesem Ordner. Soll er dennoch hinzugefügt werden?"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:787
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:817
 msgid "Changed Contact:"
 msgstr "Geänderter Kontakt:"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:789
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:819
 msgid "New Contact:"
 msgstr "Neuer Kontakt:"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:828
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:858
 msgid "Conflicting Contact:"
 msgstr "Kontakt in Konflikt:"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:830
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:860
 msgid "Old Contact:"
 msgstr "Alter Kontakt:"
 
@@ -4930,69 +5190,69 @@ msgstr "Suche wurde unterbrochen"
 msgid "Error modifying card"
 msgstr "Fehler beim Ändern einer Karte"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:680
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:678
 msgid "Cut selected contacts to the clipboard"
 msgstr "Ausgewählte Kontakte in die Zwischenablage ausschneiden"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:686
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:684
 msgid "Copy selected contacts to the clipboard"
 msgstr "Ausgewählte Kontakte in die Zwischenablage kopieren"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:692
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:690
 msgid "Paste contacts from the clipboard"
 msgstr "Kontakte aus der Zwischenablage einfügen"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:698
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:696
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1101
 msgid "Delete selected contacts"
 msgstr "Die gewählten Kontakte löschen"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:704
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "Select all visible contacts"
 msgstr "Alle sichtbaren Kontakte auswählen"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1328
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1289
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Sind Sie sicher, dass Sie diese Kontaktlisten löschen wollen?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1332
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1293
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Sind Sie sicher, dass Sie diese Kontaktliste löschen wollen?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1336
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1297
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Sind Sie sicher, dass Sie diese Kontaktliste löschen wollen (%s)?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1342
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1303
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Sind Sie sicher, dass Sie diese Kontakte löschen wollen?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1346
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1307
 msgid "Are you sure you want to delete this contact?"
 msgstr "Sind Sie sicher, dass Sie diesen Kontakt löschen wollen?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1350
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1311
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Sind Sie sicher, dass Sie diesen Kontakt löschen wollen (%s)?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1361
-#: ../src/calendar/gui/e-comp-editor.c:2005 ../src/e-util/e-accounts-window.c:1753
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1322
+#: ../src/calendar/gui/e-comp-editor.c:2048 ../src/e-util/e-accounts-window.c:1753
 #: ../src/e-util/e-focus-tracker.c:783 ../src/e-util/evolution-source-viewer.c:806
-#: ../src/e-util/e-webdav-browser.c:2688 ../src/mail/e-mail-account-manager.c:737
+#: ../src/e-util/e-webdav-browser.c:2697 ../src/mail/e-mail-account-manager.c:739
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1173
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1547
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:699
-#: ../src/modules/calendar/e-task-shell-view-actions.c:853
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1589
-#: ../src/shell/e-shell-window-actions.c:859
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1499
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:697
+#: ../src/modules/calendar/e-task-shell-view-actions.c:851
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1628
+#: ../src/shell/e-shell-window-actions.c:877
 #: ../src/smime/gui/certificate-manager.c:1656 ../src/smime/gui/smime-ui.ui.h:8
 msgid "_Delete"
 msgstr "_Löschen"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1508
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1470
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -5009,11 +5269,11 @@ msgstr[1] ""
 "geöffnet werden.\n"
 "Wollen Sie wirklich alle Kontakte anzeigen?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1516
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1478
 msgid "_Don’t Display"
 msgstr "_Nicht anzeigen"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1517
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1479
 msgid "Display _All Contacts"
 msgstr "_Alle Kontakte anzeigen"
 
@@ -5081,6 +5341,10 @@ msgstr "Fax, privat"
 msgid "ISDN Phone"
 msgstr "ISDN-Telefon"
 
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Mobile Phone"
+msgstr "Mobiltelefon"
+
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "Other Phone"
 msgstr "Weiteres Telefon"
@@ -5125,14 +5389,14 @@ msgid "Title"
 msgstr "Anrede"
 
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../src/calendar/gui/e-meeting-list-view.c:671
+#: ../src/calendar/gui/e-meeting-list-view.c:664
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "Position"
 
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:41
 msgid "Web Site"
-msgstr "Website"
+msgstr "Internet-Seite"
 
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:42
 msgid "Journal"
@@ -5188,15 +5452,15 @@ msgstr "Ver_größern"
 
 #. Zoom-out button
 #: ../src/addressbook/gui/widgets/e-contact-map-window.c:417
-#: ../src/mail/e-mail-reader.c:2829
+#: ../src/mail/e-mail-reader.c:2862
 msgid "Zoom _Out"
 msgstr "Ansicht ver_kleinern"
 
 #. Search button
 #: ../src/addressbook/gui/widgets/e-contact-map-window.c:447
 #: ../src/e-util/e-html-editor-actions.c:2015
-#: ../src/e-util/e-html-editor-find-dialog.c:250
-#: ../src/shell/e-shell-window-actions.c:929
+#: ../src/e-util/e-html-editor-find-dialog.c:244
+#: ../src/shell/e-shell-window-actions.c:947
 msgid "_Find"
 msgstr "_Suchen"
 
@@ -5204,7 +5468,7 @@ msgstr "_Suchen"
 msgid ""
 "\n"
 "\n"
-"Searching for the Contacts..."
+"Searching for the Contacts…"
 msgstr ""
 "\n"
 "\n"
@@ -5258,41 +5522,40 @@ msgstr ""
 "\n"
 "In dieser Ansicht existieren keine anzuzeigenden Einträge."
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:749
+#: ../src/addressbook/importers/evolution-csv-importer.c:796
 #: ../src/addressbook/importers/evolution-ldif-importer.c:547
 #: ../src/addressbook/importers/evolution-vcard-importer.c:247
-#: ../src/calendar/importers/icalendar-importer.c:478
-#: ../src/calendar/importers/icalendar-importer.c:971
-#: ../src/calendar/importers/icalendar-importer.c:1011
-#: ../src/shell/shell.error.xml.h:1
-msgid "Importing..."
+#: ../src/calendar/importers/icalendar-importer.c:499
+#: ../src/calendar/importers/icalendar-importer.c:1003
+#: ../src/calendar/importers/icalendar-importer.c:1043
+msgid "Importing…"
 msgstr "Importieren …"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:931
+#: ../src/addressbook/importers/evolution-csv-importer.c:978
 msgid "Can’t open .csv file"
 msgstr "csv-Datei kann nicht geöffnet werden"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1100
+#: ../src/addressbook/importers/evolution-csv-importer.c:1151
 msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "Outlook-Kontakte CSV oder Tab (.csv, .tab):"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1101
+#: ../src/addressbook/importers/evolution-csv-importer.c:1152
 msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "Outlook-Kontakte CSV- und Tab-Importeur"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1109
+#: ../src/addressbook/importers/evolution-csv-importer.c:1160
 msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "Mozilla-Kontakte CSV oder Tab (.csv, .tab):"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1110
+#: ../src/addressbook/importers/evolution-csv-importer.c:1161
 msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "Mozilla-Kontakte CSV- und Tab-Importeur"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1118
+#: ../src/addressbook/importers/evolution-csv-importer.c:1169
 msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "Evolution-Kontakte CSV oder Tab (.csv, .tab):"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1119
+#: ../src/addressbook/importers/evolution-csv-importer.c:1170
 msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Evolution-Kontakte CSV- und Tab-Importeur"
 
@@ -5461,7 +5724,7 @@ msgstr "_Nicht verschicken"
 msgid "_Send Notice"
 msgstr "Nachricht ver_schicken"
 
-#: ../src/calendar/calendar.error.xml.h:5 ../src/calendar/gui/e-cal-dialogs.c:507
+#: ../src/calendar/calendar.error.xml.h:5 ../src/calendar/gui/e-cal-dialogs.c:504
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Sind Sie sicher, dass Sie diese Besprechung löschen wollen?"
@@ -5480,7 +5743,7 @@ msgstr ""
 "Falls Sie keine Absagenachricht verschicken, wissen die anderen Teilnehmer "
 "möglicherweise nicht, dass die Aufgabe gelöscht wurde."
 
-#: ../src/calendar/calendar.error.xml.h:9 ../src/calendar/gui/e-cal-dialogs.c:510
+#: ../src/calendar/calendar.error.xml.h:9 ../src/calendar/gui/e-cal-dialogs.c:507
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Sind Sie sicher, dass Sie diese Aufgabe löschen wollen?"
@@ -5503,7 +5766,7 @@ msgstr ""
 "Falls Sie keine Absagenachricht verschicken, wissen die anderen Teilnehmer "
 "möglicherweise nicht, dass die Notiz gelöscht wurde."
 
-#: ../src/calendar/calendar.error.xml.h:13 ../src/calendar/gui/e-cal-dialogs.c:513
+#: ../src/calendar/calendar.error.xml.h:13 ../src/calendar/gui/e-cal-dialogs.c:510
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Sind Sie sicher, dass Sie diese Notiz löschen wollen?"
@@ -6131,7 +6394,7 @@ msgstr ""
 #: ../src/calendar/gui/e-memo-table.etspec.h:2
 #: ../src/calendar/gui/e-task-table.etspec.h:4
 #: ../src/calendar/gui/memotypes.xml.in.h:1 ../src/calendar/gui/tasktypes.xml.in.h:1
-#: ../src/plugins/save-calendar/csv-format.c:373
+#: ../src/plugins/save-calendar/csv-format.c:362
 msgid "Summary"
 msgstr "Zusammenfassung"
 
@@ -6151,7 +6414,7 @@ msgstr "enthält nicht"
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:4
 #: ../src/calendar/gui/memotypes.xml.in.h:4 ../src/calendar/gui/tasktypes.xml.in.h:4
 #: ../src/e-util/e-attachment-tree-view.c:147
-#: ../src/e-util/e-collection-account-wizard.c:1893
+#: ../src/e-util/e-collection-account-wizard.c:1930
 #: ../src/e-util/e-table-config.ui.h:20
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Description"
@@ -6178,20 +6441,20 @@ msgstr "ist"
 msgid "is not"
 msgstr "ist nicht"
 
-#: ../src/calendar/gui/caltypes.xml.in.h:9 ../src/calendar/gui/e-cal-list-view.c:243
-#: ../src/calendar/gui/e-cal-model.c:303 ../src/calendar/gui/e-cal-model.c:310
-#: ../src/calendar/gui/e-task-table.c:523 ../src/calendar/gui/memotypes.xml.in.h:10
+#: ../src/calendar/gui/caltypes.xml.in.h:9 ../src/calendar/gui/e-cal-list-view.c:263
+#: ../src/calendar/gui/e-cal-model.c:296 ../src/calendar/gui/e-cal-model.c:304
+#: ../src/calendar/gui/e-task-table.c:445 ../src/calendar/gui/memotypes.xml.in.h:10
 msgid "Public"
 msgstr "Öffentlich"
 
-#: ../src/calendar/gui/caltypes.xml.in.h:10 ../src/calendar/gui/e-cal-list-view.c:244
-#: ../src/calendar/gui/e-cal-model.c:312 ../src/calendar/gui/e-task-table.c:524
+#: ../src/calendar/gui/caltypes.xml.in.h:10 ../src/calendar/gui/e-cal-list-view.c:264
+#: ../src/calendar/gui/e-cal-model.c:306 ../src/calendar/gui/e-task-table.c:446
 #: ../src/calendar/gui/memotypes.xml.in.h:11
 msgid "Private"
 msgstr "Privat"
 
-#: ../src/calendar/gui/caltypes.xml.in.h:11 ../src/calendar/gui/e-cal-list-view.c:245
-#: ../src/calendar/gui/e-cal-model.c:314 ../src/calendar/gui/e-task-table.c:525
+#: ../src/calendar/gui/caltypes.xml.in.h:11 ../src/calendar/gui/e-cal-list-view.c:265
+#: ../src/calendar/gui/e-cal-model.c:308 ../src/calendar/gui/e-task-table.c:447
 #: ../src/calendar/gui/memotypes.xml.in.h:12
 #: ../src/e-util/e-html-editor-page-dialog.c:113 ../src/e-util/e-send-options.ui.h:7
 msgid "Confidential"
@@ -6213,7 +6476,7 @@ msgstr "Teilnehmer"
 #: ../src/calendar/gui/e-task-table.etspec.h:13 ../src/mail/message-list.etspec.h:14
 #: ../src/plugins/publish-calendar/publish-calendar.c:861
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../src/plugins/save-calendar/csv-format.c:387
+#: ../src/plugins/save-calendar/csv-format.c:376
 msgid "Location"
 msgstr "Ort"
 
@@ -6226,7 +6489,7 @@ msgstr "Kategorie"
 #: ../src/calendar/gui/caltypes.xml.in.h:16 ../src/calendar/gui/memotypes.xml.in.h:14
 #: ../src/calendar/gui/tasktypes.xml.in.h:15
 #: ../src/em-format/e-mail-formatter-print.c:51
-#: ../src/em-format/e-mail-formatter-print-headers.c:156
+#: ../src/em-format/e-mail-formatter-print-headers.c:161
 #: ../src/mail/filtertypes.xml.in.h:47 ../src/mail/searchtypes.xml.in.h:49
 #: ../src/mail/vfoldertypes.xml.in.h:50
 msgid "Attachments"
@@ -6245,7 +6508,7 @@ msgid "Do Not Exist"
 msgstr "Existieren nicht"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:19
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2011
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2065
 msgid "Recurrence"
 msgstr "Wiederholung"
 
@@ -6275,19 +6538,69 @@ msgstr "Zusammenfassung enthält"
 msgid "Description Contains"
 msgstr "Beschreibung enthält"
 
-#: ../src/calendar/gui/comp-util.c:1490
-#: ../src/modules/itip-formatter/itip-view.c:2393
+#: ../src/calendar/gui/comp-util.c:1544
+#: ../src/modules/itip-formatter/itip-view.c:2391
 #, c-format
 msgid "with one guest"
 msgid_plural "with %d guests"
 msgstr[0] "mit einem Gast"
 msgstr[1] "mit %d Gästen"
 
-#: ../src/calendar/gui/comp-util.c:1546
+#: ../src/calendar/gui/comp-util.c:1603
 #, c-format
 msgid "Comments: %s"
 msgstr "Kommentare: %s"
 
+#: ../src/calendar/gui/comp-util.c:1617 ../src/calendar/gui/comp-util.c:1620
+msgctxt "iCalendarStatus"
+msgid "None"
+msgstr "Keine"
+
+#: ../src/calendar/gui/comp-util.c:1618
+msgctxt "iCalendarStatus"
+msgid "Tentative"
+msgstr "Vorläufig"
+
+#: ../src/calendar/gui/comp-util.c:1619
+msgctxt "iCalendarStatus"
+msgid "Confirmed"
+msgstr "Bestätigt"
+
+#: ../src/calendar/gui/comp-util.c:1621
+msgctxt "iCalendarStatus"
+msgid "Draft"
+msgstr "Entwurf"
+
+#: ../src/calendar/gui/comp-util.c:1622
+msgctxt "iCalendarStatus"
+msgid "Final"
+msgstr "Endgültig"
+
+#: ../src/calendar/gui/comp-util.c:1623
+msgctxt "iCalendarStatus"
+msgid "Not Started"
+msgstr "Nicht begonnen"
+
+#: ../src/calendar/gui/comp-util.c:1624
+msgctxt "iCalendarStatus"
+msgid "Needs Action"
+msgstr "Erfordert Maßnahme"
+
+#: ../src/calendar/gui/comp-util.c:1625
+msgctxt "iCalendarStatus"
+msgid "In Progress"
+msgstr "In Bearbeitung"
+
+#: ../src/calendar/gui/comp-util.c:1626
+msgctxt "iCalendarStatus"
+msgid "Completed"
+msgstr "Abgeschlossen"
+
+#: ../src/calendar/gui/comp-util.c:1627
+msgctxt "iCalendarStatus"
+msgid "Cancelled"
+msgstr "Abgebrochen"
+
 #: ../src/calendar/gui/ea-cal-view.c:281
 msgid "New Appointment"
 msgstr "Neuer Termin"
@@ -6389,83 +6702,42 @@ msgstr "Sprungknopf"
 msgid "Click here, you can find more events."
 msgstr "Klicken Sie hier, um weitere Termine zu sehen."
 
-#. Translator: Entire string is like "Pop up an alert %d days before start"
-#: ../src/calendar/gui/e-alarm-list.c:368 ../src/calendar/gui/misc.c:95
-#, c-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d Tag"
-msgstr[1] "%d Tage"
-
-#. Translator: Entire string is like "Pop up an alert %d weeks before start"
-#: ../src/calendar/gui/e-alarm-list.c:374
-#, c-format
-msgid "%d week"
-msgid_plural "%d weeks"
-msgstr[0] "%d Woche"
-msgstr[1] "%d Wochen"
-
-#. Translator: Entire string is like "Pop up an alert %d hours before start"
-#: ../src/calendar/gui/e-alarm-list.c:380 ../src/calendar/gui/misc.c:101
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d Stunde"
-msgstr[1] "%d Stunden"
-
-#. Translator: Entire string is like "Pop up an alert %d minutes before start"
-#: ../src/calendar/gui/e-alarm-list.c:386 ../src/calendar/gui/misc.c:107
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d Minute"
-msgstr[1] "%d Minuten"
-
-#. Translator: Entire string is like "Pop up an alert %d seconds before start"
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../src/calendar/gui/e-alarm-list.c:392 ../src/calendar/gui/misc.c:111
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d Sekunde"
-msgstr[1] "%d Sekunden"
-
 #. Translators: Part of: [ Play a sound ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-alarm-list.c:419
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1820
+#: ../src/calendar/gui/e-alarm-list.c:387
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2188
 msgctxt "cal-reminders"
 msgid "Play a sound"
 msgstr "Klang wiedergeben"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-alarm-list.c:423
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1818
+#: ../src/calendar/gui/e-alarm-list.c:391
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2186
 msgctxt "cal-reminders"
 msgid "Pop up an alert"
 msgstr "Alarmeinblendung anzeigen"
 
 #. Translators: Part of: [ Send an email ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-alarm-list.c:427
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1824
+#: ../src/calendar/gui/e-alarm-list.c:395
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2192
 msgctxt "cal-reminders"
 msgid "Send an email"
 msgstr "E-Mail versenden"
 
 #. Translators: Part of: [ Run a program ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-alarm-list.c:431
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1822
+#: ../src/calendar/gui/e-alarm-list.c:399
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2190
 msgctxt "cal-reminders"
 msgid "Run a program"
 msgstr "Programm ausführen"
 
-#: ../src/calendar/gui/e-alarm-list.c:437
+#: ../src/calendar/gui/e-alarm-list.c:405
 msgctxt "cal-reminders"
 msgid "Unknown action to be performed"
 msgstr "Auszuführende Aktion unbekannt"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../src/calendar/gui/e-alarm-list.c:452
+#: ../src/calendar/gui/e-alarm-list.c:421
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s %s before the start"
@@ -6473,7 +6745,7 @@ msgstr "%s %s vor dem Terminbeginn"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../src/calendar/gui/e-alarm-list.c:458
+#: ../src/calendar/gui/e-alarm-list.c:427
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s %s after the start"
@@ -6481,7 +6753,7 @@ msgstr "%s %s nach dem Terminbeginn"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../src/calendar/gui/e-alarm-list.c:465
+#: ../src/calendar/gui/e-alarm-list.c:434
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s at the start"
@@ -6489,7 +6761,7 @@ msgstr "%s zum Terminbeginn"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../src/calendar/gui/e-alarm-list.c:477
+#: ../src/calendar/gui/e-alarm-list.c:447
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s %s before the end"
@@ -6497,7 +6769,7 @@ msgstr "%s %s vor dem Terminende"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../src/calendar/gui/e-alarm-list.c:483
+#: ../src/calendar/gui/e-alarm-list.c:453
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s %s after the end"
@@ -6505,7 +6777,7 @@ msgstr "%s %s nach dem Terminende"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../src/calendar/gui/e-alarm-list.c:490
+#: ../src/calendar/gui/e-alarm-list.c:460
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s at the end"
@@ -6513,7 +6785,7 @@ msgstr "%s zum Terminende"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../src/calendar/gui/e-alarm-list.c:514
+#: ../src/calendar/gui/e-alarm-list.c:484
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s at %s"
@@ -6521,7 +6793,7 @@ msgstr "%s um %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../src/calendar/gui/e-alarm-list.c:522
+#: ../src/calendar/gui/e-alarm-list.c:492
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s for an unknown trigger type"
@@ -6545,291 +6817,271 @@ msgstr "Kalenderansicht für einen Monat"
 msgid "calendar view for one or more weeks"
 msgstr "Kalenderansicht für eine oder mehrere Wochen"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:216
+#: ../src/calendar/gui/e-cal-component-preview.c:237
 #: ../src/e-util/e-filter-rule.c:986 ../src/mail/e-mail-config-page.c:124
 msgid "Untitled"
 msgstr "Namenlos"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:224
+#: ../src/calendar/gui/e-cal-component-preview.c:251
 msgid "Categories:"
 msgstr "Kategorien:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:258
+#: ../src/calendar/gui/e-cal-component-preview.c:288
 #: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:249
-#: ../src/modules/itip-formatter/itip-view.c:1682
-#: ../src/modules/itip-formatter/itip-view.c:1793
+#: ../src/modules/itip-formatter/itip-view.c:1677
+#: ../src/modules/itip-formatter/itip-view.c:1788
 msgid "Location:"
 msgstr "Ort:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:266
+#: ../src/calendar/gui/e-cal-component-preview.c:295
 msgid "Start Date:"
 msgstr "Anfangsdatum:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:277
+#: ../src/calendar/gui/e-cal-component-preview.c:304
 msgid "End Date:"
 msgstr "Enddatum:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:288
+#: ../src/calendar/gui/e-cal-component-preview.c:313
 msgid "Due Date:"
 msgstr "Fällig am:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:300
+#: ../src/calendar/gui/e-cal-component-preview.c:326
 msgid "Recurs:"
 msgstr "Wiederkehrend:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:312
-#: ../src/modules/itip-formatter/itip-view.c:1685
-#: ../src/modules/itip-formatter/itip-view.c:1802
+#: ../src/calendar/gui/e-cal-component-preview.c:338
+#: ../src/modules/itip-formatter/itip-view.c:1680
+#: ../src/modules/itip-formatter/itip-view.c:1797
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:316
-#: ../src/calendar/gui/e-cal-model-tasks.c:268
-#: ../src/calendar/gui/e-cal-model-tasks.c:522
-#: ../src/calendar/gui/e-cal-model-tasks.c:603 ../src/calendar/gui/e-task-table.c:206
-#: ../src/calendar/gui/e-task-table.c:221 ../src/calendar/gui/e-task-table.c:633
-#: ../src/calendar/gui/print.c:3594
-msgid "In Progress"
-msgstr "In Bearbeitung"
-
-#: ../src/calendar/gui/e-cal-component-preview.c:319
-#: ../src/calendar/gui/e-cal-model-tasks.c:270
-#: ../src/calendar/gui/e-cal-model-tasks.c:524
-#: ../src/calendar/gui/e-meeting-store.c:205
-#: ../src/calendar/gui/e-meeting-store.c:228 ../src/calendar/gui/e-task-table.c:208
-#: ../src/calendar/gui/e-task-table.c:223 ../src/calendar/gui/e-task-table.c:634
-#: ../src/calendar/gui/print.c:3597 ../src/calendar/gui/tasktypes.xml.in.h:13
-#: ../src/plugins/save-calendar/csv-format.c:377
-msgid "Completed"
-msgstr "Abgeschlossen"
-
-#: ../src/calendar/gui/e-cal-component-preview.c:326
-#: ../src/calendar/gui/e-cal-model-tasks.c:266
-#: ../src/calendar/gui/e-cal-model-tasks.c:520 ../src/calendar/gui/e-task-table.c:204
-#: ../src/calendar/gui/e-task-table.c:219 ../src/calendar/gui/e-task-table.c:632
-#: ../src/calendar/gui/print.c:3591 ../src/calendar/gui/tasktypes.xml.in.h:11
-msgid "Not Started"
-msgstr "Nicht begonnen"
-
-#: ../src/calendar/gui/e-cal-component-preview.c:339
-msgid "Priority:"
-msgstr "Priorität:"
-
-#: ../src/calendar/gui/e-cal-component-preview.c:341
-#: ../src/calendar/gui/e-task-table.c:549 ../src/calendar/gui/tasktypes.xml.in.h:19
-#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:328
+#: ../src/calendar/gui/e-cal-component-preview.c:347
+#: ../src/calendar/gui/e-task-table.c:471 ../src/calendar/gui/tasktypes.xml.in.h:19
+#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:331
 msgid "High"
 msgstr "Hoch"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:343
-#: ../src/calendar/gui/e-cal-model.c:1911 ../src/calendar/gui/e-task-table.c:550
+#: ../src/calendar/gui/e-cal-component-preview.c:349
+#: ../src/calendar/gui/e-cal-model.c:1872 ../src/calendar/gui/e-task-table.c:472
 #: ../src/calendar/gui/tasktypes.xml.in.h:20 ../src/e-util/e-send-options.ui.h:5
-#: ../src/mail/message-list.c:327
+#: ../src/mail/message-list.c:330
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:345
-#: ../src/calendar/gui/e-task-table.c:551 ../src/calendar/gui/tasktypes.xml.in.h:21
-#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:326
+#: ../src/calendar/gui/e-cal-component-preview.c:351
+#: ../src/calendar/gui/e-task-table.c:473 ../src/calendar/gui/tasktypes.xml.in.h:21
+#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:329
 msgid "Low"
 msgstr "Niedrig"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:364
+#: ../src/calendar/gui/e-cal-component-preview.c:353
+msgid "Priority:"
+msgstr "Priorität:"
+
+#: ../src/calendar/gui/e-cal-component-preview.c:365
+msgid "Organizer:"
+msgstr "Organisator:"
+
+#: ../src/calendar/gui/e-cal-component-preview.c:406
+msgid "Attendees:"
+msgstr "Teilnehmer:"
+
+#: ../src/calendar/gui/e-cal-component-preview.c:453
 #: ../src/mail/e-mail-config-service-page.c:533
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:408
+#: ../src/calendar/gui/e-cal-component-preview.c:507
 msgid "Web Page:"
-msgstr "Website:"
+msgstr "Internetseite:"
 
-#: ../src/calendar/gui/e-cal-data-model.c:1709
+#: ../src/calendar/gui/e-cal-data-model.c:1753
 #, c-format
 msgid "Creating view for calendar “%s”"
 msgstr "Ansicht für Kalender »%s« wird erstellt"
 
-#: ../src/calendar/gui/e-cal-data-model.c:1713
+#: ../src/calendar/gui/e-cal-data-model.c:1757
 #, c-format
 msgid "Creating view for task list “%s”"
 msgstr "Ansicht für Aufgabenliste »%s« wird erstellt"
 
-#: ../src/calendar/gui/e-cal-data-model.c:1717
+#: ../src/calendar/gui/e-cal-data-model.c:1761
 #, c-format
 msgid "Creating view for memo list “%s”"
 msgstr "Ansicht für Notizliste »%s« wird erstellt"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:219 ../src/calendar/gui/e-cal-ops.c:1966
+#: ../src/calendar/gui/e-cal-dialogs.c:217 ../src/calendar/gui/e-cal-ops.c:1964
 msgid "Destination is read only"
 msgstr "Ziel ist nur lesbar"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:299
+#: ../src/calendar/gui/e-cal-dialogs.c:297
 #, c-format
 msgid "Copying events to the calendar “%s”"
 msgstr "Termine werden in den Kalender »%s« kopiert"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:305
+#: ../src/calendar/gui/e-cal-dialogs.c:303
 #, c-format
 msgid "Copying memos to the memo list “%s”"
 msgstr "Notizen werden in die Notizliste »%s« kopiert"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:311
+#: ../src/calendar/gui/e-cal-dialogs.c:309
 #, c-format
 msgid "Copying tasks to the task list “%s”"
 msgstr "Aufgaben werden in die Aufgabenliste »%s« kopiert"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:530
+#: ../src/calendar/gui/e-cal-dialogs.c:527
 msgid "_Delete this item from all other recipient’s mailboxes?"
 msgstr ""
 "Soll dieses Objekt von allen anderen Postfächern der Empfänger ge_löscht werden?"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:533
+#: ../src/calendar/gui/e-cal-dialogs.c:530
 msgid "_Retract comment"
 msgstr "Kommentar zur_ückziehen"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:692
+#: ../src/calendar/gui/e-cal-dialogs.c:687
 msgid "Select Date"
 msgstr "Datum wählen"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:693
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1304
+#: ../src/calendar/gui/e-cal-dialogs.c:688
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1256
 msgid "Select _Today"
 msgstr "_Heute wählen"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:712
+#: ../src/calendar/gui/e-cal-dialogs.c:707
 msgid "January"
 msgstr "Januar"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:713
+#: ../src/calendar/gui/e-cal-dialogs.c:708
 msgid "February"
 msgstr "Februar"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:714
+#: ../src/calendar/gui/e-cal-dialogs.c:709
 msgid "March"
 msgstr "März"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:715
+#: ../src/calendar/gui/e-cal-dialogs.c:710
 msgid "April"
 msgstr "April"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:716
+#: ../src/calendar/gui/e-cal-dialogs.c:711
 msgid "May"
 msgstr "Mai"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:717
+#: ../src/calendar/gui/e-cal-dialogs.c:712
 msgid "June"
 msgstr "Juni"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:718
+#: ../src/calendar/gui/e-cal-dialogs.c:713
 msgid "July"
 msgstr "Juli"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:719
+#: ../src/calendar/gui/e-cal-dialogs.c:714
 msgid "August"
 msgstr "August"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:720
+#: ../src/calendar/gui/e-cal-dialogs.c:715
 msgid "September"
 msgstr "September"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:721
+#: ../src/calendar/gui/e-cal-dialogs.c:716
 msgid "October"
 msgstr "Oktober"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:722
+#: ../src/calendar/gui/e-cal-dialogs.c:717
 msgid "November"
 msgstr "November"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:723
+#: ../src/calendar/gui/e-cal-dialogs.c:718
 msgid "December"
 msgstr "Dezember"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:873
+#: ../src/calendar/gui/e-cal-dialogs.c:870
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr ""
 "Sie nehmen Änderungen an einem wiederkehrenden Termin vor. Was möchten Sie "
 "verändern?"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:875
+#: ../src/calendar/gui/e-cal-dialogs.c:872
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Sie delegieren einen wiederkehrenden Termin. Was möchten Sie delegieren?"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:879
+#: ../src/calendar/gui/e-cal-dialogs.c:876
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr ""
 "Sie nehmen Änderungen an einer wiederkehrenden Aufgabe vor. Was möchten Sie "
 "verändern?"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:883
+#: ../src/calendar/gui/e-cal-dialogs.c:880
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr ""
 "Sie nehmen Änderungen an einer wiederkehrenden Notiz vor. Was möchten Sie "
 "verändern?"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:909
+#: ../src/calendar/gui/e-cal-dialogs.c:906
 msgid "This Instance Only"
 msgstr "Nur diese Instanz"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:913
+#: ../src/calendar/gui/e-cal-dialogs.c:910
 msgid "This and Prior Instances"
 msgstr "Diese und frühere Instanzen"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:919
+#: ../src/calendar/gui/e-cal-dialogs.c:916
 msgid "This and Future Instances"
 msgstr "Diese und zukünftige Instanzen"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:924
+#: ../src/calendar/gui/e-cal-dialogs.c:921
 msgid "All Instances"
 msgstr "Alle Instanzen"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:1174 ../src/calendar/gui/e-cal-dialogs.c:1256
+#: ../src/calendar/gui/e-cal-dialogs.c:1171 ../src/calendar/gui/e-cal-dialogs.c:1253
 msgid "Send my reminders with this event"
 msgstr "Meine Erinnerungen zusammen mit diesem Termin verschicken"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:1176 ../src/calendar/gui/e-cal-dialogs.c:1258
+#: ../src/calendar/gui/e-cal-dialogs.c:1173 ../src/calendar/gui/e-cal-dialogs.c:1255
 msgid "Notify new attendees _only"
 msgstr "_Nur neue Teilnehmer benachrichtigen"
 
-#: ../src/calendar/gui/e-calendar-view.c:464
+#: ../src/calendar/gui/e-calendar-view.c:478
 msgid "Cut selected events to the clipboard"
 msgstr "Die gewählten Termine in die Zwischenablage ausschneiden"
 
-#: ../src/calendar/gui/e-calendar-view.c:470
+#: ../src/calendar/gui/e-calendar-view.c:484
 msgid "Copy selected events to the clipboard"
 msgstr "Die gewählten Termine in die Zwischenablage kopieren"
 
-#: ../src/calendar/gui/e-calendar-view.c:476
+#: ../src/calendar/gui/e-calendar-view.c:490
 msgid "Paste events from the clipboard"
 msgstr "Die in der Zwischenablage befindlichen Termine einfügen"
 
-#: ../src/calendar/gui/e-calendar-view.c:482
+#: ../src/calendar/gui/e-calendar-view.c:496
 msgid "Delete selected events"
 msgstr "Die gewählten Termine löschen"
 
-#: ../src/calendar/gui/e-calendar-view.c:866
+#: ../src/calendar/gui/e-calendar-view.c:906
 msgid "Pasted text doesn’t contain valid iCalendar data"
 msgstr "Eingefügter Text enthält keine gültigen iCalendar-Daten"
 
-#: ../src/calendar/gui/e-calendar-view.c:877 ../src/calendar/gui/e-cal-ops.c:1556
+#: ../src/calendar/gui/e-calendar-view.c:917 ../src/calendar/gui/e-cal-ops.c:1555
 msgid "Default calendar not found"
 msgstr "Vorgegebener Benutzerkalender wurde nicht gefunden"
 
-#: ../src/calendar/gui/e-calendar-view.c:882 ../src/calendar/gui/e-cal-ops.c:1559
+#: ../src/calendar/gui/e-calendar-view.c:922 ../src/calendar/gui/e-cal-ops.c:1558
 msgid "Default memo list not found"
 msgstr "Vorgabenotizliste wurde nicht gefunden"
 
-#: ../src/calendar/gui/e-calendar-view.c:887 ../src/calendar/gui/e-cal-ops.c:1562
+#: ../src/calendar/gui/e-calendar-view.c:927 ../src/calendar/gui/e-cal-ops.c:1561
 msgid "Default task list not found"
 msgstr "Vorgabeaufgabenliste wurde nicht gefunden"
 
-#: ../src/calendar/gui/e-calendar-view.c:976
+#: ../src/calendar/gui/e-calendar-view.c:1019
 msgid "No suitable component found"
 msgstr "Keine passende Komponente gefunden"
 
-#: ../src/calendar/gui/e-calendar-view.c:1046
+#: ../src/calendar/gui/e-calendar-view.c:1089
 msgid "Pasting iCalendar data"
 msgstr "iCalendar-Daten einfügen"
 
@@ -6838,8 +7090,8 @@ msgstr "iCalendar-Daten einfügen"
 #. * "Organizer: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email ofuser com>"
-#: ../src/calendar/gui/e-calendar-view.c:1854 ../src/calendar/gui/e-memo-table.c:499
-#: ../src/calendar/gui/e-task-table.c:819
+#: ../src/calendar/gui/e-calendar-view.c:1889 ../src/calendar/gui/e-memo-table.c:572
+#: ../src/calendar/gui/e-task-table.c:736
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organisator: %s <%s>"
@@ -6847,33 +7099,43 @@ msgstr "Organisator: %s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../src/calendar/gui/e-calendar-view.c:1858 ../src/calendar/gui/e-memo-table.c:504
-#: ../src/calendar/gui/e-task-table.c:823
+#: ../src/calendar/gui/e-calendar-view.c:1892 ../src/calendar/gui/e-memo-table.c:577
+#: ../src/calendar/gui/e-task-table.c:740
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisator: %s"
 
 #. Translators: It will display "Location: PlaceOfTheMeeting"
 #. Translators: It will display "Location: LocationOfTheAppointment"
-#: ../src/calendar/gui/e-calendar-view.c:1874
+#: ../src/calendar/gui/e-calendar-view.c:1911
 #: ../src/calendar/gui/e-meeting-time-sel.c:2580
-#: ../src/calendar/gui/e-task-table.c:839 ../src/calendar/gui/e-to-do-pane.c:363
-#: ../src/calendar/gui/print.c:3545
+#: ../src/calendar/gui/e-task-table.c:758 ../src/calendar/gui/e-to-do-pane.c:377
+#: ../src/calendar/gui/print.c:3565
 #, c-format
 msgid "Location: %s"
 msgstr "Ort: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
 #. Translators: It will display "Time: StartDateAndTime (Duration)"
-#: ../src/calendar/gui/e-calendar-view.c:1914 ../src/calendar/gui/e-to-do-pane.c:460
+#: ../src/calendar/gui/e-calendar-view.c:1970 ../src/calendar/gui/e-to-do-pane.c:480
 #, c-format
 msgid "Time: %s %s"
 msgstr "Zeit: %s %s"
 
-#: ../src/calendar/gui/e-calendar-view.c:2309
-#: ../src/calendar/gui/e-calendar-view.c:2312
-#: ../src/calendar/gui/e-calendar-view.c:2315
-#: ../src/calendar/gui/e-calendar-view.c:2316
+#. Translators: the '%s' stands for a component summary, the '%d' for the years.
+#. The string is used for Birthday & Anniversary events where the first year is
+#. know, constructing a summary which also shows how many years the birthday or
+#. anniversary is for. Example: "Birthday: John Doe (13)"
+#: ../src/calendar/gui/e-calendar-view.c:2117
+#, c-format
+msgctxt "BirthdaySummary"
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#: ../src/calendar/gui/e-calendar-view.c:2318
+#: ../src/calendar/gui/e-calendar-view.c:2321
+#: ../src/calendar/gui/e-calendar-view.c:2324
+#: ../src/calendar/gui/e-calendar-view.c:2325
 msgid "%d %b %Y"
 msgstr "%d. %B %Y"
 
@@ -6882,13 +7144,13 @@ msgstr "%d. %B %Y"
 #. strftime format %d = day of month, %b = abbreviated
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../src/calendar/gui/e-calendar-view.c:2311 ../src/calendar/gui/e-day-view.c:3095
-#: ../src/calendar/gui/e-day-view-top-item.c:865
+#: ../src/calendar/gui/e-calendar-view.c:2320 ../src/calendar/gui/e-day-view.c:3079
+#: ../src/calendar/gui/e-day-view-top-item.c:858
 #: ../src/calendar/gui/e-week-view-main-item.c:228
 msgid "%d %b"
 msgstr "%d. %b"
 
-#: ../src/calendar/gui/e-calendar-view.c:2322
+#: ../src/calendar/gui/e-calendar-view.c:2331
 msgid "%A %d %b %Y"
 msgstr "%A, %d. %B %Y"
 
@@ -6898,15 +7160,15 @@ msgstr "%A, %d. %B %Y"
 #. * %d = day of month, %b = abbreviated month name.
 #. * You can change the order but don't change the
 #. * specifiers or add anything.
-#: ../src/calendar/gui/e-calendar-view.c:2324 ../src/calendar/gui/e-day-view.c:3079
-#: ../src/calendar/gui/e-day-view-top-item.c:861
+#: ../src/calendar/gui/e-calendar-view.c:2333 ../src/calendar/gui/e-day-view.c:3063
+#: ../src/calendar/gui/e-day-view-top-item.c:854
 #: ../src/calendar/gui/e-week-view-main-item.c:214
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
 
-#: ../src/calendar/gui/e-calendar-view.c:2325
-#: ../src/calendar/gui/e-calendar-view.c:2327
-#: ../src/calendar/gui/e-calendar-view.c:2328
+#: ../src/calendar/gui/e-calendar-view.c:2334
+#: ../src/calendar/gui/e-calendar-view.c:2336
+#: ../src/calendar/gui/e-calendar-view.c:2337
 msgid "%a %d %b %Y"
 msgstr "%a, %d. %Y"
 
@@ -6922,7 +7184,7 @@ msgstr "Enddatum"
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:7
 #: ../src/calendar/gui/e-memo-table.etspec.h:6
 #: ../src/calendar/gui/e-task-table.etspec.h:14
-#: ../src/plugins/save-calendar/csv-format.c:378
+#: ../src/plugins/save-calendar/csv-format.c:367
 msgid "Created"
 msgstr "Angelegt"
 
@@ -6939,125 +7201,132 @@ msgstr "Zuletzt geändert"
 msgid "Source"
 msgstr "Quelle"
 
-#: ../src/calendar/gui/e-cal-model.c:316
+#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
+#. * Status: Accepted: X   Declined: Y   ...
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:10
+#: ../src/calendar/gui/e-cal-model.c:3846
+#: ../src/calendar/gui/e-meeting-list-view.c:693
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:9
+#: ../src/calendar/gui/e-memo-table.etspec.h:9
+#: ../src/calendar/gui/e-task-table.etspec.h:11
+#: ../src/calendar/gui/tasktypes.xml.in.h:8 ../src/mail/filtertypes.xml.in.h:36
+#: ../src/mail/message-list.etspec.h:1 ../src/mail/searchtypes.xml.in.h:38
+#: ../src/mail/vfoldertypes.xml.in.h:38
+msgid "Status"
+msgstr "Status"
+
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:11
+#: ../src/calendar/gui/e-meeting-list-view.c:650
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:4
+#: ../src/calendar/gui/e-memo-table.etspec.h:3
+#: ../src/calendar/gui/e-task-table.etspec.h:3 ../src/e-util/e-accounts-window.c:1443
+#: ../src/e-util/e-attachment-tree-view.c:205
+#: ../src/e-util/e-collection-account-wizard.c:1971
+#: ../src/e-util/e-webdav-browser.c:2390 ../src/mail/e-mail-account-tree-view.c:158
+msgid "Type"
+msgstr "Art"
+
+#: ../src/calendar/gui/e-cal-model.c:310
 #: ../src/calendar/gui/e-meeting-list-view.c:183
 #: ../src/calendar/gui/e-meeting-list-view.c:197
 #: ../src/calendar/gui/e-meeting-store.c:135
 #: ../src/calendar/gui/e-meeting-store.c:170
-#: ../src/calendar/gui/e-meeting-store.c:233 ../src/calendar/gui/print.c:1256
-#: ../src/calendar/gui/print.c:1273 ../src/e-util/e-charset.c:49
-#: ../src/modules/itip-formatter/itip-view.c:3587
-#: ../src/modules/itip-formatter/itip-view.c:6409
+#: ../src/calendar/gui/e-meeting-store.c:215 ../src/calendar/gui/print.c:1257
+#: ../src/calendar/gui/print.c:1274 ../src/e-util/e-charset.c:49
+#: ../src/modules/itip-formatter/itip-view.c:3640
+#: ../src/modules/itip-formatter/itip-view.c:6686
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:97
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../src/calendar/gui/e-cal-model.c:1417 ../src/calendar/gui/e-cal-ops.c:614
-#: ../src/calendar/gui/e-cal-ops.c:1250
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:435
+#: ../src/calendar/gui/e-cal-model.c:1369 ../src/calendar/gui/e-cal-ops.c:609
+#: ../src/calendar/gui/e-cal-ops.c:1246
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:378
 #, c-format
 msgid "Source with UID “%s” not found"
 msgstr "Quelle mit UID »%s« wurde nicht gefunden"
 
-#: ../src/calendar/gui/e-cal-model.c:1522 ../src/calendar/gui/e-cal-ops.c:186
-#: ../src/calendar/gui/e-cal-ops.c:1367
+#: ../src/calendar/gui/e-cal-model.c:1480 ../src/calendar/gui/e-cal-ops.c:185
+#: ../src/calendar/gui/e-cal-ops.c:1363
 msgid "Creating an event"
 msgstr "Termin anlegen"
 
-#: ../src/calendar/gui/e-cal-model.c:1526 ../src/calendar/gui/e-cal-ops.c:190
-#: ../src/calendar/gui/e-cal-ops.c:1371
+#: ../src/calendar/gui/e-cal-model.c:1484 ../src/calendar/gui/e-cal-ops.c:189
+#: ../src/calendar/gui/e-cal-ops.c:1367
 msgid "Creating a memo"
 msgstr "Notiz anlegen"
 
-#: ../src/calendar/gui/e-cal-model.c:1530 ../src/calendar/gui/e-cal-ops.c:194
-#: ../src/calendar/gui/e-cal-ops.c:1375
+#: ../src/calendar/gui/e-cal-model.c:1488 ../src/calendar/gui/e-cal-ops.c:193
+#: ../src/calendar/gui/e-cal-ops.c:1371
 msgid "Creating a task"
 msgstr "Aufgabe anlegen"
 
-#: ../src/calendar/gui/e-cal-model.c:1913
+#: ../src/calendar/gui/e-cal-model.c:1874
 msgid "Recurring"
 msgstr "Wiederkehrend"
 
-#: ../src/calendar/gui/e-cal-model.c:1915
+#: ../src/calendar/gui/e-cal-model.c:1876
 msgid "Assigned"
 msgstr "Zugewiesen"
 
-#: ../src/calendar/gui/e-cal-model.c:1918
-#: ../src/calendar/gui/e-cal-model-tasks.c:1144
-#: ../src/calendar/gui/e-meeting-list-view.c:207
-#: ../src/calendar/gui/e-meeting-store.c:177
-#: ../src/calendar/gui/e-meeting-store.c:187
-#: ../src/calendar/gui/e-meeting-store.c:1098
+#: ../src/calendar/gui/e-cal-model.c:1879
+#: ../src/calendar/gui/e-cal-model-tasks.c:1096
 msgid "Yes"
 msgstr "Ja"
 
-#: ../src/calendar/gui/e-cal-model.c:1918
-#: ../src/calendar/gui/e-cal-model-tasks.c:1144
-#: ../src/calendar/gui/e-meeting-list-view.c:208
-#: ../src/calendar/gui/e-meeting-store.c:189
+#: ../src/calendar/gui/e-cal-model.c:1879
+#: ../src/calendar/gui/e-cal-model-tasks.c:1096
 msgid "No"
 msgstr "Nein"
 
-#: ../src/calendar/gui/e-cal-model.c:3822
-#: ../src/calendar/gui/e-meeting-list-view.c:219
-#: ../src/calendar/gui/e-meeting-store.c:197
-#: ../src/calendar/gui/e-meeting-store.c:220
-#: ../src/modules/itip-formatter/itip-view.c:6397
+#: ../src/calendar/gui/e-cal-model.c:3787
+#: ../src/calendar/gui/e-meeting-list-view.c:208
+#: ../src/calendar/gui/e-meeting-store.c:179
+#: ../src/calendar/gui/e-meeting-store.c:202
+#: ../src/modules/itip-formatter/itip-view.c:6674
 msgid "Accepted"
 msgstr "Angenommen"
 
-#: ../src/calendar/gui/e-cal-model.c:3823
-#: ../src/calendar/gui/e-meeting-list-view.c:220
-#: ../src/calendar/gui/e-meeting-store.c:199
-#: ../src/calendar/gui/e-meeting-store.c:222
-#: ../src/modules/itip-formatter/itip-view.c:6403
+#: ../src/calendar/gui/e-cal-model.c:3788
+#: ../src/calendar/gui/e-meeting-list-view.c:209
+#: ../src/calendar/gui/e-meeting-store.c:181
+#: ../src/calendar/gui/e-meeting-store.c:204
+#: ../src/modules/itip-formatter/itip-view.c:6680
 msgid "Declined"
 msgstr "Abgelehnt"
 
-#: ../src/calendar/gui/e-cal-model.c:3824
-#: ../src/calendar/gui/e-meeting-list-view.c:221
-#: ../src/calendar/gui/e-meeting-store.c:201
-#: ../src/calendar/gui/e-meeting-store.c:224
+#: ../src/calendar/gui/e-cal-model.c:3789
+#: ../src/calendar/gui/e-meeting-list-view.c:210
+#: ../src/calendar/gui/e-meeting-store.c:183
+#: ../src/calendar/gui/e-meeting-store.c:206
 #: ../src/calendar/gui/e-meeting-time-sel.c:523
 msgid "Tentative"
 msgstr "Vorläufig"
 
-#: ../src/calendar/gui/e-cal-model.c:3825
-#: ../src/calendar/gui/e-meeting-list-view.c:222
-#: ../src/calendar/gui/e-meeting-store.c:203
-#: ../src/calendar/gui/e-meeting-store.c:226
-#: ../src/modules/itip-formatter/itip-view.c:6406
+#: ../src/calendar/gui/e-cal-model.c:3790
+#: ../src/calendar/gui/e-meeting-list-view.c:211
+#: ../src/calendar/gui/e-meeting-store.c:185
+#: ../src/calendar/gui/e-meeting-store.c:208
+#: ../src/modules/itip-formatter/itip-view.c:6683
 msgid "Delegated"
 msgstr "Delegiert"
 
-#: ../src/calendar/gui/e-cal-model.c:3826
+#: ../src/calendar/gui/e-cal-model.c:3791
 msgid "Needs action"
 msgstr "Erfordert Maßnahme"
 
-#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
-#. * Status: Accepted: X   Declined: Y   ...
-#: ../src/calendar/gui/e-cal-model.c:3881
-#: ../src/calendar/gui/e-meeting-list-view.c:700
-#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../src/calendar/gui/e-task-table.etspec.h:11
-#: ../src/calendar/gui/tasktypes.xml.in.h:8 ../src/mail/filtertypes.xml.in.h:36
-#: ../src/mail/message-list.etspec.h:1 ../src/mail/searchtypes.xml.in.h:38
-#: ../src/mail/vfoldertypes.xml.in.h:38
-msgid "Status"
-msgstr "Status"
-
-#: ../src/calendar/gui/e-cal-model-calendar.c:144
-#: ../src/calendar/gui/e-task-table.c:607
+#: ../src/calendar/gui/e-cal-model-calendar.c:91
+#: ../src/calendar/gui/e-task-table.c:529
 msgid "Free"
 msgstr "Frei"
 
-#: ../src/calendar/gui/e-cal-model-calendar.c:147
+#: ../src/calendar/gui/e-cal-model-calendar.c:94
 #: ../src/calendar/gui/e-meeting-time-sel.c:524
-#: ../src/calendar/gui/e-task-table.c:608
+#: ../src/calendar/gui/e-task-table.c:530
 msgid "Busy"
 msgstr "Beschäftigt"
 
-#: ../src/calendar/gui/e-cal-model-tasks.c:466
+#: ../src/calendar/gui/e-cal-model-tasks.c:456
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7067,11 +7336,9 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#. Translators: "None" for task's status
-#: ../src/calendar/gui/e-cal-model-tasks.c:518
-msgctxt "cal-task-status"
-msgid "None"
-msgstr "Keine"
+#: ../src/calendar/gui/e-cal-model-tasks.c:553
+msgid "In Progress"
+msgstr "In Bearbeitung"
 
 #: ../src/calendar/gui/e-cal-ops.c:305
 msgid "Modifying an event"
@@ -7085,154 +7352,154 @@ msgstr "Eine Notiz verändern"
 msgid "Modifying a task"
 msgstr "Eine Aufgabe verändern"
 
-#: ../src/calendar/gui/e-cal-ops.c:412 ../src/calendar/gui/e-to-do-pane.c:1954
+#: ../src/calendar/gui/e-cal-ops.c:411 ../src/calendar/gui/e-to-do-pane.c:2074
 msgid "Removing an event"
 msgstr "Einen Termin entfernen"
 
-#: ../src/calendar/gui/e-cal-ops.c:416 ../src/calendar/gui/e-to-do-pane.c:1958
+#: ../src/calendar/gui/e-cal-ops.c:415 ../src/calendar/gui/e-to-do-pane.c:2078
 msgid "Removing a memo"
 msgstr "Eine Notiz entfernen"
 
-#: ../src/calendar/gui/e-cal-ops.c:420 ../src/calendar/gui/e-to-do-pane.c:1962
+#: ../src/calendar/gui/e-cal-ops.c:419 ../src/calendar/gui/e-to-do-pane.c:2082
 msgid "Removing a task"
 msgstr "Eine Aufgabe entfernen"
 
-#: ../src/calendar/gui/e-cal-ops.c:511
+#: ../src/calendar/gui/e-cal-ops.c:507
 #, c-format
 msgid "Deleting an event"
 msgid_plural "Deleting %d events"
 msgstr[0] "Ein Termin wird gelöscht"
 msgstr[1] "%d Termine werden gelöscht"
 
-#: ../src/calendar/gui/e-cal-ops.c:515
+#: ../src/calendar/gui/e-cal-ops.c:511
 #, c-format
 msgid "Deleting a memo"
 msgid_plural "Deleting %d memos"
 msgstr[0] "Eine Notiz löschen"
 msgstr[1] "%d Notizen löschen"
 
-#: ../src/calendar/gui/e-cal-ops.c:519
+#: ../src/calendar/gui/e-cal-ops.c:515
 #, c-format
 msgid "Deleting a task"
 msgid_plural "Deleting %d tasks"
 msgstr[0] "Eine Aufgabe löschen"
 msgstr[1] "%d Aufgaben löschen"
 
-#: ../src/calendar/gui/e-cal-ops.c:722
+#: ../src/calendar/gui/e-cal-ops.c:721
 #, c-format
 msgid "Pasting an event"
 msgid_plural "Pasting %d events"
 msgstr[0] "Ein Termin wird eingefügt"
 msgstr[1] "%d Termine werden eingefügt"
 
-#: ../src/calendar/gui/e-cal-ops.c:737
+#: ../src/calendar/gui/e-cal-ops.c:736
 #, c-format
 msgid "Pasting a memo"
 msgid_plural "Pasting %d memos"
 msgstr[0] "Eine Notiz einfügen"
 msgstr[1] "%d Notizen einfügen"
 
-#: ../src/calendar/gui/e-cal-ops.c:752
+#: ../src/calendar/gui/e-cal-ops.c:751
 #, c-format
 msgid "Pasting a task"
 msgid_plural "Pasting %d tasks"
 msgstr[0] "Eine Aufgabe einfügen"
 msgstr[1] "%d Aufgaben einfügen"
 
-#: ../src/calendar/gui/e-cal-ops.c:851
+#: ../src/calendar/gui/e-cal-ops.c:847
 msgid "Updating an event"
 msgstr "Ein Termin wird aktualisiert"
 
-#: ../src/calendar/gui/e-cal-ops.c:855
+#: ../src/calendar/gui/e-cal-ops.c:851
 msgid "Updating a memo"
 msgstr "Eine Notiz aktualisieren"
 
-#: ../src/calendar/gui/e-cal-ops.c:859
+#: ../src/calendar/gui/e-cal-ops.c:855
 msgid "Updating a task"
 msgstr "Eine Aufgabe aktualisieren"
 
-#: ../src/calendar/gui/e-cal-ops.c:967
+#: ../src/calendar/gui/e-cal-ops.c:968
 #, c-format
 msgid "Getting events to purge in the calendar “%s”"
 msgstr "Termine werden gesammelt, um sie aus dem Kalender »%s« zu entfernen"
 
-#: ../src/calendar/gui/e-cal-ops.c:971
+#: ../src/calendar/gui/e-cal-ops.c:972
 #, c-format
 msgid "Getting memos to purge in the memo list “%s”"
 msgstr "Notizen werden gesammelt, um sie aus der Notizliste »%s« zu entfernen"
 
-#: ../src/calendar/gui/e-cal-ops.c:975
+#: ../src/calendar/gui/e-cal-ops.c:976
 #, c-format
 msgid "Getting tasks to purge in the task list “%s”"
 msgstr "Aufgaben werden gesammelt, um sie aus der Aufgabenliste »%s« zu entfernen"
 
-#: ../src/calendar/gui/e-cal-ops.c:1001
+#: ../src/calendar/gui/e-cal-ops.c:1002
 #, c-format
 msgid "Purging events in the calendar “%s”"
 msgstr "Termine werden aus dem Kalender »%s« entfernt"
 
-#: ../src/calendar/gui/e-cal-ops.c:1005
+#: ../src/calendar/gui/e-cal-ops.c:1006
 #, c-format
 msgid "Purging memos in the memo list “%s”"
 msgstr "Notizen werden aus der Notizliste »%s« entfernt"
 
-#: ../src/calendar/gui/e-cal-ops.c:1009
+#: ../src/calendar/gui/e-cal-ops.c:1010
 #, c-format
 msgid "Purging tasks in the task list “%s”"
 msgstr "Aufgaben werden aus der Aufgabenliste »%s« entfernt"
 
-#: ../src/calendar/gui/e-cal-ops.c:1109
+#: ../src/calendar/gui/e-cal-ops.c:1105
 msgid "Purging events"
 msgstr "Termine werden entfernt"
 
-#: ../src/calendar/gui/e-cal-ops.c:1113
+#: ../src/calendar/gui/e-cal-ops.c:1109
 msgid "Purging memos"
 msgstr "Notizen entfernen"
 
-#: ../src/calendar/gui/e-cal-ops.c:1117
+#: ../src/calendar/gui/e-cal-ops.c:1113
 msgid "Purging tasks"
 msgstr "Aufgaben entfernen"
 
-#: ../src/calendar/gui/e-cal-ops.c:1219
+#: ../src/calendar/gui/e-cal-ops.c:1215
 msgid "Expunging completed tasks"
 msgstr "Erledigte Aufgaben entfernen"
 
-#: ../src/calendar/gui/e-cal-ops.c:2060
+#: ../src/calendar/gui/e-cal-ops.c:2057
 #, c-format
 msgid "Moving an event"
 msgid_plural "Moving %d events"
 msgstr[0] "Ein Termin wird verschoben"
 msgstr[1] "%d Termine werden verschoben"
 
-#: ../src/calendar/gui/e-cal-ops.c:2061
+#: ../src/calendar/gui/e-cal-ops.c:2058
 #, c-format
 msgid "Copying an event"
 msgid_plural "Copying %d events"
 msgstr[0] "Ein Termin wird kopiert"
 msgstr[1] "%d Termine werden kopiert"
 
-#: ../src/calendar/gui/e-cal-ops.c:2067
+#: ../src/calendar/gui/e-cal-ops.c:2064
 #, c-format
 msgid "Moving a memo"
 msgid_plural "Moving %d memos"
 msgstr[0] "Eine Notiz wird verschoben"
 msgstr[1] "%d Notizen werden verschoben"
 
-#: ../src/calendar/gui/e-cal-ops.c:2068
+#: ../src/calendar/gui/e-cal-ops.c:2065
 #, c-format
 msgid "Copying a memo"
 msgid_plural "Copying %d memos"
 msgstr[0] "Eine Notiz wird kopiert"
 msgstr[1] "%d Notizen werden kopieren"
 
-#: ../src/calendar/gui/e-cal-ops.c:2074
+#: ../src/calendar/gui/e-cal-ops.c:2071
 #, c-format
 msgid "Moving a task"
 msgid_plural "Moving %d tasks"
 msgstr[0] "Eine Aufgabe wird verschoben"
 msgstr[1] "%d Aufgaben werden verschoben"
 
-#: ../src/calendar/gui/e-cal-ops.c:2075
+#: ../src/calendar/gui/e-cal-ops.c:2072
 #, c-format
 msgid "Copying a task"
 msgid_plural "Copying %d tasks"
@@ -7240,16 +7507,16 @@ msgstr[0] "Eine Aufgabe wird kopiert"
 msgstr[1] "%d Aufgaben werden kopieren"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../src/calendar/gui/e-cell-date-edit-text.c:163
+#: ../src/calendar/gui/e-cell-date-edit-text.c:177
 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.
-#: ../src/calendar/gui/e-cell-date-edit-text.c:166
+#: ../src/calendar/gui/e-cell-date-edit-text.c:180
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
-#: ../src/calendar/gui/e-cell-date-edit-text.c:174
+#: ../src/calendar/gui/e-cell-date-edit-text.c:188
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7262,42 +7529,42 @@ msgstr ""
 msgid "Event’s time is in the past"
 msgstr "Zeitpunkt des Termins liegt in der Vergangenheit"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:206
+#: ../src/calendar/gui/e-comp-editor-event.c:208
 msgid "Event cannot be edited, because the selected calendar could not be opened"
 msgstr ""
 "Der Termin kann nicht bearbeitet werden, weil der gewählte Kalender nicht geöffnet "
 "werden konnte"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:208
+#: ../src/calendar/gui/e-comp-editor-event.c:210
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr ""
 "Der Termin kann nicht bearbeitet werden, weil der gewählte Kalender nur gelesen "
 "werden darf"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:210
+#: ../src/calendar/gui/e-comp-editor-event.c:212
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr ""
 "Der Termin kann nicht vollständig bearbeitet werden, weil Sie nicht der "
 "Organisator sind"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:460
-#: ../src/calendar/gui/e-comp-editor-task.c:546
+#: ../src/calendar/gui/e-comp-editor-event.c:492
+#: ../src/calendar/gui/e-comp-editor-task.c:591
 msgid "Start date is not a valid date"
 msgstr "Das Anfangsdatum ist ungültig"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:462
+#: ../src/calendar/gui/e-comp-editor-event.c:494
 msgid "Start time is not a valid time"
 msgstr "Die Anfangszeit ist ungültig"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:466
-#: ../src/calendar/gui/e-comp-editor-event.c:482
+#: ../src/calendar/gui/e-comp-editor-event.c:498
+#: ../src/calendar/gui/e-comp-editor-event.c:514
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:206
-#: ../src/calendar/gui/e-comp-editor.c:337
-#: ../src/em-format/e-mail-part-secure-button.c:93 ../src/e-util/e-misc-utils.c:4218
-#: ../src/e-util/e-misc-utils.c:4230 ../src/e-util/e-misc-utils.c:4244
-#: ../src/mail/e-mail-autoconfig.c:1029 ../src/mail/e-mail-display.c:2292
-#: ../src/mail/e-mail-reader-utils.c:805 ../src/mail/em-composer-utils.c:3969
-#: ../src/mail/em-composer-utils.c:4000 ../src/mail/mail-send-recv.c:598
+#: ../src/calendar/gui/e-comp-editor.c:338
+#: ../src/em-format/e-mail-part-secure-button.c:93 ../src/e-util/e-misc-utils.c:4257
+#: ../src/e-util/e-misc-utils.c:4269 ../src/e-util/e-misc-utils.c:4283
+#: ../src/mail/e-mail-autoconfig.c:1029 ../src/mail/e-mail-display.c:2295
+#: ../src/mail/e-mail-reader-utils.c:805 ../src/mail/em-composer-utils.c:3841
+#: ../src/mail/em-composer-utils.c:3872 ../src/mail/mail-send-recv.c:598
 #: ../src/mail/mail-send-recv.c:1496
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:172
 #: ../src/plugins/face/face.c:175 ../src/shell/e-shell.c:1235
@@ -7306,128 +7573,128 @@ msgstr "Die Anfangszeit ist ungültig"
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:476
+#: ../src/calendar/gui/e-comp-editor-event.c:508
 msgid "End date is not a valid date"
 msgstr "Das Enddatum ist ungültig"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:478
+#: ../src/calendar/gui/e-comp-editor-event.c:510
 msgid "End time is not a valid time"
 msgstr "Die Endzeit ist ungültig"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:677
+#: ../src/calendar/gui/e-comp-editor-event.c:712
 #: ../src/calendar/gui/e-comp-editor-memo.c:134
-#: ../src/calendar/gui/e-comp-editor-task.c:651
+#: ../src/calendar/gui/e-comp-editor-task.c:704
 msgid "_Categories"
 msgstr "_Kategorien"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:679
+#: ../src/calendar/gui/e-comp-editor-event.c:714
 #: ../src/calendar/gui/e-comp-editor-memo.c:136
-#: ../src/calendar/gui/e-comp-editor-task.c:653
+#: ../src/calendar/gui/e-comp-editor-task.c:706
 msgid "Toggles whether to display categories"
 msgstr "Kategorien anzeigen/verbergen"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:685
-#: ../src/calendar/gui/e-comp-editor-task.c:659
+#: ../src/calendar/gui/e-comp-editor-event.c:720
+#: ../src/calendar/gui/e-comp-editor-task.c:712
 msgid "Time _Zone"
 msgstr "Zeit_zone"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:687
-#: ../src/calendar/gui/e-comp-editor-task.c:661
+#: ../src/calendar/gui/e-comp-editor-event.c:722
+#: ../src/calendar/gui/e-comp-editor-task.c:714
 msgid "Toggles whether the time zone is displayed"
 msgstr "Zeitzone anzeigen/verbergen"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:693
+#: ../src/calendar/gui/e-comp-editor-event.c:728
 msgid "All _Day Event"
 msgstr "_Ganztägiger Termin"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:695
+#: ../src/calendar/gui/e-comp-editor-event.c:730
 msgid "Toggles whether to have All Day Event"
 msgstr "Festlegen, ob es ein ganztägiger Termin ist"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:701
+#: ../src/calendar/gui/e-comp-editor-event.c:736
 msgid "Show Time as _Busy"
 msgstr "Zeit als b_eschäftigt anzeigen"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:703
+#: ../src/calendar/gui/e-comp-editor-event.c:738
 msgid "Toggles whether to show time as busy"
 msgstr "Festlegen, ob die Zeit als beschäftigt angezeigt wird"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:712
+#: ../src/calendar/gui/e-comp-editor-event.c:747
 msgid "Pu_blic"
 msgstr "Ö_ffentlich"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:714
+#: ../src/calendar/gui/e-comp-editor-event.c:749
 msgid "Classify as public"
 msgstr "Als öffentlich einstufen"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:719
+#: ../src/calendar/gui/e-comp-editor-event.c:754
 msgid "_Private"
 msgstr "_Privat"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:721
+#: ../src/calendar/gui/e-comp-editor-event.c:756
 msgid "Classify as private"
 msgstr "Als privat einstufen"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:726
+#: ../src/calendar/gui/e-comp-editor-event.c:761
 msgid "_Confidential"
 msgstr "Ver_traulich"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:728
+#: ../src/calendar/gui/e-comp-editor-event.c:763
 msgid "Classify as confidential"
 msgstr "Als vertraulich einstufen"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:846
+#: ../src/calendar/gui/e-comp-editor-event.c:881
 msgctxt "ECompEditor"
 msgid "_Start time:"
 msgstr "_Anfangszeit:"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:851
+#: ../src/calendar/gui/e-comp-editor-event.c:886
 msgctxt "ECompEditor"
 msgid "_End time:"
 msgstr "_Endzeit:"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:861
+#: ../src/calendar/gui/e-comp-editor-event.c:896
 msgctxt "ECompEditor"
 msgid "All da_y event"
 msgstr "_Ganztägiger Termin"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:919
-#: ../src/calendar/gui/e-comp-editor-memo.c:222
-#: ../src/calendar/gui/e-comp-editor-task.c:829
+#: ../src/calendar/gui/e-comp-editor-event.c:964
+#: ../src/calendar/gui/e-comp-editor-memo.c:232
+#: ../src/calendar/gui/e-comp-editor-task.c:882
 msgctxt "ECompEditorPage"
 msgid "General"
 msgstr "Allgemein"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:922
-#: ../src/calendar/gui/e-comp-editor-task.c:852
+#: ../src/calendar/gui/e-comp-editor-event.c:967
+#: ../src/calendar/gui/e-comp-editor-task.c:905
 msgctxt "ECompEditorPage"
 msgid "Reminders"
 msgstr "Erinnerungen"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:925
-#: ../src/calendar/gui/e-comp-editor-task.c:856
+#: ../src/calendar/gui/e-comp-editor-event.c:970
+#: ../src/calendar/gui/e-comp-editor-task.c:909
 msgctxt "ECompEditorPage"
 msgid "Recurrence"
 msgstr "Wiederholung"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:928
-#: ../src/calendar/gui/e-comp-editor-memo.c:225
-#: ../src/calendar/gui/e-comp-editor-task.c:860
+#: ../src/calendar/gui/e-comp-editor-event.c:973
+#: ../src/calendar/gui/e-comp-editor-memo.c:235
+#: ../src/calendar/gui/e-comp-editor-task.c:913
 msgctxt "ECompEditorPage"
 msgid "Attachments"
 msgstr "Anlagen"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:938
+#: ../src/calendar/gui/e-comp-editor-event.c:983
 msgctxt "ECompEditorPage"
 msgid "Schedule"
 msgstr "Terminplanung"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:973
+#: ../src/calendar/gui/e-comp-editor-event.c:1018
 #, c-format
 msgid "Meeting — %s"
 msgstr "Besprechung – %s"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:974
+#: ../src/calendar/gui/e-comp-editor-event.c:1019
 #, c-format
 msgid "Appointment — %s"
 msgstr "Termin – %s"
@@ -7451,22 +7718,22 @@ msgstr ""
 "sind"
 
 #: ../src/calendar/gui/e-comp-editor-memo.c:196
-#: ../src/calendar/gui/e-comp-editor-task.c:760
+#: ../src/calendar/gui/e-comp-editor-task.c:813
 msgid "_List:"
 msgstr "_Liste:"
 
 #: ../src/calendar/gui/e-comp-editor-memo.c:203
-#: ../src/calendar/gui/e-comp-editor-task.c:770
+#: ../src/calendar/gui/e-comp-editor-task.c:823
 msgctxt "ECompEditor"
 msgid "Sta_rt date:"
 msgstr "_Anfangsdatum:"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:256
+#: ../src/calendar/gui/e-comp-editor-memo.c:266
 #, c-format
 msgid "Assigned Memo — %s"
 msgstr "Zugewiesene Notiz – %s"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:257
+#: ../src/calendar/gui/e-comp-editor-memo.c:267
 #, c-format
 msgid "Memo — %s"
 msgstr "Notiz – %s"
@@ -7494,7 +7761,7 @@ msgstr "»%s« konnte nicht geladen werden"
 msgid "Could not load the attachment"
 msgstr "Die Anlage konnte nicht geladen werden"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:422
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:416
 msgid ""
 "Some attachments are still being downloaded. Please wait until the download is "
 "finished."
@@ -7502,170 +7769,170 @@ msgstr ""
 "Einige Anlagen werden zurzeit noch heruntergeladen. Bitte warten Sie, bis der "
 "Download beendet ist."
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:452
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:443
 #, c-format
 msgid "Attachment “%s” cannot be found, remove it from the list, please"
 msgstr ""
 "Der Anhang »%s« kann nicht gefunden werden, bitte entfernen Sie ihn aus der Liste"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:469
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:460
 #, c-format
 msgid "Attachment “%s” doesn’t have valid URI, remove it from the list, please"
 msgstr ""
 "Der Anhang »%s« hat keine gültige Adresse, bitte entfernen Sie ihn aus der Liste"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:647
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:633
 #: ../src/composer/e-composer-actions.c:312
-msgid "_Attachment..."
+msgid "_Attachment…"
 msgstr "_Anlage …"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:649
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:635
 #: ../src/composer/e-composer-actions.c:314 ../src/e-util/e-attachment-view.c:343
 msgid "Attach a file"
 msgstr "Eine Datei beilegen"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:656
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:642
 msgid "_Attachments"
 msgstr "_Anlagen"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:658
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:644
 msgid "Show attachments"
 msgstr "Anlagen anzeigen"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:811
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:797
 #: ../src/e-util/e-attachment-bar.c:764 ../src/e-util/e-attachment-paned.c:725
 msgid "Icon View"
 msgstr "Symbolansicht"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:813
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:799
 #: ../src/e-util/e-attachment-bar.c:766 ../src/e-util/e-attachment-paned.c:727
 msgid "List View"
 msgstr "Listenansicht"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:387
+#: ../src/calendar/gui/e-comp-editor-page-general.c:392
 #, c-format
 msgid "Cannot find attendee “%s” in the list of attendees"
 msgstr "Teilnehmer »%s« konnte in der Teilnehmerliste nicht gefunden werden"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:394
+#: ../src/calendar/gui/e-comp-editor-page-general.c:399
 #, c-format
 msgid "Not enough rights to delete attendee “%s”"
 msgstr "Nicht genügend Rechte, um Teilnehmer »%s« zu entfernen"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:424
+#: ../src/calendar/gui/e-comp-editor-page-general.c:429
 msgid "Failed to delete selected attendee"
 msgid_plural "Failed to delete selected attendees"
 msgstr[0] "Ausgewählter Teilnehmer konnte nicht gelöscht werden"
 msgstr[1] "Ausgewählte Teilnehmer konnten nicht gelöscht werden"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:510
+#: ../src/calendar/gui/e-comp-editor-page-general.c:543
 msgid "Organizer address is not a valid user mail address"
 msgstr "E-Mail-Adresse des Veranstalters ist ungültig"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:675
+#: ../src/calendar/gui/e-comp-editor-page-general.c:712
 msgid "A_ttendees"
 msgstr "_Teilnehmer"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:677
+#: ../src/calendar/gui/e-comp-editor-page-general.c:714
 msgid "Toggles whether the Attendees are displayed"
 msgstr "Feld für die Teilnehmer anzeigen/verbergen"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:686
+#: ../src/calendar/gui/e-comp-editor-page-general.c:723
 msgid "R_ole Field"
 msgstr "_Positions-Feld"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:688
+#: ../src/calendar/gui/e-comp-editor-page-general.c:725
 msgid "Toggles whether the Role field is displayed"
 msgstr "Feld für die Position anzeigen/verbergen"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:694
+#: ../src/calendar/gui/e-comp-editor-page-general.c:731
 msgid "_RSVP"
 msgstr "_UAwg"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:696
+#: ../src/calendar/gui/e-comp-editor-page-general.c:733
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "UAwg-Feld anzeigen/verbergen"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:702
+#: ../src/calendar/gui/e-comp-editor-page-general.c:739
 msgid "_Status Field"
 msgstr "_Statusfeld"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:704
+#: ../src/calendar/gui/e-comp-editor-page-general.c:741
 msgid "Toggles whether the Status field is displayed"
 msgstr "Statusfeld anzeigen/verbergen"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:710
+#: ../src/calendar/gui/e-comp-editor-page-general.c:747
 msgid "_Type Field"
 msgstr "A_rt-Feld"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:712
+#: ../src/calendar/gui/e-comp-editor-page-general.c:749
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Feld für die Teilnehmerart anzeigen/verbergen"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1058
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1064
 msgid "An organizer is required."
 msgstr "Es ist ein Organisator erforderlich."
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1068
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1199
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1074
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1216
 msgid "At least one attendee is required."
 msgstr "Es ist mindestens ein Teilnehmer erforderlich."
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1323
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1340
 msgid "Or_ganizer:"
 msgstr "Or_ganisator:"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1420
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1435
 msgid "Override color of the event. If not set, then color of the calendar is used."
 msgstr ""
 "Farbe des Ereignisses überschreiben. Wenn nichts festgelegt wird, dann wird die "
 "Farbe des Kalenders verwendet."
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1422
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1437
 msgid "Override color of the memo. If not set, then color of the memo list is used."
 msgstr ""
 "Farbe der Notiz überschreiben. Wenn nichts festgelegt wird, dann wird die Farbe "
 "der Notizliste verwendet."
 
 #. E_SOURCE_EXTENSION_TASK_LIST
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1424
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1439
 msgid "Override color of the task. If not set, then color of the task list is used."
 msgstr ""
 "Farbe der Aufgabe überschreiben. Wenn nichts festgelegt wird, dann wird die Farbe "
 "der Aufgabenliste verwendet."
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1436
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1450
 msgctxt "ECompEditor"
-msgid "Atte_ndees..."
+msgid "Atte_ndees…"
 msgstr "Teil_nehmer …"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1513
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2231
-#: ../src/calendar/gui/e-comp-editor.c:2070 ../src/e-util/e-accounts-window.c:1745
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1533
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2285
+#: ../src/calendar/gui/e-comp-editor.c:2113 ../src/e-util/e-accounts-window.c:1745
 #: ../src/e-util/e-html-editor-actions.c:954
-#: ../src/e-util/e-mail-signature-manager.c:358 ../src/e-util/e-webdav-browser.c:2681
-#: ../src/e-util/filter.ui.h:26 ../src/mail/e-mail-account-manager.c:728
+#: ../src/e-util/e-mail-signature-manager.c:358 ../src/e-util/e-webdav-browser.c:2690
+#: ../src/e-util/filter.ui.h:26 ../src/mail/e-mail-account-manager.c:730
 #: ../src/mail/e-mail-browser.c:195 ../src/mail/e-mail-label-manager.c:380
-#: ../src/mail/em-folder-properties.c:1047 ../src/mail/mail-config.ui.h:68
+#: ../src/mail/em-folder-properties.c:1333 ../src/mail/mail-config.ui.h:68
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:549
-#: ../src/plugins/email-custom-header/email-custom-header.c:843
+#: ../src/plugins/email-custom-header/email-custom-header.c:844
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:34
-#: ../src/plugins/templates/templates.c:469 ../src/shell/e-shell-window-actions.c:980
-#: ../src/smime/gui/smime-ui.ui.h:11
+#: ../src/plugins/templates/templates.c:469
+#: ../src/shell/e-shell-window-actions.c:1005 ../src/smime/gui/smime-ui.ui.h:11
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:325
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:328
 msgid "Add exception"
 msgstr "Ausnahme hinzufügen"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:363
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:369
 msgid "Modify exception"
 msgstr "Ausnahme verändern"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] 
[forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day 
always follows.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:488
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:502
 msgid "on"
 msgstr "am"
 
@@ -7673,7 +7940,7 @@ msgstr "am"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:569
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:583
 msgctxt "ECompEditorPageRecur"
 msgid "first"
 msgstr "ersten"
@@ -7683,7 +7950,7 @@ msgstr "ersten"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:575
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:589
 msgctxt "ECompEditorPageRecur"
 msgid "second"
 msgstr "zweiten"
@@ -7692,7 +7959,7 @@ msgstr "zweiten"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:580
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:594
 msgctxt "ECompEditorPageRecur"
 msgid "third"
 msgstr "dritten"
@@ -7701,7 +7968,7 @@ msgstr "dritten"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:585
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:599
 msgctxt "ECompEditorPageRecur"
 msgid "fourth"
 msgstr "vierten"
@@ -7710,7 +7977,7 @@ msgstr "vierten"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:590
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:604
 msgctxt "ECompEditorPageRecur"
 msgid "fifth"
 msgstr "fünften"
@@ -7719,14 +7986,14 @@ msgstr "fünften"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:595
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:609
 msgctxt "ECompEditorPageRecur"
 msgid "last"
 msgstr "letzten"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] 
[11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:622
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:636
 msgctxt "ECompEditorPageRecur"
 msgid "Other Date"
 msgstr "Anderes Datum"
@@ -7735,7 +8002,7 @@ msgstr "Anderes Datum"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:628
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:642
 msgctxt "ECompEditorPageRecur"
 msgid "1st to 10th"
 msgstr "1. bis 10."
@@ -7744,7 +8011,7 @@ msgstr "1. bis 10."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:634
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:648
 msgctxt "ECompEditorPageRecur"
 msgid "11th to 20th"
 msgstr "11. bis 20."
@@ -7753,7 +8020,7 @@ msgstr "11. bis 20."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:640
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:654
 msgctxt "ECompEditorPageRecur"
 msgid "21st to 31st"
 msgstr "21. bis 31."
@@ -7761,42 +8028,42 @@ msgstr "21. bis 31."
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the 
[first] [day] [forever]'
 #. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:666
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:680
 msgctxt "ECompEditorPageRecur"
 msgid "day"
 msgstr "Tag"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:667
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:681
 msgctxt "ECompEditorPageRecur"
 msgid "Monday"
 msgstr "Montag"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:668
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:682
 msgctxt "ECompEditorPageRecur"
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:669
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:683
 msgctxt "ECompEditorPageRecur"
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:670
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:684
 msgctxt "ECompEditorPageRecur"
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:671
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:685
 msgctxt "ECompEditorPageRecur"
 msgid "Friday"
 msgstr "Freitag"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:672
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:686
 msgctxt "ECompEditorPageRecur"
 msgid "Saturday"
 msgstr "Samstag"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:673
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:687
 msgctxt "ECompEditorPageRecur"
 msgid "Sunday"
 msgstr "Sonntag"
@@ -7804,127 +8071,127 @@ msgstr "Sonntag"
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] 
[Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:802
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:816
 msgctxt "ECompEditorPageRecur"
 msgid "on the"
 msgstr "am"
 
 # oder im Falle von Terminen: Wiederholungen ??
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:992
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1011
 msgctxt "ECompEditorPageRecur"
 msgid "occurrences"
 msgstr "Wiederholungen"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1484
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2023
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1520
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2077
 msgctxt "ECompEditorPageRecur"
 msgid "This appointment rec_urs"
 msgstr "Termin_wiederholung"
 
 #. Translators: Entire string is for example:     'This task recurs/Every[x][day(s)][for][1]occurrences' 
(combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1489
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1525
 msgctxt "ECompEditorPageRecur"
 msgid "This task rec_urs"
 msgstr "Aufgaben_wiederholung"
 
 #. Translators: Entire string is for example:     'This memo recurs/Every[x][day(s)][for][1]occurrences' 
(combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1494
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1530
 msgctxt "ECompEditorPageRecur"
 msgid "This memo rec_urs"
 msgstr "Notiz_wiederholung"
 
 #. Translators: Entire string is for example:     'This component 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1499
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1535
 msgctxt "ECompEditorPageRecur"
 msgid "This component rec_urs"
 msgstr "Dieser Termin _wiederholt sich"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1860
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1906
 msgid "Recurrence exception date is invalid"
 msgstr "Das Datum für Wiederholungsausnahmen ist ungültig"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1908
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1962
 msgid "End time of the recurrence is before the start"
 msgstr "Die Zeit der letzten Wiederholung liegt vor dem Start des Termins"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1951
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2005
 msgid "R_ecurrence"
 msgstr "_Wiederholung"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1953
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2007
 msgid "Set or unset recurrence"
 msgstr "Wiederholungen aktivieren oder deaktivieren"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2055
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2109
 msgctxt "ECompEditorPageRecur"
 msgid "Every"
 msgstr "alle"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2090
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2144
 msgctxt "ECompEditorPageRecur"
 msgid "day(s)"
 msgstr "Tag(e)"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2092
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2146
 msgctxt "ECompEditorPageRecur"
 msgid "week(s)"
 msgstr "Woche(n)"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2094
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2148
 msgctxt "ECompEditorPageRecur"
 msgid "month(s)"
 msgstr "Monat(e)"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2096
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2150
 msgctxt "ECompEditorPageRecur"
 msgid "year(s)"
 msgstr "Jahr(e)"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2125
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2179
 msgctxt "ECompEditorPageRecur"
 msgid "for"
 msgstr "für"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2127
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2181
 msgctxt "ECompEditorPageRecur"
 msgid "until"
 msgstr "bis"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2129
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2183
 msgctxt "ECompEditorPageRecur"
 msgid "forever"
 msgstr "immer"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2145
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2199
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Dieser Termin enthält Wiederholungen, die Evolution nicht bearbeiten kann."
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2158
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2212
 msgid "Exceptions"
 msgstr "Ausnahmen"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2223
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1774
-#: ../src/mail/e-mail-config-identity-page.c:853 ../src/mail/mail-config.ui.h:67
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2277
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2142
+#: ../src/mail/e-mail-config-identity-page.c:854 ../src/mail/mail-config.ui.h:67
 msgid "A_dd"
 msgstr "_Hinzufügen"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2239
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1782
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2293
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2150
 #: ../src/mail/mail-config.ui.h:69
 msgid "Re_move"
 msgstr "_Entfernen"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2247
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2301
 msgid "Preview"
 msgstr "Vorschau"
 
@@ -7932,363 +8199,352 @@ msgstr "Vorschau"
 msgid "Send To"
 msgstr "Schicken an"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1550
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1566
 msgid "_Reminders"
 msgstr "E_rinnerungen"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1552
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1568
 msgid "Set or unset reminders"
 msgstr "Erinnerungen festlegen oder löschen"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1614
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:72
-msgid "Reminders"
-msgstr "Erinnerungen"
-
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1639
-msgid "_Reminder"
-msgstr "E_rinnerung"
-
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1672
-#, c-format
-msgid "%d day before"
-msgid_plural "%d days before"
-msgstr[0] "%d Tag vor"
-msgstr[1] "%d Tage vor"
-
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1679
-#, c-format
-msgid "%d hour before"
-msgid_plural "%d hours before"
-msgstr[0] "%d Stunde vor"
-msgstr[1] "%d Stunden vor"
-
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1686
-#, c-format
-msgid "%d minute before"
-msgid_plural "%d minutes before"
-msgstr[0] "%d Minute vor"
-msgstr[1] "%d Minuten vor"
-
 #. Translators: "None" for "No reminder set"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1694
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1680
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "Keine"
 
-#. Translators: Predefined reminder's description
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1696
-msgctxt "cal-reminders"
-msgid "15 minutes before"
-msgstr "15 Minuten vor"
-
-#. Translators: Predefined reminder's description
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1698
+#. Translators: This constructs predefined reminder's description, for example "15 minutes before",
+#. "1 hour before", "1 day before", but, if user has set, also more complicated strings like
+#. "2 days 13 hours 1 minute before".
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1690
+#, c-format
 msgctxt "cal-reminders"
-msgid "1 hour before"
-msgstr "1 Stunde vor"
+msgid "%s before"
+msgstr "%s vorher"
 
-#. Translators: Predefined reminder's description
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1700
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1695
 msgctxt "cal-reminders"
-msgid "1 day before"
-msgstr "1 Tag vor"
+msgid "at the start"
+msgstr "zum Terminbeginn"
 
 #. Translators: "Custom" for "Custom reminder set"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1712
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1703
 msgctxt "cal-reminders"
 msgid "Custom"
 msgstr "Angepasst"
 
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1849
+msgid "Set a custom predefined time to"
+msgstr "Eine benutzerdefinierte Zeit festlegen auf"
+
+#. Translators: this is part of: "Set a custom predefined time to [nnn] days [nnn] hours [nnn] minutes", 
where the text in "[]" means a separate widget
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1862
+msgctxt "cal-reminders"
+msgid "da_ys"
+msgstr "_Tage"
+
+#. Translators: this is part of: "Set a custom predefined time to [nnn] days [nnn] hours [nnn] minutes", 
where the text in "[]" means a separate widget
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1878
+msgctxt "cal-reminders"
+msgid "_hours"
+msgstr "_Stunden"
+
+#. Translators: this is part of: "Set a custom predefined time to [nnn] days [nnn] hours [nnn] minutes", 
where the text in "[]" means a separate widget
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1894
+msgctxt "cal-reminders"
+msgid "_minutes"
+msgstr "_Minuten"
+
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1900
+msgid "_Add time"
+msgstr "Zeit _hinzufügen"
+
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1980
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:72
+msgid "Reminders"
+msgstr "Erinnerungen"
+
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2005
+msgid "_Reminder"
+msgstr "E_rinnerung"
+
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2030
+msgid "Add custom predefined time"
+msgstr "Eine benutzerdefinierte Zeit hinzufügen"
+
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2038
+msgid "Remove custom predefined times"
+msgstr "Eine benutzerdefinierte Zeit entfernen"
+
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1855
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2223
 msgctxt "cal-reminders"
 msgid "minute(s)"
 msgstr "Minute(n)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ hour(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1857
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2225
 msgctxt "cal-reminders"
 msgid "hour(s)"
 msgstr "Stunde(n)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ day(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1859
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2227
 msgctxt "cal-reminders"
 msgid "day(s)"
 msgstr "Tag(e)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1876
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2244
 msgctxt "cal-reminders"
 msgid "before"
 msgstr "vor"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ after ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1878
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2246
 msgctxt "cal-reminders"
 msgid "after"
 msgstr "nach"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1894
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2262
 msgctxt "cal-reminders"
 msgid "start"
 msgstr "Anfang"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ end ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1896
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2264
 msgctxt "cal-reminders"
 msgid "end"
 msgstr "Ende"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1915
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2283
 msgid "Re_peat the reminder"
 msgstr "Die Erinnerung _wiederholen"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1940
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2308
 msgctxt "cal-reminders"
 msgid "extra times every"
 msgstr "weitere Male alle"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1977
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2345
 msgctxt "cal-reminders"
 msgid "minutes"
 msgstr "Minuten"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ hours ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1979
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2347
 msgctxt "cal-reminders"
 msgid "hours"
 msgstr "Stunden"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ days ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1981
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2349
 msgctxt "cal-reminders"
 msgid "days"
 msgstr "Tage"
 
 #. page_reminders->priv->custom_email_entry is initialized on demand
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2018
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2175
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2386
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2543
 msgctxt "cal-reminders"
 msgid "Custom _message"
 msgstr "_Benutzerdefinierte Nachricht"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2062
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2430
 msgctxt "cal-reminders"
 msgid "Custom reminder _sound"
 msgstr "Benutzerdefinierter Erinnerung_sklang"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2073
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2441
 msgid "Select a sound file"
 msgstr "Klangdatei auswählen"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2101
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2469
 msgid "_Program:"
 msgstr "_Programm:"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2126
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2494
 msgid "_Arguments:"
 msgstr "_Argumente:"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2158
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2526
 msgid "_Send To:"
 msgstr "_Schicken an:"
 
-#: ../src/calendar/gui/e-comp-editor-page-schedule.c:443
+#: ../src/calendar/gui/e-comp-editor-page-schedule.c:471
 msgid "_Schedule"
 msgstr "_Terminplanung"
 
-#: ../src/calendar/gui/e-comp-editor-page-schedule.c:445
+#: ../src/calendar/gui/e-comp-editor-page-schedule.c:473
 msgid "Query free / busy information for the attendees"
 msgstr "Verfügbarkeitsinformationen der Teilnehmer abfragen"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:79
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:91
 msgctxt "ECompEditor"
 msgid "_Summary:"
 msgstr "Zu_sammenfassung:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:323
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:340
 msgctxt "ECompEditor"
 msgid "_Location:"
 msgstr "O_rt:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:456
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:473
 msgctxt "ECompEditor"
-msgid "_Categories..."
-msgstr "Ka_tegorien …"
+msgid "_Categories…"
+msgstr "_Kategorien …"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:555
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:572
 msgctxt "ECompEditor"
 msgid "_Description:"
 msgstr "_Beschreibung:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:687
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:704
 msgctxt "ECompEditor"
 msgid "_Web page:"
 msgstr "_Internetseite:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1058
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1075
 msgctxt "ECompEditor"
 msgid "D_ue date:"
 msgstr "_Fällig am:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1154
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1169
 msgctxt "ECompEditor"
 msgid "Date _completed:"
 msgstr "_Abgeschlossen am:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1170
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1185
 msgctxt "ECompEditor"
 msgid "Public"
 msgstr "Öffentlich"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1171
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1186
 msgctxt "ECompEditor"
 msgid "Private"
 msgstr "Privat"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1172
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1187
 msgctxt "ECompEditor"
 msgid "Confidential"
 msgstr "Vertraulich"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1188
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1203
 msgctxt "ECompEditor"
 msgid "C_lassification:"
 msgstr "E_instufung:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1207
-msgctxt "ECompEditor"
-msgid "Not Started"
-msgstr "Nicht begonnen"
-
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1208
-msgctxt "ECompEditor"
-msgid "In Progress"
-msgstr "In Bearbeitung"
-
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1209
-msgctxt "ECompEditor"
-msgid "Completed"
-msgstr "Abgeschlossen"
-
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1210
-msgctxt "ECompEditor"
-msgid "Cancelled"
-msgstr "Abgebrochen"
-
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1219
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1266
 msgctxt "ECompEditor"
 msgid "_Status:"
 msgstr "_Status:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1249
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1296
 msgctxt "ECompEditor"
 msgid "Undefined"
 msgstr "Nicht festgelegt"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1250
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1297
 msgctxt "ECompEditor"
 msgid "High"
 msgstr "Hoch"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1251
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1298
 msgctxt "ECompEditor"
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1252
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1299
 msgctxt "ECompEditor"
 msgid "Low"
 msgstr "Niedrig"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1261
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1308
 msgctxt "ECompEditor"
 msgid "Priorit_y:"
 msgstr "_Priorität:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1315
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1362
 msgctxt "ECompEditor"
 msgid "Percent complete:"
 msgstr "Prozent abgeschlossen:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1396
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1443
 msgctxt "ECompEditor"
 msgid "Time _zone:"
 msgstr "Zeit_zone:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1521
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1539
 msgctxt "ECompEditor"
 msgid "Show time as _busy"
 msgstr "Zeit als b_eschäftigt anzeigen"
 
 #. Translators: This 'None' is meant for 'Color' in calendar component editor, like 'None color'
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1648
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1961
 msgctxt "ECompEditor"
 msgid "None"
 msgstr "Keine"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:241
+#: ../src/calendar/gui/e-comp-editor-task.c:281
 msgid "Task’s start date is in the past"
 msgstr "Beginn der Aufgabe liegt in der Vergangenheit"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:249
+#: ../src/calendar/gui/e-comp-editor-task.c:289
 msgid "Task’s due date is in the past"
 msgstr "Fälligkeit der Aufgabe liegt in der Vergangenheit"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:485
+#: ../src/calendar/gui/e-comp-editor-task.c:530
 msgid "Task cannot be edited, because the selected task list could not be opened"
 msgstr ""
 "Die Aufgabe kann nicht bearbeitet werden, weil die gewählte Aufgabenliste nicht "
 "geöffnet werden kann"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:487
+#: ../src/calendar/gui/e-comp-editor-task.c:532
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr ""
 "Die Aufgabe kann nicht bearbeitet werden, weil die gewählte Aufgabenliste nur "
 "gelesen werden darf"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:489
+#: ../src/calendar/gui/e-comp-editor-task.c:534
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr ""
 "Die Aufgabe kann nicht vollständig bearbeitet werden, weil Sie nicht der "
 "Organisator sind"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:560
+#: ../src/calendar/gui/e-comp-editor-task.c:605
 msgid "Start date is required for recurring tasks"
 msgstr "Für wiederkehrende Aufgaben ist ein Startdatum erforderlich"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:572
+#: ../src/calendar/gui/e-comp-editor-task.c:621
 msgid "Due date is not a valid date"
 msgstr "Das Fälligkeitsdatum ist ungültig"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:583
+#: ../src/calendar/gui/e-comp-editor-task.c:632
 msgid "Completed date is not a valid date"
 msgstr "Das Fertigstellungsdatum ist ungültig"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:594
+#: ../src/calendar/gui/e-comp-editor-task.c:643
 msgid "Completed date cannot be in the future"
 msgstr "Das Fertigstellungsdatum kann nicht in der Zukunft liegen"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:667
+#: ../src/calendar/gui/e-comp-editor-task.c:720
 msgid "All _Day Task"
 msgstr "_Ganztägige Aufgabe"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:669
+#: ../src/calendar/gui/e-comp-editor-task.c:722
 msgid "Toggles whether to have All Day Task"
 msgstr "Festlegen, ob es eine ganztägige Aufgabe ist"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:893
+#: ../src/calendar/gui/e-comp-editor-task.c:946
 #, c-format
 msgid "Assigned Task — %s"
 msgstr "Zugewiesene Aufgabe – %s"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:894
+#: ../src/calendar/gui/e-comp-editor-task.c:947
 #, c-format
 msgid "Task — %s"
 msgstr "Aufgabe – %s"
@@ -8298,170 +8554,171 @@ msgstr "Aufgabe – %s"
 msgid "attachment"
 msgstr "Anlage"
 
-#: ../src/calendar/gui/e-comp-editor.c:607
-msgid "Sending notifications to attendees..."
+#: ../src/calendar/gui/e-comp-editor.c:610
+msgid "Sending notifications to attendees…"
 msgstr "Benachrichtigungen werden an die Teilnehmer verschickt …"
 
-#: ../src/calendar/gui/e-comp-editor.c:996
-msgid "Saving changes..."
+#: ../src/calendar/gui/e-comp-editor.c:985 ../src/e-util/e-webdav-browser.c:1818
+msgid "Saving changes…"
 msgstr "Änderungen werden gespeichert …"
 
-#: ../src/calendar/gui/e-comp-editor.c:1256
+#: ../src/calendar/gui/e-comp-editor.c:1245
 msgid "No Summary"
 msgstr "Keine Zusammenfassung"
 
 #. == Button box ==
-#: ../src/calendar/gui/e-comp-editor.c:1984 ../src/composer/e-composer-actions.c:319
+#: ../src/calendar/gui/e-comp-editor.c:2027 ../src/composer/e-composer-actions.c:319
 #: ../src/e-util/e-accounts-window.c:1778 ../src/e-util/e-html-editor-dialog.c:194
 #: ../src/e-util/e-mail-signature-editor.c:309
 #: ../src/e-util/e-name-selector-dialog.c:548
 #: ../src/e-util/e-preferences-window.c:399
 #: ../src/e-util/e-table-field-chooser-dialog.c:205 ../src/mail/e-mail-browser.c:144
-#: ../src/mail/e-mail-notes.c:964 ../src/mail/em-filter-editor.c:45
-#: ../src/mail/em-folder-properties.c:1172 ../src/mail/em-subscription-editor.c:1739
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:758 ../src/mail/e-mail-notes.c:964
+#: ../src/mail/em-filter-editor.c:45 ../src/mail/em-folder-properties.c:1458
+#: ../src/mail/em-subscription-editor.c:1741
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:306
-#: ../src/shell/e-shell-window-actions.c:296
-#: ../src/shell/e-shell-window-actions.c:824
+#: ../src/shell/e-shell-window-actions.c:314
+#: ../src/shell/e-shell-window-actions.c:842
 #: ../src/smime/gui/certificate-manager.c:2196
 msgid "_Close"
 msgstr "S_chließen"
 
-#: ../src/calendar/gui/e-comp-editor.c:1986
+#: ../src/calendar/gui/e-comp-editor.c:2029
 msgid "Close the current window"
 msgstr "Das aktuelle Fenster schließen"
 
 #. copy menu item
-#: ../src/calendar/gui/e-comp-editor.c:1991 ../src/e-util/e-focus-tracker.c:773
+#: ../src/calendar/gui/e-comp-editor.c:2034 ../src/e-util/e-focus-tracker.c:773
 #: ../src/e-util/e-html-editor-actions.c:910 ../src/e-util/e-text.c:2080
 #: ../src/e-util/e-web-view.c:467 ../src/mail/e-mail-browser.c:151
-#: ../src/mail/mail.error.xml.h:147 ../src/shell/e-shell-window-actions.c:845
+#: ../src/mail/mail.error.xml.h:147 ../src/shell/e-shell-window-actions.c:863
 msgid "_Copy"
 msgstr "_Kopieren"
 
-#: ../src/calendar/gui/e-comp-editor.c:1993 ../src/e-util/e-focus-tracker.c:173
+#: ../src/calendar/gui/e-comp-editor.c:2036 ../src/e-util/e-focus-tracker.c:173
 #: ../src/e-util/e-focus-tracker.c:229 ../src/e-util/e-focus-tracker.c:282
 #: ../src/e-util/e-focus-tracker.c:774 ../src/e-util/e-web-view.c:469
-#: ../src/e-util/e-web-view.c:2075 ../src/mail/e-mail-browser.c:153
-#: ../src/shell/e-shell-window-actions.c:847
+#: ../src/e-util/e-web-view.c:2080 ../src/mail/e-mail-browser.c:153
+#: ../src/shell/e-shell-window-actions.c:865
 msgid "Copy the selection"
 msgstr "Die Auswahl kopieren"
 
 #. cut menu item
-#: ../src/calendar/gui/e-comp-editor.c:1998 ../src/e-util/e-focus-tracker.c:768
+#: ../src/calendar/gui/e-comp-editor.c:2041 ../src/e-util/e-focus-tracker.c:768
 #: ../src/e-util/e-html-editor-actions.c:917 ../src/e-util/e-text.c:2066
-#: ../src/mail/e-mail-browser.c:158 ../src/shell/e-shell-window-actions.c:852
+#: ../src/mail/e-mail-browser.c:158 ../src/shell/e-shell-window-actions.c:870
 msgid "Cu_t"
 msgstr "_Ausschneiden"
 
-#: ../src/calendar/gui/e-comp-editor.c:2000 ../src/e-util/e-focus-tracker.c:166
+#: ../src/calendar/gui/e-comp-editor.c:2043 ../src/e-util/e-focus-tracker.c:166
 #: ../src/e-util/e-focus-tracker.c:222 ../src/e-util/e-focus-tracker.c:276
-#: ../src/e-util/e-focus-tracker.c:769 ../src/e-util/e-web-view.c:2084
-#: ../src/mail/e-mail-browser.c:160 ../src/shell/e-shell-window-actions.c:854
+#: ../src/e-util/e-focus-tracker.c:769 ../src/e-util/e-web-view.c:2089
+#: ../src/mail/e-mail-browser.c:160 ../src/shell/e-shell-window-actions.c:872
 msgid "Cut the selection"
 msgstr "Die Auswahl ausschneiden"
 
-#: ../src/calendar/gui/e-comp-editor.c:2007 ../src/e-util/e-focus-tracker.c:187
+#: ../src/calendar/gui/e-comp-editor.c:2050 ../src/e-util/e-focus-tracker.c:187
 #: ../src/e-util/e-focus-tracker.c:243 ../src/e-util/e-focus-tracker.c:784
-#: ../src/shell/e-shell-window-actions.c:861
+#: ../src/shell/e-shell-window-actions.c:879
 msgid "Delete the selection"
 msgstr "Die Auswahl löschen"
 
-#: ../src/calendar/gui/e-comp-editor.c:2014
+#: ../src/calendar/gui/e-comp-editor.c:2057
 msgid "View help"
 msgstr "Hilfe anzeigen"
 
 #. paste menu item
-#: ../src/calendar/gui/e-comp-editor.c:2019 ../src/e-util/e-focus-tracker.c:778
+#: ../src/calendar/gui/e-comp-editor.c:2062 ../src/e-util/e-focus-tracker.c:778
 #: ../src/e-util/e-html-editor-actions.c:924 ../src/e-util/e-text.c:2092
-#: ../src/mail/e-mail-browser.c:165 ../src/shell/e-shell-window-actions.c:880
+#: ../src/mail/e-mail-browser.c:165 ../src/shell/e-shell-window-actions.c:898
 msgid "_Paste"
 msgstr "_Einfügen"
 
-#: ../src/calendar/gui/e-comp-editor.c:2021 ../src/e-util/e-focus-tracker.c:180
+#: ../src/calendar/gui/e-comp-editor.c:2064 ../src/e-util/e-focus-tracker.c:180
 #: ../src/e-util/e-focus-tracker.c:236 ../src/e-util/e-focus-tracker.c:288
-#: ../src/e-util/e-focus-tracker.c:779 ../src/e-util/e-web-view.c:2093
-#: ../src/mail/e-mail-browser.c:167 ../src/shell/e-shell-window-actions.c:882
+#: ../src/e-util/e-focus-tracker.c:779 ../src/e-util/e-web-view.c:2098
+#: ../src/mail/e-mail-browser.c:167 ../src/shell/e-shell-window-actions.c:900
 msgid "Paste the clipboard"
 msgstr "Den Inhalt der Zwischenablage einfügen"
 
-#: ../src/calendar/gui/e-comp-editor.c:2026 ../src/composer/e-composer-actions.c:373
-#: ../src/mail/e-mail-reader.c:2717
+#: ../src/calendar/gui/e-comp-editor.c:2069 ../src/composer/e-composer-actions.c:373
+#: ../src/mail/e-mail-reader.c:2750
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1319
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1333
-msgid "_Print..."
+msgid "_Print…"
 msgstr "_Drucken …"
 
-#: ../src/calendar/gui/e-comp-editor.c:2033 ../src/mail/e-mail-reader.c:2724
+#: ../src/calendar/gui/e-comp-editor.c:2076 ../src/mail/e-mail-reader.c:2757
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1326
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1771
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:840
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1048
-msgid "Pre_view..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1723
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:838
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1046
+msgid "Pre_view…"
 msgstr "_Vorschau …"
 
-#: ../src/calendar/gui/e-comp-editor.c:2040 ../src/e-util/e-focus-tracker.c:788
+#: ../src/calendar/gui/e-comp-editor.c:2083 ../src/e-util/e-focus-tracker.c:788
 #: ../src/e-util/e-html-editor-actions.c:938 ../src/e-util/e-web-view.c:484
-#: ../src/mail/e-mail-browser.c:172 ../src/shell/e-shell-window-actions.c:950
+#: ../src/mail/e-mail-browser.c:172 ../src/shell/e-shell-window-actions.c:968
 msgid "Select _All"
 msgstr "_Alle auswählen"
 
-#: ../src/calendar/gui/e-comp-editor.c:2042 ../src/e-util/e-focus-tracker.c:194
+#: ../src/calendar/gui/e-comp-editor.c:2085 ../src/e-util/e-focus-tracker.c:194
 #: ../src/e-util/e-focus-tracker.c:250 ../src/e-util/e-focus-tracker.c:789
-#: ../src/mail/e-mail-browser.c:174 ../src/shell/e-shell-window-actions.c:952
+#: ../src/mail/e-mail-browser.c:174 ../src/shell/e-shell-window-actions.c:970
 msgid "Select all text"
 msgstr "Den gesamten Text markieren"
 
-#: ../src/calendar/gui/e-comp-editor.c:2063
+#: ../src/calendar/gui/e-comp-editor.c:2106
 msgid "_Classification"
 msgstr "E_instufung"
 
-#: ../src/calendar/gui/e-comp-editor.c:2077 ../src/e-util/e-html-editor-actions.c:961
+#: ../src/calendar/gui/e-comp-editor.c:2120 ../src/e-util/e-html-editor-actions.c:961
 #: ../src/e-util/e-mail-signature-editor.c:323 ../src/mail/e-mail-browser.c:188
-#: ../src/mail/e-mail-notes.c:978 ../src/shell/e-shell-window-actions.c:987
+#: ../src/mail/e-mail-notes.c:978 ../src/shell/e-shell-window-actions.c:1012
 msgid "_File"
 msgstr "_Datei"
 
-#: ../src/calendar/gui/e-comp-editor.c:2091 ../src/e-util/e-html-editor-actions.c:982
+#: ../src/calendar/gui/e-comp-editor.c:2134 ../src/e-util/e-html-editor-actions.c:982
 msgid "_Insert"
 msgstr "Ein_fügen"
 
-#: ../src/calendar/gui/e-comp-editor.c:2098 ../src/composer/e-composer-actions.c:363
+#: ../src/calendar/gui/e-comp-editor.c:2141 ../src/composer/e-composer-actions.c:363
 msgid "_Options"
 msgstr "_Optionen"
 
-#: ../src/calendar/gui/e-comp-editor.c:2105
+#: ../src/calendar/gui/e-comp-editor.c:2148
 #: ../src/e-util/e-html-editor-actions.c:1003 ../src/mail/e-mail-browser.c:202
-#: ../src/shell/e-shell-window-actions.c:1030
+#: ../src/shell/e-shell-window-actions.c:1055
 #: ../src/smime/gui/certificate-manager.c:1646 ../src/smime/gui/smime-ui.ui.h:3
 msgid "_View"
 msgstr "_Ansicht"
 
-#: ../src/calendar/gui/e-comp-editor.c:2117
+#: ../src/calendar/gui/e-comp-editor.c:2160
 msgid "Save current changes"
 msgstr "Aktuelle Änderungen speichern"
 
-#: ../src/calendar/gui/e-comp-editor.c:2122
+#: ../src/calendar/gui/e-comp-editor.c:2165
 #: ../src/e-util/e-mail-signature-editor.c:318 ../src/mail/e-mail-notes.c:973
 msgid "Save and Close"
 msgstr "Speichern und schließen"
 
-#: ../src/calendar/gui/e-comp-editor.c:2124
+#: ../src/calendar/gui/e-comp-editor.c:2167
 msgid "Save current changes and close editor"
 msgstr "Aktuelle Änderungen speichern und den Editor schließen"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../src/calendar/gui/e-day-view.c:2147 ../src/calendar/gui/e-to-do-pane.c:241
-#: ../src/calendar/gui/e-week-view.c:1772 ../src/calendar/gui/print.c:1079
-#: ../src/calendar/gui/print.c:1098 ../src/calendar/gui/print.c:2635
-#: ../src/calendar/gui/print.c:2655
+#: ../src/calendar/gui/e-day-view.c:2152 ../src/calendar/gui/e-to-do-pane.c:245
+#: ../src/calendar/gui/e-week-view.c:1756 ../src/calendar/gui/print.c:1076
+#: ../src/calendar/gui/print.c:1095 ../src/calendar/gui/print.c:2647
+#: ../src/calendar/gui/print.c:2667
 msgid "am"
 msgstr "AM"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../src/calendar/gui/e-day-view.c:2150 ../src/calendar/gui/e-to-do-pane.c:245
-#: ../src/calendar/gui/e-week-view.c:1775 ../src/calendar/gui/print.c:1084
-#: ../src/calendar/gui/print.c:1100 ../src/calendar/gui/print.c:2640
-#: ../src/calendar/gui/print.c:2657
+#: ../src/calendar/gui/e-day-view.c:2155 ../src/calendar/gui/e-to-do-pane.c:249
+#: ../src/calendar/gui/e-week-view.c:1759 ../src/calendar/gui/print.c:1081
+#: ../src/calendar/gui/print.c:1097 ../src/calendar/gui/print.c:2652
+#: ../src/calendar/gui/print.c:2669
 msgid "pm"
 msgstr "PM"
 
@@ -8471,14 +8728,14 @@ msgstr "PM"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../src/calendar/gui/e-day-view.c:3062
-#: ../src/calendar/gui/e-day-view-top-item.c:857
-#: ../src/calendar/gui/e-week-view-main-item.c:205 ../src/calendar/gui/print.c:2102
+#: ../src/calendar/gui/e-day-view.c:3046
+#: ../src/calendar/gui/e-day-view-top-item.c:850
+#: ../src/calendar/gui/e-week-view-main-item.c:205 ../src/calendar/gui/print.c:2109
 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
-#: ../src/calendar/gui/e-day-view.c:3790
+#: ../src/calendar/gui/e-day-view.c:3787
 #, c-format
 msgid "Week %d"
 msgstr "Woche %d"
@@ -8489,28 +8746,28 @@ msgstr "Woche %d"
 #. * day view, e.g. a day is displayed in
 #. * 24 "60 minute divisions" or
 #. * 48 "30 minute divisions".
-#: ../src/calendar/gui/e-day-view-time-item.c:804
+#: ../src/calendar/gui/e-day-view-time-item.c:811
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i Minuten-Unterteilungen"
 
-#: ../src/calendar/gui/e-day-view-time-item.c:829
+#: ../src/calendar/gui/e-day-view-time-item.c:836
 msgid "Show the second time zone"
 msgstr "Zweite Zeitzone anzeigen"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../src/calendar/gui/e-day-view-time-item.c:846
-#: ../src/modules/calendar/e-calendar-preferences.c:313
-#: ../src/modules/calendar/e-calendar-preferences.c:365
+#: ../src/calendar/gui/e-day-view-time-item.c:853
+#: ../src/modules/calendar/e-calendar-preferences.c:310
+#: ../src/modules/calendar/e-calendar-preferences.c:362
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:11
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Keine"
 
-#: ../src/calendar/gui/e-day-view-time-item.c:880
-#: ../src/calendar/gui/e-timezone-entry.c:333
-#: ../src/modules/calendar/e-calendar-preferences.c:396
-msgid "Select..."
+#: ../src/calendar/gui/e-day-view-time-item.c:887
+#: ../src/calendar/gui/e-timezone-entry.c:346
+#: ../src/modules/calendar/e-calendar-preferences.c:393
+msgid "Select…"
 msgstr "Auswählen …"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:62
@@ -8536,100 +8793,97 @@ msgstr "Teilnehmer"
 #: ../src/calendar/gui/e-meeting-list-view.c:179
 #: ../src/calendar/gui/e-meeting-store.c:110
 #: ../src/calendar/gui/e-meeting-store.c:127
-#: ../src/calendar/gui/e-meeting-store.c:1092 ../src/calendar/gui/print.c:1252
+#: ../src/calendar/gui/e-meeting-store.c:1072 ../src/calendar/gui/print.c:1253
 msgid "Individual"
 msgstr "Individuell"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:180
 #: ../src/calendar/gui/e-meeting-store.c:112
-#: ../src/calendar/gui/e-meeting-store.c:129 ../src/calendar/gui/print.c:1253
+#: ../src/calendar/gui/e-meeting-store.c:129 ../src/calendar/gui/print.c:1254
 #: ../src/e-util/e-table-config.ui.h:1
 msgid "Group"
 msgstr "Gruppe"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:181
 #: ../src/calendar/gui/e-meeting-store.c:114
-#: ../src/calendar/gui/e-meeting-store.c:131 ../src/calendar/gui/print.c:1254
+#: ../src/calendar/gui/e-meeting-store.c:131 ../src/calendar/gui/print.c:1255
 msgid "Resource"
 msgstr "Ressource"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:182
 #: ../src/calendar/gui/e-meeting-store.c:116
-#: ../src/calendar/gui/e-meeting-store.c:133 ../src/calendar/gui/print.c:1255
+#: ../src/calendar/gui/e-meeting-store.c:133 ../src/calendar/gui/print.c:1256
 msgid "Room"
 msgstr "Raum"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:193
 #: ../src/calendar/gui/e-meeting-store.c:145
-#: ../src/calendar/gui/e-meeting-store.c:162 ../src/calendar/gui/print.c:1269
+#: ../src/calendar/gui/e-meeting-store.c:162 ../src/calendar/gui/print.c:1270
 msgid "Chair"
 msgstr "Vorsitzender"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:194
 #: ../src/calendar/gui/e-meeting-store.c:147
 #: ../src/calendar/gui/e-meeting-store.c:164
-#: ../src/calendar/gui/e-meeting-store.c:1095 ../src/calendar/gui/print.c:1270
+#: ../src/calendar/gui/e-meeting-store.c:1073 ../src/calendar/gui/print.c:1271
 msgid "Required Participant"
 msgstr "Benötigter Teilnehmer"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:195
 #: ../src/calendar/gui/e-meeting-store.c:149
-#: ../src/calendar/gui/e-meeting-store.c:166 ../src/calendar/gui/print.c:1271
+#: ../src/calendar/gui/e-meeting-store.c:166 ../src/calendar/gui/print.c:1272
 msgid "Optional Participant"
 msgstr "Optionaler Teilnehmer"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:196
 #: ../src/calendar/gui/e-meeting-store.c:151
-#: ../src/calendar/gui/e-meeting-store.c:168 ../src/calendar/gui/print.c:1272
+#: ../src/calendar/gui/e-meeting-store.c:168 ../src/calendar/gui/print.c:1273
 msgid "Non-Participant"
 msgstr "Nicht-Teilnehmer"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:218
-#: ../src/calendar/gui/e-meeting-store.c:195
-#: ../src/calendar/gui/e-meeting-store.c:218
-#: ../src/calendar/gui/e-meeting-store.c:1105
+#: ../src/calendar/gui/e-meeting-list-view.c:207
+#: ../src/calendar/gui/e-meeting-store.c:177
+#: ../src/calendar/gui/e-meeting-store.c:200
+#: ../src/calendar/gui/e-meeting-store.c:1079
 msgid "Needs Action"
 msgstr "Erfordert Maßnahme"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:631
+#: ../src/calendar/gui/e-meeting-list-view.c:624
 msgid "Attendee                          "
 msgstr "Teilnehmer                        "
 
-#: ../src/calendar/gui/e-meeting-list-view.c:657
-#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:4
-#: ../src/calendar/gui/e-memo-table.etspec.h:3
-#: ../src/calendar/gui/e-task-table.etspec.h:3 ../src/e-util/e-accounts-window.c:1443
-#: ../src/e-util/e-attachment-tree-view.c:205
-#: ../src/e-util/e-collection-account-wizard.c:1934
-#: ../src/e-util/e-webdav-browser.c:2381 ../src/mail/e-mail-account-tree-view.c:158
-msgid "Type"
-msgstr "Art"
-
 #. To translators: RSVP means "please reply"
-#: ../src/calendar/gui/e-meeting-list-view.c:686
+#: ../src/calendar/gui/e-meeting-list-view.c:679
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "UAwg"
 
-#: ../src/calendar/gui/e-meeting-store.c:207
-#: ../src/calendar/gui/e-meeting-store.c:230
+#: ../src/calendar/gui/e-meeting-store.c:187
+#: ../src/calendar/gui/e-meeting-store.c:210
+#: ../src/calendar/gui/tasktypes.xml.in.h:13
+#: ../src/plugins/save-calendar/csv-format.c:366
+msgid "Completed"
+msgstr "Abgeschlossen"
+
+#: ../src/calendar/gui/e-meeting-store.c:189
+#: ../src/calendar/gui/e-meeting-store.c:212
 msgid "In Process"
 msgstr "In Bearbeitung"
 
-#: ../src/calendar/gui/e-meeting-store.c:1976
+#: ../src/calendar/gui/e-meeting-store.c:2003
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr ""
 "Geben Sie das Passwort für Benutzer %2$s auf dem Server %1$s ein, um auf "
 "Verfügbarkeitsinformationen zuzugreifen"
 
-#: ../src/calendar/gui/e-meeting-store.c:1986
+#: ../src/calendar/gui/e-meeting-store.c:2013
 #, c-format
 msgid "Failure reason: %s"
 msgstr "Fehlergrund: %s"
 
-#: ../src/calendar/gui/e-meeting-store.c:1991
-#: ../src/e-util/e-collection-account-wizard.c:470
+#: ../src/calendar/gui/e-meeting-store.c:2018
+#: ../src/e-util/e-collection-account-wizard.c:493
 #: ../src/plugins/publish-calendar/publish-calendar.c:350
 #: ../src/smime/gui/component.c:61
 msgid "Enter password"
@@ -8644,7 +8898,7 @@ msgid "No Information"
 msgstr "Keine Informationen"
 
 #: ../src/calendar/gui/e-meeting-time-sel.c:543
-msgid "Atte_ndees..."
+msgid "Atte_ndees…"
 msgstr "Teil_nehmer …"
 
 #: ../src/calendar/gui/e-meeting-time-sel.c:562
@@ -8708,7 +8962,7 @@ msgstr ""
 "Zusammenfassung: %s\n"
 "Ort: %s"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:2578 ../src/calendar/gui/print.c:3534
+#: ../src/calendar/gui/e-meeting-time-sel.c:2578 ../src/calendar/gui/print.c:3554
 #, c-format
 msgid "Summary: %s"
 msgstr "Zusammenfassung: %s"
@@ -8737,38 +8991,38 @@ msgstr "Allgemeiner Name"
 msgid "Language"
 msgstr "Sprache"
 
-#: ../src/calendar/gui/e-memo-table.c:461 ../src/calendar/gui/e-task-table.c:782
+#: ../src/calendar/gui/e-memo-table.c:535 ../src/calendar/gui/e-task-table.c:700
 msgid "* No Summary *"
 msgstr "* Keine Zusammenfassung *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../src/calendar/gui/e-memo-table.c:546 ../src/calendar/gui/e-task-table.c:879
+#: ../src/calendar/gui/e-memo-table.c:622 ../src/calendar/gui/e-task-table.c:801
 msgid "Start: "
 msgstr "Anfang: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../src/calendar/gui/e-memo-table.c:566 ../src/calendar/gui/e-task-table.c:898
+#: ../src/calendar/gui/e-memo-table.c:642 ../src/calendar/gui/e-task-table.c:834
 msgid "Due: "
 msgstr "Fälligkeit: "
 
-#: ../src/calendar/gui/e-memo-table.c:775
+#: ../src/calendar/gui/e-memo-table.c:850
 msgid "Cut selected memos to the clipboard"
 msgstr "Die gewählten Notizen in die Zwischenablage ausschneiden"
 
-#: ../src/calendar/gui/e-memo-table.c:781
+#: ../src/calendar/gui/e-memo-table.c:856
 msgid "Copy selected memos to the clipboard"
 msgstr "Die gewählten Notizen in die Zwischenablage kopieren"
 
-#: ../src/calendar/gui/e-memo-table.c:787
+#: ../src/calendar/gui/e-memo-table.c:862
 msgid "Paste memos from the clipboard"
 msgstr "Notiz aus der Zwischenablage einfügen"
 
-#: ../src/calendar/gui/e-memo-table.c:793
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:574
+#: ../src/calendar/gui/e-memo-table.c:868
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:572
 msgid "Delete selected memos"
 msgstr "Die gewählten Notizen löschen"
 
-#: ../src/calendar/gui/e-memo-table.c:799
+#: ../src/calendar/gui/e-memo-table.c:874
 msgid "Select all visible memos"
 msgstr "Alle sichtbaren Notizen wählen"
 
@@ -8776,7 +9030,7 @@ msgstr "Alle sichtbaren Notizen wählen"
 msgid "Click to add a memo"
 msgstr "Klicken Sie hier, um eine Notiz hinzuzufügen"
 
-#: ../src/calendar/gui/e-task-table.c:552 ../src/calendar/gui/tasktypes.xml.in.h:22
+#: ../src/calendar/gui/e-task-table.c:474 ../src/calendar/gui/tasktypes.xml.in.h:22
 #: ../src/e-util/e-send-options.ui.h:1
 msgid "Undefined"
 msgstr "Nicht festgelegt"
@@ -8785,29 +9039,29 @@ msgstr "Nicht festgelegt"
 #. * %d is the actual value, %% is replaced with a percent sign.
 #. * Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../src/calendar/gui/e-task-table.c:580
+#: ../src/calendar/gui/e-task-table.c:502
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../src/calendar/gui/e-task-table.c:1135
+#: ../src/calendar/gui/e-task-table.c:1072
 msgid "Cut selected tasks to the clipboard"
 msgstr "Die gewählten Aufgaben in die Zwischenablage ausschneiden"
 
-#: ../src/calendar/gui/e-task-table.c:1141
+#: ../src/calendar/gui/e-task-table.c:1078
 msgid "Copy selected tasks to the clipboard"
 msgstr "Die gewählten Aufgaben in die Zwischenablage kopieren"
 
-#: ../src/calendar/gui/e-task-table.c:1147
+#: ../src/calendar/gui/e-task-table.c:1084
 msgid "Paste tasks from the clipboard"
 msgstr "Aufgaben aus der Zwischenablage einfügen"
 
-#: ../src/calendar/gui/e-task-table.c:1153
-#: ../src/modules/calendar/e-task-shell-view-actions.c:700
+#: ../src/calendar/gui/e-task-table.c:1090
+#: ../src/modules/calendar/e-task-shell-view-actions.c:698
 msgid "Delete selected tasks"
 msgstr "Die gewählten Aufgaben löschen"
 
-#: ../src/calendar/gui/e-task-table.c:1159
+#: ../src/calendar/gui/e-task-table.c:1096
 msgid "Select all visible tasks"
 msgstr "Alle sichtbaren Aufgaben wählen"
 
@@ -8838,125 +9092,140 @@ msgstr "% abgeschlossen"
 
 #: ../src/calendar/gui/e-task-table.etspec.h:10
 #: ../src/calendar/gui/tasktypes.xml.in.h:18
-#: ../src/plugins/save-calendar/csv-format.c:384
+#: ../src/plugins/save-calendar/csv-format.c:373
 msgid "Priority"
 msgstr "Priorität"
 
-#: ../src/calendar/gui/e-timezone-entry.c:344
+#. Translators: 'None' for a time zone, like 'No time zone being set'
+#: ../src/calendar/gui/e-timezone-entry.c:92 ../src/e-util/e-timezone-dialog.c:55
+msgctxt "timezone"
+msgid "None"
+msgstr "Keine"
+
+#: ../src/calendar/gui/e-timezone-entry.c:357
 msgid "Select Timezone"
 msgstr "Zeitzone auswählen"
 
 #. Translators: It will display "Start: StartDateAndTime"
-#: ../src/calendar/gui/e-to-do-pane.c:390
+#: ../src/calendar/gui/e-to-do-pane.c:406
 #, c-format
 msgid "Start: %s"
 msgstr "Anfang: %s"
 
 #. Translators: It will display "Due: DueDateAndTime"
-#: ../src/calendar/gui/e-to-do-pane.c:410
+#: ../src/calendar/gui/e-to-do-pane.c:428
 #, c-format
 msgid "Due: %s"
 msgstr "Fälligkeit: %s"
 
 #. Translators: It will display "Completed: DateAndTimeWhenCompleted"
-#: ../src/calendar/gui/e-to-do-pane.c:424
+#: ../src/calendar/gui/e-to-do-pane.c:442
 #, c-format
 msgid "Completed: %s"
 msgstr "Abgeschlossen: %s"
 
 #. strftime format of a weekday and a date.
-#: ../src/calendar/gui/e-to-do-pane.c:1460 ../src/e-util/e-cell-date-edit.c:328
+#: ../src/calendar/gui/e-to-do-pane.c:1576 ../src/e-util/e-cell-date-edit.c:328
 #: ../src/e-util/e-datetime-format.c:207
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1869
-#: ../src/modules/itip-formatter/itip-view.c:255
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1821
+#: ../src/modules/itip-formatter/itip-view.c:254
 msgid "Today"
 msgstr "Heute"
 
 #. strftime format of a weekday and a date.
-#: ../src/calendar/gui/e-to-do-pane.c:1462 ../src/e-util/e-datetime-format.c:218
-#: ../src/modules/itip-formatter/itip-view.c:283
+#: ../src/calendar/gui/e-to-do-pane.c:1578 ../src/e-util/e-datetime-format.c:218
+#: ../src/modules/itip-formatter/itip-view.c:282
 msgid "Tomorrow"
 msgstr "Morgen"
 
-#: ../src/calendar/gui/e-to-do-pane.c:1472
+#: ../src/calendar/gui/e-to-do-pane.c:1588
 msgid "Tasks without Due date"
 msgstr "Aufgaben ohne Fälligkeitsdatum"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2045
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1472
-msgid "New _Appointment..."
+#: ../src/calendar/gui/e-to-do-pane.c:2165
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1424
+msgid "New _Appointment…"
 msgstr "Neuer _Termin …"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2053
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1458
-msgid "New _Meeting..."
+#: ../src/calendar/gui/e-to-do-pane.c:2173
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1410
+msgid "New _Meeting…"
 msgstr "Neue Bes_prechung …"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2061
-msgid "New _Task..."
-msgstr "_Neue Aufgabe …"
+#: ../src/calendar/gui/e-to-do-pane.c:2181
+msgid "New _Task…"
+msgstr "Neue _Aufgabe …"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2069
-msgid "_New Assigned Task..."
-msgstr "_Neue zugewiesene Aufgabe …"
+#: ../src/calendar/gui/e-to-do-pane.c:2189
+msgid "_New Assigned Task…"
+msgstr "Neue _zugewiesene Aufgabe …"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2082
-msgid "_Open..."
+#: ../src/calendar/gui/e-to-do-pane.c:2202
+msgid "_Open…"
 msgstr "Ö_ffnen …"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2096
-msgid "_Delete This Instance..."
-msgstr "_Dieses V_orkommen löschen …"
+#: ../src/calendar/gui/e-to-do-pane.c:2216
+msgid "_Delete This Instance…"
+msgstr "Dieses Vorkommen _löschen …"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2104
-msgid "D_elete All Instances..."
-msgstr "All_e Instanzen löschen …"
+#: ../src/calendar/gui/e-to-do-pane.c:2224
+msgid "D_elete All Instances…"
+msgstr "All_e Vorkommen löschen …"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2112
-msgid "_Delete..."
+#: ../src/calendar/gui/e-to-do-pane.c:2232
+msgid "_Delete…"
 msgstr "_Löschen …"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2129
+#: ../src/calendar/gui/e-to-do-pane.c:2249
 msgid "_Show Tasks without Due date"
 msgstr "Aufgaben ohne Fälligkeit_sdatum anzeigen"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2395
+#: ../src/calendar/gui/e-to-do-pane.c:2515
 msgid "To Do"
 msgstr "To Do"
 
+#. Translators: the first '%s' is replaced with a component summary;
+#. the second '%s' is replaced with an event location.
+#. Example: "Meet John Doe (Central Park)"
+#: ../src/calendar/gui/e-week-view.c:3705
+#, c-format
+msgctxt "SummaryWithLocation"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../src/calendar/gui/e-week-view-main-item.c:222 ../src/calendar/gui/print.c:2081
+#: ../src/calendar/gui/e-week-view-main-item.c:222 ../src/calendar/gui/print.c:2088
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: ../src/calendar/gui/itip-utils.c:786 ../src/calendar/gui/itip-utils.c:848
-#: ../src/calendar/gui/itip-utils.c:982
+#: ../src/calendar/gui/itip-utils.c:795 ../src/calendar/gui/itip-utils.c:861
+#: ../src/calendar/gui/itip-utils.c:1010
 msgid "An organizer must be set."
 msgstr "Es muss ein Organisator festgelegt werden."
 
-#: ../src/calendar/gui/itip-utils.c:839
+#: ../src/calendar/gui/itip-utils.c:851
 msgid "At least one attendee is necessary"
 msgstr "Es ist mindestens ein Teilnehmer erforderlich"
 
-#: ../src/calendar/gui/itip-utils.c:1070 ../src/calendar/gui/itip-utils.c:1231
+#: ../src/calendar/gui/itip-utils.c:1108 ../src/calendar/gui/itip-utils.c:1274
 msgid "Event information"
 msgstr "Termininformationen"
 
-#: ../src/calendar/gui/itip-utils.c:1073 ../src/calendar/gui/itip-utils.c:1234
+#: ../src/calendar/gui/itip-utils.c:1111 ../src/calendar/gui/itip-utils.c:1277
 msgid "Task information"
 msgstr "Aufgabeninformationen"
 
-#: ../src/calendar/gui/itip-utils.c:1076 ../src/calendar/gui/itip-utils.c:1237
+#: ../src/calendar/gui/itip-utils.c:1114 ../src/calendar/gui/itip-utils.c:1280
 msgid "Memo information"
 msgstr "Notiz-Informationen"
 
-#: ../src/calendar/gui/itip-utils.c:1079 ../src/calendar/gui/itip-utils.c:1255
+#: ../src/calendar/gui/itip-utils.c:1117 ../src/calendar/gui/itip-utils.c:1298
 msgid "Free/Busy information"
 msgstr "Verfügbarkeitsinformationen"
 
-#: ../src/calendar/gui/itip-utils.c:1082
+#: ../src/calendar/gui/itip-utils.c:1120
 msgid "Calendar information"
 msgstr "Kalenderinformationen"
 
@@ -8964,7 +9233,7 @@ msgstr "Kalenderinformationen"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1119
+#: ../src/calendar/gui/itip-utils.c:1160
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Angenommen"
@@ -8973,7 +9242,7 @@ msgstr "Angenommen"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1126
+#: ../src/calendar/gui/itip-utils.c:1167
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Vorläufig angenommen"
@@ -8985,7 +9254,7 @@ msgstr "Vorläufig angenommen"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1133 ../src/calendar/gui/itip-utils.c:1181
+#: ../src/calendar/gui/itip-utils.c:1174 ../src/calendar/gui/itip-utils.c:1222
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Abgelehnt"
@@ -8994,7 +9263,7 @@ msgstr "Abgelehnt"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1140
+#: ../src/calendar/gui/itip-utils.c:1181
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegiert"
@@ -9002,7 +9271,7 @@ msgstr "Delegiert"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1153
+#: ../src/calendar/gui/itip-utils.c:1194
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Aktualisiert"
@@ -9010,7 +9279,7 @@ msgstr "Aktualisiert"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1160
+#: ../src/calendar/gui/itip-utils.c:1201
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Abgesagt"
@@ -9018,7 +9287,7 @@ msgstr "Abgesagt"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1167
+#: ../src/calendar/gui/itip-utils.c:1208
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Aktualisieren"
@@ -9027,162 +9296,201 @@ msgstr "Aktualisieren"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1174
+#: ../src/calendar/gui/itip-utils.c:1215
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Gegenvorschlag"
 
-#: ../src/calendar/gui/itip-utils.c:1252
+#: ../src/calendar/gui/itip-utils.c:1295
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Verfügbarkeitsinformationen (%s bis %s)"
 
-#: ../src/calendar/gui/itip-utils.c:1260
+#: ../src/calendar/gui/itip-utils.c:1303
 msgid "iCalendar information"
 msgstr "iCalendar-Informationen"
 
-#: ../src/calendar/gui/itip-utils.c:1289
+#: ../src/calendar/gui/itip-utils.c:1332
 #, c-format
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
 "Eine Ressource kann nicht belegt werden, der neue Termin überschneidet sich mit "
 "anderen."
 
-#: ../src/calendar/gui/itip-utils.c:1294
+#: ../src/calendar/gui/itip-utils.c:1337
 msgid "Unable to book a resource, error: "
 msgstr "Eine Ressource kann nicht gebucht werden, Fehler: "
 
-#: ../src/calendar/gui/itip-utils.c:1465
+#: ../src/calendar/gui/itip-utils.c:1530
 msgid "You must be an attendee of the event."
 msgstr "Sie müssen ein Teilnehmer des Termins sein."
 
-#: ../src/calendar/gui/itip-utils.c:2210
+#: ../src/calendar/gui/itip-utils.c:2311
 msgid "Sending an event"
 msgstr "Einen Termin verschicken"
 
-#: ../src/calendar/gui/itip-utils.c:2214
-msgid "Sending a memo"
-msgstr "Eine Notiz verschicken"
+#: ../src/calendar/gui/itip-utils.c:2315
+msgid "Sending a memo"
+msgstr "Eine Notiz verschicken"
+
+#: ../src/calendar/gui/itip-utils.c:2319
+msgid "Sending a task"
+msgstr "Eine Aufgabe verschicken"
+
+#. Translator: This is used as a placeholder when an event doesn't have set a location
+#: ../src/calendar/gui/itip-utils.c:2571
+msgctxt "Location"
+msgid "Unspecified"
+msgstr "Nicht angegeben"
+
+#: ../src/calendar/gui/misc.c:95
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d Tag"
+msgstr[1] "%d Tage"
+
+#: ../src/calendar/gui/misc.c:101
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d Stunde"
+msgstr[1] "%d Stunden"
 
-#: ../src/calendar/gui/itip-utils.c:2218
-msgid "Sending a task"
-msgstr "Eine Aufgabe verschicken"
+#: ../src/calendar/gui/misc.c:107
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d Minute"
+msgstr[1] "%d Minuten"
+
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#: ../src/calendar/gui/misc.c:111
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d Sekunde"
+msgstr[1] "%d Sekunden"
 
 #. G_DATE_BAD_WEEKDAY
 #. Translators: These are workday abbreviations,
 #. * e.g. Su=Sunday and Th=thursday
 #. G_DATE_MONDAY
-#: ../src/calendar/gui/print.c:733
+#: ../src/calendar/gui/print.c:730
 msgid "Mo"
 msgstr "Mo"
 
 #. G_DATE_TUESDAY
-#: ../src/calendar/gui/print.c:734
+#: ../src/calendar/gui/print.c:731
 msgid "Tu"
 msgstr "Di"
 
 #. G_DATE_WEDNESDAY
-#: ../src/calendar/gui/print.c:735
+#: ../src/calendar/gui/print.c:732
 msgid "We"
 msgstr "Mi"
 
 #. G_DATE_THURSDAY
-#: ../src/calendar/gui/print.c:736
+#: ../src/calendar/gui/print.c:733
 msgid "Th"
 msgstr "Do"
 
 #. G_DATE_FRIDAY
-#: ../src/calendar/gui/print.c:737
+#: ../src/calendar/gui/print.c:734
 msgid "Fr"
 msgstr "Fr"
 
 #. G_DATE_SATURDAY
-#: ../src/calendar/gui/print.c:738
+#: ../src/calendar/gui/print.c:735
 msgid "Sa"
 msgstr "Sa"
 
 #. G_DATE_SUNDAY
-#: ../src/calendar/gui/print.c:739
+#: ../src/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.
-#: ../src/calendar/gui/print.c:3327
+#: ../src/calendar/gui/print.c:3346
 msgid " to "
 msgstr " bis "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../src/calendar/gui/print.c:3337
+#: ../src/calendar/gui/print.c:3356
 msgid " (Completed "
 msgstr " (Abgeschlossen "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../src/calendar/gui/print.c:3343
+#: ../src/calendar/gui/print.c:3362
 msgid "Completed "
 msgstr "Abgeschlossen "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../src/calendar/gui/print.c:3353
+#: ../src/calendar/gui/print.c:3372
 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.
-#: ../src/calendar/gui/print.c:3360
+#: ../src/calendar/gui/print.c:3379
 msgid "Due "
 msgstr "Fällig am "
 
-#: ../src/calendar/gui/print.c:3504
+#: ../src/calendar/gui/print.c:3524
 msgid "Appointment"
 msgstr "Termin"
 
-#: ../src/calendar/gui/print.c:3506 ../src/e-util/e-send-options.c:551
+#: ../src/calendar/gui/print.c:3526 ../src/e-util/e-send-options.c:551
 msgid "Task"
 msgstr "Aufgabe"
 
-#: ../src/calendar/gui/print.c:3508
+#: ../src/calendar/gui/print.c:3528
 msgid "Memo"
 msgstr "Notiz"
 
-#: ../src/calendar/gui/print.c:3564
+#: ../src/calendar/gui/print.c:3585
 msgid "Attendees: "
 msgstr "Teilnehmer: "
 
-#: ../src/calendar/gui/print.c:3608
+#: ../src/calendar/gui/print.c:3614
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../src/calendar/gui/print.c:3624
+#: ../src/calendar/gui/print.c:3630
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorität: %s"
 
-#: ../src/calendar/gui/print.c:3642
+#: ../src/calendar/gui/print.c:3645
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prozent abgeschlossen: %i"
 
-#: ../src/calendar/gui/print.c:3656
+#: ../src/calendar/gui/print.c:3660
 #, c-format
 msgid "URL: %s"
 msgstr "Adresse: %s"
 
-#: ../src/calendar/gui/print.c:3670
+#: ../src/calendar/gui/print.c:3676
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorien: %s"
 
-#: ../src/calendar/gui/print.c:3681
+#: ../src/calendar/gui/print.c:3688
 msgid "Contacts: "
 msgstr "Kontakte: "
 
+#: ../src/calendar/gui/tasktypes.xml.in.h:11
+msgid "Not Started"
+msgstr "Nicht begonnen"
+
 #: ../src/calendar/gui/tasktypes.xml.in.h:12
 msgid "In progress"
 msgstr "In Bearbeitung"
@@ -9206,208 +9514,208 @@ msgstr "ist kleiner als"
 msgid "Appointments and Meetings"
 msgstr "Termine und Besprechungen"
 
-#: ../src/calendar/importers/icalendar-importer.c:306
+#: ../src/calendar/importers/icalendar-importer.c:327
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:480
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:108
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:322
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:88
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:267
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:180
 msgid "New Calendar"
 msgstr "Neuer Kalender"
 
-#: ../src/calendar/importers/icalendar-importer.c:309
+#: ../src/calendar/importers/icalendar-importer.c:330
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:488
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:330
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:275
 #: ../src/modules/calendar/e-task-shell-view-actions.c:204
 msgid "New Task List"
 msgstr "Neue Aufgabenliste"
 
-#: ../src/calendar/importers/icalendar-importer.c:351
+#: ../src/calendar/importers/icalendar-importer.c:372
 msgid "Cre_ate new calendar"
 msgstr "Neuen Kalender _anlegen"
 
-#: ../src/calendar/importers/icalendar-importer.c:355
+#: ../src/calendar/importers/icalendar-importer.c:376
 msgid "Cre_ate new task list"
 msgstr "Neue Aufgabenliste _anlegen"
 
-#: ../src/calendar/importers/icalendar-importer.c:500
-#: ../src/calendar/importers/icalendar-importer.c:939
+#: ../src/calendar/importers/icalendar-importer.c:521
+#: ../src/calendar/importers/icalendar-importer.c:971
 msgid "Opening calendar"
 msgstr "Kalender wird geöffnet"
 
-#: ../src/calendar/importers/icalendar-importer.c:647
+#: ../src/calendar/importers/icalendar-importer.c:668
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar-Dateien (.ics)"
 
-#: ../src/calendar/importers/icalendar-importer.c:648
+#: ../src/calendar/importers/icalendar-importer.c:669
 msgid "Evolution iCalendar importer"
 msgstr "Evolution-iCalendar-Importeur"
 
-#: ../src/calendar/importers/icalendar-importer.c:740
+#: ../src/calendar/importers/icalendar-importer.c:764
 msgid "Reminder!"
 msgstr "Erinnerung!"
 
-#: ../src/calendar/importers/icalendar-importer.c:825
+#: ../src/calendar/importers/icalendar-importer.c:859
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar-Dateien (.vcs)"
 
-#: ../src/calendar/importers/icalendar-importer.c:826
+#: ../src/calendar/importers/icalendar-importer.c:860
 msgid "Evolution vCalendar importer"
 msgstr "Evolution-vCalendar-Importeur"
 
-#: ../src/calendar/importers/icalendar-importer.c:1102
+#: ../src/calendar/importers/icalendar-importer.c:1134
 msgid "Calendar Events"
 msgstr "Kalender-Termine"
 
-#: ../src/calendar/importers/icalendar-importer.c:1145
+#: ../src/calendar/importers/icalendar-importer.c:1177
 msgid "GNOME Calendar"
 msgstr "GNOME Kalender"
 
-#: ../src/calendar/importers/icalendar-importer.c:1146
+#: ../src/calendar/importers/icalendar-importer.c:1178
 msgid "Evolution Calendar intelligent importer"
 msgstr "Intelligenter Evolution-Kalender-Importeur"
 
-#: ../src/calendar/importers/icalendar-importer.c:1217
-#: ../src/calendar/importers/icalendar-importer.c:1531
+#: ../src/calendar/importers/icalendar-importer.c:1254
+#: ../src/calendar/importers/icalendar-importer.c:1582
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Besprechung"
 
-#: ../src/calendar/importers/icalendar-importer.c:1217
-#: ../src/calendar/importers/icalendar-importer.c:1531
+#: ../src/calendar/importers/icalendar-importer.c:1254
+#: ../src/calendar/importers/icalendar-importer.c:1582
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Termin"
 
-#: ../src/calendar/importers/icalendar-importer.c:1220
-#: ../src/calendar/importers/icalendar-importer.c:1532
+#: ../src/calendar/importers/icalendar-importer.c:1257
+#: ../src/calendar/importers/icalendar-importer.c:1583
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Aufgabe"
 
-#: ../src/calendar/importers/icalendar-importer.c:1223
-#: ../src/calendar/importers/icalendar-importer.c:1533
+#: ../src/calendar/importers/icalendar-importer.c:1260
+#: ../src/calendar/importers/icalendar-importer.c:1584
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Notiz"
 
 #. have ? NULL :
-#: ../src/calendar/importers/icalendar-importer.c:1232
+#: ../src/calendar/importers/icalendar-importer.c:1269
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "enthält Wiederholungen"
 
-#: ../src/calendar/importers/icalendar-importer.c:1237
+#: ../src/calendar/importers/icalendar-importer.c:1274
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "ist eine Instanz"
 
-#: ../src/calendar/importers/icalendar-importer.c:1242
+#: ../src/calendar/importers/icalendar-importer.c:1279
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "enthält Erinnerungen"
 
-#: ../src/calendar/importers/icalendar-importer.c:1247
+#: ../src/calendar/importers/icalendar-importer.c:1284
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "enthält Anlagen"
 
 #. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1260
+#: ../src/calendar/importers/icalendar-importer.c:1296
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Öffentlich"
 
 #. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1263
+#: ../src/calendar/importers/icalendar-importer.c:1299
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Privat"
 
 #. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1266
+#: ../src/calendar/importers/icalendar-importer.c:1302
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Vertraulich"
 
 #. Translators: Appointment's classification section name
-#: ../src/calendar/importers/icalendar-importer.c:1270
+#: ../src/calendar/importers/icalendar-importer.c:1306
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Einstufung"
 
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
-#: ../src/calendar/importers/icalendar-importer.c:1275
-#: ../src/calendar/importers/icalendar-importer.c:1575
+#: ../src/calendar/importers/icalendar-importer.c:1311
+#: ../src/calendar/importers/icalendar-importer.c:1627
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Zusammenfassung"
 
 #. Translators: Appointment's location
-#: ../src/calendar/importers/icalendar-importer.c:1281
+#: ../src/calendar/importers/icalendar-importer.c:1318
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Ort"
 
 #. Translators: Appointment's start time
 #. Translators: Column header for a component start date/time
-#: ../src/calendar/importers/icalendar-importer.c:1289
-#: ../src/calendar/importers/icalendar-importer.c:1570
+#: ../src/calendar/importers/icalendar-importer.c:1326
+#: ../src/calendar/importers/icalendar-importer.c:1622
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Anfang"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../src/calendar/importers/icalendar-importer.c:1300
+#: ../src/calendar/importers/icalendar-importer.c:1336
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Fällig"
 
 #. Translators: Appointment's end time
-#: ../src/calendar/importers/icalendar-importer.c:1312
+#: ../src/calendar/importers/icalendar-importer.c:1347
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Ende"
 
 #. Translators: Appointment's categories
-#: ../src/calendar/importers/icalendar-importer.c:1322
+#: ../src/calendar/importers/icalendar-importer.c:1356
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "Kategorien"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../src/calendar/importers/icalendar-importer.c:1346
+#: ../src/calendar/importers/icalendar-importer.c:1381
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Abgeschlossen"
 
 #. Translators: Appointment's URL
-#: ../src/calendar/importers/icalendar-importer.c:1354
+#: ../src/calendar/importers/icalendar-importer.c:1388
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "Adresse"
 
 #. Translators: Appointment's organizer
-#: ../src/calendar/importers/icalendar-importer.c:1365
-#: ../src/calendar/importers/icalendar-importer.c:1368
+#: ../src/calendar/importers/icalendar-importer.c:1405
+#: ../src/calendar/importers/icalendar-importer.c:1408
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Organisator"
 
 #. Translators: Appointment's attendees
-#: ../src/calendar/importers/icalendar-importer.c:1388
-#: ../src/calendar/importers/icalendar-importer.c:1391
+#: ../src/calendar/importers/icalendar-importer.c:1437
+#: ../src/calendar/importers/icalendar-importer.c:1440
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Teilnehmer"
 
-#: ../src/calendar/importers/icalendar-importer.c:1405
+#: ../src/calendar/importers/icalendar-importer.c:1456
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Beschreibung"
 
 #. Translators: Column header for a component type; it can be Event, Task or Memo
-#: ../src/calendar/importers/icalendar-importer.c:1565
+#: ../src/calendar/importers/icalendar-importer.c:1617
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Art"
@@ -10960,7 +11268,7 @@ msgid "Pacific/Yap"
 msgstr "Pazifik/Yap"
 
 #: ../src/composer/e-composer-actions.c:226
-msgid "Save as..."
+msgid "Save as…"
 msgstr "Speichern unter …"
 
 #: ../src/composer/e-composer-actions.c:321
@@ -10976,11 +11284,11 @@ msgid "Open New Message window"
 msgstr "Neues Nachrichtenfenster öffnen"
 
 #: ../src/composer/e-composer-actions.c:333 ../src/shell/e-shell.c:1469
-#: ../src/shell/e-shell-window-actions.c:894
+#: ../src/shell/e-shell-window-actions.c:912
 msgid "_Preferences"
 msgstr "_Einstellungen"
 
-#: ../src/composer/e-composer-actions.c:335 ../src/shell/e-shell-window-actions.c:896
+#: ../src/composer/e-composer-actions.c:335 ../src/shell/e-shell-window-actions.c:914
 msgid "Configure Evolution"
 msgstr "Evolution konfigurieren"
 
@@ -10989,7 +11297,7 @@ msgid "Save the current file"
 msgstr "Die momentan geöffnete Datei speichern"
 
 #: ../src/composer/e-composer-actions.c:347
-msgid "Save _As..."
+msgid "Save _As…"
 msgstr "Speichern _unter …"
 
 #: ../src/composer/e-composer-actions.c:349
@@ -11058,7 +11366,7 @@ msgstr "_Lesebestätigung anfordern"
 
 #: ../src/composer/e-composer-actions.c:438
 msgid "Get delivery notification when your message is read"
-msgstr "Eine Zustellungsbestätigung erhalten, sobald Ihre Nachricht gelesen wurde"
+msgstr "Eine Empfangsbestätigung erhalten, sobald Ihre Nachricht gelesen wurde"
 
 #: ../src/composer/e-composer-actions.c:444
 msgid "S/MIME En_crypt"
@@ -11123,11 +11431,11 @@ msgid "Save Draft"
 msgstr "Entwurf speichern"
 
 #: ../src/composer/e-composer-from-header.c:108
-#: ../src/e-util/e-collection-account-wizard.c:1966
+#: ../src/e-util/e-collection-account-wizard.c:2003
 #: ../src/e-util/e-mail-signature-script-dialog.c:416
-#: ../src/e-util/e-webdav-browser.c:2408
+#: ../src/e-util/e-webdav-browser.c:2417
 #: ../src/e-util/gal-view-instance-save-as-dialog.ui.h:2
-#: ../src/mail/e-mail-config-identity-page.c:550
+#: ../src/mail/e-mail-config-identity-page.c:551
 #: ../src/mail/e-mail-config-summary-page.c:332
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:297
 msgid "_Name:"
@@ -11178,7 +11486,7 @@ msgid "S_ubject:"
 msgstr "Be_treff:"
 
 #: ../src/composer/e-composer-header-table.c:883
-#: ../src/mail/e-mail-config-identity-page.c:743
+#: ../src/mail/e-mail-config-identity-page.c:744
 msgid "Si_gnature:"
 msgstr "Si_gnatur:"
 
@@ -11205,11 +11513,11 @@ msgstr ""
 "Ausgehende Nachricht konnte nicht verschlüsselt werden: Kein "
 "Verschlüsselungszertifikat für dieses Konto festgelegt"
 
-#: ../src/composer/e-msg-composer.c:1792 ../src/composer/e-msg-composer.c:2466
+#: ../src/composer/e-msg-composer.c:1802 ../src/composer/e-msg-composer.c:2476
 msgid "Compose Message"
 msgstr "Nachricht verfassen"
 
-#: ../src/composer/e-msg-composer.c:4987
+#: ../src/composer/e-msg-composer.c:5006
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
 "Der Editor enthält einen nicht-Text-Nachrichtenrumpf, der nicht bearbeitet werden "
@@ -11362,7 +11670,7 @@ msgid "_Save to Outbox"
 msgstr "Im Nachrichtenausgang _speichern"
 
 #: ../src/composer/mail-composer.error.xml.h:34
-#: ../src/e-util/e-collection-account-wizard.c:643
+#: ../src/e-util/e-collection-account-wizard.c:675
 msgid "_Try Again"
 msgstr "Erneut _versuchen"
 
@@ -11511,20 +11819,20 @@ msgstr "Audio-Player"
 msgid "Play the attachment in embedded audio player"
 msgstr "Anhang im eingebetteten Audio-Player abspielen"
 
-#: ../src/em-format/e-mail-formatter-headers.c:107
+#: ../src/em-format/e-mail-formatter-headers.c:108
 #: ../src/em-format/e-mail-part-headers.c:46 ../src/mail/e-mail-tag-editor.c:196
 #: ../src/mail/message-list.etspec.h:5 ../src/modules/mail/em-mailer-prefs.c:60
 msgid "From"
 msgstr "Von"
 
-#: ../src/em-format/e-mail-formatter-headers.c:132
+#: ../src/em-format/e-mail-formatter-headers.c:133
 msgid "(no subject)"
 msgstr "(Kein Betreff)"
 
 #. Translators: This message suggests to the receipients
 #. * that the sender of the mail is different from the one
 #. * listed in From field.
-#: ../src/em-format/e-mail-formatter-headers.c:339
+#: ../src/em-format/e-mail-formatter-headers.c:344
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "Diese Nachricht wurde von %s im Namen von %s gesendet"
@@ -11537,15 +11845,15 @@ msgstr "Normales Bild"
 msgid "Display part as an image"
 msgstr "Teil als Bild anzeigen"
 
-#: ../src/em-format/e-mail-formatter-message-rfc822.c:249
+#: ../src/em-format/e-mail-formatter-message-rfc822.c:253
 msgid "RFC822 message"
 msgstr "RFC822-Nachricht"
 
-#: ../src/em-format/e-mail-formatter-message-rfc822.c:250
+#: ../src/em-format/e-mail-formatter-message-rfc822.c:254
 msgid "Format part as an RFC822 message"
 msgstr "Teil als RFC822-Nachricht formatieren"
 
-#: ../src/em-format/e-mail-formatter-print.c:51 ../src/e-util/e-webdav-browser.c:2352
+#: ../src/em-format/e-mail-formatter-print.c:51 ../src/e-util/e-webdav-browser.c:2361
 #: ../src/e-util/gal-view-instance-save-as-dialog.c:92
 #: ../src/mail/e-mail-label-tree-view.c:96
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:64
@@ -11557,7 +11865,7 @@ msgstr "Name"
 msgid "Size"
 msgstr "Größe"
 
-#: ../src/em-format/e-mail-formatter-quote-headers.c:178
+#: ../src/em-format/e-mail-formatter-quote-headers.c:181
 #: ../src/em-format/e-mail-part-headers.c:51 ../src/mail/e-mail-tag-editor.c:201
 #: ../src/mail/filtertypes.xml.in.h:16 ../src/mail/message-list.etspec.h:6
 #: ../src/mail/searchtypes.xml.in.h:17 ../src/mail/vfoldertypes.xml.in.h:17
@@ -11567,8 +11875,8 @@ msgid "Subject"
 msgstr "Betreff"
 
 #. pseudo-header
-#: ../src/em-format/e-mail-formatter-quote-headers.c:197
-#: ../src/em-format/e-mail-formatter-utils.c:346
+#: ../src/em-format/e-mail-formatter-quote-headers.c:200
+#: ../src/em-format/e-mail-formatter-utils.c:360
 #: ../src/modules/mail/em-mailer-prefs.c:686
 #: ../src/modules/mail/em-mailer-prefs.c:1619
 #: ../src/modules/mail/em-mailer-prefs.c:1668
@@ -11586,12 +11894,12 @@ msgid "Display part as enriched text"
 msgstr "Teil als »enriched text« formatieren"
 
 #: ../src/em-format/e-mail-formatter-quote-text-html.c:93
-#: ../src/em-format/e-mail-formatter-text-html.c:386
+#: ../src/em-format/e-mail-formatter-text-html.c:385
 msgid "HTML"
 msgstr "HTML"
 
 #: ../src/em-format/e-mail-formatter-quote-text-html.c:94
-#: ../src/em-format/e-mail-formatter-text-html.c:387
+#: ../src/em-format/e-mail-formatter-text-html.c:386
 msgid "Format part as HTML"
 msgstr "Teil als HTML formatieren"
 
@@ -11737,59 +12045,59 @@ msgstr ""
 msgid "Display source of a MIME part"
 msgstr "Quelle als MIME-Teil anzeigen"
 
-#: ../src/em-format/e-mail-formatter-utils.c:205
-#: ../src/em-format/e-mail-formatter-utils.c:222
+#: ../src/em-format/e-mail-formatter-utils.c:212
+#: ../src/em-format/e-mail-formatter-utils.c:237
 #: ../src/em-format/e-mail-part-headers.c:48 ../src/mail/message-list.etspec.h:9
 #: ../src/mail/searchtypes.xml.in.h:11 ../src/mail/vfoldertypes.xml.in.h:11
 #: ../src/modules/mail/em-mailer-prefs.c:62
 msgid "To"
 msgstr "An"
 
-#: ../src/em-format/e-mail-formatter-utils.c:206
-#: ../src/em-format/e-mail-formatter-utils.c:223
+#: ../src/em-format/e-mail-formatter-utils.c:213
+#: ../src/em-format/e-mail-formatter-utils.c:238
 #: ../src/em-format/e-mail-part-headers.c:49 ../src/modules/mail/em-mailer-prefs.c:63
 msgid "Cc"
 msgstr "Kopie"
 
-#: ../src/em-format/e-mail-formatter-utils.c:207
-#: ../src/em-format/e-mail-formatter-utils.c:224
+#: ../src/em-format/e-mail-formatter-utils.c:214
+#: ../src/em-format/e-mail-formatter-utils.c:239
 #: ../src/em-format/e-mail-part-headers.c:50 ../src/modules/mail/em-mailer-prefs.c:64
 msgid "Bcc"
 msgstr "Blindkopie"
 
-#: ../src/em-format/e-mail-formatter-utils.c:564
+#: ../src/em-format/e-mail-formatter-utils.c:577
 msgid "GPG signed"
 msgstr "Mit GPG signiert"
 
-#: ../src/em-format/e-mail-formatter-utils.c:564
+#: ../src/em-format/e-mail-formatter-utils.c:577
 msgid "partially GPG signed"
 msgstr "teilweise mit GPG signiert"
 
-#: ../src/em-format/e-mail-formatter-utils.c:565
+#: ../src/em-format/e-mail-formatter-utils.c:578
 msgid "GPG encrypted"
 msgstr "Mit GPG verschlüsselt"
 
-#: ../src/em-format/e-mail-formatter-utils.c:565
+#: ../src/em-format/e-mail-formatter-utils.c:578
 msgid "partially GPG encrypted"
 msgstr "teilweise mit GPG verschlüsselt"
 
-#: ../src/em-format/e-mail-formatter-utils.c:566
+#: ../src/em-format/e-mail-formatter-utils.c:579
 msgid "S/MIME signed"
 msgstr "Mit S/MIME signiert"
 
-#: ../src/em-format/e-mail-formatter-utils.c:566
+#: ../src/em-format/e-mail-formatter-utils.c:579
 msgid "partially S/MIME signed"
 msgstr "teilweise mit S/MIME signiert"
 
-#: ../src/em-format/e-mail-formatter-utils.c:567
+#: ../src/em-format/e-mail-formatter-utils.c:580
 msgid "S/MIME encrypted"
 msgstr "Mit S/MIME verschlüsselt"
 
-#: ../src/em-format/e-mail-formatter-utils.c:567
+#: ../src/em-format/e-mail-formatter-utils.c:580
 msgid "partially S/MIME encrypted"
 msgstr "teilweise mit S/MIME verschlüsselt"
 
-#: ../src/em-format/e-mail-formatter-utils.c:680
+#: ../src/em-format/e-mail-formatter-utils.c:693
 #: ../src/mail/e-mail-config-security-page.c:856
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:273
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:216
@@ -11801,7 +12109,7 @@ msgstr "Sicherheit"
 msgid "Error parsing MBOX part: %s"
 msgstr "Fehler beim Einlesen des MBOX-Teils: %s"
 
-#: ../src/em-format/e-mail-parser-application-smime.c:101
+#: ../src/em-format/e-mail-parser-application-smime.c:113
 #, c-format
 msgid "Could not parse S/MIME message: %s"
 msgstr "S/MIME-Nachricht konnte nicht analysiert werden: %s"
@@ -11812,7 +12120,7 @@ msgid "Could not parse PGP message: %s"
 msgstr "PGP-Nachricht konnte nicht analysiert werden: %s"
 
 #: ../src/em-format/e-mail-parser-inlinepgp-signed.c:79
-#: ../src/em-format/e-mail-parser-multipart-signed.c:152
+#: ../src/em-format/e-mail-parser-multipart-signed.c:163
 #, c-format
 msgid "Error verifying signature: %s"
 msgstr "Fehler beim Überprüfen der Signatur: %s"
@@ -11846,23 +12154,23 @@ msgstr "Zeiger auf ferne Daten (%s)"
 msgid "Pointer to unknown external data (“%s” type)"
 msgstr "Zeiger auf unbekannte externe Daten (Typ »%s«)"
 
-#: ../src/em-format/e-mail-parser-multipart-encrypted.c:65
-#: ../src/em-format/e-mail-parser-multipart-signed.c:100
+#: ../src/em-format/e-mail-parser-multipart-encrypted.c:74
+#: ../src/em-format/e-mail-parser-multipart-signed.c:109
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "Die Syntax der MIME-Nachricht konnte nicht analysiert werden und wird daher als "
 "Quelltext angezeigt."
 
-#: ../src/em-format/e-mail-parser-multipart-encrypted.c:80
+#: ../src/em-format/e-mail-parser-multipart-encrypted.c:89
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Nicht unterstützter Verschlüsselungstyp für multipart/encrypted"
 
-#: ../src/em-format/e-mail-parser-multipart-encrypted.c:99
+#: ../src/em-format/e-mail-parser-multipart-encrypted.c:108
 #, c-format
 msgid "Could not parse PGP/MIME message: %s"
 msgstr "PGP/MIME-Nachricht konnte nicht analysiert werden: %s"
 
-#: ../src/em-format/e-mail-parser-multipart-signed.c:138
+#: ../src/em-format/e-mail-parser-multipart-signed.c:149
 msgid "Unsupported signature format"
 msgstr "Nicht unterstütztes Signaturformat"
 
@@ -11903,7 +12211,7 @@ msgstr "Zertifikat _importieren"
 msgid "This certificate is not viewable"
 msgstr "Dieses Zertifikat kann nicht angezeigt werden"
 
-#: ../src/em-format/e-mail-part-utils.c:630
+#: ../src/em-format/e-mail-part-utils.c:634
 #, c-format
 msgid "%s attachment"
 msgstr "%s-Anlage"
@@ -11923,7 +12231,7 @@ msgstr "Evolution Kalenderelement"
 
 #: ../src/e-util/e-accounts-window.c:557 ../src/e-util/e-accounts-window.c:674
 #: ../src/e-util/e-accounts-window.c:894
-#: ../src/modules/mail/e-mail-shell-backend.c:870
+#: ../src/modules/mail/e-mail-shell-backend.c:910
 msgid "Mail Accounts"
 msgstr "E-Mail-Konten"
 
@@ -11940,13 +12248,12 @@ msgstr "Kalender"
 
 #: ../src/e-util/e-accounts-window.c:576 ../src/e-util/e-accounts-window.c:705
 #: ../src/e-util/e-accounts-window.c:910
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:87
 msgid "Memo Lists"
 msgstr "Notizlisten"
 
 #: ../src/e-util/e-accounts-window.c:582 ../src/e-util/e-accounts-window.c:706
 #: ../src/e-util/e-accounts-window.c:911
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:88
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:87
 msgid "Task Lists"
 msgstr "Aufgabenlisten"
 
@@ -11995,10 +12302,10 @@ msgstr "Evolution-Konten"
 #. widget = gtk_button_new_with_mnemonic (_("_Permissions"));
 #. gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 #. webdav_browser->priv->permissions_button = widget;
-#: ../src/e-util/e-accounts-window.c:1761 ../src/e-util/e-webdav-browser.c:2699
-#: ../src/mail/em-subscription-editor.c:1950
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1561
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1632
+#: ../src/e-util/e-accounts-window.c:1761 ../src/e-util/e-webdav-browser.c:2708
+#: ../src/mail/em-subscription-editor.c:1952
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1600
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1678
 msgid "_Refresh"
 msgstr "_Aktualisieren"
 
@@ -12040,13 +12347,14 @@ msgstr "%s"
 #. *              percent complete is known.
 #. Translators: This is a running activity whose percent complete is known.
 #: ../src/e-util/e-activity.c:273
-#: ../src/modules/calendar/e-cal-base-shell-content.c:142
+#: ../src/modules/addressbook/e-book-shell-view-private.c:334
+#: ../src/modules/calendar/e-cal-base-shell-content.c:143
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (zu %d%% abgeschlossen)"
 
 #: ../src/e-util/e-activity-proxy.c:350
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1744
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1790
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -12117,14 +12425,14 @@ msgstr "Die Anlage konnte nicht gespeichert werden"
 msgid "Attachment Properties"
 msgstr "Eigenschaften der Anlage"
 
-#: ../src/e-util/e-attachment-dialog.c:337 ../src/e-util/e-import-assistant.c:276
+#: ../src/e-util/e-attachment-dialog.c:337 ../src/e-util/e-import-assistant.c:277
 msgid "F_ilename:"
 msgstr "Datei_name:"
 
 #: ../src/e-util/e-attachment-dialog.c:354
 #: ../src/e-util/e-html-editor-image-dialog.c:513
-#: ../src/e-util/e-html-editor-link-dialog.c:241
-#: ../src/e-util/e-webdav-browser.c:2447
+#: ../src/e-util/e-html-editor-link-dialog.c:229
+#: ../src/e-util/e-webdav-browser.c:2456
 msgid "_Description:"
 msgstr "_Beschreibung:"
 
@@ -12194,7 +12502,7 @@ msgid "Save extracted files and the original _archive"
 msgstr "Speichern der extrahierten Dateien und das Original-_Archiv"
 
 #: ../src/e-util/e-attachment-view.c:308
-msgid "Open With Other Application..."
+msgid "Open With Other Application…"
 msgstr "Mit anderer Anwendung öffnen …"
 
 #: ../src/e-util/e-attachment-view.c:315
@@ -12213,16 +12521,16 @@ msgid "Save _As"
 msgstr "Speichern _unter"
 
 #: ../src/e-util/e-attachment-view.c:341
-msgid "A_dd Attachment..."
+msgid "A_dd Attachment…"
 msgstr "Anlage _hinzufügen …"
 
 #: ../src/e-util/e-attachment-view.c:348
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1181
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1332
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:621
-#: ../src/modules/calendar/e-task-shell-view-actions.c:747
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1554
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1625
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1284
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:619
+#: ../src/modules/calendar/e-task-shell-view-actions.c:745
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1593
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1671
 msgid "_Properties"
 msgstr "Ei_genschaften"
 
@@ -12328,25 +12636,25 @@ msgstr "Den Inhalt der Aufgabenliste lokal zur Arbeit im Offline-Modus kopieren"
 msgid "Copy memo list contents locally for offline operation"
 msgstr "Den Inhalt der Notizliste lokal zur Arbeit im Offline-Modus kopieren"
 
-#: ../src/e-util/e-categories-editor.c:246
+#: ../src/e-util/e-categories-editor.c:251
 msgid "Currently _used categories:"
 msgstr "Gegenwärtig gen_utzte Kategorien:"
 
-#: ../src/e-util/e-categories-editor.c:257
+#: ../src/e-util/e-categories-editor.c:262
 msgid "_Available Categories:"
 msgstr "Verfügbare Kate_gorien:"
 
-#: ../src/e-util/e-categories-editor.c:297
+#: ../src/e-util/e-categories-editor.c:302
 msgctxt "category"
 msgid "_New"
 msgstr "_Neu"
 
-#: ../src/e-util/e-categories-editor.c:301
+#: ../src/e-util/e-categories-editor.c:306
 msgctxt "category"
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: ../src/e-util/e-categories-editor.c:305
+#: ../src/e-util/e-categories-editor.c:310
 msgctxt "category"
 msgid "_Delete"
 msgstr "_Löschen"
@@ -12360,31 +12668,31 @@ msgstr "Symbol"
 msgid "Create category “%s”"
 msgstr "Kategorie »%s« erstellen"
 
-#: ../src/e-util/e-category-editor.c:169 ../src/e-util/e-category-editor.c:234
+#: ../src/e-util/e-category-editor.c:167 ../src/e-util/e-category-editor.c:232
 msgid "Category Icon"
 msgstr "Kategoriesymbol"
 
-#: ../src/e-util/e-category-editor.c:173
+#: ../src/e-util/e-category-editor.c:171
 msgid "_No Image"
 msgstr "_Kein Bild"
 
-#: ../src/e-util/e-category-editor.c:207
+#: ../src/e-util/e-category-editor.c:205
 msgid "Category _Name"
 msgstr "Kategorie_name"
 
-#: ../src/e-util/e-category-editor.c:220
+#: ../src/e-util/e-category-editor.c:218
 msgid "Category _Icon"
 msgstr "Kategories_ymbol"
 
-#: ../src/e-util/e-category-editor.c:236
+#: ../src/e-util/e-category-editor.c:234
 msgid "_Unset icon"
 msgstr "Symbol _zurücksetzen"
 
-#: ../src/e-util/e-category-editor.c:262
+#: ../src/e-util/e-category-editor.c:260
 msgid "Category Properties"
 msgstr "Kategorieeigenschaften"
 
-#: ../src/e-util/e-category-editor.c:323
+#: ../src/e-util/e-category-editor.c:321
 #, c-format
 msgid ""
 "There is already a category “%s” in the configuration. Please use another name"
@@ -12397,7 +12705,7 @@ msgid "popup list"
 msgstr "Popup-Liste"
 
 #: ../src/e-util/e-cell-date.c:49 ../src/e-util/e-cell-date.c:137
-#: ../src/e-util/e-cell-date.c:157 ../src/mail/message-list.c:2146
+#: ../src/e-util/e-cell-date.c:157 ../src/mail/message-list.c:2143
 msgid "?"
 msgstr "?"
 
@@ -12498,7 +12806,6 @@ msgstr "Vereinfacht"
 msgid "Ukrainian"
 msgstr "Ukrainisch"
 
-# CHECK
 #. Translators: Character set "Hebrew, Visual"
 #: ../src/e-util/e-charset.c:102
 msgid "Visual"
@@ -12512,8 +12819,8 @@ msgstr "Zeichenkodierung"
 msgid "Enter the character set to use"
 msgstr "Geben Sie den zu verwendenden Zeichensatz ein"
 
-#: ../src/e-util/e-charset-combo-box.c:363
-msgid "Other..."
+#: ../src/e-util/e-charset-combo-box.c:364
+msgid "Other…"
 msgstr "Weitere …"
 
 #: ../src/e-util/e-client-cache.c:1149 ../src/e-util/e-client-cache.c:1280
@@ -12521,50 +12828,54 @@ msgstr "Weitere …"
 msgid "Cannot create a client object from extension name “%s”"
 msgstr "Es kann kein Client-Objekt für den Erweiterungsnamen »%s« erstellt werden"
 
-#: ../src/e-util/e-collection-account-wizard.c:106
+#: ../src/e-util/e-collection-account-wizard.c:107
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:83
 msgid "_Finish"
 msgstr "_Fertigstellen"
 
-#: ../src/e-util/e-collection-account-wizard.c:108
-#: ../src/e-util/e-collection-account-wizard.c:266 ../src/e-util/e-search-bar.c:677
+#: ../src/e-util/e-collection-account-wizard.c:110
+msgid "_Look Up"
+msgstr "Nach_schlagen"
+
+#: ../src/e-util/e-collection-account-wizard.c:112
+#: ../src/e-util/e-collection-account-wizard.c:273 ../src/e-util/e-search-bar.c:677
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:85
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:244
 msgid "_Next"
 msgstr "_Weitersuchen"
 
-#: ../src/e-util/e-collection-account-wizard.c:180
+#: ../src/e-util/e-collection-account-wizard.c:184
 msgid "New Collection Account"
 msgstr "Neues Sammelkonto"
 
-#: ../src/e-util/e-collection-account-wizard.c:251 ../src/e-util/e-search-bar.c:665
+#: ../src/e-util/e-collection-account-wizard.c:258 ../src/e-util/e-search-bar.c:665
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:78
 msgid "_Previous"
 msgstr "_Rückwärts suchen"
 
-#: ../src/e-util/e-collection-account-wizard.c:416
+#: ../src/e-util/e-collection-account-wizard.c:439
 msgid "Looking up details, please wait…"
 msgstr "Nach Details wird gesucht, bitte warten …"
 
 #. Translators: The %s is replaced with a clickable text "Enter password", thus it'll be "Requires password 
to continue. Enter password." at the end.
-#: ../src/e-util/e-collection-account-wizard.c:473
+#: ../src/e-util/e-collection-account-wizard.c:496
 #, c-format
 msgid "Requires password to continue. %s."
 msgstr "Passwort wird zum Fortfahren benötigt. %s."
 
-#: ../src/e-util/e-collection-account-wizard.c:486
+#: ../src/e-util/e-collection-account-wizard.c:509
 msgid "View certificate"
 msgstr "Zertifikat anzeigen"
 
 #. Translators: The first %s is replaced with actual error message about site certificate invalidity,
 #. like "The signing certificate authority is not known.", the second %s is replaced with a link "View 
certificate".
-#: ../src/e-util/e-collection-account-wizard.c:490
+#: ../src/e-util/e-collection-account-wizard.c:513
 #, c-format
 msgctxt "collection-account-wizard"
 msgid "%s %s."
 msgstr "%s %s."
 
-#: ../src/e-util/e-collection-account-wizard.c:528
+#: ../src/e-util/e-collection-account-wizard.c:551
 msgid ""
 "Found no candidates. It can also mean that the server doesn’t provide any "
 "information about its configuration using the selected lookup methods. Enter the "
@@ -12574,80 +12885,80 @@ msgstr ""
 "Konfigurationsinformationen über die gewählten Suchmethoden bereitstellt. Geben "
 "Sie stattdessen das Konto manuell ein, oder ändern Sie die obigen Einstellungen."
 
-#: ../src/e-util/e-collection-account-wizard.c:530
+#: ../src/e-util/e-collection-account-wizard.c:553
 #, c-format
 msgid "Found one candidate"
 msgid_plural "Found %d candidates"
 msgstr[0] "Ein Treffer gefunden"
 msgstr[1] "%d Treffer gefunden"
 
-#: ../src/e-util/e-collection-account-wizard.c:625
+#: ../src/e-util/e-collection-account-wizard.c:657
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:30
 #: ../src/smime/gui/certificate-manager.c:766
 msgid "_Password:"
 msgstr "_Passwort:"
 
-#: ../src/e-util/e-collection-account-wizard.c:637
+#: ../src/e-util/e-collection-account-wizard.c:669
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:31
 msgid "_Remember password"
 msgstr "Passwort _merken"
 
-#: ../src/e-util/e-collection-account-wizard.c:780
-#: ../src/e-util/e-webdav-browser.c:473
+#: ../src/e-util/e-collection-account-wizard.c:812
+#: ../src/e-util/e-webdav-browser.c:474
 msgid "Collection"
 msgstr "Sammlung"
 
-#: ../src/e-util/e-collection-account-wizard.c:781
+#: ../src/e-util/e-collection-account-wizard.c:813
 msgid "Mail Receive"
 msgstr "E-Mail empfangen"
 
-#: ../src/e-util/e-collection-account-wizard.c:782
+#: ../src/e-util/e-collection-account-wizard.c:814
 msgid "Mail Send"
 msgstr "E-Mail versenden"
 
-#: ../src/e-util/e-collection-account-wizard.c:783
+#: ../src/e-util/e-collection-account-wizard.c:815
 #: ../src/e-util/e-name-selector-dialog.c:445
 #: ../src/mail/importers/pine-importer.c:430
 msgid "Address Book"
 msgstr "Adressbuch"
 
-#: ../src/e-util/e-collection-account-wizard.c:785
+#: ../src/e-util/e-collection-account-wizard.c:817
 msgid "Memo List"
 msgstr "Notizliste"
 
-#: ../src/e-util/e-collection-account-wizard.c:786
+#: ../src/e-util/e-collection-account-wizard.c:818
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:63
 msgid "Task List"
 msgstr "Aufgabenliste"
 
-#: ../src/e-util/e-collection-account-wizard.c:1122
+#: ../src/e-util/e-collection-account-wizard.c:1154
 msgid "Looking up LDAP server’s search base…"
 msgstr "Die Suchbasis des LDAP-Servers wird ermittelt …"
 
-#: ../src/e-util/e-collection-account-wizard.c:1429
+#: ../src/e-util/e-collection-account-wizard.c:1461
 msgid "Saving account settings, please wait…"
 msgstr "Kontoeinstellungen werden gespeichert, bitte warten …"
 
-#: ../src/e-util/e-collection-account-wizard.c:1573
+#: ../src/e-util/e-collection-account-wizard.c:1612
 msgid "User details"
 msgstr "Benutzerdetails"
 
-#: ../src/e-util/e-collection-account-wizard.c:1586
+#: ../src/e-util/e-collection-account-wizard.c:1625
 msgid "_Email Address or User name:"
 msgstr "E-Mail-Adresse oder Benutzername:"
 
-#: ../src/e-util/e-collection-account-wizard.c:1617
+#: ../src/e-util/e-collection-account-wizard.c:1656
 msgid "_Advanced Options"
 msgstr "_Erweiterte Einstellungen"
 
-#: ../src/e-util/e-collection-account-wizard.c:1622
+#: ../src/e-util/e-collection-account-wizard.c:1661
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:217
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:173
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:25
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../src/e-util/e-collection-account-wizard.c:1641
+#: ../src/e-util/e-collection-account-wizard.c:1680
 msgid ""
 "Semicolon (“;”) separated list of servers to look up information for, in addition "
 "to the domain of the e-mail address."
@@ -12655,12 +12966,12 @@ msgstr ""
 "Durch Semikola (»;«) getrennte Liste von Servern, um Informationen zusätzlich zur "
 "Domäne der E-Mail-Adresse abzurufen."
 
-#: ../src/e-util/e-collection-account-wizard.c:1833
+#: ../src/e-util/e-collection-account-wizard.c:1870
 msgid "Select which parts should be configured:"
 msgstr "Wählen Sie, welche Teile eingerichtet werden sollen:"
 
-#: ../src/e-util/e-collection-account-wizard.c:1957
-#: ../src/mail/e-mail-config-identity-page.c:541
+#: ../src/e-util/e-collection-account-wizard.c:1994
+#: ../src/mail/e-mail-config-identity-page.c:542
 #: ../src/mail/e-mail-config-summary-page.c:323
 msgid "Account Information"
 msgstr "Konteninformation"
@@ -12669,169 +12980,169 @@ msgstr "Konteninformation"
 msgid "Choose custom color"
 msgstr "Benutzerdefinierte Farbe auswählen"
 
-#: ../src/e-util/e-color-combo.c:79
+#: ../src/e-util/e-color-combo.c:76
 msgid "black"
 msgstr "schwarz"
 
-#: ../src/e-util/e-color-combo.c:80
+#: ../src/e-util/e-color-combo.c:77
 msgid "light brown"
 msgstr "hellbraun"
 
-#: ../src/e-util/e-color-combo.c:81
+#: ../src/e-util/e-color-combo.c:78
 msgid "brown gold"
 msgstr "goldbraun"
 
-#: ../src/e-util/e-color-combo.c:82
+#: ../src/e-util/e-color-combo.c:79
 msgid "dark green #2"
 msgstr "dunkelgrün Nr. 2"
 
-#: ../src/e-util/e-color-combo.c:83
+#: ../src/e-util/e-color-combo.c:80
 msgid "navy"
 msgstr "marineblau"
 
-#: ../src/e-util/e-color-combo.c:84
+#: ../src/e-util/e-color-combo.c:81
 msgid "dark blue"
 msgstr "dunkelblau"
 
-#: ../src/e-util/e-color-combo.c:85
+#: ../src/e-util/e-color-combo.c:82
 msgid "purple #2"
 msgstr "purpur Nr. 2"
 
-#: ../src/e-util/e-color-combo.c:86
+#: ../src/e-util/e-color-combo.c:83
 msgid "very dark gray"
 msgstr "sehr dunkles Grau"
 
-#: ../src/e-util/e-color-combo.c:88
+#: ../src/e-util/e-color-combo.c:85
 msgid "dark red"
 msgstr "dunkelrot"
 
-#: ../src/e-util/e-color-combo.c:89
+#: ../src/e-util/e-color-combo.c:86
 msgid "red-orange"
 msgstr "rot-orange"
 
-#: ../src/e-util/e-color-combo.c:90
+#: ../src/e-util/e-color-combo.c:87
 msgid "gold"
 msgstr "golden"
 
-#: ../src/e-util/e-color-combo.c:91
+#: ../src/e-util/e-color-combo.c:88
 msgid "dark green"
 msgstr "dunkelgrün"
 
-#: ../src/e-util/e-color-combo.c:92
+#: ../src/e-util/e-color-combo.c:89
 msgid "dull blue"
 msgstr "mattblau"
 
-#: ../src/e-util/e-color-combo.c:93
+#: ../src/e-util/e-color-combo.c:90
 msgid "blue"
 msgstr "blau"
 
-#: ../src/e-util/e-color-combo.c:94
+#: ../src/e-util/e-color-combo.c:91
 msgid "dull purple"
 msgstr "mattpurpur"
 
-#: ../src/e-util/e-color-combo.c:95
+#: ../src/e-util/e-color-combo.c:92
 msgid "dark grey"
 msgstr "dunkelgrau"
 
-#: ../src/e-util/e-color-combo.c:97
+#: ../src/e-util/e-color-combo.c:94
 msgid "red"
 msgstr "rot"
 
-#: ../src/e-util/e-color-combo.c:98
+#: ../src/e-util/e-color-combo.c:95
 msgid "orange"
 msgstr "orange"
 
-#: ../src/e-util/e-color-combo.c:99
+#: ../src/e-util/e-color-combo.c:96
 msgid "lime"
 msgstr "limone"
 
-#: ../src/e-util/e-color-combo.c:100
+#: ../src/e-util/e-color-combo.c:97
 msgid "dull green"
 msgstr "mattgrün"
 
-#: ../src/e-util/e-color-combo.c:101
+#: ../src/e-util/e-color-combo.c:98
 msgid "dull blue #2"
 msgstr "mattblau Nr. 2"
 
-#: ../src/e-util/e-color-combo.c:102
+#: ../src/e-util/e-color-combo.c:99
 msgid "sky blue #2"
 msgstr "himmelblau Nr. 2"
 
-#: ../src/e-util/e-color-combo.c:103
+#: ../src/e-util/e-color-combo.c:100
 msgid "purple"
 msgstr "purpur"
 
-#: ../src/e-util/e-color-combo.c:104
+#: ../src/e-util/e-color-combo.c:101
 msgid "gray"
 msgstr "grau"
 
-#: ../src/e-util/e-color-combo.c:106
+#: ../src/e-util/e-color-combo.c:103
 msgid "magenta"
 msgstr "magenta"
 
-#: ../src/e-util/e-color-combo.c:107
+#: ../src/e-util/e-color-combo.c:104
 msgid "bright orange"
 msgstr "hellorange"
 
-#: ../src/e-util/e-color-combo.c:108
+#: ../src/e-util/e-color-combo.c:105
 msgid "yellow"
 msgstr "gelb"
 
-#: ../src/e-util/e-color-combo.c:109
+#: ../src/e-util/e-color-combo.c:106
 msgid "green"
 msgstr "grün"
 
-#: ../src/e-util/e-color-combo.c:110
+#: ../src/e-util/e-color-combo.c:107
 msgid "cyan"
 msgstr "zyan"
 
-#: ../src/e-util/e-color-combo.c:111
+#: ../src/e-util/e-color-combo.c:108
 msgid "bright blue"
 msgstr "hellblau"
 
-#: ../src/e-util/e-color-combo.c:112
+#: ../src/e-util/e-color-combo.c:109
 msgid "red purple"
 msgstr "rötlichpurpur"
 
-#: ../src/e-util/e-color-combo.c:113
+#: ../src/e-util/e-color-combo.c:110
 msgid "light grey"
 msgstr "hellgrau"
 
-#: ../src/e-util/e-color-combo.c:115
+#: ../src/e-util/e-color-combo.c:112
 msgid "pink"
 msgstr "rosa"
 
-#: ../src/e-util/e-color-combo.c:116
+#: ../src/e-util/e-color-combo.c:113
 msgid "light orange"
 msgstr "hellorange"
 
-#: ../src/e-util/e-color-combo.c:117
+#: ../src/e-util/e-color-combo.c:114
 msgid "light yellow"
 msgstr "hellgelb"
 
-#: ../src/e-util/e-color-combo.c:118
+#: ../src/e-util/e-color-combo.c:115
 msgid "light green"
 msgstr "hellgrün"
 
-#: ../src/e-util/e-color-combo.c:119
+#: ../src/e-util/e-color-combo.c:116
 msgid "light cyan"
 msgstr "hellzyan"
 
-#: ../src/e-util/e-color-combo.c:120
+#: ../src/e-util/e-color-combo.c:117
 msgid "light blue"
 msgstr "hellblau"
 
-#: ../src/e-util/e-color-combo.c:121
+#: ../src/e-util/e-color-combo.c:118
 msgid "light purple"
 msgstr "hellpurpur"
 
-#: ../src/e-util/e-color-combo.c:122
+#: ../src/e-util/e-color-combo.c:119
 msgid "white"
 msgstr "weiß"
 
-#: ../src/e-util/e-color-combo.c:641 ../src/mail/e-mail-account-tree-view.c:135
+#: ../src/e-util/e-color-combo.c:539 ../src/mail/e-mail-account-tree-view.c:135
 #: ../src/mail/e-mail-config-security-page.c:544
-#: ../src/mail/e-mail-config-security-page.c:708 ../src/mail/e-mail-reader.c:4816
+#: ../src/mail/e-mail-config-security-page.c:708 ../src/mail/e-mail-reader.c:4849
 #: ../src/mail/mail-config.ui.h:78
 msgid "Default"
 msgstr "Vorgabe"
@@ -13392,11 +13703,11 @@ msgid "Increase Indent"
 msgstr "Einzug erhöhen"
 
 #: ../src/e-util/e-html-editor-actions.c:1020
-msgid "_HTML File..."
+msgid "_HTML File…"
 msgstr "_HTML-Datei …"
 
 #: ../src/e-util/e-html-editor-actions.c:1027
-msgid "Te_xt File..."
+msgid "Te_xt File…"
 msgstr "Te_xtdatei …"
 
 #: ../src/e-util/e-html-editor-actions.c:1034
@@ -13404,7 +13715,7 @@ msgid "Paste _Quotation"
 msgstr "_Zitat einfügen"
 
 #: ../src/e-util/e-html-editor-actions.c:1041
-msgid "_Find..."
+msgid "_Find…"
 msgstr "_Suchen …"
 
 #: ../src/e-util/e-html-editor-actions.c:1043
@@ -13416,15 +13727,15 @@ msgid "Find A_gain"
 msgstr "Wei_tersuchen"
 
 #: ../src/e-util/e-html-editor-actions.c:1055
-msgid "Re_place..."
-msgstr "_Ersetzen …"
+msgid "Re_place…"
+msgstr "Erset_zen …"
 
 #: ../src/e-util/e-html-editor-actions.c:1057
 msgid "Search for and replace text"
 msgstr "Nach Text suchen und diesen ersetzen"
 
 #: ../src/e-util/e-html-editor-actions.c:1062
-msgid "Check _Spelling..."
+msgid "Check _Spelling…"
 msgstr "_Rechtschreibprüfung …"
 
 #: ../src/e-util/e-html-editor-actions.c:1069
@@ -13540,7 +13851,7 @@ msgstr "_Alphabetische Liste"
 
 #: ../src/e-util/e-html-editor-actions.c:1227
 #: ../src/e-util/e-html-editor-actions.c:1265
-msgid "_Image..."
+msgid "_Image…"
 msgstr "_Bild …"
 
 #. Translators: This is an action tooltip
@@ -13550,7 +13861,7 @@ msgstr "Bild einfügen"
 
 #: ../src/e-util/e-html-editor-actions.c:1235
 #: ../src/e-util/e-html-editor-actions.c:1272
-msgid "_Link..."
+msgid "_Link…"
 msgstr "_Verweis …"
 
 #: ../src/e-util/e-html-editor-actions.c:1237
@@ -13560,7 +13871,7 @@ msgstr "Verweis einfügen"
 #. Translators: 'Rule' here means a horizontal line in an HTML text
 #: ../src/e-util/e-html-editor-actions.c:1243
 #: ../src/e-util/e-html-editor-actions.c:1287
-msgid "_Rule..."
+msgid "_Rule…"
 msgstr "T_rennlinie …"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
@@ -13570,7 +13881,7 @@ msgstr "Trennlinie einfügen"
 
 #: ../src/e-util/e-html-editor-actions.c:1251
 #: ../src/e-util/e-html-editor-actions.c:1294
-msgid "_Table..."
+msgid "_Table…"
 msgstr "_Tabelle …"
 
 #: ../src/e-util/e-html-editor-actions.c:1253
@@ -13578,11 +13889,11 @@ msgid "Insert Table"
 msgstr "Tabelle einfügen"
 
 #: ../src/e-util/e-html-editor-actions.c:1258
-msgid "_Cell..."
+msgid "_Cell…"
 msgstr "_Zelle …"
 
 #: ../src/e-util/e-html-editor-actions.c:1279
-msgid "Pa_ge..."
+msgid "Pa_ge…"
 msgstr "_Seite …"
 
 #: ../src/e-util/e-html-editor-actions.c:1303
@@ -13723,36 +14034,36 @@ msgid "Row Below"
 msgstr "Zeile darunter"
 
 #: ../src/e-util/e-html-editor-actions.c:1538
-msgid "Cell..."
+msgid "Cell…"
 msgstr "Zelle …"
 
 #: ../src/e-util/e-html-editor-actions.c:1545
-msgid "Image..."
+msgid "Image…"
 msgstr "Bild …"
 
 #: ../src/e-util/e-html-editor-actions.c:1552
-msgid "Link..."
+msgid "Link…"
 msgstr "Verweis …"
 
 #: ../src/e-util/e-html-editor-actions.c:1559
-msgid "Page..."
+msgid "Page…"
 msgstr "Seite …"
 
 #: ../src/e-util/e-html-editor-actions.c:1566
-msgid "Paragraph..."
+msgid "Paragraph…"
 msgstr "Absatz …"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
 #: ../src/e-util/e-html-editor-actions.c:1574
-msgid "Rule..."
-msgstr "Trennlinie …"
+msgid "Rule…"
+msgstr "T_rennlinie …"
 
 #: ../src/e-util/e-html-editor-actions.c:1581
-msgid "Table..."
+msgid "Table…"
 msgstr "Tabelle …"
 
 #: ../src/e-util/e-html-editor-actions.c:1588
-msgid "Text..."
+msgid "Text…"
 msgstr "Text …"
 
 #: ../src/e-util/e-html-editor-actions.c:1595
@@ -13981,7 +14292,7 @@ msgstr "Groß/klein _unterscheiden"
 msgid "_Wrap Search"
 msgstr "Suche am Anfang fortsetzen"
 
-#: ../src/e-util/e-html-editor-find-dialog.c:268
+#: ../src/e-util/e-html-editor-find-dialog.c:262
 msgid "Find"
 msgstr "Suchen"
 
@@ -14050,24 +14361,23 @@ msgid "<b>Link</b>"
 msgstr "<b>Verweis</b>"
 
 #: ../src/e-util/e-html-editor-image-dialog.c:663
-#: ../src/e-util/e-html-editor-link-dialog.c:219
+#: ../src/e-util/e-html-editor-link-dialog.c:213
 msgid "_URL:"
 msgstr "_Adresse:"
 
 #: ../src/e-util/e-html-editor-image-dialog.c:668
-#: ../src/e-util/e-html-editor-link-dialog.c:224
-msgid "_Test URL..."
+msgid "_Test URL…"
 msgstr "Adresse über_prüfen …"
 
 #: ../src/e-util/e-html-editor-image-dialog.c:685
 msgid "Image Properties"
 msgstr "Bildeigenschaften"
 
-#: ../src/e-util/e-html-editor-link-dialog.c:248
+#: ../src/e-util/e-html-editor-link-dialog.c:236
 msgid "_Remove Link"
 msgstr "Verknüpfung en_tfernen"
 
-#: ../src/e-util/e-html-editor-link-dialog.c:273
+#: ../src/e-util/e-html-editor-link-dialog.c:261
 msgid "Link Properties"
 msgstr "Verweis-Eigenschaften"
 
@@ -14125,12 +14435,12 @@ msgid "<b>Background Image</b>"
 msgstr "<b>Hintergrundbild</b>"
 
 #: ../src/e-util/e-html-editor-page-dialog.c:473
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:90
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:89
 msgid "_Template:"
 msgstr "_Vorlage:"
 
 #: ../src/e-util/e-html-editor-page-dialog.c:481
-#: ../src/e-util/e-import-assistant.c:286
+#: ../src/e-util/e-import-assistant.c:287
 msgid "Select a file"
 msgstr "Eine Datei wählen"
 
@@ -14262,7 +14572,7 @@ msgstr "_Füllung:"
 
 #: ../src/e-util/e-html-editor-table-dialog.c:685
 #: ../src/e-util/e-html-editor-text-dialog.c:248
-#: ../src/e-util/e-webdav-browser.c:2418
+#: ../src/e-util/e-webdav-browser.c:2427
 msgid "_Color:"
 msgstr "_Farbe:"
 
@@ -14290,32 +14600,32 @@ msgstr ""
 "Wählen Sie die Datei, die Sie in Evolution importieren wollen und legen Sie den "
 "Dateityp anhand der Auswahlliste fest."
 
-#: ../src/e-util/e-import-assistant.c:300 ../src/e-util/e-import-assistant.c:475
+#: ../src/e-util/e-import-assistant.c:301 ../src/e-util/e-import-assistant.c:480
 msgid "File _type:"
 msgstr "Datei_typ:"
 
-#: ../src/e-util/e-import-assistant.c:343 ../src/e-util/e-import-assistant.c:956
+#: ../src/e-util/e-import-assistant.c:344 ../src/e-util/e-import-assistant.c:962
 msgid "Choose the destination for this import"
 msgstr "Wählen Sie das Ziel dieses Imports"
 
-#: ../src/e-util/e-import-assistant.c:368
+#: ../src/e-util/e-import-assistant.c:370
 msgid "Choose the type of importer to run:"
 msgstr "Wählen Sie den auszuführenden Importeur:"
 
-#: ../src/e-util/e-import-assistant.c:376
+#: ../src/e-util/e-import-assistant.c:379
 msgid "Import data and settings from _older programs"
 msgstr "Daten und Einstellungen aus ä_lteren Programmen importieren"
 
-#: ../src/e-util/e-import-assistant.c:384
+#: ../src/e-util/e-import-assistant.c:387
 msgid "Import a _single file"
 msgstr "Eine _einzelne Datei importieren"
 
-#: ../src/e-util/e-import-assistant.c:406
+#: ../src/e-util/e-import-assistant.c:409
 #: ../src/modules/startup-wizard/e-mail-config-import-page.c:209
 msgid "Please select the information that you would like to import:"
 msgstr "Bitte wählen Sie die Informationen, die Sie importieren wollen:"
 
-#: ../src/e-util/e-import-assistant.c:536
+#: ../src/e-util/e-import-assistant.c:541
 msgid ""
 "Evolution checked for settings to import from the following applications: Pine, "
 "Netscape, Elm, iCalendar, KMail. No importable settings found. If you would like "
@@ -14326,40 +14636,40 @@ msgstr ""
 "Einstellungen gefunden. Klicken Sie bitte auf den Knopf »Zurück«, falls Sie es "
 "noch einmal versuchen wollen."
 
-#: ../src/e-util/e-import-assistant.c:562
+#: ../src/e-util/e-import-assistant.c:568
 #: ../src/modules/startup-wizard/e-mail-config-import-page.c:238
 #, c-format
 msgid "From %s:"
 msgstr "Von %s:"
 
 #. Install a custom "Cancel Import" button.
-#: ../src/e-util/e-import-assistant.c:808
+#: ../src/e-util/e-import-assistant.c:814
 msgid "_Cancel Import"
 msgstr "Import abbre_chen"
 
-#: ../src/e-util/e-import-assistant.c:955
+#: ../src/e-util/e-import-assistant.c:961
 msgid "Preview data to be imported"
 msgstr "Vorschau der zu importierenden Daten"
 
-#: ../src/e-util/e-import-assistant.c:961 ../src/e-util/e-import-assistant.c:974
-#: ../src/e-util/e-import-assistant.c:1327 ../src/e-util/e-import-assistant.c:1403
-#: ../src/e-util/e-import-assistant.c:1412
+#: ../src/e-util/e-import-assistant.c:967 ../src/e-util/e-import-assistant.c:980
+#: ../src/e-util/e-import-assistant.c:1333 ../src/e-util/e-import-assistant.c:1410
+#: ../src/e-util/e-import-assistant.c:1419
 msgid "Import Data"
 msgstr "Daten importieren"
 
-#: ../src/e-util/e-import-assistant.c:969
+#: ../src/e-util/e-import-assistant.c:975
 msgid "Select what type of file you want to import from the list."
 msgstr "Wählen Sie den aus der Liste zu importierenden Dateityp."
 
-#: ../src/e-util/e-import-assistant.c:1317 ../src/e-util/e-import-assistant.c:1352
+#: ../src/e-util/e-import-assistant.c:1323 ../src/e-util/e-import-assistant.c:1359
 msgid "Evolution Import Assistant"
 msgstr "Evolution-Importassistent"
 
-#: ../src/e-util/e-import-assistant.c:1334 ../src/e-util/e-import-assistant.c:1390
+#: ../src/e-util/e-import-assistant.c:1340 ../src/e-util/e-import-assistant.c:1397
 msgid "Import Location"
 msgstr "Ort importieren"
 
-#: ../src/e-util/e-import-assistant.c:1345
+#: ../src/e-util/e-import-assistant.c:1352
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing external "
@@ -14368,19 +14678,19 @@ msgstr ""
 "Willkommen zum Evolution-Importassistenten.\n"
 "Dieser Assistent führt Sie durch das Importieren externer Dateien in Evolution."
 
-#: ../src/e-util/e-import-assistant.c:1362
+#: ../src/e-util/e-import-assistant.c:1369
 msgid "Importer Type"
 msgstr "Importeurtyp"
 
-#: ../src/e-util/e-import-assistant.c:1372
+#: ../src/e-util/e-import-assistant.c:1379
 msgid "Select Information to Import"
 msgstr "Zu importierende Informationen auswählen"
 
-#: ../src/e-util/e-import-assistant.c:1381
+#: ../src/e-util/e-import-assistant.c:1388
 msgid "Select a File"
 msgstr "Wählen Sie eine Datei"
 
-#: ../src/e-util/e-import-assistant.c:1398
+#: ../src/e-util/e-import-assistant.c:1405
 msgid "Click “Apply” to begin importing the file into Evolution."
 msgstr ""
 "Klicken Sie auf »Anwenden«, um den Import der Datei in Evolution zu beginnen."
@@ -14476,32 +14786,32 @@ msgstr "Verknüpfung konnte nicht geöffnet werden."
 msgid "Could not display help for Evolution."
 msgstr "Hilfe für Evolution konnte nicht angezeigt werden."
 
-#: ../src/e-util/e-misc-utils.c:2563
+#: ../src/e-util/e-misc-utils.c:2561
 #, c-format
 msgid "Opening calendar “%s”"
 msgstr "Kalender »%s« wird geöffnet"
 
-#: ../src/e-util/e-misc-utils.c:2566
+#: ../src/e-util/e-misc-utils.c:2564
 #, c-format
 msgid "Opening memo list “%s”"
 msgstr "Notizliste »%s« wird geöffnet"
 
-#: ../src/e-util/e-misc-utils.c:2569
+#: ../src/e-util/e-misc-utils.c:2567
 #, c-format
 msgid "Opening task list “%s”"
 msgstr "Aufgabenliste »%s« wird geöffnet"
 
-#: ../src/e-util/e-misc-utils.c:2572
+#: ../src/e-util/e-misc-utils.c:2570
 #, c-format
 msgid "Opening address book “%s”"
 msgstr "Adressbuch »%s« wird geöffnet"
 
-#: ../src/e-util/e-misc-utils.c:3352
+#: ../src/e-util/e-misc-utils.c:3350
 #: ../src/modules/mailto-handler/evolution-mailto-handler.c:146
 msgid "_Do not show this message again"
 msgstr "Diese _Meldung nicht mehr anzeigen"
 
-#: ../src/e-util/e-misc-utils.c:4205
+#: ../src/e-util/e-misc-utils.c:4244
 msgid ""
 "This address book server might be unreachable or the server name may be misspelled "
 "or your network connection could be down."
@@ -14509,17 +14819,17 @@ msgstr ""
 "Möglicherweise ist dieser Adressbuch-Server nicht erreichbar, Sie haben den Server-"
 "Namen falsch angegeben oder Ihre Netzwerkverbindung ist inaktiv."
 
-#: ../src/e-util/e-misc-utils.c:4217
+#: ../src/e-util/e-misc-utils.c:4256
 #, c-format
 msgid "Failed to set protocol version to LDAPv3 (%d): %s"
 msgstr "Protokollversion konnte nicht auf LDAPv3 gesetzt werden (%d): %s"
 
-#: ../src/e-util/e-misc-utils.c:4229
+#: ../src/e-util/e-misc-utils.c:4268
 #, c-format
 msgid "Failed to authenticate with LDAP server (%d): %s"
 msgstr "Legitimation am LDAP-Server gescheitert (%d): %s"
 
-#: ../src/e-util/e-misc-utils.c:4243
+#: ../src/e-util/e-misc-utils.c:4282
 #, c-format
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support this "
@@ -14534,7 +14844,7 @@ msgstr ""
 "\n"
 "Ausführliche Fehlermeldung (%d): %s"
 
-#: ../src/e-util/e-misc-utils.c:4254
+#: ../src/e-util/e-misc-utils.c:4293
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support this "
 "functionality or it may be misconfigured. Ask your administrator for supported "
@@ -14544,12 +14854,12 @@ msgstr ""
 "Funktionen nicht unterstützt, oder er ist fehlerhaft konfiguriert. Fragen Sie "
 "Ihren Systemadministrator nach unterstützten Suchbasen."
 
-#: ../src/e-util/e-misc-utils.c:4287
+#: ../src/e-util/e-misc-utils.c:4326
 msgid "Evolution had not been compiled with LDAP support"
 msgstr "Evolution wurde ohne LDAP-Unterstützung erstellt"
 
 #. Translators: %s is the language ISO code.
-#: ../src/e-util/e-misc-utils.c:4601
+#: ../src/e-util/e-misc-utils.c:4640
 #, c-format
 msgctxt "language"
 msgid "Unknown (%s)"
@@ -14557,7 +14867,7 @@ msgstr "Unbekannt (%s)"
 
 #. Translators: The first %s is the language name, and the
 #. * second is the country name. Example: "French (France)"
-#: ../src/e-util/e-misc-utils.c:4610
+#: ../src/e-util/e-misc-utils.c:4649
 #, c-format
 msgctxt "language"
 msgid "%s (%s)"
@@ -14580,11 +14890,11 @@ msgid "_Search:"
 msgstr "_Suchen:"
 
 #: ../src/e-util/e-name-selector-dialog.c:363
-#: ../src/e-util/e-name-selector-dialog.c:1330
+#: ../src/e-util/e-name-selector-dialog.c:1325
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1271
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1702
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:785
-#: ../src/modules/calendar/e-task-shell-view-actions.c:958
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1654
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:783
+#: ../src/modules/calendar/e-task-shell-view-actions.c:956
 msgid "Any Category"
 msgstr "Beliebige Kategorie"
 
@@ -14602,25 +14912,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
-#: ../src/e-util/e-name-selector-entry.c:3252
+#: ../src/e-util/e-name-selector-entry.c:3234
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "%s aus_klappen"
 
 #. Copy Contact Item
-#: ../src/e-util/e-name-selector-entry.c:3268
+#: ../src/e-util/e-name-selector-entry.c:3250
 #, c-format
 msgid "Cop_y %s"
 msgstr "%s _kopieren"
 
 #. Cut Contact Item
-#: ../src/e-util/e-name-selector-entry.c:3279
+#: ../src/e-util/e-name-selector-entry.c:3261
 #, c-format
 msgid "C_ut %s"
 msgstr "%s ausschnei_den"
 
 #. Edit Contact item
-#: ../src/e-util/e-name-selector-entry.c:3297
+#: ../src/e-util/e-name-selector-entry.c:3279
 #, c-format
 msgid "_Edit %s"
 msgstr "%s _bearbeiten"
@@ -14658,19 +14968,19 @@ msgstr ""
 msgid "You have the Caps Lock key on."
 msgstr "Die Feststelltaste ist aktiviert."
 
-#: ../src/e-util/e-passwords.c:576
+#: ../src/e-util/e-passwords.c:577
 msgid "_Remember this passphrase"
 msgstr "Diese Passphrase _merken"
 
-#: ../src/e-util/e-passwords.c:577
+#: ../src/e-util/e-passwords.c:578
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "Für den Rest dieser Sitzung an dieses Kennwort _erinnern"
 
-#: ../src/e-util/e-passwords.c:582
+#: ../src/e-util/e-passwords.c:583
 msgid "_Remember this password"
 msgstr "Dieses Passwort _merken"
 
-#: ../src/e-util/e-passwords.c:583
+#: ../src/e-util/e-passwords.c:584
 msgid "_Remember this password for the remainder of this session"
 msgstr "Für den Rest dieser Sitzung an dieses Passwort _erinnern"
 
@@ -14973,7 +15283,7 @@ msgstr "Art:"
 msgid "Name:"
 msgstr "Name:"
 
-#: ../src/e-util/e-source-config.c:849 ../src/e-util/e-webdav-browser.c:1748
+#: ../src/e-util/e-source-config.c:849 ../src/e-util/e-webdav-browser.c:1752
 msgid "Name cannot be empty"
 msgstr "Name darf nicht leer sein"
 
@@ -14995,27 +15305,27 @@ msgstr "_Vertrauenswürdigkeit des SSL/TLS-Zertifikats zurücknehmen"
 msgid "User:"
 msgstr "Benutzer:"
 
-#: ../src/e-util/e-source-selector.c:3217
+#: ../src/e-util/e-source-selector.c:3219
 msgid "Show"
 msgstr "Anzeigen"
 
-#: ../src/e-util/e-source-selector.c:3224
+#: ../src/e-util/e-source-selector.c:3225
 msgid "Group name"
 msgstr "Gruppenname"
 
-#: ../src/e-util/e-source-selector.c:3379 ../src/mail/e-mail-display.c:805
+#: ../src/e-util/e-source-selector.c:3380 ../src/mail/e-mail-display.c:805
 msgid "_Hide"
 msgstr "_Verbergen"
 
-#: ../src/e-util/e-source-selector.c:3379 ../src/e-util/e-source-selector.c:3478
+#: ../src/e-util/e-source-selector.c:3380 ../src/e-util/e-source-selector.c:3478
 msgid "_Show"
 msgstr "_Anzeigen"
 
-#: ../src/e-util/e-source-selector.c:3431
+#: ../src/e-util/e-source-selector.c:3432
 msgid "Manage Groups"
 msgstr "Gruppen verwalten"
 
-#: ../src/e-util/e-source-selector.c:3443
+#: ../src/e-util/e-source-selector.c:3444
 msgid "Available Groups:"
 msgstr "Verfügbare Gruppen:"
 
@@ -15033,8 +15343,8 @@ msgid "(no suggestions)"
 msgstr "(Keine Vorschläge)"
 
 #: ../src/e-util/e-spell-entry.c:503
-msgid "More..."
-msgstr "Mehr …"
+msgid "More…"
+msgstr "Weitere …"
 
 #. + Add to Dictionary
 #: ../src/e-util/e-spell-entry.c:588
@@ -15231,11 +15541,11 @@ msgstr "Alles _entfernen"
 msgid "_Show field in View"
 msgstr "Fel_d in Ansicht anzeigen"
 
-#: ../src/e-util/e-table-config.ui.h:6 ../src/e-util/e-table-header-item.c:1780
+#: ../src/e-util/e-table-config.ui.h:6 ../src/e-util/e-table-header-item.c:1782
 msgid "Ascending"
 msgstr "Aufsteigend"
 
-#: ../src/e-util/e-table-config.ui.h:7 ../src/e-util/e-table-header-item.c:1780
+#: ../src/e-util/e-table-config.ui.h:7 ../src/e-util/e-table-header-item.c:1782
 msgid "Descending"
 msgstr "Absteigend"
 
@@ -15326,60 +15636,60 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d Objekt)"
 msgstr[1] "%s (%d Objekte)"
 
-#: ../src/e-util/e-table-header-item.c:1607
+#: ../src/e-util/e-table-header-item.c:1609
 msgid "Customize Current View"
 msgstr "Aktuelle Ansicht anpassen"
 
-#: ../src/e-util/e-table-header-item.c:1630
+#: ../src/e-util/e-table-header-item.c:1632
 msgid "Sort _Ascending"
 msgstr "A_ufsteigend sortieren"
 
-#: ../src/e-util/e-table-header-item.c:1633
+#: ../src/e-util/e-table-header-item.c:1635
 msgid "Sort _Descending"
 msgstr "A_bsteigend sortieren"
 
-#: ../src/e-util/e-table-header-item.c:1636
+#: ../src/e-util/e-table-header-item.c:1638
 msgid "_Reset sort"
 msgstr "Sortierung _zurücksetzen"
 
-#: ../src/e-util/e-table-header-item.c:1639
+#: ../src/e-util/e-table-header-item.c:1641
 msgid "Group By This _Field"
 msgstr "Nach diesem _Feld gruppieren"
 
-#: ../src/e-util/e-table-header-item.c:1642
+#: ../src/e-util/e-table-header-item.c:1644
 msgid "Group By _Box"
 msgstr "Nach Fäc_hern gruppieren"
 
-#: ../src/e-util/e-table-header-item.c:1646
+#: ../src/e-util/e-table-header-item.c:1648
 msgid "Remove This _Column"
 msgstr "_Diese Spalte entfernen"
 
-#: ../src/e-util/e-table-header-item.c:1649
-msgid "Add a C_olumn..."
-msgstr "Spalte hin_zufügen …"
+#: ../src/e-util/e-table-header-item.c:1651
+msgid "Add a C_olumn…"
+msgstr "Spalte _hinzufügen …"
 
-#: ../src/e-util/e-table-header-item.c:1653
+#: ../src/e-util/e-table-header-item.c:1655
 msgid "A_lignment"
 msgstr "Aus_richtung"
 
-#: ../src/e-util/e-table-header-item.c:1656
+#: ../src/e-util/e-table-header-item.c:1658
 msgid "B_est Fit"
 msgstr "_Optimal"
 
-#: ../src/e-util/e-table-header-item.c:1659
-msgid "Format Column_s..."
+#: ../src/e-util/e-table-header-item.c:1661
+msgid "Format Column_s…"
 msgstr "Spalten for_matieren …"
 
-#: ../src/e-util/e-table-header-item.c:1663
-msgid "Custo_mize Current View..."
-msgstr "A_ktuelle Ansicht anpassen …"
+#: ../src/e-util/e-table-header-item.c:1665
+msgid "Custo_mize Current View…"
+msgstr "Aktuelle Ansicht an_passen …"
 
-#: ../src/e-util/e-table-header-item.c:1730
+#: ../src/e-util/e-table-header-item.c:1732
 msgid "_Sort By"
 msgstr "_Sortieren nach"
 
 #. Custom
-#: ../src/e-util/e-table-header-item.c:1753
+#: ../src/e-util/e-table-header-item.c:1755
 msgid "_Custom"
 msgstr "_Benutzerdefiniert"
 
@@ -15392,9 +15702,9 @@ msgid "Input Methods"
 msgstr "Eingabemethoden"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../src/e-util/e-timezone-dialog.c:268 ../src/e-util/e-timezone-dialog.c:508
-#: ../src/e-util/e-timezone-dialog.c:512 ../src/e-util/e-timezone-dialog.c:516
-#: ../src/e-util/e-timezone-dialog.c:899
+#: ../src/e-util/e-timezone-dialog.c:280 ../src/e-util/e-timezone-dialog.c:520
+#: ../src/e-util/e-timezone-dialog.c:524 ../src/e-util/e-timezone-dialog.c:528
+#: ../src/e-util/e-timezone-dialog.c:1015
 msgid "UTC"
 msgstr "UTC"
 
@@ -15446,135 +15756,132 @@ msgid "Flags"
 msgstr "Markierungen"
 
 #: ../src/e-util/evolution-source-viewer.c:729
-#: ../src/mail/e-mail-config-identity-page.c:1230
+#: ../src/mail/e-mail-config-identity-page.c:1231
 msgid "Identity"
 msgstr "Identität"
 
-#: ../src/e-util/e-webdav-browser.c:447
+#: ../src/e-util/e-webdav-browser.c:448
 msgid "Address book"
 msgstr "Adressbuch"
 
-#: ../src/e-util/e-webdav-browser.c:458
+#: ../src/e-util/e-webdav-browser.c:459
 msgid "Events"
 msgstr "Termine"
 
-#: ../src/e-util/e-webdav-browser.c:514
+#: ../src/e-util/e-webdav-browser.c:515 ../src/mail/em-folder-tree-model.c:1553
+#: ../src/mail/em-folder-tree-model.c:1930
 msgid "Loading…"
 msgstr "Wird geladen …"
 
-#: ../src/e-util/e-webdav-browser.c:1383
+#: ../src/e-util/e-webdav-browser.c:1387
 msgid "Searching collection children…"
 msgstr "Elemente der Sammlung werden gesucht …"
 
-#: ../src/e-util/e-webdav-browser.c:1385
+#: ../src/e-util/e-webdav-browser.c:1389
 msgid "Failed to search for collection children"
 msgstr "Suche nach Elementen der Sammlung ist fehlgeschlagen"
 
-#: ../src/e-util/e-webdav-browser.c:1419
+#: ../src/e-util/e-webdav-browser.c:1423
 msgid "Searching for user home, please wait…"
 msgstr "Nach persönlichem Ordner des Benutzers wird gesucht, bitte warten …"
 
-#: ../src/e-util/e-webdav-browser.c:1421
+#: ../src/e-util/e-webdav-browser.c:1425
 msgid "Failed to search for user home"
 msgstr "Suche nach persönlichem Ordner des Benutzers ist fehlgeschlagen"
 
-#: ../src/e-util/e-webdav-browser.c:1763
+#: ../src/e-util/e-webdav-browser.c:1768
 msgid "At least one component type should be set"
 msgstr "Es sollte mindestens ein Komponententyp festgelegt werden"
 
-#: ../src/e-util/e-webdav-browser.c:1781
+#: ../src/e-util/e-webdav-browser.c:1787
 msgid "Failed to get selected collection HREF"
 msgstr "HREF der ausgewählten Sammlung konnte nicht ermittelt werden"
 
-#: ../src/e-util/e-webdav-browser.c:1812
-msgid "Saving changes…"
-msgstr "Änderungen werden gespeichert …"
-
-#: ../src/e-util/e-webdav-browser.c:1813
+#: ../src/e-util/e-webdav-browser.c:1819
 msgid "Failed to save changes"
 msgstr "Speichern der Änderungen fehlgeschlagen"
 
-#: ../src/e-util/e-webdav-browser.c:1815
+#: ../src/e-util/e-webdav-browser.c:1821
 msgid "Creating new book…"
 msgstr "Neues Buch wird angelegt …"
 
-#: ../src/e-util/e-webdav-browser.c:1816
+#: ../src/e-util/e-webdav-browser.c:1822
 msgid "Failed to create new book"
 msgstr "Neues Buch konnte nicht angelegt werden"
 
-#: ../src/e-util/e-webdav-browser.c:1818
+#: ../src/e-util/e-webdav-browser.c:1824
 msgid "Creating new calendar…"
 msgstr "Neuer Kalender wird angelegt …"
 
-#: ../src/e-util/e-webdav-browser.c:1819
+#: ../src/e-util/e-webdav-browser.c:1825
 msgid "Failed to create new calendar"
 msgstr "Neuer Kalender konnte nicht angelegt werden"
 
-#: ../src/e-util/e-webdav-browser.c:1821
+#: ../src/e-util/e-webdav-browser.c:1827
 msgid "Creating new collection…"
 msgstr "Neue Sammlung wird angelegt …"
 
-#: ../src/e-util/e-webdav-browser.c:1822
+#: ../src/e-util/e-webdav-browser.c:1828
 msgid "Failed to create new collection"
 msgstr "Neue Sammlung konnte nicht angelegt werden"
 
-#: ../src/e-util/e-webdav-browser.c:1961
+#: ../src/e-util/e-webdav-browser.c:1967
 msgid "It is not allowed to create book under another book or calendar"
 msgstr ""
 "Es ist nicht zulässig, ein Buch unter einem anderen Buch oder Kalender anzulegen"
 
 #. if (button == webdav_browser->priv->create_calendar_button)
-#: ../src/e-util/e-webdav-browser.c:1963
+#: ../src/e-util/e-webdav-browser.c:1969
 msgid "It is not allowed to create calendar under another book or calendar"
 msgstr ""
 "Es ist nicht zulässig, einen Kalender unter einem anderen Buch oder Kalender "
 "anzulegen"
 
-#: ../src/e-util/e-webdav-browser.c:2189
+#: ../src/e-util/e-webdav-browser.c:2198
 msgid "Deleting book…"
 msgstr "Buch wird gelöscht …"
 
-#: ../src/e-util/e-webdav-browser.c:2190
+#: ../src/e-util/e-webdav-browser.c:2199
 msgid "Failed to delete book"
 msgstr "Buch konnte nicht gelöscht werden"
 
-#: ../src/e-util/e-webdav-browser.c:2193
+#: ../src/e-util/e-webdav-browser.c:2202
 msgid "Deleting calendar…"
 msgstr "Kalender wird gelöscht …"
 
-#: ../src/e-util/e-webdav-browser.c:2194
+#: ../src/e-util/e-webdav-browser.c:2203
 msgid "Failed to delete calendar"
 msgstr "Kalender konnte nicht gelöscht werden"
 
-#: ../src/e-util/e-webdav-browser.c:2197
+#: ../src/e-util/e-webdav-browser.c:2206
 msgid "Deleting collection…"
 msgstr "Sammlung wird gelöscht …"
 
-#: ../src/e-util/e-webdav-browser.c:2198
+#: ../src/e-util/e-webdav-browser.c:2207
 msgid "Failed to delete collection"
 msgstr "Sammlung konnte nicht gelöscht werden"
 
-#: ../src/e-util/e-webdav-browser.c:2429
+#: ../src/e-util/e-webdav-browser.c:2438
 msgid "For Components:"
 msgstr "Für Komponenten:"
 
-#: ../src/e-util/e-webdav-browser.c:2435
+#: ../src/e-util/e-webdav-browser.c:2444
 msgid "_Events"
 msgstr "T_ermine"
 
-#: ../src/e-util/e-webdav-browser.c:2625
+#: ../src/e-util/e-webdav-browser.c:2634
 msgid "WebDAV server:"
 msgstr "WebDAV-Server:"
 
-#: ../src/e-util/e-webdav-browser.c:2660
+#: ../src/e-util/e-webdav-browser.c:2669
 msgid "Create _Book"
 msgstr "_Buch anlegen"
 
-#: ../src/e-util/e-webdav-browser.c:2667
+#: ../src/e-util/e-webdav-browser.c:2676
 msgid "Create _Calendar"
 msgstr "Kalender _anlegen"
 
-#: ../src/e-util/e-webdav-browser.c:2674
+#: ../src/e-util/e-webdav-browser.c:2683
 msgid "Create Collectio_n"
 msgstr "Sammlu_ng anlegen"
 
@@ -15615,64 +15922,64 @@ msgid "Copy the image to the clipboard"
 msgstr "Das Bild in die Zwischenablage kopieren"
 
 #: ../src/e-util/e-web-view.c:457
-msgid "Save _Image..."
-msgstr "Bild spe_ichern …"
+msgid "Save _Image…"
+msgstr "Bild _speichern …"
 
 #: ../src/e-util/e-web-view.c:459
 msgid "Save the image to a file"
 msgstr "Das Bild in einer Datei speichern"
 
 #: ../src/e-util/e-web-view.c:474 ../src/mail/e-mail-browser.c:179
-#: ../src/mail/e-mail-reader.c:2787
+#: ../src/mail/e-mail-reader.c:2820
 msgid "Search _Web…"
 msgstr "_Internet durchsuchen …"
 
 #: ../src/e-util/e-web-view.c:476 ../src/mail/e-mail-browser.c:181
-#: ../src/mail/e-mail-reader.c:2789
+#: ../src/mail/e-mail-reader.c:2822
 msgid "Search the Web with the selected text"
 msgstr "Das Internet nach dem ausgewählten Text durchsuchen"
 
-#: ../src/e-util/e-web-view.c:486 ../src/e-util/e-web-view.c:2097
+#: ../src/e-util/e-web-view.c:486 ../src/e-util/e-web-view.c:2102
 msgid "Select all text and images"
 msgstr "Den gesamten Text und Bilder in einer Nachricht markieren"
 
-#: ../src/e-util/e-web-view.c:1446
+#: ../src/e-util/e-web-view.c:1451
 #, c-format
 msgid "Click to call %s"
 msgstr "Klicken Sie hier, um %s anzurufen"
 
-#: ../src/e-util/e-web-view.c:1448
+#: ../src/e-util/e-web-view.c:1453
 msgid "Click to hide/unhide addresses"
 msgstr "Adressen anzeigen/verbergen"
 
-#: ../src/e-util/e-web-view.c:1459
+#: ../src/e-util/e-web-view.c:1464
 #, c-format
 msgid "Go to the section %s of the message"
 msgstr "Zu Abschnitt »%s« in der Nachricht springen"
 
-#: ../src/e-util/e-web-view.c:1461
+#: ../src/e-util/e-web-view.c:1466
 msgid "Go to the beginning of the message"
 msgstr "Zum Anfang der aktuellen Zeile springen"
 
-#: ../src/e-util/e-web-view.c:1465
+#: ../src/e-util/e-web-view.c:1470
 #, c-format
 msgid "Click to open %s"
 msgstr "Klicken Sie hier, um %s zu öffnen"
 
-#: ../src/e-util/e-web-view.c:4128
+#: ../src/e-util/e-web-view.c:4157
 msgid "Copying image to clipboard"
 msgstr "Das Bild wird in die Zwischenablage kopiert"
 
-#: ../src/e-util/e-web-view.c:4316
+#: ../src/e-util/e-web-view.c:4345
 msgid "Save Image"
 msgstr "Bild speichern"
 
-#: ../src/e-util/e-web-view.c:4353
+#: ../src/e-util/e-web-view.c:4382
 #, c-format
 msgid "Saving image to “%s”"
 msgstr "Bild wird als »%s« gespeichert"
 
-#: ../src/e-util/e-web-view.c:4500
+#: ../src/e-util/e-web-view.c:4529
 #, c-format
 msgid "Cannot get URI “%s”, do not know how to download it."
 msgstr ""
@@ -15984,50 +16291,50 @@ msgid "Invalid folder URI “%s”"
 msgstr "Ungültiger Ordneradresse »%s«"
 
 #. Some local folders
-#: ../src/libemail-engine/e-mail-session.c:117
-#: ../src/mail/em-folder-properties.c:1164 ../src/mail/em-folder-tree-model.c:1237
-#: ../src/mail/importers/kmail-libs.c:139
+#: ../src/libemail-engine/e-mail-session.c:120
+#: ../src/mail/em-folder-properties.c:1444 ../src/mail/em-folder-tree-model.c:1501
+#: ../src/mail/importers/kmail-libs.c:138
 #: ../src/modules/mail/e-mail-shell-view-private.c:1032
 #: ../src/modules/mail/e-mail-shell-view-private.c:1043
 msgid "Inbox"
 msgstr "Eingang"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../src/libemail-engine/e-mail-session.c:118
-#: ../src/mail/em-folder-tree-model.c:1230 ../src/mail/importers/kmail-libs.c:145
+#: ../src/libemail-engine/e-mail-session.c:121
+#: ../src/mail/em-folder-tree-model.c:1495 ../src/mail/importers/kmail-libs.c:144
 #: ../src/modules/mail/e-mail-shell-view-private.c:1030
 msgid "Drafts"
 msgstr "Entwürfe"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../src/libemail-engine/e-mail-session.c:119
-#: ../src/mail/em-folder-tree-model.c:1241 ../src/mail/importers/kmail-libs.c:141
+#: ../src/libemail-engine/e-mail-session.c:122
+#: ../src/mail/em-folder-tree-model.c:1505 ../src/mail/importers/kmail-libs.c:140
 #: ../src/modules/mail/e-mail-shell-view-private.c:1034
 msgid "Outbox"
 msgstr "Ausgang"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../src/libemail-engine/e-mail-session.c:120
-#: ../src/mail/em-folder-tree-model.c:1245 ../src/mail/importers/kmail-libs.c:143
+#: ../src/libemail-engine/e-mail-session.c:123
+#: ../src/mail/em-folder-tree-model.c:1509 ../src/mail/importers/kmail-libs.c:142
 #: ../src/modules/mail/e-mail-shell-view-private.c:1036
 msgid "Sent"
 msgstr "Verschickt"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../src/libemail-engine/e-mail-session.c:121
-#: ../src/mail/e-mail-templates-store.c:2211 ../src/mail/em-folder-tree-model.c:1233
-#: ../src/mail/importers/kmail-libs.c:147
+#: ../src/libemail-engine/e-mail-session.c:124
+#: ../src/mail/e-mail-templates-store.c:2211 ../src/mail/em-folder-tree-model.c:1497
+#: ../src/mail/importers/kmail-libs.c:146
 #: ../src/modules/mail/e-mail-shell-view-private.c:1038
 #: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:1
 msgid "Templates"
 msgstr "Vorlagen"
 
-#: ../src/libemail-engine/e-mail-session.c:1294
+#: ../src/libemail-engine/e-mail-session.c:1519
 #, c-format
 msgid "User cancelled operation"
 msgstr "Vorgang wurde vom Benutzer abgebrochen"
 
-#: ../src/libemail-engine/e-mail-session.c:1351
+#: ../src/libemail-engine/e-mail-session.c:1576
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been cancelled."
@@ -16035,27 +16342,27 @@ msgstr ""
 "Das Weiterleiten der Nachricht wurde abgebrochen, da keine Zieladresse angegeben "
 "wurde."
 
-#: ../src/libemail-engine/e-mail-session.c:1364
+#: ../src/libemail-engine/e-mail-session.c:1589
 #, 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."
 
-#: ../src/libemail-engine/e-mail-session.c:1516
+#: ../src/libemail-engine/e-mail-session.c:1741
 #, c-format
 msgid "Corresponding source for service with UID “%s” not found"
 msgstr "Die dem Dienst mit der UID »%s« zugehörige Quelle wurde nicht gefunden"
 
-#: ../src/libemail-engine/e-mail-session.c:1636
+#: ../src/libemail-engine/e-mail-session.c:1861
 msgid "Looking up recipient S/MIME certificates in address books…"
 msgstr "Nach S/MIME-Zertifikaten des Empfängers wird in den Adressbüchern gesucht …"
 
-#: ../src/libemail-engine/e-mail-session.c:1638
+#: ../src/libemail-engine/e-mail-session.c:1863
 msgid "Looking up recipient PGP keys in address books…"
 msgstr "Nach PGP-Schlüsseln des Empfängers wird in den Adressbüchern gesucht …"
 
-#: ../src/libemail-engine/e-mail-session.c:2639
+#: ../src/libemail-engine/e-mail-session.c:2910
 #, c-format
 msgid "Waiting for “%s”"
 msgstr "Warten auf »%s«"
@@ -16110,7 +16417,7 @@ msgstr "Nachricht wird verschickt"
 msgid "Disconnecting from “%s”"
 msgstr "Verbindung mit »%s« wird getrennt"
 
-#: ../src/libemail-engine/e-mail-store-utils.c:264
+#: ../src/libemail-engine/e-mail-store-utils.c:264 ../src/mail/e-mail-backend.c:1048
 #, c-format
 msgid "Reconnecting to “%s”"
 msgstr "Verbindung mit »%s« wird erneut hergestellt"
@@ -16226,8 +16533,8 @@ msgstr "Es wurde versucht, movemail auf einer nicht-mbox-Quelle »%s« auszufüh
 #. Translators: This is a subject attribution for forwarded messages. The %s is replaced with subject of the 
original message.
 #: ../src/libemail-engine/mail-tools.c:198
 #, c-format
-msgid "[Fwd: %s]"
-msgstr "[Fwd: %s]"
+msgid "Fwd: %s"
+msgstr "Fwd: %s"
 
 #. Translators: This is a subject attribution for forwarded messages, used when there could not be used any 
subject.
 #. It results in "[Fwd: No Subject]" being used as a subject of the forwarded message.
@@ -16277,23 +16584,23 @@ msgstr[1] ""
 "entfernten Ordner verwenden:\n"
 "»%s«."
 
-#: ../src/mail/e-mail-account-manager.c:118 ../src/mail/e-mail-account-manager.c:205
+#: ../src/mail/e-mail-account-manager.c:118 ../src/mail/e-mail-account-manager.c:206
 msgid "Open _Online Accounts"
 msgstr "_Online-Konten öffnen"
 
-#: ../src/mail/e-mail-account-manager.c:144 ../src/mail/e-mail-account-manager.c:231
+#: ../src/mail/e-mail-account-manager.c:144 ../src/mail/e-mail-account-manager.c:232
 msgid "This account was created through the Online Accounts service."
 msgstr "Dieses Benutzerkonto wurde durch den »Online-Konten«-Dienst erstellt."
 
-#: ../src/mail/e-mail-account-manager.c:690
+#: ../src/mail/e-mail-account-manager.c:692
 msgid "_Reset Order"
 msgstr "_Reihenfolge zurücksetzen"
 
-#: ../src/mail/e-mail-account-manager.c:703
+#: ../src/mail/e-mail-account-manager.c:705
 msgid "You can drag and drop account names to reorder them."
 msgstr "Sie können Kontonamen durch Ziehen-und-Ablegen neu anordnen."
 
-#: ../src/mail/e-mail-account-manager.c:746
+#: ../src/mail/e-mail-account-manager.c:748
 msgid "De_fault"
 msgstr "_Vorgabe"
 
@@ -16355,9 +16662,9 @@ msgstr "POP3-Server"
 msgid "SMTP server"
 msgstr "SMTP-Server"
 
-#: ../src/mail/e-mail-browser.c:146 ../src/shell/e-shell-window-actions.c:819
-#: ../src/shell/e-shell-window-actions.c:826
-#: ../src/shell/e-shell-window-actions.c:833
+#: ../src/mail/e-mail-browser.c:146 ../src/shell/e-shell-window-actions.c:837
+#: ../src/shell/e-shell-window-actions.c:844
+#: ../src/shell/e-shell-window-actions.c:851
 msgid "Close this window"
 msgstr "Dieses Fenster schließen"
 
@@ -16384,7 +16691,7 @@ msgid "_Revise Details"
 msgstr "Details ü_berarbeiten"
 
 #: ../src/mail/e-mail-config-auth-check.c:217
-msgid "Querying authentication types..."
+msgid "Querying authentication types…"
 msgstr "Legitimationstypen werden abgefragt …"
 
 #: ../src/mail/e-mail-config-auth-check.c:430
@@ -16450,7 +16757,7 @@ msgid "Language for Reply and Forward attribution text"
 msgstr "Sprache für die Textvorlage zum Beantworten und Weiterleiten"
 
 #: ../src/mail/e-mail-config-composing-page.c:524
-#: ../src/mail/em-composer-utils.c:4273 ../src/mail/mail-config.ui.h:22
+#: ../src/mail/em-composer-utils.c:4145 ../src/mail/mail-config.ui.h:22
 msgid "Start _typing at the bottom"
 msgstr "_Unten mit dem Schreiben beginnen"
 
@@ -16478,7 +16785,7 @@ msgstr "Immer"
 msgid "Ask for each message"
 msgstr "Bei jeder Nachricht nachfragen"
 
-#: ../src/mail/e-mail-config-confirm-page.c:154
+#: ../src/mail/e-mail-config-confirm-page.c:155
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -16495,12 +16802,12 @@ msgstr ""
 "Klicken Sie auf »Anwenden«, um Ihre Einstellungen zu\n"
 "speichern."
 
-#: ../src/mail/e-mail-config-confirm-page.c:166
+#: ../src/mail/e-mail-config-confirm-page.c:167
 msgid "Done"
 msgstr "Fertig"
 
 #: ../src/mail/e-mail-config-defaults-page.c:314
-msgid "Checking server settings..."
+msgid "Checking server settings…"
 msgstr "Servereinstellungen werden überprüft …"
 
 #: ../src/mail/e-mail-config-defaults-page.c:663
@@ -16586,7 +16893,7 @@ msgstr ""
 "ausgefüllt werden, es sei denn, Sie wollen diese Informationen in von Ihnen "
 "verschickten E-Mails einschließen."
 
-#: ../src/mail/e-mail-config-identity-page.c:579
+#: ../src/mail/e-mail-config-identity-page.c:580
 #: ../src/mail/e-mail-config-summary-page.c:353
 msgid ""
 "The above name will be used to identify this account.\n"
@@ -16595,74 +16902,74 @@ msgstr ""
 "Mit obigem Namen wird dieses Konto bezeichnet.\n"
 "Verwenden Sie zum Beispiel »Geschäftlich« oder »Privat«."
 
-#: ../src/mail/e-mail-config-identity-page.c:596
+#: ../src/mail/e-mail-config-identity-page.c:597
 msgid "Required Information"
 msgstr "Benötigte Informationen"
 
-#: ../src/mail/e-mail-config-identity-page.c:605
+#: ../src/mail/e-mail-config-identity-page.c:606
 msgid "Full Nam_e:"
 msgstr "_Voller Name:"
 
-#: ../src/mail/e-mail-config-identity-page.c:634
+#: ../src/mail/e-mail-config-identity-page.c:635
 msgid "Email _Address:"
 msgstr "_E-Mail-Adresse:"
 
-#: ../src/mail/e-mail-config-identity-page.c:683
+#: ../src/mail/e-mail-config-identity-page.c:684
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:27
 msgid "Optional Information"
 msgstr "Zusätzliche Informationen"
 
-#: ../src/mail/e-mail-config-identity-page.c:692
+#: ../src/mail/e-mail-config-identity-page.c:693
 msgid "Re_ply-To:"
 msgstr "_Antwort an:"
 
-#: ../src/mail/e-mail-config-identity-page.c:721
+#: ../src/mail/e-mail-config-identity-page.c:722
 msgid "Or_ganization:"
 msgstr "_Organisation:"
 
-#: ../src/mail/e-mail-config-identity-page.c:776
-msgid "Add Ne_w Signature..."
+#: ../src/mail/e-mail-config-identity-page.c:777
+msgid "Add Ne_w Signature…"
 msgstr "N_eue Signatur …"
 
-#: ../src/mail/e-mail-config-identity-page.c:790
+#: ../src/mail/e-mail-config-identity-page.c:791
 msgid "A_liases:"
 msgstr "A_liase:"
 
-#: ../src/mail/e-mail-config-identity-page.c:862
+#: ../src/mail/e-mail-config-identity-page.c:863
 msgid "Edi_t"
 msgstr "Bearbei_ten"
 
-#: ../src/mail/e-mail-config-identity-page.c:885
+#: ../src/mail/e-mail-config-identity-page.c:886
 msgid "_Look up mail server details based on the entered e-mail address"
 msgstr ""
 "_Eigenschaften des E-Mail-Servers anhand der eingegebenen E-Mail-Adresse abrufen"
 
 #. This is only a warning, not a blocker
 #. complete = complete && correct;
-#: ../src/mail/e-mail-config-identity-page.c:934
+#: ../src/mail/e-mail-config-identity-page.c:935
 msgid "Full Name should not be empty"
 msgstr "Das Feld »Vollständiger Name« sollte nicht leer sein."
 
-#: ../src/mail/e-mail-config-identity-page.c:941
+#: ../src/mail/e-mail-config-identity-page.c:942
 msgid "Email Address cannot be empty"
 msgstr "E-Mail-Adresse darf nicht leer sein"
 
-#: ../src/mail/e-mail-config-identity-page.c:946
+#: ../src/mail/e-mail-config-identity-page.c:947
 msgid "Email Address is not a valid email"
 msgstr "E-Mail-Adresse ist ungültig"
 
-#: ../src/mail/e-mail-config-identity-page.c:958
+#: ../src/mail/e-mail-config-identity-page.c:959
 msgid "Reply To is not a valid email"
 msgstr "Antwortadresse ist ungültig"
 
-#: ../src/mail/e-mail-config-identity-page.c:969
+#: ../src/mail/e-mail-config-identity-page.c:970
 #: ../src/mail/e-mail-config-summary-page.c:638
 msgid "Account Name cannot be empty"
 msgstr "Kontoname darf nicht leer sein"
 
 #: ../src/mail/e-mail-config-lookup-page.c:65
-msgid "Looking up account details..."
-msgstr "Es wird nach Kontendetails gesucht …"
+msgid "Looking up account details…"
+msgstr "Kontendetails nachschlagen …"
 
 #: ../src/mail/e-mail-config-provider-page.c:538
 msgid "Checking for New Mail"
@@ -16689,11 +16996,11 @@ msgid "%s — %s"
 msgstr "%s — %s"
 
 #: ../src/mail/e-mail-config-security-page.c:460
-#: ../src/mail/em-folder-properties.c:1083 ../src/mail/mail-config.ui.h:34
+#: ../src/mail/em-folder-properties.c:1367 ../src/mail/mail-config.ui.h:34
 #: ../src/modules/addressbook/autocompletion-config.c:115
-#: ../src/modules/calendar/e-calendar-preferences.c:643
+#: ../src/modules/calendar/e-calendar-preferences.c:621
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:48
-#: ../src/modules/mail/e-mail-shell-backend.c:771
+#: ../src/modules/mail/e-mail-shell-backend.c:802
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "General"
 msgstr "Allgemein"
@@ -16770,7 +17077,7 @@ msgstr "Auswählen"
 
 #: ../src/mail/e-mail-config-security-page.c:686
 #: ../src/mail/e-mail-config-security-page.c:784
-#: ../src/shell/e-shell-window-actions.c:915
+#: ../src/shell/e-shell-window-actions.c:933
 msgid "_Clear"
 msgstr "_Leeren"
 
@@ -16854,7 +17161,7 @@ msgstr "Empfangen und Senden kann nicht gleichzeitig auf Nichts gesetzt werden"
 msgid "Account Summary"
 msgstr "Konto-Zusammenfassung"
 
-#: ../src/mail/e-mail-config-welcome-page.c:161
+#: ../src/mail/e-mail-config-welcome-page.c:162
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -16864,7 +17171,7 @@ msgstr ""
 "\n"
 "Klicken Sie auf »Vor«, um die Konfiguration zu beginnen."
 
-#: ../src/mail/e-mail-config-welcome-page.c:171
+#: ../src/mail/e-mail-config-welcome-page.c:172
 #: ../src/modules/startup-wizard/e-startup-assistant.c:182
 msgid "Welcome"
 msgstr "Willkommen"
@@ -16874,7 +17181,7 @@ msgid "Account Editor"
 msgstr "Konteneditor"
 
 #: ../src/mail/e-mail-display.c:126
-msgid "_Add to Address Book..."
+msgid "_Add to Address Book…"
 msgstr "Zum Adressbuch _hinzufügen …"
 
 #: ../src/mail/e-mail-display.c:133
@@ -16886,7 +17193,7 @@ msgid "_From This Address"
 msgstr "_Von dieser Adresse"
 
 #: ../src/mail/e-mail-display.c:147
-msgid "Send _Reply To..."
+msgid "Send _Reply To…"
 msgstr "Antwo_rt senden an …"
 
 #: ../src/mail/e-mail-display.c:149
@@ -16941,6 +17248,27 @@ msgstr "_Anlegen"
 msgid "Folder _name:"
 msgstr "Ordner_name:"
 
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:694
+msgid "Folder Sort Order"
+msgstr "Sortierreihenfolge des Ordners"
+
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:735
+msgid "Reset c_urrent level"
+msgstr "A_ktuelle Ebene zurücksetzen "
+
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:736
+msgid "Reset sort order in the current level to the defaults"
+msgstr ""
+"Sortierreihenfolge auf der aktuellen Ebene auf die Voreinstellungen zurücksetzen"
+
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:746
+msgid "Reset _all levels"
+msgstr "A_lle Ebenen zurücksetzen "
+
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:747
+msgid "Reset sort order in all levels to their defaults"
+msgstr "Sortierreihenfolge auf allen Ebenen auf die Voreinstellungen zurücksetzen"
+
 #. Translators: This is a name of a flag, the same as all strings in the 'ffe' context.
 #. The translated value should not contain spaces.
 #: ../src/mail/e-mail-free-form-exp.c:231
@@ -16973,12 +17301,12 @@ msgctxt "ffe"
 msgid "Attachment"
 msgstr "Anlage"
 
-#: ../src/mail/e-mail-free-form-exp.c:484
+#: ../src/mail/e-mail-free-form-exp.c:489
 msgctxt "ffe"
 msgid "no"
 msgstr "nein"
 
-#: ../src/mail/e-mail-free-form-exp.c:485
+#: ../src/mail/e-mail-free-form-exp.c:490
 msgctxt "ffe"
 msgid "false"
 msgstr "falsch"
@@ -17016,11 +17344,11 @@ msgid "_Later"
 msgstr "S_päter"
 
 #: ../src/mail/e-mail-label-manager.c:169 ../src/mail/e-mail-reader.c:906
-#: ../src/mail/em-folder-properties.c:855
+#: ../src/mail/em-folder-properties.c:1141
 msgid "Add Label"
 msgstr "Beschriftung hinzufügen"
 
-#: ../src/mail/e-mail-label-manager.c:220 ../src/mail/em-folder-properties.c:882
+#: ../src/mail/e-mail-label-manager.c:220 ../src/mail/em-folder-properties.c:1168
 msgid "Edit Label"
 msgstr "Beschriftung bearbeiten"
 
@@ -17045,15 +17373,15 @@ msgid "Cannot find message in its folder summary"
 msgstr "Nachrichten konnte in Ordnerzusammenfassung nicht gefunden werden"
 
 #: ../src/mail/e-mail-notes.c:863
-msgid "Storing changes..."
+msgid "Storing changes…"
 msgstr "Änderungen werden gespeichert …"
 
 #: ../src/mail/e-mail-notes.c:1001
 msgid "Edit Message Note"
 msgstr "Nachrichtennotiz bearbeiten"
 
-#: ../src/mail/e-mail-notes.c:1159
-msgid "Retrieving message..."
+#: ../src/mail/e-mail-notes.c:1157
+msgid "Retrieving message…"
 msgstr "Nachricht wird abgerufen …"
 
 #: ../src/mail/e-mail-print-config-headers.c:166
@@ -17111,662 +17439,662 @@ msgid "C_opy"
 msgstr "K_opieren"
 
 #: ../src/mail/e-mail-reader.c:610
-msgid "Deleting message note..."
+msgid "Deleting message note…"
 msgstr "Nachrichtennotiz wird gelöscht …"
 
-#: ../src/mail/e-mail-reader.c:1577 ../src/mail/e-mail-reader.c:1868
-#: ../src/mail/e-mail-reader.c:1908
+#: ../src/mail/e-mail-reader.c:1610 ../src/mail/e-mail-reader.c:1901
+#: ../src/mail/e-mail-reader.c:1941
 msgid "_Do not ask me again."
 msgstr "_Nicht mehr nachfragen."
 
-#: ../src/mail/e-mail-reader.c:1914
+#: ../src/mail/e-mail-reader.c:1947
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "»_Antwort an« bei Mailinglisten immer ignorieren"
 
-#: ../src/mail/e-mail-reader.c:2118
+#: ../src/mail/e-mail-reader.c:2151
 msgid "Failed to retrieve message:"
 msgstr "Abrufen der Nachricht schlug fehl:"
 
-#: ../src/mail/e-mail-reader.c:2164 ../src/mail/e-mail-reader.c:3641
+#: ../src/mail/e-mail-reader.c:2197 ../src/mail/e-mail-reader.c:3674
 #, c-format
 msgid "Retrieving message “%s”"
 msgstr "Nachricht »%s« wird abgerufen"
 
-#: ../src/mail/e-mail-reader.c:2365
+#: ../src/mail/e-mail-reader.c:2398
 msgid "A_dd Sender to Address Book"
 msgstr "A_bsender zum Adressbuch hinzufügen"
 
-#: ../src/mail/e-mail-reader.c:2367
+#: ../src/mail/e-mail-reader.c:2400
 msgid "Add sender to address book"
 msgstr "Absender zum Adressbuch hinzufügen"
 
-#: ../src/mail/e-mail-reader.c:2372
-msgid "_Archive..."
-msgstr "_Archivieren …"
+#: ../src/mail/e-mail-reader.c:2405
+msgid "_Archive…"
+msgstr "Archi_vieren …"
 
-#: ../src/mail/e-mail-reader.c:2374
+#: ../src/mail/e-mail-reader.c:2407
 msgid "Move selected messages to the Archive folder for the account"
 msgstr "Gewählten Nachrichten in den Archivordner verschieben"
 
-#: ../src/mail/e-mail-reader.c:2379
+#: ../src/mail/e-mail-reader.c:2412
 msgid "Check for _Junk"
 msgstr "Auf unerwünschte Nachrichten über_prüfen"
 
-#: ../src/mail/e-mail-reader.c:2381
+#: ../src/mail/e-mail-reader.c:2414
 msgid "Filter the selected messages for junk status"
 msgstr "Die gewählten Nachrichten auf den Status »Unerwünscht« filtern"
 
-#: ../src/mail/e-mail-reader.c:2386
+#: ../src/mail/e-mail-reader.c:2419
 msgid "Assign C_olor…"
 msgstr "_Farbe zuweisen …"
 
-#: ../src/mail/e-mail-reader.c:2388
+#: ../src/mail/e-mail-reader.c:2421
 msgid "Assign color for the selected messages"
 msgstr "Den gewählten Nachrichten eine Farbe zuweisen"
 
-#: ../src/mail/e-mail-reader.c:2393
+#: ../src/mail/e-mail-reader.c:2426
 msgid "Unse_t Color"
 msgstr "Farbe zurückse_tzen"
 
-#: ../src/mail/e-mail-reader.c:2395
+#: ../src/mail/e-mail-reader.c:2428
 msgid "Unset color for the selected messages"
 msgstr "Farbe der gewählten Nachrichten zurücksetzen"
 
-#: ../src/mail/e-mail-reader.c:2400
-msgid "_Copy to Folder..."
+#: ../src/mail/e-mail-reader.c:2433
+msgid "_Copy to Folder…"
 msgstr "In Ordner _kopieren …"
 
-#: ../src/mail/e-mail-reader.c:2402
+#: ../src/mail/e-mail-reader.c:2435
 msgid "Copy selected messages to another folder"
 msgstr "Die gewählten Nachrichten in einen anderen Ordner kopieren"
 
-#: ../src/mail/e-mail-reader.c:2407
+#: ../src/mail/e-mail-reader.c:2440
 msgid "_Delete Message"
 msgstr "Nachricht _löschen"
 
-#: ../src/mail/e-mail-reader.c:2409
+#: ../src/mail/e-mail-reader.c:2442
 msgid "Mark the selected messages for deletion"
 msgstr "Die gewählten Nachrichten zum Löschen markieren"
 
-#: ../src/mail/e-mail-reader.c:2414
-msgid "_Add note..."
+#: ../src/mail/e-mail-reader.c:2447
+msgid "_Add note…"
 msgstr "Notiz _hinzufügen …"
 
-#: ../src/mail/e-mail-reader.c:2416
+#: ../src/mail/e-mail-reader.c:2449
 msgid "Add a note for the selected message"
 msgstr "Der gewählten Nachricht eine Notiz hinzufügen"
 
-#: ../src/mail/e-mail-reader.c:2421
+#: ../src/mail/e-mail-reader.c:2454
 msgid "Delete no_te"
 msgstr "No_tiz löschen"
 
-#: ../src/mail/e-mail-reader.c:2423
+#: ../src/mail/e-mail-reader.c:2456
 msgid "Delete the note for the selected message"
 msgstr "Die Notiz für die gewählte Nachricht löschen"
 
-#: ../src/mail/e-mail-reader.c:2428
-msgid "_Edit note..."
+#: ../src/mail/e-mail-reader.c:2461
+msgid "_Edit note…"
 msgstr "_Notiz bearbeiten …"
 
-#: ../src/mail/e-mail-reader.c:2430
+#: ../src/mail/e-mail-reader.c:2463
 msgid "Edit a note for the selected message"
 msgstr "Eine Notiz für die gewählte Nachricht anlegen"
 
-#: ../src/mail/e-mail-reader.c:2435
-msgid "Create a Filter Rule for Mailing _List..."
+#: ../src/mail/e-mail-reader.c:2468
+msgid "Create a Filter Rule for Mailing _List…"
 msgstr "Filterregel über Mailing_liste erstellen …"
 
-#: ../src/mail/e-mail-reader.c:2437
+#: ../src/mail/e-mail-reader.c:2470
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Eine Regel anlegen, um Nachrichten an diese Mailingliste zu filtern"
 
-#: ../src/mail/e-mail-reader.c:2442
-msgid "Create a Filter Rule for _Recipients..."
+#: ../src/mail/e-mail-reader.c:2475
+msgid "Create a Filter Rule for _Recipients…"
 msgstr "Filterregel über _Empfänger erstellen …"
 
-#: ../src/mail/e-mail-reader.c:2444
+#: ../src/mail/e-mail-reader.c:2477
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Eine Regel anlegen, um Nachrichten an diese Empfänger zu filtern"
 
-#: ../src/mail/e-mail-reader.c:2449
-msgid "Create a Filter Rule for Se_nder..."
+#: ../src/mail/e-mail-reader.c:2482
+msgid "Create a Filter Rule for Se_nder…"
 msgstr "Filterregel über _Absender erstellen …"
 
-#: ../src/mail/e-mail-reader.c:2451
+#: ../src/mail/e-mail-reader.c:2484
 msgid "Create a rule to filter messages from this sender"
 msgstr "Eine Regel anlegen, um Nachrichten von diesem Absender zu filtern"
 
-#: ../src/mail/e-mail-reader.c:2456
-msgid "Create a Filter Rule for _Subject..."
+#: ../src/mail/e-mail-reader.c:2489
+msgid "Create a Filter Rule for _Subject…"
 msgstr "Filterregel über _Betreff erstellen …"
 
-#: ../src/mail/e-mail-reader.c:2458
+#: ../src/mail/e-mail-reader.c:2491
 msgid "Create a rule to filter messages with this subject"
 msgstr "Eine Regel anlegen, um Nachrichten mit diesem Betreff zu filtern"
 
-#: ../src/mail/e-mail-reader.c:2463
+#: ../src/mail/e-mail-reader.c:2496
 msgid "A_pply Filters"
 msgstr "Filter an_wenden"
 
-#: ../src/mail/e-mail-reader.c:2465
+#: ../src/mail/e-mail-reader.c:2498
 msgid "Apply filter rules to the selected messages"
 msgstr "Filterregeln auf die gewählten Nachrichten anwenden"
 
-#: ../src/mail/e-mail-reader.c:2470
-msgid "_Find in Message..."
+#: ../src/mail/e-mail-reader.c:2503
+msgid "_Find in Message…"
 msgstr "In Nachricht _suchen …"
 
-#: ../src/mail/e-mail-reader.c:2472
+#: ../src/mail/e-mail-reader.c:2505
 msgid "Search for text in the body of the displayed message"
 msgstr "Im Rumpf der angezeigten Nachricht nach Text suchen"
 
-#: ../src/mail/e-mail-reader.c:2477
+#: ../src/mail/e-mail-reader.c:2510
 msgid "_Clear Flag"
 msgstr "Markierung _löschen"
 
-#: ../src/mail/e-mail-reader.c:2479
+#: ../src/mail/e-mail-reader.c:2512
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Die Folgemarkierung aus den gewählten Nachrichten entfernen"
 
-#: ../src/mail/e-mail-reader.c:2484
+#: ../src/mail/e-mail-reader.c:2517
 msgid "_Flag Completed"
 msgstr "Als abgeschlossen _markieren"
 
-#: ../src/mail/e-mail-reader.c:2486
+#: ../src/mail/e-mail-reader.c:2519
 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"
 
-#: ../src/mail/e-mail-reader.c:2491
-msgid "Follow _Up..."
+#: ../src/mail/e-mail-reader.c:2524
+msgid "Follow _Up…"
 msgstr "_Folgenachricht …"
 
-#: ../src/mail/e-mail-reader.c:2493
+#: ../src/mail/e-mail-reader.c:2526
 msgid "Flag the selected messages for follow-up"
 msgstr "Die gewählten Nachrichten zur Nachverfolgung markieren"
 
-#: ../src/mail/e-mail-reader.c:2498
+#: ../src/mail/e-mail-reader.c:2531
 #: ../src/modules/mail/e-mail-attachment-handler.c:431
 msgid "_Attached"
 msgstr "_Anhang"
 
-#: ../src/mail/e-mail-reader.c:2500 ../src/mail/e-mail-reader.c:2507
+#: ../src/mail/e-mail-reader.c:2533 ../src/mail/e-mail-reader.c:2540
 #: ../src/modules/mail/e-mail-attachment-handler.c:433
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Die gewählte Nachricht an jemanden als Anlage weiterleiten"
 
-#: ../src/mail/e-mail-reader.c:2505
+#: ../src/mail/e-mail-reader.c:2538
 msgid "Forward As _Attached"
 msgstr "Als _Anhang weiterleiten"
 
-#: ../src/mail/e-mail-reader.c:2512
+#: ../src/mail/e-mail-reader.c:2545
 #: ../src/modules/mail/e-mail-attachment-handler.c:438
 msgid "_Inline"
 msgstr "_Eingebettet"
 
-#: ../src/mail/e-mail-reader.c:2514 ../src/mail/e-mail-reader.c:2521
+#: ../src/mail/e-mail-reader.c:2547 ../src/mail/e-mail-reader.c:2554
 #: ../src/modules/mail/e-mail-attachment-handler.c:440
 msgid "Forward the selected message in the body of a new message"
 msgstr "Die gewählte Nachricht im Rumpf einer neuen Nachricht weiterleiten"
 
-#: ../src/mail/e-mail-reader.c:2519
+#: ../src/mail/e-mail-reader.c:2552
 msgid "Forward As _Inline"
 msgstr "_Eingebettet weiterleiten"
 
-#: ../src/mail/e-mail-reader.c:2526
+#: ../src/mail/e-mail-reader.c:2559
 #: ../src/modules/mail/e-mail-attachment-handler.c:445
 msgid "_Quoted"
 msgstr "_Zitiert"
 
-#: ../src/mail/e-mail-reader.c:2528 ../src/mail/e-mail-reader.c:2535
+#: ../src/mail/e-mail-reader.c:2561 ../src/mail/e-mail-reader.c:2568
 #: ../src/modules/mail/e-mail-attachment-handler.c:447
 msgid "Forward the selected message quoted like a reply"
 msgstr "Die gewählte Nachricht als Zitat wie in einer Antwort weiterleiten"
 
-#: ../src/mail/e-mail-reader.c:2533
+#: ../src/mail/e-mail-reader.c:2566
 msgid "Forward As _Quoted"
 msgstr "_Zitiert weiterleiten"
 
-#: ../src/mail/e-mail-reader.c:2540
+#: ../src/mail/e-mail-reader.c:2573
 msgid "_New Label"
 msgstr "_Neue Beschriftung"
 
 #. Translators: "None" is used in the message label context menu.
 #. *              It removes all labels from the selected messages.
-#: ../src/mail/e-mail-reader.c:2549
+#: ../src/mail/e-mail-reader.c:2582
 msgid "N_one"
 msgstr "_Keine"
 
-#: ../src/mail/e-mail-reader.c:2556
+#: ../src/mail/e-mail-reader.c:2589
 msgid "_Load Images"
 msgstr "_Bilder laden"
 
-#: ../src/mail/e-mail-reader.c:2558
+#: ../src/mail/e-mail-reader.c:2591
 msgid "Force images in HTML mail to be loaded"
 msgstr "Laden von Bildern in HTML-E-Mails erzwingen"
 
-#: ../src/mail/e-mail-reader.c:2563 ../src/mail/e-mail-reader.c:2982
+#: ../src/mail/e-mail-reader.c:2596 ../src/mail/e-mail-reader.c:3015
 msgid "_Ignore Subthread"
 msgstr "Unterkonversation _ignorieren"
 
-#: ../src/mail/e-mail-reader.c:2565
+#: ../src/mail/e-mail-reader.c:2598
 msgid "Mark new mails in a subthread as read automatically"
 msgstr "Neue E-Mails in Unterkonversationen automatisch als gelesen markieren"
 
-#: ../src/mail/e-mail-reader.c:2570 ../src/mail/e-mail-reader.c:2986
+#: ../src/mail/e-mail-reader.c:2603 ../src/mail/e-mail-reader.c:3019
 msgid "_Ignore Thread"
 msgstr "Konversation _ignorieren"
 
-#: ../src/mail/e-mail-reader.c:2572
+#: ../src/mail/e-mail-reader.c:2605
 msgid "Mark new mails in this thread as read automatically"
 msgstr "Neue E-Mails in dieser Konversation automatisch als gelesen markieren"
 
-#: ../src/mail/e-mail-reader.c:2577
+#: ../src/mail/e-mail-reader.c:2610
 msgid "_Important"
 msgstr "_Wichtig"
 
-#: ../src/mail/e-mail-reader.c:2579
+#: ../src/mail/e-mail-reader.c:2612
 msgid "Mark the selected messages as important"
 msgstr "Die gewählten Nachrichten als wichtig markieren"
 
-#: ../src/mail/e-mail-reader.c:2584
+#: ../src/mail/e-mail-reader.c:2617
 msgid "_Junk"
 msgstr "Unerwü_nscht"
 
-#: ../src/mail/e-mail-reader.c:2586
+#: ../src/mail/e-mail-reader.c:2619
 msgid "Mark the selected messages as junk"
 msgstr "Die gewählten Nachrichten als unerwünscht markieren"
 
-#: ../src/mail/e-mail-reader.c:2591
+#: ../src/mail/e-mail-reader.c:2624
 msgid "_Not Junk"
 msgstr "E_rwünscht"
 
 # doppelte Verneinung?
-#: ../src/mail/e-mail-reader.c:2593
+#: ../src/mail/e-mail-reader.c:2626
 msgid "Mark the selected messages as not being junk"
 msgstr "Die gewählten Nachrichten als nicht unerwünscht markieren"
 
-#: ../src/mail/e-mail-reader.c:2598
+#: ../src/mail/e-mail-reader.c:2631
 msgid "_Read"
 msgstr "Ge_lesen"
 
-#: ../src/mail/e-mail-reader.c:2600
+#: ../src/mail/e-mail-reader.c:2633
 msgid "Mark the selected messages as having been read"
 msgstr "Die gewählten Nachrichten als gelesen markieren"
 
-#: ../src/mail/e-mail-reader.c:2605 ../src/mail/e-mail-reader.c:3006
+#: ../src/mail/e-mail-reader.c:2638 ../src/mail/e-mail-reader.c:3039
 msgid "Do not _Ignore Subthread"
 msgstr "Unterkonversation nicht _ignorieren"
 
-#: ../src/mail/e-mail-reader.c:2607
+#: ../src/mail/e-mail-reader.c:2640
 msgid "Do not mark new mails in a subthread as read automatically"
 msgstr "Neue E-Mails in Unterkonversationen nicht automatisch als gelesen markieren"
 
-#: ../src/mail/e-mail-reader.c:2612 ../src/mail/e-mail-reader.c:3010
+#: ../src/mail/e-mail-reader.c:2645 ../src/mail/e-mail-reader.c:3043
 msgid "Do not _Ignore Thread"
 msgstr "Konversation nicht _ignorieren"
 
-#: ../src/mail/e-mail-reader.c:2614
+#: ../src/mail/e-mail-reader.c:2647
 msgid "Do not mark new mails in this thread as read automatically"
 msgstr "Neue E-Mails in dieser Konversation nicht automatisch als gelesen markieren"
 
-#: ../src/mail/e-mail-reader.c:2619
+#: ../src/mail/e-mail-reader.c:2652
 msgid "Uni_mportant"
 msgstr "_Unwichtig"
 
-#: ../src/mail/e-mail-reader.c:2621
+#: ../src/mail/e-mail-reader.c:2654
 msgid "Mark the selected messages as unimportant"
 msgstr "Die gewählten Nachrichten als unwichtig markieren"
 
-#: ../src/mail/e-mail-reader.c:2626
+#: ../src/mail/e-mail-reader.c:2659
 msgid "_Unread"
 msgstr "_Ungelesen"
 
-#: ../src/mail/e-mail-reader.c:2628
+#: ../src/mail/e-mail-reader.c:2661
 msgid "Mark the selected messages as not having been read"
 msgstr "Die gewählten Nachrichten als ungelesen markieren"
 
-#: ../src/mail/e-mail-reader.c:2633
+#: ../src/mail/e-mail-reader.c:2666
 #: ../src/modules/mail/e-mail-attachment-handler.c:417
-msgid "_Edit as New Message..."
+msgid "_Edit as New Message…"
 msgstr "Als neue _Nachricht bearbeiten …"
 
-#: ../src/mail/e-mail-reader.c:2635
+#: ../src/mail/e-mail-reader.c:2668
 #: ../src/modules/mail/e-mail-attachment-handler.c:419
 msgid "Open the selected messages in the composer for editing"
 msgstr "Die gewählten Nachrichten zum Bearbeiten im Editor öffnen"
 
-#: ../src/mail/e-mail-reader.c:2640
+#: ../src/mail/e-mail-reader.c:2673
 msgid "Compose _New Message"
 msgstr "_Nachricht verfassen"
 
-#: ../src/mail/e-mail-reader.c:2642
+#: ../src/mail/e-mail-reader.c:2675
 msgid "Open a window for composing a mail message"
 msgstr "Ein Fenster zum Verfassen einer E-Mail-Nachricht öffnen"
 
-#: ../src/mail/e-mail-reader.c:2647
+#: ../src/mail/e-mail-reader.c:2680
 msgid "_Open in New Window"
 msgstr "In neuem _Fenster öffnen"
 
-#: ../src/mail/e-mail-reader.c:2649
+#: ../src/mail/e-mail-reader.c:2682
 msgid "Open the selected messages in a new window"
 msgstr "Die gewählten Nachrichten in einem neuen Fenster öffnen"
 
-#: ../src/mail/e-mail-reader.c:2654
-msgid "_Move to Folder..."
+#: ../src/mail/e-mail-reader.c:2687
+msgid "_Move to Folder…"
 msgstr "In Ordner _verschieben …"
 
-#: ../src/mail/e-mail-reader.c:2656
+#: ../src/mail/e-mail-reader.c:2689
 msgid "Move selected messages to another folder"
 msgstr "Die gewählten Nachrichten in einen anderen Ordner verschieben"
 
-#: ../src/mail/e-mail-reader.c:2661
+#: ../src/mail/e-mail-reader.c:2694
 msgid "_Next Message"
 msgstr "_Nächste Nachricht"
 
-#: ../src/mail/e-mail-reader.c:2663
+#: ../src/mail/e-mail-reader.c:2696
 msgid "Display the next message"
 msgstr "Die nächste Nachricht anzeigen"
 
-#: ../src/mail/e-mail-reader.c:2668
+#: ../src/mail/e-mail-reader.c:2701
 msgid "Next _Important Message"
 msgstr "Nächste _wichtige Nachricht"
 
-#: ../src/mail/e-mail-reader.c:2670
+#: ../src/mail/e-mail-reader.c:2703
 msgid "Display the next important message"
 msgstr "Die nächste wichtige Nachricht anzeigen"
 
-#: ../src/mail/e-mail-reader.c:2675
+#: ../src/mail/e-mail-reader.c:2708
 msgid "Next _Thread"
 msgstr "Nächste _Konversation"
 
-#: ../src/mail/e-mail-reader.c:2677
+#: ../src/mail/e-mail-reader.c:2710
 msgid "Display the next thread"
 msgstr "Nächste Konversation anzeigen"
 
-#: ../src/mail/e-mail-reader.c:2682
+#: ../src/mail/e-mail-reader.c:2715
 msgid "Next _Unread Message"
 msgstr "Nächste _ungelesene Nachricht"
 
-#: ../src/mail/e-mail-reader.c:2684
+#: ../src/mail/e-mail-reader.c:2717
 msgid "Display the next unread message"
 msgstr "Die nächste ungelesene Nachricht anzeigen"
 
-#: ../src/mail/e-mail-reader.c:2689
+#: ../src/mail/e-mail-reader.c:2722
 msgid "_Previous Message"
 msgstr "_Vorherige Nachricht"
 
-#: ../src/mail/e-mail-reader.c:2691
+#: ../src/mail/e-mail-reader.c:2724
 msgid "Display the previous message"
 msgstr "Die vorhergehende Nachricht anzeigen"
 
-#: ../src/mail/e-mail-reader.c:2696
+#: ../src/mail/e-mail-reader.c:2729
 msgid "Pr_evious Important Message"
 msgstr "V_orherige wichtige Nachricht"
 
-#: ../src/mail/e-mail-reader.c:2698
+#: ../src/mail/e-mail-reader.c:2731
 msgid "Display the previous important message"
 msgstr "Die vorhergehende wichtige Nachricht anzeigen"
 
-#: ../src/mail/e-mail-reader.c:2703
+#: ../src/mail/e-mail-reader.c:2736
 msgid "Previous T_hread"
 msgstr "Vo_rherige Konversation"
 
-#: ../src/mail/e-mail-reader.c:2705
+#: ../src/mail/e-mail-reader.c:2738
 msgid "Display the previous thread"
 msgstr "Die vorhergehende Konversation anzeigen"
 
-#: ../src/mail/e-mail-reader.c:2710
+#: ../src/mail/e-mail-reader.c:2743
 msgid "P_revious Unread Message"
 msgstr "_Vorherige ungelesene Nachricht"
 
-#: ../src/mail/e-mail-reader.c:2712
+#: ../src/mail/e-mail-reader.c:2745
 msgid "Display the previous unread message"
 msgstr "Die vorhergehende ungelesene Nachricht anzeigen"
 
-#: ../src/mail/e-mail-reader.c:2719
+#: ../src/mail/e-mail-reader.c:2752
 msgid "Print this message"
 msgstr "Diese Nachricht drucken"
 
-#: ../src/mail/e-mail-reader.c:2726
+#: ../src/mail/e-mail-reader.c:2759
 msgid "Preview the message to be printed"
 msgstr "Eine Vorschau auf die zu druckende Nachricht anzeigen"
 
-#: ../src/mail/e-mail-reader.c:2731
+#: ../src/mail/e-mail-reader.c:2764
 #: ../src/modules/mail/e-mail-attachment-handler.c:452
 msgid "Re_direct"
 msgstr "_Umleiten"
 
-#: ../src/mail/e-mail-reader.c:2733
+#: ../src/mail/e-mail-reader.c:2766
 #: ../src/modules/mail/e-mail-attachment-handler.c:454
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Die gewählte Nachricht an jemanden umleiten"
 
-#: ../src/mail/e-mail-reader.c:2738
+#: ../src/mail/e-mail-reader.c:2771
 msgid "Remo_ve Attachments"
 msgstr "Anlagen _löschen"
 
-#: ../src/mail/e-mail-reader.c:2740
+#: ../src/mail/e-mail-reader.c:2773
 msgid "Remove attachments"
 msgstr "Anlagen löschen"
 
-#: ../src/mail/e-mail-reader.c:2745
+#: ../src/mail/e-mail-reader.c:2778
 msgid "Remove Du_plicate Messages"
 msgstr "Do_ppelte Nachrichten löschen"
 
-#: ../src/mail/e-mail-reader.c:2747
+#: ../src/mail/e-mail-reader.c:2780
 msgid "Checks selected messages for duplicates"
 msgstr "Die gewählten Nachrichten auf Duplikate überprüfen"
 
-#: ../src/mail/e-mail-reader.c:2752 ../src/mail/em-composer-utils.c:4227
+#: ../src/mail/e-mail-reader.c:2785 ../src/mail/em-composer-utils.c:4099
 #: ../src/mail/mail.error.xml.h:28
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1500
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1452
 #: ../src/modules/mail/e-mail-attachment-handler.c:396
 msgid "Reply to _All"
 msgstr "Antw_ort an alle"
 
-#: ../src/mail/e-mail-reader.c:2754
+#: ../src/mail/e-mail-reader.c:2787
 #: ../src/modules/mail/e-mail-attachment-handler.c:398
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Eine Antwort an alle Empfänger der gewählten Nachricht verfassen"
 
-#: ../src/mail/e-mail-reader.c:2759
+#: ../src/mail/e-mail-reader.c:2792
 msgid "Al_ternative Reply…"
 msgstr "Al_ternative Antwort …"
 
-#: ../src/mail/e-mail-reader.c:2761
+#: ../src/mail/e-mail-reader.c:2794
 msgid "Choose reply options for the selected message"
 msgstr "Antwortoptionen für die gewählte Nachricht wählen"
 
-#: ../src/mail/e-mail-reader.c:2766 ../src/mail/em-composer-utils.c:4222
+#: ../src/mail/e-mail-reader.c:2799 ../src/mail/em-composer-utils.c:4094
 #: ../src/mail/mail.error.xml.h:26
 #: ../src/modules/mail/e-mail-attachment-handler.c:403
 msgid "Reply to _List"
 msgstr "Antwort an Lis_te"
 
-#: ../src/mail/e-mail-reader.c:2768
+#: ../src/mail/e-mail-reader.c:2801
 #: ../src/modules/mail/e-mail-attachment-handler.c:405
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Eine Antwort an die Mailingliste der gewählten Nachricht verfassen"
 
-#: ../src/mail/e-mail-reader.c:2773
+#: ../src/mail/e-mail-reader.c:2806
 #: ../src/modules/mail/e-mail-attachment-handler.c:410
 msgid "_Reply to Sender"
 msgstr "_Antwort an Absender"
 
-#: ../src/mail/e-mail-reader.c:2775
+#: ../src/mail/e-mail-reader.c:2808
 #: ../src/modules/mail/e-mail-attachment-handler.c:412
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Eine Antwort an den Absender der gewählten Nachricht verfassen"
 
-#: ../src/mail/e-mail-reader.c:2780
-msgid "_Save as mbox..."
+#: ../src/mail/e-mail-reader.c:2813
+msgid "_Save as mbox…"
 msgstr "_Speichern als mbox …"
 
-#: ../src/mail/e-mail-reader.c:2782
+#: ../src/mail/e-mail-reader.c:2815
 msgid "Save selected messages as an mbox file"
 msgstr "Die gewählten Nachrichten als mbox-Datei speichern"
 
-#: ../src/mail/e-mail-reader.c:2794
+#: ../src/mail/e-mail-reader.c:2827
 msgid "_Message Source"
 msgstr "Nachrichten-_Quelltext"
 
-#: ../src/mail/e-mail-reader.c:2796
+#: ../src/mail/e-mail-reader.c:2829
 msgid "Show the raw email source of the message"
 msgstr "Den zugrunde liegenden E-Mail-Quelltext dieser Nachricht anzeigen"
 
-#: ../src/mail/e-mail-reader.c:2808
+#: ../src/mail/e-mail-reader.c:2841
 msgid "_Undelete Message"
 msgstr "Löschen der Nachricht _rückgängig"
 
-#: ../src/mail/e-mail-reader.c:2810
+#: ../src/mail/e-mail-reader.c:2843
 msgid "Undelete the selected messages"
 msgstr "Löschen der gewählten Nachrichten rückgängig machen"
 
-#: ../src/mail/e-mail-reader.c:2815
+#: ../src/mail/e-mail-reader.c:2848
 msgid "_Normal Size"
 msgstr "_Normale Größe"
 
-#: ../src/mail/e-mail-reader.c:2817
+#: ../src/mail/e-mail-reader.c:2850
 msgid "Reset the text to its original size"
 msgstr "Den Text auf seine Originalgröße zurücksetzen"
 
-#: ../src/mail/e-mail-reader.c:2822
+#: ../src/mail/e-mail-reader.c:2855
 msgid "_Zoom In"
 msgstr "Ansicht ver_größern"
 
-#: ../src/mail/e-mail-reader.c:2824
+#: ../src/mail/e-mail-reader.c:2857
 msgid "Increase the text size"
 msgstr "Die Textgröße heraufsetzen"
 
-#: ../src/mail/e-mail-reader.c:2831
+#: ../src/mail/e-mail-reader.c:2864
 msgid "Decrease the text size"
 msgstr "Die Textgröße heruntersetzen"
 
-#: ../src/mail/e-mail-reader.c:2838
+#: ../src/mail/e-mail-reader.c:2871
 msgid "Cre_ate"
 msgstr "_Erstellen"
 
-#: ../src/mail/e-mail-reader.c:2845
+#: ../src/mail/e-mail-reader.c:2878
 msgid "Ch_aracter Encoding"
 msgstr "Zeichenko_dierung"
 
-#: ../src/mail/e-mail-reader.c:2852
+#: ../src/mail/e-mail-reader.c:2885
 #: ../src/modules/mail/e-mail-attachment-handler.c:424
 msgid "F_orward As"
 msgstr "_Weiterleiten als"
 
-#: ../src/mail/e-mail-reader.c:2859
+#: ../src/mail/e-mail-reader.c:2892
 msgid "_Label"
 msgstr "Bes_chriftung"
 
-#: ../src/mail/e-mail-reader.c:2866
+#: ../src/mail/e-mail-reader.c:2899
 msgid "_Group Reply"
 msgstr "Antwort an _Gruppe"
 
-#: ../src/mail/e-mail-reader.c:2873
+#: ../src/mail/e-mail-reader.c:2906
 msgid "_Go To"
 msgstr "_Gehe zu"
 
-#: ../src/mail/e-mail-reader.c:2880
+#: ../src/mail/e-mail-reader.c:2913
 msgid "Mar_k As"
 msgstr "Mar_kieren als"
 
-#: ../src/mail/e-mail-reader.c:2887
+#: ../src/mail/e-mail-reader.c:2920
 msgid "_Message"
 msgstr "_Nachricht"
 
-#: ../src/mail/e-mail-reader.c:2894
+#: ../src/mail/e-mail-reader.c:2927
 msgid "_Zoom"
 msgstr "Ansicht ver_größern"
 
-#: ../src/mail/e-mail-reader.c:2904
-msgid "Create a Search Folder from Mailing _List..."
+#: ../src/mail/e-mail-reader.c:2937
+msgid "Create a Search Folder from Mailing _List…"
 msgstr "Einen Suchordner für diese Mailing_liste anlegen …"
 
-#: ../src/mail/e-mail-reader.c:2906
+#: ../src/mail/e-mail-reader.c:2939
 msgid "Create a search folder for this mailing list"
 msgstr "Einen Suchordner für diese Mailingliste anlegen"
 
-#: ../src/mail/e-mail-reader.c:2911
-msgid "Create a Search Folder from Recipien_ts..."
+#: ../src/mail/e-mail-reader.c:2944
+msgid "Create a Search Folder from Recipien_ts…"
 msgstr "Einen Suchordner über _Empfänger anlegen …"
 
-#: ../src/mail/e-mail-reader.c:2913
+#: ../src/mail/e-mail-reader.c:2946
 msgid "Create a search folder for these recipients"
 msgstr "Einen Suchordner für diese Empfänger anlegen"
 
-#: ../src/mail/e-mail-reader.c:2918
-msgid "Create a Search Folder from Sen_der..."
+#: ../src/mail/e-mail-reader.c:2951
+msgid "Create a Search Folder from Sen_der…"
 msgstr "Einen Suchordner über _Absender anlegen …"
 
-#: ../src/mail/e-mail-reader.c:2920
+#: ../src/mail/e-mail-reader.c:2953
 msgid "Create a search folder for this sender"
 msgstr "Einen Suchordner für diesen Absender anlegen"
 
-#: ../src/mail/e-mail-reader.c:2925
-msgid "Create a Search Folder from S_ubject..."
+#: ../src/mail/e-mail-reader.c:2958
+msgid "Create a Search Folder from S_ubject…"
 msgstr "Einen Suchordner über _Betreff anlegen …"
 
-#: ../src/mail/e-mail-reader.c:2927
+#: ../src/mail/e-mail-reader.c:2960
 msgid "Create a search folder for this subject"
 msgstr "Einen Suchordner für diesen Betreff anlegen"
 
-#: ../src/mail/e-mail-reader.c:2974
-msgid "Mark for Follo_w Up..."
+#: ../src/mail/e-mail-reader.c:3007
+msgid "Mark for Follo_w Up…"
 msgstr "Als _Folgenachricht markieren …"
 
-#: ../src/mail/e-mail-reader.c:2990
+#: ../src/mail/e-mail-reader.c:3023
 msgid "Mark as _Important"
 msgstr "Als w_ichtig markieren"
 
-#: ../src/mail/e-mail-reader.c:2994
+#: ../src/mail/e-mail-reader.c:3027
 msgid "Mark as _Junk"
 msgstr "Als un_erwünscht markieren"
 
-#: ../src/mail/e-mail-reader.c:2998
+#: ../src/mail/e-mail-reader.c:3031
 msgid "Mark as _Not Junk"
 msgstr "Als _nicht unerwünscht markieren"
 
-#: ../src/mail/e-mail-reader.c:3002
+#: ../src/mail/e-mail-reader.c:3035
 msgid "Mar_k as Read"
 msgstr "Als _gelesen markieren"
 
-#: ../src/mail/e-mail-reader.c:3014
+#: ../src/mail/e-mail-reader.c:3047
 msgid "Mark as Uni_mportant"
 msgstr "Als un_wichtig markieren"
 
-#: ../src/mail/e-mail-reader.c:3018
+#: ../src/mail/e-mail-reader.c:3051
 msgid "Mark as _Unread"
 msgstr "Als _ungelesen markieren"
 
-#: ../src/mail/e-mail-reader.c:3066
+#: ../src/mail/e-mail-reader.c:3099
 msgid "_Caret Mode"
 msgstr "Cursor-_Modus"
 
-#: ../src/mail/e-mail-reader.c:3068
+#: ../src/mail/e-mail-reader.c:3101
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Im Rumpf der angezeigten Nachricht einen blinkenden Cursor anzeigen"
 
-#: ../src/mail/e-mail-reader.c:3074
+#: ../src/mail/e-mail-reader.c:3107
 msgid "All Message _Headers"
 msgstr "Alle Nachrichtenk_öpfe"
 
-#: ../src/mail/e-mail-reader.c:3076
+#: ../src/mail/e-mail-reader.c:3109
 msgid "Show messages with all email headers"
 msgstr "Nachrichten mit allen E-Mail-Kopfzeilen anzeigen"
 
-#: ../src/mail/e-mail-reader.c:3647
+#: ../src/mail/e-mail-reader.c:3680
 msgid "Retrieving message"
 msgstr "Nachricht wird abgerufen"
 
-#: ../src/mail/e-mail-reader.c:5008
+#: ../src/mail/e-mail-reader.c:5041
 #: ../src/modules/mail/e-mail-attachment-handler.c:389
 msgid "_Forward"
 msgstr "_Weiterleiten"
 
-#: ../src/mail/e-mail-reader.c:5009
+#: ../src/mail/e-mail-reader.c:5042
 #: ../src/modules/mail/e-mail-attachment-handler.c:391
 msgid "Forward the selected message to someone"
 msgstr "Die gewählte Nachricht an jemanden weiterleiten"
@@ -17775,54 +18103,54 @@ msgstr "Die gewählte Nachricht an jemanden weiterleiten"
 #. * (if possible and if that configuration option is enabled), or else
 #. * it will reply to all. The word "Group" was chosen because it covers
 #. * either of those, without too strongly implying one or the other.
-#: ../src/mail/e-mail-reader.c:5028
+#: ../src/mail/e-mail-reader.c:5061
 msgid "Group Reply"
 msgstr "Antwort an Gruppe"
 
-#: ../src/mail/e-mail-reader.c:5029
+#: ../src/mail/e-mail-reader.c:5062
 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"
 
-#: ../src/mail/e-mail-reader.c:5095 ../src/mail/filtertypes.xml.in.h:67
+#: ../src/mail/e-mail-reader.c:5128 ../src/mail/filtertypes.xml.in.h:67
 msgid "Delete"
 msgstr "Löschen"
 
-#: ../src/mail/e-mail-reader.c:5107
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1297
+#: ../src/mail/e-mail-reader.c:5140
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1249
 msgid "Next"
 msgstr "Weiter"
 
-#: ../src/mail/e-mail-reader.c:5111
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1290
+#: ../src/mail/e-mail-reader.c:5144
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1242
 msgid "Previous"
 msgstr "Vorherige"
 
-#: ../src/mail/e-mail-reader.c:5120 ../src/mail/mail-dialogs.ui.h:9
+#: ../src/mail/e-mail-reader.c:5153 ../src/mail/mail-dialogs.ui.h:9
 msgid "Reply"
 msgstr "Antworten"
 
-#: ../src/mail/e-mail-reader.c:6275
+#: ../src/mail/e-mail-reader.c:6308
 #, c-format
 msgid "Allow remote content for anyone from %s"
 msgstr "Entfernten Inhalt für jeden von %s zulassen"
 
-#: ../src/mail/e-mail-reader.c:6277
+#: ../src/mail/e-mail-reader.c:6310
 #, c-format
 msgid "Allow remote content for %s"
 msgstr "Entfernten Inhalt für %s zulassen"
 
-#: ../src/mail/e-mail-reader.c:6294
+#: ../src/mail/e-mail-reader.c:6327
 #, c-format
 msgid "Allow remote content from %s"
 msgstr "Entfernten Inhalt von %s zulassen"
 
-#: ../src/mail/e-mail-reader.c:6311
+#: ../src/mail/e-mail-reader.c:6344
 msgid "Do not show this message again"
 msgstr "Diese Meldung nicht mehr anzeigen"
 
-#: ../src/mail/e-mail-reader.c:6363
+#: ../src/mail/e-mail-reader.c:6396
 msgid "Load remote content"
 msgstr "Entfernten Inhalt laden"
 
@@ -17895,7 +18223,7 @@ msgstr[1] "Nachrichten"
 msgid "Parsing message"
 msgstr "Nachricht wird verarbeitet"
 
-#: ../src/mail/e-mail-request.c:276
+#: ../src/mail/e-mail-request.c:288
 msgid "The message has no text content."
 msgstr "Diese Nachricht hat keinen inhaltlichen Text."
 
@@ -17962,14 +18290,14 @@ msgstr[1] ""
 #. This message is never removed from the camel operation, otherwise the GtkInfoBar
 #. hides itself and the user sees no feedback.
 #: ../src/mail/em-composer-utils.c:829
-msgid "Waiting for attachments to load..."
+msgid "Waiting for attachments to load…"
 msgstr "Anhänge werden geladen …"
 
 #. Note to translators: this is the attribution string used
 #. * 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.
-#: ../src/mail/em-composer-utils.c:2176
+#: ../src/mail/em-composer-utils.c:2027
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -17977,79 +18305,79 @@ msgstr ""
 "Am ${WeekdayName}, den ${Day}.${Month}.${Year}, ${24Hour}:${Minute} ${TimeZone} "
 "schrieb ${Sender}:"
 
-#: ../src/mail/em-composer-utils.c:2182
+#: ../src/mail/em-composer-utils.c:2033
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Weitergeleitete Nachricht --------"
 
-#: ../src/mail/em-composer-utils.c:2187
+#: ../src/mail/em-composer-utils.c:2038
 msgid "-----Original Message-----"
 msgstr "-------- Weitergeleitete Nachricht --------"
 
 #. Translators: This is a reply attribution in the message reply subject. The %s is replaced with the 
subject of the original message. Both 'Re'-s in the 'reply-attribution' translation context should translate 
into the same string, the same as the ':' separator.
-#: ../src/mail/em-composer-utils.c:2919
+#: ../src/mail/em-composer-utils.c:2799
 #, c-format
 msgctxt "reply-attribution"
 msgid "Re: %s"
 msgstr "AW: %s"
 
-#: ../src/mail/em-composer-utils.c:3529
+#: ../src/mail/em-composer-utils.c:3417
 msgid "an unknown sender"
 msgstr "ein unbekannter Absender"
 
-#: ../src/mail/em-composer-utils.c:4173
+#: ../src/mail/em-composer-utils.c:4045
 msgid "Alternative Reply"
 msgstr "Alternative Antwort"
 
-#: ../src/mail/em-composer-utils.c:4176
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1493
+#: ../src/mail/em-composer-utils.c:4048
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1445
 msgid "_Reply"
 msgstr "_Antworten"
 
-#: ../src/mail/em-composer-utils.c:4189
+#: ../src/mail/em-composer-utils.c:4061
 msgid "Recipients:"
 msgstr "Empfänger:"
 
-#: ../src/mail/em-composer-utils.c:4217
+#: ../src/mail/em-composer-utils.c:4089
 msgid "Reply to _Sender"
 msgstr "_Antwort an Absender"
 
-#: ../src/mail/em-composer-utils.c:4239
+#: ../src/mail/em-composer-utils.c:4111
 msgid "Reply style:"
 msgstr "Antwortstil:"
 
-#: ../src/mail/em-composer-utils.c:4247
+#: ../src/mail/em-composer-utils.c:4119
 msgid "_Default"
 msgstr "_Vorgabe"
 
-#: ../src/mail/em-composer-utils.c:4251
+#: ../src/mail/em-composer-utils.c:4123
 msgid "Attach_ment"
 msgstr "An_lage"
 
-#: ../src/mail/em-composer-utils.c:4255
+#: ../src/mail/em-composer-utils.c:4127
 msgid "Inline (_Outlook style)"
 msgstr "Eingebettet (Im Stil von _Outlook)"
 
-#: ../src/mail/em-composer-utils.c:4259
+#: ../src/mail/em-composer-utils.c:4131
 msgid "_Quote"
 msgstr "_Zitiert"
 
-#: ../src/mail/em-composer-utils.c:4263
+#: ../src/mail/em-composer-utils.c:4135
 msgid "Do _Not Quote"
 msgstr "_Nicht zitieren"
 
-#: ../src/mail/em-composer-utils.c:4270
+#: ../src/mail/em-composer-utils.c:4142
 msgid "_Format message in HTML"
 msgstr "Nachrichten als HTML f_ormatieren"
 
-#: ../src/mail/em-composer-utils.c:4280
+#: ../src/mail/em-composer-utils.c:4152
 msgid "Apply t_emplate"
 msgstr "Vorlage verw_enden"
 
-#: ../src/mail/em-composer-utils.c:4292
+#: ../src/mail/em-composer-utils.c:4164
 msgid "Preserve original message S_ubject"
 msgstr "_Ursprünglichen Betreff der Nachricht beibehalten"
 
-#: ../src/mail/em-composer-utils.c:4358
+#: ../src/mail/em-composer-utils.c:4230
 #, c-format
 msgid "one recipient"
 msgid_plural "%d recipients"
@@ -18057,11 +18385,11 @@ msgstr[0] "ein Empfänger"
 msgstr[1] "%d Empfänger"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../src/mail/em-composer-utils.c:4776
+#: ../src/mail/em-composer-utils.c:4639
 msgid "Posting destination"
 msgstr "Zielordner"
 
-#: ../src/mail/em-composer-utils.c:4781
+#: ../src/mail/em-composer-utils.c:4644
 msgid "Choose folders to post the message to."
 msgstr "Wählen Sie Ordner, in denen die Nachricht abgelegt werden soll."
 
@@ -18131,106 +18459,122 @@ msgstr "Für das _Konto:"
 msgid "Add Ac_tion"
 msgstr "Aktion hin_zufügen"
 
-#: ../src/mail/em-folder-properties.c:241
+#: ../src/mail/em-folder-properties.c:170
+msgid "Select Custom Icon"
+msgstr "Benutzerdefiniertes Symbol wählen"
+
+#: ../src/mail/em-folder-properties.c:219
+msgid "_Use custom icon"
+msgstr "Benutzerdefiniertes Symbol _verwenden"
+
+#: ../src/mail/em-folder-properties.c:312
+msgid "Use te_xt color"
+msgstr "Text_farbe verwenden"
+
+#: ../src/mail/em-folder-properties.c:494
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Ungelesene Nachrichten:"
 msgstr[1] "Ungelesene Nachrichten:"
 
-#: ../src/mail/em-folder-properties.c:252
+#: ../src/mail/em-folder-properties.c:505
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Nachrichten insgesamt:"
 msgstr[1] "Nachrichten insgesamt:"
 
-#: ../src/mail/em-folder-properties.c:273
+#: ../src/mail/em-folder-properties.c:526
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Speicherverbrauch (%s):"
 
-#: ../src/mail/em-folder-properties.c:275
+#: ../src/mail/em-folder-properties.c:528
 #, c-format
 msgid "Quota usage"
 msgstr "Speicherverbrauch"
 
 #. Translators: Label of a combo with a list of configured accounts where a user can
 #. choose which account to use as the sender when composing a message in this folder
-#: ../src/mail/em-folder-properties.c:419
+#: ../src/mail/em-folder-properties.c:672
 msgid "_Send Account Override:"
 msgstr "_Sendekonto überschreiben:"
 
-#: ../src/mail/em-folder-properties.c:626
+#: ../src/mail/em-folder-properties.c:912
 msgid "Archive this folder using these settings:"
 msgstr "Diesen Ordner mit diesen Einstellungen archivieren:"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:638
+#: ../src/mail/em-folder-properties.c:924
 msgctxt "autoarchive"
 msgid "Auto-_cleanup messages older than"
 msgstr "Nachrichten automatisch _aufräumen, die älter sind als"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:651
+#: ../src/mail/em-folder-properties.c:937
 msgctxt "autoarchive"
 msgid "days"
 msgstr "Tage"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:653
+#: ../src/mail/em-folder-properties.c:939
 msgctxt "autoarchive"
 msgid "weeks"
 msgstr "Wochen"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:655
+#: ../src/mail/em-folder-properties.c:941
 msgctxt "autoarchive"
 msgid "months"
 msgstr "Monate"
 
-#: ../src/mail/em-folder-properties.c:661
+#: ../src/mail/em-folder-properties.c:947
 msgid "Move messages to the default archive _folder"
 msgstr "Nachrichten in den Standard-_Archivordner verschieben"
 
-#: ../src/mail/em-folder-properties.c:668
+#: ../src/mail/em-folder-properties.c:954
 msgid "_Move messages to:"
 msgstr "Nachrichten _verschieben nach:"
 
-#: ../src/mail/em-folder-properties.c:672
+#: ../src/mail/em-folder-properties.c:958
 msgid "Archive folder"
 msgstr "Archivordner"
 
-#: ../src/mail/em-folder-properties.c:672
+#: ../src/mail/em-folder-properties.c:958
 msgid "Select folder to use for Archive"
 msgstr "Wählen Sie den Ordner für die Archivierung"
 
-#: ../src/mail/em-folder-properties.c:676
+#: ../src/mail/em-folder-properties.c:962
 msgid "_Delete messages"
 msgstr "Nachrichten _löschen"
 
-#: ../src/mail/em-folder-properties.c:1031
+#: ../src/mail/em-folder-properties.c:1317
 msgid "Server Tag"
 msgstr "Server-Beschriftung"
 
-#: ../src/mail/em-folder-properties.c:1035 ../src/mail/filtertypes.xml.in.h:29
+#: ../src/mail/em-folder-properties.c:1321 ../src/mail/filtertypes.xml.in.h:29
 #: ../src/mail/searchtypes.xml.in.h:31 ../src/mail/vfoldertypes.xml.in.h:31
 msgid "Label"
 msgstr "Beschriftung"
 
+#: ../src/mail/em-folder-properties.c:1370
+msgid "Appearance"
+msgstr "Erscheinungsbild"
+
 #. Translators: "Archive" is a noun (This is a tab heading in the mail folder properties)
-#: ../src/mail/em-folder-properties.c:1087
+#: ../src/mail/em-folder-properties.c:1374
 msgid "Archive"
 msgstr "Archivieren"
 
-#: ../src/mail/em-folder-properties.c:1090 ../src/mail/mail-config.ui.h:123
+#: ../src/mail/em-folder-properties.c:1377 ../src/mail/mail-config.ui.h:123
 #: ../src/mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Beschriftungen"
 
-#: ../src/mail/em-folder-properties.c:1169
+#: ../src/mail/em-folder-properties.c:1455
 msgid "Folder Properties"
 msgstr "Ordnereigenschaften"
 
-#: ../src/mail/em-folder-properties.c:1408
+#: ../src/mail/em-folder-properties.c:1694
 msgid "Gathering folder properties"
 msgstr "Ordnereigenschaften werden abgerufen"
 
@@ -18242,7 +18586,7 @@ msgstr "<Klicken Sie hier, um einen Ordner auszuwählen>"
 msgid "Create a new folder"
 msgstr "Einen neuen Ordner anlegen"
 
-#: ../src/mail/em-folder-tree.c:682
+#: ../src/mail/em-folder-tree.c:685
 msgid "Folder names cannot contain “/”"
 msgstr "Ordnernamen dürfen das Slash-Zeichen »/« nicht enthalten"
 
@@ -18264,51 +18608,47 @@ msgstr "Ordnernamen dürfen das Slash-Zeichen »/« nicht enthalten"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../src/mail/em-folder-tree.c:876
+#: ../src/mail/em-folder-tree.c:879
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../src/mail/em-folder-tree.c:1731
+#: ../src/mail/em-folder-tree.c:1741
 msgid "Mail Folder Tree"
 msgstr "E-Mail-Ordnerbaum"
 
-#: ../src/mail/em-folder-tree.c:2280
+#: ../src/mail/em-folder-tree.c:2290
 #, c-format
 msgid "Moving folder %s"
 msgstr "Ordner %s wird verschoben"
 
-#: ../src/mail/em-folder-tree.c:2283
+#: ../src/mail/em-folder-tree.c:2293
 #, c-format
 msgid "Copying folder %s"
 msgstr "Ordner %s wird kopiert"
 
-#: ../src/mail/em-folder-tree.c:2290 ../src/mail/message-list.c:2632
+#: ../src/mail/em-folder-tree.c:2300 ../src/mail/message-list.c:2629
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Nachrichten werden in den Ordner %s verschoben"
 
-#: ../src/mail/em-folder-tree.c:2294 ../src/mail/message-list.c:2634
+#: ../src/mail/em-folder-tree.c:2304 ../src/mail/message-list.c:2631
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Nachrichten werden in den Ordner %s kopiert"
 
-#: ../src/mail/em-folder-tree.c:2313
+#: ../src/mail/em-folder-tree.c:2323
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Sie können Nachrichten nicht im Speicher auf der obersten Ebene abgelegen"
 
 # CHECK
 #. UNMATCHED is always last.
-#: ../src/mail/em-folder-tree-model.c:445 ../src/mail/em-folder-tree-model.c:447
+#: ../src/mail/em-folder-tree-model.c:460 ../src/mail/em-folder-tree-model.c:462
 msgid "UNMATCHED"
 msgstr "OHNE TREFFER"
 
-#: ../src/mail/em-folder-tree-model.c:1326 ../src/mail/em-folder-tree-model.c:1703
-msgid "Loading..."
-msgstr "Ladevorgang …"
-
 #: ../src/mail/em-folder-utils.c:111
 #, c-format
 msgid "Moving folder “%s”"
@@ -18349,9 +18689,9 @@ msgstr "_Gezeigte abonnieren"
 msgid "Subscribe To _All"
 msgstr "_Alle abonnieren"
 
-#: ../src/mail/em-subscription-editor.c:936 ../src/mail/em-subscription-editor.c:1888
+#: ../src/mail/em-subscription-editor.c:936 ../src/mail/em-subscription-editor.c:1890
 #: ../src/mail/mail.error.xml.h:73
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1660
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1706
 msgid "_Unsubscribe"
 msgstr "Ab_bestellen"
 
@@ -18363,7 +18703,7 @@ msgstr "_Versteckte abbestellen"
 msgid "Unsubscribe From _All"
 msgstr "_Alle abbestellen"
 
-#: ../src/mail/em-subscription-editor.c:1313
+#: ../src/mail/em-subscription-editor.c:1315
 #: ../src/modules/mail/e-mail-shell-view-private.c:933
 #: ../src/modules/mail/e-mail-shell-view-private.c:965
 #: ../src/modules/mail/e-mail-shell-view-private.c:1009
@@ -18373,7 +18713,7 @@ msgid_plural "%d unread, "
 msgstr[0] "%d ungelesen, "
 msgstr[1] "%d ungelesen, "
 
-#: ../src/mail/em-subscription-editor.c:1317
+#: ../src/mail/em-subscription-editor.c:1319
 #: ../src/modules/mail/e-mail-shell-view-private.c:1019
 #, c-format
 msgid "%d total"
@@ -18381,60 +18721,60 @@ msgid_plural "%d total"
 msgstr[0] "%d insgesamt"
 msgstr[1] "%d insgesamt"
 
-#: ../src/mail/em-subscription-editor.c:1729
+#: ../src/mail/em-subscription-editor.c:1731
 msgid "Folder Subscriptions"
 msgstr "Ordnerabonnements"
 
-#: ../src/mail/em-subscription-editor.c:1764
+#: ../src/mail/em-subscription-editor.c:1766
 msgid "_Account:"
 msgstr "_Konto:"
 
-#: ../src/mail/em-subscription-editor.c:1777
+#: ../src/mail/em-subscription-editor.c:1779
 msgid "Clear Search"
 msgstr "Suchfeld leeren"
 
-#: ../src/mail/em-subscription-editor.c:1794
+#: ../src/mail/em-subscription-editor.c:1796
 msgid "Sho_w items that contain:"
 msgstr "Nur Einträge anzeigen, die Folgendes ent_halten:"
 
-#: ../src/mail/em-subscription-editor.c:1841
+#: ../src/mail/em-subscription-editor.c:1843
 msgid "Subscribe to the selected folder"
 msgstr "Den gewählten Ordner abonnieren"
 
-#: ../src/mail/em-subscription-editor.c:1842
+#: ../src/mail/em-subscription-editor.c:1844
 msgid "Su_bscribe"
 msgstr "A_bonnieren"
 
-#: ../src/mail/em-subscription-editor.c:1887
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1662
+#: ../src/mail/em-subscription-editor.c:1889
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1708
 msgid "Unsubscribe from the selected folder"
 msgstr "Den gewählten Ordner abbestellen"
 
-#: ../src/mail/em-subscription-editor.c:1927
+#: ../src/mail/em-subscription-editor.c:1929
 msgid "Collapse all folders"
 msgstr "Alle Ordner einklappen"
 
-#: ../src/mail/em-subscription-editor.c:1928
+#: ../src/mail/em-subscription-editor.c:1930
 msgid "C_ollapse All"
 msgstr "Alle _einklappen"
 
-#: ../src/mail/em-subscription-editor.c:1938
+#: ../src/mail/em-subscription-editor.c:1940
 msgid "Expand all folders"
 msgstr "Alle Ordner aufklappen"
 
-#: ../src/mail/em-subscription-editor.c:1939
+#: ../src/mail/em-subscription-editor.c:1941
 msgid "E_xpand All"
 msgstr "Alle _aufklappen"
 
-#: ../src/mail/em-subscription-editor.c:1949
+#: ../src/mail/em-subscription-editor.c:1951
 msgid "Refresh the folder list"
 msgstr "Die Ordnerliste auffrischen"
 
-#: ../src/mail/em-subscription-editor.c:1961
+#: ../src/mail/em-subscription-editor.c:1963
 msgid "Stop the current operation"
 msgstr "Den momentan ausgeführten Vorgang abbrechen"
 
-#: ../src/mail/em-subscription-editor.c:1962
+#: ../src/mail/em-subscription-editor.c:1964
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1085
 msgid "_Stop"
 msgstr "_Anhalten"
@@ -18874,7 +19214,7 @@ msgstr "Evolution KMail-Importeur"
 msgid "Import mail and contacts from KMail."
 msgstr "E-Mail und Kontakte aus KMail importieren."
 
-#: ../src/mail/importers/kmail-libs.c:150
+#: ../src/mail/importers/kmail-libs.c:149
 #: ../src/modules/mail/e-mail-shell-view-private.c:1040
 msgid "Trash"
 msgstr "Papierkorb"
@@ -19712,7 +20052,7 @@ msgstr ""
 "entfernen wollen?"
 
 #: ../src/mail/mail.error.xml.h:42
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1540
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1579
 msgid "_Empty Trash"
 msgstr "_Papierkorb leeren"
 
@@ -20469,8 +20809,8 @@ msgid "Failed to empty Junk folder “{0}”"
 msgstr "Unerwünscht-Ordner »{0}« konnte nicht gesäubert werden."
 
 #: ../src/mail/mail-send-recv.c:193
-msgid "Canceling..."
-msgstr "Absagevorgang …"
+msgid "Canceling…"
+msgstr "Abbrechen …"
 
 #: ../src/mail/mail-send-recv.c:610
 msgid "Edit Message"
@@ -20489,11 +20829,11 @@ msgid "Cancel _All"
 msgstr "A_lles abbrechen"
 
 #: ../src/mail/mail-send-recv.c:871 ../src/mail/mail-send-recv.c:1470
-msgid "Updating..."
+msgid "Updating…"
 msgstr "Aktualisieren …"
 
 #: ../src/mail/mail-send-recv.c:871 ../src/mail/mail-send-recv.c:952
-msgid "Waiting..."
+msgid "Waiting…"
 msgstr "Warten …"
 
 #: ../src/mail/mail-send-recv.c:1436
@@ -20528,86 +20868,86 @@ msgstr "Suchordner bearbeiten"
 msgid "New Search Folder"
 msgstr "Neuer Suchordner"
 
-#: ../src/mail/message-list.c:306
+#: ../src/mail/message-list.c:309
 msgid "Unseen"
 msgstr "Ungelesen"
 
-#: ../src/mail/message-list.c:307
+#: ../src/mail/message-list.c:310
 msgid "Seen"
 msgstr "Gelesen"
 
-#: ../src/mail/message-list.c:308
+#: ../src/mail/message-list.c:311
 msgid "Answered"
 msgstr "Beantwortet"
 
-#: ../src/mail/message-list.c:309
+#: ../src/mail/message-list.c:312
 msgid "Forwarded"
 msgstr "Weitergeleitet"
 
-#: ../src/mail/message-list.c:310
+#: ../src/mail/message-list.c:313
 msgid "Multiple Unseen Messages"
 msgstr "Mehrere ungelesene Nachrichten"
 
-#: ../src/mail/message-list.c:311
+#: ../src/mail/message-list.c:314
 msgid "Multiple Messages"
 msgstr "Mehrere Nachrichten"
 
-#: ../src/mail/message-list.c:324
+#: ../src/mail/message-list.c:327
 msgid "Lowest"
 msgstr "Am niedrigsten"
 
-#: ../src/mail/message-list.c:325
+#: ../src/mail/message-list.c:328
 msgid "Lower"
 msgstr "Niedriger"
 
-#: ../src/mail/message-list.c:329
+#: ../src/mail/message-list.c:332
 msgid "Higher"
 msgstr "Höher"
 
-#: ../src/mail/message-list.c:330
+#: ../src/mail/message-list.c:333
 msgid "Highest"
 msgstr "Am höchsten"
 
-#: ../src/mail/message-list.c:479 ../src/mail/message-list.c:6690
+#: ../src/mail/message-list.c:482
 msgid "Generating message list"
 msgstr "Nachrichtenliste wird erzeugt"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../src/mail/message-list.c:2154 ../src/modules/itip-formatter/itip-view.c:269
+#: ../src/mail/message-list.c:2151 ../src/modules/itip-formatter/itip-view.c:268
 msgid "Today %l:%M %p"
 msgstr "Heute %I:%M %p"
 
-#: ../src/mail/message-list.c:2163
+#: ../src/mail/message-list.c:2160
 msgid "Yesterday %l:%M %p"
 msgstr "Gestern %l:%M %p"
 
-#: ../src/mail/message-list.c:2175
+#: ../src/mail/message-list.c:2172
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: ../src/mail/message-list.c:2183
+#: ../src/mail/message-list.c:2180
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b, %k:%M"
 
-#: ../src/mail/message-list.c:2185
+#: ../src/mail/message-list.c:2182
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../src/mail/message-list.c:3265
+#: ../src/mail/message-list.c:3267
 msgid "Select all visible messages"
 msgstr "Alle sichtbaren Nachrichten wählen"
 
-#: ../src/mail/message-list.c:4010 ../src/mail/message-list.etspec.h:17
+#: ../src/mail/message-list.c:4022 ../src/mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "Nachrichten"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../src/mail/message-list.c:5559
+#: ../src/mail/message-list.c:5591
 msgid "Follow-up"
 msgstr "Folgenachricht"
 
-#: ../src/mail/message-list.c:6629
+#: ../src/mail/message-list.c:6654
 msgid ""
 "No message satisfies your search criteria. Change search criteria by selecting a "
 "new Show message filter from the drop down list above or by running a new search "
@@ -20618,10 +20958,14 @@ msgstr ""
 "indem Sie eine neue Suche ausführen, entweder durch Löschen mit dem Menüeintrag "
 "Suche→Löschen oder durch Ändern der Anfrage oben."
 
-#: ../src/mail/message-list.c:6637
+#: ../src/mail/message-list.c:6662
 msgid "There are no messages in this folder."
 msgstr "Es existieren keine Nachrichten in diesem Ordner."
 
+#: ../src/mail/message-list.c:6738
+msgid "Generating message list…"
+msgstr "Nachrichtenliste wird erzeugt …"
+
 #: ../src/mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "Markiert"
@@ -20650,7 +20994,7 @@ msgstr "Nachrichten an"
 msgid "Subject — Trimmed"
 msgstr "Betreff – Gekürzt"
 
-#: ../src/mail/message-list.etspec.h:21 ../src/plugins/save-calendar/csv-format.c:372
+#: ../src/mail/message-list.etspec.h:21 ../src/plugins/save-calendar/csv-format.c:361
 msgid "UID"
 msgstr "UID"
 
@@ -20671,32 +21015,32 @@ msgid "Subject or Addresses contains"
 msgstr "Betreff oder Adresse enthält"
 
 #: ../src/mail/searchtypes.xml.in.h:58
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2065
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2111
 msgid "Recipients contain"
 msgstr "Empfänger enthalten"
 
 #: ../src/mail/searchtypes.xml.in.h:59
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2058
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2104
 msgid "Message contains"
 msgstr "Nachricht enthält"
 
 #: ../src/mail/searchtypes.xml.in.h:60
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2079
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2125
 msgid "Subject contains"
 msgstr "Betreff enthält"
 
 #: ../src/mail/searchtypes.xml.in.h:61
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2072
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2118
 msgid "Sender contains"
 msgstr "Absender enthält"
 
 #: ../src/mail/searchtypes.xml.in.h:62
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2044
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2090
 msgid "Body contains"
 msgstr "Rumpf enthält"
 
 #: ../src/mail/searchtypes.xml.in.h:63
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2051
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2097
 msgid "Free form expression"
 msgstr "Freies Eingabefeld"
 
@@ -20724,7 +21068,7 @@ msgid "New Address Book"
 msgstr "Neues Adressbuch"
 
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:484
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:326
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:271
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:180
 msgid "New Memo List"
 msgstr "Neue Notizliste"
@@ -20860,8 +21204,8 @@ msgid "Save as vCard"
 msgstr "Als VCard speichern"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1015
-msgid "Co_py All Contacts To..."
-msgstr "Kontakte _kopieren nach …"
+msgid "Co_py All Contacts To…"
+msgstr "Alle Kontakte _kopieren nach …"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1017
 msgid "Copy the contacts of the selected address book to another"
@@ -20876,16 +21220,16 @@ msgid "Delete the selected address book"
 msgstr "Das gewählte Adressbuch löschen"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1029
-msgid "_Manage Address Book groups..."
+msgid "_Manage Address Book groups…"
 msgstr "Adressbuchgruppen _verwalten …"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1031
-#: ../src/modules/calendar/e-task-shell-view-actions.c:735
+#: ../src/modules/calendar/e-task-shell-view-actions.c:733
 msgid "Manage task list groups order and visibility"
 msgstr "Gruppenreihenfolge in Aufgabenliste und deren Sichtbarkeit verwalten"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1036
-msgid "Mo_ve All Contacts To..."
+msgid "Mo_ve All Contacts To…"
 msgstr "Alle Kontakte _verschieben nach …"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1038
@@ -20905,9 +21249,9 @@ msgid "Show properties of the selected address book"
 msgstr "Die Eigenschaften des gewählten Adressbuchs anzeigen"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1057
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1346
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:628
-#: ../src/modules/calendar/e-task-shell-view-actions.c:754
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1298
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:626
+#: ../src/modules/calendar/e-task-shell-view-actions.c:752
 msgid "Re_fresh"
 msgstr "Auf_frischen"
 
@@ -20928,11 +21272,11 @@ msgid "Show map with all contacts from selected address book"
 msgstr "Karte mit allen Kontakten des gewählten Adressbuchs anzeigen"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1078
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1360
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:642
-#: ../src/modules/calendar/e-task-shell-view-actions.c:768
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1639
-msgid "_Rename..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1312
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:640
+#: ../src/modules/calendar/e-task-shell-view-actions.c:766
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1685
+msgid "_Rename…"
 msgstr "_Umbenennen …"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1080
@@ -20944,7 +21288,7 @@ msgid "Stop loading"
 msgstr "Laden stoppen"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1092
-msgid "_Copy Contact To..."
+msgid "_Copy Contact To…"
 msgstr "Kontakt _kopieren nach …"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1094
@@ -20956,23 +21300,23 @@ msgid "_Delete Contact"
 msgstr "Kontakt _löschen"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1106
-msgid "_Find in Contact..."
-msgstr "In Kontakten _suchen …"
+msgid "_Find in Contact…"
+msgstr "In Kontakt _suchen …"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1108
 msgid "Search for text in the displayed contact"
 msgstr "Im angezeigten Kontakt einen Text suchen"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1113
-msgid "_Forward Contact..."
-msgstr "Kontakt _weiterleiten …"
+msgid "_Forward Contact…"
+msgstr "Kontakt weiter_leiten …"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1115
 msgid "Send selected contacts to another person"
 msgstr "Gewählte Kontakte an jemanden verschicken"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1120
-msgid "_Move Contact To..."
+msgid "_Move Contact To…"
 msgstr "Kontakt _verschieben nach …"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1122
@@ -20980,11 +21324,11 @@ msgid "Move selected contacts to another address book"
 msgstr "Gewählte Kontakte in ein anderes Adressbuch verschieben"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1127
-msgid "_New Contact..."
+msgid "_New Contact…"
 msgstr "_Neuer Kontakt …"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1134
-msgid "New Contact _List..."
+msgid "New Contact _List…"
 msgstr "Neue Kontakt_liste …"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1141
@@ -20996,7 +21340,7 @@ msgid "View the current contact"
 msgstr "Den aktuellen Kontakt anzeigen"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1148
-msgid "_Send Message to Contact..."
+msgid "_Send Message to Contact…"
 msgstr "_Nachricht an Kontakt schicken …"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1150
@@ -21004,23 +21348,23 @@ msgid "Send a message to the selected contacts"
 msgstr "Eine Nachricht an die gewählten Kontakte schicken"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1157
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1530
-#: ../src/modules/calendar/e-task-shell-view-actions.c:833
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1482
+#: ../src/modules/calendar/e-task-shell-view-actions.c:831
 msgid "_Actions"
 msgstr "A_ktionen"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1164
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:686
-#: ../src/modules/calendar/e-task-shell-view-actions.c:840
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1788
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:684
+#: ../src/modules/calendar/e-task-shell-view-actions.c:838
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1834
 msgid "_Preview"
 msgstr "_Vorschau"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1177
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1559
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:703
-#: ../src/modules/calendar/e-task-shell-view-actions.c:857
-msgid "_Manage groups..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1511
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:701
+#: ../src/modules/calendar/e-task-shell-view-actions.c:855
+msgid "_Manage groups…"
 msgstr "_Gruppen verwalten …"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1193
@@ -21045,9 +21389,9 @@ msgstr "Karten im Kontakt-Vorschaufenster anzeigen"
 
 # CHECK
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1254
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:768
-#: ../src/modules/calendar/e-task-shell-view-actions.c:934
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1946
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:766
+#: ../src/modules/calendar/e-task-shell-view-actions.c:932
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1992
 msgid "_Classic View"
 msgstr "_Klassische Ansicht"
 
@@ -21057,9 +21401,9 @@ msgstr "Kontakt-Vorschaufenster unter der Kontaktliste anzeigen"
 
 # CHECK - macht überhaupt keinen Sinn
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1261
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:775
-#: ../src/modules/calendar/e-task-shell-view-actions.c:941
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1953
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:773
+#: ../src/modules/calendar/e-task-shell-view-actions.c:939
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1999
 msgid "_Vertical View"
 msgstr "_Vertikale Ansicht"
 
@@ -21068,17 +21412,17 @@ msgid "Show contact preview alongside the contact list"
 msgstr "Kontakt-Vorschaufenster neben der Kontaktliste anzeigen"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1278
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1723
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:792
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1000
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1675
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:790
+#: ../src/modules/calendar/e-task-shell-view-actions.c:998
 msgid "Unmatched"
 msgstr "Nicht einsortiert"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1288
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1733
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:802
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1010
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2037
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1685
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:800
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1008
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2083
 #: ../src/shell/e-shell-content.c:639
 msgid "Advanced Search"
 msgstr "Erweiterte Suche"
@@ -21106,8 +21450,8 @@ msgstr "Die Kontakte des gewählten Adressbuchs als vCard speichern"
 #. Translators: This is an action label
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1358
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1368
-msgid "_Save as vCard..."
-msgstr "Als VCard _speichern …"
+msgid "_Save as vCard…"
+msgstr "Als vCard _speichern …"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1360
 msgid "Save selected contacts as a vCard"
@@ -21133,7 +21477,7 @@ msgstr "_Nachricht an Liste schicken"
 msgid "_Send Message to Contact"
 msgstr "_Nachricht an Kontakt schicken"
 
-#: ../src/modules/alarm-notify/alarm-notify.c:169
+#: ../src/modules/alarm-notify/alarm-notify.c:171
 #, c-format
 msgid "Failed to launch command “%s”:"
 msgstr "Befehl »%s« konnte nicht ausgeführt werden:"
@@ -21149,17 +21493,17 @@ msgstr ""
 "Alle E-Mails, Kalender, Aufgaben, Notizen und Adressbücher sowie alle\n"
 "persönlichen Einstellungen, Filter etc. können wiederhergestellt werden."
 
-#: ../src/modules/backup-restore/e-mail-config-restore-page.c:177
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:178
 msgid "_Restore from a backup file:"
 msgstr "Aus Siche_rungsdatei wiederherstellen:"
 
-#: ../src/modules/backup-restore/e-mail-config-restore-page.c:188
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:189
 msgid "Choose a backup file to restore"
 msgstr "Eine Datei zum Wiederherstellen wählen"
 
 #. Keep the title identical to EMailConfigRestorePage
 #. * so it's only shown once in the assistant sidebar.
-#: ../src/modules/backup-restore/e-mail-config-restore-page.c:291
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:292
 #: ../src/modules/backup-restore/e-mail-config-restore-ready-page.c:57
 msgid "Restore from Backup"
 msgstr "Aus Sicherungsdatei wiederherstellen"
@@ -21182,11 +21526,11 @@ msgstr "Name des Evolution-Sicherungsarchivs zur Wiederherstellung wählen"
 
 #: ../src/modules/backup-restore/evolution-backup-restore.c:437
 #, c-format
-msgid "Checking content of backup file “%s”, please wait..."
+msgid "Checking content of backup file “%s”, please wait…"
 msgstr "Inhalt von Sicherungskopie-Datei »%s« wird geprüft, bitte warten …"
 
 #: ../src/modules/backup-restore/evolution-backup-restore.c:458
-msgid "_Back up Evolution Data..."
+msgid "_Back up Evolution Data…"
 msgstr "Evolution-Daten _sichern …"
 
 #: ../src/modules/backup-restore/evolution-backup-restore.c:460
@@ -21196,7 +21540,7 @@ msgstr ""
 "Archivdatei"
 
 #: ../src/modules/backup-restore/evolution-backup-restore.c:465
-msgid "R_estore Evolution Data..."
+msgid "R_estore Evolution Data…"
 msgstr "Evolution-Daten wi_ederherstellen …"
 
 #: ../src/modules/backup-restore/evolution-backup-restore.c:467
@@ -21396,25 +21740,26 @@ msgstr "Filter für unerwünschte Nachrichten, der den Bogofilter verwendet"
 msgid "Choose an Address Book"
 msgstr "Wählen Sie ein Adressbuch"
 
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:250
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:263
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:294
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:310
-#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:128
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:264
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:277
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:313
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:334
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:147
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:168
 msgid "URL:"
 msgstr "Adresse:"
 
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:274
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:288
 msgid "Find Address Books"
 msgstr "Adressbücher suchen"
 
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:285
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:299
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "IfMatch vermeiden (benötigt von Apache < 2.2.8)"
 
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:336
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:426
-#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:185
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:352
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:453
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:233
 msgid "URL is not a valid http:// nor https:// URL"
 msgstr "Adresse entspricht nicht dem Format http:// oder https://";
 
@@ -21583,38 +21928,38 @@ msgstr "Durchsuchen, bis Begrenzung erreicht ist"
 msgid "Server address cannot be empty"
 msgstr "Serveradresse darf nicht leer sein"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:110
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:112
 #: ../src/modules/cal-config-google/e-google-chooser-button.c:226
 msgid "Choose a Calendar"
 msgstr "Wählen Sie einen Kalender"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:114
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:116
 #: ../src/modules/cal-config-google/e-google-chooser-button.c:230
 msgid "Choose a Memo List"
 msgstr "Wählen Sie eine Notizliste"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:118
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:120
 #: ../src/modules/cal-config-google/e-google-chooser-button.c:234
 msgid "Choose a Task List"
 msgstr "Wählen Sie eine Aufgabenliste"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:326
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:349
 msgid "Find Calendars"
 msgstr "Kalender suchen"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:329
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:352
 msgid "Find Memo Lists"
 msgstr "Notizlisten suchen"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:332
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:355
 msgid "Find Task Lists"
 msgstr "Aufgabenlisten suchen"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:351
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:374
 msgid "Email:"
 msgstr "E-Mail:"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:356
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:380
 msgid "Server handles meeting invitations"
 msgstr "Server unterstützt Einladungen zu Besprechungen"
 
@@ -21690,124 +22035,124 @@ msgstr "Einheiten:"
 msgid "Location cannot be empty"
 msgstr "Ort darf nicht leer sein"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:285
+#: ../src/modules/calendar/e-cal-attachment-handler.c:283
 #: ../src/smime/gui/smime-ui.ui.h:7
 msgid "I_mport"
 msgstr "I_mportieren"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:335
+#: ../src/modules/calendar/e-cal-attachment-handler.c:333
 msgid "Importing an event"
 msgstr "Termin wird importiert"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:339
+#: ../src/modules/calendar/e-cal-attachment-handler.c:337
 msgid "Importing a memo"
 msgstr "Notiz wird importiert"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:343
+#: ../src/modules/calendar/e-cal-attachment-handler.c:341
 msgid "Importing a task"
 msgstr "Aufgabe wird importiert"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:401
+#: ../src/modules/calendar/e-cal-attachment-handler.c:399
 msgid "Select a Calendar"
 msgstr "Einen Kalender auswählen"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:408
+#: ../src/modules/calendar/e-cal-attachment-handler.c:406
 msgid "Select a Memo List"
 msgstr "Notizliste auswählen"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:415
+#: ../src/modules/calendar/e-cal-attachment-handler.c:413
 msgid "Select a Task List"
 msgstr "Eine Aufgabenliste auswählen"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:422
+#: ../src/modules/calendar/e-cal-attachment-handler.c:420
 msgid "I_mport to Calendar"
 msgstr "In _Kalender importieren"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:429
+#: ../src/modules/calendar/e-cal-attachment-handler.c:427
 msgid "I_mport to Memo List"
 msgstr "In _Notizliste importieren"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:436
+#: ../src/modules/calendar/e-cal-attachment-handler.c:434
 msgid "I_mport to Task List"
 msgstr "In _Aufgabenliste importieren"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:569
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:566
 #, c-format
 msgid "Copying an event into the calendar “%s”"
 msgstr "Ein Termin wird in den Kalender »%s« kopiert"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:570
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:567
 #, c-format
 msgid "Moving an event into the calendar “%s”"
 msgstr "Ein Termin wird in den Kalender »%s« verschoben"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:575
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:572
 #, c-format
 msgid "Copying a memo into the memo list “%s”"
 msgstr "Eine Notiz wird in die Notizliste »%s« kopiert"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:576
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:573
 #, c-format
 msgid "Moving a memo into the memo list “%s”"
 msgstr "Eine Notiz wird in die Notizliste »%s« verschoben"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:581
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:578
 #, c-format
 msgid "Copying a task into the task list “%s”"
 msgstr "Eine Aufgabe wird in die Aufgabenliste »%s« kopiert"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:582
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:579
 #, c-format
 msgid "Moving a task into the task list “%s”"
 msgstr "Eine Aufgabe wird in die Aufgabenliste »%s« verschoben"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:699
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:694
 msgid "Calendar Selector"
 msgstr "Kalenderquellenauswahl"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:705
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:700
 msgid "Memo List Selector"
 msgstr "Notizquellenauswahl"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:710
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:705
 msgid "Task List Selector"
 msgstr "Aufgabenlistenauswahl"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:524
+#: ../src/modules/calendar/e-calendar-preferences.c:521
 msgid "Selected Calendars for Notifications of Reminders"
 msgstr "Ausgewählte Kalender für Erinnerungsmeldungen"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:531
-msgid "Selected Memo Lists for Notifications of Reminders"
-msgstr "Ausgewählte Notizlisten für Erinnerungsmeldungen"
-
-#: ../src/modules/calendar/e-calendar-preferences.c:538
+#: ../src/modules/calendar/e-calendar-preferences.c:528
 msgid "Selected Task Lists for Notifications of Reminders"
 msgstr "Ausgewählte Aufgabenlisten für Erinnerungsmeldungen"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:634
+#: ../src/modules/calendar/e-calendar-preferences.c:612
 msgid "Meeting Invitations"
 msgstr "Besprechungseinladungen"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:660
+#: ../src/modules/calendar/e-calendar-preferences.c:638
 msgid "_Delete message after acting"
 msgstr "_Löschen der Nachricht nach Abarbeitung"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:674
-#: ../src/modules/calendar/e-calendar-preferences.c:705
+#: ../src/modules/calendar/e-calendar-preferences.c:645
+msgid "_Preserve existing reminder by default"
+msgstr "_Vorhandene Erinnerungen standardmäßig aufbewahren"
+
+#: ../src/modules/calendar/e-calendar-preferences.c:659
+#: ../src/modules/calendar/e-calendar-preferences.c:690
 msgid "Conflict Search"
 msgstr "Konfliktsuche"
 
 #. Source selector
-#: ../src/modules/calendar/e-calendar-preferences.c:689
+#: ../src/modules/calendar/e-calendar-preferences.c:674
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Kalender zur Suche nach Besprechungskonflikten auswählen"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:1129
+#: ../src/modules/calendar/e-calendar-preferences.c:1113
 msgid "Ti_me and date:"
 msgstr "_Zeit und Datum:"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:1130
+#: ../src/modules/calendar/e-calendar-preferences.c:1114
 msgid "_Date only:"
 msgstr "Nur das _Datum:"
 
@@ -21872,7 +22217,7 @@ msgid "_24 hour"
 msgstr "_24 Stunden"
 
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:18
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1685
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1637
 msgid "Work Week"
 msgstr "Arbeitswoche"
 
@@ -22041,8 +22386,8 @@ msgid "Show Tasks without _Due date"
 msgstr "Aufgaben ohne Fälligkeits_datum anzeigen"
 
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:73
-msgid "Display reminders in _notification area only"
-msgstr "Erinnerungen nur im _Benachrichtigungsfeld anzeigen"
+msgid "Display Reminders window with _notifications"
+msgstr "Erinnerungsdialog mit Be_nachrichtigungen anzeigen"
 
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:74
 msgid "Keep reminder notification _window always on top"
@@ -22080,16 +22425,16 @@ msgstr "vor jedem Jahrestag/Geburtstag"
 msgid "Select the sources for reminder notification:"
 msgstr "Quellen für Erinnerungsmeldungen auswählen:"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:89
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:88
 msgid "Default Free/Busy Server"
 msgstr "Vorgegebener Verfügbarkeits-Server"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:92
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:91
 #, 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."
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:93
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:92
 msgid ""
 "Specify login user name as part of the URL in case the server requires "
 "authentication, like: https://USER example com/"
@@ -22097,49 +22442,49 @@ msgstr ""
 "Anmelde-Benutzername als Teil der Adresse angeben, falls der Server eine "
 "Authentifizierung erfordert, z.B.: https://NUTZER beispiel de/"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:94
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:93
 msgid "Publishing Information"
 msgstr "Information zur Veröffentlichung"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:115
+#: ../src/modules/calendar/e-cal-shell-backend.c:118
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Termin"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:117
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1474
+#: ../src/modules/calendar/e-cal-shell-backend.c:120
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1426
 msgid "Create a new appointment"
 msgstr "Einen neuen Termin anlegen"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:122
+#: ../src/modules/calendar/e-cal-shell-backend.c:125
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "_Ganztagstermin"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:124
+#: ../src/modules/calendar/e-cal-shell-backend.c:127
 msgid "Create a new all-day appointment"
 msgstr "Einen neuen ganztägigen Termin anlegen"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:129
+#: ../src/modules/calendar/e-cal-shell-backend.c:132
 msgctxt "New"
 msgid "M_eeting"
 msgstr "_Besprechung"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:131
+#: ../src/modules/calendar/e-cal-shell-backend.c:134
 msgid "Create a new meeting request"
 msgstr "Eine neue Besprechungsanfrage anlegen"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:139
+#: ../src/modules/calendar/e-cal-shell-backend.c:142
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Kalen_der"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:141
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1327
+#: ../src/modules/calendar/e-cal-shell-backend.c:144
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1279
 msgid "Create a new calendar"
 msgstr "Einen neuen Kalender anlegen"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:258
+#: ../src/modules/calendar/e-cal-shell-backend.c:261
 msgid "Calendar and Tasks"
 msgstr "Kalender und Aufgaben"
 
@@ -22161,373 +22506,373 @@ msgstr ""
 msgid "Purge events older than"
 msgstr "Termine löschen älter als"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:940
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:919
 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.
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1140
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1112
 msgid "event"
 msgstr "Termin"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1142
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:207
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:275
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:512
-#: ../src/modules/calendar/e-task-shell-view-actions.c:631
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1114
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:204
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:278
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:510
+#: ../src/modules/calendar/e-task-shell-view-actions.c:629
 msgid "Save as iCalendar"
 msgstr "Als iCalendar speichern"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1276
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:593
-#: ../src/modules/calendar/e-task-shell-view-actions.c:719
-msgid "_Copy..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1228
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:591
+#: ../src/modules/calendar/e-task-shell-view-actions.c:717
+msgid "_Copy…"
 msgstr "_Kopieren …"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1283
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1235
 msgid "D_elete Calendar"
 msgstr "Kalender _löschen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1285
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1237
 msgid "Delete the selected calendar"
 msgstr "Den gewählten Kalender löschen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1292
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1244
 msgid "Go Back"
 msgstr "Zurück gehen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1299
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1251
 msgid "Go Forward"
 msgstr "Vor gehen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1306
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1258
 msgid "Select today"
 msgstr "Heute wählen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1311
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1263
 msgid "Select _Date"
 msgstr "_Datum wählen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1313
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1265
 msgid "Select a specific date"
 msgstr "Ein bestimmtes Datum wählen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1318
-msgid "_Manage Calendar groups..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1270
+msgid "_Manage Calendar groups…"
 msgstr "Kalendergruppen _verwalten …"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1320
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1272
 msgid "Manage Calendar groups order and visibility"
 msgstr "Kalendergruppen und deren Sichtbarkeit verwalten"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1325
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1277
 msgid "_New Calendar"
 msgstr "_Neuer Kalender"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1339
-#: ../src/modules/calendar/e-task-shell-view-actions.c:824
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1291
+#: ../src/modules/calendar/e-task-shell-view-actions.c:822
 msgid "Purg_e"
 msgstr "_Säubern"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1341
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1293
 msgid "Purge old appointments and meetings"
 msgstr "Alte Termine und Besprechungen löschen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1348
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1300
 msgid "Refresh the selected calendar"
 msgstr "Den gewählten Kalender aktualisieren"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1353
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1305
 msgid "Re_fresh list of account calendars"
 msgstr "Liste der Kalender des Kontos _aktualisieren"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1362
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1314
 msgid "Rename the selected calendar"
 msgstr "Den gewählten Kalender umbenennen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1367
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1319
 msgid "Find _Next"
 msgstr "_Nächster Treffer"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1369
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1321
 msgid "Find next occurrence of the current search string"
 msgstr "Das nächste Vorkommen des aktuellen Suchbegriffs finden"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1374
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1326
 msgid "Find _Previous"
 msgstr "_Vorheriger Treffer"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1376
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1328
 msgid "Find previous occurrence of the current search string"
 msgstr "Das vorherige Vorkommen des aktuellen Suchbegriffs finden"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1381
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1333
 msgid "Stop _Running Search"
 msgstr "Suchvorgang _anhalten"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1383
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1335
 msgid "Stop currently running search"
 msgstr "Derzeit laufende Suche stoppen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1388
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1340
 msgid "Sho_w All Calendars"
 msgstr "_Alle Kalender anzeigen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1395
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1347
 msgid "Show _Only This Calendar"
 msgstr "Nur diesen _Kalender anzeigen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1402
-msgid "Cop_y to Calendar..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1354
+msgid "Cop_y to Calendar…"
 msgstr "In Kalender k_opieren …"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1409
-msgid "_Delegate Meeting..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1361
+msgid "_Delegate Meeting…"
 msgstr "Besprechung dele_gieren …"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1416
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1368
 msgid "_Delete Appointment"
 msgstr "Den Termin _löschen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1418
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1370
 msgid "Delete selected appointments"
 msgstr "Ausgewählte Termine löschen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1423
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1375
 msgid "Delete This _Occurrence"
 msgstr "Dieses V_orkommen löschen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1425
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1377
 msgid "Delete this occurrence"
 msgstr "Diesen Treffer löschen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1430
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1382
 msgid "Delete All Occ_urrences"
 msgstr "Alle _Vorkommen löschen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1432
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1384
 msgid "Delete all occurrences"
 msgstr "Alle Vorkommen löschen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1437
-msgid "Edit as Ne_w..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1389
+msgid "Edit as Ne_w…"
 msgstr "Als _neu bearbeiten …"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1439
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1391
 msgid "Edit the current appointment as new"
 msgstr "Den aktuellen Termin als neu bearbeiten"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1444
-msgid "New All Day _Event..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1396
+msgid "New All Day _Event…"
 msgstr "Neuer _ganztägiger Termin …"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1446
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1398
 msgid "Create a new all day event"
 msgstr "Einen neuen ganztägigen Termin anlegen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1451
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:241
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:315
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:586
-#: ../src/modules/calendar/e-task-shell-view-actions.c:712
-msgid "_Forward as iCalendar..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1403
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:238
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:318
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:584
+#: ../src/modules/calendar/e-task-shell-view-actions.c:710
+msgid "_Forward as iCalendar…"
 msgstr "Als i_Calendar weiterleiten …"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1460
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1412
 msgid "Create a new meeting"
 msgstr "Eine neue Besprechung anlegen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1465
-msgid "Mo_ve to Calendar..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1417
+msgid "Mo_ve to Calendar…"
 msgstr "In Kalender _verschieben …"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1479
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1431
 msgid "Make this Occurrence _Movable"
 msgstr "Diese Wiederholung v_erschiebbar machen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1486
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1438
 msgid "_Open Appointment"
 msgstr "Termin ö_ffnen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1488
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1440
 msgid "View the current appointment"
 msgstr "Den aktuellen Termin anzeigen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1507
-msgid "_Schedule Meeting..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1459
+msgid "_Schedule Meeting…"
 msgstr "Besprechung _ansetzen …"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1509
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1461
 msgid "Converts an appointment to a meeting"
 msgstr "Wandelt einen Termin in eine Besprechung um"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1514
-msgid "Conv_ert to Appointment..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1466
+msgid "Conv_ert to Appointment…"
 msgstr "In T_ermin umwandeln …"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1516
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1468
 msgid "Converts a meeting to an appointment"
 msgstr "Wandelt eine Besprechung in einen Termin um"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1521
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1473
 msgid "Quit"
 msgstr "Beenden"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1657
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1609
 msgid "Day"
 msgstr "Tag"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1659
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1611
 msgid "Show one day"
 msgstr "Tagesansicht"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1664
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1616
 msgid "List"
 msgstr "Liste"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1666
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1618
 msgid "Show as list"
 msgstr "Listenansicht"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1671
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1623
 msgid "Month"
 msgstr "Monat"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1673
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1625
 msgid "Show one month"
 msgstr "Monatsansicht"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1678
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1630
 msgid "Week"
 msgstr "Woche"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1680
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1632
 msgid "Show one week"
 msgstr "Wochenansicht"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1687
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1639
 msgid "Show one work week"
 msgstr "Eine Arbeitswoche anzeigen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1695
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1647
 msgid "Active Appointments"
 msgstr "Aktuelle Termine"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1709
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1661
 msgid "Next 7 Days’ Appointments"
 msgstr "Termine der nächsten 7 Tage"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1716
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1668
 msgid "Occurs Less Than 5 Times"
 msgstr "Kommt weniger als fünf Mal vor"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1747
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:816
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1024
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1699
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:814
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1022
 msgid "Description contains"
 msgstr "Beschreibung enthält"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1754
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:823
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1031
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1706
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:821
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1029
 msgid "Summary contains"
 msgstr "Zusammenfassung enthält"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1764
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1778
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:272
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:360
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:833
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:847
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1041
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1055
-msgid "Print..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1716
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1730
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:269
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:363
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:831
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:845
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1039
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1053
+msgid "Print…"
 msgstr "Drucken …"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1766
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1718
 msgid "Print this calendar"
 msgstr "Diesen Kalender drucken"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1773
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1725
 msgid "Preview the calendar to be printed"
 msgstr "Vorschau auf den zu druckenden Kalender"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1795
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:282
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:370
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:864
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1072
-msgid "_Save as iCalendar..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1747
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:279
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:373
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:862
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1070
+msgid "_Save as iCalendar…"
 msgstr "Als i_Calendar speichern …"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1872
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1824
 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.
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:205
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:510
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:202
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:508
 msgid "memo"
 msgstr "Notiz"
 
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:248
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:663
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:245
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:661
 msgid "New _Memo"
 msgstr "Neue _Notiz"
 
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:250
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:247
 #: ../src/modules/calendar/e-memo-shell-backend.c:79
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:665
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:663
 msgid "Create a new memo"
 msgstr "Eine neue Notiz anlegen"
 
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:255
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:670
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:252
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:668
 msgid "_Open Memo"
 msgstr "Notiz ö_ffnen"
 
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:672
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:254
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:670
 msgid "View the selected memo"
 msgstr "Die gewählte Notiz anzeigen"
 
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:262
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:350
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:677
-#: ../src/modules/calendar/e-task-shell-view-actions.c:817
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:259
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:353
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:675
+#: ../src/modules/calendar/e-task-shell-view-actions.c:815
 msgid "Open _Web Page"
-msgstr "_Website öffnen"
+msgstr "_Internetseite öffnen"
 
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:274
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:849
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:271
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:847
 msgid "Print the selected memo"
 msgstr "Die gewählte Notiz drucken"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:885
+#: ../src/modules/calendar/e-cal-shell-view-private.c:911
 msgid "Searching next matching event"
 msgstr "Nächsten zutreffenden Termin suchen"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:886
+#: ../src/modules/calendar/e-cal-shell-view-private.c:912
 msgid "Searching previous matching event"
 msgstr "Vorherigen zutreffenden Termin suchen"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:907
+#: ../src/modules/calendar/e-cal-shell-view-private.c:933
 #, c-format
 msgid "Cannot find matching event in the next %d year"
 msgid_plural "Cannot find matching event in the next %d years"
 msgstr[0] "Passender Termin konnte im nächsten Jahr nicht gefunden werden"
 msgstr[1] "Passender Termin konnte in den nächsten %d Jahren nicht gefunden werden"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:911
+#: ../src/modules/calendar/e-cal-shell-view-private.c:937
 #, c-format
 msgid "Cannot find matching event in the previous %d year"
 msgid_plural "Cannot find matching event in the previous %d years"
 msgstr[0] "Passender Termin konnte im letzten Jahr nicht gefunden werden"
 msgstr[1] "Passender Termin konnte in den letzten %d Jahren nicht gefunden werden"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:934
+#: ../src/modules/calendar/e-cal-shell-view-private.c:960
 msgid "Cannot search with no active calendar"
 msgstr "Suche kann ohne aktiven Kalender nicht ausgeführt werden"
 
@@ -22535,58 +22880,58 @@ 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
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:273
-#: ../src/modules/calendar/e-task-shell-view-actions.c:629
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:276
+#: ../src/modules/calendar/e-task-shell-view-actions.c:627
 msgid "task"
 msgstr "Aufgabe"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:308
-#: ../src/modules/calendar/e-task-shell-view-actions.c:691
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:311
+#: ../src/modules/calendar/e-task-shell-view-actions.c:689
 msgid "_Assign Task"
 msgstr "Aufgabe _zuweisen"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:322
-#: ../src/modules/calendar/e-task-shell-view-actions.c:789
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:325
+#: ../src/modules/calendar/e-task-shell-view-actions.c:787
 msgid "_Mark as Complete"
 msgstr "Als abgeschlossen _markieren"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../src/modules/calendar/e-task-shell-view-actions.c:791
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:327
+#: ../src/modules/calendar/e-task-shell-view-actions.c:789
 msgid "Mark selected tasks as complete"
 msgstr "Die gewählten Aufgaben als abgeschlossen markieren"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:329
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:332
 msgid "_Mark as Incomplete"
 msgstr "Als _offen markieren"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:331
-#: ../src/modules/calendar/e-task-shell-view-actions.c:798
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:334
+#: ../src/modules/calendar/e-task-shell-view-actions.c:796
 msgid "Mark selected tasks as incomplete"
 msgstr "Die gewählten Aufgaben als unvollständig markieren"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:336
-#: ../src/modules/calendar/e-task-shell-view-actions.c:803
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:339
+#: ../src/modules/calendar/e-task-shell-view-actions.c:801
 msgid "New _Task"
 msgstr "_Neue Aufgabe"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:338
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:341
 #: ../src/modules/calendar/e-task-shell-backend.c:77
-#: ../src/modules/calendar/e-task-shell-view-actions.c:805
+#: ../src/modules/calendar/e-task-shell-view-actions.c:803
 msgid "Create a new task"
 msgstr "Eine neue Aufgabe anlegen"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:343
-#: ../src/modules/calendar/e-task-shell-view-actions.c:810
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:346
+#: ../src/modules/calendar/e-task-shell-view-actions.c:808
 msgid "_Open Task"
 msgstr "Aufgabe ö_ffnen"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../src/modules/calendar/e-task-shell-view-actions.c:812
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:348
+#: ../src/modules/calendar/e-task-shell-view-actions.c:810
 msgid "View the selected task"
 msgstr "Die gewählte Aufgabe anzeigen"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:362
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1057
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:365
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1055
 msgid "Print the selected task"
 msgstr "Die gewählte Aufgabe drucken"
 
@@ -22610,7 +22955,7 @@ msgid "Memo Li_st"
 msgstr "Notizli_ste"
 
 #: ../src/modules/calendar/e-memo-shell-backend.c:96
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:616
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:614
 msgid "Create a new memo list"
 msgstr "Eine neue Notizliste anlegen"
 
@@ -22619,79 +22964,79 @@ msgstr "Eine neue Notizliste anlegen"
 msgid "Print Memos"
 msgstr "Notizen drucken"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:572
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:570
 msgid "_Delete Memo"
 msgstr "Notiz _löschen"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:579
-msgid "_Find in Memo..."
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:577
+msgid "_Find in Memo…"
 msgstr "In Notiz _suchen …"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:581
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:579
 msgid "Search for text in the displayed memo"
 msgstr "In der angezeigten Notiz einen Text suchen"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:600
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:598
 msgid "D_elete Memo List"
 msgstr "Notizlist_e löschen"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:602
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:600
 msgid "Delete the selected memo list"
 msgstr "Die gewählte Notizliste löschen"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:607
-msgid "_Manage Memo List groups..."
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:605
+msgid "_Manage Memo List groups…"
 msgstr "Notizlistengruppen _verwalten …"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:609
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:607
 msgid "Manage Memo List groups order and visibility"
 msgstr "Gruppenreihenfolge in Notizlisten und deren Sichtbarkeit verwalten"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:614
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:612
 msgid "_New Memo List"
 msgstr "_Neue Notizliste"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:630
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:628
 msgid "Refresh the selected memo list"
 msgstr "Die ausgewählte Notizliste aktualisieren"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:635
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:633
 msgid "Re_fresh list of account memo lists"
 msgstr "Liste der Notizlisten des Kontos _aktualisieren"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:644
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:642
 msgid "Rename the selected memo list"
 msgstr "Die ausgewählte Notizliste umbenennen"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:649
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:647
 msgid "Show _Only This Memo List"
 msgstr "Nur diese N_otizliste anzeigen"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:656
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:654
 msgid "Sho_w All Memo Lists"
 msgstr "_Alle Notizlisten anzeigen"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:747
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:745
 msgid "Memo _Preview"
 msgstr "Notiz_vorschau"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:749
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:747
 msgid "Show memo preview pane"
 msgstr "Vorschaufeld für Notizen anzeigen"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:770
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:768
 msgid "Show memo preview below the memo list"
 msgstr "Notizvorschau unter der Notizliste anzeigen"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:777
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:775
 msgid "Show memo preview alongside the memo list"
 msgstr "Notizvorschau neben der Notizliste anzeigen"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:835
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:833
 msgid "Print the list of memos"
 msgstr "Die Liste von Notizen drucken"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:842
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:840
 msgid "Preview the list of memos to be printed"
 msgstr "Vorschau auf die zu druckende Liste von Notizen anzeigen"
 
@@ -22736,7 +23081,7 @@ msgid "Tas_k List"
 msgstr "_Aufgabenliste"
 
 #: ../src/modules/calendar/e-task-shell-backend.c:94
-#: ../src/modules/calendar/e-task-shell-view-actions.c:742
+#: ../src/modules/calendar/e-task-shell-view-actions.c:740
 msgid "Create a new task list"
 msgstr "Eine neue Aufgabenliste anlegen"
 
@@ -22745,7 +23090,7 @@ msgstr "Eine neue Aufgabenliste anlegen"
 msgid "Print Tasks"
 msgstr "Aufgaben drucken"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:573
+#: ../src/modules/calendar/e-task-shell-view-actions.c:571
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -22757,119 +23102,119 @@ msgstr ""
 "\n"
 "Sollen die Aufgaben wirklich entfernt werden?"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:580
+#: ../src/modules/calendar/e-task-shell-view-actions.c:578
 msgid "Do not ask me again"
 msgstr "Nicht mehr nachfragen"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:698
+#: ../src/modules/calendar/e-task-shell-view-actions.c:696
 msgid "_Delete Task"
 msgstr "Aufgabe _löschen"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:705
-msgid "_Find in Task..."
+#: ../src/modules/calendar/e-task-shell-view-actions.c:703
+msgid "_Find in Task…"
 msgstr "In Aufgabe _suchen …"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:707
+#: ../src/modules/calendar/e-task-shell-view-actions.c:705
 msgid "Search for text in the displayed task"
 msgstr "In der angezeigten Aufgabe nach Text suchen"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:726
+#: ../src/modules/calendar/e-task-shell-view-actions.c:724
 msgid "D_elete Task List"
 msgstr "Aufgabenlist_e löschen"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:728
+#: ../src/modules/calendar/e-task-shell-view-actions.c:726
 msgid "Delete the selected task list"
 msgstr "Die gewählte Aufgabenliste löschen"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:733
-msgid "_Manage Task List groups..."
-msgstr "Notizlistengruppen _verwalten …"
+#: ../src/modules/calendar/e-task-shell-view-actions.c:731
+msgid "_Manage Task List groups…"
+msgstr "Aufgabenlistengruppen _verwalten …"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:740
+#: ../src/modules/calendar/e-task-shell-view-actions.c:738
 msgid "_New Task List"
 msgstr "_Neue Aufgabenliste"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:756
+#: ../src/modules/calendar/e-task-shell-view-actions.c:754
 msgid "Refresh the selected task list"
 msgstr "Die gewählte Aufgabenliste aktualisieren"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:761
+#: ../src/modules/calendar/e-task-shell-view-actions.c:759
 msgid "Re_fresh list of account task lists"
 msgstr "Liste der Aufgabenlisten des Kontos _aktualisieren"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:770
+#: ../src/modules/calendar/e-task-shell-view-actions.c:768
 msgid "Rename the selected task list"
 msgstr "Die gewählte Aufgabenliste umbenennen"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:775
+#: ../src/modules/calendar/e-task-shell-view-actions.c:773
 msgid "Sho_w All Task Lists"
 msgstr "_Alle Aufgabenlisten anzeigen"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:782
+#: ../src/modules/calendar/e-task-shell-view-actions.c:780
 msgid "Show _Only This Task List"
 msgstr "Nur diese Auf_gabenliste anzeigen"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:796
+#: ../src/modules/calendar/e-task-shell-view-actions.c:794
 msgid "Mar_k as Incomplete"
 msgstr "Als unvollständig mar_kieren"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:826
+#: ../src/modules/calendar/e-task-shell-view-actions.c:824
 msgid "Delete completed tasks"
 msgstr "Die abgeschlossenen Aufgaben löschen"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:913
+#: ../src/modules/calendar/e-task-shell-view-actions.c:911
 msgid "Task _Preview"
 msgstr "Aufgaben_vorschau"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:915
+#: ../src/modules/calendar/e-task-shell-view-actions.c:913
 msgid "Show task preview pane"
 msgstr "Aufgabenvorschaufeld anzeigen"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:936
+#: ../src/modules/calendar/e-task-shell-view-actions.c:934
 msgid "Show task preview below the task list"
 msgstr "Aufgabenvorschau unter der Aufgabenliste anzeigen"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:943
+#: ../src/modules/calendar/e-task-shell-view-actions.c:941
 msgid "Show task preview alongside the task list"
 msgstr "Aufgabenvorschau neben der Aufgabenliste anzeigen"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:951
+#: ../src/modules/calendar/e-task-shell-view-actions.c:949
 msgid "Active Tasks"
 msgstr "Aktuelle Aufgaben"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:965
+#: ../src/modules/calendar/e-task-shell-view-actions.c:963
 msgid "Cancelled Tasks"
 msgstr "Abgebrochene Aufgaben"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:972
+#: ../src/modules/calendar/e-task-shell-view-actions.c:970
 msgid "Completed Tasks"
 msgstr "Abgeschlossene Aufgaben"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:979
+#: ../src/modules/calendar/e-task-shell-view-actions.c:977
 msgid "Next 7 Days’ Tasks"
 msgstr "Aufgaben der nächsten 7 Tage"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:986
+#: ../src/modules/calendar/e-task-shell-view-actions.c:984
 msgid "Overdue Tasks"
 msgstr "Überfällige Aufgaben"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:993
+#: ../src/modules/calendar/e-task-shell-view-actions.c:991
 msgid "Tasks with Attachments"
 msgstr "Aufgaben mit Anlagen"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1043
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1041
 msgid "Print the list of tasks"
 msgstr "Die Aufgabenliste drucken"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1050
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1048
 msgid "Preview the list of tasks to be printed"
 msgstr "Vorschau auf die zu druckende Aufgabenliste"
 
-#: ../src/modules/calendar/e-task-shell-view.c:345
+#: ../src/modules/calendar/e-task-shell-view.c:346
 msgid "Delete Tasks"
 msgstr "Aufgaben löschen"
 
-#: ../src/modules/calendar/e-task-shell-view.c:347
+#: ../src/modules/calendar/e-task-shell-view.c:348
 msgid "Delete Task"
 msgstr "Aufgabe löschen"
 
@@ -22880,19 +23225,19 @@ msgid_plural "%d tasks"
 msgstr[0] "%d Aufgabe"
 msgstr[1] "%d Aufgaben"
 
-#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:331
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:326
 msgid "Convert to M_eeting"
 msgstr "In eine B_esprechung umwandeln"
 
-#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:333
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:328
 msgid "Convert the message to a meeting request"
 msgstr "Die Nachricht in eine Besprechungsanfrage umwandeln"
 
-#: ../src/modules/composer-to-meeting/e-meeting-to-composer.c:357
+#: ../src/modules/composer-to-meeting/e-meeting-to-composer.c:365
 msgid "Convert to M_essage"
 msgstr "In eine N_achricht umwandeln"
 
-#: ../src/modules/composer-to-meeting/e-meeting-to-composer.c:359
+#: ../src/modules/composer-to-meeting/e-meeting-to-composer.c:367
 msgid "Convert to the mail message"
 msgstr "In eine E-Mail-Nachricht umwandeln"
 
@@ -22946,7 +23291,7 @@ msgstr "LDAP-Server"
 msgid "Looking up LDAP server…"
 msgstr "LDAP-Server wird gesucht …"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:242
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:279
 msgid "Look up in SRV records"
 msgstr "In SRV-Einträgen suchen"
 
@@ -22978,281 +23323,281 @@ msgstr "Teil als Einladung anzeigen"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:260
+#: ../src/modules/itip-formatter/itip-view.c:259
 msgid "Today %H:%M"
 msgstr "Heute %k:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:264
+#: ../src/modules/itip-formatter/itip-view.c:263
 msgid "Today %H:%M:%S"
 msgstr "Heute %k:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:273
+#: ../src/modules/itip-formatter/itip-view.c:272
 msgid "Today %l:%M:%S %p"
 msgstr "Heute %l:%M:%S %p"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:288
+#: ../src/modules/itip-formatter/itip-view.c:287
 msgid "Tomorrow %H:%M"
 msgstr "Morgen %k:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:292
+#: ../src/modules/itip-formatter/itip-view.c:291
 msgid "Tomorrow %H:%M:%S"
 msgstr "Morgen %k:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:297
+#: ../src/modules/itip-formatter/itip-view.c:296
 msgid "Tomorrow %l:%M %p"
 msgstr "Morgen %l:%M %p"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:301
+#: ../src/modules/itip-formatter/itip-view.c:300
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Morgen %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../src/modules/itip-formatter/itip-view.c:320
+#: ../src/modules/itip-formatter/itip-view.c:319
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:325
+#: ../src/modules/itip-formatter/itip-view.c:324
 msgid "%A %H:%M"
 msgstr "%A %k:%M"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:329
+#: ../src/modules/itip-formatter/itip-view.c:328
 msgid "%A %H:%M:%S"
 msgstr "%A %k:%M:%S"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:334
+#: ../src/modules/itip-formatter/itip-view.c:333
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:338
+#: ../src/modules/itip-formatter/itip-view.c:337
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. * without a year.
-#: ../src/modules/itip-formatter/itip-view.c:347
+#: ../src/modules/itip-formatter/itip-view.c:346
 msgid "%A, %B %e"
 msgstr "%A, %e. %B"
 
 #. strftime format of a weekday, a date
 #. * without a year and a time,
 #. * in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:353
+#: ../src/modules/itip-formatter/itip-view.c:352
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e. %B %k:%M"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:357
+#: ../src/modules/itip-formatter/itip-view.c:356
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e. %B %k:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:362
+#: ../src/modules/itip-formatter/itip-view.c:361
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e. %B %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:366
+#: ../src/modules/itip-formatter/itip-view.c:365
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e. %B %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../src/modules/itip-formatter/itip-view.c:372
+#: ../src/modules/itip-formatter/itip-view.c:371
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e. %B %Y"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:377
+#: ../src/modules/itip-formatter/itip-view.c:376
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e. %B %Y %k:%M"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:381
+#: ../src/modules/itip-formatter/itip-view.c:380
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e. %B %Y %k:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:386
+#: ../src/modules/itip-formatter/itip-view.c:385
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e. %B %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:390
+#: ../src/modules/itip-formatter/itip-view.c:389
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e. %B %Y %l:%M:%S %p"
 
+#: ../src/modules/itip-formatter/itip-view.c:427
 #: ../src/modules/itip-formatter/itip-view.c:428
-#: ../src/modules/itip-formatter/itip-view.c:429
+#: ../src/modules/itip-formatter/itip-view.c:517
 #: ../src/modules/itip-formatter/itip-view.c:518
-#: ../src/modules/itip-formatter/itip-view.c:519
-#: ../src/modules/itip-formatter/itip-view.c:608
+#: ../src/modules/itip-formatter/itip-view.c:607
 msgid "An unknown person"
 msgstr "Eine unbekannte Person"
 
-#: ../src/modules/itip-formatter/itip-view.c:433
-#: ../src/modules/itip-formatter/itip-view.c:523
-#: ../src/modules/itip-formatter/itip-view.c:612
+#: ../src/modules/itip-formatter/itip-view.c:432
+#: ../src/modules/itip-formatter/itip-view.c:522
+#: ../src/modules/itip-formatter/itip-view.c:611
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "Bitte antworten Sie im Namen von %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:435
-#: ../src/modules/itip-formatter/itip-view.c:525
-#: ../src/modules/itip-formatter/itip-view.c:614
+#: ../src/modules/itip-formatter/itip-view.c:434
+#: ../src/modules/itip-formatter/itip-view.c:524
+#: ../src/modules/itip-formatter/itip-view.c:613
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "Erhalten im Namen von %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:440
+#: ../src/modules/itip-formatter/itip-view.c:439
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr "%s hat durch %s folgende Besprechungsinformationen veröffentlicht:"
 
-#: ../src/modules/itip-formatter/itip-view.c:442
+#: ../src/modules/itip-formatter/itip-view.c:441
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s hat folgende Besprechungsinformationen veröffentlicht:"
 
-#: ../src/modules/itip-formatter/itip-view.c:447
+#: ../src/modules/itip-formatter/itip-view.c:446
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s hat folgende Besprechung an Sie delegiert:"
 
-#: ../src/modules/itip-formatter/itip-view.c:450
+#: ../src/modules/itip-formatter/itip-view.c:449
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "%s wünscht durch %s Ihre Teilnahme an folgender Besprechung:"
 
-#: ../src/modules/itip-formatter/itip-view.c:452
+#: ../src/modules/itip-formatter/itip-view.c:451
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "%s wünscht Ihre Teilnahme an folgender Besprechung:"
 
-#: ../src/modules/itip-formatter/itip-view.c:458
+#: ../src/modules/itip-formatter/itip-view.c:457
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "%s wünscht durch %s zu einer existierenden Besprechung hinzuzufügen:"
 
-#: ../src/modules/itip-formatter/itip-view.c:460
+#: ../src/modules/itip-formatter/itip-view.c:459
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "%s wünscht zu einer existierenden Besprechung hinzuzufügen:"
 
-#: ../src/modules/itip-formatter/itip-view.c:464
+#: ../src/modules/itip-formatter/itip-view.c:463
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following meeting:"
 msgstr ""
 "%s durch %s wünscht, aktuelle Informationen zu folgender Besprechung zu erhalten:"
 
-#: ../src/modules/itip-formatter/itip-view.c:466
+#: ../src/modules/itip-formatter/itip-view.c:465
 #, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "%s wünscht, aktuelle Informationen zu folgender Besprechung zu erhalten:"
 
-#: ../src/modules/itip-formatter/itip-view.c:470
+#: ../src/modules/itip-formatter/itip-view.c:469
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "%s durch %s hat folgende Besprechungsrückmeldung geschickt:"
 
-#: ../src/modules/itip-formatter/itip-view.c:472
+#: ../src/modules/itip-formatter/itip-view.c:471
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "%s hat folgende Besprechungsrückmeldung geschickt:"
 
-#: ../src/modules/itip-formatter/itip-view.c:476
+#: ../src/modules/itip-formatter/itip-view.c:475
 #, c-format
 msgid "%s through %s has cancelled the following meeting:"
 msgstr "%s hat durch %s folgende Besprechung abgesagt:"
 
-#: ../src/modules/itip-formatter/itip-view.c:478
+#: ../src/modules/itip-formatter/itip-view.c:477
 #, c-format
 msgid "%s has cancelled the following meeting:"
 msgstr "%s hat folgende Besprechung abgesagt:"
 
-#: ../src/modules/itip-formatter/itip-view.c:482
+#: ../src/modules/itip-formatter/itip-view.c:481
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "%s durch %s hat folgende Besprechungsänderungen vorgeschlagen."
 
-#: ../src/modules/itip-formatter/itip-view.c:484
+#: ../src/modules/itip-formatter/itip-view.c:483
 #, c-format
 msgid "%s has proposed the following meeting changes:"
 msgstr "%s hat folgende Besprechungsänderungen vorgeschlagen:"
 
-#: ../src/modules/itip-formatter/itip-view.c:488
+#: ../src/modules/itip-formatter/itip-view.c:487
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "%s hat durch %s folgende Besprechungsänderungen abgelehnt:"
 
-#: ../src/modules/itip-formatter/itip-view.c:490
+#: ../src/modules/itip-formatter/itip-view.c:489
 #, c-format
 msgid "%s has declined the following meeting changes:"
 msgstr "%s hat folgende Besprechungsänderungen abgelehnt:"
 
-#: ../src/modules/itip-formatter/itip-view.c:530
+#: ../src/modules/itip-formatter/itip-view.c:529
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr "%s hat durch %s folgende Aufgabe veröffentlicht:"
 
-#: ../src/modules/itip-formatter/itip-view.c:532
+#: ../src/modules/itip-formatter/itip-view.c:531
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s hat folgende Aufgabe veröffentlicht:"
 
-#: ../src/modules/itip-formatter/itip-view.c:537
+#: ../src/modules/itip-formatter/itip-view.c:536
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "%s wünscht die Zuweisung folgender Aufgabe an %s:"
 
-#: ../src/modules/itip-formatter/itip-view.c:540
+#: ../src/modules/itip-formatter/itip-view.c:539
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s hat Ihnen durch %s eine Aufgabe zugewiesen:"
 
-#: ../src/modules/itip-formatter/itip-view.c:542
+#: ../src/modules/itip-formatter/itip-view.c:541
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s hat Ihnen eine Aufgabe zugewiesen:"
 
-#: ../src/modules/itip-formatter/itip-view.c:548
+#: ../src/modules/itip-formatter/itip-view.c:547
 #, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "%s wünscht durch %s zu einer bestehenden Aufgabe hinzuzufügen:"
 
-#: ../src/modules/itip-formatter/itip-view.c:550
+#: ../src/modules/itip-formatter/itip-view.c:549
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "%s wünscht zu einer bestehenden Aufgabe hinzuzufügen:"
 
-#: ../src/modules/itip-formatter/itip-view.c:554
+#: ../src/modules/itip-formatter/itip-view.c:553
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following assigned "
@@ -23261,202 +23606,212 @@ msgstr ""
 "%s durch %s wünscht aktuelle Informationen zu folgender zugewiesener Aufgabe zu "
 "erhalten:"
 
-#: ../src/modules/itip-formatter/itip-view.c:556
+#: ../src/modules/itip-formatter/itip-view.c:555
 #, c-format
 msgid "%s wishes to receive the latest information for the following assigned task:"
 msgstr ""
 "%s wünscht aktuelle Informationen zu folgender zugewiesener Aufgabe zu erhalten:"
 
-#: ../src/modules/itip-formatter/itip-view.c:560
+#: ../src/modules/itip-formatter/itip-view.c:559
 #, c-format
 msgid "%s through %s has sent back the following assigned task response:"
 msgstr ""
 "%s durch %s hat folgende Rückmeldung zu einer zugewiesenen Aufgabe geschickt:"
 
-#: ../src/modules/itip-formatter/itip-view.c:562
+#: ../src/modules/itip-formatter/itip-view.c:561
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "%s hat folgende Rückmeldung zu einer zugewiesenen Aufgabe geschickt:"
 
-#: ../src/modules/itip-formatter/itip-view.c:566
+#: ../src/modules/itip-formatter/itip-view.c:565
 #, c-format
 msgid "%s through %s has cancelled the following assigned task:"
 msgstr "%s hat durch %s folgende zugewiesene Aufgabe zurückgezogen:"
 
-#: ../src/modules/itip-formatter/itip-view.c:568
+#: ../src/modules/itip-formatter/itip-view.c:567
 #, c-format
 msgid "%s has cancelled the following assigned task:"
 msgstr "%s hat folgende zugewiesene Aufgabe zurückgezogen:"
 
-#: ../src/modules/itip-formatter/itip-view.c:572
+#: ../src/modules/itip-formatter/itip-view.c:571
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "%s durch %s hat folgende Änderungen an der Aufgabenzuweisung vorgeschlagen:"
 
-#: ../src/modules/itip-formatter/itip-view.c:574
+#: ../src/modules/itip-formatter/itip-view.c:573
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "%s hat folgende Änderungen an der Aufgabenzuweisung vorgeschlagen:"
 
-#: ../src/modules/itip-formatter/itip-view.c:578
+#: ../src/modules/itip-formatter/itip-view.c:577
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "%s hat durch %s folgende zugewiesene Aufgabe abgelehnt:"
 
-#: ../src/modules/itip-formatter/itip-view.c:580
+#: ../src/modules/itip-formatter/itip-view.c:579
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s hat die folgende zugewiesene Aufgabe abgelehnt:"
 
-#: ../src/modules/itip-formatter/itip-view.c:619
+#: ../src/modules/itip-formatter/itip-view.c:618
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "%s hat durch %s folgende Notiz veröffentlicht:"
 
-#: ../src/modules/itip-formatter/itip-view.c:621
+#: ../src/modules/itip-formatter/itip-view.c:620
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s hat folgende Notiz veröffentlicht:"
 
-#: ../src/modules/itip-formatter/itip-view.c:626
+#: ../src/modules/itip-formatter/itip-view.c:625
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "%s wünscht durch %s zu einer existierenden Notiz hinzuzufügen:"
 
-#: ../src/modules/itip-formatter/itip-view.c:628
+#: ../src/modules/itip-formatter/itip-view.c:627
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "%s wünscht zu einer existierenden Notiz hinzuzufügen:"
 
-#: ../src/modules/itip-formatter/itip-view.c:632
+#: ../src/modules/itip-formatter/itip-view.c:631
 #, c-format
 msgid "%s through %s has cancelled the following shared memo:"
 msgstr "%s hat durch %s folgende gemeinsame Notiz gelöscht:"
 
-#: ../src/modules/itip-formatter/itip-view.c:634
+#: ../src/modules/itip-formatter/itip-view.c:633
 #, c-format
 msgid "%s has cancelled the following shared memo:"
 msgstr "%s hat folgende gemeinsame Notiz gelöscht:"
 
-#: ../src/modules/itip-formatter/itip-view.c:859
+#: ../src/modules/itip-formatter/itip-view.c:858
 msgid "All day:"
 msgstr "Ganztägig:"
 
-#: ../src/modules/itip-formatter/itip-view.c:865
+#: ../src/modules/itip-formatter/itip-view.c:864
 msgid "Start day:"
 msgstr "Anfangsdatum:"
 
-#: ../src/modules/itip-formatter/itip-view.c:865
-#: ../src/modules/itip-formatter/itip-view.c:1683
+#: ../src/modules/itip-formatter/itip-view.c:864
+#: ../src/modules/itip-formatter/itip-view.c:1678
 msgid "Start time:"
 msgstr "Anfangszeit:"
 
-#: ../src/modules/itip-formatter/itip-view.c:874
+#: ../src/modules/itip-formatter/itip-view.c:873
 msgid "End day:"
 msgstr "Enddatum:"
 
-#: ../src/modules/itip-formatter/itip-view.c:874
-#: ../src/modules/itip-formatter/itip-view.c:1684
+#: ../src/modules/itip-formatter/itip-view.c:873
+#: ../src/modules/itip-formatter/itip-view.c:1679
 msgid "End time:"
 msgstr "Endzeit:"
 
-#: ../src/modules/itip-formatter/itip-view.c:1214
+#: ../src/modules/itip-formatter/itip-view.c:1213
 msgid "Ope_n Calendar"
 msgstr "Kalender ö_ffnen"
 
-#: ../src/modules/itip-formatter/itip-view.c:1217
+#: ../src/modules/itip-formatter/itip-view.c:1216
 msgid "_Decline all"
 msgstr "Alles a_blehnen"
 
-#: ../src/modules/itip-formatter/itip-view.c:1220
+#: ../src/modules/itip-formatter/itip-view.c:1219
 msgid "_Decline"
 msgstr "Ab_lehnen"
 
-#: ../src/modules/itip-formatter/itip-view.c:1223
+#: ../src/modules/itip-formatter/itip-view.c:1222
 msgid "_Tentative all"
 msgstr "Alles vorläu_fig"
 
-#: ../src/modules/itip-formatter/itip-view.c:1226
+#: ../src/modules/itip-formatter/itip-view.c:1225
 msgid "_Tentative"
 msgstr "_Vorläufig"
 
-#: ../src/modules/itip-formatter/itip-view.c:1229
+#: ../src/modules/itip-formatter/itip-view.c:1228
 msgid "Acce_pt all"
 msgstr "Alles anneh_men"
 
-#: ../src/modules/itip-formatter/itip-view.c:1232
+#: ../src/modules/itip-formatter/itip-view.c:1231
 msgid "Acce_pt"
 msgstr "Annehmen"
 
-#: ../src/modules/itip-formatter/itip-view.c:1235
+#: ../src/modules/itip-formatter/itip-view.c:1234
 msgid "Send _Information"
 msgstr "Informationen über_mitteln"
 
-#: ../src/modules/itip-formatter/itip-view.c:1238
+#: ../src/modules/itip-formatter/itip-view.c:1237
 msgid "_Update Attendee Status"
 msgstr "Teilnehmerstatus a_ktualisieren"
 
-#: ../src/modules/itip-formatter/itip-view.c:1241
+#: ../src/modules/itip-formatter/itip-view.c:1240
 #: ../src/smime/gui/certificate-manager.c:1661
 msgid "_Update"
 msgstr "A_ktualisieren"
 
-#: ../src/modules/itip-formatter/itip-view.c:1686
-#: ../src/modules/itip-formatter/itip-view.c:1734
-#: ../src/modules/itip-formatter/itip-view.c:1805
+#: ../src/modules/itip-formatter/itip-view.c:1681
+#: ../src/modules/itip-formatter/itip-view.c:1729
+#: ../src/modules/itip-formatter/itip-view.c:1800
 msgid "Comment:"
 msgstr "Kommentar:"
 
 #. RSVP area
-#: ../src/modules/itip-formatter/itip-view.c:1722
+#: ../src/modules/itip-formatter/itip-view.c:1717
 msgid "Send reply to sender"
 msgstr "Antwort an Absender verschicken"
 
 #. Updates
-#: ../src/modules/itip-formatter/itip-view.c:1737
+#: ../src/modules/itip-formatter/itip-view.c:1732
 msgid "Send _updates to attendees"
 msgstr "Akt_ualisierungen an die Teilnehmer verschicken"
 
 #. The recurrence check button
-#: ../src/modules/itip-formatter/itip-view.c:1740
+#: ../src/modules/itip-formatter/itip-view.c:1735
 msgid "_Apply to all instances"
 msgstr "Auf alle _Instanzen anwenden"
 
-#: ../src/modules/itip-formatter/itip-view.c:1741
+#: ../src/modules/itip-formatter/itip-view.c:1736
 msgid "Show time as _free"
 msgstr "Zeit als _frei anzeigen"
 
-#: ../src/modules/itip-formatter/itip-view.c:1742
+#: ../src/modules/itip-formatter/itip-view.c:1737
 msgid "_Preserve my reminder"
 msgstr "_Erinnerung aufbewahren"
 
-#: ../src/modules/itip-formatter/itip-view.c:1743
+#: ../src/modules/itip-formatter/itip-view.c:1738
 msgid "_Inherit reminder"
 msgstr "Erinnerung ü_bernehmen"
 
-#: ../src/modules/itip-formatter/itip-view.c:2079
+#: ../src/modules/itip-formatter/itip-view.c:2074
 msgid "_Tasks:"
 msgstr "Auf_gaben:"
 
-#: ../src/modules/itip-formatter/itip-view.c:2082
+#: ../src/modules/itip-formatter/itip-view.c:2077
 msgid "_Memos:"
 msgstr "_Notizen:"
 
-#: ../src/modules/itip-formatter/itip-view.c:3139
+#: ../src/modules/itip-formatter/itip-view.c:3151
 msgid "Sa_ve"
 msgstr "_Speichern"
 
-#: ../src/modules/itip-formatter/itip-view.c:3661
-#: ../src/modules/itip-formatter/itip-view.c:5227
+#: ../src/modules/itip-formatter/itip-view.c:3715
+#: ../src/modules/itip-formatter/itip-view.c:5468
 msgid "Attendee status updated"
 msgstr "Teilnehmerstatus aktualisiert"
 
-#: ../src/modules/itip-formatter/itip-view.c:3876
+#: ../src/modules/itip-formatter/itip-view.c:3925
 #, c-format
 msgid "An appointment “%s” in the calendar “%s” conflicts with this meeting"
 msgstr "Ein Termin »%s« im Kalender »%s« überschneidet sich mit dieser Besprechung"
 
-#: ../src/modules/itip-formatter/itip-view.c:3882
+#: ../src/modules/itip-formatter/itip-view.c:3932
+#, c-format
+msgid "A task “%s” in the task list “%s” conflicts with this task"
+msgstr "Eine Aufgabe »%s« in der Aufgabenliste »%s« kollidiert mit dieser Aufgabe"
+
+#: ../src/modules/itip-formatter/itip-view.c:3939
+#, c-format
+msgid "A memo “%s” in the memo list “%s” conflicts with this memo"
+msgstr "Eine Notiz »%s« in der Notizliste »%s« kollidiert mit dieser Notiz"
+
+#: ../src/modules/itip-formatter/itip-view.c:3950
 #, c-format
 msgid "The calendar “%s” contains an appointment which conflicts with this meeting"
 msgid_plural ""
@@ -23464,154 +23819,244 @@ msgid_plural ""
 msgstr[0] ""
 "Der Kalender »%s« enthält einen Termin, der sich mit diesem Termin überschneidet"
 msgstr[1] ""
-"Der Kalender »%s« enthält »%d« Termine, die sich mit diesem Termin überschneiden"
+"Der Kalender »%s« enthält %d Termine, die sich mit diesem Termin überschneiden"
+
+#: ../src/modules/itip-formatter/itip-view.c:3959
+#, c-format
+msgid "The task list “%s” contains a task which conflicts with this task"
+msgid_plural "The task list “%s” contains %d tasks which conflict with this task"
+msgstr[0] ""
+"Die Aufgabenliste »%s« enthält eine Aufgabe, die mit dieser Aufgabe kollidiert"
+msgstr[1] ""
+"Die Aufgabenliste »%s« enthält %d Aufgaben, die mit dieser Aufgabe kollidieren"
+
+#: ../src/modules/itip-formatter/itip-view.c:3968
+#, c-format
+msgid "The memo list “%s” contains a memo which conflicts with this memo"
+msgid_plural "The memo list “%s” contains %d memos which conflict with this memo"
+msgstr[0] "Die Notizliste »%s« enthält eine Notiz, die mit dieser Notiz kollidiert"
+msgstr[1] "Die Notizliste »%s« enthält %d Notizen, die mit dieser Notiz kollidieren"
 
-#: ../src/modules/itip-formatter/itip-view.c:3915
+#: ../src/modules/itip-formatter/itip-view.c:4006
 #, c-format
 msgid "Found the appointment in the calendar “%s”"
 msgstr "Der Termin wurde im Kalender »%s« gefunden"
 
-#: ../src/modules/itip-formatter/itip-view.c:3924
+#: ../src/modules/itip-formatter/itip-view.c:4011
+#, c-format
+msgid "Found the task in the task list “%s”"
+msgstr "Die Aufgabe wurde in der Aufgabenliste »%s« gefunden"
+
+#: ../src/modules/itip-formatter/itip-view.c:4016
+#, c-format
+msgid "Found the memo in the memo list “%s”"
+msgstr "Die Notiz wurde in der Notizliste »%s« gefunden"
+
+#: ../src/modules/itip-formatter/itip-view.c:4027
 msgid "This meeting invitation is obsolete. It had been updated."
 msgstr "Die Besprechungsanfrage ist obsolet. Sie hätte aktualisiert werden müssen."
 
-#: ../src/modules/itip-formatter/itip-view.c:4066
+#: ../src/modules/itip-formatter/itip-view.c:4169
 msgid "Unable to find any calendars"
 msgstr "Es wurden keine Kalender gefunden"
 
-#: ../src/modules/itip-formatter/itip-view.c:4074
+#: ../src/modules/itip-formatter/itip-view.c:4177
 msgid "Unable to find this meeting in any calendar"
 msgstr "Diese Besprechung wurde in keinem Kalender gefunden"
 
-#: ../src/modules/itip-formatter/itip-view.c:4079
+#: ../src/modules/itip-formatter/itip-view.c:4182
 msgid "Unable to find this task in any task list"
 msgstr "Diese Aufgabe wurde in keiner Aufgabenliste gefunden"
 
-#: ../src/modules/itip-formatter/itip-view.c:4084
+#: ../src/modules/itip-formatter/itip-view.c:4187
 msgid "Unable to find this memo in any memo list"
 msgstr "Diese Notiz wurde in keiner Notizliste gefunden"
 
-#: ../src/modules/itip-formatter/itip-view.c:4425
-msgid "Opening the calendar. Please wait..."
-msgstr "Kalender wird geöffnet. Bitte warten …"
-
-#: ../src/modules/itip-formatter/itip-view.c:4430
+#: ../src/modules/itip-formatter/itip-view.c:4481
 msgid "Searching for an existing version of this appointment"
 msgstr "Eine bestehende Version dieses Termins wird gesucht"
 
-#: ../src/modules/itip-formatter/itip-view.c:4838
+#: ../src/modules/itip-formatter/itip-view.c:4485
+msgid "Searching for an existing version of this task"
+msgstr "Eine bestehende Version dieser Aufgabe wird gesucht"
+
+#: ../src/modules/itip-formatter/itip-view.c:4489
+msgid "Searching for an existing version of this memo"
+msgstr "Eine bestehende Version dieser Notiz wird gesucht"
+
+#: ../src/modules/itip-formatter/itip-view.c:4547
+msgid "Opening the calendar. Please wait…"
+msgstr "Kalender wird geöffnet. Bitte warten …"
+
+#: ../src/modules/itip-formatter/itip-view.c:4964
 #, c-format
-msgid "Unable to send item to calendar “%s”.  %s"
+msgid "Unable to send item to calendar “%s”. %s"
 msgstr "Element kann nicht zu Kalender »%s« gesendet werden. %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:4853
+#: ../src/modules/itip-formatter/itip-view.c:4972
+#, c-format
+msgid "Unable to send item to task list “%s”. %s"
+msgstr "Element kann nicht zu Aufgabenliste »%s« gesendet werden. %s"
+
+#: ../src/modules/itip-formatter/itip-view.c:4980
+#, c-format
+msgid "Unable to send item to memo list “%s”. %s"
+msgstr "Element kann nicht zu Notizliste »%s« gesendet werden. %s"
+
+#: ../src/modules/itip-formatter/itip-view.c:5000
 #, c-format
 msgid "Sent to calendar “%s” as accepted"
 msgstr "In Kalender »%s« als »Angenommen« eingetragen"
 
-#: ../src/modules/itip-formatter/itip-view.c:4858
+#: ../src/modules/itip-formatter/itip-view.c:5005
+#, c-format
+msgid "Sent to task list “%s” as accepted"
+msgstr "In Aufgabenliste »%s« als »Angenommen« eingetragen"
+
+#: ../src/modules/itip-formatter/itip-view.c:5010
+#, c-format
+msgid "Sent to memo list “%s” as accepted"
+msgstr "In Notizliste »%s« als »Angenommen« eingetragen"
+
+#: ../src/modules/itip-formatter/itip-view.c:5020
 #, c-format
 msgid "Sent to calendar “%s” as tentative"
 msgstr "In Kalender »%s« als »Vorläufig angenommen« eingetragen"
 
-#: ../src/modules/itip-formatter/itip-view.c:4864
+#: ../src/modules/itip-formatter/itip-view.c:5025
+#, c-format
+msgid "Sent to task list “%s” as tentative"
+msgstr "In Aufgabenliste »%s« als »Vorläufig angenommen« eingetragen"
+
+#: ../src/modules/itip-formatter/itip-view.c:5030
+#, c-format
+msgid "Sent to memo list “%s” as tentative"
+msgstr "In Notizliste »%s« als »Vorläufig angenommen« eingetragen"
+
+#: ../src/modules/itip-formatter/itip-view.c:5040
 #, c-format
 msgid "Sent to calendar “%s” as declined"
 msgstr "In Kalender »%s« als »Abgelehnt« eingetragen"
 
-#: ../src/modules/itip-formatter/itip-view.c:4870
+#: ../src/modules/itip-formatter/itip-view.c:5045
+#, c-format
+msgid "Sent to task list “%s” as declined"
+msgstr "In Aufgabenliste »%s« als »Abgelehnt« eingetragen"
+
+#: ../src/modules/itip-formatter/itip-view.c:5050
+#, c-format
+msgid "Sent to memo list “%s” as declined"
+msgstr "In Notizliste »%s« als »Abgelehnt« eingetragen"
+
+#: ../src/modules/itip-formatter/itip-view.c:5060
 #, c-format
 msgid "Sent to calendar “%s” as cancelled"
 msgstr "In Kalender »%s« als »Abgesagt« eingetragen"
 
-#: ../src/modules/itip-formatter/itip-view.c:4905
-#: ../src/modules/itip-formatter/itip-view.c:5364
-#: ../src/modules/itip-formatter/itip-view.c:5467
-msgid "Saving changes to the calendar. Please wait..."
+#: ../src/modules/itip-formatter/itip-view.c:5065
+#, c-format
+msgid "Sent to task list “%s” as cancelled"
+msgstr "In Aufgabenliste »%s« als »Abgesagt« eingetragen"
+
+#: ../src/modules/itip-formatter/itip-view.c:5070
+#, c-format
+msgid "Sent to memo list “%s” as cancelled"
+msgstr "In Notizliste »%s« als »Abgesagt« eingetragen"
+
+#: ../src/modules/itip-formatter/itip-view.c:5088
+msgid "Saving changes to the calendar. Please wait…"
 msgstr "Änderungen im Kalender werden gespeichert. Bitte warten …"
 
-#: ../src/modules/itip-formatter/itip-view.c:4959
+#: ../src/modules/itip-formatter/itip-view.c:5091
+msgid "Saving changes to the task list. Please wait…"
+msgstr "Änderungen in der Aufgabenliste werden gespeichert. Bitte warten …"
+
+#: ../src/modules/itip-formatter/itip-view.c:5094
+msgid "Saving changes to the memo list. Please wait…"
+msgstr "Änderungen in der Notizliste werden gespeichert. Bitte warten …"
+
+#: ../src/modules/itip-formatter/itip-view.c:5185
 msgid "Unable to parse item"
 msgstr "Element kann nicht analysiert werden"
 
-#: ../src/modules/itip-formatter/itip-view.c:5151
+#: ../src/modules/itip-formatter/itip-view.c:5393
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Der Organisator hat den Vertreter %s entfernt "
 
-#: ../src/modules/itip-formatter/itip-view.c:5168
+#: ../src/modules/itip-formatter/itip-view.c:5410
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Dem Vertreter wurde eine Absagenachricht zugestellt"
 
-#: ../src/modules/itip-formatter/itip-view.c:5172
+#: ../src/modules/itip-formatter/itip-view.c:5414
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Die Absagenachricht konnte dem Vertreter nicht zugestellt werden"
 
-#: ../src/modules/itip-formatter/itip-view.c:5219
+#: ../src/modules/itip-formatter/itip-view.c:5460
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Teilnehmer konnte nicht aktualisiert werden. %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:5254
+#: ../src/modules/itip-formatter/itip-view.c:5493
 msgid "The meeting is invalid and cannot be updated"
 msgstr "Die Besprechung ist ungültig und kann nicht aktualisiert werden"
 
-#: ../src/modules/itip-formatter/itip-view.c:5329
+#: ../src/modules/itip-formatter/itip-view.c:5578
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "Teilnehmerstatus konnte auf Grund eines ungültigen Zustands nicht aktualisiert "
 "werden"
 
-#: ../src/modules/itip-formatter/itip-view.c:5400
-#: ../src/modules/itip-formatter/itip-view.c:5438
+#: ../src/modules/itip-formatter/itip-view.c:5653
+#: ../src/modules/itip-formatter/itip-view.c:5691
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Teilnahmestatus konnte nicht aktualisiert werden, weil der Eintrag nicht mehr "
 "existiert"
 
-#: ../src/modules/itip-formatter/itip-view.c:5499
+#: ../src/modules/itip-formatter/itip-view.c:5752
 msgid "Meeting information sent"
 msgstr "Besprechungsinformationen wurden verschickt"
 
-#: ../src/modules/itip-formatter/itip-view.c:5504
+#: ../src/modules/itip-formatter/itip-view.c:5757
 msgid "Task information sent"
 msgstr "Aufgabeninformationen wurden verschickt"
 
-#: ../src/modules/itip-formatter/itip-view.c:5509
+#: ../src/modules/itip-formatter/itip-view.c:5762
 msgid "Memo information sent"
 msgstr "Notizinformationen wurden verschickt"
 
-#: ../src/modules/itip-formatter/itip-view.c:5520
+#: ../src/modules/itip-formatter/itip-view.c:5773
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr ""
 "Verschicken der Besprechungsinformationen nicht möglich, die Besprechung existiert "
 "nicht"
 
-#: ../src/modules/itip-formatter/itip-view.c:5525
+#: ../src/modules/itip-formatter/itip-view.c:5778
 msgid "Unable to send task information, the task does not exist"
 msgstr ""
 "Verschicken der Aufgabeninformationen nicht möglich, die Aufgabe existiert nicht"
 
-#: ../src/modules/itip-formatter/itip-view.c:5530
+#: ../src/modules/itip-formatter/itip-view.c:5783
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Verschicken der Notizinformationen nicht möglich, die Notiz existiert nicht"
 
 #. Translators: This is a default filename for a calendar.
-#: ../src/modules/itip-formatter/itip-view.c:5595
+#: ../src/modules/itip-formatter/itip-view.c:5828
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../src/modules/itip-formatter/itip-view.c:5600
+#: ../src/modules/itip-formatter/itip-view.c:5833
 msgid "Save Calendar"
 msgstr "Kalender speichern"
 
-#: ../src/modules/itip-formatter/itip-view.c:5649
-#: ../src/modules/itip-formatter/itip-view.c:5662
+#: ../src/modules/itip-formatter/itip-view.c:5881
+#: ../src/modules/itip-formatter/itip-view.c:5894
 msgid "The calendar attached is not valid"
 msgstr "Der beigelegte Kalender ist ungültig"
 
-#: ../src/modules/itip-formatter/itip-view.c:5650
-#: ../src/modules/itip-formatter/itip-view.c:5663
+#: ../src/modules/itip-formatter/itip-view.c:5882
+#: ../src/modules/itip-formatter/itip-view.c:5895
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -23619,15 +24064,15 @@ msgstr ""
 "Die Nachricht gibt an, einen Kalender zu enthalten. Dieser Kalender ist jedoch "
 "kein gültiger iCalendar."
 
-#: ../src/modules/itip-formatter/itip-view.c:5725
-#: ../src/modules/itip-formatter/itip-view.c:5806
-#: ../src/modules/itip-formatter/itip-view.c:5902
+#: ../src/modules/itip-formatter/itip-view.c:5977
+#: ../src/modules/itip-formatter/itip-view.c:6061
+#: ../src/modules/itip-formatter/itip-view.c:6165
 msgid "The item in the calendar is not valid"
 msgstr "Das Element im Kalender ist ungültig"
 
-#: ../src/modules/itip-formatter/itip-view.c:5726
-#: ../src/modules/itip-formatter/itip-view.c:5807
-#: ../src/modules/itip-formatter/itip-view.c:5903
+#: ../src/modules/itip-formatter/itip-view.c:5978
+#: ../src/modules/itip-formatter/itip-view.c:6062
+#: ../src/modules/itip-formatter/itip-view.c:6166
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, tasks or "
 "free/busy information"
@@ -23635,23 +24080,23 @@ msgstr ""
 "Die Nachricht enthält einen Kalender. Dieser beinhaltet allerdings keine Termine, "
 "Aufgaben oder Verfügbarkeitsinformationen."
 
-#: ../src/modules/itip-formatter/itip-view.c:5816
+#: ../src/modules/itip-formatter/itip-view.c:6071
 msgid "The calendar attached contains multiple items"
 msgstr "Der beigelegte Kalender enthält mehrere Elemente"
 
-#: ../src/modules/itip-formatter/itip-view.c:5817
+#: ../src/modules/itip-formatter/itip-view.c:6072
 msgid ""
 "To process all of these items, the file should be saved and the calendar imported"
 msgstr ""
 "Um alle diese Elemente weiterzuverarbeiten, sollte die Datei gespeichert und der "
 "Kalender importiert werden."
 
-#: ../src/modules/itip-formatter/itip-view.c:6384
+#: ../src/modules/itip-formatter/itip-view.c:6659
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Keine"
 
-#: ../src/modules/itip-formatter/itip-view.c:6400
+#: ../src/modules/itip-formatter/itip-view.c:6677
 msgid "Tentatively Accepted"
 msgstr "Vorläufig angenommen"
 
@@ -23890,7 +24335,7 @@ msgstr "Einen neuen E-Mail-Ordner anlegen"
 # it to some user-frienly form, or keep it as is.
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
 #. it to some user-frienly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:751
+#: ../src/modules/mail/e-mail-shell-backend.c:782
 msgctxt "NetworkMonitor"
 msgid "base"
 msgstr "base"
@@ -23898,7 +24343,7 @@ msgstr "base"
 # One of the known implementation names of the GNetworkMonitor.
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
 #. it to some user-frienly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:754
+#: ../src/modules/mail/e-mail-shell-backend.c:785
 msgctxt "NetworkMonitor"
 msgid "netlink"
 msgstr "netlink"
@@ -23908,402 +24353,417 @@ msgstr "netlink"
 # it to some user-frienly form, or keep it as is.
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
 #. it to some user-frienly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:757
+#: ../src/modules/mail/e-mail-shell-backend.c:788
 msgctxt "NetworkMonitor"
 msgid "networkmanager"
 msgstr "networkmanager"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:787
+#: ../src/modules/mail/e-mail-shell-backend.c:818
 msgctxt "NetworkMonitor"
 msgid "Method to detect _online state:"
 msgstr "Methode zur Erkennung des _Online-Status:"
 
+#. Translators: The '%s' is replaced with the actual name of the GNetworkMonitor implementation
+#: ../src/modules/mail/e-mail-shell-backend.c:829
+#, c-format
+msgctxt "NetworkMonitor"
+msgid "Default (%s)"
+msgstr "Voreinstellung (%s)"
+
 #. Always as the first
-#: ../src/modules/mail/e-mail-shell-backend.c:796
+#: ../src/modules/mail/e-mail-shell-backend.c:833
 msgctxt "NetworkMonitor"
 msgid "Default"
 msgstr "Vorgabe"
 
 #. Always as the last
-#: ../src/modules/mail/e-mail-shell-backend.c:810
+#: ../src/modules/mail/e-mail-shell-backend.c:850
 msgctxt "NetworkMonitor"
 msgid "Always Online"
 msgstr "Immer online"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:879
+#: ../src/modules/mail/e-mail-shell-backend.c:919
 msgid "Mail Preferences"
 msgstr "E-Mail-Einstellungen"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:888
+#: ../src/modules/mail/e-mail-shell-backend.c:928
 msgid "Composer Preferences"
 msgstr "Editoreinstellungen"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:897
+#: ../src/modules/mail/e-mail-shell-backend.c:937
 msgid "Network Preferences"
 msgstr "Netzwerkeinstellungen"
 
 #. Translators: The first item in the list, to be
 #. * able to set rule: [Label] [is/is-not] [None]
-#: ../src/modules/mail/e-mail-shell-backend.c:1258
+#: ../src/modules/mail/e-mail-shell-backend.c:1298
 msgctxt "label"
 msgid "None"
 msgstr "Keine"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:821
-msgid "Marking messages as read..."
+#: ../src/modules/mail/e-mail-shell-view-actions.c:853
+msgid "Marking messages as read…"
 msgstr "Nachrichten werden als gelesen markiert …"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1226
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1258
 msgid "Go to Folder"
 msgstr "In Ordner wechseln"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1230
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1262
 msgid "_Select"
 msgstr "A_uswählen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1533
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1572
 msgid "_Disable Account"
 msgstr "Konto _deaktivieren"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1535
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1574
 msgid "Disable this account"
 msgstr "Dieses Konto deaktivieren"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1542
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1581
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Alle gelöschten Nachrichten auf Dauer aus allen Ordnern entfernen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1547
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1586
 msgid "Empty _Junk"
 msgstr "Uner_wünscht-Ordner leeren"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1549
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1588
 msgid "Delete all Junk messages from all folders"
 msgstr "Alle unerwünschten Nachrichten aus allen Ordnern entfernen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1556
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1595
 msgid "Edit properties of this account"
 msgstr "Die Eigenschaften dieses Kontos bearbeiten"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1563
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1602
 msgid "Refresh list of folders of this account"
 msgstr "Die Ordnerliste dieses Kontos neu einlesen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1568
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1607
 msgid "_Download Messages for Offline Usage"
 msgstr "_Nachrichten für Offline-Benutzung herunterladen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1570
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1609
 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"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1575
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1614
 msgid "Fl_ush Outbox"
 msgstr "E-Mails aus A_usgang verschicken"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1582
-msgid "_Copy Folder To..."
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1621
+msgid "_Copy Folder To…"
 msgstr "Ordner _kopieren nach …"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1584
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1623
 msgid "Copy the selected folder into another folder"
 msgstr "Den gewählten Ordner in einen anderen Ordner kopieren"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1591
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1630
 msgid "Permanently remove this folder"
 msgstr "Diesen Ordner dauerhaft entfernen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1596
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1635
+msgid "Edit Sort _Order…"
+msgstr "Sortier_reihenfolge bearbeiten …"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1637
+msgid "Change sort order of the folders in the folder tree"
+msgstr "Sortierreihenfolge der Ordner im Ordnerbaum ändern"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1642
 msgid "E_xpunge"
 msgstr "_Säubern"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1598
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1644
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Alle gelöschten Nachrichten auf Dauer aus diesem Ordner entfernen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1603
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1695
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1649
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1741
 msgid "Mar_k All Messages as Read"
 msgstr "Alle Nachrichten als gelesen _markieren"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1605
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1697
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1651
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1743
 msgid "Mark all messages in the folder as read"
 msgstr "Alle Nachrichten im Ordner als gelesen markieren"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1610
-msgid "_Move Folder To..."
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1656
+msgid "_Move Folder To…"
 msgstr "Ordner verschie_ben nach …"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1612
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1658
 msgid "Move the selected folder into another folder"
 msgstr "Den gewählten Ordner in einen anderen Ordner verschieben"
 
 #. Translators: An action caption to create a new mail folder
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1618
-msgid "_New..."
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1664
+msgid "_New…"
 msgstr "_Neu …"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1620
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1666
 msgid "Create a new folder for storing mail"
 msgstr "Einen neuen Ordner zum Ablegen von Nachrichten anlegen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1627
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1673
 msgid "Change the properties of this folder"
 msgstr "Die Eigenschaften dieses Ordners ändern"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1634
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1680
 msgid "Refresh the folder"
 msgstr "Den Ordner auffrischen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1641
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1687
 msgid "Change the name of this folder"
 msgstr "Den Namen dieses Ordners ändern"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1646
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1692
 msgid "Select Message _Thread"
 msgstr "Nachrichten-_Konversation auswählen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1648
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1694
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Alle Nachrichten in derselben Konversation markieren"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1653
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1699
 msgid "Select Message S_ubthread"
 msgstr "Nachrichten-_Unterkonversation auswählen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1655
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1701
 msgid "Select all replies to the currently selected message"
 msgstr "Alle Antworten auf die momentan ausgewählten Nachricht auswählen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1667
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1713
 msgid "Empty _Trash"
 msgstr "_Papierkorb leeren"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1669
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1715
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Alle gelöschten Nachrichten auf Dauer aus allen Konten entfernen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1674
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1720
 msgid "Go to _Folder"
 msgstr "In Ordner _wechseln"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1676
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1722
 msgid "Opens a dialog to select a folder to go to"
 msgstr "Öffnet einen Dialog, um einen Zielordner anzuzeigen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1688
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1734
 msgid "_Manage Subscriptions"
 msgstr "Abonnements _verwalten"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1690
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1774
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1736
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1820
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Ordner auf fernen Servern abonnieren oder abbestellen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1702
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1723
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1748
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1769
 msgid "Send / _Receive"
 msgstr "Verschicken/Ab_rufen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1704
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1750
 msgid "Send queued items and retrieve new items"
 msgstr "Objekte in der Warteschlange verschicken und neue Objekte abrufen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1709
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1755
 msgid "R_eceive All"
 msgstr "Alle _abrufen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1711
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1757
 msgid "Receive new items from all accounts"
 msgstr "Neue Objekte in von allen Konten empfangen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1716
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1762
 msgid "_Send All"
 msgstr "Alle _verschicken"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1718
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1764
 msgid "Send queued items in all accounts"
 msgstr "Objekte in den Warteschlangen aller Konten verschicken"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1746
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1792
 msgid "Cancel the current mail operation"
 msgstr "Den momentan ausgeführten E-Mail-Vorgang abbrechen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1751
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1797
 msgid "Collapse All _Threads"
 msgstr "Alle _Konversationen einklappen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1753
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1799
 msgid "Collapse all message threads"
 msgstr "Alle Nachrichtenkonversationen einklappen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1758
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1804
 msgid "E_xpand All Threads"
 msgstr "Alle Konversationen a_usklappen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1760
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1806
 msgid "Expand all message threads"
 msgstr "Alle Nachrichtenkonversationen ausklappen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1765
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1811
 msgid "_Message Filters"
 msgstr "Nachrichtenf_ilter"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1767
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1813
 msgid "Create or edit rules for filtering new mail"
 msgstr "Regeln zum Filtern neuer E-Mails anlegen/bearbeiten"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1772
-msgid "_Subscriptions..."
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1818
+msgid "_Subscriptions…"
 msgstr "A_bonnements …"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1781
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1827
 msgid "F_older"
 msgstr "_Ordner"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1798
-msgid "C_reate Search Folder From Search..."
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1844
+msgid "C_reate Search Folder From Search…"
 msgstr "Sucho_rdner aus Suche anlegen …"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1805
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1851
 msgid "Search F_olders"
 msgstr "S_uchordner"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1807
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1853
 msgid "Create or edit search folder definitions"
 msgstr "Suchordner-Definitionen anlegen oder bearbeiten"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1850
-msgid "_New Folder..."
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1896
+msgid "_New Folder…"
 msgstr "Ordner a_nlegen …"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1878
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1924
 msgid "Show Message _Preview"
 msgstr "Nachrichten_vorschau anzeigen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1880
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1926
 msgid "Show message preview pane"
 msgstr "Nachrichten-Vorschaufenster anzeigen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1886
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1932
 msgid "Show _Attachment Bar"
 msgstr "Anla_genleiste anzeigen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1888
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1934
 msgid ""
 "Show Attachment Bar below the message preview pane when the message has attachments"
 msgstr ""
 "Eine Anlagenleiste unterhalb des Nachrichtenvorschaufensters anzeigen, sofern die "
 "Nachricht Anhänge enthält"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1894
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1940
 msgid "Show _Deleted Messages"
 msgstr "Gel_öschte Nachrichten anzeigen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1896
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1942
 msgid "Show deleted messages with a line through them"
 msgstr "Gelöschte Nachrichten (durchgestrichen) anzeigen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1902
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1948
 msgid "Show _Junk Messages"
 msgstr "_Unerwünschte Nachrichten anzeigen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1904
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1950
 msgid "Show junk messages with a red line through them"
 msgstr "Unerwünschte Nachrichten rot durchgestrichen anzeigen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1910
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1956
 msgid "_Group By Threads"
 msgstr "Nach Konversationen _gruppieren"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1912
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1958
 msgid "Threaded message list"
 msgstr "Nachrichtenliste nach Konversationen sortieren"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1918
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1964
 msgid "Show To _Do Bar"
 msgstr "To-_Do-Leiste anzeigen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1920
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1966
 msgid "Show To Do bar with appointments and tasks"
 msgstr "To-Do-Leiste mit Terminen und Aufgaben anzeigen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1926
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1972
 msgid "_Unmatched Folder Enabled"
 msgstr "Trefferlosen Suchordner _aktiviert"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1928
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1974
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "Legt fest, ob trefferlose Suchordner aktiviert sind"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1948
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1994
 msgid "Show message preview below the message list"
 msgstr "Nachrichtenvorschau unter der Nachrichtenliste anzeigen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1955
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2001
 msgid "Show message preview alongside the message list"
 msgstr "Nachrichtenvorschau neben der Nachrichtenliste anzeigen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1963
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2009
 msgid "All Messages"
 msgstr "Alle Nachrichten"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1970
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2016
 msgid "Important Messages"
 msgstr "Wichtige Nachrichten"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1977
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2023
 msgid "Last 5 Days’ Messages"
 msgstr "Nachrichten der letzten fünf Tage"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1984
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2030
 msgid "Messages Not Junk"
 msgstr "Nachrichten sind nicht unerwünscht"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1991
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2037
 msgid "Messages with Attachments"
 msgstr "Nachrichten mit Anlagen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1998
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2044
 msgid "Messages with Notes"
 msgstr "Nachrichten mit Notizen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2005
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2051
 msgid "No Label"
 msgstr "Keine Beschriftung"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2012
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2058
 msgid "Read Messages"
 msgstr "Gelesene Nachrichten"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2019
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2065
 msgid "Unread Messages"
 msgstr "Ungelesene Nachrichten"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2026
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2072
 msgid "Message Thread"
 msgstr "Nachrichten-Konversation"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2086
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2132
 msgid "Subject or Addresses contain"
 msgstr "Betreff oder Adresse enthält"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2096
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2142
 msgid "All Accounts"
 msgstr "Alle Konten"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2103
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2149
 msgid "Current Account"
 msgstr "Derzeitiges Konto"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2110
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2156
 msgid "Current Folder"
 msgstr "Derzeitiger Ordner"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2117
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2163
 msgid "Current Folder and Subfolders"
 msgstr "Derzeitiger Ordner und Unterordner"
 
@@ -24467,7 +24927,7 @@ msgstr "Ihre Nachricht an %s mit dem Betreff »%s« am %s wurde gelesen."
 #: ../src/modules/mdn/evolution-mdn.c:374
 #, c-format
 msgid "Delivery Notification for “%s”"
-msgstr "Zustellungsbestätigung für »%s«"
+msgstr "Empfangsbestätigung für »%s«"
 
 #: ../src/modules/mdn/evolution-mdn.c:540
 #, c-format
@@ -24711,22 +25171,22 @@ msgid "Alternatively, you can %s (email, contacts and calendaring) instead."
 msgstr "Alternativ können Sie %s (E-Mail, Kontakte und Kalender)."
 
 #: ../src/modules/startup-wizard/evolution-startup-wizard.c:212
-msgid "Loading accounts..."
+msgid "Loading accounts…"
 msgstr "Konten werden geladen …"
 
 #: ../src/modules/text-highlight/e-mail-display-popup-text-highlight.c:93
-msgid "_Format as..."
+msgid "_Format as…"
 msgstr "_Formatieren als …"
 
 #: ../src/modules/text-highlight/e-mail-display-popup-text-highlight.c:101
 msgid "_Other languages"
 msgstr "_Andere Sprachen"
 
-#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:498
+#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:493
 msgid "Text Highlight"
 msgstr "Texthervorhebung"
 
-#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:499
+#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:494
 msgid "Syntax highlighting of mail parts"
 msgstr "Syntaxhervorhebung der Nachrichtenteile"
 
@@ -25139,11 +25599,11 @@ msgstr ""
 "Das Format zum Festlegen einer eigenen Kopfzeile lautet:\n"
 "Name der eigenen Kopfzeile;Wert«"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:861
+#: ../src/plugins/email-custom-header/email-custom-header.c:862
 msgid "Key"
 msgstr "Schlüssel"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:878
+#: ../src/plugins/email-custom-header/email-custom-header.c:879
 #: ../src/plugins/templates/templates.c:498
 msgid "Values"
 msgstr "Werte"
@@ -25535,30 +25995,30 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Beim Eintreffen neuer E-Mails benachrichtigen."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
-#: ../src/plugins/mail-to-task/mail-to-task.c:200
+#: ../src/plugins/mail-to-task/mail-to-task.c:198
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Erstellt aus einer Nachricht an %s"
 
 #. Translators: Dialog button to Cancel edit of an existing event/memo/task
-#: ../src/plugins/mail-to-task/mail-to-task.c:605
+#: ../src/plugins/mail-to-task/mail-to-task.c:600
 msgctxt "mail-to-task"
 msgid "_Cancel"
 msgstr "A_bbrechen"
 
 #. Translators: Dialog button to Edit an existing event/memo/task
-#: ../src/plugins/mail-to-task/mail-to-task.c:607
+#: ../src/plugins/mail-to-task/mail-to-task.c:602
 msgctxt "mail-to-task"
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
 #. Translators: Dialog button to create a New event/memo/task
-#: ../src/plugins/mail-to-task/mail-to-task.c:609
+#: ../src/plugins/mail-to-task/mail-to-task.c:604
 msgctxt "mail-to-task"
 msgid "_New"
 msgstr "_Neu"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:627
+#: ../src/plugins/mail-to-task/mail-to-task.c:622
 #, c-format
 msgid ""
 "Selected calendar contains event “%s” already. Would you like to edit the old "
@@ -25567,7 +26027,7 @@ msgstr ""
 "Der ausgewählte Kalender enthält bereits den Termin »%s«. Möchten Sie den alten "
 "Termin bearbeiten?"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:630
+#: ../src/plugins/mail-to-task/mail-to-task.c:625
 #, c-format
 msgid ""
 "Selected task list contains task “%s” already. Would you like to edit the old task?"
@@ -25575,7 +26035,7 @@ msgstr ""
 "Die ausgewählte Aufgabenliste enthält bereits die Aufgabe »%s«. Möchten Sie die "
 "alte Aufgabe bearbeiten?"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:633
+#: ../src/plugins/mail-to-task/mail-to-task.c:628
 #, c-format
 msgid ""
 "Selected memo list contains memo “%s” already. Would you like to edit the old memo?"
@@ -25584,7 +26044,7 @@ msgstr ""
 "Notiz bearbeiten?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../src/plugins/mail-to-task/mail-to-task.c:653
+#: ../src/plugins/mail-to-task/mail-to-task.c:648
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to add "
@@ -25600,7 +26060,7 @@ msgstr[1] ""
 "Wollen Sie diese wirklich alle hinzufügen?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../src/plugins/mail-to-task/mail-to-task.c:660
+#: ../src/plugins/mail-to-task/mail-to-task.c:655
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to add "
@@ -25616,7 +26076,7 @@ msgstr[1] ""
 "Wollen Sie diese wirklich alle hinzufügen?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../src/plugins/mail-to-task/mail-to-task.c:667
+#: ../src/plugins/mail-to-task/mail-to-task.c:662
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to add "
@@ -25631,29 +26091,29 @@ msgstr[1] ""
 "Sie haben %d Nachrichten ausgewählt, die in Notizen umgewandelt werden sollen. "
 "Wollen Sie diese wirklich alle hinzufügen?"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:688
+#: ../src/plugins/mail-to-task/mail-to-task.c:683
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "Soll die Umwandlung der verbleibenden Nachrichten fortgesetzt werden?"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:764
+#: ../src/plugins/mail-to-task/mail-to-task.c:759
 msgid "[No Summary]"
 msgstr "[Keine Zusammenfassung]"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:777
+#: ../src/plugins/mail-to-task/mail-to-task.c:772
 msgid "Invalid object returned from a server"
 msgstr "Ein ungültiges Objekt wurde vom Server zurückgegeben"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:831
+#: ../src/plugins/mail-to-task/mail-to-task.c:826
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Ein Fehler ist während der Verarbeitung aufgetreten: %s"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:869
+#: ../src/plugins/mail-to-task/mail-to-task.c:864
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Kalender konnte nicht geöffnet werden. %s"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:873
+#: ../src/plugins/mail-to-task/mail-to-task.c:868
 msgid ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
@@ -25661,7 +26121,7 @@ msgstr ""
 "Der gewählte Kalender ist schreibgeschützt, deshalb kann dort kein neuer Termin "
 "erstellt werden. Bitte wählen Sie einen anderen Ordner aus."
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:876
+#: ../src/plugins/mail-to-task/mail-to-task.c:871
 msgid ""
 "Selected task list is read only, thus cannot create task there. Select other task "
 "list, please."
@@ -25669,7 +26129,7 @@ msgstr ""
 "Die gewählte Aufgabenliste ist schreibgeschützt, deshalb kann keine neue Aufgabe "
 "erstellt werden. Bitte wählen Sie eine andere Aufgabenliste aus."
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:879
+#: ../src/plugins/mail-to-task/mail-to-task.c:874
 msgid ""
 "Selected memo list is read only, thus cannot create memo there. Select other memo "
 "list, please."
@@ -25677,35 +26137,35 @@ msgstr ""
 "Die gewählte Notizliste ist schreibgeschützt, deshalb kann keine neue Notiz "
 "erstellt werden. Bitte wählen Sie eine andere Notizliste aus."
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1301
+#: ../src/plugins/mail-to-task/mail-to-task.c:1299
 msgid "Create an _Appointment"
 msgstr "Einen neuen _Termin anlegen"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1303
+#: ../src/plugins/mail-to-task/mail-to-task.c:1301
 msgid "Create a new event from the selected message"
 msgstr "Einen neuen Termin mit Hilfe der gewählten Nachricht anlegen"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1308
+#: ../src/plugins/mail-to-task/mail-to-task.c:1306
 msgid "Create a Mem_o"
 msgstr "Eine _Notiz anlegen"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1310
+#: ../src/plugins/mail-to-task/mail-to-task.c:1308
 msgid "Create a new memo from the selected message"
 msgstr "Eine neue Notiz mit Hilfe der gewählten Nachricht anlegen"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1315
+#: ../src/plugins/mail-to-task/mail-to-task.c:1313
 msgid "Create a _Task"
 msgstr "Eine _Aufgabe anlegen"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1317
+#: ../src/plugins/mail-to-task/mail-to-task.c:1315
 msgid "Create a new task from the selected message"
 msgstr "Eine neue Aufgabe mit Hilfe der gewählten Nachricht anlegen"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1325
+#: ../src/plugins/mail-to-task/mail-to-task.c:1323
 msgid "Create a _Meeting"
 msgstr "Eine _Besprechung anlegen"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1327
+#: ../src/plugins/mail-to-task/mail-to-task.c:1325
 msgid "Create a new meeting from the selected message"
 msgstr "Eine neue Besprechung mit Hilfe der gewählten Nachricht anlegen"
 
@@ -25902,75 +26362,75 @@ msgstr "Ort bearbeiten"
 #. Translators: the %F %T is the third argument for a
 #. * strftime function.  It lets you define the formatting
 #. * of the date in the csv-file.
-#: ../src/plugins/save-calendar/csv-format.c:158
+#: ../src/plugins/save-calendar/csv-format.c:154
 msgid "%F %T"
 msgstr "%d.%m.%Y %T"
 
-#: ../src/plugins/save-calendar/csv-format.c:374
+#: ../src/plugins/save-calendar/csv-format.c:363
 msgid "Description List"
 msgstr "Beschreibungsliste"
 
-#: ../src/plugins/save-calendar/csv-format.c:375
+#: ../src/plugins/save-calendar/csv-format.c:364
 msgid "Categories List"
 msgstr "Kategorienliste"
 
-#: ../src/plugins/save-calendar/csv-format.c:376
+#: ../src/plugins/save-calendar/csv-format.c:365
 msgid "Comment List"
 msgstr "Kommentarliste"
 
-#: ../src/plugins/save-calendar/csv-format.c:379
+#: ../src/plugins/save-calendar/csv-format.c:368
 msgid "Contact List"
 msgstr "Kontaktliste"
 
-#: ../src/plugins/save-calendar/csv-format.c:380
+#: ../src/plugins/save-calendar/csv-format.c:369
 msgid "Start"
 msgstr "Anfang"
 
-#: ../src/plugins/save-calendar/csv-format.c:381
+#: ../src/plugins/save-calendar/csv-format.c:370
 msgid "End"
 msgstr "Ende"
 
-#: ../src/plugins/save-calendar/csv-format.c:382
+#: ../src/plugins/save-calendar/csv-format.c:371
 msgid "Due"
 msgstr "Fällig"
 
-#: ../src/plugins/save-calendar/csv-format.c:383
+#: ../src/plugins/save-calendar/csv-format.c:372
 msgid "percent Done"
 msgstr "Prozent abgeschlossen"
 
-#: ../src/plugins/save-calendar/csv-format.c:385
+#: ../src/plugins/save-calendar/csv-format.c:374
 msgid "URL"
 msgstr "Adresse"
 
-#: ../src/plugins/save-calendar/csv-format.c:386
+#: ../src/plugins/save-calendar/csv-format.c:375
 msgid "Attendees List"
 msgstr "Teilnehmerliste"
 
-#: ../src/plugins/save-calendar/csv-format.c:388
+#: ../src/plugins/save-calendar/csv-format.c:377
 msgid "Modified"
 msgstr "Geändert"
 
-#: ../src/plugins/save-calendar/csv-format.c:561
+#: ../src/plugins/save-calendar/csv-format.c:537
 msgid "A_dvanced options for the CSV format"
 msgstr "Er_weiterte Einstellungen für das CSV-Format"
 
-#: ../src/plugins/save-calendar/csv-format.c:569
+#: ../src/plugins/save-calendar/csv-format.c:545
 msgid "Prepend a _header"
 msgstr "Einen _Kopf voranstellen"
 
-#: ../src/plugins/save-calendar/csv-format.c:578
+#: ../src/plugins/save-calendar/csv-format.c:554
 msgid "_Value delimiter:"
 msgstr "_Variablentrennzeichen:"
 
-#: ../src/plugins/save-calendar/csv-format.c:589
+#: ../src/plugins/save-calendar/csv-format.c:565
 msgid "_Record delimiter:"
 msgstr "_Eintragstrennzeichen:"
 
-#: ../src/plugins/save-calendar/csv-format.c:600
+#: ../src/plugins/save-calendar/csv-format.c:576
 msgid "_Encapsulate values with:"
 msgstr "Variablen _einschließen in:"
 
-#: ../src/plugins/save-calendar/csv-format.c:626
+#: ../src/plugins/save-calendar/csv-format.c:602
 msgid "Comma separated values (.csv)"
 msgstr "Mit Kommata getrennte Werte (.csv)"
 
@@ -25995,7 +26455,7 @@ msgstr "Einen Kalender oder eine Aufgabenliste auf einem Datenträger speichern.
 msgid "%FT%T"
 msgstr "%d.%m.%YT%T"
 
-#: ../src/plugins/save-calendar/rdf-format.c:383
+#: ../src/plugins/save-calendar/rdf-format.c:373
 msgid "RDF (.rdf)"
 msgstr "RDF-Format (.rdf)"
 
@@ -26047,11 +26507,11 @@ msgid "Save as Template"
 msgstr "Als Vorlage speichern"
 
 #: ../src/shell/e-shell.c:379
-msgid "Preparing to go offline..."
+msgid "Preparing to go offline…"
 msgstr "Offline-Betrieb wird vorbereitet …"
 
 #: ../src/shell/e-shell.c:408
-msgid "Preparing to go online..."
+msgid "Preparing to go online…"
 msgstr "Online-Betrieb wird vorbereitet …"
 
 #: ../src/shell/e-shell.c:519
@@ -26059,8 +26519,8 @@ msgid "Preparing to quit"
 msgstr "Beenden wird vorbereitet"
 
 #: ../src/shell/e-shell.c:525
-msgid "Preparing to quit..."
-msgstr "Beenden wird vorbereitet …"
+msgid "Preparing to quit…"
+msgstr "Beenden wird vorbereitet"
 
 #: ../src/shell/e-shell.c:1088
 msgid "Open _Settings"
@@ -26070,15 +26530,15 @@ msgstr "_Einstellungen öffnen"
 msgid "Credentials are required to connect to the destination host."
 msgstr "Anmeldedaten sind für eine Verbindung mit dem Zielrechner erforderlich."
 
-#: ../src/shell/e-shell.c:1464 ../src/shell/e-shell-window-actions.c:873
+#: ../src/shell/e-shell.c:1464 ../src/shell/e-shell-window-actions.c:891
 msgid "New _Window"
 msgstr "Neues F_enster"
 
-#: ../src/shell/e-shell.c:1475 ../src/shell/e-shell-window-actions.c:803
+#: ../src/shell/e-shell.c:1475 ../src/shell/e-shell-window-actions.c:821
 msgid "_About"
 msgstr "_Info"
 
-#: ../src/shell/e-shell.c:1476 ../src/shell/e-shell-window-actions.c:901
+#: ../src/shell/e-shell.c:1476 ../src/shell/e-shell-window-actions.c:919
 msgid "_Quit"
 msgstr "_Beenden"
 
@@ -26141,287 +26601,295 @@ msgstr ""
 "Tim Sabsch <tim sabsch com>"
 
 #: ../src/shell/e-shell-utils.c:354
-msgid "Evolution Website"
-msgstr "Evolution-Webseite"
+msgid "Website"
+msgstr "Internetseite"
 
 #: ../src/shell/e-shell-view.c:295
 msgid "Saving user interface state"
 msgstr "Zustand der Benutzerschnittstelle wird gespeichert"
 
-#: ../src/shell/e-shell-window-actions.c:293
+#: ../src/shell/e-shell-window-actions.c:311
 msgid "Categories Editor"
 msgstr "Kategorien-Editor"
 
-#: ../src/shell/e-shell-window-actions.c:596
+#: ../src/shell/e-shell-window-actions.c:614
 msgid "Bug Buddy is not installed."
 msgstr "Bug-Buddy ist nicht installiert."
 
-#: ../src/shell/e-shell-window-actions.c:597
+#: ../src/shell/e-shell-window-actions.c:615
 msgid "Bug Buddy could not be run."
 msgstr "Bug-Buddy konnte nicht gestartet werden."
 
-#: ../src/shell/e-shell-window-actions.c:793
+#: ../src/shell/e-shell-window-actions.c:811
 msgid "Collect_ion Account"
 msgstr "Sammel_konto"
 
-#: ../src/shell/e-shell-window-actions.c:795
+#: ../src/shell/e-shell-window-actions.c:813
 msgid "Create a new collection account"
 msgstr "Ein neues Sammelkonto erstellen"
 
-#: ../src/shell/e-shell-window-actions.c:805
+#: ../src/shell/e-shell-window-actions.c:823
 msgid "Show information about Evolution"
 msgstr "Informationen zu Evolution anzeigen"
 
-#: ../src/shell/e-shell-window-actions.c:810
+#: ../src/shell/e-shell-window-actions.c:828
 msgid "_Accounts"
 msgstr "_Konten"
 
-#: ../src/shell/e-shell-window-actions.c:812
+#: ../src/shell/e-shell-window-actions.c:830
 msgid "Configure Evolution Accounts"
 msgstr "Evolution-Konten konfigurieren"
 
-#: ../src/shell/e-shell-window-actions.c:817
-#: ../src/shell/e-shell-window-actions.c:831
+#: ../src/shell/e-shell-window-actions.c:835
+#: ../src/shell/e-shell-window-actions.c:849
 msgid "_Close Window"
 msgstr "Fenster s_chließen"
 
-#: ../src/shell/e-shell-window-actions.c:838
+#: ../src/shell/e-shell-window-actions.c:856
 msgid "_Contents"
 msgstr "_Inhalte"
 
-#: ../src/shell/e-shell-window-actions.c:840
+#: ../src/shell/e-shell-window-actions.c:858
 msgid "Open the Evolution User Guide"
 msgstr "Das Benutzerhandbuch von Evolution öffnen"
 
-#: ../src/shell/e-shell-window-actions.c:866
-msgid "I_mport..."
-msgstr "Impor_tieren …"
+#: ../src/shell/e-shell-window-actions.c:884
+msgid "I_mport…"
+msgstr "I_mportieren …"
 
-#: ../src/shell/e-shell-window-actions.c:868
+#: ../src/shell/e-shell-window-actions.c:886
 msgid "Import data from other programs"
 msgstr "Daten aus anderen Programmen importieren"
 
-#: ../src/shell/e-shell-window-actions.c:875
+#: ../src/shell/e-shell-window-actions.c:893
 msgid "Create a new window displaying this view"
 msgstr "Ein neues Fenster öffnen, das diese Ansicht anzeigt"
 
-#: ../src/shell/e-shell-window-actions.c:887
+#: ../src/shell/e-shell-window-actions.c:905
 msgid "Available Cate_gories"
 msgstr "Verfügbare Kate_gorien"
 
-#: ../src/shell/e-shell-window-actions.c:889
+#: ../src/shell/e-shell-window-actions.c:907
 msgid "Manage available categories"
 msgstr "Verfügbare Kategorien verwalten"
 
-#: ../src/shell/e-shell-window-actions.c:903
+#: ../src/shell/e-shell-window-actions.c:921
 msgid "Exit the program"
 msgstr "Das Programm beenden"
 
-#: ../src/shell/e-shell-window-actions.c:908
-msgid "_Advanced Search..."
+#: ../src/shell/e-shell-window-actions.c:926
+msgid "_Advanced Search…"
 msgstr "Er_weiterte Suche …"
 
-#: ../src/shell/e-shell-window-actions.c:910
+#: ../src/shell/e-shell-window-actions.c:928
 msgid "Construct a more advanced search"
 msgstr "Erweiterte Suche ausführen"
 
-#: ../src/shell/e-shell-window-actions.c:917
+#: ../src/shell/e-shell-window-actions.c:935
 msgid "Clear the current search parameters"
 msgstr "Die aktuellen Suchparameter leeren"
 
-#: ../src/shell/e-shell-window-actions.c:922
-msgid "_Edit Saved Searches..."
+#: ../src/shell/e-shell-window-actions.c:940
+msgid "_Edit Saved Searches…"
 msgstr "Gespeicherte Suchen _bearbeiten …"
 
-#: ../src/shell/e-shell-window-actions.c:924
+#: ../src/shell/e-shell-window-actions.c:942
 msgid "Manage your saved searches"
 msgstr "Ihre gespeicherten Suchvorgänge verwalten"
 
-#: ../src/shell/e-shell-window-actions.c:931
+#: ../src/shell/e-shell-window-actions.c:949
 msgid "Click here to change the search type"
 msgstr "Klicken Sie hier, um den Suchtypen zu ändern"
 
-#: ../src/shell/e-shell-window-actions.c:936
+#: ../src/shell/e-shell-window-actions.c:954
 msgid "_Find Now"
 msgstr "_Jetzt suchen"
 
-#: ../src/shell/e-shell-window-actions.c:938
+#: ../src/shell/e-shell-window-actions.c:956
 msgid "Execute the current search parameters"
 msgstr "Die aktuellen Suchparameter anwenden"
 
-#: ../src/shell/e-shell-window-actions.c:943
-msgid "_Save Search..."
+#: ../src/shell/e-shell-window-actions.c:961
+msgid "_Save Search…"
 msgstr "Suche _speichern …"
 
-#: ../src/shell/e-shell-window-actions.c:945
+#: ../src/shell/e-shell-window-actions.c:963
 msgid "Save the current search parameters"
 msgstr "Die aktuellen Suchparameter speichern"
 
-#: ../src/shell/e-shell-window-actions.c:957
-msgid "Submit _Bug Report..."
+#: ../src/shell/e-shell-window-actions.c:975
+msgid "_Keyboard Shortcuts"
+msgstr "_Tastenkürzel"
+
+#: ../src/shell/e-shell-window-actions.c:977
+msgid "Show keyboard shortcuts"
+msgstr "Tastenkürzel anzeigen"
+
+#: ../src/shell/e-shell-window-actions.c:982
+msgid "Submit _Bug Report…"
 msgstr "Fehler_bericht einschicken …"
 
-#: ../src/shell/e-shell-window-actions.c:959
+#: ../src/shell/e-shell-window-actions.c:984
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Einen Fehlerbericht mit Bug Buddy einschicken"
 
-#: ../src/shell/e-shell-window-actions.c:964
+#: ../src/shell/e-shell-window-actions.c:989
 msgid "_Work Offline"
 msgstr "_Offline arbeiten"
 
-#: ../src/shell/e-shell-window-actions.c:966
+#: ../src/shell/e-shell-window-actions.c:991
 msgid "Put Evolution into offline mode"
 msgstr "Evolution in den Offline-Modus versetzen"
 
-#: ../src/shell/e-shell-window-actions.c:971
+#: ../src/shell/e-shell-window-actions.c:996
 msgid "_Work Online"
 msgstr "_Online arbeiten"
 
-#: ../src/shell/e-shell-window-actions.c:973
+#: ../src/shell/e-shell-window-actions.c:998
 msgid "Put Evolution into online mode"
 msgstr "Evolution in den Online-Modus versetzen"
 
-#: ../src/shell/e-shell-window-actions.c:1001
+#: ../src/shell/e-shell-window-actions.c:1026
 msgid "Lay_out"
 msgstr "_Anordnung"
 
 #. Translators: This is a New menu item caption, under File->New
-#: ../src/shell/e-shell-window-actions.c:1009
+#: ../src/shell/e-shell-window-actions.c:1034
 msgid "_New"
 msgstr "_Neu"
 
-#: ../src/shell/e-shell-window-actions.c:1016
+#: ../src/shell/e-shell-window-actions.c:1041
 msgid "_Search"
 msgstr "_Suchen"
 
-#: ../src/shell/e-shell-window-actions.c:1023
+#: ../src/shell/e-shell-window-actions.c:1048
 msgid "_Switcher Appearance"
 msgstr "Erscheinungsbild der Knö_pfe"
 
-#: ../src/shell/e-shell-window-actions.c:1037
+#: ../src/shell/e-shell-window-actions.c:1062
 msgid "_Window"
 msgstr "_Fenster"
 
-#: ../src/shell/e-shell-window-actions.c:1066
+#: ../src/shell/e-shell-window-actions.c:1091
 msgid "Show _Menu Bar"
 msgstr "_Menüleiste anzeigen"
 
-#: ../src/shell/e-shell-window-actions.c:1068
+#: ../src/shell/e-shell-window-actions.c:1093
 msgid "Show the menu bar"
 msgstr "Die Menüleiste anzeigen"
 
-#: ../src/shell/e-shell-window-actions.c:1074
+#: ../src/shell/e-shell-window-actions.c:1099
 msgid "Show Side _Bar"
 msgstr "Sei_tenleiste anzeigen"
 
-#: ../src/shell/e-shell-window-actions.c:1076
+#: ../src/shell/e-shell-window-actions.c:1101
 msgid "Show the side bar"
 msgstr "Seitenleiste anzeigen"
 
-#: ../src/shell/e-shell-window-actions.c:1082
+#: ../src/shell/e-shell-window-actions.c:1107
 msgid "Show _Buttons"
 msgstr "_Knöpfe anzeigen"
 
-#: ../src/shell/e-shell-window-actions.c:1084
+#: ../src/shell/e-shell-window-actions.c:1109
 msgid "Show the switcher buttons"
 msgstr "Umschaltknöpfe anzeigen"
 
-#: ../src/shell/e-shell-window-actions.c:1090
+#: ../src/shell/e-shell-window-actions.c:1115
 msgid "Show _Status Bar"
 msgstr "Stat_usleiste anzeigen"
 
-#: ../src/shell/e-shell-window-actions.c:1092
+#: ../src/shell/e-shell-window-actions.c:1117
 msgid "Show the status bar"
 msgstr "Die Statusleiste anzeigen"
 
-#: ../src/shell/e-shell-window-actions.c:1098
+#: ../src/shell/e-shell-window-actions.c:1123
 msgid "Show _Tool Bar"
 msgstr "_Werkzeugleiste anzeigen"
 
-#: ../src/shell/e-shell-window-actions.c:1100
+#: ../src/shell/e-shell-window-actions.c:1125
 msgid "Show the tool bar"
 msgstr "Die Werkzeugleiste anzeigen"
 
-#: ../src/shell/e-shell-window-actions.c:1122
+#: ../src/shell/e-shell-window-actions.c:1147
 msgid "_Icons Only"
 msgstr "Nur S_ymbole"
 
-#: ../src/shell/e-shell-window-actions.c:1124
+#: ../src/shell/e-shell-window-actions.c:1149
 msgid "Display window buttons with icons only"
 msgstr "Fensterknöpfe nur als Symbole anzeigen"
 
-#: ../src/shell/e-shell-window-actions.c:1129
+#: ../src/shell/e-shell-window-actions.c:1154
 msgid "_Text Only"
 msgstr "Nur _Text"
 
-#: ../src/shell/e-shell-window-actions.c:1131
+#: ../src/shell/e-shell-window-actions.c:1156
 msgid "Display window buttons with text only"
 msgstr "Fensterknöpfe nur als Text anzeigen"
 
-#: ../src/shell/e-shell-window-actions.c:1136
+#: ../src/shell/e-shell-window-actions.c:1161
 msgid "Icons _and Text"
 msgstr "Symbole _und Text"
 
-#: ../src/shell/e-shell-window-actions.c:1138
+#: ../src/shell/e-shell-window-actions.c:1163
 msgid "Display window buttons with icons and text"
 msgstr "Fensterknöpfe mit Symbolen und Text anzeigen"
 
-#: ../src/shell/e-shell-window-actions.c:1143
+#: ../src/shell/e-shell-window-actions.c:1168
 msgid "Tool_bar Style"
 msgstr "_Werkzeugleistenstil"
 
-#: ../src/shell/e-shell-window-actions.c:1145
+#: ../src/shell/e-shell-window-actions.c:1170
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "Fensterknöpfe mit der Systemeinstellung für Werkzeugleisten anzeigen"
 
-#: ../src/shell/e-shell-window-actions.c:1153
+#: ../src/shell/e-shell-window-actions.c:1178
 msgid "Delete Current View"
 msgstr "Aktuelle Ansicht löschen"
 
-#: ../src/shell/e-shell-window-actions.c:1160
-msgid "Save Custom View..."
+#: ../src/shell/e-shell-window-actions.c:1185
+msgid "Save Custom View…"
 msgstr "Benutzerdefinierte Ansicht speichern …"
 
-#: ../src/shell/e-shell-window-actions.c:1162
+#: ../src/shell/e-shell-window-actions.c:1187
 msgid "Save current custom view"
 msgstr "Aktuelle benutzerdefinierte Ansicht speichern"
 
-#: ../src/shell/e-shell-window-actions.c:1169
+#: ../src/shell/e-shell-window-actions.c:1194
 msgid "C_urrent View"
 msgstr "A_ktuelle Ansicht"
 
-#: ../src/shell/e-shell-window-actions.c:1179
+#: ../src/shell/e-shell-window-actions.c:1204
 msgid "Custom View"
 msgstr "Benutzerdefinierte Ansicht"
 
-#: ../src/shell/e-shell-window-actions.c:1181
+#: ../src/shell/e-shell-window-actions.c:1206
 msgid "Current view is a customized view"
 msgstr "Aktuelle Ansicht ist eine benutzerdefinierte Ansicht"
 
-#: ../src/shell/e-shell-window-actions.c:1189
-msgid "Page Set_up..."
+#: ../src/shell/e-shell-window-actions.c:1214
+msgid "Page Set_up…"
 msgstr "Seite _einrichten …"
 
-#: ../src/shell/e-shell-window-actions.c:1191
+#: ../src/shell/e-shell-window-actions.c:1216
 msgid "Change the page settings for your current printer"
 msgstr "Die Seiteneinstellungen für Ihren aktuellen Drucker ändern"
 
-#: ../src/shell/e-shell-window-actions.c:1561
+#: ../src/shell/e-shell-window-actions.c:1586
 #, c-format
 msgid "Switch to %s"
 msgstr "Zu %s wechseln"
 
-#: ../src/shell/e-shell-window-actions.c:1684
+#: ../src/shell/e-shell-window-actions.c:1709
 #, c-format
 msgid "Select view: %s"
 msgstr "Ansicht wählen: %s"
 
-#: ../src/shell/e-shell-window-actions.c:1701
+#: ../src/shell/e-shell-window-actions.c:1726
 #, c-format
 msgid "Delete view: %s"
 msgstr "Ansicht löschen: %s"
 
-#: ../src/shell/e-shell-window-actions.c:1805
+#: ../src/shell/e-shell-window-actions.c:1830
 msgid "Execute these search parameters"
 msgstr "Diese Suchparameter ausführen"
 
@@ -26494,7 +26962,7 @@ msgstr "Nicht mehr anzeigen"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../src/shell/main.c:312
+#: ../src/shell/main.c:325
 msgid ""
 "Start Evolution showing the specified component. Available options are “mail”, "
 "“calendar”, “contacts”, “tasks”, and “memos”"
@@ -26502,40 +26970,40 @@ msgstr ""
 "Evolution mit einer bestimmten Komponente starten. Mögliche Optionen sind »mail«, "
 "»calendar«, »contacts«, »tasks« und »memos«"
 
-#: ../src/shell/main.c:316
+#: ../src/shell/main.c:329
 msgid "Apply the given geometry to the main window"
 msgstr "Die angegebene Geometrie auf das Hauptfenster anwenden"
 
-#: ../src/shell/main.c:320
+#: ../src/shell/main.c:333
 msgid "Start in online mode"
 msgstr "Im Online-Modus starten"
 
-#: ../src/shell/main.c:322
+#: ../src/shell/main.c:335
 msgid "Ignore network availability"
 msgstr "Verfügbarkeit des Netzwerks ignorieren"
 
-#: ../src/shell/main.c:325
+#: ../src/shell/main.c:338
 msgid "Forcibly shut down Evolution"
 msgstr "Evolution zum Herunterfahren zwingen"
 
-#: ../src/shell/main.c:328
+#: ../src/shell/main.c:341
 msgid "Disable loading of any plugins."
 msgstr "Das Laden von allen Erweiterungen deaktivieren."
 
-#: ../src/shell/main.c:330
+#: ../src/shell/main.c:343
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Die Vorschau von E-Mails, Kontakten und Aufgaben deaktivieren."
 
-#: ../src/shell/main.c:334
+#: ../src/shell/main.c:347
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr ""
 "Adressen oder Dateinamen importieren, die als restliche Argumente angegeben wurden."
 
-#: ../src/shell/main.c:336
+#: ../src/shell/main.c:349
 msgid "Request a running Evolution process to quit"
 msgstr "Einen laufenden Evolution-Prozess zum Beenden auffordern"
 
-#: ../src/shell/main.c:418
+#: ../src/shell/main.c:431
 #, c-format
 msgid ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. System "
@@ -26544,11 +27012,11 @@ msgstr ""
 "Evolution kann nicht gestartet werden. Eine andere Instanz von Evolution könnte "
 "nicht reagieren. Systemfehler: %s"
 
-#: ../src/shell/main.c:474 ../src/shell/main.c:479
+#: ../src/shell/main.c:490 ../src/shell/main.c:495
 msgid "— The Evolution PIM and Email Client"
 msgstr "– Die Evolution PIM- und E-Mail-Anwendung"
 
-#: ../src/shell/main.c:541
+#: ../src/shell/main.c:551
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -26557,7 +27025,7 @@ msgstr ""
 "%s: »--online« und »--offline« können nicht gemeinsam verwendet werden.\n"
 "  Rufen Sie »%s --help« auf, um weitere Informationen zu erhalten.\n"
 
-#: ../src/shell/main.c:547
+#: ../src/shell/main.c:557
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -26566,6 +27034,10 @@ msgstr ""
 "%s: »--force-online« und »--offline« können nicht gemeinsam verwendet werden.\n"
 "  Rufen Sie »%s --help« auf, um weitere Informationen zu erhalten.\n"
 
+#: ../src/shell/shell.error.xml.h:1
+msgid "Importing..."
+msgstr "Importieren …"
+
 #: ../src/shell/shell.error.xml.h:2
 msgid "Upgrade from previous version failed:"
 msgstr "Aktualisieren von vorheriger Version gescheitert:"
@@ -26795,7 +27267,7 @@ msgid "Email Address"
 msgstr "E-Mail-Adresse"
 
 #: ../src/smime/gui/certificate-manager.c:648
-msgid "Select a file to backup your key and certificate..."
+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:
@@ -26819,7 +27291,7 @@ msgstr "_Dateiname:"
 
 #. FIXME when gtk_file_chooser_button allows GTK_FILE_CHOOSER_ACTION_SAVE use it
 #: ../src/smime/gui/certificate-manager.c:741
-msgid "Please select a file..."
+msgid "Please select a file…"
 msgstr "Bitte eine Datei wählen …"
 
 #: ../src/smime/gui/certificate-manager.c:755
@@ -26867,7 +27339,7 @@ msgid "Failed to backup key and certificate"
 msgstr "Zertifikat und Notfallschlüssel konnten nicht gesichert werden"
 
 #: ../src/smime/gui/certificate-manager.c:948
-msgid "Select a certificate to import..."
+msgid "Select a certificate to import…"
 msgstr "Wählen Sie ein zu importierendes Zertifikat …"
 
 #: ../src/smime/gui/certificate-manager.c:997
@@ -27078,7 +27550,8 @@ msgstr "Vertrauenswürdigkeit einer Zertifizierungsstelle"
 
 #: ../src/smime/gui/smime-ui.ui.h:19
 msgid "Trust this CA to identify _websites."
-msgstr "Dieser Zertifizierungsstelle bei der _Website-Identifikation vertrauen."
+msgstr ""
+"Dieser Zertifizierungsstelle für die Identifikation von Internetseiten vertrauen."
 
 #: ../src/smime/gui/smime-ui.ui.h:20
 msgid "Trust this CA to identify _email users."
@@ -27170,6 +27643,234 @@ msgstr ""
 msgid "Imported Certificate"
 msgstr "Importiertes Zertifikat"
 
+#~ msgid "%d week"
+#~ msgid_plural "%d weeks"
+#~ msgstr[0] "%d Woche"
+#~ msgstr[1] "%d Wochen"
+
+#~ msgctxt "cal-task-status"
+#~ msgid "None"
+#~ msgstr "Keine"
+
+#~ msgid "_Attachment..."
+#~ msgstr "_Anlage …"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "Atte_ndees..."
+#~ msgstr "Teil_nehmer …"
+
+#~ msgid "%d day before"
+#~ msgid_plural "%d days before"
+#~ msgstr[0] "%d Tag vor"
+#~ msgstr[1] "%d Tage vor"
+
+#~ msgid "%d hour before"
+#~ msgid_plural "%d hours before"
+#~ msgstr[0] "%d Stunde vor"
+#~ msgstr[1] "%d Stunden vor"
+
+#~ msgid "%d minute before"
+#~ msgid_plural "%d minutes before"
+#~ msgstr[0] "%d Minute vor"
+#~ msgstr[1] "%d Minuten vor"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "15 minutes before"
+#~ msgstr "15 Minuten vor"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "1 hour before"
+#~ msgstr "1 Stunde vor"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "1 day before"
+#~ msgstr "1 Tag vor"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "_Categories..."
+#~ msgstr "Ka_tegorien …"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "Not Started"
+#~ msgstr "Nicht begonnen"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "In Progress"
+#~ msgstr "In Bearbeitung"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "Completed"
+#~ msgstr "Abgeschlossen"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "Cancelled"
+#~ msgstr "Abgebrochen"
+
+#~ msgid "Saving changes..."
+#~ msgstr "Änderungen werden gespeichert …"
+
+#~ msgid "_Print..."
+#~ msgstr "_Drucken …"
+
+#~ msgid "Pre_view..."
+#~ msgstr "_Vorschau …"
+
+#~ msgid "Select..."
+#~ msgstr "Auswählen …"
+
+#~ msgid "Atte_ndees..."
+#~ msgstr "Teil_nehmer …"
+
+#~ msgid "New _Appointment..."
+#~ msgstr "Neuer _Termin …"
+
+#~ msgid "New _Meeting..."
+#~ msgstr "Neue Bes_prechung …"
+
+#~ msgid "New _Task..."
+#~ msgstr "_Neue Aufgabe …"
+
+#~ msgid "_Open..."
+#~ msgstr "Ö_ffnen …"
+
+#~ msgid "_Delete..."
+#~ msgstr "_Löschen …"
+
+#~ msgid "Save _As..."
+#~ msgstr "Speichern _unter …"
+
+#~ msgid "A_dd Attachment..."
+#~ msgstr "Anlage _hinzufügen …"
+
+#~ msgid "Other..."
+#~ msgstr "Weitere …"
+
+#~ msgid "_Find..."
+#~ msgstr "_Suchen …"
+
+#~ msgid "Re_place..."
+#~ msgstr "_Ersetzen …"
+
+#~ msgid "_Image..."
+#~ msgstr "_Bild …"
+
+#~ msgid "_Link..."
+#~ msgstr "_Verweis …"
+
+#~ msgid "_Rule..."
+#~ msgstr "T_rennlinie …"
+
+#~ msgid "_Table..."
+#~ msgstr "_Tabelle …"
+
+#~ msgid "Cell..."
+#~ msgstr "Zelle …"
+
+#~ msgid "Image..."
+#~ msgstr "Bild …"
+
+#~ msgid "Link..."
+#~ msgstr "Verweis …"
+
+#~ msgid "Page..."
+#~ msgstr "Seite …"
+
+#~ msgid "Rule..."
+#~ msgstr "Trennlinie …"
+
+#~ msgid "Table..."
+#~ msgstr "Tabelle …"
+
+#~ msgid "Text..."
+#~ msgstr "Text …"
+
+#~ msgid "More..."
+#~ msgstr "Mehr …"
+
+#~ msgid "Add a C_olumn..."
+#~ msgstr "Spalte hin_zufügen …"
+
+#~ msgid "Custo_mize Current View..."
+#~ msgstr "A_ktuelle Ansicht anpassen …"
+
+#~ msgid "Save _Image..."
+#~ msgstr "Bild spe_ichern …"
+
+#~ msgid "Storing changes..."
+#~ msgstr "Änderungen werden gespeichert …"
+
+#~ msgid "Retrieving message..."
+#~ msgstr "Nachricht wird abgerufen …"
+
+#~ msgid "_Archive..."
+#~ msgstr "_Archivieren …"
+
+#~ msgid "_Copy to Folder..."
+#~ msgstr "In Ordner _kopieren …"
+
+#~ msgid "Follow _Up..."
+#~ msgstr "_Folgenachricht …"
+
+#~ msgid "_Move to Folder..."
+#~ msgstr "In Ordner _verschieben …"
+
+#~ msgid "Loading..."
+#~ msgstr "Ladevorgang …"
+
+#~ msgid "_Forward Contact..."
+#~ msgstr "Kontakt _weiterleiten …"
+
+#~ msgid "_New Contact..."
+#~ msgstr "_Neuer Kontakt …"
+
+#~ msgid "New Contact _List..."
+#~ msgstr "Neue Kontakt_liste …"
+
+#~ msgid "_Send Message to Contact..."
+#~ msgstr "_Nachricht an Kontakt schicken …"
+
+#~ msgid "_Save as vCard..."
+#~ msgstr "Als VCard _speichern …"
+
+#~ msgid "Selected Memo Lists for Notifications of Reminders"
+#~ msgstr "Ausgewählte Notizlisten für Erinnerungsmeldungen"
+
+#~ msgid "_Copy..."
+#~ msgstr "_Kopieren …"
+
+#~ msgid "New All Day _Event..."
+#~ msgstr "Neuer _ganztägiger Termin …"
+
+#~ msgid "Print..."
+#~ msgstr "Drucken …"
+
+#~ msgid "_Save as iCalendar..."
+#~ msgstr "Als i_Calendar speichern …"
+
+#~ msgid "_Copy Folder To..."
+#~ msgstr "Ordner _kopieren nach …"
+
+#~ msgid "_Move Folder To..."
+#~ msgstr "Ordner verschie_ben nach …"
+
+#~ msgid "_New..."
+#~ msgstr "_Neu …"
+
+#~ msgid "Preparing to quit..."
+#~ msgstr "Beenden wird vorbereitet …"
+
+#~ msgid "Evolution Website"
+#~ msgstr "Evolution-Webseite"
+
+#~ msgid "I_mport..."
+#~ msgstr "Impor_tieren …"
+
+#~ msgid "_Advanced Search..."
+#~ msgstr "Er_weiterte Suche …"
+
+#~ msgid "_Save Search..."
+#~ msgstr "Suche _speichern …"
+
 #~ msgid "Summary:"
 #~ msgstr "Zusammenfassung:"
 


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