diff --git a/po/de.po b/po/de.po
index 71915447dc..d74bd14611 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: 2020-10-20 19:49+0000\n"
-"PO-Revision-Date: 2020-11-01 14:53+0100\n"
-"Last-Translator: Tim Sabsch <tim@sabsch.com>\n"
+"POT-Creation-Date: 2020-12-09 10:05+0000\n"
+"PO-Revision-Date: 2020-12-23 11:41+0100\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"
@@ -125,7 +125,7 @@ msgstr "Karten anzeigen"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:16
 msgid "Whether to show maps in preview pane"
-msgstr "Sollen Karten im Vorschaufeld angezeigt werden?"
+msgstr "Legt fest, ob Karten im Vorschaufeld angezeigt werden sollen"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:17
 msgid "Primary address book"
@@ -137,7 +137,7 @@ msgid ""
 "“Contacts” view"
 msgstr ""
 "Die UID des gewählten (oder »primären«) Adressbuchs in der Seitenleiste der "
-"»Kontakte«-Ansicht."
+"»Kontakte«-Ansicht"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:19
 msgid "Show preview pane"
@@ -145,7 +145,7 @@ msgstr "Vorschaufeld anzeigen"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:20
 msgid "Whether to show the preview pane."
-msgstr "Soll das Vorschaufeld angezeigt werden?"
+msgstr "Legt fest, ob das Vorschaufeld angezeigt werden soll."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:21
 msgid "true"
@@ -269,8 +269,8 @@ msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and Sunday in "
 "the space of one weekday"
 msgstr ""
-"Sollen Wochenenden in der Monatsansicht komprimiert werden, wobei die Tage "
-"Sonnabend und Sonntag im Raum eines einzelnen Wochentages enthalten sind?"
+"Legt fest, ob Wochenenden in der Monatsansicht komprimiert werden sollen, wobei "
+"Samstag und Sonntag im Raum eines einzelnen Wochentages enthalten sind"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:9
 msgid "Ask for confirmation when deleting items"
@@ -278,7 +278,8 @@ msgstr "Beim Löschen von Objekten nachfragen"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:10
 msgid "Whether to ask for confirmation when deleting an appointment or task"
-msgstr "Soll beim Löschen von Terminen oder Aufgaben nachgefragt werden?"
+msgstr ""
+"Legt fest, ob beim Löschen von Terminen oder Aufgaben nachgefragt werden soll"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:11
 msgid "Confirm expunge"
@@ -286,7 +287,8 @@ msgstr "Beim Säubern nachfragen"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:12
 msgid "Whether to ask for confirmation when expunging appointments and tasks"
-msgstr "Soll beim Säubern von Terminen oder Aufgaben nachgefragt werden?"
+msgstr ""
+"Legt fest, ob beim Säubern von Terminen oder Aufgaben nachgefragt werden soll"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:13
 msgid "Month view vertical pane position"
@@ -342,7 +344,7 @@ msgid ""
 "to use day-start-hour and day-start-minute"
 msgstr ""
 "Die Stunde, zu der ein Arbeitstag beginnt, im 24-Stunden-Format (SSMM) von 0000 "
-"bis 2359. »-1« legt fest, dass die Uhrzeit zum Tagesanfang verwendet wird."
+"bis 2359. »-1« legt fest, dass die Uhrzeit zum Tagesanfang verwendet wird"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
 msgid "Workday end time for Monday"
@@ -354,7 +356,7 @@ msgid ""
 "use day-end-hour and day-end-minute"
 msgstr ""
 "Die Stunde, zu der ein Arbeitstag endet, im 24-Stunden-Format (SSMM) von 0000 bis "
-"2359. »-1« legt fest, dass die Uhrzeit zum Tagesende verwendet wird."
+"2359. »-1« legt fest, dass die Uhrzeit zum Tagesende verwendet wird"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:27
 msgid "Workday start time for Tuesday"
@@ -366,7 +368,7 @@ msgid ""
 "use day-start-hour and day-start-minute"
 msgstr ""
 "Die Stunde, zu der ein Arbeitstag endet, im 24-Stunden-Format (SSMM) von 0000 bis "
-"2359. »-1« legt fest, dass die Uhrzeit zum Tagesanfang verwendet wird."
+"2359. »-1« legt fest, dass die Uhrzeit zum Tagesanfang verwendet wird"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
 msgid "Workday end time for Tuesday"
@@ -423,7 +425,7 @@ msgid ""
 msgstr ""
 "Legt fest, ob die zweite Zeitzone in der Tagesansicht angezeigt wird, falls diese "
 "definiert ist. Der Schlüsselwert hat das gleiche Format wie der Schlüssel "
-"»timezone«."
+"»timezone«"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:42
 msgid "Recently used second time zones in a Day View"
@@ -466,7 +468,8 @@ msgstr "Kategoriefeld im Termin-/Aufgaben-/Besprechungseditor anzeigen"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
 msgid "Whether to show categories field in the event/meeting editor"
-msgstr "Soll das Kategoriefeld im Termin-/Besprechungseditor angezeigt werden?"
+msgstr ""
+"Legt fest, ob das Kategoriefeld im Termin-/Besprechungseditor angezeigt werden soll"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
 msgid "Show Role field in the event/task/meeting editor"
@@ -475,7 +478,8 @@ msgstr "Positionsfeld im Termin-/Aufgaben-/Besprechungseditor anzeigen"
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr ""
-"Soll das Positionsfeld im Termin-/Aufgaben-/Besprechungseditor angezeigt werden?"
+"Legt fest, ob das Positionsfeld im Termin-/Aufgaben-/Besprechungseditor angezeigt "
+"werden soll"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:54
 msgid "Show RSVP field in the event/task/meeting editor"
@@ -483,7 +487,9 @@ msgstr "UAwg-Feld im Termin-/Aufgaben-/Besprechungseditor anzeigen"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
 msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr "Soll das UAwg-Feld im Termin-/Aufgaben-/Besprechungseditor angezeigt werden?"
+msgstr ""
+"Legt fest, ob das UAwg-Feld im Termin-/Aufgaben-/Besprechungseditor angezeigt "
+"werden soll"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
 msgid "Show status field in the event/task/meeting editor"
@@ -492,7 +498,8 @@ msgstr "Statusfeld im Termin-/Aufgaben-/Besprechungseditor anzeigen"
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr ""
-"Soll das Statusfeld im Termin-/Aufgaben-/Besprechungseditor angezeigt werden?"
+"Legt fest, ob das Statusfeld im Termin-/Aufgaben-/Besprechungseditor angezeigt "
+"werden soll"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
 msgid "Show timezone field in the event/meeting editor"
@@ -500,7 +507,8 @@ msgstr "Zeitzonenfeld im Termin-/Besprechungseditor anzeigen"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
 msgid "Whether to show timezone field in the event/meeting editor"
-msgstr "Soll das Zeitzonenfeld im Termin-/Besprechungseditor angezeigt werden?"
+msgstr ""
+"Legt fest, ob das Zeitzonenfeld im Termin-/Besprechungseditor angezeigt werden soll"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
 msgid "Show type field in the event/task/meeting editor"
@@ -508,7 +516,9 @@ msgstr "Artenfeld im Termin-/Aufgaben-/Besprechungseditor anzeigen"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
 msgid "Whether to show type field in the event/task/meeting editor"
-msgstr "Soll das Artenfeld im Termin-/Aufgaben-/Besprechungseditor angezeigt werden?"
+msgstr ""
+"Legt fest, ob das Artenfeld im Termin-/Aufgaben-/Besprechungseditor angezeigt "
+"werden soll"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
 msgid "Hide completed tasks"
@@ -516,7 +526,9 @@ msgstr "Erledigte Aufgaben verbergen"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
 msgid "Whether to hide completed tasks in the tasks view"
-msgstr "Sollen abgeschlossene Aufgaben in der Aufgabenansicht verborgen werden?"
+msgstr ""
+"Legt fest, ob abgeschlossene Aufgaben in der Aufgabenansicht verborgen werden "
+"sollen"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
 msgid "Hide task units"
@@ -597,8 +609,8 @@ msgstr "Marcus-Bains-Linie"
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
 msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar"
 msgstr ""
-"Soll eine Marcus-Bains-Linie (Linie auf der momentanen Zeit) im Kalender angezeigt "
-"werden?"
+"Legt fest, ob eine Marcus-Bains-Linie (Linie auf der aktuellen Zeit) im Kalender "
+"angezeigt werden soll"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
 msgid "Memo preview pane position (horizontal)"
@@ -620,7 +632,7 @@ msgid ""
 msgstr ""
 "Die Anordnung legt fest, wo die Vorschauleiste in Bezug auf die Notizliste "
 "angezeigt wird. »0« (klassische Ansicht) setzt die Vorschauleiste unter die "
-"Notizliste. »1« (vertikale Ansicht) setzt die Vorschauleiste neben die Notizliste."
+"Notizliste. »1« (vertikale Ansicht) setzt die Vorschauleiste neben die Notizliste"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
 msgid "Memo preview pane position (vertical)"
@@ -645,11 +657,15 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
 msgid "Scroll Month View by a week, not by a month"
-msgstr "Soll in der Monatsansicht wochenweise geblättert werden anstatt monatsweise?"
+msgstr ""
+"Legt fest, ob in der Monatsansicht wochenweise statt monatsweise geblättert werden "
+"soll"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
 msgid "Whether to scroll a Month View by a week, not by a month"
-msgstr "Soll in der Monatsansicht wochenweise geblättert werden anstatt monatsweise?"
+msgstr ""
+"Legt fest, ob in der Monatsansicht wochenweise statt monatsweise geblättert werden "
+"soll"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
 msgid "Let the Month View start with the current week"
@@ -660,8 +676,8 @@ msgid ""
 "Whether the month view should show weeks starting with the current week instead of "
 "the first week of the month."
 msgstr ""
-"Soll die Monatsansicht mit der aktuellen Woche beginnen anstatt mit der ersten "
-"Woche des Monats?"
+"Legt fest, ob die Monatsansicht mit der aktuellen Wochestatt mit der ersten Woche "
+"des Monats beginnen soll."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
 msgid "Preferred New button item"
@@ -748,8 +764,8 @@ msgstr "Endzeiten von Terminen in Wochen- und Monatsansichten anzeigen"
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
 msgid "Whether to display the end time of events in the week and month views"
 msgstr ""
-"Sollen die Endzeiten von Terminen in den Wochen- und Monatsansichten angezeigt "
-"werden?"
+"Legt fest, ob die Endzeiten von Terminen in den Wochen- und Monatsansichten "
+"angezeigt werden sollen"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
 msgid "Show appointment icons in the month view"
@@ -757,7 +773,9 @@ msgstr "Terminsymbole in Monatsansichten anzeigen"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
 msgid "Whether to show icons of events in the month view"
-msgstr "Sollen die Symbole von Terminen in den Monatsansichten angezeigt werden?"
+msgstr ""
+"Legt fest, ob die Symbole von Terminen in den Monatsansichten angezeigt werden "
+"sollen"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
 msgid "Show the memo preview pane"
@@ -784,7 +802,8 @@ msgstr ""
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
 msgid "Whether to show week numbers in various places in the Calendar"
 msgstr ""
-"Sollen die Wochennummern im Kalender an verschiedenen Stellen angezeigt werden?"
+"Legt fest, ob die Wochennummern im Kalender an verschiedenen Stellen angezeigt "
+"werden sollen"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
 msgid "Vertical position for the tag pane"
@@ -888,7 +907,8 @@ msgstr "24-Stunden-Zeitformat"
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
 msgid "Whether to show times in twenty four hour format instead of using am/pm"
 msgstr ""
-"Sollen Zeiten im 24-Stunden- und nicht im 12-Stunden-Format angezeigt werden?"
+"Legt fest, ob Zeiten im 24-Stunden- statt im 12-Stunden-Format angezeigt werden "
+"sollen"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
 msgid "Birthday and anniversary reminder"
@@ -896,7 +916,8 @@ msgstr "Erinnerung an Geburts- und Jahrestage"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
 msgid "Whether to set a reminder for birthdays and anniversaries"
-msgstr "Soll eine Erinnerung für Geburtstage und Jahrestage festgelegt werden?"
+msgstr ""
+"Legt fest, ob eine Erinnerung für Geburtstage und Jahrestage festgelegt werden soll"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
 msgid "Default appointment reminder"
@@ -904,7 +925,8 @@ msgstr "Voreingestellte Erinnerung für Termine"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
 msgid "Whether to set a default reminder for appointments"
-msgstr "Soll eine voreingestellte Erinnerung für Termine festgelegt werden?"
+msgstr ""
+"Legt fest, ob eine voreingestellte Erinnerung für Termine festgelegt werden soll"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
 msgid "Use system timezone"
@@ -1043,7 +1065,7 @@ msgstr "Die Fensterhöhe in Pixel"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:9
 msgid "Whether the window is maximized"
-msgstr "Soll das Fenster maximiert werden?"
+msgstr "Legt fest, ob das Fenster maximiert werden soll"
 
 #: ../data/org.gnome.evolution.importer.gschema.xml.in.h:1
 msgid "GNOME Calendar’s calendar import done"
@@ -1216,11 +1238,11 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
 msgid "Send HTML mail by default"
-msgstr "Per Vorgabe HTML-E-Mails verschicken?"
+msgstr "Per Vorgabe HTML-E-Mails verschicken"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
 msgid "Send HTML mail by default."
-msgstr "Per Vorgabe HTML-E-Mails verschicken?"
+msgstr "Per Vorgabe HTML-E-Mails verschicken."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
 msgid "Spell checking languages"
@@ -1372,7 +1394,7 @@ msgid ""
 "Replies or Forwards."
 msgstr ""
 "Signatur nur in neue Nachrichten einschließen, aber nicht in Antworten und "
-"Weiterleitungen"
+"Weiterleitungen."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
 msgid "Put personalized signatures at the top of replies"
@@ -1482,7 +1504,7 @@ msgstr "Anzahl von Zeichen bis zum Zeilenumbruch"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Will autowrap lines after given number of characters."
-msgstr "Automatischer Zeilenumbruch nach angegebener Anzahl von Zeichen"
+msgstr "Automatischer Zeilenumbruch nach angegebener Anzahl von Zeichen."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 msgid "Number of To and CC recipients to ask “prompt-on-many-to-cc-recips” from"
@@ -1548,7 +1570,7 @@ msgstr ""
 msgid "Whether start Plain Text composer with Preformatted paragraph mode"
 msgstr ""
 "Legt fest, ob der einfache Text-Nachrichteneditor im vorformatierten Absatzmodus "
-"starten soll."
+"starten soll"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid ""
@@ -1781,7 +1803,7 @@ msgstr "Gelöschte Nachrichten in der Nachrichtenliste anzeigen"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid "Show deleted messages (with a strike-through) in the message-list."
-msgstr "Gelöschte Nachrichten (durchgestrichen) in der Nachrichtenliste anzeigen"
+msgstr "Gelöschte Nachrichten (durchgestrichen) in der Nachrichtenliste anzeigen."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Show junk messages in the message-list"
@@ -1974,10 +1996,22 @@ msgstr ""
 "selbst orientieren."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+msgid "Whether to compress thread level"
+msgstr ""
+"Legt fest, ob abgeschlossene Aufgaben in der Aufgabenansicht verborgen werden "
+"sollen"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+msgid ""
+"Set to true to compress thread levels for flat conversations, to make the level "
+"not so deep."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "Konten alphabetisch in einem Ordnerbaum sortieren"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid ""
 "Tells how to sort accounts in a folder tree used in a Mail view. When set to true "
 "accounts are sorted alphabetically, with an exception of On This Computer and "
@@ -1988,19 +2022,19 @@ msgstr ""
 "diesem Rechner« und »Suchordner«, anderenfalls werden Konten nach einer vom "
 "Benutzer angegebenen Reihenfolge sortiert"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid "Log filter actions"
 msgstr "Filteraktionen protokollieren"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid "Log filter actions to the specified log file."
 msgstr "Filteraktionen in der angegebenen Protokolldatei protokollieren."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid "Logfile to log filter actions"
 msgstr "Protokolldatei für Filteraktionen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 msgid ""
 "If not set, or being “stdout”, then the logging is done to stdout, instead to a "
 "file."
@@ -2008,11 +2042,11 @@ msgstr ""
 "Falls nicht gesetzt oder auf »stdout«, erfolgt die Protokollierung in die "
 "Standardausgabe anstelle einer Datei."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 msgid "Flush Outbox after filtering"
 msgstr "Nachrichtenausgang nach dem Filtern leeren"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid ""
 "Whether to flush Outbox after filtering is done. Outbox flush will happen only "
 "when there was used any “Forward to” filter action and approximately one minute "
@@ -2022,15 +2056,15 @@ msgstr ""
 "geschieht nur, wenn ein »Weiterleiten an«-Filtervorgang angewendet wurde, etwa "
 "eine Minute nach der letzten Aktion."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 msgid "Default forward style"
 msgstr "Vorgabe-Weiterleitungsstil"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 msgid "Default reply style"
 msgstr "Standard-Antwortstil"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 msgid ""
 "Forward and reply attribution language tag, like en_US. Empty string means to use "
 "the same language as the user interface."
@@ -2039,59 +2073,59 @@ msgstr ""
 "Zeichenkette bedeutet, dass die gleiche Sprache wie für die Benutzeroberfläche "
 "verwendet wird."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
 msgstr ""
 "Legt fest, ob eine Bestätigung eingeholt werden soll, falls eine Nachricht durch "
 "Tastenkürzel (Strg+Eingabe) verschickt wird"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 msgid ""
 "Prompt the user when he or she tries to send a message with a key accelerator."
 msgstr ""
 "Legt fest, ob eine Bestätigung eingeholt werden soll, falls ein Benutzer versucht, "
 "eine Nachricht durch Tastenkürzel zu verschicken."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "Prompt on empty subject"
 msgstr "Bei leerem Betreff nachfragen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Rückfragen, falls ein Benutzer versucht, eine Nachricht ohne Betreff zu "
 "verschicken."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "Prompt when emptying the trash"
 msgstr "Beim Leeren des Papierkorbs nachfragen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "Rückfragen, falls ein Benutzer versucht, einen Ordner zu säubern."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid "Prompt when user expunges"
 msgstr "Beim Säubern nachfragen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Rückfragen, falls ein Benutzer versucht, einen Ordner zu säubern."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid "Prompt when user calls Empty Junk"
 msgstr "Beim Leeren des Unerwünscht-Ordners nachfragen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 msgid "Prompt the user when he or she tries to Empty a Junk folder."
 msgstr ""
 "Rückfragen, falls ein Benutzer versucht, einen Unerwünscht-Ordner zu säubern."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr "Nachfragen, wenn Empfänger nicht als E-Mail-Adresse angegeben wurden"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send a "
 "message to recipients not entered as mail addresses"
@@ -2099,32 +2133,32 @@ msgstr ""
 "Legt fest, ob der Benutzer wiederholt gewarnt werden soll, dass er eine Nachricht "
 "an Empfänger versendet, deren Adresse nicht als E-Mail-Adresse angegeben wurde"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid "Prompt when user only fills Bcc"
 msgstr "Rückfragen, falls der Benutzer nur das Blindkopie-Feld ausfüllt"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Beim Verschicken von Nachrichten ohne An- und Blindkopie-Feld nachfragen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 "Rückfragen, falls der Benutzer versucht, nicht erwünschtes HTML zu verschicken"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr ""
 "Beim Verschicken von HTML-Nachrichten an Kontakte, die keine wollen, nachfragen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Vor gleichzeitigem Öffnen von 10 oder mehr Nachrichten einen Hinweis anzeigen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if they "
 "really want to do it."
@@ -2132,19 +2166,19 @@ msgstr ""
 "Wenn ein Benutzer versucht, 10 oder mehr Nachrichten auf einmal zu öffnen, wird er "
 "gefragt, ob er es wirklich tun will."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid "Prompt while marking multiple messages"
 msgstr "Anzeigen wenn mehrere Nachrichten markiert werden"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 msgid "Enable or disable the prompt whilst marking multiple messages."
-msgstr "Die Anzeige beim Markieren mehrerer Nachrichten ein-/ausschalten"
+msgstr "Die Anzeige beim Markieren mehrerer Nachrichten ein-/ausschalten."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "Prompt when deleting messages in search folder"
 msgstr "Nachfrage beim Löschen von Nachrichten in Suchordner"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from a "
 "search folder permanently deletes the message, not simply removing it from the "
@@ -2154,13 +2188,13 @@ msgstr ""
 "in einem Suchordner die Nachricht wirklich löscht und nicht nur aus den "
 "Suchergebnissen entfernt."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
 msgstr ""
 "Anfragen, ob ein Ordner durch Ziehen und Ablegen in den Ordnerbaum kopiert werden "
 "soll"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid ""
 "Possible values are: “never” — do not allow copy with drag &amp; drop of folders "
 "in folder tree, “always” — allow copy with drag &amp; drop of folders in folder "
@@ -2171,13 +2205,13 @@ msgstr ""
 "Ziehen-und-Ablegen von Ordnern in den Ordnerbaum zu erlauben und »ask« (bzw. jeder "
 "andere Wert) führt dazu, dass der Benutzer stets gefragt wird."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
 msgstr ""
 "Anfragen, ob ein Ordner durch Ziehen und Ablegen in den Ordnerbaum verschoben "
 "werden soll"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 msgid ""
 "Possible values are: “never” — do not allow move with drag &amp; drop of folders "
 "in folder tree, “always” — allow move with drag &amp; drop of folders in folder "
@@ -2188,11 +2222,11 @@ msgstr ""
 "Verschieben per Ziehen-und-Ablegen von Ordnern in den Ordnerbaum zu erlauben und "
 "»ask« (bzw. jeder andere Wert) führt dazu, dass der Benutzer stets gefragt wird."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 msgid "Prompt when replying privately to list messages"
 msgstr "Bei privater Antwort auf Listennachrichten nachfragen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a private "
 "reply to a message which arrived via a mailing list."
@@ -2200,12 +2234,12 @@ msgstr ""
 "Legt fest, ob der Benutzer wiederholt gewarnt werden soll, dass er eine private "
 "Antwort auf eine Nachricht versendet, die über eine Mailingliste eingegangen ist."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 msgid "Prompt when mailing list hijacks private replies"
 msgstr ""
 "Nachfragen, wenn Mailinglisten versuchen private Antworten an die Liste umzuleiten"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending a "
 "private reply to a message which arrived via a mailing list, but the list sets a "
@@ -2214,13 +2248,13 @@ msgstr ""
 "Dadurch werden die wiederholten Warnhinweise aktiviert oder deaktiviert, welche "
 "erscheinen, wenn Sie auf eine über eine Mailingliste erhaltene Nachricht an den "
 "privaten Absender antworten wollen, aber die »Antwort an«-Kopfzeile die Antwort "
-"normalerweise an die Mailingliste leiten würde."
+"normalerweise an die Mailingliste leiten würde"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 msgid "Prompt when replying to many recipients"
 msgstr "Beim Antworten an viele Empfänger nachfragen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a reply to "
 "many people."
@@ -2228,14 +2262,14 @@ msgstr ""
 "Legt fest, ob der Benutzer wiederholt gewarnt werden soll, dass er eine Antwort an "
 "viele Personen versendet."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 msgid ""
 "Prompt when switching composer format and the content needs to lose its formatting"
 msgstr ""
 "Nachfragen, wenn der Verfassungsmodus umgeschaltet wird und der Inhalt dabei seine "
 "Formatierung verliert"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
 msgid ""
 "It disables/enables the repeated prompts to warn that you are switching composer "
 "format and the content needs to lose its formatting."
@@ -2244,11 +2278,11 @@ msgstr ""
 "Verfassungsmodus umgeschaltet wird und der Inhalt dabei seine Formatierung "
 "verliert."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
 msgid "Prompt when sending to many To and CC recipients"
 msgstr "Beim Antworten an sehr viele Kopie- und Blindkopie-Empfänger nachfragen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
 msgid ""
 "Enable or disable the prompt when sending to many To and CC recipients. The "
 "“composer-many-to-cc-recips-num” defines the threshold."
@@ -2256,7 +2290,7 @@ msgstr ""
 "Nachfrage ein- oder ausschalten, wenn zu viele Kopien und Blindkopien eingetragen "
 "sind. »composer-many-to-cc-recips-num« legt den Schwellwert fest."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
 msgid ""
 "Policy for automatically closing the message browser window when forwarding or "
 "replying to the displayed message."
@@ -2264,40 +2298,40 @@ msgstr ""
 "Richtlinie zum automatischen Schließen des Nachrichtenfensters beim Weiterleiten "
 "oder Antworten auf die dargestellte Nachricht."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
 msgid "Empty Trash folders on exit"
 msgstr "Papierkorb-Ordner beim Beenden leeren"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Alle Papierkorb-Ordner beim Beenden von Evolution leeren."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Minimale Anzahl der Tage zwischen dem Leeren des Papierkorbs beim Beenden"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Minimale Anzahl der Tage zwischen dem Leeren des Papierkorbs beim Beenden."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 msgid "Last time Empty Trash was run"
 msgstr "Letzte Papierkorbleerung"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
 msgid "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Die Zeit seit der letzten Papierkorbleerung in Tagen seit dem 01.01.1970."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr ""
 "Anzahl der Sekunden, die eine Fehlermeldung in der Statusleiste angezeigt wird."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
 msgid "Level beyond which the message should be logged."
 msgstr "Protokolltyp, ab welchem die Nachricht protokolliert werden soll."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
 msgid ""
 "This can have three possible values. “0” for errors. “1” for warnings. “2” for "
 "debug messages."
@@ -2305,11 +2339,11 @@ msgstr ""
 "Hier sind drei verschiedene Werte möglich: »0« für Fehler, »1« für Warnungen, »2« "
 "für Diagnosemeldungen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
 msgid "Show original “Date” header value."
 msgstr "Den originalen Wert der Kopfzeile »Datum« anzeigen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
 msgid ""
 "Show the original “Date” header (with a local time only if the time zone differs). "
 "Otherwise always show “Date” header value in a user preferred format and local "
@@ -2319,11 +2353,11 @@ msgstr ""
 "sich die Zeitzonen unterscheiden. Anderenfalls wird der Wert der Kopfzeile »Datum« "
 "in einem benutzerdefinierten Format und der lokalen Zeitzone dargestellt."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
 msgid "List of Labels and their associated colors"
 msgstr "Liste mit Beschriftungen und damit assoziierter Farben"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains strings "
 "containing name:color where color uses the HTML hex encoding."
@@ -2332,46 +2366,46 @@ msgstr ""
 "enthält Zeichenketten der Form Name:Farbe, wobei die Farbe als HTML-Hextriplet "
 "anzugeben ist."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
 msgid "Check incoming mail being junk"
 msgstr "Eingehende E-Mails daraufhin überprüfen, ob sie unerwünscht sind"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
 msgid "Run junk test on incoming mail."
 msgstr "Unerwünscht-Test auf eingehende E-Mails anwenden."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
 msgid "Empty Junk folders on exit"
 msgstr "Unerwünscht-Ordner beim Beenden leeren"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Alle Unerwünscht-Ordner beim Beenden von Evolution leeren."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
 msgid "Minimum days between emptying the junk on exit"
 msgstr ""
 "Minimale Anzahl der Tage zwischen dem Leeren des Unerwünscht-Ordners beim Beenden"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr ""
 "Minimale Anzahl der Tage zwischen dem Leeren des Unerwünscht-Ordners beim Beenden."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
 msgid "Last time Empty Junk was run"
 msgstr "Letzte Leerung des Unerwünscht-Ordners"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
 msgid "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "Die Zeit seit der letzten Unerwünscht-Ordner-Leerung in Tagen seit dem 01.01.1970."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
 msgid "The default plugin for Junk hook"
 msgstr "Vorgabe-Erweiterung für die Unerwünscht-Erkennung"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins enabled. "
 "If the default listed plugin is disabled, then it won’t fall back to the other "
@@ -2382,12 +2416,12 @@ msgstr ""
 "aufgelistete Erweiterung deaktiviert ist, wird nicht auf eine der anderen "
 "Erweiterungen zurückgegriffen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
 msgid "Determines whether to lookup in address book for sender email"
 msgstr ""
 "Legt fest, ob im Adressbuch nach der E-Mail-Adresse des Absenders gesucht wird"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn’t be a spam. It looks up in the books marked for autocompletion. It can be "
@@ -2399,7 +2433,7 @@ msgstr ""
 "Funktion kann langsam sein, falls entfernte Adressbücher (wie LDAP) für die Auto-"
 "Vervollständigung aktiviert sind."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address book "
 "only"
@@ -2407,7 +2441,7 @@ msgstr ""
 "Legt fest, ob nur in lokalen Adressbüchern nach der E-Mail-Adresse des Absenders "
 "für das Filtern unerwünschter Nachrichten gesucht wird"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
 msgid ""
 "This option is related to the key lookup_addressbook and is used to determine "
 "whether to look up addresses in local address book only to exclude mail sent by "
@@ -2417,13 +2451,13 @@ msgstr ""
 "Adressen im lokalen Adressbuch gesucht werden um sicherzustellen, dass E-Mails von "
 "Bekannten nicht als unerwünscht markiert werden."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Legt fest, ob benutzerdefinierte Kopfzeilen für die Unerwünscht-Prüfung benutzt "
 "werden sollen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option is "
 "enabled and the headers are mentioned, it will be improve the junk checking speed."
@@ -2432,13 +2466,13 @@ msgstr ""
 "benutzt werden sollen. Wenn diese Option aktiviert ist und eine angegebene "
 "Kopfzeile auftritt, so wird hierdurch die Prüfung auf Unerwünschtheit beschleunigt."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
 msgid "Custom headers to use while checking for junk."
 msgstr ""
 "Benutzerdefinierte Kopfzeilen, die für die Prüfung auf Unerwünschtheit genutzt "
 "werden."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:242
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string in the "
 "format “headername=value”."
@@ -2446,31 +2480,31 @@ msgstr ""
 "Benutzerdefinierte Kopfzeilen, die für die Prüfung auf Unerwünschtheit genutzt "
 "werden. Die Listenelemente sind Zeichenketten im Format »Kopfzeilenname=Wert«."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:243
 msgid "UID string of the default account."
 msgstr "UID-Zeichenkette für das Vorgabekonto."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:242
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:244
 msgid "Save directory"
 msgstr "Ordner speichern"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:243
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:245
 msgid "Directory for saving mail component files."
 msgstr "Ordner zum Speichern der E-Mailkomponenten-Dateien."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:244
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:246
 msgid "Composer load/attach directory"
 msgstr "Vorgabeordner für Anlagen im Nachrichteneditor"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:245
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:247
 msgid "Directory for loading/attaching files to composer."
 msgstr "Vorgabeordner für Anlagen im Nachrichteneditor."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:246
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:248
 msgid "Check for new messages on start"
 msgstr "Beim Start nach neuen Nachrichten suchen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:247
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:249
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes also "
 "sending messages from Outbox."
@@ -2478,11 +2512,11 @@ msgstr ""
 "Legt fest, ob nach neuen E-Mails geschaut werden soll, sobald Evolution gestartet "
 "wurde. Dies schließt das Versenden von E-Mails aus dem Nachrichtenausgang mit ein."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:248
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:250
 msgid "Check for new messages in all active accounts"
 msgstr "Nach neuen Nachrichten in allen aktiven Konten schauen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:249
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:251
 msgid ""
 "Whether to check for new messages in all active accounts regardless of the account "
 "“Check for new messages every X minutes” option when Evolution is started. This "
@@ -2493,11 +2527,11 @@ msgstr ""
 "neuen E-Mails sehen alle X Minuten«. Diese Option wird nur in Verbindung mit der "
 "Option »send_recv_on_start« verwendet."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:250
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:252
 msgid "Server synchronization interval"
 msgstr "Intervall für Datenabgleich mit Servern"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:251
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:253
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -2505,11 +2539,11 @@ msgstr ""
 "Legt fest, wie oft lokale Änderungen mit dem entfernen Mail-Server abgeglichen "
 "werden. Das Intervall muss mindestens 30 Sekunden betragen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:252
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:254
 msgid "Allow expunge in virtual folders"
 msgstr "Löschen in virtuellen Ordnern erlauben"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:253
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:255
 msgid ""
 "Enables Expunge in virtual folders, which means that the Folder→Expunge will be "
 "callable in virtual folders, while the expunge itself will be done in all folders "
@@ -2521,12 +2555,12 @@ msgstr ""
 "virtuellen Ordner vertretenen Ordnern mit allen darin enthaltenen Nachrichten "
 "angewendet wird."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:254
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:256
 #: ../src/mail/mail-config.ui.h:9
 msgid "Inherit theme colors in HTML format"
 msgstr "Themen-Farben im HTML-Format übernehmen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:255
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:257
 msgid ""
 "When enabled the theme colors for background, text and links are sent in resulting "
 "HTML formatted message."
@@ -2534,11 +2568,11 @@ msgstr ""
 "Wenn die Themenfarben für den Hintergrund eingeschaltet sind, so werden Text und "
 "Verweise in einer resultierenden HTML-formatierten Nachricht verschickt."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:256
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:258
 msgid "An Archive folder for On This Computer folders."
 msgstr "Ein Archiv-Ordner für »Auf diesem Rechner«-Ordner."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:257
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:259
 msgid ""
 "An Archive folder to use for Messages|Archive... feature when in an On This "
 "Computer folder."
@@ -2546,77 +2580,77 @@ msgstr ""
 "Ein Archiv-Ordner zur Benutzung für Nachrichten -&gt; Archivieren unter »Auf "
 "diesem Rechner«-Ordnern."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:258
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:260
 msgid "Whether the To Do bar is visible in the main window"
 msgstr "Anzeige der To-Do-Leiste im Hauptfenster"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:259
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:261
 msgid "Stores whether the To Do bar is visible in the main window."
 msgstr "Legt fest, ob die To-Do-Leiste im Hauptfenster sichtbar sein soll."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:260
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:262
 msgid "Width of the To Do bar in the main window"
 msgstr "Breite der To-Do-Leiste im Hauptfenster"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:261
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:263
 msgid "Holds the width of the To Do bar for the main window."
 msgstr "Legt die Breite der To-Do-Leiste im Hauptfenster fest."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:262
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:264
 msgid "Whether the To Do bar is visible in a sub-window"
 msgstr "Anzeige der To-Do-Leiste in einem Unterfenster"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:263
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:265
 msgid "Stores whether the To Do bar is visible in a sub-window."
 msgstr "Legt fest, ob die To-Do-Leiste in einem Unterfenster sichtbar sein soll."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:264
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:266
 msgid "Width of the To Do bar in a sub-window"
 msgstr "Breite der To-Do-Leiste für ein Unterfenster"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:265
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:267
 msgid "Holds the width of the To Do bar for a sub-window."
 msgstr "Legt die Breite der To-Do-Leiste für ein Unterfenster fest."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:266
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:268
 msgid "Whether the To Do bar should show also completed tasks"
 msgstr "Anzeige bereits abgeschlossener Aufgaben in der To-Do-Leiste"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:267
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:269
 msgid "Stores whether the To Do bar should show also completed tasks."
 msgstr ""
 "Legt fest, ob in der To-Do-Leiste auch bereits abgeschlossene Aufgaben angezeigt "
 "werden sollen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:268
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:270
 msgid "Whether the To Do bar should show also tasks without Due date"
 msgstr ""
 "Legt fest, ob Aufgaben ohne Fälligkeitsdatum in der To-Do-Leiste angezeigt werden "
 "sollen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:269
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:271
 msgid "Stores whether the To Do bar should show also tasks without Due date."
 msgstr ""
 "Legt fest, ob in der To-Do-Leiste auch Aufgaben ohne Fälligkeitsdatum angezeigt "
 "werden sollen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:270
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:272
 msgid "Show start up wizard"
 msgstr "Den Startassistenten anzeigen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:271
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:273
 msgid "Whether show start up wizard when there is no mail account configured."
 msgstr ""
 "Legt fest, ob der Startassistent angezeigt werden soll, wenn kein E-\n"
 "ail-Konto eingerichtet ist."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:272
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:274
 msgid "Whether go to the previous message after message deletion"
 msgstr ""
 "Legt fest, ob nach dem Löschen der Nachricht die vorherige Nachricht angezeigt "
 "werden soll"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:273
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:275
 msgid ""
 "If set to true, goes to the previous message when the selected is deleted; or to "
 "the next message, when it’s set to false."
@@ -2625,11 +2659,11 @@ msgstr ""
 "Nachricht angezeigt werden soll. Wenn nicht aktiviert, wird die nächste Nachricht "
 "angezeigt."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:274
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:276
 msgid "Show Subject above Sender in Messages column"
 msgstr "Betreff in der Nachrichtenspalte oberhalb des Absenders anzeigen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:275
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:277
 msgid ""
 "Whether to show Subject above Sender (From/To) in the Messages column, usually "
 "shown in the Vertical/Wide view of the message list"
@@ -2638,30 +2672,30 @@ msgstr ""
 "angezeigt werden soll. Dies geschieht üblicherweise in der vertikalen bzw. breiten "
 "Ansicht der Nachrichtenliste"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:276
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:278
 msgid "Visually wrap long lines in composer"
 msgstr "Lange Zeilen im Nachrichteneditor umbrechen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:277
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:279
 #: ../src/composer/e-composer-actions.c:556
 msgid "Whether to visually wrap long lines of text to avoid horizontal scrolling"
 msgstr ""
 "Legt fest, ob lange Zeilen umgebrochen werden sollen, um den horizontalen Bildlauf "
 "zu vermeiden"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:278
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:280
 msgid "Alternative reply style"
 msgstr "Alternativer Antwortstil"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:279
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:281
 msgid "Format message in HTML"
 msgstr "Nachrichten als HTML formatieren"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:280
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:282
 msgid "Put the cursor at the bottom of alternative replies"
 msgstr "Bei alternativen Antworten die Eingabemarke ans Ende setzen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:281
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:283
 msgid ""
 "This determines whether the cursor is placed at the top of the message or the "
 "bottom when using Alternative Reply."
@@ -2669,11 +2703,11 @@ msgstr ""
 "Legt fest, ob die Eingabemarke bei alternativen Antworten am Anfang oder am Ende "
 "der Nachricht platziert wird."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:282
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:284
 msgid "Put the signature at the top of the message"
 msgstr "Die Signaturen an den Anfang der Nachricht stellen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:283
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:285
 msgid ""
 "This determines whether the signature is placed at the top of the message or the "
 "bottom when using Alternative Reply."
@@ -2681,27 +2715,27 @@ msgstr ""
 "Legt fest, ob die Signatur beim alternativen Antworten an den Anfang oder das Ende "
 "der Nachricht platziert wird."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:284
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:286
 msgid "Apply chosen template when using Alternative Reply"
 msgstr "Gewählte Vorlage anwenden, wenn eine alternative Antwort verwendet wird"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:285
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:287
 msgid "Last chosen template’s folder URI for Alternative Reply"
 msgstr "Adresse des zuletzt verwendeten Vorlagenordners für alternative Antworten"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:286
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:288
 msgid "Last chosen template’s message UID for Alternative Reply"
 msgstr "Nachrichten-UID der zuletzt verwendeten Vorlage für alternative Antworten"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:287
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:289
 msgid ""
 "Whether preserve original message subject when applying template for Alternative "
 "Reply"
 msgstr ""
 "Legt fest, ob der ursprüngliche Nachrichtenbetreff beibehalten werden soll, wenn "
-"eine Vorlage für alternative Antworten angewendet wird."
+"eine Vorlage für alternative Antworten angewendet wird"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:288
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:290
 msgid ""
 "Whether set “body” in mailto: URI as Preformatted paragraph style. If set to "
 "“false”, then Normal paragraph style will be used."
@@ -2709,7 +2743,7 @@ msgstr ""
 "Legt fest, ob »body« in »mailto:«-Adressen im vorformatierten Absatzstil gesetzt "
 "wird. Wenn deaktiviert, wird der herkömmliche Absatzstil verwendet."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:289
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:291
 msgid ""
 "Close the message browser window when the selected message is deleted or marked as "
 "Junk."
@@ -2717,21 +2751,21 @@ msgstr ""
 "Das Nachrichtenlistenfenster schließen, wenn die gewählte Nachricht gelöscht oder "
 "als unerwünscht markiert wird."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:290
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:292
 msgid ""
 "Collapse archive folders in Move/Copy message to Folder and Go to Folder selectors."
 msgstr ""
 "Archivordner beim Verschieben oder Kopieren von Nachrichten in den Ordner- und "
-"Gehe-zu-Ordner-Auswahlen einklappen "
+"Gehe-zu-Ordner-Auswahlen einklappen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:291
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:293
 msgid ""
 "Where to lookup recipient S/MIME certificates or PGP keys when encrypting messages."
 msgstr ""
 "Legt fest, wo beim Verschlüsseln von Nachrichten nach S/MIME-Zertifikaten des "
 "Empfängers gesucht werden soll."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:292
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:294
 msgid ""
 "The “off” value completely disables certificate lookup; the “autocompleted” value "
 "provides certificates only for auto-completed contacts; the “books” value uses "
@@ -2743,13 +2777,13 @@ msgstr ""
 "verwendet Zertifikate aus automatisch vervollständigten Kontakten und sucht in den "
 "Adressbüchern, die für die automatische Vervollständigung markiert sind."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:293
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:295
 msgid "Whether Send/Receive should also download of messages for offline."
 msgstr ""
 "Legt fest, ob bei »Verschicken/Abrufen« auch Nachrichten für Offline-Benutzung "
 "heruntergeladen werden sollen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:294
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:296
 msgid ""
 "If enabled, whenever Send/Receive is run it also runs synchronization of messages "
 "for offline use. The option is disabled by default."
@@ -2758,12 +2792,12 @@ msgstr ""
 "Nachrichten für die Offline-Benutzung. Diese Einstellung ist standardmäßig "
 "deaktiviert."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:295
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:297
 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:296
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:298
 msgid ""
 "If enabled, the message/delivery-status and message/disposition-notification parts "
 "are shown automatically inline."
@@ -2771,11 +2805,11 @@ 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:297
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:299
 msgid "Whether unset colors provided in HTML mails."
-msgstr "Sollen Farben in HTML-Nachrichten entfernt werden?"
+msgstr "Legt fest, ob Farben in HTML-Nachrichten entfernt werden sollen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:298
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:300
 msgid ""
 "If enabled, unset colors in HTML messages, forcing use of desktop theme colors "
 "instead."
@@ -2783,11 +2817,11 @@ msgstr ""
 "Legt fest, ob Farben in HTML-Nachrichten entfernt werden. Es wird somit die "
 "Verwendung des Umgebungsthemas erzwungen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:299
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:301
 msgid "(Deprecated) Default forward style"
 msgstr "(Veraltet) Standard-Weiterleitungsstil"
 
-#: ../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 “forward-"
 "style-name” instead."
@@ -2795,11 +2829,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:301
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:303
 msgid "(Deprecated) Default reply style"
 msgstr "(Veraltet) Standard-Antwortmethode"
 
-#: ../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 “reply-"
 "style-name” instead."
@@ -2807,12 +2841,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:303
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:305
 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:304
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:306
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use “show-"
 "headers” instead."
@@ -2820,11 +2854,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:305
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:307
 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:306
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:308
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use “image-"
 "loading-policy” instead."
@@ -2832,15 +2866,15 @@ 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:307
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:309
 msgid ""
 "(Deprecated) Asks whether to close the message window when the user forwards or "
 "replies to the message shown in the window"
 msgstr ""
 "(Veraltet) Nachfragen, ob das Nachrichtenfenster geschlossen werden soll, wenn die "
-"Nachricht im Nachrichtenfenster weitergeleitet oder beantwortet wird."
+"Nachricht im Nachrichtenfenster weitergeleitet oder beantwortet wird"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:308
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:310
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use “browser-"
 "close-on-reply-policy” instead."
@@ -2903,7 +2937,7 @@ msgstr ""
 msgid "Set File under as “First Last”, instead of “Last, First”."
 msgstr ""
 "»Einsortieren als« festlegen als »Vorname Nachname« anstelle von »Nachname, "
-"Vorname«"
+"Vorname«."
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:9
 msgid "Pidgin address book source"
@@ -2913,7 +2947,7 @@ msgstr "Pidgin-Adressbuchquelle"
 msgid "Address book to use for storing automatically synced contacts from Pidgin."
 msgstr ""
 "Für die Speicherung von automatisch abgeglichenen Pidgin-Kontakten zu verwendendes "
-"Adressbuch"
+"Adressbuch."
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:11
 msgid "Pidgin check interval"
@@ -2921,7 +2955,7 @@ msgstr "Pidgin-Abgleichintervall"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:12
 msgid "Check interval for Pidgin syncing of contacts."
-msgstr "Überprüfungsintervall für den Abgleich von Pidgin-Kontakten"
+msgstr "Überprüfungsintervall für den Abgleich von Pidgin-Kontakten."
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:13
 msgid "Pidgin last sync MD5"
@@ -2991,7 +3025,7 @@ msgstr "Löschen wurde ausgeführt"
 
 #: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:2
 msgid "Whether to delete processed iTip objects"
-msgstr "Sollen verarbeitete iTip-Objekte gelöscht werden?"
+msgstr "Legt fest, ob verarbeitete iTip-Objekte gelöscht werden sollen"
 
 #: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:3
 msgid "Preserve existing reminder by default"
@@ -3118,11 +3152,11 @@ msgstr ""
 "den besten Teil zur Anzeige auswählen, »prefer_plain« stellt den Textteil dar "
 "(falls vorhanden), »prefer_source« verwendet den Textteil (oder zeigt den HTML-"
 "Quellcode an, wenn kein Textteil vorhanden ist), und »only_plain« zwingt Evolution "
-"zur ausschließlichen Anzeige des Textteils."
+"zur ausschließlichen Anzeige des Textteils"
 
 #: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:3
 msgid "Whether to show suppressed HTML output"
-msgstr "Soll die HTML-Ausgabe unterdrückt werden?"
+msgstr "Legt fest, ob die HTML-Ausgabe unterdrückt werden soll"
 
 #: ../data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in.h:1
 msgid "List of Destinations for publishing"
@@ -3137,6 +3171,21 @@ msgstr ""
 "werden sollen. Jeder Wert ist eine XML-Sequenz, die für die Veröffentlichung in "
 "einem Ziel konfiguriert ist."
 
+#: ../data/org.gnome.evolution.plugin.sender-validator.gschema.xml.in.h:1
+msgid "[]"
+msgstr "[]"
+
+#: ../data/org.gnome.evolution.plugin.sender-validator.gschema.xml.in.h:2
+msgid "List of assignments for recipient and the address to be used with it"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.sender-validator.gschema.xml.in.h:3
+msgid ""
+"The list is of format 'recipient&lt;tab&gt;sender', where the recipient can be "
+"part of the address only and the sender is a full email address, which should "
+"match the From address precisely."
+msgstr ""
+
 #: ../data/org.gnome.evolution.plugin.templates.gschema.xml.in.h:1
 msgid ""
 "List of keyword/value pairs for the Templates plugin to substitute in a message "
@@ -3151,7 +3200,9 @@ msgstr "Entwicklungs-Warndialog nicht anzeigen"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:2
 msgid "Whether the warning dialog in development versions of Evolution is skipped."
-msgstr "Soll der Warndialog in Evolution-Entwicklerversionen nicht angezeigt werden?"
+msgstr ""
+"Legt fest, ob der Warndialog in Evolution-Entwicklerversionen nicht angezeigt "
+"werden soll."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:3
 msgid "Initial attachment view"
@@ -3161,7 +3212,7 @@ msgstr "Erstmalige Anlagenansicht"
 msgid "Initial view for attachment bar widgets. “0” is Icon View, “1” is List View."
 msgstr ""
 "Initiale Ansicht der Widgets in der Anlagenleiste. »0« bedeutet Symbolansicht, »1« "
-"Listenansicht"
+"Listenansicht."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:5
 msgid "Initial file chooser folder"
@@ -3197,7 +3248,8 @@ msgstr "Im Offline-Modus starten"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:12
 msgid "Whether Evolution will start up in offline mode instead of online mode."
-msgstr "Soll Evolution im Offline- statt im Online-Modus gestartet werden?"
+msgstr ""
+"Legt fest, ob Evolution im Offline- statt im Online-Modus gestartet werden soll."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:13
 msgid "Offline folder paths"
@@ -3235,7 +3287,7 @@ msgstr "Fensterknöpfe sind sichtbar"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
 msgid "Whether the window buttons should be visible."
-msgstr "Sollen die Fensterknöpfe angezeigt werden?"
+msgstr "Legt fest, ob die Fensterknöpfe angezeigt werden sollen."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
 msgid "Window button style"
@@ -3257,7 +3309,7 @@ msgstr "Menüleiste anzeigen"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
 msgid "Whether the menubar should be visible."
-msgstr "Soll die Menüleiste angezeigt werden?"
+msgstr "Legt fest, ob die Menüleiste angezeigt werden soll."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
 msgid "Toolbar is visible"
@@ -3265,7 +3317,7 @@ msgstr "Werkzeugleiste anzeigen"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:26
 msgid "Whether the toolbar should be visible."
-msgstr "Soll die Werkzeugleiste angezeigt werden?"
+msgstr "Legt fest, ob die Werkzeugleiste angezeigt werden soll."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:27
 msgid "Sidebar is visible"
@@ -3273,7 +3325,7 @@ msgstr "Seitenleiste anzeigen"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:28
 msgid "Whether the sidebar should be visible."
-msgstr "Soll die Seitenleiste angezeigt werden?"
+msgstr "Legt fest, ob die Seitenleiste angezeigt werden soll."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:29
 msgid "Statusbar is visible"
@@ -3281,7 +3333,7 @@ msgstr "Statusleiste ist sichtbar"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:30
 msgid "Whether the status bar should be visible."
-msgstr "Soll die Statusleiste angezeigt werden?"
+msgstr "Legt fest, ob die Statusleiste angezeigt werden soll."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:31
 msgid "ID or alias of the component to be shown by default at start-up."
@@ -3352,6 +3404,17 @@ msgstr ""
 "Einstellung legt die absolut kleinste Größe fest. Werte ungleich Null können "
 "möglicherweise das Seiten-Layout ruinieren. Negative Werte werden als Null gezählt."
 
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:42
+msgid "Set of additional illegal characters in the filename"
+msgstr "Menge der zusätzlichen illegalen Zeichen im Dateinamen"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:43
+msgid ""
+"When generating file names from custom strings some non-printable or reserved "
+"characters are replaced with an underscore. Here's a set of additional characters "
+"to be replaced."
+msgstr ""
+
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:1
 msgid "Use only local spam tests."
 msgstr "Ausschließlich lokale Spam-Tests verwenden."
@@ -3388,7 +3451,7 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.text-highlight.gschema.xml.in.h:1
 msgid "Whether the text-highlight module is enabled"
-msgstr "Soll das Texthervorhebungsmodul aktiviert werden?"
+msgstr "Legt fest, ob das Texthervorhebungsmodul aktiviert werden soll"
 
 #: ../data/org.gnome.evolution.text-highlight.gschema.xml.in.h:2
 msgid "Theme name to use, defaults to “bclear”"
@@ -3469,26 +3532,26 @@ msgstr "Kontakte"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:9
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1009
-#: ../src/e-util/e-collection-account-wizard.c:858 ../src/e-util/e-send-options.c:544
+#: ../src/e-util/e-collection-account-wizard.c:855 ../src/e-util/e-send-options.c:544
 #: ../src/e-util/e-webdav-browser.c:529
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:199
-#: ../src/modules/calendar/e-cal-shell-view.c:599
+#: ../src/modules/calendar/e-cal-shell-view.c:609
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:22
 msgid "Calendar"
 msgstr "Kalender"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:10 ../src/e-util/e-send-options.c:536
 #: ../src/mail/importers/elm-importer.c:330
-#: ../src/mail/importers/kmail-importer.c:251
+#: ../src/mail/importers/kmail-importer.c:249
 #: ../src/mail/importers/pine-importer.c:423
-#: ../src/modules/mail/e-mail-shell-view.c:1617
-#: ../src/smime/gui/certificate-manager.c:1666
+#: ../src/modules/mail/e-mail-shell-view.c:1608
+#: ../src/smime/gui/certificate-manager.c:1661
 msgid "Mail"
 msgstr "E-Mail"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:11
-#: ../src/calendar/gui/e-memo-table.c:457 ../src/e-util/e-webdav-browser.c:519
-#: ../src/modules/calendar/e-cal-shell-content.c:1773
+#: ../src/calendar/gui/e-memo-table.c:446 ../src/e-util/e-webdav-browser.c:519
+#: ../src/modules/calendar/e-cal-shell-content.c:1879
 #: ../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
@@ -3496,12 +3559,12 @@ msgid "Memos"
 msgstr "Notizen"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:12
-#: ../src/calendar/gui/e-task-table.c:624 ../src/calendar/gui/print.c:2442
+#: ../src/calendar/gui/e-task-table.c:618 ../src/calendar/gui/print.c:2442
 #: ../src/calendar/importers/icalendar-importer.c:77
 #: ../src/calendar/importers/icalendar-importer.c:1148
 #: ../src/e-util/e-webdav-browser.c:520
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:72
-#: ../src/modules/calendar/e-cal-shell-content.c:1733
+#: ../src/modules/calendar/e-cal-shell-content.c:1839
 #: ../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:530
@@ -3521,37 +3584,37 @@ msgstr "Allgemein"
 #: ../data/ui/evolution-shortcuts.ui.h:3
 msgctxt "shortcut window"
 msgid "Select Mail component"
-msgstr "E-Mail-Komponente auswählen."
+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."
+msgstr "Kontakte-Komponente auswählen"
 
 #: ../data/ui/evolution-shortcuts.ui.h:5
 msgctxt "shortcut window"
 msgid "Select Calendar component"
-msgstr "Kalender-Komponente auswählen."
+msgstr "Kalender-Komponente auswählen"
 
 #: ../data/ui/evolution-shortcuts.ui.h:6
 msgctxt "shortcut window"
 msgid "Select Tasks component"
-msgstr "Aufgaben-Komponente auswählen."
+msgstr "Aufgaben-Komponente auswählen"
 
 #: ../data/ui/evolution-shortcuts.ui.h:7
 msgctxt "shortcut window"
 msgid "Select Memos component"
-msgstr "Notizen-Komponente auswählen."
+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."
+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."
+msgstr "Zwischen Teilfenstern wechseln"
 
 #: ../data/ui/evolution-shortcuts.ui.h:10
 msgctxt "shortcut window"
@@ -3566,12 +3629,12 @@ 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."
+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."
+msgstr "E-Mails oder Kontakte in einen Ordner kopieren"
 
 #: ../data/ui/evolution-shortcuts.ui.h:14
 msgctxt "shortcut window"
@@ -3973,17 +4036,18 @@ msgstr ""
 #: ../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:757
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1517
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1491
 #: ../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: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:1359 ../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/e-util/e-mail-signature-manager.c:324
+#: ../src/e-util/e-name-selector-dialog.c:1026 ../src/e-util/filter.ui.h:25
+#: ../src/mail/e-mail-account-manager.c:721 ../src/mail/e-mail-label-manager.c:355
+#: ../src/mail/em-folder-properties.c:1359 ../src/mail/em-vfolder-editor-rule.c:405
+#: ../src/mail/em-vfolder-editor-rule.c:634 ../src/mail/mail-config.ui.h:63
+#: ../src/modules/mail/em-composer-prefs.c:420
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:544
-#: ../src/plugins/email-custom-header/email-custom-header.c:839
+#: ../src/plugins/email-custom-header/email-custom-header.c:826
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:33
+#: ../src/plugins/sender-validation/sender-validation.c:498
 #: ../src/plugins/templates/templates.c:464
 msgid "_Add"
 msgstr "_Hinzufügen"
@@ -4021,7 +4085,7 @@ msgstr ""
 "dennoch hinzugefügt werden?"
 
 #: ../src/addressbook/addressbook.error.xml.h:39
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1242
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1220
 msgid "Failed to delete contact"
 msgstr "Kontakt konnte nicht gelöscht werden"
 
@@ -4142,7 +4206,7 @@ msgstr "Kontakteditor"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:13
 #: ../src/calendar/gui/e-comp-editor-page-reminders.c:2379
-#: ../src/mail/mail-config.ui.h:40
+#: ../src/em-format/e-mail-formatter-attachment.c:277 ../src/mail/mail-config.ui.h:40
 msgid "Options"
 msgstr "Optionen"
 
@@ -4153,39 +4217,39 @@ msgstr "Optionen"
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3504
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4336
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4342
-#: ../src/addressbook/gui/contact-editor/e-contact-editor-fullname.c:220
+#: ../src/addressbook/gui/contact-editor/e-contact-editor-fullname.c:212
 #: ../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:516
 #: ../src/addressbook/gui/widgets/eab-contact-merging.c:752
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:316
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1322
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1300
 #: ../src/calendar/gui/e-cal-dialogs.c:690
 #: ../src/calendar/gui/e-comp-editor-page-recurrence.c:304
 #: ../src/composer/e-composer-actions.c:242 ../src/e-util/e-activity-bar.c:370
-#: ../src/e-util/e-attachment-dialog.c:309 ../src/e-util/e-attachment-store.c:658
+#: ../src/e-util/e-attachment-dialog.c:289 ../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: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:240
-#: ../src/e-util/e-collection-account-wizard.c:1890
-#: ../src/e-util/e-collection-account-wizard.c:2137
+#: ../src/e-util/e-collection-account-wizard.c:1887
+#: ../src/e-util/e-collection-account-wizard.c:2134
 #: ../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:342
 #: ../src/e-util/e-html-editor-actions.c:386
 #: ../src/e-util/e-html-editor-actions.c:489
 #: ../src/e-util/e-image-chooser-dialog.c:179
-#: ../src/e-util/e-mail-signature-script-dialog.c:366 ../src/e-util/e-passwords.c:468
-#: ../src/e-util/e-rule-context.c:816 ../src/e-util/e-rule-editor.c:187
-#: ../src/e-util/e-rule-editor.c:298 ../src/e-util/e-rule-editor.c:933
-#: ../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:325 ../src/e-util/e-table-config.c:548
+#: ../src/e-util/e-mail-signature-script-dialog.c:358 ../src/e-util/e-passwords.c:468
+#: ../src/e-util/e-rule-context.c:816 ../src/e-util/e-rule-editor.c:184
+#: ../src/e-util/e-rule-editor.c:295 ../src/e-util/e-rule-editor.c:930
+#: ../src/e-util/e-send-options.ui.h:16 ../src/e-util/e-source-config-dialog.c:356
+#: ../src/e-util/e-source-selector-dialog.c:325 ../src/e-util/e-table-config.c:540
 #: ../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:3933
-#: ../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/e-util/evolution-source-viewer.c:829 ../src/e-util/e-web-view.c:3930
+#: ../src/e-util/gal-view-instance-save-as-dialog.c:265
+#: ../src/mail/e-mail-config-window.c:310 ../src/mail/e-mail-label-dialog.c:186
 #: ../src/mail/e-mail-tag-editor.c:160 ../src/mail/em-composer-utils.c:4023
 #: ../src/mail/em-folder-selector.c:333 ../src/mail/mail-config.ui.h:2
 #: ../src/mail/mail.error.xml.h:16 ../src/mail/mail-send-recv.c:874
@@ -4193,19 +4257,19 @@ msgstr "Optionen"
 #: ../src/mail/mail-vfolder-ui.c:271
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:277
 #: ../src/modules/backup-restore/evolution-backup-tool.c:989
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:409
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:406
 #: ../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
-#: ../src/plugins/publish-calendar/url-editor-dialog.c:419
-#: ../src/plugins/save-calendar/save-calendar.c:186
+#: ../src/plugins/publish-calendar/publish-calendar.c:788
+#: ../src/plugins/publish-calendar/url-editor-dialog.c:417
+#: ../src/plugins/save-calendar/save-calendar.c:184
 #: ../src/shell/e-shell-content.c:641 ../src/shell/e-shell-content.c:748
 #: ../src/shell/e-shell-utils.c:69 ../src/shell/e-shell-utils.c:133
-#: ../src/smime/gui/certificate-manager.c:651
-#: ../src/smime/gui/certificate-manager.c:723
-#: ../src/smime/gui/certificate-manager.c:951
-#: ../src/smime/gui/certificate-manager.c:1332 ../src/smime/gui/e-cert-selector.c:235
+#: ../src/smime/gui/certificate-manager.c:650
+#: ../src/smime/gui/certificate-manager.c:718
+#: ../src/smime/gui/certificate-manager.c:946
+#: ../src/smime/gui/certificate-manager.c:1327 ../src/smime/gui/e-cert-selector.c:235
 #: ../src/smime/gui/smime-ui.ui.h:17
 msgid "_Cancel"
 msgstr "A_bbrechen"
@@ -4214,28 +4278,28 @@ msgstr "A_bbrechen"
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3504
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
 #: ../src/addressbook/gui/widgets/eab-contact-merging.c:755
-#: ../src/calendar/calendar.error.xml.h:47 ../src/calendar/gui/e-comp-editor.c:2212
+#: ../src/calendar/calendar.error.xml.h:47 ../src/calendar/gui/e-comp-editor.c:2224
 #: ../src/composer/e-composer-actions.c:242 ../src/composer/e-composer-actions.c:354
 #: ../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:2561 ../src/e-util/e-web-view.c:3933
-#: ../src/e-util/gal-view-instance-save-as-dialog.c:268
+#: ../src/e-util/e-mail-signature-script-dialog.c:362
+#: ../src/e-util/e-webdav-browser.c:2561 ../src/e-util/e-web-view.c:3930
+#: ../src/e-util/gal-view-instance-save-as-dialog.c:266
 #: ../src/shell/e-shell-content.c:642 ../src/shell/e-shell-utils.c:133
-#: ../src/smime/gui/certificate-manager.c:651
-#: ../src/smime/gui/certificate-manager.c:724
+#: ../src/smime/gui/certificate-manager.c:650
+#: ../src/smime/gui/certificate-manager.c:719
 msgid "_Save"
 msgstr "_Speichern"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:16
-#: ../src/calendar/gui/e-comp-editor.c:2109 ../src/calendar/gui/e-comp-editor.c:2181
-#: ../src/e-util/e-preferences-window.c:390 ../src/e-util/e-send-options.ui.h:15
+#: ../src/calendar/gui/e-comp-editor.c:2121 ../src/calendar/gui/e-comp-editor.c:2193
+#: ../src/e-util/e-preferences-window.c:387 ../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-window-actions.c:1066
 msgid "_Help"
 msgstr "_Hilfe"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:17
-#: ../src/e-util/e-misc-utils.c:3574
+#: ../src/e-util/e-misc-utils.c:3571
 msgid "Image"
 msgstr "Grafik"
 
@@ -4294,7 +4358,7 @@ msgstr "_Homepage:"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:30
 #: ../src/calendar/gui/e-comp-editor-event.c:871
-#: ../src/modules/itip-formatter/itip-view.c:1983
+#: ../src/modules/itip-formatter/itip-view.c:1978
 msgid "_Calendar:"
 msgstr "_Kalender:"
 
@@ -4384,14 +4448,14 @@ msgstr "_Jahrestag:"
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:52
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1055
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:47
-#: ../src/calendar/gui/e-calendar-view.c:2141
+#: ../src/calendar/gui/e-calendar-view.c:2195
 msgid "Anniversary"
 msgstr "Jahrestag"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:53
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1054
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:46
-#: ../src/calendar/gui/e-calendar-view.c:2140
+#: ../src/calendar/gui/e-calendar-view.c:2194
 msgid "Birthday"
 msgstr "Geburtstag"
 
@@ -4449,7 +4513,7 @@ msgstr "Geschäftlich"
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:84
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:526
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1089
-#: ../src/calendar/gui/e-cal-model.c:3792
+#: ../src/calendar/gui/e-cal-model.c:3793
 msgid "Other"
 msgstr "Weitere"
 
@@ -4473,18 +4537,19 @@ 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:1533
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1507
 #: ../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:1033 ../src/e-util/filter.error.xml.h:18
+#: ../src/e-util/e-mail-signature-manager.c:364
+#: ../src/e-util/e-name-selector-dialog.c:1030 ../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:1365 ../src/mail/em-vfolder-editor-rule.c:642
+#: ../src/mail/e-mail-label-manager.c:373 ../src/mail/em-filter-rule.c:678
+#: ../src/mail/em-folder-properties.c:1365 ../src/mail/em-vfolder-editor-rule.c:639
 #: ../src/mail/mail-config.ui.h:64
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:554
-#: ../src/plugins/email-custom-header/email-custom-header.c:849
-#: ../src/plugins/publish-calendar/publish-calendar.c:790
+#: ../src/plugins/email-custom-header/email-custom-header.c:836
+#: ../src/plugins/publish-calendar/publish-calendar.c:789
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:35
+#: ../src/plugins/sender-validation/sender-validation.c:508
 #: ../src/plugins/templates/templates.c:474
 msgid "_Remove"
 msgstr "_Entfernen"
@@ -4503,25 +4568,25 @@ msgid "Certificates"
 msgstr "Zertifikate"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:261
-#: ../src/calendar/gui/e-comp-editor.c:2144
+#: ../src/calendar/gui/e-comp-editor.c:2156
 #: ../src/e-util/e-html-editor-actions.c:1107
 msgid "_Undo"
 msgstr "_Rückgängig"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:263
-#: ../src/calendar/gui/e-comp-editor.c:2146 ../src/e-util/e-focus-tracker.c:147
+#: ../src/calendar/gui/e-comp-editor.c:2158 ../src/e-util/e-focus-tracker.c:147
 #: ../src/e-util/e-focus-tracker.c:150
 msgid "Undo"
 msgstr "Rückgängig"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:268
-#: ../src/calendar/gui/e-comp-editor.c:2151
+#: ../src/calendar/gui/e-comp-editor.c:2163
 #: ../src/e-util/e-html-editor-actions.c:1093
 msgid "_Redo"
 msgstr "_Wiederholen"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:270
-#: ../src/calendar/gui/e-comp-editor.c:2153 ../src/e-util/e-focus-tracker.c:163
+#: ../src/calendar/gui/e-comp-editor.c:2165 ../src/e-util/e-focus-tracker.c:163
 #: ../src/e-util/e-focus-tracker.c:166
 msgid "Redo"
 msgstr "Wiederherstellen"
@@ -4556,8 +4621,8 @@ msgstr "PGP-Schlüssel"
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3252
 #: ../src/e-util/e-html-editor-actions.c:395
 #: ../src/e-util/e-image-chooser-dialog.c:193
-#: ../src/smime/gui/certificate-manager.c:672
-#: ../src/smime/gui/certificate-manager.c:961
+#: ../src/smime/gui/certificate-manager.c:671
+#: ../src/smime/gui/certificate-manager.c:956
 msgid "All files"
 msgstr "Alle Dateien"
 
@@ -4577,7 +4642,7 @@ msgstr "X.509-Zertifikat öffnen"
 #: ../src/e-util/e-html-editor-actions.c:386
 #: ../src/e-util/e-html-editor-actions.c:489
 #: ../src/e-util/e-image-chooser-dialog.c:182 ../src/plugins/face/face.c:298
-#: ../src/shell/e-shell-utils.c:69 ../src/smime/gui/certificate-manager.c:951
+#: ../src/shell/e-shell-utils.c:69 ../src/smime/gui/certificate-manager.c:946
 msgid "_Open"
 msgstr "Ö_ffnen"
 
@@ -4656,28 +4721,28 @@ msgstr "%s»%s« ist leer"
 msgid "Invalid contact."
 msgstr "Kontakt ungültig."
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor-fullname.c:221
+#: ../src/addressbook/gui/contact-editor/e-contact-editor-fullname.c:213
 #: ../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:305
-#: ../src/e-util/e-attachment-dialog.c:311 ../src/e-util/e-categories-dialog.c:81
+#: ../src/e-util/e-attachment-dialog.c:291 ../src/e-util/e-categories-dialog.c:81
 #: ../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:240 ../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
-#: ../src/e-util/e-source-selector-dialog.c:326 ../src/e-util/e-table-config.c:549
+#: ../src/e-util/e-rule-context.c:817 ../src/e-util/e-rule-editor.c:185
+#: ../src/e-util/e-rule-editor.c:296 ../src/e-util/e-rule-editor.c:931
+#: ../src/e-util/e-send-options.ui.h:17 ../src/e-util/e-source-config-dialog.c:357
+#: ../src/e-util/e-source-selector-dialog.c:326 ../src/e-util/e-table-config.c:541
 #: ../src/e-util/e-table-config.ui.h:4 ../src/e-util/e-timezone-dialog.ui.h:3
-#: ../src/mail/e-mail-config-window.c:335 ../src/mail/e-mail-tag-editor.c:162
+#: ../src/mail/e-mail-config-window.c:311 ../src/mail/e-mail-tag-editor.c:162
 #: ../src/mail/em-folder-selector.c:44 ../src/mail/mail-config.ui.h:3
 #: ../src/mail/mail-vfolder-ui.c:150 ../src/mail/mail-vfolder-ui.c:272
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:278
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
-#: ../src/plugins/publish-calendar/url-editor-dialog.c:420
+#: ../src/plugins/publish-calendar/url-editor-dialog.c:418
 #: ../src/shell/e-shell-content.c:643 ../src/shell/e-shell-content.c:749
-#: ../src/shell/main.c:177 ../src/smime/gui/certificate-manager.c:1333
+#: ../src/shell/main.c:177 ../src/smime/gui/certificate-manager.c:1328
 #: ../src/smime/gui/e-cert-selector.c:236 ../src/smime/gui/smime-ui.ui.h:18
 msgid "_OK"
 msgstr "_OK"
@@ -4835,19 +4900,19 @@ msgstr "_Unten"
 msgid "Contact List Members"
 msgstr "Kontaktlistenmitglieder"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1506
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1499
 msgid "_Members"
 msgstr "_Mitglieder"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1646
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1639
 msgid "Error adding list"
 msgstr "Fehler beim Hinzufügen einer Liste"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1666
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1659
 msgid "Error modifying list"
 msgstr "Fehler beim Ändern einer Liste"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1686
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1679
 msgid "Error removing list"
 msgstr "Fehler beim Entfernen einer Liste"
 
@@ -4896,13 +4961,13 @@ msgstr "Neue Nachricht _schicken an …"
 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-misc-utils.c:4546
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:317
+#: ../src/e-util/e-misc-utils.c:4536
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klicken Sie hier, um eine E-Mail an %s zu verfassen"
 
-#: ../src/addressbook/gui/widgets/eab-contact-display.c:335
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:331
 #, c-format
 msgid "Click to open map for %s"
 msgstr "Klicken Sie hier, um die Karte für %s zu öffnen"
@@ -5235,7 +5300,7 @@ msgstr[1] "%d Kontakte"
 msgid "Error getting book view"
 msgstr "Fehler beim Abrufen der Buchansicht"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-model.c:817
+#: ../src/addressbook/gui/widgets/e-addressbook-model.c:814
 msgid "Search Interrupted"
 msgstr "Suche wurde unterbrochen"
 
@@ -5243,56 +5308,56 @@ msgstr "Suche wurde unterbrochen"
 msgid "Error modifying card"
 msgstr "Fehler beim Ändern einer Karte"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:679
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:657
 msgid "Cut selected contacts to the clipboard"
 msgstr "Ausgewählte Kontakte in die Zwischenablage ausschneiden"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:685
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:663
 msgid "Copy selected contacts to the clipboard"
 msgstr "Ausgewählte Kontakte in die Zwischenablage kopieren"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:691
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:669
 msgid "Paste contacts from the clipboard"
 msgstr "Kontakte aus der Zwischenablage einfügen"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:697
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:675
 #: ../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:703
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:681
 msgid "Select all visible contacts"
 msgstr "Alle sichtbaren Kontakte auswählen"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1290
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1268
 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:1294
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1272
 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:1298
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1276
 #, 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:1304
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1282
 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:1308
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1286
 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:1312
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1290
 #, 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:1323
-#: ../src/calendar/gui/e-comp-editor.c:2102 ../src/e-util/e-accounts-window.c:1753
-#: ../src/e-util/e-focus-tracker.c:816 ../src/e-util/evolution-source-viewer.c:806
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1301
+#: ../src/calendar/gui/e-comp-editor.c:2114 ../src/e-util/e-accounts-window.c:1753
+#: ../src/e-util/e-focus-tracker.c:816 ../src/e-util/evolution-source-viewer.c:800
 #: ../src/e-util/e-webdav-browser.c:2785 ../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:1499
@@ -5300,12 +5365,12 @@ msgstr "Sind Sie sicher, dass Sie diesen Kontakt löschen wollen (%s)?"
 #: ../src/modules/calendar/e-task-shell-view-actions.c:851
 #: ../src/modules/mail/e-mail-shell-view-actions.c:1622
 #: ../src/shell/e-shell-window-actions.c:917
-#: ../src/smime/gui/certificate-manager.c:1656 ../src/smime/gui/smime-ui.ui.h:8
+#: ../src/smime/gui/certificate-manager.c:1651 ../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:1471
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1449
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -5322,11 +5387,11 @@ msgstr[1] ""
 "geöffnet werden.\n"
 "Wollen Sie wirklich alle Kontakte anzeigen?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1479
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1457
 msgid "_Don’t Display"
 msgstr "_Nicht anzeigen"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1480
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1458
 msgid "Display _All Contacts"
 msgstr "_Alle Kontakte anzeigen"
 
@@ -5442,7 +5507,7 @@ msgid "Title"
 msgstr "Anrede"
 
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../src/calendar/gui/e-meeting-list-view.c:663
+#: ../src/calendar/gui/e-meeting-list-view.c:660
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "Position"
@@ -6467,7 +6532,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:1988
+#: ../src/e-util/e-collection-account-wizard.c:1985
 #: ../src/e-util/e-table-config.ui.h:20
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Description"
@@ -6494,20 +6559,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: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
+#: ../src/calendar/gui/caltypes.xml.in.h:9 ../src/calendar/gui/e-cal-list-view.c:293
+#: ../src/calendar/gui/e-cal-model.c:293 ../src/calendar/gui/e-cal-model.c:301
+#: ../src/calendar/gui/e-task-table.c:438 ../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:264
-#: ../src/calendar/gui/e-cal-model.c:306 ../src/calendar/gui/e-task-table.c:446
+#: ../src/calendar/gui/caltypes.xml.in.h:10 ../src/calendar/gui/e-cal-list-view.c:294
+#: ../src/calendar/gui/e-cal-model.c:303 ../src/calendar/gui/e-task-table.c:439
 #: ../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:265
-#: ../src/calendar/gui/e-cal-model.c:308 ../src/calendar/gui/e-task-table.c:447
+#: ../src/calendar/gui/caltypes.xml.in.h:11 ../src/calendar/gui/e-cal-list-view.c:295
+#: ../src/calendar/gui/e-cal-model.c:305 ../src/calendar/gui/e-task-table.c:440
 #: ../src/calendar/gui/memotypes.xml.in.h:12
 #: ../src/e-util/e-html-editor-page-dialog.c:116 ../src/e-util/e-send-options.ui.h:7
 msgid "Confidential"
@@ -6519,7 +6584,7 @@ msgid "Organizer"
 msgstr "Organisator"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:13
-#: ../src/calendar/gui/e-meeting-list-view.c:623
+#: ../src/calendar/gui/e-meeting-list-view.c:620
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:2
 #: ../src/calendar/gui/tasktypes.xml.in.h:6
 msgid "Attendee"
@@ -6528,7 +6593,7 @@ msgstr "Teilnehmer"
 #: ../src/calendar/gui/caltypes.xml.in.h:14
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:5
 #: ../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.c:860
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:23
 #: ../src/plugins/save-calendar/csv-format.c:376
 msgid "Location"
@@ -6536,7 +6601,7 @@ msgstr "Ort"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:15 ../src/calendar/gui/memotypes.xml.in.h:13
 #: ../src/calendar/gui/tasktypes.xml.in.h:23
-#: ../src/e-util/e-categories-selector.c:328
+#: ../src/e-util/e-categories-selector.c:324
 msgid "Category"
 msgstr "Kategorie"
 
@@ -6562,7 +6627,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:2107
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2104
 msgid "Recurrence"
 msgstr "Wiederholung"
 
@@ -6599,7 +6664,7 @@ msgid "Description Contains"
 msgstr "Beschreibung enthält"
 
 #: ../src/calendar/gui/comp-util.c:1552
-#: ../src/modules/itip-formatter/itip-view.c:2329
+#: ../src/modules/itip-formatter/itip-view.c:2312
 #, c-format
 msgid "with one guest"
 msgid_plural "with %d guests"
@@ -6661,52 +6726,52 @@ msgctxt "iCalendarStatus"
 msgid "Cancelled"
 msgstr "Abgebrochen"
 
-#: ../src/calendar/gui/ea-cal-view.c:281
+#: ../src/calendar/gui/ea-cal-view.c:277
 msgid "New Appointment"
 msgstr "Neuer Termin"
 
-#: ../src/calendar/gui/ea-cal-view.c:282
+#: ../src/calendar/gui/ea-cal-view.c:278
 msgid "New All Day Event"
 msgstr "Neuer ganztägiger Termin"
 
-#: ../src/calendar/gui/ea-cal-view.c:283
+#: ../src/calendar/gui/ea-cal-view.c:279
 msgid "New Meeting"
 msgstr "Neue Besprechung"
 
-#: ../src/calendar/gui/ea-cal-view.c:284
+#: ../src/calendar/gui/ea-cal-view.c:280
 msgid "Go to Today"
 msgstr "Zum heutigen Tag"
 
-#: ../src/calendar/gui/ea-cal-view.c:285
+#: ../src/calendar/gui/ea-cal-view.c:281
 msgid "Go to Date"
 msgstr "Gehe zu Datum"
 
-#: ../src/calendar/gui/ea-cal-view-event.c:232
+#: ../src/calendar/gui/ea-cal-view-event.c:229
 msgid "It has reminders."
 msgstr "Es enthält Erinnerungen."
 
-#: ../src/calendar/gui/ea-cal-view-event.c:235
+#: ../src/calendar/gui/ea-cal-view-event.c:232
 msgid "It has recurrences."
 msgstr "Es enthält Wiederholungen."
 
-#: ../src/calendar/gui/ea-cal-view-event.c:238
+#: ../src/calendar/gui/ea-cal-view-event.c:235
 msgid "It is a meeting."
 msgstr "Es ist eine Besprechung."
 
-#: ../src/calendar/gui/ea-cal-view-event.c:242
+#: ../src/calendar/gui/ea-cal-view-event.c:239
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Kalender-Termin: Die Zusammenfassung lautet %s."
 
-#: ../src/calendar/gui/ea-cal-view-event.c:246
+#: ../src/calendar/gui/ea-cal-view-event.c:243
 msgid "Calendar Event: It has no summary."
 msgstr "Kalender-Termin: Keine Zusammenfassung verfügbar."
 
-#: ../src/calendar/gui/ea-cal-view-event.c:269
+#: ../src/calendar/gui/ea-cal-view-event.c:266
 msgid "calendar view event"
 msgstr "Kalenderansicht Termin"
 
-#: ../src/calendar/gui/ea-cal-view-event.c:501
+#: ../src/calendar/gui/ea-cal-view-event.c:498
 msgid "Grab Focus"
 msgstr "Erhält Fokus"
 
@@ -6857,7 +6922,7 @@ msgstr "%s um %s"
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s for an unknown trigger type"
-msgstr "%s für einen unbekannten Auslösetyp."
+msgstr "%s für einen unbekannten Auslösetyp"
 
 #: ../src/calendar/gui/ea-week-view.c:112
 #, c-format
@@ -6888,8 +6953,8 @@ msgstr "Kategorien:"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:288
 #: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:246
-#: ../src/modules/itip-formatter/itip-view.c:1707
-#: ../src/modules/itip-formatter/itip-view.c:1819
+#: ../src/modules/itip-formatter/itip-view.c:1702
+#: ../src/modules/itip-formatter/itip-view.c:1814
 msgid "Location:"
 msgstr "Ort:"
 
@@ -6910,27 +6975,27 @@ msgid "Recurs:"
 msgstr "Wiederkehrend:"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:339
-#: ../src/modules/itip-formatter/itip-view.c:1711
-#: ../src/modules/itip-formatter/itip-view.c:1831
+#: ../src/modules/itip-formatter/itip-view.c:1706
+#: ../src/modules/itip-formatter/itip-view.c:1826
 msgid "Status:"
 msgstr "Status:"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:348
-#: ../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:336
+#: ../src/calendar/gui/e-task-table.c:464 ../src/calendar/gui/tasktypes.xml.in.h:19
+#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:338
 msgid "High"
 msgstr "Hoch"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:350
-#: ../src/calendar/gui/e-cal-model.c:1872 ../src/calendar/gui/e-task-table.c:472
+#: ../src/calendar/gui/e-cal-model.c:1873 ../src/calendar/gui/e-task-table.c:465
 #: ../src/calendar/gui/tasktypes.xml.in.h:20 ../src/e-util/e-send-options.ui.h:5
-#: ../src/mail/message-list.c:335
+#: ../src/mail/message-list.c:337
 msgid "Normal"
 msgstr "Normal"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:352
-#: ../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:334
+#: ../src/calendar/gui/e-task-table.c:466 ../src/calendar/gui/tasktypes.xml.in.h:21
+#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:336
 msgid "Low"
 msgstr "Niedrig"
 
@@ -6947,7 +7012,7 @@ msgid "Attendees:"
 msgstr "Teilnehmer:"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:454
-#: ../src/mail/e-mail-config-service-page.c:533
+#: ../src/mail/e-mail-config-service-page.c:522
 msgid "Description:"
 msgstr "Beschreibung:"
 
@@ -7105,97 +7170,50 @@ msgstr "Meine Erinnerungen zusammen mit diesem Termin verschicken"
 msgid "Notify new attendees _only"
 msgstr "_Nur neue Teilnehmer benachrichtigen"
 
-#: ../src/calendar/gui/e-calendar-view.c:479
+#: ../src/calendar/gui/e-calendar-view.c:472
 msgid "Cut selected events to the clipboard"
 msgstr "Die gewählten Termine in die Zwischenablage ausschneiden"
 
-#: ../src/calendar/gui/e-calendar-view.c:485
+#: ../src/calendar/gui/e-calendar-view.c:478
 msgid "Copy selected events to the clipboard"
 msgstr "Die gewählten Termine in die Zwischenablage kopieren"
 
-#: ../src/calendar/gui/e-calendar-view.c:491
+#: ../src/calendar/gui/e-calendar-view.c:484
 msgid "Paste events from the clipboard"
 msgstr "Die in der Zwischenablage befindlichen Termine einfügen"
 
-#: ../src/calendar/gui/e-calendar-view.c:497
+#: ../src/calendar/gui/e-calendar-view.c:490
 msgid "Delete selected events"
 msgstr "Die gewählten Termine löschen"
 
-#: ../src/calendar/gui/e-calendar-view.c:907
+#: ../src/calendar/gui/e-calendar-view.c:900
 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:918 ../src/calendar/gui/e-cal-ops.c:1582
+#: ../src/calendar/gui/e-calendar-view.c:911 ../src/calendar/gui/e-cal-ops.c:1582
 msgid "Default calendar not found"
 msgstr "Vorgegebener Benutzerkalender wurde nicht gefunden"
 
-#: ../src/calendar/gui/e-calendar-view.c:923 ../src/calendar/gui/e-cal-ops.c:1585
+#: ../src/calendar/gui/e-calendar-view.c:916 ../src/calendar/gui/e-cal-ops.c:1585
 msgid "Default memo list not found"
 msgstr "Vorgabenotizliste wurde nicht gefunden"
 
-#: ../src/calendar/gui/e-calendar-view.c:928 ../src/calendar/gui/e-cal-ops.c:1588
+#: ../src/calendar/gui/e-calendar-view.c:921 ../src/calendar/gui/e-cal-ops.c:1588
 msgid "Default task list not found"
 msgstr "Vorgabeaufgabenliste wurde nicht gefunden"
 
-#: ../src/calendar/gui/e-calendar-view.c:1020
+#: ../src/calendar/gui/e-calendar-view.c:1013
 msgid "No suitable component found"
 msgstr "Keine passende Komponente gefunden"
 
-#: ../src/calendar/gui/e-calendar-view.c:1090
+#: ../src/calendar/gui/e-calendar-view.c:1083
 msgid "Pasting iCalendar data"
 msgstr "iCalendar-Daten einfügen"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#. Translators: It will display
-#. * "Organizer: NameOfTheUser <email@ofuser.com>"
-#. To Translators: It will display
-#. * "Organizer: NameOfTheUser <email@ofuser.com>"
-#: ../src/calendar/gui/e-calendar-view.c:1892 ../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>"
-
-#. With SunOne accounts, there may be no ':' in organiser.value
-#. With SunOne accounts, there may be no ':' in
-#. * organizer.value.
-#: ../src/calendar/gui/e-calendar-view.c:1895 ../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:1914
-#: ../src/calendar/gui/e-meeting-time-sel.c:2580
-#: ../src/calendar/gui/e-task-table.c:758 ../src/calendar/gui/e-to-do-pane.c:377
-#: ../src/calendar/gui/print.c:3627
-#, 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:1973 ../src/calendar/gui/e-to-do-pane.c:480
-#, c-format
-msgid "Time: %s %s"
-msgstr "Zeit: %s %s"
-
-#. 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:2160
-#, c-format
-msgctxt "BirthdaySummary"
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: ../src/calendar/gui/e-calendar-view.c:2361
-#: ../src/calendar/gui/e-calendar-view.c:2364
-#: ../src/calendar/gui/e-calendar-view.c:2367
-#: ../src/calendar/gui/e-calendar-view.c:2368
+#: ../src/calendar/gui/e-calendar-view.c:1144
+#: ../src/calendar/gui/e-calendar-view.c:1147
+#: ../src/calendar/gui/e-calendar-view.c:1150
+#: ../src/calendar/gui/e-calendar-view.c:1151
 msgid "%d %b %Y"
 msgstr "%d. %B %Y"
 
@@ -7204,13 +7222,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:2363 ../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
+#: ../src/calendar/gui/e-calendar-view.c:1146 ../src/calendar/gui/e-day-view.c:3059
+#: ../src/calendar/gui/e-day-view-top-item.c:854
+#: ../src/calendar/gui/e-week-view-main-item.c:230
 msgid "%d %b"
 msgstr "%d. %b"
 
-#: ../src/calendar/gui/e-calendar-view.c:2374
+#: ../src/calendar/gui/e-calendar-view.c:1157
 msgid "%A %d %b %Y"
 msgstr "%A, %d. %B %Y"
 
@@ -7220,18 +7238,79 @@ 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:2376 ../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
+#: ../src/calendar/gui/e-calendar-view.c:1159 ../src/calendar/gui/e-day-view.c:3043
+#: ../src/calendar/gui/e-day-view-top-item.c:850
+#: ../src/calendar/gui/e-week-view-main-item.c:216
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
 
-#: ../src/calendar/gui/e-calendar-view.c:2377
-#: ../src/calendar/gui/e-calendar-view.c:2379
-#: ../src/calendar/gui/e-calendar-view.c:2380
+#: ../src/calendar/gui/e-calendar-view.c:1160
+#: ../src/calendar/gui/e-calendar-view.c:1162
+#: ../src/calendar/gui/e-calendar-view.c:1163
 msgid "%a %d %b %Y"
 msgstr "%a, %d. %Y"
 
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#. Translators: It will display
+#. * "Organizer: NameOfTheUser <email@ofuser.com>"
+#. To Translators: It will display
+#. * "Organizer: NameOfTheUser <email@ofuser.com>"
+#: ../src/calendar/gui/e-calendar-view.c:1946 ../src/calendar/gui/e-memo-table.c:561
+#: ../src/calendar/gui/e-task-table.c:730
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Organisator: %s <%s>"
+
+#. With SunOne accounts, there may be no ':' in organiser.value
+#. With SunOne accounts, there may be no ':' in
+#. * organizer.value.
+#: ../src/calendar/gui/e-calendar-view.c:1949 ../src/calendar/gui/e-memo-table.c:566
+#: ../src/calendar/gui/e-task-table.c:734
+#, 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:1968
+#: ../src/calendar/gui/e-meeting-time-sel.c:2580
+#: ../src/calendar/gui/e-task-table.c:752 ../src/calendar/gui/e-to-do-pane.c:377
+#: ../src/calendar/gui/print.c:3627
+#, 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:2027 ../src/calendar/gui/e-to-do-pane.c:480
+#, c-format
+msgid "Time: %s %s"
+msgstr "Zeit: %s %s"
+
+#. 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:2214
+#, c-format
+msgctxt "BirthdaySummary"
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#: ../src/calendar/gui/e-cal-list-view.c:116
+#, c-format
+msgid "%d appointment"
+msgid_plural "%d appointments"
+msgstr[0] "%d Termin"
+msgstr[1] "%d Termine"
+
+#: ../src/calendar/gui/e-cal-list-view.c:120
+#: ../src/modules/calendar/e-memo-shell-view-private.c:365
+#: ../src/modules/calendar/e-task-shell-view-private.c:574
+#, c-format
+msgid "%d selected"
+msgstr "%d gewählt"
+
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:1
 #: ../src/calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
@@ -7264,8 +7343,8 @@ msgstr "Quelle"
 #. 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:692
+#: ../src/calendar/gui/e-cal-model.c:3847
+#: ../src/calendar/gui/e-meeting-list-view.c:689
 #: ../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
@@ -7276,113 +7355,113 @@ msgid "Status"
 msgstr "Status"
 
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:11
-#: ../src/calendar/gui/e-meeting-list-view.c:649
+#: ../src/calendar/gui/e-meeting-list-view.c:646
 #: ../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:2029
+#: ../src/e-util/e-collection-account-wizard.c:2026
 #: ../src/e-util/e-webdav-browser.c:2475 ../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-cal-model.c:307
+#: ../src/calendar/gui/e-meeting-list-view.c:180
+#: ../src/calendar/gui/e-meeting-list-view.c:194
 #: ../src/calendar/gui/e-meeting-store.c:135
 #: ../src/calendar/gui/e-meeting-store.c:170
 #: ../src/calendar/gui/e-meeting-store.c:215 ../src/calendar/gui/print.c:1265
 #: ../src/calendar/gui/print.c:1282 ../src/e-util/e-charset.c:49
-#: ../src/modules/itip-formatter/itip-view.c:3495
-#: ../src/modules/itip-formatter/itip-view.c:6567
+#: ../src/modules/itip-formatter/itip-view.c:3477
+#: ../src/modules/itip-formatter/itip-view.c:6548
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:97
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../src/calendar/gui/e-cal-model.c:1369 ../src/calendar/gui/e-cal-ops.c:626
+#: ../src/calendar/gui/e-cal-model.c:1366 ../src/calendar/gui/e-cal-ops.c:626
 #: ../src/calendar/gui/e-cal-ops.c:1267
 #: ../src/modules/calendar/e-cal-base-shell-backend.c:391
 #, c-format
 msgid "Source with UID “%s” not found"
 msgstr "Quelle mit UID »%s« wurde nicht gefunden"
 
-#: ../src/calendar/gui/e-cal-model.c:1480 ../src/calendar/gui/e-cal-ops.c:191
+#: ../src/calendar/gui/e-cal-model.c:1477 ../src/calendar/gui/e-cal-ops.c:191
 #: ../src/calendar/gui/e-cal-ops.c:1384
 msgid "Creating an event"
 msgstr "Termin anlegen"
 
-#: ../src/calendar/gui/e-cal-model.c:1484 ../src/calendar/gui/e-cal-ops.c:195
+#: ../src/calendar/gui/e-cal-model.c:1481 ../src/calendar/gui/e-cal-ops.c:195
 #: ../src/calendar/gui/e-cal-ops.c:1388
 msgid "Creating a memo"
 msgstr "Notiz anlegen"
 
-#: ../src/calendar/gui/e-cal-model.c:1488 ../src/calendar/gui/e-cal-ops.c:199
+#: ../src/calendar/gui/e-cal-model.c:1485 ../src/calendar/gui/e-cal-ops.c:199
 #: ../src/calendar/gui/e-cal-ops.c:1392
 msgid "Creating a task"
 msgstr "Aufgabe anlegen"
 
-#: ../src/calendar/gui/e-cal-model.c:1874
+#: ../src/calendar/gui/e-cal-model.c:1875
 msgid "Recurring"
 msgstr "Wiederkehrend"
 
-#: ../src/calendar/gui/e-cal-model.c:1876
+#: ../src/calendar/gui/e-cal-model.c:1877
 msgid "Assigned"
 msgstr "Zugewiesen"
 
-#: ../src/calendar/gui/e-cal-model.c:1879
+#: ../src/calendar/gui/e-cal-model.c:1880
 #: ../src/calendar/gui/e-cal-model-tasks.c:1097
 msgid "Yes"
 msgstr "Ja"
 
-#: ../src/calendar/gui/e-cal-model.c:1879
+#: ../src/calendar/gui/e-cal-model.c:1880
 #: ../src/calendar/gui/e-cal-model-tasks.c:1097
 msgid "No"
 msgstr "Nein"
 
-#: ../src/calendar/gui/e-cal-model.c:3787
-#: ../src/calendar/gui/e-meeting-list-view.c:208
+#: ../src/calendar/gui/e-cal-model.c:3788
+#: ../src/calendar/gui/e-meeting-list-view.c:205
 #: ../src/calendar/gui/e-meeting-store.c:179
 #: ../src/calendar/gui/e-meeting-store.c:202
-#: ../src/modules/itip-formatter/itip-view.c:6555
+#: ../src/modules/itip-formatter/itip-view.c:6536
 msgid "Accepted"
 msgstr "Angenommen"
 
-#: ../src/calendar/gui/e-cal-model.c:3788
-#: ../src/calendar/gui/e-meeting-list-view.c:209
+#: ../src/calendar/gui/e-cal-model.c:3789
+#: ../src/calendar/gui/e-meeting-list-view.c:206
 #: ../src/calendar/gui/e-meeting-store.c:181
 #: ../src/calendar/gui/e-meeting-store.c:204
-#: ../src/modules/itip-formatter/itip-view.c:6561
+#: ../src/modules/itip-formatter/itip-view.c:6542
 msgid "Declined"
 msgstr "Abgelehnt"
 
-#: ../src/calendar/gui/e-cal-model.c:3789
-#: ../src/calendar/gui/e-meeting-list-view.c:210
+#: ../src/calendar/gui/e-cal-model.c:3790
+#: ../src/calendar/gui/e-meeting-list-view.c:207
 #: ../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:3790
-#: ../src/calendar/gui/e-meeting-list-view.c:211
+#: ../src/calendar/gui/e-cal-model.c:3791
+#: ../src/calendar/gui/e-meeting-list-view.c:208
 #: ../src/calendar/gui/e-meeting-store.c:185
 #: ../src/calendar/gui/e-meeting-store.c:208
-#: ../src/modules/itip-formatter/itip-view.c:6564
+#: ../src/modules/itip-formatter/itip-view.c:6545
 msgid "Delegated"
 msgstr "Delegiert"
 
-#: ../src/calendar/gui/e-cal-model.c:3791
+#: ../src/calendar/gui/e-cal-model.c:3792
 msgid "Needs action"
 msgstr "Erfordert Maßnahme"
 
 #: ../src/calendar/gui/e-cal-model-calendar.c:91
-#: ../src/calendar/gui/e-task-table.c:529
+#: ../src/calendar/gui/e-task-table.c:523
 msgid "Free"
 msgstr "Frei"
 
 #: ../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:530
+#: ../src/calendar/gui/e-task-table.c:524
 msgid "Busy"
 msgstr "Beschäftigt"
 
@@ -7619,10 +7698,10 @@ msgstr "Die Anfangszeit ist ungültig"
 #: ../src/calendar/gui/e-comp-editor-event.c:506
 #: ../src/calendar/gui/e-comp-editor-event.c:522
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:206
-#: ../src/calendar/gui/e-comp-editor.c:338 ../src/composer/e-composer-actions.c:180
-#: ../src/em-format/e-mail-part-secure-button.c:97 ../src/e-util/e-misc-utils.c:3992
-#: ../src/e-util/e-misc-utils.c:4004 ../src/e-util/e-misc-utils.c:4018
-#: ../src/mail/e-mail-autoconfig.c:1041 ../src/mail/e-mail-display.c:2457
+#: ../src/calendar/gui/e-comp-editor.c:340 ../src/composer/e-composer-actions.c:180
+#: ../src/em-format/e-mail-part-secure-button.c:97 ../src/e-util/e-misc-utils.c:3989
+#: ../src/e-util/e-misc-utils.c:4001 ../src/e-util/e-misc-utils.c:4015
+#: ../src/mail/e-mail-autoconfig.c:1041 ../src/mail/e-mail-display.c:2449
 #: ../src/mail/e-mail-notes.c:875 ../src/mail/e-mail-reader-utils.c:805
 #: ../src/mail/em-composer-utils.c:3816 ../src/mail/em-composer-utils.c:3847
 #: ../src/mail/mail-send-recv.c:598 ../src/mail/mail-send-recv.c:1493
@@ -7805,7 +7884,7 @@ msgstr "Notiz – %s"
 
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:123
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:128
-#: ../src/em-format/e-mail-formatter-attachment.c:334
+#: ../src/em-format/e-mail-formatter-attachment.c:336
 #: ../src/e-util/e-attachment-bar.c:101 ../src/e-util/e-attachment-bar.c:106
 #: ../src/e-util/e-attachment-paned.c:175 ../src/e-util/e-attachment-paned.c:180
 #: ../src/mail/message-list.etspec.h:4
@@ -7865,123 +7944,124 @@ msgid "Show attachments"
 msgstr "Anlagen anzeigen"
 
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:812
-#: ../src/e-util/e-attachment-bar.c:764 ../src/e-util/e-attachment-paned.c:725
+#: ../src/e-util/e-attachment-bar.c:716 ../src/e-util/e-attachment-paned.c:690
 msgid "Icon View"
 msgstr "Symbolansicht"
 
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:814
-#: ../src/e-util/e-attachment-bar.c:766 ../src/e-util/e-attachment-paned.c:727
+#: ../src/e-util/e-attachment-bar.c:718 ../src/e-util/e-attachment-paned.c:692
 msgid "List View"
 msgstr "Listenansicht"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:392
+#: ../src/calendar/gui/e-comp-editor-page-general.c:322
 #, 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:399
+#: ../src/calendar/gui/e-comp-editor-page-general.c:329
 #, 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:429
+#: ../src/calendar/gui/e-comp-editor-page-general.c:359
 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:543
+#: ../src/calendar/gui/e-comp-editor-page-general.c:473
 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:712
+#: ../src/calendar/gui/e-comp-editor-page-general.c:686
 msgid "A_ttendees"
 msgstr "_Teilnehmer"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:714
+#: ../src/calendar/gui/e-comp-editor-page-general.c:688
 msgid "Toggles whether the Attendees are displayed"
 msgstr "Feld für die Teilnehmer anzeigen/verbergen"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:723
+#: ../src/calendar/gui/e-comp-editor-page-general.c:697
 msgid "R_ole Field"
 msgstr "_Positions-Feld"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:725
+#: ../src/calendar/gui/e-comp-editor-page-general.c:699
 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:731
+#: ../src/calendar/gui/e-comp-editor-page-general.c:705
 msgid "_RSVP"
 msgstr "_UAwg"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:733
+#: ../src/calendar/gui/e-comp-editor-page-general.c:707
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "UAwg-Feld anzeigen/verbergen"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:739
+#: ../src/calendar/gui/e-comp-editor-page-general.c:713
 msgid "_Status Field"
 msgstr "_Statusfeld"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:741
+#: ../src/calendar/gui/e-comp-editor-page-general.c:715
 msgid "Toggles whether the Status field is displayed"
 msgstr "Statusfeld anzeigen/verbergen"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:747
+#: ../src/calendar/gui/e-comp-editor-page-general.c:721
 msgid "_Type Field"
 msgstr "A_rt-Feld"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:749
+#: ../src/calendar/gui/e-comp-editor-page-general.c:723
 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:1056
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1030
 msgid "An organizer is required."
 msgstr "Es ist ein Organisator erforderlich."
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1066
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1208
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1040
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1182
 msgid "At least one attendee is required."
 msgstr "Es ist mindestens ein Teilnehmer erforderlich."
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1332
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1306
 msgid "Or_ganizer:"
 msgstr "Or_ganisator:"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1427
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1401
 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:1429
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1403
 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:1431
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1405
 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:1442
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1416
 msgctxt "ECompEditor"
 msgid "Atte_ndees…"
 msgstr "Teil_nehmer …"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1525
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2327
-#: ../src/calendar/gui/e-comp-editor.c:2167 ../src/e-util/e-accounts-window.c:1745
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1499
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2324
+#: ../src/calendar/gui/e-comp-editor.c:2179 ../src/e-util/e-accounts-window.c:1745
 #: ../src/e-util/e-html-editor-actions.c:1116
-#: ../src/e-util/e-mail-signature-manager.c:358 ../src/e-util/e-webdav-browser.c:2778
+#: ../src/e-util/e-mail-signature-manager.c:354 ../src/e-util/e-webdav-browser.c:2778
 #: ../src/e-util/filter.ui.h:26 ../src/mail/e-mail-account-manager.c:730
-#: ../src/mail/e-mail-browser.c:217 ../src/mail/e-mail-label-manager.c:380
+#: ../src/mail/e-mail-browser.c:217 ../src/mail/e-mail-label-manager.c:364
 #: ../src/mail/em-folder-properties.c:1362 ../src/mail/mail-config.ui.h:68
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:549
-#: ../src/plugins/email-custom-header/email-custom-header.c:844
+#: ../src/plugins/email-custom-header/email-custom-header.c:831
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:34
+#: ../src/plugins/sender-validation/sender-validation.c:503
 #: ../src/plugins/templates/templates.c:469
 #: ../src/shell/e-shell-window-actions.c:1052 ../src/smime/gui/smime-ui.ui.h:11
 msgid "_Edit"
@@ -8142,121 +8222,121 @@ msgid "on the"
 msgstr "am"
 
 # oder im Falle von Terminen: Wiederholungen ??
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1093
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1090
 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:1562
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2119
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1559
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2116
 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:1567
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1564
 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:1572
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1569
 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:1577
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1574
 msgctxt "ECompEditorPageRecur"
 msgid "This component rec_urs"
 msgstr "Dieser Termin _wiederholt sich"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1948
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1945
 msgid "Recurrence exception date is invalid"
 msgstr "Das Datum für Wiederholungsausnahmen ist ungültig"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2004
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2001
 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:2047
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2044
 msgid "R_ecurrence"
 msgstr "_Wiederholung"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2049
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2046
 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:2151
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2148
 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:2186
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2183
 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:2188
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2185
 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:2190
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2187
 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:2192
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2189
 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:2221
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2218
 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:2223
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2220
 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:2225
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2222
 msgctxt "ECompEditorPageRecur"
 msgid "forever"
 msgstr "immer"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2241
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2238
 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:2254
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2251
 msgid "Exceptions"
 msgstr "Ausnahmen"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2319
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2316
 #: ../src/calendar/gui/e-comp-editor-page-reminders.c:2168
 #: ../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:2335
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2332
 #: ../src/calendar/gui/e-comp-editor-page-reminders.c:2176
 #: ../src/mail/mail-config.ui.h:69
 msgid "Re_move"
 msgstr "_Entfernen"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2343
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2340
 msgid "Preview"
 msgstr "Vorschau"
 
@@ -8453,117 +8533,115 @@ msgctxt "ECompEditor"
 msgid "_Summary:"
 msgstr "Zu_sammenfassung:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:341
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:387
 msgctxt "ECompEditor"
 msgid "_Location:"
 msgstr "O_rt:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:474
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:521
 msgctxt "ECompEditor"
 msgid "_Categories…"
 msgstr "_Kategorien …"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:577
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:624
 msgid "Edit as text"
 msgstr "Als Text bearbeiten"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:577
-#, fuzzy
-#| msgid "Edit as text"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:624
 msgid "View as text"
-msgstr "Als Text bearbeiten"
+msgstr "Als Text anzeigen"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:577
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:624
 msgid "View as HTML"
 msgstr "Als HTML anzeigen"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:664
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:711
 msgctxt "ECompEditor"
 msgid "_Description:"
 msgstr "_Beschreibung:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:999
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1046
 msgctxt "ECompEditor"
 msgid "_Web page:"
 msgstr "_Internetseite:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1370
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1417
 msgctxt "ECompEditor"
 msgid "D_ue date:"
 msgstr "_Fällig am:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1464
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1511
 msgctxt "ECompEditor"
 msgid "Date _completed:"
 msgstr "_Abgeschlossen am:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1480
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1527
 msgctxt "ECompEditor"
 msgid "Public"
 msgstr "Öffentlich"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1481
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1528
 msgctxt "ECompEditor"
 msgid "Private"
 msgstr "Privat"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1482
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1529
 msgctxt "ECompEditor"
 msgid "Confidential"
 msgstr "Vertraulich"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1498
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1545
 msgctxt "ECompEditor"
 msgid "C_lassification:"
 msgstr "E_instufung:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1561
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1608
 msgctxt "ECompEditor"
 msgid "_Status:"
 msgstr "_Status:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1591
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1638
 msgctxt "ECompEditor"
 msgid "Undefined"
 msgstr "Nicht festgelegt"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1592
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1639
 msgctxt "ECompEditor"
 msgid "High"
 msgstr "Hoch"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1593
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1640
 msgctxt "ECompEditor"
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1594
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1641
 msgctxt "ECompEditor"
 msgid "Low"
 msgstr "Niedrig"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1603
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1650
 msgctxt "ECompEditor"
 msgid "Priorit_y:"
 msgstr "_Priorität:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1657
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1704
 msgctxt "ECompEditor"
 msgid "Percent complete:"
 msgstr "Prozent abgeschlossen:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1738
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1785
 msgctxt "ECompEditor"
 msgid "Time _zone:"
 msgstr "Zeit_zone:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1834
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1881
 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:2255
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:2302
 msgctxt "ECompEditor"
 msgid "None"
 msgstr "Keine"
@@ -8628,106 +8706,106 @@ msgstr "Zugewiesene Aufgabe – %s"
 msgid "Task — %s"
 msgstr "Aufgabe – %s"
 
-#: ../src/calendar/gui/e-comp-editor.c:253
+#: ../src/calendar/gui/e-comp-editor.c:255
 #: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:133
 msgid "attachment"
 msgstr "Anlage"
 
-#: ../src/calendar/gui/e-comp-editor.c:610
+#: ../src/calendar/gui/e-comp-editor.c:612
 msgid "Sending notifications to attendees…"
 msgstr "Benachrichtigungen werden an die Teilnehmer verschickt …"
 
-#: ../src/calendar/gui/e-comp-editor.c:1013 ../src/e-util/e-webdav-browser.c:1888
+#: ../src/calendar/gui/e-comp-editor.c:1015 ../src/e-util/e-webdav-browser.c:1888
 msgid "Saving changes…"
 msgstr "Änderungen werden gespeichert …"
 
-#: ../src/calendar/gui/e-comp-editor.c:1273
+#: ../src/calendar/gui/e-comp-editor.c:1285
 msgid "No Summary"
 msgstr "Keine Zusammenfassung"
 
 #. == Button box ==
-#: ../src/calendar/gui/e-comp-editor.c:2081 ../src/composer/e-composer-actions.c:333
+#: ../src/calendar/gui/e-comp-editor.c:2093 ../src/composer/e-composer-actions.c:333
 #: ../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:319
 #: ../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:166
-#: ../src/mail/e-mail-folder-sort-order-dialog.c:758 ../src/mail/e-mail-notes.c:1015
+#: ../src/e-util/e-preferences-window.c:396
+#: ../src/e-util/e-table-field-chooser-dialog.c:197 ../src/mail/e-mail-browser.c:166
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:751 ../src/mail/e-mail-notes.c:1015
 #: ../src/mail/em-filter-editor.c:45 ../src/mail/em-folder-properties.c:1487
-#: ../src/mail/em-subscription-editor.c:1741
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:306
+#: ../src/mail/em-subscription-editor.c:1734
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:307
 #: ../src/shell/e-shell-window-actions.c:354
 #: ../src/shell/e-shell-window-actions.c:882
-#: ../src/smime/gui/certificate-manager.c:2196
+#: ../src/smime/gui/certificate-manager.c:2173
 msgid "_Close"
 msgstr "S_chließen"
 
-#: ../src/calendar/gui/e-comp-editor.c:2083
+#: ../src/calendar/gui/e-comp-editor.c:2095
 msgid "Close the current window"
 msgstr "Das aktuelle Fenster schließen"
 
 #. copy menu item
-#: ../src/calendar/gui/e-comp-editor.c:2088 ../src/e-util/e-focus-tracker.c:806
-#: ../src/e-util/e-html-editor-actions.c:1072 ../src/e-util/e-text.c:2080
+#: ../src/calendar/gui/e-comp-editor.c:2100 ../src/e-util/e-focus-tracker.c:806
+#: ../src/e-util/e-html-editor-actions.c:1072 ../src/e-util/e-text.c:2065
 #: ../src/e-util/e-web-view.c:468 ../src/mail/e-mail-browser.c:173
 #: ../src/mail/mail.error.xml.h:147 ../src/shell/e-shell-window-actions.c:903
 msgid "_Copy"
 msgstr "_Kopieren"
 
-#: ../src/calendar/gui/e-comp-editor.c:2090 ../src/e-util/e-focus-tracker.c:203
+#: ../src/calendar/gui/e-comp-editor.c:2102 ../src/e-util/e-focus-tracker.c:203
 #: ../src/e-util/e-focus-tracker.c:259 ../src/e-util/e-focus-tracker.c:312
 #: ../src/e-util/e-focus-tracker.c:807 ../src/e-util/e-web-view.c:470
-#: ../src/e-util/e-web-view.c:1995 ../src/mail/e-mail-browser.c:175
+#: ../src/e-util/e-web-view.c:1992 ../src/mail/e-mail-browser.c:175
 #: ../src/shell/e-shell-window-actions.c:905
 msgid "Copy the selection"
 msgstr "Die Auswahl kopieren"
 
 #. cut menu item
-#: ../src/calendar/gui/e-comp-editor.c:2095 ../src/e-util/e-focus-tracker.c:801
-#: ../src/e-util/e-html-editor-actions.c:1079 ../src/e-util/e-text.c:2066
+#: ../src/calendar/gui/e-comp-editor.c:2107 ../src/e-util/e-focus-tracker.c:801
+#: ../src/e-util/e-html-editor-actions.c:1079 ../src/e-util/e-text.c:2051
 #: ../src/mail/e-mail-browser.c:180 ../src/shell/e-shell-window-actions.c:910
 msgid "Cu_t"
 msgstr "_Ausschneiden"
 
-#: ../src/calendar/gui/e-comp-editor.c:2097 ../src/e-util/e-focus-tracker.c:196
+#: ../src/calendar/gui/e-comp-editor.c:2109 ../src/e-util/e-focus-tracker.c:196
 #: ../src/e-util/e-focus-tracker.c:252 ../src/e-util/e-focus-tracker.c:306
-#: ../src/e-util/e-focus-tracker.c:802 ../src/e-util/e-web-view.c:2004
+#: ../src/e-util/e-focus-tracker.c:802 ../src/e-util/e-web-view.c:2001
 #: ../src/mail/e-mail-browser.c:182 ../src/shell/e-shell-window-actions.c:912
 msgid "Cut the selection"
 msgstr "Die Auswahl ausschneiden"
 
-#: ../src/calendar/gui/e-comp-editor.c:2104 ../src/e-util/e-focus-tracker.c:217
+#: ../src/calendar/gui/e-comp-editor.c:2116 ../src/e-util/e-focus-tracker.c:217
 #: ../src/e-util/e-focus-tracker.c:273 ../src/e-util/e-focus-tracker.c:817
 #: ../src/shell/e-shell-window-actions.c:919
 msgid "Delete the selection"
 msgstr "Die Auswahl löschen"
 
-#: ../src/calendar/gui/e-comp-editor.c:2111
+#: ../src/calendar/gui/e-comp-editor.c:2123
 msgid "View help"
 msgstr "Hilfe anzeigen"
 
 #. paste menu item
-#: ../src/calendar/gui/e-comp-editor.c:2116 ../src/e-util/e-focus-tracker.c:811
-#: ../src/e-util/e-html-editor-actions.c:1086 ../src/e-util/e-text.c:2092
+#: ../src/calendar/gui/e-comp-editor.c:2128 ../src/e-util/e-focus-tracker.c:811
+#: ../src/e-util/e-html-editor-actions.c:1086 ../src/e-util/e-text.c:2077
 #: ../src/mail/e-mail-browser.c:187 ../src/shell/e-shell-window-actions.c:938
 msgid "_Paste"
 msgstr "_Einfügen"
 
-#: ../src/calendar/gui/e-comp-editor.c:2118 ../src/e-util/e-focus-tracker.c:210
+#: ../src/calendar/gui/e-comp-editor.c:2130 ../src/e-util/e-focus-tracker.c:210
 #: ../src/e-util/e-focus-tracker.c:266 ../src/e-util/e-focus-tracker.c:318
-#: ../src/e-util/e-focus-tracker.c:812 ../src/e-util/e-web-view.c:2013
+#: ../src/e-util/e-focus-tracker.c:812 ../src/e-util/e-web-view.c:2010
 #: ../src/mail/e-mail-browser.c:189 ../src/shell/e-shell-window-actions.c:940
 msgid "Paste the clipboard"
 msgstr "Den Inhalt der Zwischenablage einfügen"
 
-#: ../src/calendar/gui/e-comp-editor.c:2123 ../src/composer/e-composer-actions.c:387
+#: ../src/calendar/gui/e-comp-editor.c:2135 ../src/composer/e-composer-actions.c:387
 #: ../src/mail/e-mail-reader.c:2749
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1319
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1333
 msgid "_Print…"
 msgstr "_Drucken …"
 
-#: ../src/calendar/gui/e-comp-editor.c:2130 ../src/mail/e-mail-reader.c:2756
+#: ../src/calendar/gui/e-comp-editor.c:2142 ../src/mail/e-mail-reader.c:2756
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1326
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1723
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:838
@@ -8735,69 +8813,69 @@ msgstr "_Drucken …"
 msgid "Pre_view…"
 msgstr "_Vorschau …"
 
-#: ../src/calendar/gui/e-comp-editor.c:2137 ../src/e-util/e-focus-tracker.c:821
+#: ../src/calendar/gui/e-comp-editor.c:2149 ../src/e-util/e-focus-tracker.c:821
 #: ../src/e-util/e-html-editor-actions.c:1100 ../src/e-util/e-web-view.c:485
 #: ../src/mail/e-mail-browser.c:194 ../src/shell/e-shell-window-actions.c:1015
 msgid "Select _All"
 msgstr "_Alle auswählen"
 
-#: ../src/calendar/gui/e-comp-editor.c:2139 ../src/e-util/e-focus-tracker.c:224
+#: ../src/calendar/gui/e-comp-editor.c:2151 ../src/e-util/e-focus-tracker.c:224
 #: ../src/e-util/e-focus-tracker.c:280 ../src/e-util/e-focus-tracker.c:822
 #: ../src/mail/e-mail-browser.c:196 ../src/shell/e-shell-window-actions.c:1017
 msgid "Select all text"
 msgstr "Den gesamten Text markieren"
 
-#: ../src/calendar/gui/e-comp-editor.c:2160
+#: ../src/calendar/gui/e-comp-editor.c:2172
 msgid "_Classification"
 msgstr "E_instufung"
 
-#: ../src/calendar/gui/e-comp-editor.c:2174
+#: ../src/calendar/gui/e-comp-editor.c:2186
 #: ../src/e-util/e-html-editor-actions.c:1123
 #: ../src/e-util/e-mail-signature-editor.c:333 ../src/mail/e-mail-browser.c:210
 #: ../src/mail/e-mail-notes.c:1029 ../src/shell/e-shell-window-actions.c:1059
 msgid "_File"
 msgstr "_Datei"
 
-#: ../src/calendar/gui/e-comp-editor.c:2188
+#: ../src/calendar/gui/e-comp-editor.c:2200
 #: ../src/e-util/e-html-editor-actions.c:1144
 msgid "_Insert"
 msgstr "Ein_fügen"
 
-#: ../src/calendar/gui/e-comp-editor.c:2195 ../src/composer/e-composer-actions.c:377
+#: ../src/calendar/gui/e-comp-editor.c:2207 ../src/composer/e-composer-actions.c:377
 msgid "_Options"
 msgstr "_Optionen"
 
-#: ../src/calendar/gui/e-comp-editor.c:2202
+#: ../src/calendar/gui/e-comp-editor.c:2214
 #: ../src/e-util/e-html-editor-actions.c:1165 ../src/mail/e-mail-browser.c:224
 #: ../src/shell/e-shell-window-actions.c:1102
-#: ../src/smime/gui/certificate-manager.c:1646 ../src/smime/gui/smime-ui.ui.h:3
+#: ../src/smime/gui/certificate-manager.c:1641 ../src/smime/gui/smime-ui.ui.h:3
 msgid "_View"
 msgstr "_Ansicht"
 
-#: ../src/calendar/gui/e-comp-editor.c:2214
+#: ../src/calendar/gui/e-comp-editor.c:2226
 msgid "Save current changes"
 msgstr "Aktuelle Änderungen speichern"
 
-#: ../src/calendar/gui/e-comp-editor.c:2219
+#: ../src/calendar/gui/e-comp-editor.c:2231
 #: ../src/e-util/e-mail-signature-editor.c:328 ../src/mail/e-mail-notes.c:1024
 msgid "Save and Close"
 msgstr "Speichern und schließen"
 
-#: ../src/calendar/gui/e-comp-editor.c:2221
+#: ../src/calendar/gui/e-comp-editor.c:2233
 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: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/e-day-view.c:2132 ../src/calendar/gui/e-to-do-pane.c:245
+#: ../src/calendar/gui/e-week-view.c:1750 ../src/calendar/gui/print.c:1076
 #: ../src/calendar/gui/print.c:1095 ../src/calendar/gui/print.c:2663
 #: ../src/calendar/gui/print.c:2683
 msgid "am"
 msgstr "AM"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../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/e-day-view.c:2135 ../src/calendar/gui/e-to-do-pane.c:249
+#: ../src/calendar/gui/e-week-view.c:1753 ../src/calendar/gui/print.c:1081
 #: ../src/calendar/gui/print.c:1097 ../src/calendar/gui/print.c:2668
 #: ../src/calendar/gui/print.c:2685
 msgid "pm"
@@ -8809,14 +8887,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: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:2117
+#: ../src/calendar/gui/e-day-view.c:3026
+#: ../src/calendar/gui/e-day-view-top-item.c:846
+#: ../src/calendar/gui/e-week-view-main-item.c:207 ../src/calendar/gui/print.c:2117
 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:3787
+#: ../src/calendar/gui/e-day-view.c:3767
 #, c-format
 msgid "Week %d"
 msgstr "Woche %d"
@@ -8827,17 +8905,17 @@ 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:811
+#: ../src/calendar/gui/e-day-view-time-item.c:817
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i Minuten-Unterteilungen"
 
-#: ../src/calendar/gui/e-day-view-time-item.c:836
+#: ../src/calendar/gui/e-day-view-time-item.c:842
 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:853
+#: ../src/calendar/gui/e-day-view-time-item.c:859
 #: ../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
@@ -8845,7 +8923,7 @@ msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Keine"
 
-#: ../src/calendar/gui/e-day-view-time-item.c:887
+#: ../src/calendar/gui/e-day-view-time-item.c:893
 #: ../src/calendar/gui/e-timezone-entry.c:346
 #: ../src/modules/calendar/e-calendar-preferences.c:393
 msgid "Select…"
@@ -8867,62 +8945,62 @@ msgstr "Optionale Teilnehmer"
 msgid "Resources"
 msgstr "Ressourcen"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:163
+#: ../src/calendar/gui/e-meeting-list-view.c:160
 msgid "Attendees"
 msgstr "Teilnehmer"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:179
+#: ../src/calendar/gui/e-meeting-list-view.c:176
 #: ../src/calendar/gui/e-meeting-store.c:110
 #: ../src/calendar/gui/e-meeting-store.c:127
 #: ../src/calendar/gui/e-meeting-store.c:1072 ../src/calendar/gui/print.c:1261
 msgid "Individual"
 msgstr "Individuell"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:180
+#: ../src/calendar/gui/e-meeting-list-view.c:177
 #: ../src/calendar/gui/e-meeting-store.c:112
 #: ../src/calendar/gui/e-meeting-store.c:129 ../src/calendar/gui/print.c:1262
 #: ../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-list-view.c:178
 #: ../src/calendar/gui/e-meeting-store.c:114
 #: ../src/calendar/gui/e-meeting-store.c:131 ../src/calendar/gui/print.c:1263
 msgid "Resource"
 msgstr "Ressource"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:182
+#: ../src/calendar/gui/e-meeting-list-view.c:179
 #: ../src/calendar/gui/e-meeting-store.c:116
 #: ../src/calendar/gui/e-meeting-store.c:133 ../src/calendar/gui/print.c:1264
 msgid "Room"
 msgstr "Raum"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:193
+#: ../src/calendar/gui/e-meeting-list-view.c:190
 #: ../src/calendar/gui/e-meeting-store.c:145
 #: ../src/calendar/gui/e-meeting-store.c:162 ../src/calendar/gui/print.c:1278
 msgid "Chair"
 msgstr "Vorsitzender"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:194
+#: ../src/calendar/gui/e-meeting-list-view.c:191
 #: ../src/calendar/gui/e-meeting-store.c:147
 #: ../src/calendar/gui/e-meeting-store.c:164
 #: ../src/calendar/gui/e-meeting-store.c:1073 ../src/calendar/gui/print.c:1279
 msgid "Required Participant"
 msgstr "Benötigter Teilnehmer"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:195
+#: ../src/calendar/gui/e-meeting-list-view.c:192
 #: ../src/calendar/gui/e-meeting-store.c:149
 #: ../src/calendar/gui/e-meeting-store.c:166 ../src/calendar/gui/print.c:1280
 msgid "Optional Participant"
 msgstr "Optionaler Teilnehmer"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:196
+#: ../src/calendar/gui/e-meeting-list-view.c:193
 #: ../src/calendar/gui/e-meeting-store.c:151
 #: ../src/calendar/gui/e-meeting-store.c:168 ../src/calendar/gui/print.c:1281
 msgid "Non-Participant"
 msgstr "Nicht-Teilnehmer"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:207
+#: ../src/calendar/gui/e-meeting-list-view.c:204
 #: ../src/calendar/gui/e-meeting-store.c:177
 #: ../src/calendar/gui/e-meeting-store.c:200
 #: ../src/calendar/gui/e-meeting-store.c:1079
@@ -8930,7 +9008,7 @@ msgid "Needs Action"
 msgstr "Erfordert Maßnahme"
 
 #. To translators: RSVP means "please reply"
-#: ../src/calendar/gui/e-meeting-list-view.c:678
+#: ../src/calendar/gui/e-meeting-list-view.c:675
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "UAwg"
@@ -9068,38 +9146,38 @@ msgstr "Allgemeiner Name"
 msgid "Language"
 msgstr "Sprache"
 
-#: ../src/calendar/gui/e-memo-table.c:535 ../src/calendar/gui/e-task-table.c:700
+#: ../src/calendar/gui/e-memo-table.c:524 ../src/calendar/gui/e-task-table.c:694
 msgid "* No Summary *"
 msgstr "* Keine Zusammenfassung *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../src/calendar/gui/e-memo-table.c:622 ../src/calendar/gui/e-task-table.c:801
+#: ../src/calendar/gui/e-memo-table.c:611 ../src/calendar/gui/e-task-table.c:795
 msgid "Start: "
 msgstr "Anfang: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../src/calendar/gui/e-memo-table.c:642 ../src/calendar/gui/e-task-table.c:834
+#: ../src/calendar/gui/e-memo-table.c:631 ../src/calendar/gui/e-task-table.c:828
 msgid "Due: "
 msgstr "Fälligkeit: "
 
-#: ../src/calendar/gui/e-memo-table.c:850
+#: ../src/calendar/gui/e-memo-table.c:839
 msgid "Cut selected memos to the clipboard"
 msgstr "Die gewählten Notizen in die Zwischenablage ausschneiden"
 
-#: ../src/calendar/gui/e-memo-table.c:856
+#: ../src/calendar/gui/e-memo-table.c:845
 msgid "Copy selected memos to the clipboard"
 msgstr "Die gewählten Notizen in die Zwischenablage kopieren"
 
-#: ../src/calendar/gui/e-memo-table.c:862
+#: ../src/calendar/gui/e-memo-table.c:851
 msgid "Paste memos from the clipboard"
 msgstr "Notiz aus der Zwischenablage einfügen"
 
-#: ../src/calendar/gui/e-memo-table.c:868
+#: ../src/calendar/gui/e-memo-table.c:857
 #: ../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:874
+#: ../src/calendar/gui/e-memo-table.c:863
 msgid "Select all visible memos"
 msgstr "Alle sichtbaren Notizen wählen"
 
@@ -9107,7 +9185,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:474 ../src/calendar/gui/tasktypes.xml.in.h:22
+#: ../src/calendar/gui/e-task-table.c:467 ../src/calendar/gui/tasktypes.xml.in.h:22
 #: ../src/e-util/e-send-options.ui.h:1
 msgid "Undefined"
 msgstr "Nicht festgelegt"
@@ -9116,29 +9194,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:502
+#: ../src/calendar/gui/e-task-table.c:496
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../src/calendar/gui/e-task-table.c:1072
+#: ../src/calendar/gui/e-task-table.c:1066
 msgid "Cut selected tasks to the clipboard"
 msgstr "Die gewählten Aufgaben in die Zwischenablage ausschneiden"
 
-#: ../src/calendar/gui/e-task-table.c:1078
+#: ../src/calendar/gui/e-task-table.c:1072
 msgid "Copy selected tasks to the clipboard"
 msgstr "Die gewählten Aufgaben in die Zwischenablage kopieren"
 
-#: ../src/calendar/gui/e-task-table.c:1084
+#: ../src/calendar/gui/e-task-table.c:1078
 msgid "Paste tasks from the clipboard"
 msgstr "Aufgaben aus der Zwischenablage einfügen"
 
-#: ../src/calendar/gui/e-task-table.c:1090
+#: ../src/calendar/gui/e-task-table.c:1084
 #: ../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:1096
+#: ../src/calendar/gui/e-task-table.c:1090
 msgid "Select all visible tasks"
 msgstr "Alle sichtbaren Aufgaben wählen"
 
@@ -9202,7 +9280,7 @@ msgid "Completed: %s"
 msgstr "Abgeschlossen: %s"
 
 #. strftime format of a weekday and a date.
-#: ../src/calendar/gui/e-to-do-pane.c:1576 ../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:338
 #: ../src/e-util/e-datetime-format.c:207
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1821
 #: ../src/modules/itip-formatter/itip-view.c:260
@@ -9264,7 +9342,7 @@ 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:3703
+#: ../src/calendar/gui/e-week-view.c:3697
 #, c-format
 msgctxt "SummaryWithLocation"
 msgid "%s (%s)"
@@ -9273,7 +9351,7 @@ 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:2096
+#: ../src/calendar/gui/e-week-view-main-item.c:224 ../src/calendar/gui/print.c:2096
 msgid "%d %B"
 msgstr "%d. %B"
 
@@ -9588,48 +9666,32 @@ msgid "is less than"
 msgstr "ist kleiner als"
 
 #: ../src/calendar/gui/tasktypes.xml.in.h:28
-#, fuzzy
-#| msgid "C_urrent View"
 msgid "Current State"
-msgstr "A_ktuelle Ansicht"
+msgstr "Aktueller Status"
 
 #: ../src/calendar/gui/tasktypes.xml.in.h:29
-#, fuzzy
-#| msgid "Overdue Tasks"
 msgid "is Overdue"
-msgstr "Überfällige Aufgaben"
+msgstr "ist überfällig"
 
 #: ../src/calendar/gui/tasktypes.xml.in.h:30
-#, fuzzy
-#| msgctxt "ECompEditorPage"
-#| msgid "Schedule"
 msgid "is Scheduled"
-msgstr "Terminplanung"
+msgstr "ist geplant"
 
 #: ../src/calendar/gui/tasktypes.xml.in.h:31
-#, fuzzy
-#| msgid "is not Flagged"
 msgid "is not Scheduled"
-msgstr "ist nicht markiert"
+msgstr "ist nicht geplant"
 
 #: ../src/calendar/gui/tasktypes.xml.in.h:32
-#, fuzzy
-#| msgid "Due "
 msgid "Due In"
-msgstr "Fällig am "
+msgstr "Fällig in"
 
 #: ../src/calendar/gui/tasktypes.xml.in.h:33
-#, fuzzy
-#| msgctxt "DateFmt"
-#| msgid "Next Sat"
 msgid "Next Days"
-msgstr "Nächster %a"
+msgstr "Nächste Tage"
 
 #: ../src/calendar/gui/tasktypes.xml.in.h:34
-#, fuzzy
-#| msgid "Previous year"
 msgid "Previous Days"
-msgstr "Vorheriges Jahr"
+msgstr "Vorherige Tage"
 
 #: ../src/calendar/importers/icalendar-importer.c:76
 msgid "Appointments and Meetings"
@@ -9695,148 +9757,148 @@ msgstr "GNOME Kalender"
 msgid "Evolution Calendar intelligent importer"
 msgstr "Intelligenter Evolution-Kalender-Importeur"
 
-#: ../src/calendar/importers/icalendar-importer.c:1261
-#: ../src/calendar/importers/icalendar-importer.c:1589
+#: ../src/calendar/importers/icalendar-importer.c:1280
+#: ../src/calendar/importers/icalendar-importer.c:1606
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Besprechung"
 
-#: ../src/calendar/importers/icalendar-importer.c:1261
-#: ../src/calendar/importers/icalendar-importer.c:1589
+#: ../src/calendar/importers/icalendar-importer.c:1280
+#: ../src/calendar/importers/icalendar-importer.c:1606
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Termin"
 
-#: ../src/calendar/importers/icalendar-importer.c:1264
-#: ../src/calendar/importers/icalendar-importer.c:1590
+#: ../src/calendar/importers/icalendar-importer.c:1283
+#: ../src/calendar/importers/icalendar-importer.c:1607
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Aufgabe"
 
-#: ../src/calendar/importers/icalendar-importer.c:1267
-#: ../src/calendar/importers/icalendar-importer.c:1591
+#: ../src/calendar/importers/icalendar-importer.c:1286
+#: ../src/calendar/importers/icalendar-importer.c:1608
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Notiz"
 
-#. have ? NULL :
-#: ../src/calendar/importers/icalendar-importer.c:1276
-msgctxt "iCalImp"
-msgid "has recurrences"
-msgstr "enthält Wiederholungen"
-
-#: ../src/calendar/importers/icalendar-importer.c:1281
+#: ../src/calendar/importers/icalendar-importer.c:1295
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "ist eine Instanz"
 
-#: ../src/calendar/importers/icalendar-importer.c:1286
+#. have ? NULL :
+#: ../src/calendar/importers/icalendar-importer.c:1298
+msgctxt "iCalImp"
+msgid "has recurrences"
+msgstr "enthält Wiederholungen"
+
+#: ../src/calendar/importers/icalendar-importer.c:1303
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "enthält Erinnerungen"
 
-#: ../src/calendar/importers/icalendar-importer.c:1291
+#: ../src/calendar/importers/icalendar-importer.c:1308
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "enthält Anlagen"
 
 #. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1303
+#: ../src/calendar/importers/icalendar-importer.c:1320
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Öffentlich"
 
 #. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1306
+#: ../src/calendar/importers/icalendar-importer.c:1323
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Privat"
 
 #. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1309
+#: ../src/calendar/importers/icalendar-importer.c:1326
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Vertraulich"
 
 #. Translators: Appointment's classification section name
-#: ../src/calendar/importers/icalendar-importer.c:1313
+#: ../src/calendar/importers/icalendar-importer.c:1330
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Einstufung"
 
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
-#: ../src/calendar/importers/icalendar-importer.c:1318
-#: ../src/calendar/importers/icalendar-importer.c:1634
+#: ../src/calendar/importers/icalendar-importer.c:1335
+#: ../src/calendar/importers/icalendar-importer.c:1651
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Zusammenfassung"
 
 #. Translators: Appointment's location
-#: ../src/calendar/importers/icalendar-importer.c:1325
+#: ../src/calendar/importers/icalendar-importer.c:1342
 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:1333
-#: ../src/calendar/importers/icalendar-importer.c:1629
+#: ../src/calendar/importers/icalendar-importer.c:1350
+#: ../src/calendar/importers/icalendar-importer.c:1646
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Anfang"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../src/calendar/importers/icalendar-importer.c:1343
+#: ../src/calendar/importers/icalendar-importer.c:1360
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Fällig"
 
 #. Translators: Appointment's end time
-#: ../src/calendar/importers/icalendar-importer.c:1354
+#: ../src/calendar/importers/icalendar-importer.c:1371
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Ende"
 
 #. Translators: Appointment's categories
-#: ../src/calendar/importers/icalendar-importer.c:1363
+#: ../src/calendar/importers/icalendar-importer.c:1380
 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:1388
+#: ../src/calendar/importers/icalendar-importer.c:1405
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Abgeschlossen"
 
 #. Translators: Appointment's URL
-#: ../src/calendar/importers/icalendar-importer.c:1395
+#: ../src/calendar/importers/icalendar-importer.c:1412
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "Adresse"
 
 #. Translators: Appointment's organizer
-#: ../src/calendar/importers/icalendar-importer.c:1412
-#: ../src/calendar/importers/icalendar-importer.c:1415
+#: ../src/calendar/importers/icalendar-importer.c:1429
+#: ../src/calendar/importers/icalendar-importer.c:1432
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Organisator"
 
 #. Translators: Appointment's attendees
-#: ../src/calendar/importers/icalendar-importer.c:1444
-#: ../src/calendar/importers/icalendar-importer.c:1447
+#: ../src/calendar/importers/icalendar-importer.c:1461
+#: ../src/calendar/importers/icalendar-importer.c:1464
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Teilnehmer"
 
-#: ../src/calendar/importers/icalendar-importer.c:1463
+#: ../src/calendar/importers/icalendar-importer.c:1480
 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:1624
+#: ../src/calendar/importers/icalendar-importer.c:1641
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Art"
@@ -11551,12 +11613,12 @@ msgid "Save Draft"
 msgstr "Entwurf speichern"
 
 #: ../src/composer/e-composer-from-header.c:108
-#: ../src/e-util/e-collection-account-wizard.c:2061
-#: ../src/e-util/e-mail-signature-script-dialog.c:416
+#: ../src/e-util/e-collection-account-wizard.c:2058
+#: ../src/e-util/e-mail-signature-script-dialog.c:408
 #: ../src/e-util/e-webdav-browser.c:2502
 #: ../src/e-util/gal-view-instance-save-as-dialog.ui.h:2
 #: ../src/mail/e-mail-config-identity-page.c:551
-#: ../src/mail/e-mail-config-summary-page.c:334
+#: ../src/mail/e-mail-config-summary-page.c:327
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:297
 msgid "_Name:"
 msgstr "_Name:"
@@ -11577,44 +11639,44 @@ msgstr ""
 "Geben Sie die Adressen ein, die eine Kopie erhalten, jedoch nicht in der "
 "Empfängerliste auftauchen sollen"
 
-#: ../src/composer/e-composer-header-table.c:840
+#: ../src/composer/e-composer-header-table.c:831
 msgid "Fr_om:"
 msgstr "V_on:"
 
-#: ../src/composer/e-composer-header-table.c:847
+#: ../src/composer/e-composer-header-table.c:838
 msgid "_Reply-To:"
 msgstr "Antwo_rt an:"
 
-#: ../src/composer/e-composer-header-table.c:852
+#: ../src/composer/e-composer-header-table.c:843
 msgid "_To:"
 msgstr "A_n:"
 
-#: ../src/composer/e-composer-header-table.c:858
+#: ../src/composer/e-composer-header-table.c:849
 msgid "_Cc:"
 msgstr "_Kopie an:"
 
-#: ../src/composer/e-composer-header-table.c:864
+#: ../src/composer/e-composer-header-table.c:855
 msgid "_Bcc:"
 msgstr "Blindko_pie an:"
 
-#: ../src/composer/e-composer-header-table.c:869
+#: ../src/composer/e-composer-header-table.c:860
 msgid "_Post To:"
 msgstr "_Veröffentlichen in:"
 
-#: ../src/composer/e-composer-header-table.c:873
+#: ../src/composer/e-composer-header-table.c:864
 msgid "S_ubject:"
 msgstr "Be_treff:"
 
-#: ../src/composer/e-composer-header-table.c:883
+#: ../src/composer/e-composer-header-table.c:874
 #: ../src/mail/e-mail-config-identity-page.c:744
 msgid "Si_gnature:"
 msgstr "Si_gnatur:"
 
-#: ../src/composer/e-composer-name-header.c:237
+#: ../src/composer/e-composer-name-header.c:233
 msgid "Click here for the address book"
 msgstr "Klicken Sie hier, um das Adressbuch zu öffnen"
 
-#: ../src/composer/e-composer-post-header.c:180
+#: ../src/composer/e-composer-post-header.c:176
 msgid "Click here to select folders to post to"
 msgstr "Klicken Sie hier, um die Veröffentlichungsordner zu wählen"
 
@@ -11637,18 +11699,18 @@ msgstr ""
 msgid "Compose Message"
 msgstr "Nachricht verfassen"
 
-#: ../src/composer/e-msg-composer.c:4377
+#: ../src/composer/e-msg-composer.c:4381
 #: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:352
 msgid "Reading text content…"
 msgstr "Textinhalt wird geladen …"
 
-#: ../src/composer/e-msg-composer.c:5187
+#: ../src/composer/e-msg-composer.c:5191
 msgid "Review attachment before sending."
 msgid_plural "Review attachments before sending."
 msgstr[0] "Prüfen Sie die Anlage vor dem Verschicken."
 msgstr[1] "Prüfen Sie die Anlagen vor dem Verschicken."
 
-#: ../src/composer/e-msg-composer.c:5192
+#: ../src/composer/e-msg-composer.c:5196
 #, c-format
 msgid ""
 "There had been added %d attachment. Make sure it does not contain any sensitive "
@@ -11663,7 +11725,7 @@ msgstr[1] ""
 "Es gibt %d Anlagen. Stellen Sie sicher, dass diese keine geheimen Informationen "
 "enthält, bevor Sie die Nachricht verschicken."
 
-#: ../src/composer/e-msg-composer.c:5325
+#: ../src/composer/e-msg-composer.c:5329
 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 "
@@ -11816,7 +11878,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:713
+#: ../src/e-util/e-collection-account-wizard.c:710
 msgid "_Try Again"
 msgstr "Erneut _versuchen"
 
@@ -11953,7 +12015,15 @@ msgstr ""
 msgid "An error occurred while creating message composer."
 msgstr "Bei der Erstellung des Nachrichteneditors ist ein Fehler aufgetreten."
 
-#: ../src/em-format/e-mail-formatter-attachment.c:335
+#: ../src/em-format/e-mail-formatter-attachment.c:272
+msgid "Toggle View Inline"
+msgstr "Eingebettet anzeigen"
+
+#: ../src/em-format/e-mail-formatter-attachment.c:272
+msgid "Open in default application"
+msgstr "Mit Standardanwendung öffnen"
+
+#: ../src/em-format/e-mail-formatter-attachment.c:337
 msgid "Display as attachment"
 msgstr "Als Anlage anzeigen"
 
@@ -12022,7 +12092,7 @@ msgstr "Größe"
 #: ../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
 #: ../src/modules/mail/em-mailer-prefs.c:65
-#: ../src/smime/gui/certificate-manager.c:1627
+#: ../src/smime/gui/certificate-manager.c:1622
 msgid "Subject"
 msgstr "Betreff"
 
@@ -12123,7 +12193,7 @@ msgstr ""
 msgid "This message is signed, but the public key is not in your keyring"
 msgstr ""
 "Diese Nachricht wurde signiert, jedoch ist kein passender öffentlicher Schlüssel "
-"in Ihrem Schlüsselbund vorhanden."
+"in Ihrem Schlüsselbund vorhanden"
 
 #: ../src/em-format/e-mail-formatter-secure-button.c:68
 msgid ""
@@ -12279,7 +12349,7 @@ msgid "partially S/MIME encrypted"
 msgstr "teilweise mit S/MIME verschlüsselt"
 
 #: ../src/em-format/e-mail-formatter-utils.c:693
-#: ../src/mail/e-mail-config-security-page.c:856
+#: ../src/mail/e-mail-config-security-page.c:852
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:273
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:216
 msgid "Security"
@@ -12359,8 +12429,8 @@ msgstr "Nicht unterstütztes Signaturformat"
 msgid "Reply-To"
 msgstr "Antwort an"
 
-#: ../src/em-format/e-mail-part-headers.c:52 ../src/e-util/e-dateedit.c:559
-#: ../src/e-util/e-dateedit.c:582 ../src/mail/message-list.etspec.h:7
+#: ../src/em-format/e-mail-part-headers.c:52 ../src/e-util/e-dateedit.c:558
+#: ../src/e-util/e-dateedit.c:581 ../src/mail/message-list.etspec.h:7
 #: ../src/modules/mail/em-mailer-prefs.c:66
 msgid "Date"
 msgstr "Datum"
@@ -12399,7 +12469,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:930
+#: ../src/modules/mail/e-mail-shell-backend.c:1109
 msgid "Mail Accounts"
 msgstr "E-Mail-Konten"
 
@@ -12427,15 +12497,15 @@ msgstr "Aufgabenlisten"
 
 #: ../src/e-util/e-accounts-window.c:1399 ../src/e-util/filter.ui.h:23
 #: ../src/mail/e-mail-account-tree-view.c:84
-#: ../src/modules/mail/em-composer-prefs.c:1306
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:407
-#: ../src/plugins/mail-notification/mail-notification.c:1146
-#: ../src/plugins/publish-calendar/publish-calendar.c:854
+#: ../src/modules/mail/em-composer-prefs.c:1303
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:408
+#: ../src/plugins/mail-notification/mail-notification.c:1182
+#: ../src/plugins/publish-calendar/publish-calendar.c:853
 msgid "Enabled"
 msgstr "Aktiv"
 
 #: ../src/e-util/e-accounts-window.c:1415 ../src/mail/e-mail-account-tree-view.c:108
-#: ../src/plugins/mail-notification/mail-notification.c:1162
+#: ../src/plugins/mail-notification/mail-notification.c:1198
 msgid "Account Name"
 msgstr "Kontoname"
 
@@ -12471,7 +12541,7 @@ msgstr "Evolution-Konten"
 #. 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:2796
-#: ../src/mail/em-subscription-editor.c:1952
+#: ../src/mail/em-subscription-editor.c:1945
 #: ../src/modules/mail/e-mail-shell-view-actions.c:1594
 #: ../src/modules/mail/e-mail-shell-view-actions.c:1672
 msgid "_Refresh"
@@ -12482,31 +12552,31 @@ msgid "Initiates refresh of account sources"
 msgstr "Beginnt eine Aktualisierung der Kontenquellen"
 
 #. Translators: This is a cancelled activity.
-#: ../src/e-util/e-activity.c:256
+#: ../src/e-util/e-activity.c:252
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (abgebrochen)"
 
 #. Translators: This is a completed activity.
-#: ../src/e-util/e-activity.c:259
+#: ../src/e-util/e-activity.c:255
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (abgeschlossen)"
 
 #. Translators: This is an activity waiting to run.
-#: ../src/e-util/e-activity.c:262
+#: ../src/e-util/e-activity.c:258
 #, c-format
 msgid "%s (waiting)"
 msgstr "%s (wartend)"
 
 #. Translators: This is a running activity which
 #. *              the user has requested to cancel.
-#: ../src/e-util/e-activity.c:266
+#: ../src/e-util/e-activity.c:262
 #, c-format
 msgid "%s (cancelling)"
 msgstr "%s (wird abgebrochen)"
 
-#: ../src/e-util/e-activity.c:268
+#: ../src/e-util/e-activity.c:264
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -12514,7 +12584,7 @@ msgstr "%s"
 #. Translators: This is a running activity whose
 #. *              percent complete is known.
 #. Translators: This is a running activity whose percent complete is known.
-#: ../src/e-util/e-activity.c:273
+#: ../src/e-util/e-activity.c:269
 #: ../src/modules/addressbook/e-book-shell-view-private.c:334
 #: ../src/modules/calendar/e-cal-base-shell-content.c:143
 #, c-format
@@ -12547,21 +12617,21 @@ msgstr "Konversation konnte nicht angelegt werden: "
 msgid "Attached message"
 msgstr "Beigelegte Nachricht"
 
-#: ../src/e-util/e-attachment.c:2085 ../src/e-util/e-attachment.c:3146
+#: ../src/e-util/e-attachment.c:2085 ../src/e-util/e-attachment.c:3130
 msgid "Operation was cancelled"
 msgstr "Vorgang wurde abgebrochen"
 
 #. Translators: Default attachment filename.
-#: ../src/e-util/e-attachment.c:2270 ../src/e-util/e-attachment.c:2990
-#: ../src/e-util/e-attachment.c:3442 ../src/e-util/e-attachment-store.c:914
+#: ../src/e-util/e-attachment.c:2270 ../src/e-util/e-attachment.c:2974
+#: ../src/e-util/e-attachment.c:3426 ../src/e-util/e-attachment-store.c:914
 msgid "attachment.dat"
 msgstr "Anlage.dat"
 
-#: ../src/e-util/e-attachment.c:2352 ../src/e-util/e-attachment.c:3502
+#: ../src/e-util/e-attachment.c:2352 ../src/e-util/e-attachment.c:3486
 msgid "A load operation is already in progress"
 msgstr "Ein Ladevorgang läuft bereits"
 
-#: ../src/e-util/e-attachment.c:2360 ../src/e-util/e-attachment.c:3510
+#: ../src/e-util/e-attachment.c:2360 ../src/e-util/e-attachment.c:3494
 msgid "A save operation is already in progress"
 msgstr "Ein Speichervorgang läuft bereits"
 
@@ -12575,40 +12645,40 @@ msgstr "»%s« konnte nicht geöffnet werden"
 msgid "Could not open the attachment"
 msgstr "Die Anlage konnte nicht geöffnet werden"
 
-#: ../src/e-util/e-attachment.c:3519
+#: ../src/e-util/e-attachment.c:3503
 msgid "Attachment contents not loaded"
 msgstr "Anlagen wurden nicht geladen"
 
-#: ../src/e-util/e-attachment.c:3610
+#: ../src/e-util/e-attachment.c:3594
 #, c-format
 msgid "Could not save “%s”"
 msgstr "»%s« konnte nicht gespeichert werden"
 
-#: ../src/e-util/e-attachment.c:3613
+#: ../src/e-util/e-attachment.c:3597
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Die Anlage konnte nicht gespeichert werden"
 
-#: ../src/e-util/e-attachment-dialog.c:315
+#: ../src/e-util/e-attachment-dialog.c:295
 msgid "Attachment Properties"
 msgstr "Eigenschaften der Anlage"
 
-#: ../src/e-util/e-attachment-dialog.c:337 ../src/e-util/e-import-assistant.c:303
+#: ../src/e-util/e-attachment-dialog.c:317 ../src/e-util/e-import-assistant.c:303
 msgid "F_ilename:"
 msgstr "Datei_name:"
 
-#: ../src/e-util/e-attachment-dialog.c:354
+#: ../src/e-util/e-attachment-dialog.c:334
 #: ../src/e-util/e-html-editor-image-dialog.c:513
 #: ../src/e-util/e-html-editor-link-dialog.c:226
 #: ../src/e-util/e-webdav-browser.c:2541
 msgid "_Description:"
 msgstr "_Beschreibung:"
 
-#: ../src/e-util/e-attachment-dialog.c:372
+#: ../src/e-util/e-attachment-dialog.c:352
 msgid "MIME Type:"
 msgstr "MIME-Typ:"
 
-#: ../src/e-util/e-attachment-dialog.c:380 ../src/e-util/e-attachment-store.c:700
+#: ../src/e-util/e-attachment-dialog.c:360 ../src/e-util/e-attachment-store.c:700
 msgid "_Suggest automatic display of attachment"
 msgstr "Automatische Anzeige der Anlage _vorschlagen"
 
@@ -12634,7 +12704,7 @@ msgstr "Wird gespeichert"
 msgid "Hide Attachment _Bar"
 msgstr "Anla_genleiste verbergen"
 
-#: ../src/e-util/e-attachment-paned.c:105 ../src/e-util/e-attachment-paned.c:741
+#: ../src/e-util/e-attachment-paned.c:105 ../src/e-util/e-attachment-paned.c:706
 msgid "Show Attachment _Bar"
 msgstr "Anla_genleiste anzeigen"
 
@@ -12682,9 +12752,9 @@ msgid "Sa_ve As"
 msgstr "Speichern _unter"
 
 #: ../src/e-util/e-attachment-view.c:331
-#: ../src/plugins/save-calendar/save-calendar.c:348
-#: ../src/plugins/save-calendar/save-calendar.c:387
-#: ../src/plugins/save-calendar/save-calendar.c:426
+#: ../src/plugins/save-calendar/save-calendar.c:345
+#: ../src/plugins/save-calendar/save-calendar.c:384
+#: ../src/plugins/save-calendar/save-calendar.c:423
 msgid "Save _As"
 msgstr "Speichern _unter"
 
@@ -12702,33 +12772,33 @@ msgstr "Anlage _hinzufügen …"
 msgid "_Properties"
 msgstr "Ei_genschaften"
 
-#: ../src/e-util/e-attachment-view.c:786
+#: ../src/e-util/e-attachment-view.c:784
 #, c-format
 msgid "Open With “%s”"
 msgstr "Mit »%s« öffnen"
 
-#: ../src/e-util/e-attachment-view.c:787
+#: ../src/e-util/e-attachment-view.c:785
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Diese Anlage mit »%s« öffnen"
 
-#: ../src/e-util/e-attachment-view.c:789
+#: ../src/e-util/e-attachment-view.c:787
 msgid "Open With Default Application"
 msgstr "Mit Standardanwendung öffnen"
 
-#: ../src/e-util/e-attachment-view.c:790
+#: ../src/e-util/e-attachment-view.c:788
 msgid "Open this attachment in default application"
 msgstr "Diese Anlage mit der Standardanwendung öffnen"
 
-#: ../src/e-util/e-book-source-config.c:98
+#: ../src/e-util/e-book-source-config.c:90
 msgid "Mark as default address book"
 msgstr "Als Vorgabeadressbuch markieren"
 
-#: ../src/e-util/e-book-source-config.c:103
+#: ../src/e-util/e-book-source-config.c:95
 msgid "Autocomplete with this address book"
 msgstr "Aus diesem Adressbuch automatisch vervollständigen"
 
-#: ../src/e-util/e-book-source-config.c:277
+#: ../src/e-util/e-book-source-config.c:269
 msgid "Copy book content locally for offline operation"
 msgstr "Den Adressbuchinhalt lokal zum Arbeiten im Offline-Modus kopieren"
 
@@ -12753,48 +12823,48 @@ msgid "Month Calendar"
 msgstr "Monatskalender"
 
 #. This is a strftime() format. %B = Month name.
-#: ../src/e-util/e-calendar-item.c:1379 ../src/e-util/e-calendar-item.c:2262
+#: ../src/e-util/e-calendar-item.c:1368 ../src/e-util/e-calendar-item.c:2261
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%B"
 
 #. This is a strftime() format. %Y = Year.
-#: ../src/e-util/e-calendar-item.c:1381
+#: ../src/e-util/e-calendar-item.c:1370
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../src/e-util/e-calendar-item.c:1418
+#: ../src/e-util/e-calendar-item.c:1407
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../src/e-util/e-cal-source-config.c:169
+#: ../src/e-util/e-cal-source-config.c:161
 msgid "Mark as default calendar"
 msgstr "Als Vorgabekalender markieren"
 
-#: ../src/e-util/e-cal-source-config.c:172
+#: ../src/e-util/e-cal-source-config.c:164
 msgid "Mark as default task list"
 msgstr "Als Vorgabeaufgabenliste markieren"
 
-#: ../src/e-util/e-cal-source-config.c:175
+#: ../src/e-util/e-cal-source-config.c:167
 msgid "Mark as default memo list"
 msgstr "Als Vorgabenotizliste markieren"
 
-#: ../src/e-util/e-cal-source-config.c:200
+#: ../src/e-util/e-cal-source-config.c:192
 msgid "Color:"
 msgstr "Farbe:"
 
-#: ../src/e-util/e-cal-source-config.c:428
+#: ../src/e-util/e-cal-source-config.c:420
 msgid "Copy calendar contents locally for offline operation"
 msgstr "Den Kalenderinhalt lokal zur Arbeit im Offline-Modus kopieren"
 
-#: ../src/e-util/e-cal-source-config.c:432
+#: ../src/e-util/e-cal-source-config.c:424
 msgid "Copy task list contents locally for offline operation"
 msgstr "Den Inhalt der Aufgabenliste lokal zur Arbeit im Offline-Modus kopieren"
 
-#: ../src/e-util/e-cal-source-config.c:436
+#: ../src/e-util/e-cal-source-config.c:428
 msgid "Copy memo list contents locally for offline operation"
 msgstr "Den Inhalt der Notizliste lokal zur Arbeit im Offline-Modus kopieren"
 
@@ -12821,7 +12891,7 @@ msgctxt "category"
 msgid "_Delete"
 msgstr "_Löschen"
 
-#: ../src/e-util/e-categories-selector.c:323
+#: ../src/e-util/e-categories-selector.c:319
 msgid "Icon"
 msgstr "Symbol"
 
@@ -12860,33 +12930,33 @@ msgid ""
 "There is already a category “%s” in the configuration. Please use another name"
 msgstr ""
 "Es gibt bereits eine Kategorie »%s« in dieser Konfiguration. Bitte einen anderen "
-"Namen verwenden."
+"Namen verwenden"
 
-#: ../src/e-util/e-cell-combo.c:183
+#: ../src/e-util/e-cell-combo.c:186
 msgid "popup list"
 msgstr "Popup-Liste"
 
 #: ../src/e-util/e-cell-date.c:49 ../src/e-util/e-cell-date.c:138
-#: ../src/e-util/e-cell-date.c:158 ../src/mail/message-list.c:2148
+#: ../src/e-util/e-cell-date.c:158 ../src/mail/message-list.c:2146
 msgid "?"
 msgstr "?"
 
-#: ../src/e-util/e-cell-date-edit.c:320
+#: ../src/e-util/e-cell-date-edit.c:330
 msgid "Now"
 msgstr "Jetzt"
 
 #. Translators: "None" as a label of a button to unset date in a
 #. * date table cell.
-#: ../src/e-util/e-cell-date-edit.c:338
+#: ../src/e-util/e-cell-date-edit.c:348
 msgctxt "table-date"
 msgid "None"
 msgstr "Keine"
 
-#: ../src/e-util/e-cell-date-edit.c:346 ../src/mail/e-mail-label-dialog.c:198
+#: ../src/e-util/e-cell-date-edit.c:356 ../src/mail/e-mail-label-dialog.c:190
 msgid "OK"
 msgstr "OK"
 
-#: ../src/e-util/e-cell-date-edit.c:901
+#: ../src/e-util/e-cell-date-edit.c:908
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Die Zeit muss folgendes Format haben: %s"
@@ -12981,41 +13051,34 @@ 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:364
+#: ../src/e-util/e-charset-combo-box.c:356
 msgid "Other…"
 msgstr "Weitere …"
 
-#: ../src/e-util/e-client-cache.c:1149 ../src/e-util/e-client-cache.c:1280
+#: ../src/e-util/e-client-cache.c:1146 ../src/e-util/e-client-cache.c:1277
 #, c-format
 msgid "Cannot create a client object from extension name “%s”"
 msgstr "Es kann kein Client-Objekt für den Erweiterungsnamen »%s« erstellt werden"
 
 #: ../src/e-util/e-client-selector.c:190 ../src/mail/em-folder-tree.c:1035
-#, fuzzy
-#| msgid "_Work Offline"
 msgctxt "Status"
 msgid "Offline"
-msgstr "_Offline arbeiten"
+msgstr "Offline"
 
 #: ../src/e-util/e-client-selector.c:193 ../src/mail/em-folder-tree.c:1038
-#, fuzzy
-#| msgctxt "ReplyForward"
-#| msgid "Inline"
 msgctxt "Status"
 msgid "Online"
-msgstr "Eingebettet"
+msgstr "Online"
 
 #: ../src/e-util/e-client-selector.c:196 ../src/mail/em-folder-tree.c:1041
 msgctxt "Status"
 msgid "Unreachable"
-msgstr ""
+msgstr "Nicht erreichbar"
 
 #: ../src/e-util/e-client-selector.c:199 ../src/mail/em-folder-tree.c:1044
-#, fuzzy
-#| msgid "Failed to connect “{0}”"
 msgctxt "Status"
 msgid "Failed to connect"
-msgstr "Verbindung zu »{0}« fehlgeschlagen"
+msgstr "Verbindung fehlgeschlagen"
 
 #: ../src/e-util/e-collection-account-wizard.c:107
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:83
@@ -13027,7 +13090,7 @@ msgid "_Look Up"
 msgstr "Nach_schlagen"
 
 #: ../src/e-util/e-collection-account-wizard.c:112
-#: ../src/e-util/e-collection-account-wizard.c:275 ../src/e-util/e-search-bar.c:680
+#: ../src/e-util/e-collection-account-wizard.c:275 ../src/e-util/e-search-bar.c:653
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:85
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:244
 msgid "_Next"
@@ -13037,7 +13100,7 @@ msgstr "_Weitersuchen"
 msgid "New Collection Account"
 msgstr "Neues Sammelkonto"
 
-#: ../src/e-util/e-collection-account-wizard.c:260 ../src/e-util/e-search-bar.c:668
+#: ../src/e-util/e-collection-account-wizard.c:260 ../src/e-util/e-search-bar.c:641
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:78
 msgid "_Previous"
 msgstr "_Rückwärts suchen"
@@ -13056,7 +13119,7 @@ msgstr "Passwort wird zum Fortfahren benötigt. %s."
 msgid "View certificate"
 msgstr "Zertifikat anzeigen"
 
-#: ../src/e-util/e-collection-account-wizard.c:569
+#: ../src/e-util/e-collection-account-wizard.c:566
 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 "
@@ -13066,93 +13129,93 @@ 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:571
+#: ../src/e-util/e-collection-account-wizard.c:568
 #, 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:682
+#: ../src/e-util/e-collection-account-wizard.c:679
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:29
 msgid "_Username:"
 msgstr "_Benutzername:"
 
-#: ../src/e-util/e-collection-account-wizard.c:694
+#: ../src/e-util/e-collection-account-wizard.c:691
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../src/smime/gui/certificate-manager.c:766
+#: ../src/smime/gui/certificate-manager.c:761
 msgid "_Password:"
 msgstr "_Passwort:"
 
-#: ../src/e-util/e-collection-account-wizard.c:707
+#: ../src/e-util/e-collection-account-wizard.c:704
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:31
 msgid "_Remember password"
 msgstr "Passwort _merken"
 
-#: ../src/e-util/e-collection-account-wizard.c:854
+#: ../src/e-util/e-collection-account-wizard.c:851
 #: ../src/e-util/e-webdav-browser.c:533
 msgid "Collection"
 msgstr "Sammlung"
 
-#: ../src/e-util/e-collection-account-wizard.c:855
+#: ../src/e-util/e-collection-account-wizard.c:852
 msgid "Mail Receive"
 msgstr "E-Mail empfangen"
 
-#: ../src/e-util/e-collection-account-wizard.c:856
+#: ../src/e-util/e-collection-account-wizard.c:853
 msgid "Mail Send"
 msgstr "E-Mail versenden"
 
-#: ../src/e-util/e-collection-account-wizard.c:857
+#: ../src/e-util/e-collection-account-wizard.c:854
 #: ../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:859
+#: ../src/e-util/e-collection-account-wizard.c:856
 msgid "Memo List"
 msgstr "Notizliste"
 
-#: ../src/e-util/e-collection-account-wizard.c:860
+#: ../src/e-util/e-collection-account-wizard.c:857
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:64
 msgid "Task List"
 msgstr "Aufgabenliste"
 
-#: ../src/e-util/e-collection-account-wizard.c:1196
+#: ../src/e-util/e-collection-account-wizard.c:1193
 msgid "Looking up LDAP server’s search base…"
 msgstr "Die Suchbasis des LDAP-Servers wird ermittelt …"
 
-#: ../src/e-util/e-collection-account-wizard.c:1329
+#: ../src/e-util/e-collection-account-wizard.c:1326
 msgid "Failed to store password: "
 msgstr "Speichern des Passworts ist fehlgeschlagen: "
 
-#: ../src/e-util/e-collection-account-wizard.c:1339
+#: ../src/e-util/e-collection-account-wizard.c:1336
 msgid "Failed to create sources: "
 msgstr "Anlegen der Quellen ist fehlgeschlagen: "
 
-#: ../src/e-util/e-collection-account-wizard.c:1506
+#: ../src/e-util/e-collection-account-wizard.c:1503
 msgid "Saving account settings, please wait…"
 msgstr "Kontoeinstellungen werden gespeichert, bitte warten …"
 
-#: ../src/e-util/e-collection-account-wizard.c:1658
+#: ../src/e-util/e-collection-account-wizard.c:1655
 msgid "User details"
 msgstr "Benutzerdetails"
 
-#: ../src/e-util/e-collection-account-wizard.c:1671
+#: ../src/e-util/e-collection-account-wizard.c:1668
 msgid "_Email Address or User name:"
 msgstr "E-Mail-Adresse oder Benutzername:"
 
-#: ../src/e-util/e-collection-account-wizard.c:1702
+#: ../src/e-util/e-collection-account-wizard.c:1699
 msgid "_Advanced Options"
 msgstr "_Erweiterte Einstellungen"
 
-#: ../src/e-util/e-collection-account-wizard.c:1707
+#: ../src/e-util/e-collection-account-wizard.c:1704
 #: ../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:1726
+#: ../src/e-util/e-collection-account-wizard.c:1723
 msgid ""
 "Semicolon (“;”) separated list of servers to look up information for, in addition "
 "to the domain of the e-mail address."
@@ -13160,13 +13223,13 @@ 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:1928
+#: ../src/e-util/e-collection-account-wizard.c:1925
 msgid "Select which parts should be configured:"
 msgstr "Wählen Sie, welche Teile eingerichtet werden sollen:"
 
-#: ../src/e-util/e-collection-account-wizard.c:2052
+#: ../src/e-util/e-collection-account-wizard.c:2049
 #: ../src/mail/e-mail-config-identity-page.c:542
-#: ../src/mail/e-mail-config-summary-page.c:325
+#: ../src/mail/e-mail-config-summary-page.c:318
 msgid "Account Information"
 msgstr "Konteninformation"
 
@@ -13174,171 +13237,171 @@ msgstr "Konteninformation"
 msgid "Choose custom color"
 msgstr "Benutzerdefinierte Farbe auswählen"
 
-#: ../src/e-util/e-color-combo.c:488 ../src/e-util/e-html-editor.c:127
+#: ../src/e-util/e-color-combo.c:476 ../src/e-util/e-html-editor.c:127
 #: ../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:4881
+#: ../src/mail/e-mail-config-security-page.c:540
+#: ../src/mail/e-mail-config-security-page.c:704 ../src/mail/e-mail-reader.c:4881
 #: ../src/mail/mail-config.ui.h:78
 msgid "Default"
 msgstr "Vorgabe"
 
-#: ../src/e-util/e-color-combo.c:576
+#: ../src/e-util/e-color-combo.c:564
 msgid "black"
 msgstr "schwarz"
 
-#: ../src/e-util/e-color-combo.c:577
+#: ../src/e-util/e-color-combo.c:565
 msgid "light brown"
 msgstr "hellbraun"
 
-#: ../src/e-util/e-color-combo.c:578
+#: ../src/e-util/e-color-combo.c:566
 msgid "brown gold"
 msgstr "goldbraun"
 
-#: ../src/e-util/e-color-combo.c:579
+#: ../src/e-util/e-color-combo.c:567
 msgid "dark green #2"
 msgstr "dunkelgrün Nr. 2"
 
-#: ../src/e-util/e-color-combo.c:580
+#: ../src/e-util/e-color-combo.c:568
 msgid "navy"
 msgstr "marineblau"
 
-#: ../src/e-util/e-color-combo.c:581
+#: ../src/e-util/e-color-combo.c:569
 msgid "dark blue"
 msgstr "dunkelblau"
 
-#: ../src/e-util/e-color-combo.c:582
+#: ../src/e-util/e-color-combo.c:570
 msgid "purple #2"
 msgstr "purpur Nr. 2"
 
-#: ../src/e-util/e-color-combo.c:583
+#: ../src/e-util/e-color-combo.c:571
 msgid "very dark gray"
 msgstr "sehr dunkles Grau"
 
-#: ../src/e-util/e-color-combo.c:585
+#: ../src/e-util/e-color-combo.c:573
 msgid "dark red"
 msgstr "dunkelrot"
 
-#: ../src/e-util/e-color-combo.c:586
+#: ../src/e-util/e-color-combo.c:574
 msgid "red-orange"
 msgstr "rot-orange"
 
-#: ../src/e-util/e-color-combo.c:587
+#: ../src/e-util/e-color-combo.c:575
 msgid "gold"
 msgstr "golden"
 
-#: ../src/e-util/e-color-combo.c:588
+#: ../src/e-util/e-color-combo.c:576
 msgid "dark green"
 msgstr "dunkelgrün"
 
-#: ../src/e-util/e-color-combo.c:589
+#: ../src/e-util/e-color-combo.c:577
 msgid "dull blue"
 msgstr "mattblau"
 
-#: ../src/e-util/e-color-combo.c:590
+#: ../src/e-util/e-color-combo.c:578
 msgid "blue"
 msgstr "blau"
 
-#: ../src/e-util/e-color-combo.c:591
+#: ../src/e-util/e-color-combo.c:579
 msgid "dull purple"
 msgstr "mattpurpur"
 
-#: ../src/e-util/e-color-combo.c:592
+#: ../src/e-util/e-color-combo.c:580
 msgid "dark grey"
 msgstr "dunkelgrau"
 
-#: ../src/e-util/e-color-combo.c:594
+#: ../src/e-util/e-color-combo.c:582
 msgid "red"
 msgstr "rot"
 
-#: ../src/e-util/e-color-combo.c:595
+#: ../src/e-util/e-color-combo.c:583
 msgid "orange"
 msgstr "orange"
 
-#: ../src/e-util/e-color-combo.c:596
+#: ../src/e-util/e-color-combo.c:584
 msgid "lime"
 msgstr "limone"
 
-#: ../src/e-util/e-color-combo.c:597
+#: ../src/e-util/e-color-combo.c:585
 msgid "dull green"
 msgstr "mattgrün"
 
-#: ../src/e-util/e-color-combo.c:598
+#: ../src/e-util/e-color-combo.c:586
 msgid "dull blue #2"
 msgstr "mattblau Nr. 2"
 
-#: ../src/e-util/e-color-combo.c:599
+#: ../src/e-util/e-color-combo.c:587
 msgid "sky blue #2"
 msgstr "himmelblau Nr. 2"
 
-#: ../src/e-util/e-color-combo.c:600
+#: ../src/e-util/e-color-combo.c:588
 msgid "purple"
 msgstr "purpur"
 
-#: ../src/e-util/e-color-combo.c:601
+#: ../src/e-util/e-color-combo.c:589
 msgid "gray"
 msgstr "grau"
 
-#: ../src/e-util/e-color-combo.c:603
+#: ../src/e-util/e-color-combo.c:591
 msgid "magenta"
 msgstr "magenta"
 
-#: ../src/e-util/e-color-combo.c:604
+#: ../src/e-util/e-color-combo.c:592
 msgid "bright orange"
 msgstr "hellorange"
 
-#: ../src/e-util/e-color-combo.c:605
+#: ../src/e-util/e-color-combo.c:593
 msgid "yellow"
 msgstr "gelb"
 
-#: ../src/e-util/e-color-combo.c:606
+#: ../src/e-util/e-color-combo.c:594
 msgid "green"
 msgstr "grün"
 
-#: ../src/e-util/e-color-combo.c:607
+#: ../src/e-util/e-color-combo.c:595
 msgid "cyan"
 msgstr "zyan"
 
-#: ../src/e-util/e-color-combo.c:608
+#: ../src/e-util/e-color-combo.c:596
 msgid "bright blue"
 msgstr "hellblau"
 
-#: ../src/e-util/e-color-combo.c:609
+#: ../src/e-util/e-color-combo.c:597
 msgid "red purple"
 msgstr "rötlichpurpur"
 
-#: ../src/e-util/e-color-combo.c:610
+#: ../src/e-util/e-color-combo.c:598
 msgid "light grey"
 msgstr "hellgrau"
 
-#: ../src/e-util/e-color-combo.c:612
+#: ../src/e-util/e-color-combo.c:600
 msgid "pink"
 msgstr "rosa"
 
-#: ../src/e-util/e-color-combo.c:613
+#: ../src/e-util/e-color-combo.c:601
 msgid "light orange"
 msgstr "hellorange"
 
-#: ../src/e-util/e-color-combo.c:614
+#: ../src/e-util/e-color-combo.c:602
 msgid "light yellow"
 msgstr "hellgelb"
 
-#: ../src/e-util/e-color-combo.c:615
+#: ../src/e-util/e-color-combo.c:603
 msgid "light green"
 msgstr "hellgrün"
 
-#: ../src/e-util/e-color-combo.c:616
+#: ../src/e-util/e-color-combo.c:604
 msgid "light cyan"
 msgstr "hellzyan"
 
-#: ../src/e-util/e-color-combo.c:617
+#: ../src/e-util/e-color-combo.c:605
 msgid "light blue"
 msgstr "hellblau"
 
-#: ../src/e-util/e-color-combo.c:618
+#: ../src/e-util/e-color-combo.c:606
 msgid "light purple"
 msgstr "hellpurpur"
 
-#: ../src/e-util/e-color-combo.c:619
+#: ../src/e-util/e-color-combo.c:607
 msgid "white"
 msgstr "weiß"
 
@@ -13346,53 +13409,53 @@ msgstr "weiß"
 msgid "Running…"
 msgstr "Wird ausgeführt …"
 
-#: ../src/e-util/e-dateedit.c:526
+#: ../src/e-util/e-dateedit.c:523
 msgid "Date and Time"
 msgstr "Datum und Uhrzeit"
 
-#: ../src/e-util/e-dateedit.c:558
+#: ../src/e-util/e-dateedit.c:557
 msgid "Text entry to input date"
 msgstr "Eingabefeld für das Datum"
 
-#: ../src/e-util/e-dateedit.c:581
+#: ../src/e-util/e-dateedit.c:580
 msgid "Click this button to show a calendar"
 msgstr "Diesen Knopf drücken, um den Kalender anzuzeigen"
 
-#: ../src/e-util/e-dateedit.c:636
+#: ../src/e-util/e-dateedit.c:640
 msgid "Drop-down combination box to select time"
 msgstr "Auswahlliste für die Zeit"
 
-#: ../src/e-util/e-dateedit.c:637
+#: ../src/e-util/e-dateedit.c:641
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Time"
 msgstr "Uhrzeit"
 
-#: ../src/e-util/e-dateedit.c:714
+#: ../src/e-util/e-dateedit.c:718
 msgid "No_w"
 msgstr "_Jetzt"
 
-#: ../src/e-util/e-dateedit.c:721
+#: ../src/e-util/e-dateedit.c:725
 msgid "_Today"
 msgstr "_Heute"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. * is not permitted.
-#: ../src/e-util/e-dateedit.c:730 ../src/mail/em-folder-selector.c:334
+#: ../src/e-util/e-dateedit.c:734 ../src/mail/em-folder-selector.c:334
 msgid "_None"
 msgstr "_Keine"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../src/e-util/e-dateedit.c:1889 ../src/e-util/e-dateedit.c:2142
+#: ../src/e-util/e-dateedit.c:1893 ../src/e-util/e-dateedit.c:2146
 msgctxt "date"
 msgid "None"
 msgstr "Keine"
 
-#: ../src/e-util/e-dateedit.c:2025 ../src/e-util/e-dateedit.c:2496
+#: ../src/e-util/e-dateedit.c:2029 ../src/e-util/e-dateedit.c:2500
 msgid "Invalid Date Value"
 msgstr "Ungültiges Datum"
 
-#: ../src/e-util/e-dateedit.c:2065 ../src/e-util/e-dateedit.c:2553
+#: ../src/e-util/e-dateedit.c:2069 ../src/e-util/e-dateedit.c:2557
 msgid "Invalid Time Value"
 msgstr "Ungültige Zeitangabe"
 
@@ -13778,7 +13841,7 @@ msgstr "Objekte suchen, die folgenden Bedingungen entsprechen"
 #: ../src/e-util/e-mail-signature-combo-box.c:422
 #: ../src/libemail-engine/camel-null-store.c:29 ../src/mail/e-mail-autoconfig.c:778
 #: ../src/mail/e-mail-config-summary-page.c:143
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:684
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:681
 msgid "None"
 msgstr "Keine"
 
@@ -14922,10 +14985,8 @@ msgid "File _type:"
 msgstr "Datei_typ:"
 
 #: ../src/e-util/e-import-assistant.c:355
-#, fuzzy
-#| msgid "Preview"
 msgid "Pre_view:"
-msgstr "Vorschau"
+msgstr "_Vorschau:"
 
 #: ../src/e-util/e-import-assistant.c:390 ../src/e-util/e-import-assistant.c:1008
 msgid "Choose the destination for this import"
@@ -14975,8 +15036,8 @@ msgid "Preview data to be imported"
 msgstr "Vorschau der zu importierenden Daten"
 
 #: ../src/e-util/e-import-assistant.c:1013 ../src/e-util/e-import-assistant.c:1026
-#: ../src/e-util/e-import-assistant.c:1402 ../src/e-util/e-import-assistant.c:1479
-#: ../src/e-util/e-import-assistant.c:1488
+#: ../src/e-util/e-import-assistant.c:1399 ../src/e-util/e-import-assistant.c:1476
+#: ../src/e-util/e-import-assistant.c:1485
 msgid "Import Data"
 msgstr "Daten importieren"
 
@@ -14984,15 +15045,15 @@ msgstr "Daten importieren"
 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:1392 ../src/e-util/e-import-assistant.c:1428
+#: ../src/e-util/e-import-assistant.c:1389 ../src/e-util/e-import-assistant.c:1425
 msgid "Evolution Import Assistant"
 msgstr "Evolution-Importassistent"
 
-#: ../src/e-util/e-import-assistant.c:1409 ../src/e-util/e-import-assistant.c:1466
+#: ../src/e-util/e-import-assistant.c:1406 ../src/e-util/e-import-assistant.c:1463
 msgid "Import Location"
 msgstr "Ort importieren"
 
-#: ../src/e-util/e-import-assistant.c:1421
+#: ../src/e-util/e-import-assistant.c:1418
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing external "
@@ -15001,19 +15062,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:1438
+#: ../src/e-util/e-import-assistant.c:1435
 msgid "Importer Type"
 msgstr "Importeurtyp"
 
-#: ../src/e-util/e-import-assistant.c:1448
+#: ../src/e-util/e-import-assistant.c:1445
 msgid "Select Information to Import"
 msgstr "Zu importierende Informationen auswählen"
 
-#: ../src/e-util/e-import-assistant.c:1457
+#: ../src/e-util/e-import-assistant.c:1454
 msgid "Select a File"
 msgstr "Wählen Sie eine Datei"
 
-#: ../src/e-util/e-import-assistant.c:1474
+#: ../src/e-util/e-import-assistant.c:1471
 msgid "Click “Apply” to begin importing the file into Evolution."
 msgstr ""
 "Klicken Sie auf »Anwenden«, um den Import der Datei in Evolution zu beginnen."
@@ -15047,31 +15108,31 @@ msgstr "Schließen"
 msgid "_Save and Close"
 msgstr "_Speichern und schließen"
 
-#: ../src/e-util/e-mail-signature-editor.c:568
+#: ../src/e-util/e-mail-signature-editor.c:549
 msgid "Edit Signature"
 msgstr "Signatur bearbeiten"
 
-#: ../src/e-util/e-mail-signature-editor.c:601
+#: ../src/e-util/e-mail-signature-editor.c:582
 msgid "_Signature Name:"
 msgstr "_Signaturname:"
 
-#: ../src/e-util/e-mail-signature-editor.c:637
+#: ../src/e-util/e-mail-signature-editor.c:618
 msgid "Unnamed"
 msgstr "Namenlose"
 
-#: ../src/e-util/e-mail-signature-manager.c:338
+#: ../src/e-util/e-mail-signature-manager.c:334
 msgid "Add _Script"
 msgstr "_Skript hinzufügen"
 
-#: ../src/e-util/e-mail-signature-manager.c:444
+#: ../src/e-util/e-mail-signature-manager.c:440
 msgid "Add Signature Script"
 msgstr "Signaturskript hinzufügen"
 
-#: ../src/e-util/e-mail-signature-manager.c:538
+#: ../src/e-util/e-mail-signature-manager.c:534
 msgid "Edit Signature Script"
 msgstr "Signatur bearbeiten"
 
-#: ../src/e-util/e-mail-signature-script-dialog.c:394
+#: ../src/e-util/e-mail-signature-script-dialog.c:386
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -15081,19 +15142,19 @@ msgstr ""
 "verwendet. Der von Ihnen angegebene Name\n"
 "wird lediglich zur Anzeige verwendet."
 
-#: ../src/e-util/e-mail-signature-script-dialog.c:445
+#: ../src/e-util/e-mail-signature-script-dialog.c:437
 msgid "S_cript:"
 msgstr "_Skript:"
 
-#: ../src/e-util/e-mail-signature-script-dialog.c:476
+#: ../src/e-util/e-mail-signature-script-dialog.c:468
 msgid "Script file must be executable."
 msgstr "Die Skriptdatei muss ausführbar sein."
 
-#: ../src/e-util/e-map.c:886
+#: ../src/e-util/e-map.c:883
 msgid "World Map"
 msgstr "Weltkarte"
 
-#: ../src/e-util/e-map.c:889
+#: ../src/e-util/e-map.c:886
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users should "
 "instead select the timezone from the drop-down combination box below."
@@ -15129,12 +15190,12 @@ msgstr "Aufgabenliste »%s« wird geöffnet"
 msgid "Opening address book “%s”"
 msgstr "Adressbuch »%s« wird geöffnet"
 
-#: ../src/e-util/e-misc-utils.c:3351
+#: ../src/e-util/e-misc-utils.c:3348
 #: ../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:3979
+#: ../src/e-util/e-misc-utils.c:3976
 msgid ""
 "This address book server might be unreachable or the server name may be misspelled "
 "or your network connection could be down."
@@ -15142,17 +15203,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:3991
+#: ../src/e-util/e-misc-utils.c:3988
 #, 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:4003
+#: ../src/e-util/e-misc-utils.c:4000
 #, 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:4017
+#: ../src/e-util/e-misc-utils.c:4014
 #, c-format
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support this "
@@ -15167,7 +15228,7 @@ msgstr ""
 "\n"
 "Ausführliche Fehlermeldung (%d): %s"
 
-#: ../src/e-util/e-misc-utils.c:4028
+#: ../src/e-util/e-misc-utils.c:4025
 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 "
@@ -15177,12 +15238,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:4061
+#: ../src/e-util/e-misc-utils.c:4058
 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:4384
+#: ../src/e-util/e-misc-utils.c:4381
 #, c-format
 msgctxt "language"
 msgid "Unknown (%s)"
@@ -15190,31 +15251,31 @@ 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:4393
+#: ../src/e-util/e-misc-utils.c:4390
 #, c-format
 msgctxt "language"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../src/e-util/e-misc-utils.c:4551
+#: ../src/e-util/e-misc-utils.c:4541
 #, c-format
 msgid "Click to call %s"
 msgstr "Klicken Sie hier, um %s anzurufen"
 
-#: ../src/e-util/e-misc-utils.c:4553
+#: ../src/e-util/e-misc-utils.c:4543
 msgid "Click to hide/unhide addresses"
 msgstr "Adressen anzeigen/verbergen"
 
-#: ../src/e-util/e-misc-utils.c:4566
+#: ../src/e-util/e-misc-utils.c:4556
 #, c-format
 msgid "Go to the section %s of the message"
 msgstr "Zu Abschnitt »%s« in der Nachricht springen"
 
-#: ../src/e-util/e-misc-utils.c:4568
+#: ../src/e-util/e-misc-utils.c:4558
 msgid "Go to the beginning of the message"
 msgstr "Zum Anfang der aktuellen Zeile springen"
 
-#: ../src/e-util/e-misc-utils.c:4574
+#: ../src/e-util/e-misc-utils.c:4564
 #, c-format
 msgid "Click to open %s"
 msgstr "Klicken Sie hier, um %s zu öffnen"
@@ -15236,7 +15297,7 @@ msgid "_Search:"
 msgstr "_Suchen:"
 
 #: ../src/e-util/e-name-selector-dialog.c:363
-#: ../src/e-util/e-name-selector-dialog.c:1325
+#: ../src/e-util/e-name-selector-dialog.c:1322
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1271
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1654
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:783
@@ -15258,25 +15319,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:3255
+#: ../src/e-util/e-name-selector-entry.c:3222
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "%s aus_klappen"
 
 #. Copy Contact Item
-#: ../src/e-util/e-name-selector-entry.c:3271
+#: ../src/e-util/e-name-selector-entry.c:3238
 #, c-format
 msgid "Cop_y %s"
 msgstr "%s _kopieren"
 
 #. Cut Contact Item
-#: ../src/e-util/e-name-selector-entry.c:3282
+#: ../src/e-util/e-name-selector-entry.c:3249
 #, c-format
 msgid "C_ut %s"
 msgstr "%s ausschnei_den"
 
 #. Edit Contact item
-#: ../src/e-util/e-name-selector-entry.c:3300
+#: ../src/e-util/e-name-selector-entry.c:3267
 #, c-format
 msgid "_Edit %s"
 msgstr "%s _bearbeiten"
@@ -15330,7 +15391,7 @@ msgstr "Dieses Passwort _merken"
 msgid "_Remember this password for the remainder of this session"
 msgstr "Für den Rest dieser Sitzung an dieses Passwort _erinnern"
 
-#: ../src/e-util/e-preferences-window.c:329
+#: ../src/e-util/e-preferences-window.c:326
 msgid "Evolution Preferences"
 msgstr "Evolution-Einstellungen"
 
@@ -15427,11 +15488,11 @@ msgstr "Ein neues Proxy-Profil anlegen"
 msgid "Delete the selected proxy profile"
 msgstr "Das gewählte Proxy-Profil löschen"
 
-#: ../src/e-util/e-rule-editor.c:191
+#: ../src/e-util/e-rule-editor.c:188
 msgid "Add Rule"
 msgstr "Regel hinzufügen"
 
-#: ../src/e-util/e-rule-editor.c:302
+#: ../src/e-util/e-rule-editor.c:299
 msgid "Edit Rule"
 msgstr "Regel bearbeiten"
 
@@ -15440,35 +15501,35 @@ msgstr "Regel bearbeiten"
 msgid "Matches: %u"
 msgstr "Stimmt überein mit: %u"
 
-#: ../src/e-util/e-search-bar.c:624
+#: ../src/e-util/e-search-bar.c:597
 msgid "Close the find bar"
 msgstr "Die Suchleiste schließen"
 
-#: ../src/e-util/e-search-bar.c:632
+#: ../src/e-util/e-search-bar.c:605
 msgid "Fin_d:"
 msgstr "_Suchen:"
 
-#: ../src/e-util/e-search-bar.c:644
+#: ../src/e-util/e-search-bar.c:617
 msgid "Clear the search"
 msgstr "Das Suchfeld leeren"
 
-#: ../src/e-util/e-search-bar.c:671
+#: ../src/e-util/e-search-bar.c:644
 msgid "Find the previous occurrence of the phrase"
 msgstr "Den letzten Suchtreffer finden"
 
-#: ../src/e-util/e-search-bar.c:683
+#: ../src/e-util/e-search-bar.c:656
 msgid "Find the next occurrence of the phrase"
 msgstr "Den nächsten Suchtreffer finden"
 
-#: ../src/e-util/e-search-bar.c:692
+#: ../src/e-util/e-search-bar.c:665
 msgid "Mat_ch case"
 msgstr "_Groß-/Kleinschreibung berücksichtigen"
 
-#: ../src/e-util/e-search-bar.c:720
+#: ../src/e-util/e-search-bar.c:693
 msgid "Reached bottom of page, continued from top"
 msgstr "Seitenende erreicht, ab Anfang wird fortgesetzt"
 
-#: ../src/e-util/e-search-bar.c:742
+#: ../src/e-util/e-search-bar.c:715
 msgid "Reached top of page, continued from bottom"
 msgstr "Seitenanfang erreicht, ab Ende wird fortgesetzt"
 
@@ -15621,33 +15682,33 @@ msgstr "Rücksendemitteilung"
 msgid "Sta_tus Tracking"
 msgstr "Sta_tusverfolgung"
 
-#: ../src/e-util/e-source-config.c:725 ../src/e-util/e-source-config.c:729
+#: ../src/e-util/e-source-config.c:689 ../src/e-util/e-source-config.c:693
 msgid "Type:"
 msgstr "Art:"
 
-#: ../src/e-util/e-source-config.c:739 ../src/e-util/e-source-config.c:743
+#: ../src/e-util/e-source-config.c:703 ../src/e-util/e-source-config.c:707
 msgid "Name:"
 msgstr "Name:"
 
-#: ../src/e-util/e-source-config.c:850 ../src/e-util/e-webdav-browser.c:1822
+#: ../src/e-util/e-source-config.c:814 ../src/e-util/e-webdav-browser.c:1822
 msgid "Name cannot be empty"
 msgstr "Name darf nicht leer sein"
 
 #. Translators: This is the first of a sequence of widgets:
 #. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../src/e-util/e-source-config.c:1417
+#: ../src/e-util/e-source-config.c:1381
 msgid "Refresh every"
 msgstr "Aktualisieren alle"
 
-#: ../src/e-util/e-source-config.c:1447 ../src/e-util/e-source-config.c:1521
+#: ../src/e-util/e-source-config.c:1411 ../src/e-util/e-source-config.c:1485
 msgid "Use a secure connection"
 msgstr "Eine sichere Verbindung verwenden"
 
-#: ../src/e-util/e-source-config.c:1548
+#: ../src/e-util/e-source-config.c:1512
 msgid "Unset _trust for SSL/TLS certificate"
 msgstr "_Vertrauenswürdigkeit des SSL/TLS-Zertifikats zurücknehmen"
 
-#: ../src/e-util/e-source-config.c:1584
+#: ../src/e-util/e-source-config.c:1548
 msgid "User:"
 msgstr "Benutzer:"
 
@@ -15823,7 +15884,7 @@ msgstr ""
 msgid "Failed to refresh list of account sources"
 msgstr "Liste der Kontenquellen konnte nicht aktualisiert werden"
 
-#: ../src/e-util/e-table-click-to-add.c:688
+#: ../src/e-util/e-table-click-to-add.c:686
 #: ../src/e-util/gal-a11y-e-table-click-to-add.c:59
 #: ../src/e-util/gal-a11y-e-table-click-to-add.c:140
 msgid "click to add"
@@ -15849,27 +15910,27 @@ msgstr "Ausgewählte Spaltennamen nach unten verschieben"
 msgid "Select all column names"
 msgstr "Alle Spaltennamen auswählen"
 
-#: ../src/e-util/e-table-config.c:388 ../src/e-util/e-table-config.c:434
+#: ../src/e-util/e-table-config.c:380 ../src/e-util/e-table-config.c:426
 msgid "(Ascending)"
 msgstr "(Aufsteigend)"
 
-#: ../src/e-util/e-table-config.c:388 ../src/e-util/e-table-config.c:434
+#: ../src/e-util/e-table-config.c:380 ../src/e-util/e-table-config.c:426
 msgid "(Descending)"
 msgstr "(Absteigend)"
 
-#: ../src/e-util/e-table-config.c:395
+#: ../src/e-util/e-table-config.c:387
 msgid "Not sorted"
 msgstr "Nicht sortiert"
 
-#: ../src/e-util/e-table-config.c:440
+#: ../src/e-util/e-table-config.c:432
 msgid "No grouping"
 msgstr "Nicht gruppieren"
 
-#: ../src/e-util/e-table-config.c:545
+#: ../src/e-util/e-table-config.c:537
 msgid "Show Fields"
 msgstr "Felder anzeigen"
 
-#: ../src/e-util/e-table-config.c:559
+#: ../src/e-util/e-table-config.c:551
 msgid "Choose the order of information to appear in the message list."
 msgstr ""
 "Wählen Sie die Reihenfolge der Informationen, die in der Nachrichtenliste "
@@ -15883,11 +15944,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:1792
+#: ../src/e-util/e-table-config.ui.h:6 ../src/e-util/e-table-header-item.c:1778
 msgid "Ascending"
 msgstr "Aufsteigend"
 
-#: ../src/e-util/e-table-config.ui.h:7 ../src/e-util/e-table-header-item.c:1792
+#: ../src/e-util/e-table-config.ui.h:7 ../src/e-util/e-table-header-item.c:1778
 msgid "Descending"
 msgstr "Absteigend"
 
@@ -15947,7 +16008,7 @@ msgstr ""
 "Um eine Spalte zur Tabelle hinzuzufügen, ziehen Sie\n"
 "sie an die Stelle, an der die Spalte erscheinen soll."
 
-#: ../src/e-util/e-table-field-chooser-dialog.c:224
+#: ../src/e-util/e-table-field-chooser-dialog.c:216
 msgid "Add a Column"
 msgstr "Spalte hinzufügen"
 
@@ -15958,7 +16019,7 @@ msgstr "Spalte hinzufügen"
 #. * Finally the %d is replaced with count of items in this group.
 #. * Example: "Family name: Smith (13 items)"
 #.
-#: ../src/e-util/e-table-group-container.c:366
+#: ../src/e-util/e-table-group-container.c:355
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
@@ -15971,83 +16032,83 @@ msgstr[1] "%s: %s (%d Objekte)"
 #. * The %d is replaced with count of items in this group.
 #. * Example: "Smith (13 items)"
 #.
-#: ../src/e-util/e-table-group-container.c:380
+#: ../src/e-util/e-table-group-container.c:369
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d Objekt)"
 msgstr[1] "%s (%d Objekte)"
 
-#: ../src/e-util/e-table-header-item.c:1610
+#: ../src/e-util/e-table-header-item.c:1596
 msgid "Customize Current View"
 msgstr "Aktuelle Ansicht anpassen"
 
-#: ../src/e-util/e-table-header-item.c:1642
+#: ../src/e-util/e-table-header-item.c:1628
 msgid "Sort _Ascending"
 msgstr "A_ufsteigend sortieren"
 
-#: ../src/e-util/e-table-header-item.c:1645
+#: ../src/e-util/e-table-header-item.c:1631
 msgid "Sort _Descending"
 msgstr "A_bsteigend sortieren"
 
-#: ../src/e-util/e-table-header-item.c:1648
+#: ../src/e-util/e-table-header-item.c:1634
 msgid "_Reset sort"
 msgstr "Sortierung _zurücksetzen"
 
-#: ../src/e-util/e-table-header-item.c:1651
+#: ../src/e-util/e-table-header-item.c:1637
 msgid "Group By This _Field"
 msgstr "Nach diesem _Feld gruppieren"
 
-#: ../src/e-util/e-table-header-item.c:1654
+#: ../src/e-util/e-table-header-item.c:1640
 msgid "Group By _Box"
 msgstr "Nach Fäc_hern gruppieren"
 
-#: ../src/e-util/e-table-header-item.c:1658
+#: ../src/e-util/e-table-header-item.c:1644
 msgid "Remove This _Column"
 msgstr "_Diese Spalte entfernen"
 
-#: ../src/e-util/e-table-header-item.c:1661
+#: ../src/e-util/e-table-header-item.c:1647
 msgid "Add a C_olumn…"
 msgstr "Spalte _hinzufügen …"
 
-#: ../src/e-util/e-table-header-item.c:1665
+#: ../src/e-util/e-table-header-item.c:1651
 msgid "A_lignment"
 msgstr "Aus_richtung"
 
-#: ../src/e-util/e-table-header-item.c:1668
+#: ../src/e-util/e-table-header-item.c:1654
 msgid "B_est Fit"
 msgstr "_Optimal"
 
-#: ../src/e-util/e-table-header-item.c:1671
+#: ../src/e-util/e-table-header-item.c:1657
 msgid "Format Column_s…"
 msgstr "Spalten for_matieren …"
 
-#: ../src/e-util/e-table-header-item.c:1675
+#: ../src/e-util/e-table-header-item.c:1661
 #: ../src/shell/e-shell-window-actions.c:1239
 msgid "Custo_mize Current View…"
 msgstr "Aktuelle Ansicht an_passen …"
 
-#: ../src/e-util/e-table-header-item.c:1742
+#: ../src/e-util/e-table-header-item.c:1728
 msgid "_Sort By"
 msgstr "_Sortieren nach"
 
 #. Custom
-#: ../src/e-util/e-table-header-item.c:1765
+#: ../src/e-util/e-table-header-item.c:1751
 msgid "_Custom"
 msgstr "_Benutzerdefiniert"
 
-#: ../src/e-util/e-text.c:2105
+#: ../src/e-util/e-text.c:2090
 msgid "Select All"
 msgstr "Alle auswählen"
 
-#: ../src/e-util/e-text.c:2118
+#: ../src/e-util/e-text.c:2103
 msgid "Input Methods"
 msgstr "Eingabemethoden"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../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
+#: ../src/e-util/e-timezone-dialog.c:270 ../src/e-util/e-timezone-dialog.c:510
+#: ../src/e-util/e-timezone-dialog.c:514 ../src/e-util/e-timezone-dialog.c:518
+#: ../src/e-util/e-timezone-dialog.c:1005
 msgid "UTC"
 msgstr "UTC"
 
@@ -16077,28 +16138,28 @@ msgstr "Au_swahl"
 msgid "Timezone drop-down combination box"
 msgstr "Auswahlliste für die Zeitzone"
 
-#: ../src/e-util/e-url-entry.c:102
+#: ../src/e-util/e-url-entry.c:155
 msgid "Click here to open the URL"
 msgstr "Klicken Sie hier, um die Adresse zu öffnen"
 
-#: ../src/e-util/e-url-entry.c:104
+#: ../src/e-util/e-url-entry.c:192
 msgid "Enter a URL here"
 msgstr "Geben Sie hier eine Adresse ein"
 
-#: ../src/e-util/evolution-source-viewer.c:638
+#: ../src/e-util/evolution-source-viewer.c:632
 msgid "Evolution Source Viewer"
 msgstr "Evolution Quellansicht"
 
 #. Translators: The name that is displayed in the user interface
-#: ../src/e-util/evolution-source-viewer.c:668
+#: ../src/e-util/evolution-source-viewer.c:662
 msgid "Display Name"
 msgstr "Angezeigter Name"
 
-#: ../src/e-util/evolution-source-viewer.c:677
+#: ../src/e-util/evolution-source-viewer.c:671
 msgid "Flags"
 msgstr "Markierungen"
 
-#: ../src/e-util/evolution-source-viewer.c:729
+#: ../src/e-util/evolution-source-viewer.c:723
 #: ../src/mail/e-mail-config-identity-page.c:1231
 msgid "Identity"
 msgstr "Identität"
@@ -16282,24 +16343,24 @@ msgstr "_Internet durchsuchen …"
 msgid "Search the Web with the selected text"
 msgstr "Das Internet nach dem ausgewählten Text durchsuchen"
 
-#: ../src/e-util/e-web-view.c:487 ../src/e-util/e-web-view.c:2017
+#: ../src/e-util/e-web-view.c:487 ../src/e-util/e-web-view.c:2014
 msgid "Select all text and images"
 msgstr "Den gesamten Text und Bilder in einer Nachricht markieren"
 
-#: ../src/e-util/e-web-view.c:3743
+#: ../src/e-util/e-web-view.c:3740
 msgid "Copying image to clipboard"
 msgstr "Das Bild wird in die Zwischenablage kopiert"
 
-#: ../src/e-util/e-web-view.c:3931
+#: ../src/e-util/e-web-view.c:3928
 msgid "Save Image"
 msgstr "Bild speichern"
 
-#: ../src/e-util/e-web-view.c:3968
+#: ../src/e-util/e-web-view.c:3965
 #, c-format
 msgid "Saving image to “%s”"
 msgstr "Bild wird als »%s« gespeichert"
 
-#: ../src/e-util/e-web-view.c:4115
+#: ../src/e-util/e-web-view.c:4112
 #, c-format
 msgid "Cannot get URI “%s”, do not know how to download it."
 msgstr ""
@@ -16470,7 +16531,7 @@ msgstr "_Filterregeln"
 msgid "Rule Name"
 msgstr "Regelname"
 
-#: ../src/e-util/gal-a11y-e-cell.c:128
+#: ../src/e-util/gal-a11y-e-cell.c:125
 msgid "Table Cell"
 msgstr "Zelle"
 
@@ -16503,11 +16564,11 @@ msgstr "Die Zeile des ETrees einrollen, die diese Zelle enthält"
 msgid "click"
 msgstr "Klicken"
 
-#: ../src/e-util/gal-a11y-e-table-column-header.c:161
+#: ../src/e-util/gal-a11y-e-table-column-header.c:158
 msgid "sort"
 msgstr "Sortieren"
 
-#: ../src/e-util/gal-view-instance-save-as-dialog.c:293
+#: ../src/e-util/gal-view-instance-save-as-dialog.c:291
 msgid "Save Current View"
 msgstr "Aktuelle Ansicht speichern"
 
@@ -16650,12 +16711,12 @@ msgstr "Verschickt"
 msgid "Templates"
 msgstr "Vorlagen"
 
-#: ../src/libemail-engine/e-mail-session.c:1514
+#: ../src/libemail-engine/e-mail-session.c:1504
 #, c-format
 msgid "User cancelled operation"
 msgstr "Vorgang wurde vom Benutzer abgebrochen"
 
-#: ../src/libemail-engine/e-mail-session.c:1575
+#: ../src/libemail-engine/e-mail-session.c:1565
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been cancelled."
@@ -16663,27 +16724,27 @@ msgstr ""
 "Das Weiterleiten der Nachricht wurde abgebrochen, da keine Zieladresse angegeben "
 "wurde."
 
-#: ../src/libemail-engine/e-mail-session.c:1588
+#: ../src/libemail-engine/e-mail-session.c:1578
 #, 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:1789
+#: ../src/libemail-engine/e-mail-session.c:1779
 #, 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:1909
+#: ../src/libemail-engine/e-mail-session.c:1899
 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:1911
+#: ../src/libemail-engine/e-mail-session.c:1901
 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:2958
+#: ../src/libemail-engine/e-mail-session.c:2948
 #, c-format
 msgid "Waiting for “%s”"
 msgstr "Warten auf »%s«"
@@ -16693,26 +16754,26 @@ msgid "No mail transport service available"
 msgstr "Keine E-Mail-Dienste verfügbar"
 
 #: ../src/libemail-engine/e-mail-session-utils.c:618
-#: ../src/libemail-engine/mail-ops.c:708
+#: ../src/libemail-engine/mail-ops.c:705
 #, c-format
 msgid "Posting message to “%s”"
 msgstr "Nachricht wird an »%s« verschickt"
 
 #: ../src/libemail-engine/e-mail-session-utils.c:656
-#: ../src/libemail-engine/mail-ops.c:744
+#: ../src/libemail-engine/mail-ops.c:741
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Ausgangsfilter konnten nicht angewandt werden: %s"
 
 #: ../src/libemail-engine/e-mail-session-utils.c:689
 #: ../src/libemail-engine/e-mail-session-utils.c:724
-#: ../src/libemail-engine/mail-ops.c:772 ../src/libemail-engine/mail-ops.c:807
+#: ../src/libemail-engine/mail-ops.c:769 ../src/libemail-engine/mail-ops.c:804
 #, c-format
 msgid "Storing sent message to “%s”"
 msgstr "An »%s« verschickte Nachricht wird abgelegt"
 
 #: ../src/libemail-engine/e-mail-session-utils.c:713
-#: ../src/libemail-engine/mail-ops.c:796
+#: ../src/libemail-engine/mail-ops.c:793
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -16722,13 +16783,13 @@ msgstr ""
 "Stattdessen wird versucht, an den lokalen »Verschickt«-Ordner anzuhängen."
 
 #: ../src/libemail-engine/e-mail-session-utils.c:743
-#: ../src/libemail-engine/mail-ops.c:824
+#: ../src/libemail-engine/mail-ops.c:821
 #, c-format
 msgid "Failed to append to local “Sent” folder: %s"
 msgstr "Anhängen an lokalen »Verschickt«-Ordner gescheitert: %s"
 
 #: ../src/libemail-engine/e-mail-session-utils.c:936
-#: ../src/libemail-engine/mail-ops.c:1020 ../src/libemail-engine/mail-ops.c:1135
+#: ../src/libemail-engine/mail-ops.c:1017 ../src/libemail-engine/mail-ops.c:1129
 #: ../src/mail/mail-send-recv.c:665
 msgid "Sending message"
 msgstr "Nachricht wird verschickt"
@@ -16770,7 +16831,7 @@ msgstr ""
 msgid "Fetching mail from “%s”"
 msgstr "E-Mail wird von »%s« abgerufen"
 
-#: ../src/libemail-engine/mail-ops.c:738
+#: ../src/libemail-engine/mail-ops.c:735
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set in "
@@ -16783,7 +16844,7 @@ msgstr ""
 "prüfen Sie Ihre Filter unter Bearbeiten→Nachrichtenfilter.\n"
 "Ursprüngliche Fehlermeldung ist: %s"
 
-#: ../src/libemail-engine/mail-ops.c:1031
+#: ../src/libemail-engine/mail-ops.c:1028
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Nachricht %d von %d wird verschickt"
@@ -16791,52 +16852,52 @@ msgstr "Nachricht %d von %d wird verschickt"
 #. Translators: The string is distinguished by total
 #. * count of messages to be sent.  Failed messages is
 #. * always more than zero.
-#: ../src/libemail-engine/mail-ops.c:1089
+#: ../src/libemail-engine/mail-ops.c:1086
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
 msgstr[0] "Eine Nachricht konnte nicht verschickt werden"
 msgstr[1] "%d von %d Nachrichten konnten nicht verschickt werden"
 
-#: ../src/libemail-engine/mail-ops.c:1095
+#: ../src/libemail-engine/mail-ops.c:1092
 msgid "Cancelled."
 msgstr "Abgebrochen."
 
-#: ../src/libemail-engine/mail-ops.c:1097
+#: ../src/libemail-engine/mail-ops.c:1094
 msgid "Complete."
 msgstr "Abgeschlossen."
 
-#: ../src/libemail-engine/mail-ops.c:1221
+#: ../src/libemail-engine/mail-ops.c:1215
 #, c-format
 msgid "Moving messages to “%s”"
 msgstr "Nachrichten werden nach »%s« verschoben"
 
-#: ../src/libemail-engine/mail-ops.c:1222
+#: ../src/libemail-engine/mail-ops.c:1216
 #, c-format
 msgid "Copying messages to “%s”"
 msgstr "Nachrichten werden nach »%s« kopiert"
 
-#: ../src/libemail-engine/mail-ops.c:1341
+#: ../src/libemail-engine/mail-ops.c:1335
 #, c-format
 msgid "Storing folder “%s”"
 msgstr "Ordner »%s« wird gespeichert"
 
-#: ../src/libemail-engine/mail-ops.c:1469
+#: ../src/libemail-engine/mail-ops.c:1463
 #, c-format
 msgid "Expunging and storing account “%s”"
 msgstr "Konto »%s« wird gesäubert und gespeichert"
 
-#: ../src/libemail-engine/mail-ops.c:1470
+#: ../src/libemail-engine/mail-ops.c:1464
 #, c-format
 msgid "Storing account “%s”"
 msgstr "Konto »%s« wird gespeichert"
 
-#: ../src/libemail-engine/mail-ops.c:1545
+#: ../src/libemail-engine/mail-ops.c:1539
 #, c-format
 msgid "Emptying trash in “%s”"
 msgstr "Papierkorb in »%s« wird geleert"
 
-#: ../src/libemail-engine/mail-ops.c:1644
+#: ../src/libemail-engine/mail-ops.c:1638
 #, c-format
 msgid "Processing folder changes in “%s”"
 msgstr "Veränderungen an Ordner »%s« werden verarbeitet"
@@ -17004,11 +17065,11 @@ msgstr "_Zurück gehen"
 msgid "_Skip Lookup"
 msgstr "Nachschlagen _überspringen"
 
-#: ../src/mail/e-mail-config-assistant.c:725
+#: ../src/mail/e-mail-config-assistant.c:697
 msgid "Evolution Account Assistant"
 msgstr "Evolution-Kontoassistent"
 
-#: ../src/mail/e-mail-config-assistant.c:1032
+#: ../src/mail/e-mail-config-assistant.c:1004
 msgid "_Revise Details"
 msgstr "Details ü_berarbeiten"
 
@@ -17217,7 +17278,7 @@ msgstr ""
 "verschickten E-Mails einschließen."
 
 #: ../src/mail/e-mail-config-identity-page.c:580
-#: ../src/mail/e-mail-config-summary-page.c:355
+#: ../src/mail/e-mail-config-summary-page.c:348
 msgid ""
 "The above name will be used to identify this account.\n"
 "Use for example, “Work” or “Personal”."
@@ -17271,7 +17332,7 @@ msgstr ""
 #. complete = complete && correct;
 #: ../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."
+msgstr "Das Feld »Vollständiger Name« sollte nicht leer sein"
 
 #: ../src/mail/e-mail-config-identity-page.c:942
 msgid "Email Address cannot be empty"
@@ -17286,7 +17347,7 @@ msgid "Reply To is not a valid email"
 msgstr "Antwortadresse ist ungültig"
 
 #: ../src/mail/e-mail-config-identity-page.c:970
-#: ../src/mail/e-mail-config-summary-page.c:637
+#: ../src/mail/e-mail-config-summary-page.c:630
 msgid "Account Name cannot be empty"
 msgstr "Kontoname darf nicht leer sein"
 
@@ -17302,7 +17363,7 @@ msgstr "Nach neuen E-Mails sehen"
 msgid "Check for _new messages every"
 msgstr "_Automatisch nach neuen E-Mails sehen alle"
 
-#: ../src/mail/e-mail-config-provider-page.c:767
+#: ../src/mail/e-mail-config-provider-page.c:763
 msgid "Receiving Options"
 msgstr "Empfangsoptionen"
 
@@ -17312,115 +17373,115 @@ msgstr "Abrufen von E-Mails"
 
 #. Translators: This string is to describe a PGP key in a combo box in mail account's preferences.
 #. The first '%s' is a key ID, the second '%s' is a display name of the key.
-#: ../src/mail/e-mail-config-security-page.c:379
+#: ../src/mail/e-mail-config-security-page.c:375
 #, c-format
 msgctxt "PGPKeyDescription"
 msgid "%s — %s"
 msgstr "%s — %s"
 
-#: ../src/mail/e-mail-config-security-page.c:460
+#: ../src/mail/e-mail-config-security-page.c:456
 #: ../src/mail/em-folder-properties.c:1396 ../src/mail/mail-config.ui.h:34
 #: ../src/modules/addressbook/autocompletion-config.c:115
 #: ../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:822
+#: ../src/modules/mail/e-mail-shell-backend.c:1001
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "General"
 msgstr "Allgemein"
 
-#: ../src/mail/e-mail-config-security-page.c:469
+#: ../src/mail/e-mail-config-security-page.c:465
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Besprechungsanfragen nicht signieren (zur Kompatibilität mit Outlook)"
 
-#: ../src/mail/e-mail-config-security-page.c:491
+#: ../src/mail/e-mail-config-security-page.c:487
 msgid "Pretty Good Privacy (OpenPGP)"
 msgstr "Pretty Good Privacy (OpenPGP)"
 
-#: ../src/mail/e-mail-config-security-page.c:500
+#: ../src/mail/e-mail-config-security-page.c:496
 msgid "OpenPGP _Key ID:"
 msgstr "OpenPGP-_Schlüsselkennung:"
 
-#: ../src/mail/e-mail-config-security-page.c:531
+#: ../src/mail/e-mail-config-security-page.c:527
 msgid "Si_gning algorithm:"
 msgstr "Si_gnaturalgorithmus:"
 
-#: ../src/mail/e-mail-config-security-page.c:547
-#: ../src/mail/e-mail-config-security-page.c:711 ../src/mail/mail-config.ui.h:79
+#: ../src/mail/e-mail-config-security-page.c:543
+#: ../src/mail/e-mail-config-security-page.c:707 ../src/mail/mail-config.ui.h:79
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../src/mail/e-mail-config-security-page.c:550
-#: ../src/mail/e-mail-config-security-page.c:714 ../src/mail/mail-config.ui.h:80
+#: ../src/mail/e-mail-config-security-page.c:546
+#: ../src/mail/e-mail-config-security-page.c:710 ../src/mail/mail-config.ui.h:80
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../src/mail/e-mail-config-security-page.c:553
-#: ../src/mail/e-mail-config-security-page.c:717 ../src/mail/mail-config.ui.h:81
+#: ../src/mail/e-mail-config-security-page.c:549
+#: ../src/mail/e-mail-config-security-page.c:713 ../src/mail/mail-config.ui.h:81
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../src/mail/e-mail-config-security-page.c:556
-#: ../src/mail/e-mail-config-security-page.c:720 ../src/mail/mail-config.ui.h:82
+#: ../src/mail/e-mail-config-security-page.c:552
+#: ../src/mail/e-mail-config-security-page.c:716 ../src/mail/mail-config.ui.h:82
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../src/mail/e-mail-config-security-page.c:572
+#: ../src/mail/e-mail-config-security-page.c:568
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "Aus diesem Konto ausgehende Nachrichten _immer signieren"
 
-#: ../src/mail/e-mail-config-security-page.c:584
+#: ../src/mail/e-mail-config-security-page.c:580
 msgid "Always enc_rypt outgoing messages when using this account"
 msgstr "Aus diesem Konto ausgehende Nachrichten immer _verschlüsseln"
 
-#: ../src/mail/e-mail-config-security-page.c:596
+#: ../src/mail/e-mail-config-security-page.c:592
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr ""
 "Beim Verschicken verschlüsselter E-Mails _immer für mich selbst verschlüsseln"
 
-#: ../src/mail/e-mail-config-security-page.c:608
+#: ../src/mail/e-mail-config-security-page.c:604
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Schlüsseln des eigenen Schlüsselbunds beim Verschlüsseln _immer vertrauen"
 
-#: ../src/mail/e-mail-config-security-page.c:620
+#: ../src/mail/e-mail-config-security-page.c:616
 msgid "Prefer _inline sign/encrypt for plain text messages"
 msgstr "E_ingebettetes Signieren / Verschlüsseln für Klartextnachrichten bevorzugen"
 
-#: ../src/mail/e-mail-config-security-page.c:644
+#: ../src/mail/e-mail-config-security-page.c:640
 msgid "Secure MIME (S/MIME)"
 msgstr "Sicheres MIME (S/MIME)"
 
-#: ../src/mail/e-mail-config-security-page.c:653
+#: ../src/mail/e-mail-config-security-page.c:649
 msgid "Sig_ning certificate:"
 msgstr "Signatur_zertifikat:"
 
-#: ../src/mail/e-mail-config-security-page.c:677
-#: ../src/mail/e-mail-config-security-page.c:775
+#: ../src/mail/e-mail-config-security-page.c:673
+#: ../src/mail/e-mail-config-security-page.c:771
 msgid "Select"
 msgstr "Auswählen"
 
-#: ../src/mail/e-mail-config-security-page.c:686
-#: ../src/mail/e-mail-config-security-page.c:784
+#: ../src/mail/e-mail-config-security-page.c:682
+#: ../src/mail/e-mail-config-security-page.c:780
 #: ../src/shell/e-shell-window-actions.c:980
 msgid "_Clear"
 msgstr "_Leeren"
 
-#: ../src/mail/e-mail-config-security-page.c:695
+#: ../src/mail/e-mail-config-security-page.c:691
 msgid "Signing _algorithm:"
 msgstr "Signatur_algorithmus:"
 
-#: ../src/mail/e-mail-config-security-page.c:736
+#: ../src/mail/e-mail-config-security-page.c:732
 msgid "Always sign outgoing messages when using this account"
 msgstr "Aus diesem Konto ausgehende Nachrichten immer signieren"
 
-#: ../src/mail/e-mail-config-security-page.c:751
+#: ../src/mail/e-mail-config-security-page.c:747
 msgid "Encryption certificate:"
 msgstr "Verschlüsselungszertifikat:"
 
-#: ../src/mail/e-mail-config-security-page.c:793
+#: ../src/mail/e-mail-config-security-page.c:789
 msgid "Always encrypt outgoing messages when using this account"
 msgstr "Aus diesem Konto ausgehende Nachrichten immer verschlüsseln"
 
-#: ../src/mail/e-mail-config-security-page.c:805
+#: ../src/mail/e-mail-config-security-page.c:801
 msgid "Always encrypt to myself when sending encrypted messages"
 msgstr "Beim Verschicken verschlüsselter E-Mails immer für mich selbst verschlüsseln"
 
@@ -17428,59 +17489,59 @@ msgstr "Beim Verschicken verschlüsselter E-Mails immer für mich selbst verschl
 msgid "Sending Email"
 msgstr "Verschicken von E-Mails"
 
-#: ../src/mail/e-mail-config-service-page.c:501
+#: ../src/mail/e-mail-config-service-page.c:490
 msgid "Server _Type:"
 msgstr "_Server-Art:"
 
-#: ../src/mail/e-mail-config-summary-page.c:308
+#: ../src/mail/e-mail-config-summary-page.c:301
 msgid "This is a summary of the settings which will be used to access your mail."
 msgstr ""
 "Dies ist eine Zusammenfassung der Einstellungen, die zum Zugriff auf Ihre "
 "Nachrichten verwendet werden."
 
-#: ../src/mail/e-mail-config-summary-page.c:372
+#: ../src/mail/e-mail-config-summary-page.c:365
 msgid "Personal Details"
 msgstr "Persönliche Angaben"
 
-#: ../src/mail/e-mail-config-summary-page.c:381
+#: ../src/mail/e-mail-config-summary-page.c:374
 msgid "Full Name:"
 msgstr "Voller Name:"
 
-#: ../src/mail/e-mail-config-summary-page.c:395
+#: ../src/mail/e-mail-config-summary-page.c:388
 msgid "Email Address:"
 msgstr "E-Mail-Adresse:"
 
-#: ../src/mail/e-mail-config-summary-page.c:409
+#: ../src/mail/e-mail-config-summary-page.c:402
 msgid "Receiving"
 msgstr "Abrufen läuft"
 
-#: ../src/mail/e-mail-config-summary-page.c:421
+#: ../src/mail/e-mail-config-summary-page.c:414
 msgid "Sending"
 msgstr "Verschicken läuft"
 
-#: ../src/mail/e-mail-config-summary-page.c:433
+#: ../src/mail/e-mail-config-summary-page.c:426
 msgid "Server Type:"
 msgstr "Server-Art:"
 
-#: ../src/mail/e-mail-config-summary-page.c:454
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:661
+#: ../src/mail/e-mail-config-summary-page.c:447
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:658
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/mail/e-mail-config-summary-page.c:475
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:779
+#: ../src/mail/e-mail-config-summary-page.c:468
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:776
 msgid "Username:"
 msgstr "Benutzername:"
 
-#: ../src/mail/e-mail-config-summary-page.c:496
+#: ../src/mail/e-mail-config-summary-page.c:489
 msgid "Security:"
 msgstr "Sicherheit:"
 
-#: ../src/mail/e-mail-config-summary-page.c:650
+#: ../src/mail/e-mail-config-summary-page.c:643
 msgid "Cannot have both receiving and sending parts set to None"
 msgstr "Empfangen und Senden kann nicht gleichzeitig auf Nichts gesetzt werden"
 
-#: ../src/mail/e-mail-config-summary-page.c:806
+#: ../src/mail/e-mail-config-summary-page.c:799
 msgid "Account Summary"
 msgstr "Konto-Zusammenfassung"
 
@@ -17495,11 +17556,11 @@ msgstr ""
 "Klicken Sie auf »Vor«, um die Konfiguration zu beginnen."
 
 #: ../src/mail/e-mail-config-welcome-page.c:172
-#: ../src/modules/startup-wizard/e-startup-assistant.c:182
+#: ../src/modules/startup-wizard/e-startup-assistant.c:170
 msgid "Welcome"
 msgstr "Willkommen"
 
-#: ../src/mail/e-mail-config-window.c:329
+#: ../src/mail/e-mail-config-window.c:305
 msgid "Account Editor"
 msgstr "Konteneditor"
 
@@ -17571,24 +17632,24 @@ msgstr "_Anlegen"
 msgid "Folder _name:"
 msgstr "Ordner_name:"
 
-#: ../src/mail/e-mail-folder-sort-order-dialog.c:694
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:687
 msgid "Folder Sort Order"
 msgstr "Sortierreihenfolge des Ordners"
 
-#: ../src/mail/e-mail-folder-sort-order-dialog.c:735
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:728
 msgid "Reset c_urrent level"
-msgstr "A_ktuelle Ebene zurücksetzen "
+msgstr "A_ktuelle Ebene zurücksetzen"
 
-#: ../src/mail/e-mail-folder-sort-order-dialog.c:736
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:729
 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
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:739
 msgid "Reset _all levels"
-msgstr "A_lle Ebenen zurücksetzen "
+msgstr "A_lle Ebenen zurücksetzen"
 
-#: ../src/mail/e-mail-folder-sort-order-dialog.c:747
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:740
 msgid "Reset sort order in all levels to their defaults"
 msgstr "Sortierreihenfolge auf allen Ebenen auf die Voreinstellungen zurücksetzen"
 
@@ -17642,11 +17703,11 @@ msgctxt "ffe"
 msgid "false"
 msgstr "falsch"
 
-#: ../src/mail/e-mail-junk-options.c:296
+#: ../src/mail/e-mail-junk-options.c:289
 msgid "Junk filtering software:"
 msgstr "Software-Filter für unerwünschte Nachrichten:"
 
-#: ../src/mail/e-mail-label-dialog.c:222
+#: ../src/mail/e-mail-label-dialog.c:214
 msgid "_Label name:"
 msgstr "_Beschriftungsname:"
 
@@ -17674,16 +17735,16 @@ msgstr "Zu er_ledigen"
 msgid "_Later"
 msgstr "S_päter"
 
-#: ../src/mail/e-mail-label-manager.c:169 ../src/mail/e-mail-reader.c:905
+#: ../src/mail/e-mail-label-manager.c:153 ../src/mail/e-mail-reader.c:905
 #: ../src/mail/em-folder-properties.c:1170
 msgid "Add Label"
 msgstr "Beschriftung hinzufügen"
 
-#: ../src/mail/e-mail-label-manager.c:220 ../src/mail/em-folder-properties.c:1197
+#: ../src/mail/e-mail-label-manager.c:204 ../src/mail/em-folder-properties.c:1197
 msgid "Edit Label"
 msgstr "Beschriftung bearbeiten"
 
-#: ../src/mail/e-mail-label-manager.c:352
+#: ../src/mail/e-mail-label-manager.c:336
 msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
@@ -17784,7 +17845,7 @@ msgstr "_Nicht mehr nachfragen."
 
 #: ../src/mail/e-mail-reader.c:1946
 msgid "_Always ignore Reply-To: for mailing lists."
-msgstr "»_Antwort an« bei Mailinglisten immer ignorieren"
+msgstr "»_Antwort an« bei Mailinglisten immer ignorieren."
 
 #: ../src/mail/e-mail-reader.c:2150
 msgid "Failed to retrieve message:"
@@ -18264,10 +18325,8 @@ 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:2812
-#, fuzzy
-#| msgid "Apply t_emplate"
 msgid "Repl_y with Template"
-msgstr "Vorlage verw_enden"
+msgstr "Mit _Vorlage antworten"
 
 #: ../src/mail/e-mail-reader.c:2819
 msgid "_Save as mbox…"
@@ -18588,12 +18647,12 @@ msgstr "_Leeren"
 msgid "No Title"
 msgstr "Kein Titel"
 
-#: ../src/mail/e-mail-ui-session.c:855
+#: ../src/mail/e-mail-ui-session.c:841
 #, c-format
 msgid "%s authentication failed"
 msgstr "%s-Legitimation ist fehlgeschlagen"
 
-#: ../src/mail/e-mail-ui-session.c:905
+#: ../src/mail/e-mail-ui-session.c:891
 #, c-format
 msgid "No data source found for UID “%s”"
 msgstr "Keine Datenquelle gefunden für UID »%s«"
@@ -18786,7 +18845,7 @@ msgstr "Dann"
 msgid "De_scribe Filters…"
 msgstr "Filter _beschreiben …"
 
-#: ../src/mail/em-filter-editor-folder-element.c:154
+#: ../src/mail/em-filter-editor-folder-element.c:151
 msgid "Select Folder"
 msgstr "Ordner wählen"
 
@@ -18822,7 +18881,7 @@ msgstr "Text_farbe verwenden"
 
 #: ../src/mail/em-folder-properties.c:517
 msgid "Path:"
-msgstr ""
+msgstr "Pfad:"
 
 #: ../src/mail/em-folder-properties.c:526
 msgid "Unread messages:"
@@ -18967,31 +19026,31 @@ msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../src/mail/em-folder-tree.c:1833
+#: ../src/mail/em-folder-tree.c:1822
 msgid "Mail Folder Tree"
 msgstr "E-Mail-Ordnerbaum"
 
-#: ../src/mail/em-folder-tree.c:2382
+#: ../src/mail/em-folder-tree.c:2371
 #, c-format
 msgid "Moving folder %s"
 msgstr "Ordner %s wird verschoben"
 
-#: ../src/mail/em-folder-tree.c:2385
+#: ../src/mail/em-folder-tree.c:2374
 #, c-format
 msgid "Copying folder %s"
 msgstr "Ordner %s wird kopiert"
 
-#: ../src/mail/em-folder-tree.c:2392 ../src/mail/message-list.c:2634
+#: ../src/mail/em-folder-tree.c:2381 ../src/mail/message-list.c:2632
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Nachrichten werden in den Ordner %s verschoben"
 
-#: ../src/mail/em-folder-tree.c:2396 ../src/mail/message-list.c:2636
+#: ../src/mail/em-folder-tree.c:2385 ../src/mail/message-list.c:2634
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Nachrichten werden in den Ordner %s kopiert"
 
-#: ../src/mail/em-folder-tree.c:2415
+#: ../src/mail/em-folder-tree.c:2404
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Sie können Nachrichten nicht im Speicher auf der obersten Ebene abgelegen"
@@ -19052,7 +19111,7 @@ msgstr "_Gezeigte abonnieren"
 msgid "Subscribe To _All"
 msgstr "_Alle abonnieren"
 
-#: ../src/mail/em-subscription-editor.c:936 ../src/mail/em-subscription-editor.c:1890
+#: ../src/mail/em-subscription-editor.c:936 ../src/mail/em-subscription-editor.c:1883
 #: ../src/mail/mail.error.xml.h:73
 #: ../src/modules/mail/e-mail-shell-view-actions.c:1700
 msgid "_Unsubscribe"
@@ -19084,60 +19143,60 @@ msgid_plural "%d total"
 msgstr[0] "%d insgesamt"
 msgstr[1] "%d insgesamt"
 
-#: ../src/mail/em-subscription-editor.c:1731
+#: ../src/mail/em-subscription-editor.c:1724
 msgid "Folder Subscriptions"
 msgstr "Ordnerabonnements"
 
-#: ../src/mail/em-subscription-editor.c:1766
+#: ../src/mail/em-subscription-editor.c:1759
 msgid "_Account:"
 msgstr "_Konto:"
 
-#: ../src/mail/em-subscription-editor.c:1779
+#: ../src/mail/em-subscription-editor.c:1772
 msgid "Clear Search"
 msgstr "Suchfeld leeren"
 
-#: ../src/mail/em-subscription-editor.c:1796
+#: ../src/mail/em-subscription-editor.c:1789
 msgid "Sho_w items that contain:"
 msgstr "Nur Einträge anzeigen, die Folgendes ent_halten:"
 
-#: ../src/mail/em-subscription-editor.c:1843
+#: ../src/mail/em-subscription-editor.c:1836
 msgid "Subscribe to the selected folder"
 msgstr "Den gewählten Ordner abonnieren"
 
-#: ../src/mail/em-subscription-editor.c:1844
+#: ../src/mail/em-subscription-editor.c:1837
 msgid "Su_bscribe"
 msgstr "A_bonnieren"
 
-#: ../src/mail/em-subscription-editor.c:1889
+#: ../src/mail/em-subscription-editor.c:1882
 #: ../src/modules/mail/e-mail-shell-view-actions.c:1702
 msgid "Unsubscribe from the selected folder"
 msgstr "Den gewählten Ordner abbestellen"
 
-#: ../src/mail/em-subscription-editor.c:1929
+#: ../src/mail/em-subscription-editor.c:1922
 msgid "Collapse all folders"
 msgstr "Alle Ordner einklappen"
 
-#: ../src/mail/em-subscription-editor.c:1930
+#: ../src/mail/em-subscription-editor.c:1923
 msgid "C_ollapse All"
 msgstr "Alle _einklappen"
 
-#: ../src/mail/em-subscription-editor.c:1940
+#: ../src/mail/em-subscription-editor.c:1933
 msgid "Expand all folders"
 msgstr "Alle Ordner aufklappen"
 
-#: ../src/mail/em-subscription-editor.c:1941
+#: ../src/mail/em-subscription-editor.c:1934
 msgid "E_xpand All"
 msgstr "Alle _aufklappen"
 
-#: ../src/mail/em-subscription-editor.c:1951
+#: ../src/mail/em-subscription-editor.c:1944
 msgid "Refresh the folder list"
 msgstr "Die Ordnerliste auffrischen"
 
-#: ../src/mail/em-subscription-editor.c:1963
+#: ../src/mail/em-subscription-editor.c:1956
 msgid "Stop the current operation"
 msgstr "Den momentan ausgeführten Vorgang abbrechen"
 
-#: ../src/mail/em-subscription-editor.c:1964
+#: ../src/mail/em-subscription-editor.c:1957
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1085
 msgid "_Stop"
 msgstr "_Anhalten"
@@ -19158,24 +19217,24 @@ msgstr[1] "Sind Sie sicher, dass Sie %d Nachrichten auf einmal öffnen wollen?"
 msgid "Message Filters"
 msgstr "Nachrichtenfilter"
 
-#: ../src/mail/em-utils.c:1014
+#: ../src/mail/em-utils.c:1022
 #, c-format
 msgid "Messages from %s"
 msgstr "Nachrichten von %s"
 
 #. Translators: This is a reply attribution in the message reply subject. Both 'Re'-s in the 'reply-attribution' translation context should translate into the same string.
-#: ../src/mail/em-utils.c:1575
+#: ../src/mail/em-utils.c:1583
 msgctxt "reply-attribution"
 msgid "Re"
 msgstr "AW"
 
 #. Translators: This is a reply attribution separator in the message reply subject. This should match the ':' in 'Re: %s' in the 'reply-attribution' translation context.
-#: ../src/mail/em-utils.c:1578
+#: ../src/mail/em-utils.c:1586
 msgctxt "reply-attribution"
 msgid ":"
 msgstr ":"
 
-#: ../src/mail/em-utils.c:1878
+#: ../src/mail/em-utils.c:1886
 msgid "Deleting old messages"
 msgstr "Alte Nachrichten werden gelöscht"
 
@@ -19183,35 +19242,35 @@ msgstr "Alte Nachrichten werden gelöscht"
 msgid "Search _Folders"
 msgstr "Such_ordner"
 
-#: ../src/mail/em-vfolder-editor-rule.c:404
+#: ../src/mail/em-vfolder-editor-rule.c:401
 msgid "Add Folder"
 msgstr "Ordner hinzufügen"
 
-#: ../src/mail/em-vfolder-editor-rule.c:533
+#: ../src/mail/em-vfolder-editor-rule.c:530
 msgid "Search Folder Sources"
 msgstr "Ordnerquellen durchsuchen"
 
-#: ../src/mail/em-vfolder-editor-rule.c:565
+#: ../src/mail/em-vfolder-editor-rule.c:562
 msgid "Automatically update on any _source folder change"
 msgstr "Bei jeder Änderung des _Quellordners automatisch aktualisieren"
 
-#: ../src/mail/em-vfolder-editor-rule.c:577
+#: ../src/mail/em-vfolder-editor-rule.c:574
 msgid "All local folders"
 msgstr "Alle lokalen Ordner"
 
-#: ../src/mail/em-vfolder-editor-rule.c:578
+#: ../src/mail/em-vfolder-editor-rule.c:575
 msgid "All active remote folders"
 msgstr "Alle aktiven fernen Ordner"
 
-#: ../src/mail/em-vfolder-editor-rule.c:579
+#: ../src/mail/em-vfolder-editor-rule.c:576
 msgid "All local and active remote folders"
 msgstr "Alle lokalen und aktiven, fernen Ordner"
 
-#: ../src/mail/em-vfolder-editor-rule.c:580
+#: ../src/mail/em-vfolder-editor-rule.c:577
 msgid "Specific folders"
 msgstr "Bestimmte Ordner"
 
-#: ../src/mail/em-vfolder-editor-rule.c:618
+#: ../src/mail/em-vfolder-editor-rule.c:615
 msgid "include subfolders"
 msgstr "Unterordner einschließen"
 
@@ -19512,20 +19571,20 @@ msgid "Import mail from Elm."
 msgstr "E-Mail von Elm importieren."
 
 #: ../src/mail/importers/evolution-mbox-importer.c:135
-#: ../src/mail/importers/kmail-importer.c:208
+#: ../src/mail/importers/kmail-importer.c:206
 #: ../src/plugins/dbx-import/dbx-importer.c:242
 msgid "_Destination folder:"
 msgstr "Zielor_dner:"
 
 #: ../src/mail/importers/evolution-mbox-importer.c:141
-#: ../src/mail/importers/kmail-importer.c:214
+#: ../src/mail/importers/kmail-importer.c:212
 #: ../src/plugins/dbx-import/dbx-importer.c:248
 #: ../src/plugins/pst-import/pst-importer.c:537
 msgid "Select folder"
 msgstr "Ordner wählen"
 
 #: ../src/mail/importers/evolution-mbox-importer.c:142
-#: ../src/mail/importers/kmail-importer.c:215
+#: ../src/mail/importers/kmail-importer.c:213
 #: ../src/plugins/dbx-import/dbx-importer.c:249
 #: ../src/plugins/pst-import/pst-importer.c:538
 msgid "Select folder to import into"
@@ -19552,18 +19611,18 @@ msgstr "Berkeley Mailbox (mbox)"
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importeur für Ordner im Berkeley-Mailbox-Format"
 
-#: ../src/mail/importers/kmail-importer.c:261
+#: ../src/mail/importers/kmail-importer.c:259
 #, c-format
 msgid "%d Address"
 msgid_plural "%d Addresses"
 msgstr[0] "%d Adresse"
 msgstr[1] "%d Adressen"
 
-#: ../src/mail/importers/kmail-importer.c:352
+#: ../src/mail/importers/kmail-importer.c:350
 msgid "Evolution KMail importer"
 msgstr "Evolution KMail-Importeur"
 
-#: ../src/mail/importers/kmail-importer.c:353
+#: ../src/mail/importers/kmail-importer.c:351
 msgid "Import mail and contacts from KMail."
 msgstr "E-Mail und Kontakte aus KMail importieren."
 
@@ -19848,7 +19907,7 @@ msgid "Use for Recipients"
 msgstr "Als Empfänger verwenden"
 
 #. Translators: Label of a frame with a list of configured accounts in Send account overrides
-#: ../src/mail/mail-config.ui.h:73 ../src/modules/mail/em-composer-prefs.c:876
+#: ../src/mail/mail-config.ui.h:73 ../src/modules/mail/em-composer-prefs.c:873
 msgid "Account"
 msgstr "Konto"
 
@@ -20256,7 +20315,7 @@ msgstr ""
 "Viele E-Mail-Systeme fügen eine »Apparently-To«-Kopfzeile zu Nachrichten hinzu, "
 "die ausschließlich Blindkopie-Empfänger angeben. Diese Kopfzeile enthält - falls "
 "sie hinzugefügt wird - sämtliche Empfänger Ihrer Nachricht. Um dies zu umgehen, "
-"sollten Sie mindestens einen »An:«- oder »Kopie an:-Empfänger hinzufügen.«"
+"sollten Sie mindestens einen »An:«- oder »Kopie an:«-Empfänger hinzufügen."
 
 #: ../src/mail/mail.error.xml.h:15
 msgid ""
@@ -20828,7 +20887,7 @@ msgstr "_Immer nur im derzeitigen Ordner"
 
 #: ../src/mail/mail.error.xml.h:142
 msgid "Should Evolution close this window when replying or forwarding?"
-msgstr "Soll Evolution dieses Fenster beim Antworten oder Weiterleiten schließen:"
+msgstr "Soll Evolution dieses Fenster beim Antworten oder Weiterleiten schließen?"
 
 #: ../src/mail/mail.error.xml.h:143
 msgid "_Yes, Always"
@@ -21201,90 +21260,90 @@ msgstr "Suchordner bearbeiten"
 msgid "New Search Folder"
 msgstr "Neuer Suchordner"
 
-#: ../src/mail/message-list.c:314
+#: ../src/mail/message-list.c:316
 msgid "Unseen"
 msgstr "Ungelesen"
 
-#: ../src/mail/message-list.c:315
+#: ../src/mail/message-list.c:317
 msgid "Seen"
 msgstr "Gelesen"
 
-#: ../src/mail/message-list.c:316
+#: ../src/mail/message-list.c:318
 msgid "Answered"
 msgstr "Beantwortet"
 
-#: ../src/mail/message-list.c:317
+#: ../src/mail/message-list.c:319
 msgid "Forwarded"
 msgstr "Weitergeleitet"
 
-#: ../src/mail/message-list.c:318
+#: ../src/mail/message-list.c:320
 msgid "Multiple Unseen Messages"
 msgstr "Mehrere ungelesene Nachrichten"
 
-#: ../src/mail/message-list.c:319
+#: ../src/mail/message-list.c:321
 msgid "Multiple Messages"
 msgstr "Mehrere Nachrichten"
 
-#: ../src/mail/message-list.c:332
+#: ../src/mail/message-list.c:334
 msgid "Lowest"
 msgstr "Am niedrigsten"
 
-#: ../src/mail/message-list.c:333
+#: ../src/mail/message-list.c:335
 msgid "Lower"
 msgstr "Niedriger"
 
-#: ../src/mail/message-list.c:337
+#: ../src/mail/message-list.c:339
 msgid "Higher"
 msgstr "Höher"
 
-#: ../src/mail/message-list.c:338
+#: ../src/mail/message-list.c:340
 msgid "Highest"
 msgstr "Am höchsten"
 
-#: ../src/mail/message-list.c:487
+#: ../src/mail/message-list.c:489
 msgid "Generating message list"
 msgstr "Nachrichtenliste wird erzeugt"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../src/mail/message-list.c:2156 ../src/modules/itip-formatter/itip-view.c:274
+#: ../src/mail/message-list.c:2154 ../src/modules/itip-formatter/itip-view.c:274
 msgid "Today %l:%M %p"
 msgstr "Heute %I:%M %p"
 
-#: ../src/mail/message-list.c:2165
+#: ../src/mail/message-list.c:2163
 msgid "Yesterday %l:%M %p"
 msgstr "Gestern %l:%M %p"
 
-#: ../src/mail/message-list.c:2177
+#: ../src/mail/message-list.c:2175
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: ../src/mail/message-list.c:2185
+#: ../src/mail/message-list.c:2183
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b, %k:%M"
 
-#: ../src/mail/message-list.c:2187
+#: ../src/mail/message-list.c:2185
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../src/mail/message-list.c:3363
+#: ../src/mail/message-list.c:3364
 msgid "Select all visible messages"
 msgstr "Alle sichtbaren Nachrichten wählen"
 
-#: ../src/mail/message-list.c:4137 ../src/mail/message-list.etspec.h:17
+#: ../src/mail/message-list.c:4168 ../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:5706
+#: ../src/mail/message-list.c:5761
 msgid "Follow-up"
 msgstr "Folgenachricht"
 
-#: ../src/mail/message-list.c:6455 ../src/mail/message-list.c:6895
+#: ../src/mail/message-list.c:6510 ../src/mail/message-list.c:6947
 msgid "Generating message list…"
 msgstr "Nachrichtenliste wird erzeugt …"
 
-#: ../src/mail/message-list.c:6458
+#: ../src/mail/message-list.c:6513
 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 "
@@ -21295,7 +21354,7 @@ 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:6465
+#: ../src/mail/message-list.c:6520
 msgid "There are no messages in this folder."
 msgstr "Es existieren keine Nachrichten in diesem Ordner."
 
@@ -22081,8 +22140,8 @@ msgstr "Wählen Sie ein Adressbuch"
 #: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:165
 #: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:299
 #: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:320
-#: ../src/modules/itip-formatter/itip-view.c:1708
-#: ../src/modules/itip-formatter/itip-view.c:1822
+#: ../src/modules/itip-formatter/itip-view.c:1703
+#: ../src/modules/itip-formatter/itip-view.c:1817
 msgid "URL:"
 msgstr "Adresse:"
 
@@ -22102,7 +22161,7 @@ msgid "URL is not a valid http:// nor https:// URL"
 msgstr "Adresse entspricht nicht dem Format http:// oder https://"
 
 #: ../src/modules/book-config-google/evolution-book-config-google.c:93
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1069
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1066
 #: ../src/modules/cal-config-google/e-cal-config-google.c:187
 #: ../src/modules/cal-config-google/e-cal-config-gtasks.c:115
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:444
@@ -22110,124 +22169,124 @@ msgstr "Adresse entspricht nicht dem Format http:// oder https://"
 msgid "User name cannot be empty"
 msgstr "Benutzername darf nicht leer sein"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:418
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:415
 msgid "Looking up server search bases, please wait…"
 msgstr "Nach Server-Suchbasen wird gesucht, bitte warten …"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:494
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:491
 msgid "Standard LDAP Port"
 msgstr "Standard-LDAP-Port"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:500
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:687
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:497
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:684
 msgid "LDAP over SSL/TLS (deprecated)"
 msgstr "LDAP über SSL/TLS (veraltet)"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:506
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:503
 msgid "Microsoft Global Catalog"
 msgstr "Microsoft Global Catalog"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:512
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:509
 msgid "Microsoft Global Catalog over SSL/TLS"
 msgstr "Microsoft Global Catalog über SSL/TLS"
 
 #. Page 1
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:623
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:620
 msgid "Connecting to LDAP"
 msgstr "Verbindung mit LDAP"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:640
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:637
 msgid "Server Information"
 msgstr "Server-Informationen"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:667
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:664
 msgid "Port:"
 msgstr "Port:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:675
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:672
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:247
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:202
 msgid "Port number is not valid"
 msgstr "Portnummer ist ungültig"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:690
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:687
 msgid "StartTLS (recommended)"
 msgstr "StartTLS (empfohlen)"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:692
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:689
 msgid "Encryption:"
 msgstr "Verschlüsselung:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:716
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:713
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:324
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:267
 msgid "Authentication"
 msgstr "Legitimation"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:748
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:745
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:749
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:746
 msgid "Username can be left empty"
 msgstr "Benutzername darf nicht leer sein"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:755
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:752
 msgid "Using email address"
 msgstr "E-Mail-Adresse verwenden"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:756
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:753
 msgid "requires anonymous access to your LDAP server"
 msgstr "erfordert anonymen Zugriff auf Ihren LDAP-Server"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:762
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:759
 msgid "Using distinguished name (DN)"
 msgstr "Eindeutiger Name (DN) wird verwendet"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:763
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:760
 msgid "for example: uid=user,dc=example,dc=com"
 msgstr "Beispiel: uid=Benutzer,dc=example,dc=com"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:771
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:768
 msgid "Method:"
 msgstr "Methode:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:775
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:772
 msgid "This is the method Evolution will use to authenticate you."
 msgstr "Diese Methode verwendet Evolution, um Sie zu legitimieren."
 
 #. Page 2
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:787
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:784
 msgid "Using LDAP"
 msgstr "LDAP wird verwendet"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:804
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:801
 #: ../src/modules/mail/e-mail-shell-view.c:119
 #: ../src/modules/mail/e-mail-shell-view.c:208
 msgid "Searching"
 msgstr "Suchen"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:826
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:823
 msgid "Search Base:"
 msgstr "Suchbasis:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:830
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:827
 msgid "Find Possible Search Bases"
 msgstr "Mögliche Suchbasen suchen"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:852
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:849
 msgid "One Level"
 msgstr "Eine Ebene"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:854
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:851
 msgid "Subtree"
 msgstr "Unterbaum"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:856
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:853
 msgid "Search Scope:"
 msgstr "Suchbereich:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:861
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:858
 msgid ""
 "The search scope defines how deep you would like the search to extend down the "
 "directory tree.  A search scope of “Subtree” will include all entries below your "
@@ -22239,28 +22298,28 @@ msgstr ""
 "Suchbereichs ein. Der Suchbereich »Eine Ebene« hingegen schließt lediglich die "
 "Ebene unterhalb des Ausgangspunktes der Suche ein."
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:870
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:867
 msgid "Search Filter:"
 msgstr "Suchfilter:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:882
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:879
 msgid "Downloading"
 msgstr "Herunterladen"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:903
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:900
 msgid "Limit:"
 msgstr "Begrenzung:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:914
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:911
 msgid "contacts"
 msgstr "Kontakte"
 
 # server until either set time limit or amount of contacts limit reached
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:919
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:916
 msgid "Browse until limit is reached"
 msgstr "Durchsuchen, bis Begrenzung erreicht ist"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1054
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1051
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:425
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:461
 msgid "Server address cannot be empty"
@@ -22294,6 +22353,7 @@ msgid "Find Task Lists"
 msgstr "Aufgabenlisten suchen"
 
 #: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:371
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:260
 msgid "Email:"
 msgstr "E-Mail:"
 
@@ -22305,7 +22365,7 @@ msgstr "Server unterstützt Einladungen zu Besprechungen"
 msgid "Choose which address books to use."
 msgstr "Wählen Sie die zu verwendenden Adressbücher."
 
-#: ../src/modules/cal-config-contacts/evolution-cal-config-contacts.c:204
+#: ../src/modules/cal-config-contacts/evolution-cal-config-contacts.c:201
 msgid "Use in Birthdays & Anniversaries calendar"
 msgstr "Im Geburts- und Jahrestagskalender verwenden"
 
@@ -22317,23 +22377,23 @@ msgstr "Abgleich für Kalender einschalten"
 msgid "Default User Calendar"
 msgstr "Vorgegebener Benutzerkalender"
 
-#: ../src/modules/cal-config-local/evolution-cal-config-local.c:159
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:177
 msgid "Use an existing iCalendar (ics) file"
 msgstr "Eine vorhandene iCalendar-Datei (*.ics) verwenden"
 
-#: ../src/modules/cal-config-local/evolution-cal-config-local.c:184
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:202
 msgid "iCalendar File"
 msgstr "iCalendar-Datei"
 
-#: ../src/modules/cal-config-local/evolution-cal-config-local.c:196
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:214
 msgid "Choose an iCalendar file"
 msgstr "Wählen Sie eine iCalendar-Datei"
 
-#: ../src/modules/cal-config-local/evolution-cal-config-local.c:199
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:217
 msgid "File:"
 msgstr "Datei:"
 
-#: ../src/modules/cal-config-local/evolution-cal-config-local.c:214
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:232
 msgid "Allow Evolution to update the file"
 msgstr "Evolution erlauben, die Datei zu aktualisieren"
 
@@ -22422,45 +22482,45 @@ msgstr "In _Notizliste importieren"
 msgid "I_mport to Task List"
 msgstr "In _Aufgabenliste importieren"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:566
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:579
 #, 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:567
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:580
 #, 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:572
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:585
 #, 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:573
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:586
 #, 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:578
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:591
 #, 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:579
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:592
 #, 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:694
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:707
 msgid "Calendar Selector"
 msgstr "Kalenderquellenauswahl"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:700
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:713
 msgid "Memo List Selector"
 msgstr "Notizquellenauswahl"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:705
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:718
 msgid "Task List Selector"
 msgstr "Aufgabenlistenauswahl"
 
@@ -23200,29 +23260,29 @@ msgstr "_Internetseite öffnen"
 msgid "Print the selected memo"
 msgstr "Die gewählte Notiz drucken"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:1019
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1038
 msgid "Searching next matching event"
 msgstr "Nächsten zutreffenden Termin suchen"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:1020
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1039
 msgid "Searching previous matching event"
 msgstr "Vorherigen zutreffenden Termin suchen"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:1041
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1060
 #, 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:1045
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1064
 #, 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:1068
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1087
 msgid "Cannot search with no active calendar"
 msgstr "Suche kann ohne aktiven Kalender nicht ausgeführt werden"
 
@@ -23405,12 +23465,6 @@ msgid_plural "%d memos"
 msgstr[0] "%d Notiz"
 msgstr[1] "%d Notizen"
 
-#: ../src/modules/calendar/e-memo-shell-view-private.c:365
-#: ../src/modules/calendar/e-task-shell-view-private.c:577
-#, c-format
-msgid "%d selected"
-msgstr "%d gewählt"
-
 #: ../src/modules/calendar/e-task-shell-backend.c:75
 msgctxt "New"
 msgid "_Task"
@@ -23545,16 +23599,12 @@ msgid "Uncompleted Tasks"
 msgstr "Unvollständige Aufgaben"
 
 #: ../src/modules/calendar/e-task-shell-view-actions.c:984
-#, fuzzy
-#| msgid "Cancelled Tasks"
 msgid "Scheduled Tasks"
-msgstr "Abgebrochene Aufgaben"
+msgstr "Geplante Aufgaben"
 
 #: ../src/modules/calendar/e-task-shell-view-actions.c:986
-#, fuzzy
-#| msgid "_Show Tasks without Due date"
 msgid "Show scheduled tasks, aka those with a Due date"
-msgstr "Aufgaben ohne Fälligkeit_sdatum anzeigen"
+msgstr "Geplante Aufgaben anzeigen (mit Fälligkeitsdatum)"
 
 #: ../src/modules/calendar/e-task-shell-view-actions.c:991
 msgid "Next 7 Days’ Tasks"
@@ -23569,10 +23619,8 @@ msgid "Tasks with Attachments"
 msgstr "Aufgaben mit Anlagen"
 
 #: ../src/modules/calendar/e-task-shell-view-actions.c:1019
-#, fuzzy
-#| msgid "Print Tasks"
 msgid "Started Tasks"
-msgstr "Aufgaben drucken"
+msgstr "Begonnene Aufgaben"
 
 #: ../src/modules/calendar/e-task-shell-view-actions.c:1021
 msgid ""
@@ -23596,7 +23644,7 @@ msgstr "Aufgaben löschen"
 msgid "Delete Task"
 msgstr "Aufgabe löschen"
 
-#: ../src/modules/calendar/e-task-shell-view-private.c:573
+#: ../src/modules/calendar/e-task-shell-view-private.c:570
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -23689,10 +23737,8 @@ msgid "CalDAV and CardDAV server"
 msgstr "CalDAV und CardDAV-Server"
 
 #: ../src/modules/config-lookup/e-webdav-config-lookup.c:162
-#, fuzzy
-#| msgid "Requires password to continue. %s."
 msgid "Requires password to continue."
-msgstr "Passwort wird zum Fortfahren benötigt. %s."
+msgstr "Passwort wird zum Fortfahren benötigt."
 
 #: ../src/modules/config-lookup/e-webdav-config-lookup.c:213
 msgid "Look up for a CalDAV/CardDAV server"
@@ -24077,135 +24123,135 @@ msgstr "%s hat durch %s folgende gemeinsame Notiz gelöscht:"
 msgid "%s has cancelled the following shared memo:"
 msgstr "%s hat folgende gemeinsame Notiz gelöscht:"
 
-#: ../src/modules/itip-formatter/itip-view.c:861
+#: ../src/modules/itip-formatter/itip-view.c:858
 msgid "All day:"
 msgstr "Ganztägig:"
 
-#: ../src/modules/itip-formatter/itip-view.c:867
+#: ../src/modules/itip-formatter/itip-view.c:864
 msgid "Start day:"
 msgstr "Anfangsdatum:"
 
-#: ../src/modules/itip-formatter/itip-view.c:867
-#: ../src/modules/itip-formatter/itip-view.c:1709
+#: ../src/modules/itip-formatter/itip-view.c:864
+#: ../src/modules/itip-formatter/itip-view.c:1704
 msgid "Start time:"
 msgstr "Anfangszeit:"
 
-#: ../src/modules/itip-formatter/itip-view.c:876
+#: ../src/modules/itip-formatter/itip-view.c:873
 msgid "End day:"
 msgstr "Enddatum:"
 
-#: ../src/modules/itip-formatter/itip-view.c:876
-#: ../src/modules/itip-formatter/itip-view.c:1710
+#: ../src/modules/itip-formatter/itip-view.c:873
+#: ../src/modules/itip-formatter/itip-view.c:1705
 msgid "End time:"
 msgstr "Endzeit:"
 
-#: ../src/modules/itip-formatter/itip-view.c:1254
+#: ../src/modules/itip-formatter/itip-view.c:1249
 msgid "Ope_n Calendar"
 msgstr "Kalender ö_ffnen"
 
-#: ../src/modules/itip-formatter/itip-view.c:1257
+#: ../src/modules/itip-formatter/itip-view.c:1252
 msgid "_Decline all"
 msgstr "Alles a_blehnen"
 
-#: ../src/modules/itip-formatter/itip-view.c:1260
+#: ../src/modules/itip-formatter/itip-view.c:1255
 msgid "_Decline"
 msgstr "Ab_lehnen"
 
-#: ../src/modules/itip-formatter/itip-view.c:1263
+#: ../src/modules/itip-formatter/itip-view.c:1258
 msgid "_Tentative all"
 msgstr "Alles vorläu_fig"
 
-#: ../src/modules/itip-formatter/itip-view.c:1266
+#: ../src/modules/itip-formatter/itip-view.c:1261
 msgid "_Tentative"
 msgstr "_Vorläufig"
 
-#: ../src/modules/itip-formatter/itip-view.c:1269
+#: ../src/modules/itip-formatter/itip-view.c:1264
 msgid "Acce_pt all"
 msgstr "Alles anneh_men"
 
-#: ../src/modules/itip-formatter/itip-view.c:1272
+#: ../src/modules/itip-formatter/itip-view.c:1267
 msgid "Acce_pt"
 msgstr "Annehmen"
 
-#: ../src/modules/itip-formatter/itip-view.c:1275
+#: ../src/modules/itip-formatter/itip-view.c:1270
 msgid "Send _Information"
 msgstr "Informationen über_mitteln"
 
-#: ../src/modules/itip-formatter/itip-view.c:1278
+#: ../src/modules/itip-formatter/itip-view.c:1273
 msgid "_Update Attendee Status"
 msgstr "Teilnehmerstatus a_ktualisieren"
 
-#: ../src/modules/itip-formatter/itip-view.c:1281
-#: ../src/smime/gui/certificate-manager.c:1661
+#: ../src/modules/itip-formatter/itip-view.c:1276
+#: ../src/smime/gui/certificate-manager.c:1656
 msgid "_Update"
 msgstr "A_ktualisieren"
 
-#: ../src/modules/itip-formatter/itip-view.c:1712
-#: ../src/modules/itip-formatter/itip-view.c:1760
-#: ../src/modules/itip-formatter/itip-view.c:1834
+#: ../src/modules/itip-formatter/itip-view.c:1707
+#: ../src/modules/itip-formatter/itip-view.c:1755
+#: ../src/modules/itip-formatter/itip-view.c:1829
 msgid "Comment:"
 msgstr "Kommentar:"
 
 #. RSVP area
-#: ../src/modules/itip-formatter/itip-view.c:1748
+#: ../src/modules/itip-formatter/itip-view.c:1743
 msgid "Send reply to sender"
 msgstr "Antwort an Absender verschicken"
 
 #. Updates
-#: ../src/modules/itip-formatter/itip-view.c:1763
+#: ../src/modules/itip-formatter/itip-view.c:1758
 msgid "Send _updates to attendees"
 msgstr "Akt_ualisierungen an die Teilnehmer verschicken"
 
 #. The recurrence check button
-#: ../src/modules/itip-formatter/itip-view.c:1766
+#: ../src/modules/itip-formatter/itip-view.c:1761
 msgid "_Apply to all instances"
 msgstr "Auf alle _Instanzen anwenden"
 
-#: ../src/modules/itip-formatter/itip-view.c:1767
+#: ../src/modules/itip-formatter/itip-view.c:1762
 msgid "Show time as _free"
 msgstr "Zeit als _frei anzeigen"
 
-#: ../src/modules/itip-formatter/itip-view.c:1768
+#: ../src/modules/itip-formatter/itip-view.c:1763
 msgid "_Preserve my reminder"
 msgstr "_Erinnerung aufbewahren"
 
-#: ../src/modules/itip-formatter/itip-view.c:1769
+#: ../src/modules/itip-formatter/itip-view.c:1764
 msgid "_Inherit reminder"
 msgstr "Erinnerung ü_bernehmen"
 
-#: ../src/modules/itip-formatter/itip-view.c:1986
+#: ../src/modules/itip-formatter/itip-view.c:1981
 msgid "_Tasks:"
 msgstr "Auf_gaben:"
 
-#: ../src/modules/itip-formatter/itip-view.c:1989
+#: ../src/modules/itip-formatter/itip-view.c:1984
 msgid "_Memos:"
 msgstr "_Notizen:"
 
-#: ../src/modules/itip-formatter/itip-view.c:3009
+#: ../src/modules/itip-formatter/itip-view.c:2991
 msgid "Sa_ve"
 msgstr "_Speichern"
 
-#: ../src/modules/itip-formatter/itip-view.c:3570
-#: ../src/modules/itip-formatter/itip-view.c:5342
+#: ../src/modules/itip-formatter/itip-view.c:3552
+#: ../src/modules/itip-formatter/itip-view.c:5323
 msgid "Attendee status updated"
 msgstr "Teilnehmerstatus aktualisiert"
 
-#: ../src/modules/itip-formatter/itip-view.c:3780
+#: ../src/modules/itip-formatter/itip-view.c:3762
 #, 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:3787
+#: ../src/modules/itip-formatter/itip-view.c:3769
 #, 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:3794
+#: ../src/modules/itip-formatter/itip-view.c:3776
 #, 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:3805
+#: ../src/modules/itip-formatter/itip-view.c:3787
 #, c-format
 msgid "The calendar “%s” contains an appointment which conflicts with this meeting"
 msgid_plural ""
@@ -24215,7 +24261,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Der Kalender »%s« enthält %d Termine, die sich mit diesem Termin überschneiden"
 
-#: ../src/modules/itip-formatter/itip-view.c:3814
+#: ../src/modules/itip-formatter/itip-view.c:3796
 #, 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"
@@ -24224,233 +24270,233 @@ msgstr[0] ""
 msgstr[1] ""
 "Die Aufgabenliste »%s« enthält %d Aufgaben, die mit dieser Aufgabe kollidieren"
 
-#: ../src/modules/itip-formatter/itip-view.c:3823
+#: ../src/modules/itip-formatter/itip-view.c:3805
 #, 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:3861
+#: ../src/modules/itip-formatter/itip-view.c:3843
 #, 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:3866
+#: ../src/modules/itip-formatter/itip-view.c:3848
 #, 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:3871
+#: ../src/modules/itip-formatter/itip-view.c:3853
 #, 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:3882
+#: ../src/modules/itip-formatter/itip-view.c:3864
 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:4024
+#: ../src/modules/itip-formatter/itip-view.c:4006
 msgid "Unable to find any calendars"
 msgstr "Es wurden keine Kalender gefunden"
 
-#: ../src/modules/itip-formatter/itip-view.c:4032
+#: ../src/modules/itip-formatter/itip-view.c:4014
 msgid "Unable to find this meeting in any calendar"
 msgstr "Diese Besprechung wurde in keinem Kalender gefunden"
 
-#: ../src/modules/itip-formatter/itip-view.c:4037
+#: ../src/modules/itip-formatter/itip-view.c:4019
 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:4042
+#: ../src/modules/itip-formatter/itip-view.c:4024
 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:4356
+#: ../src/modules/itip-formatter/itip-view.c:4337
 msgid "Searching for an existing version of this appointment"
 msgstr "Eine bestehende Version dieses Termins wird gesucht"
 
-#: ../src/modules/itip-formatter/itip-view.c:4360
+#: ../src/modules/itip-formatter/itip-view.c:4341
 msgid "Searching for an existing version of this task"
 msgstr "Eine bestehende Version dieser Aufgabe wird gesucht"
 
-#: ../src/modules/itip-formatter/itip-view.c:4364
+#: ../src/modules/itip-formatter/itip-view.c:4345
 msgid "Searching for an existing version of this memo"
 msgstr "Eine bestehende Version dieser Notiz wird gesucht"
 
-#: ../src/modules/itip-formatter/itip-view.c:4422
+#: ../src/modules/itip-formatter/itip-view.c:4403
 msgid "Opening the calendar. Please wait…"
 msgstr "Kalender wird geöffnet. Bitte warten …"
 
-#: ../src/modules/itip-formatter/itip-view.c:4838
+#: ../src/modules/itip-formatter/itip-view.c:4819
 #, c-format
 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:4846
+#: ../src/modules/itip-formatter/itip-view.c:4827
 #, 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:4854
+#: ../src/modules/itip-formatter/itip-view.c:4835
 #, 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:4874
+#: ../src/modules/itip-formatter/itip-view.c:4855
 #, c-format
 msgid "Sent to calendar “%s” as accepted"
 msgstr "In Kalender »%s« als »Angenommen« eingetragen"
 
-#: ../src/modules/itip-formatter/itip-view.c:4879
+#: ../src/modules/itip-formatter/itip-view.c:4860
 #, c-format
 msgid "Sent to task list “%s” as accepted"
 msgstr "In Aufgabenliste »%s« als »Angenommen« eingetragen"
 
-#: ../src/modules/itip-formatter/itip-view.c:4884
+#: ../src/modules/itip-formatter/itip-view.c:4865
 #, c-format
 msgid "Sent to memo list “%s” as accepted"
 msgstr "In Notizliste »%s« als »Angenommen« eingetragen"
 
-#: ../src/modules/itip-formatter/itip-view.c:4894
+#: ../src/modules/itip-formatter/itip-view.c:4875
 #, 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:4899
+#: ../src/modules/itip-formatter/itip-view.c:4880
 #, 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:4904
+#: ../src/modules/itip-formatter/itip-view.c:4885
 #, 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:4914
+#: ../src/modules/itip-formatter/itip-view.c:4895
 #, c-format
 msgid "Sent to calendar “%s” as declined"
 msgstr "In Kalender »%s« als »Abgelehnt« eingetragen"
 
-#: ../src/modules/itip-formatter/itip-view.c:4919
+#: ../src/modules/itip-formatter/itip-view.c:4900
 #, c-format
 msgid "Sent to task list “%s” as declined"
 msgstr "In Aufgabenliste »%s« als »Abgelehnt« eingetragen"
 
-#: ../src/modules/itip-formatter/itip-view.c:4924
+#: ../src/modules/itip-formatter/itip-view.c:4905
 #, c-format
 msgid "Sent to memo list “%s” as declined"
 msgstr "In Notizliste »%s« als »Abgelehnt« eingetragen"
 
-#: ../src/modules/itip-formatter/itip-view.c:4934
+#: ../src/modules/itip-formatter/itip-view.c:4915
 #, c-format
 msgid "Sent to calendar “%s” as cancelled"
 msgstr "In Kalender »%s« als »Abgesagt« eingetragen"
 
-#: ../src/modules/itip-formatter/itip-view.c:4939
+#: ../src/modules/itip-formatter/itip-view.c:4920
 #, c-format
 msgid "Sent to task list “%s” as cancelled"
 msgstr "In Aufgabenliste »%s« als »Abgesagt« eingetragen"
 
-#: ../src/modules/itip-formatter/itip-view.c:4944
+#: ../src/modules/itip-formatter/itip-view.c:4925
 #, c-format
 msgid "Sent to memo list “%s” as cancelled"
 msgstr "In Notizliste »%s« als »Abgesagt« eingetragen"
 
-#: ../src/modules/itip-formatter/itip-view.c:4962
+#: ../src/modules/itip-formatter/itip-view.c:4943
 msgid "Saving changes to the calendar. Please wait…"
 msgstr "Änderungen im Kalender werden gespeichert. Bitte warten …"
 
-#: ../src/modules/itip-formatter/itip-view.c:4965
+#: ../src/modules/itip-formatter/itip-view.c:4946
 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:4968
+#: ../src/modules/itip-formatter/itip-view.c:4949
 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:5059
+#: ../src/modules/itip-formatter/itip-view.c:5040
 msgid "Unable to parse item"
 msgstr "Element kann nicht analysiert werden"
 
-#: ../src/modules/itip-formatter/itip-view.c:5267
+#: ../src/modules/itip-formatter/itip-view.c:5248
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Der Organisator hat den Vertreter %s entfernt "
 
-#: ../src/modules/itip-formatter/itip-view.c:5284
+#: ../src/modules/itip-formatter/itip-view.c:5265
 msgid "Sent a cancellation notice to the delegate"
 msgstr "Eine Absagenachricht an den Vertreter senden"
 
-#: ../src/modules/itip-formatter/itip-view.c:5288
+#: ../src/modules/itip-formatter/itip-view.c:5269
 msgid "Could not send the cancellation notice to the delegate"
 msgstr "Die Absagenachricht konnte nicht an den Vertreter geschickt werden"
 
-#: ../src/modules/itip-formatter/itip-view.c:5334
+#: ../src/modules/itip-formatter/itip-view.c:5315
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Teilnehmer konnte nicht aktualisiert werden. %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:5367
+#: ../src/modules/itip-formatter/itip-view.c:5348
 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:5452
+#: ../src/modules/itip-formatter/itip-view.c:5433
 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:5527
-#: ../src/modules/itip-formatter/itip-view.c:5565
+#: ../src/modules/itip-formatter/itip-view.c:5508
+#: ../src/modules/itip-formatter/itip-view.c:5546
 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:5626
+#: ../src/modules/itip-formatter/itip-view.c:5607
 msgid "Meeting information sent"
 msgstr "Besprechungsinformationen wurden verschickt"
 
-#: ../src/modules/itip-formatter/itip-view.c:5631
+#: ../src/modules/itip-formatter/itip-view.c:5612
 msgid "Task information sent"
 msgstr "Aufgabeninformationen wurden verschickt"
 
-#: ../src/modules/itip-formatter/itip-view.c:5636
+#: ../src/modules/itip-formatter/itip-view.c:5617
 msgid "Memo information sent"
 msgstr "Notizinformationen wurden verschickt"
 
-#: ../src/modules/itip-formatter/itip-view.c:5647
+#: ../src/modules/itip-formatter/itip-view.c:5628
 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:5652
+#: ../src/modules/itip-formatter/itip-view.c:5633
 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:5657
+#: ../src/modules/itip-formatter/itip-view.c:5638
 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:5702
+#: ../src/modules/itip-formatter/itip-view.c:5683
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../src/modules/itip-formatter/itip-view.c:5707
+#: ../src/modules/itip-formatter/itip-view.c:5688
 msgid "Save Calendar"
 msgstr "Kalender speichern"
 
-#: ../src/modules/itip-formatter/itip-view.c:5755
-#: ../src/modules/itip-formatter/itip-view.c:5768
+#: ../src/modules/itip-formatter/itip-view.c:5736
+#: ../src/modules/itip-formatter/itip-view.c:5749
 msgid "The calendar attached is not valid"
 msgstr "Der beigelegte Kalender ist ungültig"
 
-#: ../src/modules/itip-formatter/itip-view.c:5756
-#: ../src/modules/itip-formatter/itip-view.c:5769
+#: ../src/modules/itip-formatter/itip-view.c:5737
+#: ../src/modules/itip-formatter/itip-view.c:5750
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -24458,39 +24504,39 @@ msgstr ""
 "Die Nachricht gibt an, einen Kalender zu enthalten. Dieser Kalender ist jedoch "
 "kein gültiger iCalendar."
 
-#: ../src/modules/itip-formatter/itip-view.c:5851
-#: ../src/modules/itip-formatter/itip-view.c:5935
-#: ../src/modules/itip-formatter/itip-view.c:6039
+#: ../src/modules/itip-formatter/itip-view.c:5832
+#: ../src/modules/itip-formatter/itip-view.c:5916
+#: ../src/modules/itip-formatter/itip-view.c:6020
 msgid "The item in the calendar is not valid"
 msgstr "Das Element im Kalender ist ungültig"
 
-#: ../src/modules/itip-formatter/itip-view.c:5852
-#: ../src/modules/itip-formatter/itip-view.c:5936
-#: ../src/modules/itip-formatter/itip-view.c:6040
+#: ../src/modules/itip-formatter/itip-view.c:5833
+#: ../src/modules/itip-formatter/itip-view.c:5917
+#: ../src/modules/itip-formatter/itip-view.c:6021
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, tasks or "
 "free/busy information"
 msgstr ""
 "Die Nachricht enthält einen Kalender. Dieser beinhaltet allerdings keine Termine, "
-"Aufgaben oder Verfügbarkeitsinformationen."
+"Aufgaben oder Verfügbarkeitsinformationen"
 
-#: ../src/modules/itip-formatter/itip-view.c:5945
+#: ../src/modules/itip-formatter/itip-view.c:5926
 msgid "The calendar attached contains multiple items"
 msgstr "Der beigelegte Kalender enthält mehrere Elemente"
 
-#: ../src/modules/itip-formatter/itip-view.c:5946
+#: ../src/modules/itip-formatter/itip-view.c:5927
 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."
+"Kalender importiert werden"
 
-#: ../src/modules/itip-formatter/itip-view.c:6536
+#: ../src/modules/itip-formatter/itip-view.c:6517
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Keine"
 
-#: ../src/modules/itip-formatter/itip-view.c:6558
+#: ../src/modules/itip-formatter/itip-view.c:6539
 msgid "Tentatively Accepted"
 msgstr "Vorläufig angenommen"
 
@@ -24509,35 +24555,35 @@ msgid "“{0}” has delegated the meeting. Do you want to add the delegate “{
 msgstr ""
 "»{0}« hat die Besprechung delegiert. Möchten Sie den Vertreter »{1}« hinzufügen?"
 
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:301
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:297
 msgid "Google Features"
 msgstr "Google-Funktionen"
 
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:310
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:306
 msgid "Add Google Ca_lendar to this account"
 msgstr "Google-K_alender zu diesem Konto hinzufügen"
 
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:319
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:315
 msgid "Add Google Con_tacts to this account"
 msgstr "Google-Kon_takte zu diesem Konto hinzufügen"
 
 #. Translators: This is part of a sentence "You may need to enable IMAP access and Calendars to synchronize",
 #. where the 'IMAP access' and 'Calendars to synchronize' are clickable.
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:330
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:326
 msgctxt "GoggleSummary"
 msgid "IMAP access"
 msgstr "IMAP-Zugriff"
 
 #. Translators: This is part of a sentence "You may need to enable IMAP access and Calendars to synchronize",
 #. where the 'IMAP access' and 'Calendars to synchronize' are clickable.
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:333
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:329
 msgctxt "GoggleSummary"
 msgid "Calendars to synchronize"
 msgstr "Abzugleichende Kalender"
 
 #. Translators: This is part of a sentence "You may need to enable IMAP access and Calendars to synchronize",
 #. where the 'IMAP access' and 'Calendars to synchronize' are clickable.
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:336
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:332
 #, c-format
 msgctxt "GoggleSummary"
 msgid "You may need to enable %s and %s"
@@ -24603,8 +24649,8 @@ msgstr "Mbox-Spool-Ordner darf nicht leer sein"
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:199
 #: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:59
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:155
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:193
-#: ../src/plugins/mail-notification/mail-notification.c:1242
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:194
+#: ../src/plugins/mail-notification/mail-notification.c:1278
 msgid "Configuration"
 msgstr "Konfiguration"
 
@@ -24682,11 +24728,11 @@ msgstr "Server erfordert _Legitimation"
 msgid "T_ype:"
 msgstr "T_yp:"
 
-#: ../src/modules/mail-config/e-mail-config-yahoo-summary.c:252
+#: ../src/modules/mail-config/e-mail-config-yahoo-summary.c:248
 msgid "Yahoo! Features"
 msgstr "Yahoo!-Funktionen"
 
-#: ../src/modules/mail-config/e-mail-config-yahoo-summary.c:261
+#: ../src/modules/mail-config/e-mail-config-yahoo-summary.c:257
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr "Ka_lender und Aufgabenlisten aus Yahoo! zu diesem Konto hinzufügen"
 
@@ -24697,30 +24743,30 @@ msgid_plural "%d attached messages"
 msgstr[0] "%d beigelegte Nachricht"
 msgstr[1] "%d beigelegte Nachrichten"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:415
+#: ../src/modules/mail/e-mail-shell-backend.c:420
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_E-Mail-Nachricht"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:417
+#: ../src/modules/mail/e-mail-shell-backend.c:422
 msgid "Compose a new mail message"
 msgstr "Eine neue E-Mail-Nachricht verfassen"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:425
+#: ../src/modules/mail/e-mail-shell-backend.c:430
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "E-Mail-Konto"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:427
+#: ../src/modules/mail/e-mail-shell-backend.c:432
 msgid "Create a new mail account"
 msgstr "Ein neues E-Mail-Konto erstellen"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:432
+#: ../src/modules/mail/e-mail-shell-backend.c:437
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "E-Mail-_Ordner"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:434
+#: ../src/modules/mail/e-mail-shell-backend.c:439
 msgid "Create a new mail folder"
 msgstr "Einen neuen E-Mail-Ordner anlegen"
 
@@ -24729,7 +24775,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-friendly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:802
+#: ../src/modules/mail/e-mail-shell-backend.c:981
 msgctxt "NetworkMonitor"
 msgid "base"
 msgstr "base"
@@ -24737,7 +24783,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-friendly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:805
+#: ../src/modules/mail/e-mail-shell-backend.c:984
 msgctxt "NetworkMonitor"
 msgid "netlink"
 msgstr "netlink"
@@ -24747,50 +24793,50 @@ 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-friendly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:808
+#: ../src/modules/mail/e-mail-shell-backend.c:987
 msgctxt "NetworkMonitor"
 msgid "networkmanager"
 msgstr "networkmanager"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:838
+#: ../src/modules/mail/e-mail-shell-backend.c:1017
 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:849
+#: ../src/modules/mail/e-mail-shell-backend.c:1028
 #, c-format
 msgctxt "NetworkMonitor"
 msgid "Default (%s)"
 msgstr "Voreinstellung (%s)"
 
 #. Always as the first
-#: ../src/modules/mail/e-mail-shell-backend.c:853
+#: ../src/modules/mail/e-mail-shell-backend.c:1032
 msgctxt "NetworkMonitor"
 msgid "Default"
 msgstr "Vorgabe"
 
 #. Always as the last
-#: ../src/modules/mail/e-mail-shell-backend.c:870
+#: ../src/modules/mail/e-mail-shell-backend.c:1049
 msgctxt "NetworkMonitor"
 msgid "Always Online"
 msgstr "Immer online"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:939
+#: ../src/modules/mail/e-mail-shell-backend.c:1118
 msgid "Mail Preferences"
 msgstr "E-Mail-Einstellungen"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:948
+#: ../src/modules/mail/e-mail-shell-backend.c:1127
 msgid "Composer Preferences"
 msgstr "Editoreinstellungen"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:957
+#: ../src/modules/mail/e-mail-shell-backend.c:1136
 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:1318
+#: ../src/modules/mail/e-mail-shell-backend.c:1497
 msgctxt "label"
 msgid "None"
 msgstr "Keine"
@@ -25161,15 +25207,15 @@ msgstr "Derzeitiger Ordner"
 msgid "Current Folder and Subfolders"
 msgstr "Derzeitiger Ordner und Unterordner"
 
-#: ../src/modules/mail/e-mail-shell-view.c:1042
+#: ../src/modules/mail/e-mail-shell-view.c:1039
 msgid "Current Folder and Subfolders Search"
 msgstr "Suche im derzeitigen Ordner und in Unterordnern"
 
-#: ../src/modules/mail/e-mail-shell-view.c:1165
+#: ../src/modules/mail/e-mail-shell-view.c:1159
 msgid "All Account Search"
 msgstr "Alle Konten durchsuchen"
 
-#: ../src/modules/mail/e-mail-shell-view.c:1276
+#: ../src/modules/mail/e-mail-shell-view.c:1267
 msgid "Account Search"
 msgstr "Konto durchsuchen"
 
@@ -25228,36 +25274,36 @@ msgstr[1] "%d ungelesene"
 msgid "Send / Receive"
 msgstr "Verschicken/Abrufen"
 
-#: ../src/modules/mail/em-composer-prefs.c:420
+#: ../src/modules/mail/em-composer-prefs.c:417
 msgid "Select Folder to Add"
 msgstr "Wählen Sie einen Ordner zum Hinzufügen"
 
-#: ../src/modules/mail/em-composer-prefs.c:896
+#: ../src/modules/mail/em-composer-prefs.c:893
 msgid "Folder"
 msgstr "Ordner"
 
-#: ../src/modules/mail/em-composer-prefs.c:932
+#: ../src/modules/mail/em-composer-prefs.c:929
 msgid "Recipient"
 msgstr "Empfänger"
 
-#: ../src/modules/mail/em-composer-prefs.c:1223
+#: ../src/modules/mail/em-composer-prefs.c:1220
 msgid "Keep in Outbox"
 msgstr "Im Nachrichtenausgang behalten"
 
-#: ../src/modules/mail/em-composer-prefs.c:1224
+#: ../src/modules/mail/em-composer-prefs.c:1221
 msgid "Send immediately"
 msgstr "Sofort versenden"
 
-#: ../src/modules/mail/em-composer-prefs.c:1225
+#: ../src/modules/mail/em-composer-prefs.c:1222
 msgid "Send after 5 minutes"
 msgstr "Nach 5 Minuten verschicken"
 
-#: ../src/modules/mail/em-composer-prefs.c:1310
+#: ../src/modules/mail/em-composer-prefs.c:1307
 msgid "Language(s)"
 msgstr "Sprache(n)"
 
 # CHECK (Kontext unklar)
-#: ../src/modules/mail/em-composer-prefs.c:1340
+#: ../src/modules/mail/em-composer-prefs.c:1337
 msgid "Same as user interface"
 msgstr "So wie Benutzerschnittstelle"
 
@@ -25351,7 +25397,7 @@ msgstr "Der Absender wurde benachrichtigt, dass Sie diese Nachricht gelesen habe
 
 #: ../src/modules/offline-alert/evolution-offline-alert.error.xml.h:1
 msgid "Evolution is currently offline."
-msgstr "Evolution ist im Offline-Modus"
+msgstr "Evolution ist im Offline-Modus."
 
 #: ../src/modules/offline-alert/evolution-offline-alert.error.xml.h:2
 msgid "Click “Work Online” to return to online mode."
@@ -25374,28 +25420,28 @@ msgstr ""
 msgid "Author(s)"
 msgstr "Autor(en)"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:303
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:304
 msgid "Plugin Manager"
 msgstr "Erweiterungs-Verwaltung"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:318
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:319
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Hinweis: Einige Änderungen werden erst nach einem Neustart wirksam"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:346
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:347
 msgid "Overview"
 msgstr "Überblick"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:415
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:498
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:416
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:499
 msgid "Plugin"
 msgstr "Erweiterung"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:536
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:537
 msgid "_Plugins"
 msgstr "_Erweiterungen"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:537
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:538
 msgid "Enable and disable plugins"
 msgstr "Erweiterungen aktivieren und deaktivieren"
 
@@ -25530,19 +25576,19 @@ msgstr "Filter für unerwünschte Nachrichten, der den SpamAssassin-Filter verwe
 #. Keep the title identical to EMailConfigImportPage
 #. * so it's only shown once in the assistant sidebar.
 #: ../src/modules/startup-wizard/e-mail-config-import-page.c:271
-#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:340
+#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:336
 msgid "Importing Files"
 msgstr "Dateien werden importiert"
 
-#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:257
+#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:253
 msgid "Import cancelled."
 msgstr "Import wurde abgebrochen."
 
-#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:274
+#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:270
 msgid "Import complete."
 msgstr "Import wurde abgeschlossen."
 
-#: ../src/modules/startup-wizard/e-startup-assistant.c:186
+#: ../src/modules/startup-wizard/e-startup-assistant.c:174
 msgid ""
 "Welcome to Evolution.\n"
 "\n"
@@ -25554,18 +25600,18 @@ msgstr ""
 "Die folgenden Dialoge werden Ihnen helfen, Ihre E-Mail-Konten einzurichten und "
 "Dateien aus anderen Anwendungen zu importieren."
 
-#: ../src/modules/startup-wizard/e-startup-assistant.c:193
+#: ../src/modules/startup-wizard/e-startup-assistant.c:181
 msgid "Do not _show this wizard again"
 msgstr "Diesen _Startassistenten nicht mehr anzeigen"
 
 #. Translators: This is part of "Alternatively, you can %s (email, contacts and calendaring) instead." sentence from the same translation context.
-#: ../src/modules/startup-wizard/e-startup-assistant.c:206
+#: ../src/modules/startup-wizard/e-startup-assistant.c:194
 msgctxt "wizard-ca-note"
 msgid "create a collection account"
 msgstr "ein Sammelkonto anlegen"
 
 #. Translators: The '%s' is replaced with "create a collection account" from the same translation context.
-#: ../src/modules/startup-wizard/e-startup-assistant.c:208
+#: ../src/modules/startup-wizard/e-startup-assistant.c:196
 #, c-format
 msgctxt "wizard-ca-note"
 msgid "Alternatively, you can %s (email, contacts and calendaring) instead."
@@ -25857,6 +25903,7 @@ msgid "_Add Attachment..."
 msgstr "Anlage _hinzufügen …"
 
 #: ../src/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+#: ../src/plugins/sender-validation/org-gnome-sender-validation.error.xml.h:3
 msgid "_Edit Message"
 msgstr "Nachricht _bearbeiten"
 
@@ -25983,26 +26030,26 @@ msgctxt "email-custom-header"
 msgid "None"
 msgstr "Keine"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:538
+#: ../src/plugins/email-custom-header/email-custom-header.c:528
 msgid "_Custom Header"
 msgstr "Benutzerdefinierte _Kopfzeile"
 
 # CHECK
 #  to specifying the format of the key values
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../src/plugins/email-custom-header/email-custom-header.c:808
+#: ../src/plugins/email-custom-header/email-custom-header.c:795
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by “;”."
 msgstr ""
 "Das Format zum Festlegen einer eigenen Kopfzeile lautet:\n"
-"Name der eigenen Kopfzeile;Wert«"
+"Name der eigenen Kopfzeile;Wert«."
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:862
+#: ../src/plugins/email-custom-header/email-custom-header.c:849
 msgid "Key"
 msgstr "Schlüssel"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:879
+#: ../src/plugins/email-custom-header/email-custom-header.c:866
 #: ../src/plugins/templates/templates.c:498
 msgid "Values"
 msgstr "Werte"
@@ -26303,7 +26350,7 @@ msgstr ""
 "Kopfzeile: {0}"
 
 #. Translators: '%d' is the count of mails received.
-#: ../src/plugins/mail-notification/mail-notification.c:462
+#: ../src/plugins/mail-notification/mail-notification.c:498
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -26312,76 +26359,76 @@ msgstr[1] "Sie haben %d neue Nachrichten."
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user@example.com"
-#: ../src/plugins/mail-notification/mail-notification.c:471
+#: ../src/plugins/mail-notification/mail-notification.c:507
 #, c-format
 msgid "From: %s"
 msgstr "Von: %s"
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../src/plugins/mail-notification/mail-notification.c:485
+#: ../src/plugins/mail-notification/mail-notification.c:521
 #, c-format
 msgid "Subject: %s"
 msgstr "Betreff: %s"
 
 #. Translators: %d is the count of mails received in addition
 #. * to the one displayed in this notification.
-#: ../src/plugins/mail-notification/mail-notification.c:501
+#: ../src/plugins/mail-notification/mail-notification.c:537
 #, c-format
 msgid "(and %d more)"
 msgid_plural "(and %d more)"
 msgstr[0] "(und %d weitere)"
 msgstr[1] "(und %d weitere)"
 
-#: ../src/plugins/mail-notification/mail-notification.c:513
+#: ../src/plugins/mail-notification/mail-notification.c:549
 msgid "New email in Evolution"
 msgstr "Neue E-Mail in Evolution"
 
 #. Translators: The '%s' is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../src/plugins/mail-notification/mail-notification.c:553
+#: ../src/plugins/mail-notification/mail-notification.c:590
 #, c-format
 msgid "Show %s"
 msgstr "%s anzeigen"
 
-#: ../src/plugins/mail-notification/mail-notification.c:814
+#: ../src/plugins/mail-notification/mail-notification.c:850
 msgid "_Play sound when a new message arrives"
 msgstr "Beim Eintreffen neuer E-Mails _Klang abspielen"
 
-#: ../src/plugins/mail-notification/mail-notification.c:846
+#: ../src/plugins/mail-notification/mail-notification.c:882
 msgid "_Beep"
 msgstr "_Signalton ausgeben"
 
-#: ../src/plugins/mail-notification/mail-notification.c:859
+#: ../src/plugins/mail-notification/mail-notification.c:895
 msgid "Use sound _theme"
 msgstr "Klang_thema verwenden"
 
-#: ../src/plugins/mail-notification/mail-notification.c:878
+#: ../src/plugins/mail-notification/mail-notification.c:914
 msgid "Play _file:"
 msgstr "Klang_datei abspielen:"
 
-#: ../src/plugins/mail-notification/mail-notification.c:887
+#: ../src/plugins/mail-notification/mail-notification.c:923
 msgid "Select sound file"
 msgstr "Klangdatei auswählen"
 
-#: ../src/plugins/mail-notification/mail-notification.c:1036
+#: ../src/plugins/mail-notification/mail-notification.c:1072
 msgid "Select _accounts for which enable notifications:"
 msgstr "Konten für Ben_achrichtigungen auswählen:"
 
-#: ../src/plugins/mail-notification/mail-notification.c:1198
+#: ../src/plugins/mail-notification/mail-notification.c:1234
 #: ../src/plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid "Mail Notification"
 msgstr "Benachrichtigung bei neuen E-Mails"
 
-#: ../src/plugins/mail-notification/mail-notification.c:1212
+#: ../src/plugins/mail-notification/mail-notification.c:1248
 msgid "Notify new messages for _Inbox only"
 msgstr "Nur über neue Nachrichten im _Eingangsordner benachrichtigen"
 
-#: ../src/plugins/mail-notification/mail-notification.c:1228
+#: ../src/plugins/mail-notification/mail-notification.c:1264
 msgid "Show _notification when a new message arrives"
 msgstr "Symbol im Be_nachrichtigungsfeld beim Eintreffen neuer E-Mails anzeigen"
 
-#: ../src/plugins/mail-notification/mail-notification.c:1246
+#: ../src/plugins/mail-notification/mail-notification.c:1282
 msgid "Accounts"
 msgstr "Konten"
 
@@ -26396,24 +26443,24 @@ 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:600
+#: ../src/plugins/mail-to-task/mail-to-task.c:598
 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:602
+#: ../src/plugins/mail-to-task/mail-to-task.c:600
 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:604
+#: ../src/plugins/mail-to-task/mail-to-task.c:602
 msgctxt "mail-to-task"
 msgid "_New"
 msgstr "_Neu"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:622
+#: ../src/plugins/mail-to-task/mail-to-task.c:620
 #, c-format
 msgid ""
 "Selected calendar contains event “%s” already. Would you like to edit the old "
@@ -26422,7 +26469,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:625
+#: ../src/plugins/mail-to-task/mail-to-task.c:623
 #, c-format
 msgid ""
 "Selected task list contains task “%s” already. Would you like to edit the old task?"
@@ -26430,7 +26477,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:628
+#: ../src/plugins/mail-to-task/mail-to-task.c:626
 #, c-format
 msgid ""
 "Selected memo list contains memo “%s” already. Would you like to edit the old memo?"
@@ -26439,7 +26486,7 @@ msgstr ""
 "Notiz bearbeiten?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../src/plugins/mail-to-task/mail-to-task.c:648
+#: ../src/plugins/mail-to-task/mail-to-task.c:646
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to add "
@@ -26455,7 +26502,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:655
+#: ../src/plugins/mail-to-task/mail-to-task.c:653
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to add "
@@ -26471,7 +26518,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:662
+#: ../src/plugins/mail-to-task/mail-to-task.c:660
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to add "
@@ -26486,29 +26533,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:683
+#: ../src/plugins/mail-to-task/mail-to-task.c:681
 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:759
+#: ../src/plugins/mail-to-task/mail-to-task.c:756
 msgid "[No Summary]"
 msgstr "[Keine Zusammenfassung]"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:772
+#: ../src/plugins/mail-to-task/mail-to-task.c:769
 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:826
+#: ../src/plugins/mail-to-task/mail-to-task.c:823
 #, 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:877
+#: ../src/plugins/mail-to-task/mail-to-task.c:874
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Kalender konnte nicht geöffnet werden. %s"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:881
+#: ../src/plugins/mail-to-task/mail-to-task.c:878
 msgid ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
@@ -26516,7 +26563,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:884
+#: ../src/plugins/mail-to-task/mail-to-task.c:881
 msgid ""
 "Selected task list is read only, thus cannot create task there. Select other task "
 "list, please."
@@ -26524,7 +26571,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:887
+#: ../src/plugins/mail-to-task/mail-to-task.c:884
 msgid ""
 "Selected memo list is read only, thus cannot create memo there. Select other memo "
 "list, please."
@@ -26532,35 +26579,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:1328
+#: ../src/plugins/mail-to-task/mail-to-task.c:1325
 msgid "Create an _Appointment"
 msgstr "Einen neuen _Termin anlegen"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1330
+#: ../src/plugins/mail-to-task/mail-to-task.c:1327
 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:1335
+#: ../src/plugins/mail-to-task/mail-to-task.c:1332
 msgid "Create a Mem_o"
 msgstr "Eine _Notiz anlegen"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1337
+#: ../src/plugins/mail-to-task/mail-to-task.c:1334
 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:1342
+#: ../src/plugins/mail-to-task/mail-to-task.c:1339
 msgid "Create a _Task"
 msgstr "Eine _Aufgabe anlegen"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1344
+#: ../src/plugins/mail-to-task/mail-to-task.c:1341
 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:1352
+#: ../src/plugins/mail-to-task/mail-to-task.c:1349
 msgid "Create a _Meeting"
 msgstr "Eine _Besprechung anlegen"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1354
+#: ../src/plugins/mail-to-task/mail-to-task.c:1351
 msgid "Create a new meeting from the selected message"
 msgstr "Eine neue Besprechung mit Hilfe der gewählten Nachricht anlegen"
 
@@ -26641,18 +26688,18 @@ msgstr "Die Veröffentlichung nach »%s« ist erfolgreich abgeschlossen worden"
 msgid "Mount of %s failed:"
 msgstr "Einhängen von »%s« ist fehlgeschlagen:"
 
-#: ../src/plugins/publish-calendar/publish-calendar.c:788
+#: ../src/plugins/publish-calendar/publish-calendar.c:787
 msgid "Are you sure you want to remove this location?"
 msgstr "Sind Sie sicher, dass Sie diesen Ort entfernen wollen?"
 
 #. To Translators: This is shown to a user when creation of a new thread,
 #. * where the publishing should be done, fails. Basically, this shouldn't
 #. * ever happen, and if so, then something is really wrong.
-#: ../src/plugins/publish-calendar/publish-calendar.c:1098
+#: ../src/plugins/publish-calendar/publish-calendar.c:1097
 msgid "Could not create publish thread."
 msgstr "Konversation zum Veröffentlichen der Nachricht konnte nicht erstellt werden."
 
-#: ../src/plugins/publish-calendar/publish-calendar.c:1108
+#: ../src/plugins/publish-calendar/publish-calendar.c:1107
 msgid "_Publish Calendar Information"
 msgstr "Kalenderinformationen verö_ffentlichen"
 
@@ -26742,11 +26789,11 @@ msgstr "Ort der Veröffentlichung"
 msgid "Invalid source UID “%s”"
 msgstr "Ungültige Quellen-Benutzerkennung »%s«"
 
-#: ../src/plugins/publish-calendar/url-editor-dialog.c:542
+#: ../src/plugins/publish-calendar/url-editor-dialog.c:540
 msgid "New Location"
 msgstr "Neuer Ort"
 
-#: ../src/plugins/publish-calendar/url-editor-dialog.c:544
+#: ../src/plugins/publish-calendar/url-editor-dialog.c:542
 msgid "Edit Location"
 msgstr "Ort bearbeiten"
 
@@ -26850,30 +26897,64 @@ msgstr "%d.%m.%YT%T"
 msgid "RDF (.rdf)"
 msgstr "RDF-Format (.rdf)"
 
-#: ../src/plugins/save-calendar/save-calendar.c:116
+#: ../src/plugins/save-calendar/save-calendar.c:114
 msgid "_Format:"
 msgstr "_Format:"
 
-#: ../src/plugins/save-calendar/save-calendar.c:183
+#: ../src/plugins/save-calendar/save-calendar.c:181
 msgid "Select destination file"
 msgstr "Zieldatei wählen"
 
-#: ../src/plugins/save-calendar/save-calendar.c:186
+#: ../src/plugins/save-calendar/save-calendar.c:184
 msgid "_Save As"
 msgstr "Speichern _unter"
 
-#: ../src/plugins/save-calendar/save-calendar.c:346
+#: ../src/plugins/save-calendar/save-calendar.c:343
 msgid "Save the selected calendar to disk"
 msgstr "Den gewählten Kalender auf einem Datenträger speichern"
 
-#: ../src/plugins/save-calendar/save-calendar.c:385
+#: ../src/plugins/save-calendar/save-calendar.c:382
 msgid "Save the selected memo list to disk"
 msgstr "Die gewählte Notizliste auf einem Datenträger speichern"
 
-#: ../src/plugins/save-calendar/save-calendar.c:424
+#: ../src/plugins/save-calendar/save-calendar.c:421
 msgid "Save the selected task list to disk"
 msgstr "Die gewählte Aufgabenliste auf einen Datenträger speichern"
 
+#: ../src/plugins/sender-validation/org-gnome-evolution-sender-validation.eplug.xml.h:1
+msgid "Sender Validation"
+msgstr "Überprüfung des Absenders"
+
+#: ../src/plugins/sender-validation/org-gnome-evolution-sender-validation.eplug.xml.h:2
+msgid ""
+"Validates sender before sending an e-mail against a list of recipients and for "
+"them assigned expected send account."
+msgstr ""
+
+#: ../src/plugins/sender-validation/org-gnome-sender-validation.error.xml.h:1
+msgid "Confirm sender address"
+msgstr "Absender bestätigen"
+
+#: ../src/plugins/sender-validation/org-gnome-sender-validation.error.xml.h:2
+msgid ""
+"The message contains recipient “{0}” for which it is set up to use sender account "
+"“{1}”, but the account “{2}” is used instead."
+msgstr ""
+"Die Nachricht enthält den Empfänger »{0}«, welcher normalerweise das Senderkonto "
+"»{1}« verwendet. Stattdessen wird das Konto »{2}« verwendet."
+
+#: ../src/plugins/sender-validation/org-gnome-sender-validation.error.xml.h:4
+msgid "_Send Anyway"
+msgstr "Trotzdem _verschicken"
+
+#: ../src/plugins/sender-validation/sender-validation.c:520
+msgid "Recipient Contains"
+msgstr "Empfänger enthält"
+
+#: ../src/plugins/sender-validation/sender-validation.c:530
+msgid "Account to Use"
+msgstr "Zu nutzendes Konto"
+
 #: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid ""
 "Drafts based template plugin. You can use variables like $ORIG[subject], "
@@ -26911,7 +26992,7 @@ msgstr "Beenden wird vorbereitet"
 
 #: ../src/shell/e-shell.c:525
 msgid "Preparing to quit…"
-msgstr "Beenden wird vorbereitet"
+msgstr "Beenden wird vorbereitet …"
 
 #: ../src/shell/e-shell.c:1088
 msgid "Open _Settings"
@@ -27665,7 +27746,7 @@ msgstr "MD5-Fingerabdruck"
 msgid "Email Address"
 msgstr "E-Mail-Adresse"
 
-#: ../src/smime/gui/certificate-manager.c:648
+#: ../src/smime/gui/certificate-manager.c:647
 msgid "Select a file to backup your key and certificate…"
 msgstr "Wählen Sie eine Datei zum Sichern ihres Schlüssels und Zertifikats …"
 
@@ -27674,31 +27755,31 @@ msgstr "Wählen Sie eine Datei zum Sichern ihres Schlüssels und Zertifikats …
 #. * when a user wants to backup one of her/his private keys/certificates.
 #. * For example: gnomedev-backup.p12
 #.
-#: ../src/smime/gui/certificate-manager.c:658
+#: ../src/smime/gui/certificate-manager.c:657
 #, c-format
 msgid "%s-backup.p12"
 msgstr "%s-backup.p12"
 
-#: ../src/smime/gui/certificate-manager.c:721
+#: ../src/smime/gui/certificate-manager.c:716
 msgid "Backup Certificate"
 msgstr "Zertifikat sichern"
 
 #. filename selection
-#: ../src/smime/gui/certificate-manager.c:736
+#: ../src/smime/gui/certificate-manager.c:731
 msgid "_File name:"
 msgstr "_Dateiname:"
 
 #. FIXME when gtk_file_chooser_button allows GTK_FILE_CHOOSER_ACTION_SAVE use it
-#: ../src/smime/gui/certificate-manager.c:741
+#: ../src/smime/gui/certificate-manager.c:736
 msgid "Please select a file…"
 msgstr "Bitte eine Datei wählen …"
 
-#: ../src/smime/gui/certificate-manager.c:755
+#: ../src/smime/gui/certificate-manager.c:750
 msgid "_Include certificate chain in the backup"
 msgstr "Die Zertifikatskette in der Sicherung mit _einschließen"
 
 #. To Translators: this text was copied from Firefox
-#: ../src/smime/gui/certificate-manager.c:761
+#: ../src/smime/gui/certificate-manager.c:756
 msgid ""
 "The certificate backup password you set here protects the backup file that you are "
 "about to create.\n"
@@ -27708,16 +27789,16 @@ msgstr ""
 "erstellen.\n"
 "Sie müssen ein Passwort angeben, um mit der Sicherheitskopie fortsetzen zu können."
 
-#: ../src/smime/gui/certificate-manager.c:780
+#: ../src/smime/gui/certificate-manager.c:775
 msgid "_Repeat Password:"
 msgstr "Passwort _wiederholen:"
 
-#: ../src/smime/gui/certificate-manager.c:799
+#: ../src/smime/gui/certificate-manager.c:794
 msgid "Passwords do not match"
 msgstr "Passwörter stimmen nicht überein"
 
 #. To Translators: this text was copied from Firefox
-#: ../src/smime/gui/certificate-manager.c:807
+#: ../src/smime/gui/certificate-manager.c:802
 msgid ""
 "Important:\n"
 "If you forget your certificate backup password, you will not be able to restore "
@@ -27729,93 +27810,93 @@ msgstr ""
 "Sicherheitskopie später nicht wiederherstellen.\n"
 "Bewahren Sie das Passwort an einem sicheren Ort auf."
 
-#: ../src/smime/gui/certificate-manager.c:852
+#: ../src/smime/gui/certificate-manager.c:847
 msgid "No file name provided"
 msgstr "Kein Dateiname angegeben"
 
-#: ../src/smime/gui/certificate-manager.c:856
+#: ../src/smime/gui/certificate-manager.c:851
 msgid "Failed to backup key and certificate"
 msgstr "Zertifikat und Notfallschlüssel konnten nicht gesichert werden"
 
-#: ../src/smime/gui/certificate-manager.c:948
+#: ../src/smime/gui/certificate-manager.c:943
 msgid "Select a certificate to import…"
 msgstr "Wählen Sie ein zu importierendes Zertifikat …"
 
-#: ../src/smime/gui/certificate-manager.c:997
+#: ../src/smime/gui/certificate-manager.c:992
 msgid "Failed to import certificate"
 msgstr "Zertifikat konnte nicht importiert werden"
 
-#: ../src/smime/gui/certificate-manager.c:1114
+#: ../src/smime/gui/certificate-manager.c:1109
 msgctxt "CamelTrust"
 msgid "Ask when used"
 msgstr "Beim Verwenden nachfragen"
 
-#: ../src/smime/gui/certificate-manager.c:1116
+#: ../src/smime/gui/certificate-manager.c:1111
 msgctxt "CamelTrust"
 msgid "Never"
 msgstr "Nie"
 
-#: ../src/smime/gui/certificate-manager.c:1118
+#: ../src/smime/gui/certificate-manager.c:1113
 msgctxt "CamelTrust"
 msgid "Marginally"
 msgstr "Geringfügig"
 
-#: ../src/smime/gui/certificate-manager.c:1120
+#: ../src/smime/gui/certificate-manager.c:1115
 msgctxt "CamelTrust"
 msgid "Fully"
 msgstr "Vollkommen"
 
-#: ../src/smime/gui/certificate-manager.c:1122
+#: ../src/smime/gui/certificate-manager.c:1117
 msgctxt "CamelTrust"
 msgid "Ultimately"
 msgstr "Uneingeschränkt"
 
-#: ../src/smime/gui/certificate-manager.c:1124
+#: ../src/smime/gui/certificate-manager.c:1119
 msgctxt "CamelTrust"
 msgid "Temporarily"
 msgstr "Vorübergehend"
 
-#: ../src/smime/gui/certificate-manager.c:1330
+#: ../src/smime/gui/certificate-manager.c:1325
 msgid "Change certificate trust"
 msgstr "Vertrauenswürdigkeit eines Zertifikats ändern"
 
-#: ../src/smime/gui/certificate-manager.c:1342
+#: ../src/smime/gui/certificate-manager.c:1337
 #, c-format
 msgid "Change trust for the host “%s”:"
 msgstr "Vertrauenswürdigkeit für Rechner »%s« ändern:"
 
-#: ../src/smime/gui/certificate-manager.c:1366
+#: ../src/smime/gui/certificate-manager.c:1361
 msgctxt "CamelTrust"
 msgid "_Ask when used"
 msgstr "Beim _Verwenden nachfragen"
 
-#: ../src/smime/gui/certificate-manager.c:1367
+#: ../src/smime/gui/certificate-manager.c:1362
 msgctxt "CamelTrust"
 msgid "_Never trust this certificate"
 msgstr "_Niemals diesem Zertifikat vertrauen"
 
-#: ../src/smime/gui/certificate-manager.c:1368
+#: ../src/smime/gui/certificate-manager.c:1363
 msgctxt "CamelTrust"
 msgid "_Temporarily trusted (this session only)"
 msgstr "_Vorübergehend vertrauenswürdig (nur für diese Sitzung)"
 
-#: ../src/smime/gui/certificate-manager.c:1369
+#: ../src/smime/gui/certificate-manager.c:1364
 msgctxt "CamelTrust"
 msgid "_Marginally trusted"
 msgstr "_Geringfügig vertrauenswürdig"
 
-#: ../src/smime/gui/certificate-manager.c:1370
+#: ../src/smime/gui/certificate-manager.c:1365
 msgctxt "CamelTrust"
 msgid "_Fully trusted"
 msgstr "_Vollständig vertrauenswürdig"
 
-#: ../src/smime/gui/certificate-manager.c:1371
+#: ../src/smime/gui/certificate-manager.c:1366
 msgctxt "CamelTrust"
 msgid "_Ultimately trusted"
 msgstr "_Uneingeschränkt vertrauenswürdig"
 
 # CHECK
-#: ../src/smime/gui/certificate-manager.c:1375
+#: ../src/smime/gui/certificate-manager.c:1370
 msgid ""
 "Before trusting this site, you should examine its certificate and its policy and "
 "procedures (if available)."
@@ -27823,43 +27904,43 @@ msgstr ""
 "Bevor Sie dieser Zertifizierungsstelle vertrauen, sollten Sie deren Zertifikat und "
 "seine Verfahrensweisen genau kontrollieren (falls möglich)."
 
-#: ../src/smime/gui/certificate-manager.c:1390
+#: ../src/smime/gui/certificate-manager.c:1385
 msgid "_Display certificate"
 msgstr "_Zertifikat anzeigen"
 
-#: ../src/smime/gui/certificate-manager.c:1595
+#: ../src/smime/gui/certificate-manager.c:1590
 msgid "You have certificates on file that identify these mail servers:"
 msgstr "Sie besitzen Zertifikate, die folgende E-Mail-Server identifizieren:"
 
-#: ../src/smime/gui/certificate-manager.c:1626
+#: ../src/smime/gui/certificate-manager.c:1621
 msgid "Host name"
 msgstr "Rechnername"
 
-#: ../src/smime/gui/certificate-manager.c:1628
+#: ../src/smime/gui/certificate-manager.c:1623
 msgid "Issuer"
 msgstr "Aussteller"
 
-#: ../src/smime/gui/certificate-manager.c:1629
+#: ../src/smime/gui/certificate-manager.c:1624
 msgid "Fingerprint"
 msgstr "Fingerabdruck"
 
-#: ../src/smime/gui/certificate-manager.c:1630
+#: ../src/smime/gui/certificate-manager.c:1625
 msgid "Trust"
 msgstr "Vertrauenswürdigkeit"
 
-#: ../src/smime/gui/certificate-manager.c:1651
+#: ../src/smime/gui/certificate-manager.c:1646
 msgid "_Edit Trust"
 msgstr "Vertrauenswürdigkeit _bearbeiten"
 
-#: ../src/smime/gui/certificate-manager.c:2105
+#: ../src/smime/gui/certificate-manager.c:2082
 msgid "All PKCS12 files"
 msgstr "Alle PKCS12-Dateien"
 
-#: ../src/smime/gui/certificate-manager.c:2122
+#: ../src/smime/gui/certificate-manager.c:2099
 msgid "All email certificate files"
 msgstr "Alle E-Mail-Zertifikatdateien"
 
-#: ../src/smime/gui/certificate-manager.c:2139
+#: ../src/smime/gui/certificate-manager.c:2116
 msgid "All CA certificate files"
 msgstr "Alle CA-Zertifikatdateien"
 
@@ -27870,7 +27951,7 @@ msgid ""
 msgstr ""
 "Sie vertrauen der Zertifizierungsstelle, die dieses Zertifikat ausgestellt hat. "
 "Daher vertrauen Sie der Echtheit dieses Zertifikats, falls Sie es hier nicht "
-"anders angeben."
+"anders angeben"
 
 #: ../src/smime/gui/cert-trust-dialog.c:155
 msgid ""
@@ -27880,7 +27961,7 @@ msgid ""
 msgstr ""
 "Sie vertrauen der Zertifizierungsstelle nicht, die dieses Zertifikat ausgestellt "
 "hat. Daher vertrauen Sie der Echtheit dieses Zertifikats nicht, falls Sie es hier "
-"nicht anders angeben."
+"nicht anders angeben"
 
 # token ?
 #: ../src/smime/gui/component.c:53