[evolution] Updated German translation



commit 52ac3b0006a71382b5a8d6e3d5f1876cad6a4a71
Author: Benjamin Steinwender <b stbe at>
Date:   Sun Jun 16 20:45:03 2013 +0200

    Updated German translation

 po/de.po | 4366 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 2179 insertions(+), 2187 deletions(-)
---
diff --git a/po/de.po b/po/de.po
index 9536507..be94548 100644
--- a/po/de.po
+++ b/po/de.po
@@ -24,24 +24,22 @@
 # Tobias Endrigkeit <tobiasendrigkeit googlemail com>, 2012.
 # Christian Kirbach <christian kirbach gmail com>, 2009, 2010, 2011, 2012, 2013.
 #
-#: ../shell/main.c:573
+#: ../shell/main.c:558
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution&keywords=I18N+L10N&component=Miscellaneous\n"
-"POT-Creation-Date: 2013-03-03 12:21+0000\n"
-"PO-Revision-Date: 2013-03-03 19:42+0100\n"
-"Last-Translator: Mario Blättermann <mario blaettermann gmail com>\n"
+"POT-Creation-Date: 2013-06-16 00:35+0000\n"
+"PO-Revision-Date: 2013-06-08 14:56+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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 2.91.6\n"
-"X-Poedit-Language: German\n"
-"X-Poedit-Country: GERMANY\n"
+"X-Generator: Poedit 1.5.4\n"
 
 #: ../addressbook/addressbook.error.xml.h:1
 msgid "This address book could not be opened."
@@ -299,7 +297,7 @@ msgstr "_In:"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 #: ../calendar/gui/dialogs/event-page.ui.h:16
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
-#: ../calendar/gui/dialogs/task-page.ui.h:5
+#: ../calendar/gui/dialogs/task-page.ui.h:27
 msgid "Ca_tegories..."
 msgstr "Ka_tegorien …"
 
@@ -314,8 +312,8 @@ msgstr "Wünscht _HTML-E-Mails"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
 #: ../addressbook/gui/merging/eab-contact-merging.c:396
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:606
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:971
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:590
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:942
 #: ../smime/lib/e-asn1-object.c:395
 msgid "Email"
 msgstr "E-Mail"
@@ -432,8 +430,8 @@ msgid "_Anniversary:"
 msgstr "_Jahrestag:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:703
-#: ../calendar/gui/e-calendar-view.c:2193
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:685
+#: ../calendar/gui/e-calendar-view.c:2197
 msgid "Anniversary"
 msgstr "Jahrestag"
 
@@ -443,13 +441,12 @@ msgstr "Jahrestag"
 #. * which, so long as it has an icon.  We're just interested in
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:702
-#: ../calendar/gui/e-calendar-view.c:2192 ../shell/main.c:127
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:684
+#: ../calendar/gui/e-calendar-view.c:2196 ../shell/main.c:129
 msgid "Birthday"
 msgstr "Geburtstag"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
-#: ../calendar/gui/dialogs/task-details-page.ui.h:22
 msgid "Miscellaneous"
 msgstr "Verschiedenes"
 
@@ -484,25 +481,25 @@ msgstr "_Adresse:"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:191
 #: ../addressbook/gui/widgets/e-contact-map.c:308
-#: ../addressbook/gui/widgets/eab-contact-display.c:389
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:69
+#: ../addressbook/gui/widgets/eab-contact-display.c:357
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:81
 msgid "Home"
 msgstr "Privat"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:190
 #: ../addressbook/gui/widgets/e-contact-map.c:316
-#: ../addressbook/gui/widgets/eab-contact-display.c:386
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:68
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:684
+#: ../addressbook/gui/widgets/eab-contact-display.c:354
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:80
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:666
 msgid "Work"
 msgstr "Geschäftlich"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:70
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:379
-#: ../calendar/gui/e-cal-model.c:3466
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:82
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:368
+#: ../calendar/gui/e-cal-model.c:3965
 msgid "Other"
 msgstr "Weitere"
 
@@ -515,47 +512,47 @@ msgid "Notes"
 msgstr "Notizen"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:170
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:609
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:593
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:612
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:596
 msgid "Jabber"
 msgstr "Jabber"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:614
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:598
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:615
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:599
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:613
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:597
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:611
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:595
 msgid "ICQ"
 msgstr "ICQ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:610
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:594
 msgid "GroupWise"
 msgstr "GroupWise"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:616
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:600
 msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:617
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:601
 msgid "Twitter"
 msgstr "Twitter"
 
@@ -578,15 +575,15 @@ msgstr "Fehler beim Entfernen eines Kontakts"
 msgid "Contact Editor - %s"
 msgstr "Kontakteditor - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3476
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3477
 msgid "Please select an image for this contact"
 msgstr "Bitte wählen Sie ein Bild für diesen Kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3477
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3478
 msgid "_No image"
 msgstr "_Kein Bild"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3810
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3819
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -594,28 +591,28 @@ msgstr ""
 "Die Kontaktdaten sind ungültig:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3816
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3825
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "»%s« hat ein ungültiges Format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3824
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3833
 #, c-format
 msgid "'%s' cannot be a future date"
 msgstr "»%s« darf kein zukünftiges Datum sein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3832
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3841
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s»%s« hat ein ungültiges Format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3845
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3859
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3854
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3868
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s»%s« ist leer"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3874
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3883
 msgid "Invalid contact."
 msgstr "Kontakt ungültig."
 
@@ -752,19 +749,19 @@ msgstr "A_uswählen …"
 msgid "Contact List Members"
 msgstr "Kontaktlistenmitglieder"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1468
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1475
 msgid "_Members"
 msgstr "_Mitglieder"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1587
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1594
 msgid "Error adding list"
 msgstr "Fehler beim Hinzufügen einer Liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1602
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1609
 msgid "Error modifying list"
 msgstr "Fehler beim Ändern einer Liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1617
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1624
 msgid "Error removing list"
 msgstr "Fehler beim Entfernen einer Liste"
 
@@ -829,9 +826,9 @@ msgstr "E-Mail-Adresse beginnt mit"
 #: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
 #: ../calendar/gui/tasktypes.xml.h:30
 #: ../modules/addressbook/e-book-shell-view-actions.c:1090
-#: ../modules/calendar/e-cal-shell-view-actions.c:1795
-#: ../modules/calendar/e-memo-shell-view-actions.c:812
-#: ../modules/calendar/e-task-shell-view-actions.c:1011
+#: ../modules/calendar/e-cal-shell-view-actions.c:1792
+#: ../modules/calendar/e-memo-shell-view-actions.c:811
+#: ../modules/calendar/e-task-shell-view-actions.c:1010
 msgid "Any field contains"
 msgstr "Ein beliebiges Feld enthält"
 
@@ -944,7 +941,7 @@ msgid "Family Name"
 msgstr "Familienname"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:608
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:592
 msgid "Nickname"
 msgstr "Spitzname"
 
@@ -1001,7 +998,7 @@ msgid "ISDN Phone"
 msgstr "ISDN-Telefon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:700
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:682
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
@@ -1041,7 +1038,7 @@ msgid "TTYTDD"
 msgstr "TTYTDD"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:663
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:645
 msgid "Company"
 msgstr "Firma"
 
@@ -1058,18 +1055,18 @@ msgid "Title"
 msgstr "Anrede"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../calendar/gui/e-meeting-list-view.c:663
+#: ../calendar/gui/e-meeting-list-view.c:666
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "Position"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:667
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:649
 msgid "Manager"
 msgstr "Vorgesetzter"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:668
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:650
 msgid "Assistant"
 msgstr "Assistent"
 
@@ -1090,12 +1087,12 @@ msgid "Categories"
 msgstr "Kategorien"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:704
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:686
 msgid "Spouse"
 msgstr "Ehepartner"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:738
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:718
 msgid "Note"
 msgstr "Notiz"
 
@@ -1211,110 +1208,110 @@ msgstr "Kontakt: "
 msgid "evolution minicard"
 msgstr "Evolution-Minicard"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:152
+#: ../addressbook/gui/widgets/eab-contact-display.c:150
 msgid "Copy _Email Address"
 msgstr "_E-Mail-Adresse kopieren"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:154
-#: ../e-util/e-web-view-gtkhtml.c:428 ../e-util/e-web-view.c:295
+#: ../addressbook/gui/widgets/eab-contact-display.c:152
+#: ../e-util/e-web-view-gtkhtml.c:428 ../e-util/e-web-view.c:296
 msgid "Copy the email address to the clipboard"
 msgstr "E-Mail-Adresse in die Zwischenablage kopieren"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:159
-#: ../e-util/e-web-view-gtkhtml.c:433 ../e-util/e-web-view.c:300
+#: ../addressbook/gui/widgets/eab-contact-display.c:157
+#: ../e-util/e-web-view-gtkhtml.c:433 ../e-util/e-web-view.c:301
 msgid "_Send New Message To..."
 msgstr "Neue Nachricht _schicken an …"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:161
-#: ../e-util/e-web-view-gtkhtml.c:435 ../e-util/e-web-view.c:302
+#: ../addressbook/gui/widgets/eab-contact-display.c:159
+#: ../e-util/e-web-view-gtkhtml.c:435 ../e-util/e-web-view.c:303
 msgid "Send a mail message to this address"
 msgstr "Eine Nachricht an diese Adresse senden"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:323
-#: ../e-util/e-web-view-gtkhtml.c:970 ../e-util/e-web-view.c:1084
+#: ../addressbook/gui/widgets/eab-contact-display.c:291
+#: ../e-util/e-web-view-gtkhtml.c:970 ../e-util/e-web-view.c:962
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klicken Sie hier, um eine E-Mail an %s zu verfassen"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:148
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:137
 msgid "Open map"
 msgstr "Karte öffnen"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:544
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:529
 msgid "List Members:"
 msgstr "Listenmitglieder:"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:664
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:646
 msgid "Department"
 msgstr "Abteilung"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:665
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:647
 msgid "Profession"
 msgstr "Beruf"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:666
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:648
 msgid "Position"
 msgstr "Position"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:669
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:651
 msgid "Video Chat"
 msgstr "Video-Chat"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:670
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:652
 #: ../e-util/e-send-options.c:546
 #: ../modules/calendar/e-cal-shell-view-actions.c:216
 #: ../modules/calendar/e-cal-shell-view-actions.c:245
-#: ../modules/calendar/e-cal-shell-view.c:548
+#: ../modules/calendar/e-cal-shell-view.c:557
 #: ../plugins/publish-calendar/publish-calendar.ui.h:21
 msgid "Calendar"
 msgstr "Kalender"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:671
-#: ../calendar/gui/dialogs/event-editor.c:122
-#: ../calendar/gui/dialogs/event-editor.c:349
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:653
+#: ../calendar/gui/dialogs/event-editor.c:116
+#: ../calendar/gui/dialogs/event-editor.c:343
 #: ../plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Free/Busy"
 msgstr "Verfügbarkeit"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:672
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:699
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:654
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:681
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:673
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:655
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:674
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:701
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:656
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:683
 msgid "Address"
 msgstr "Adresse"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:697
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:679
 msgid "Home Page"
 msgstr "Homepage"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:698
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:680
 msgid "Web Log"
 msgstr "Weblog"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:714
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:696
 msgid "Personal"
 msgstr "Persönlich"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:935
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:906
 msgid "List Members"
 msgstr "Listenmitglieder"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:956
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:927
 msgid "Job Title"
 msgstr "Tätigkeit"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:997
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:968
 msgid "Home page"
 msgstr "Homepage"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1007
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:978
 msgid "Blog"
 msgstr "Blog"
 
@@ -1558,7 +1555,7 @@ msgstr[1] "Stunden"
 #. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #: ../calendar/alarm-notify/alarm-notify-dialog.c:132
-#: ../calendar/gui/dialogs/recurrence-page.c:1204
+#: ../calendar/gui/dialogs/recurrence-page.c:1248
 msgid "day"
 msgid_plural "days"
 msgstr[0] "Tag"
@@ -1580,7 +1577,7 @@ msgstr "_Alle verwerfen"
 msgid "_Snooze"
 msgstr "_Schlummer"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:4 ../e-util/e-alert-dialog.c:162
+#: ../calendar/alarm-notify/alarm-notify.ui.h:4 ../e-util/e-alert-dialog.c:165
 msgid "_Dismiss"
 msgstr "_Verwerfen"
 
@@ -1642,7 +1639,7 @@ msgstr "Keine Ortsinformationen verfügbar."
 
 #: ../calendar/alarm-notify/alarm-queue.c:1636
 #: ../calendar/alarm-notify/alarm-queue.c:1737
-#: ../calendar/alarm-notify/alarm-queue.c:2099
+#: ../calendar/alarm-notify/alarm-queue.c:2076
 msgid "Evolution Reminders"
 msgstr "Evolution-Erinnerungen"
 
@@ -1653,25 +1650,11 @@ msgid_plural "You have %d reminders"
 msgstr[0] "Sie haben %d Erinnerung"
 msgstr[1] "Sie haben %d Erinnerungen"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1884
-#: ../calendar/alarm-notify/alarm-queue.c:1919
+#: ../calendar/alarm-notify/alarm-queue.c:1896
 msgid "Warning"
 msgstr "Warnung"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1888
-msgid ""
-"Evolution does not support calendar reminders with\n"
-"email notifications yet, but this reminder was\n"
-"configured to send an email.  Evolution will display\n"
-"a normal reminder dialog box instead."
-msgstr ""
-"Evolution unterstützt noch keine Kalendererinnerungen\n"
-"mit E-Mail-Benachrichtigungen, aber diese Erinnerung\n"
-"war darauf konfiguriert, eine E-Mail zu verschicken.\n"
-"Evolution wird stattdessen ein normales\n"
-"Erinnerungsdialogfenster anzeigen."
-
-#: ../calendar/alarm-notify/alarm-queue.c:1925
+#: ../calendar/alarm-notify/alarm-queue.c:1902
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -1688,7 +1671,7 @@ msgstr ""
 "\n"
 "Sind Sie sicher, dass Sie dieses Programm ausführen wollen?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1940
+#: ../calendar/alarm-notify/alarm-queue.c:1917
 msgid "Do not ask me about this program again."
 msgstr "Nicht mehr nach diesem Programm fragen."
 
@@ -1972,7 +1955,7 @@ msgstr ""
 "Einige Anlagen werden zurzeit noch heruntergeladen. Das Speichern dieser "
 "Aufgabe würde den Verlust dieser Anlagen zur Folge haben."
 
-#: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:315
+#: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:297
 msgid "_Save"
 msgstr "_Speichern"
 
@@ -2213,21 +2196,26 @@ msgstr "ist"
 msgid "is not"
 msgstr "ist nicht"
 
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:841 ../calendar/gui/e-cal-model.c:848
-#: ../calendar/gui/e-task-table.c:545 ../calendar/gui/memotypes.xml.h:10
+#. To Translators: This is task classification
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/dialogs/task-page.ui.h:2
+#: ../calendar/gui/e-cal-list-view.c:234 ../calendar/gui/e-cal-model.c:1231
+#: ../calendar/gui/e-cal-model.c:1238 ../calendar/gui/e-task-table.c:545
+#: ../calendar/gui/memotypes.xml.h:10
 msgid "Public"
 msgstr "Öffentlich"
 
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:850 ../calendar/gui/e-task-table.c:546
-#: ../calendar/gui/memotypes.xml.h:11
+#. To Translators: This is task classification
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/dialogs/task-page.ui.h:4
+#: ../calendar/gui/e-cal-list-view.c:235 ../calendar/gui/e-cal-model.c:1240
+#: ../calendar/gui/e-task-table.c:546 ../calendar/gui/memotypes.xml.h:11
 msgid "Private"
 msgstr "Privat"
 
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:236
-#: ../calendar/gui/e-cal-model.c:852 ../calendar/gui/e-task-table.c:547
-#: ../calendar/gui/memotypes.xml.h:12 ../e-util/e-send-options.ui.h:7
+#. To Translators: This is task classification
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/dialogs/task-page.ui.h:6
+#: ../calendar/gui/e-cal-list-view.c:236 ../calendar/gui/e-cal-model.c:1242
+#: ../calendar/gui/e-task-table.c:547 ../calendar/gui/memotypes.xml.h:12
+#: ../e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "Vertraulich"
 
@@ -2256,8 +2244,8 @@ msgid "Category"
 msgstr "Kategorie"
 
 #: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:56
-#: ../em-format/e-mail-formatter-print-headers.c:187
+#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:54
+#: ../em-format/e-mail-formatter-print-headers.c:204
 #: ../mail/em-filter-i18n.h:6
 msgid "Attachments"
 msgstr "Anlagen"
@@ -2273,8 +2261,8 @@ msgid "Do Not Exist"
 msgstr "Existieren nicht"
 
 #: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/dialogs/event-editor.c:316
-#: ../calendar/gui/dialogs/event-editor.c:337
+#: ../calendar/gui/dialogs/event-editor.c:310
+#: ../calendar/gui/dialogs/event-editor.c:331
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:15
 msgid "Recurrence"
 msgstr "Wiederholung"
@@ -2362,7 +2350,7 @@ msgid "Add Reminder"
 msgstr "Erinnerung hinzufügen"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-#: ../calendar/gui/dialogs/event-editor.c:359
+#: ../calendar/gui/dialogs/event-editor.c:353
 msgid "Reminder"
 msgstr "Erinnerung"
 
@@ -2379,7 +2367,7 @@ msgstr "Die Erinnerung _wiederholen"
 msgid "extra times every"
 msgstr "weitere Male alle"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../mail/mail-config.ui.h:25
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../mail/mail-config.ui.h:30
 msgid "Options"
 msgstr "Optionen"
 
@@ -2477,243 +2465,248 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Sie haben keine Änderungen vorgenommen, den Editor aktualisieren?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:269
+#: ../calendar/gui/dialogs/comp-editor.c:266
 msgid "Could not save attachments"
 msgstr "Die Anlagen konnten nicht gespeichert werden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:621
+#: ../calendar/gui/dialogs/comp-editor.c:618
 msgid "Could not update object"
 msgstr "Objekt konnte nicht aktualisiert werden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:755
+#: ../calendar/gui/dialogs/comp-editor.c:752
 msgid "Edit Appointment"
 msgstr "Termin bearbeiten"
 
-#: ../calendar/gui/dialogs/comp-editor.c:762
+#: ../calendar/gui/dialogs/comp-editor.c:759
 #, c-format
 msgid "Meeting - %s"
 msgstr "Besprechung - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:764
+#: ../calendar/gui/dialogs/comp-editor.c:761
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:770
+#: ../calendar/gui/dialogs/comp-editor.c:767
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Zugewiesene Aufgabe - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:772
+#: ../calendar/gui/dialogs/comp-editor.c:769
 #, c-format
 msgid "Task - %s"
 msgstr "Aufgabe - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:777
+#: ../calendar/gui/dialogs/comp-editor.c:774
 #, c-format
 msgid "Memo - %s"
 msgstr "Notiz - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:793
+#: ../calendar/gui/dialogs/comp-editor.c:790
 msgid "No Summary"
 msgstr "Keine Zusammenfassung"
 
-#: ../calendar/gui/dialogs/comp-editor.c:914
+#: ../calendar/gui/dialogs/comp-editor.c:911
 msgid "Keep original item?"
 msgstr "Originaleintrag behalten?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1151
+#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1118
+msgid "Unable to synchronize with the server"
+msgstr "Abgleich mit dem Server nicht möglich."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1232
 msgid "Close the current window"
 msgstr "Das aktuelle Fenster schließen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1158 ../e-util/e-focus-tracker.c:121
+#: ../calendar/gui/dialogs/comp-editor.c:1239 ../e-util/e-focus-tracker.c:121
 #: ../e-util/e-focus-tracker.c:558 ../e-util/e-web-view-gtkhtml.c:455
-#: ../e-util/e-web-view-gtkhtml.c:1296 ../e-util/e-web-view.c:322
-#: ../e-util/e-web-view.c:1407 ../mail/e-mail-browser.c:130
-#: ../shell/e-shell-window-actions.c:876
+#: ../e-util/e-web-view-gtkhtml.c:1296 ../e-util/e-web-view.c:323
+#: ../e-util/e-web-view.c:1285 ../mail/e-mail-browser.c:136
+#: ../shell/e-shell-window-actions.c:870
 msgid "Copy the selection"
 msgstr "Die Auswahl kopieren"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1165 ../e-util/e-focus-tracker.c:114
+#: ../calendar/gui/dialogs/comp-editor.c:1246 ../e-util/e-focus-tracker.c:114
 #: ../e-util/e-focus-tracker.c:553 ../e-util/e-web-view-gtkhtml.c:1290
-#: ../e-util/e-web-view.c:1401 ../mail/e-mail-browser.c:137
-#: ../shell/e-shell-window-actions.c:883
+#: ../e-util/e-web-view.c:1279 ../mail/e-mail-browser.c:143
+#: ../shell/e-shell-window-actions.c:877
 msgid "Cut the selection"
 msgstr "Die Auswahl ausschneiden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1172 ../e-util/e-focus-tracker.c:135
-#: ../e-util/e-focus-tracker.c:568 ../shell/e-shell-window-actions.c:890
+#: ../calendar/gui/dialogs/comp-editor.c:1253 ../e-util/e-focus-tracker.c:135
+#: ../e-util/e-focus-tracker.c:568 ../shell/e-shell-window-actions.c:884
 msgid "Delete the selection"
 msgstr "Die Auswahl löschen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1179
+#: ../calendar/gui/dialogs/comp-editor.c:1260
 msgid "View help"
 msgstr "Hilfe anzeigen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1186 ../e-util/e-focus-tracker.c:128
+#: ../calendar/gui/dialogs/comp-editor.c:1267 ../e-util/e-focus-tracker.c:128
 #: ../e-util/e-focus-tracker.c:563 ../e-util/e-web-view-gtkhtml.c:1302
-#: ../e-util/e-web-view.c:1413 ../mail/e-mail-browser.c:144
-#: ../shell/e-shell-window-actions.c:911
+#: ../e-util/e-web-view.c:1291 ../mail/e-mail-browser.c:150
+#: ../shell/e-shell-window-actions.c:905
 msgid "Paste the clipboard"
 msgstr "Den Inhalt der Zwischenablage einfügen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1207
+#: ../calendar/gui/dialogs/comp-editor.c:1288
 msgid "Save current changes"
 msgstr "Aktuelle Änderungen speichern"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1212
+#: ../calendar/gui/dialogs/comp-editor.c:1293
 #: ../e-util/e-mail-signature-editor.c:312
 msgid "Save and Close"
 msgstr "Speichern und schließen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1214
+#: ../calendar/gui/dialogs/comp-editor.c:1295
 msgid "Save current changes and close editor"
 msgstr "Aktuelle Änderungen speichern und den Editor schließen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1221 ../e-util/e-focus-tracker.c:142
-#: ../e-util/e-focus-tracker.c:573 ../mail/e-mail-browser.c:151
-#: ../shell/e-shell-window-actions.c:988
+#: ../calendar/gui/dialogs/comp-editor.c:1302 ../e-util/e-focus-tracker.c:142
+#: ../e-util/e-focus-tracker.c:573 ../mail/e-mail-browser.c:157
+#: ../shell/e-shell-window-actions.c:982
 msgid "Select all text"
 msgstr "Den gesamten Text markieren"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1228
+#: ../calendar/gui/dialogs/comp-editor.c:1309
 msgid "_Classification"
 msgstr "E_instufung"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1235
+#: ../calendar/gui/dialogs/comp-editor.c:1316
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../e-util/filter.ui.h:16
-#: ../e-util/gal-define-views.ui.h:5 ../mail/e-mail-browser.c:165
+#: ../e-util/gal-define-views.ui.h:5 ../mail/e-mail-browser.c:171
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
-#: ../shell/e-shell-window-actions.c:1016
+#: ../shell/e-shell-window-actions.c:1010
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1242
-#: ../e-util/e-mail-signature-editor.c:317 ../mail/e-mail-browser.c:158
-#: ../shell/e-shell-window-actions.c:1023
+#: ../calendar/gui/dialogs/comp-editor.c:1323
+#: ../e-util/e-mail-signature-editor.c:317 ../mail/e-mail-browser.c:164
+#: ../shell/e-shell-window-actions.c:1017
 msgid "_File"
 msgstr "_Datei"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1249
-#: ../shell/e-shell-window-actions.c:1030
+#: ../calendar/gui/dialogs/comp-editor.c:1330
+#: ../shell/e-shell-window-actions.c:1024
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1256
+#: ../calendar/gui/dialogs/comp-editor.c:1337
 msgid "_Insert"
 msgstr "Ein_fügen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1263
-#: ../composer/e-composer-actions.c:338
+#: ../calendar/gui/dialogs/comp-editor.c:1344
+#: ../composer/e-composer-actions.c:320
 msgid "_Options"
 msgstr "_Optionen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1270 ../mail/e-mail-browser.c:172
-#: ../shell/e-shell-window-actions.c:1065 ../smime/gui/smime-ui.ui.h:5
+#: ../calendar/gui/dialogs/comp-editor.c:1351 ../mail/e-mail-browser.c:178
+#: ../shell/e-shell-window-actions.c:1059 ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "_Ansicht"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1280
-#: ../composer/e-composer-actions.c:287
+#: ../calendar/gui/dialogs/comp-editor.c:1361
+#: ../composer/e-composer-actions.c:269
 msgid "_Attachment..."
 msgstr "_Anlage …"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1282
-#: ../composer/e-composer-actions.c:289 ../e-util/e-attachment-view.c:413
+#: ../calendar/gui/dialogs/comp-editor.c:1363
+#: ../composer/e-composer-actions.c:271 ../e-util/e-attachment-view.c:414
 msgid "Attach a file"
 msgstr "Eine Datei beilegen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1290
+#: ../calendar/gui/dialogs/comp-editor.c:1371
 msgid "_Categories"
 msgstr "_Kategorien"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1292
+#: ../calendar/gui/dialogs/comp-editor.c:1373
 msgid "Toggles whether to display categories"
 msgstr "Kategorien anzeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1298
+#: ../calendar/gui/dialogs/comp-editor.c:1379
 msgid "Time _Zone"
 msgstr "Zeit_zone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1300
+#: ../calendar/gui/dialogs/comp-editor.c:1381
 msgid "Toggles whether the time zone is displayed"
 msgstr "Zeitzone anzeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1309
+#: ../calendar/gui/dialogs/comp-editor.c:1390
 msgid "Pu_blic"
 msgstr "Ö_ffentlich"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1311
+#: ../calendar/gui/dialogs/comp-editor.c:1392
 msgid "Classify as public"
 msgstr "Als öffentlich einstufen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1316
+#: ../calendar/gui/dialogs/comp-editor.c:1397
 msgid "_Private"
 msgstr "_Privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1318
+#: ../calendar/gui/dialogs/comp-editor.c:1399
 msgid "Classify as private"
 msgstr "Als privat einstufen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1323
+#: ../calendar/gui/dialogs/comp-editor.c:1404
 msgid "_Confidential"
 msgstr "Ver_traulich"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1325
+#: ../calendar/gui/dialogs/comp-editor.c:1406
 msgid "Classify as confidential"
 msgstr "Als vertraulich einstufen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1333
+#: ../calendar/gui/dialogs/comp-editor.c:1414
 msgid "R_ole Field"
 msgstr "_Positions-Feld"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1335
+#: ../calendar/gui/dialogs/comp-editor.c:1416
 msgid "Toggles whether the Role field is displayed"
 msgstr "Feld für die Position angezeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1341
+#: ../calendar/gui/dialogs/comp-editor.c:1422
 msgid "_RSVP"
 msgstr "_UAwg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1343
+#: ../calendar/gui/dialogs/comp-editor.c:1424
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "UAwg-Feld angezeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1349
+#: ../calendar/gui/dialogs/comp-editor.c:1430
 msgid "_Status Field"
 msgstr "_Statusfeld"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1351
+#: ../calendar/gui/dialogs/comp-editor.c:1432
 msgid "Toggles whether the Status field is displayed"
 msgstr "Statusfeld anzeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1357
+#: ../calendar/gui/dialogs/comp-editor.c:1438
 msgid "_Type Field"
 msgstr "A_rt-Feld"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1359
+#: ../calendar/gui/dialogs/comp-editor.c:1440
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Feld für die Teilnehmerart angezeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2120
-#: ../composer/e-composer-actions.c:506
+#: ../calendar/gui/dialogs/comp-editor.c:2221
+#: ../composer/e-composer-actions.c:488
 msgid "Attach"
 msgstr "Beilegen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2470
-#: ../calendar/gui/dialogs/comp-editor.c:2657
-#: ../calendar/gui/dialogs/comp-editor.c:3663
+#: ../calendar/gui/dialogs/comp-editor.c:2551
+#: ../calendar/gui/dialogs/comp-editor.c:2761
+#: ../calendar/gui/dialogs/comp-editor.c:3772
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "An diesem Objekt vorgenommene Änderungen verfallen möglicherweise, sobald "
 "Aktualisierungen eintreffen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3627
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:115
+#: ../calendar/gui/dialogs/comp-editor.c:3734
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:121
 msgid "attachment"
 msgstr "Anlage"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3695
+#: ../calendar/gui/dialogs/comp-editor.c:3804
 msgid "Unable to use current version!"
 msgstr "Aktuelle Version konnte nicht verwendet werden!"
 
@@ -2779,22 +2772,22 @@ msgstr ""
 #: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
-"Das Ereignis konnte nicht gelöscht werden, da der Zugriff verweigert wurde"
+"Das Ereignis konnte nicht gelöscht werden, weil der Zugriff verweigert wurde"
 
 #: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
-"Die Aufgabe konnte nicht gelöscht werden, da der Zugriff verweigert wurde"
+"Die Aufgabe konnte nicht gelöscht werden, weil der Zugriff verweigert wurde"
 
 #: ../calendar/gui/dialogs/delete-error.c:80
 msgid "The memo could not be deleted because permission was denied"
 msgstr ""
-"Diese Notiz konnte nicht gelöscht werden, da der Zugriff verweigert wurde"
+"Diese Notiz konnte nicht gelöscht werden, weil der Zugriff verweigert wurde"
 
 #: ../calendar/gui/dialogs/delete-error.c:83
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
-"Das Objekt konnte nicht gelöscht werden, da der Zugriff verweigert wurde"
+"Das Objekt konnte nicht gelöscht werden, weil der Zugriff verweigert wurde"
 
 #. Translators: The '%s' is replaced with a detailed error message
 #: ../calendar/gui/dialogs/delete-error.c:91
@@ -2832,66 +2825,66 @@ msgstr "Delegieren an:"
 msgid "Contacts..."
 msgstr "Kontakte …"
 
-#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/event-editor.c:205
 msgid "_Reminders"
 msgstr "E_rinnerungen"
 
-#: ../calendar/gui/dialogs/event-editor.c:213
+#: ../calendar/gui/dialogs/event-editor.c:207
 msgid "Set or unset reminders for this event"
 msgstr "Erinnerungen für dieses Ereignis festlegen oder löschen"
 
-#: ../calendar/gui/dialogs/event-editor.c:221
+#: ../calendar/gui/dialogs/event-editor.c:215
 msgid "Show Time as _Busy"
 msgstr "Zeit als b_eschäftigt anzeigen"
 
-#: ../calendar/gui/dialogs/event-editor.c:223
+#: ../calendar/gui/dialogs/event-editor.c:217
 msgid "Toggles whether to show time as busy"
 msgstr "Festlegen, ob die Zeit als beschäftigt angezeigt wird"
 
-#: ../calendar/gui/dialogs/event-editor.c:232
+#: ../calendar/gui/dialogs/event-editor.c:226
 msgid "_Recurrence"
 msgstr "_Wiederholung"
 
-#: ../calendar/gui/dialogs/event-editor.c:234
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Make this a recurring event"
 msgstr "Dies zu einem wiederkehrenden Ereignis machen"
 
-#: ../calendar/gui/dialogs/event-editor.c:239 ../e-util/e-send-options.ui.h:14
+#: ../calendar/gui/dialogs/event-editor.c:233 ../e-util/e-send-options.ui.h:14
 msgid "Send Options"
 msgstr "Versandoptionen"
 
-#: ../calendar/gui/dialogs/event-editor.c:241
-#: ../calendar/gui/dialogs/task-editor.c:125
+#: ../calendar/gui/dialogs/event-editor.c:235
+#: ../calendar/gui/dialogs/task-editor.c:96
 msgid "Insert advanced send options"
 msgstr "Erweiterte Versandoptionen einfügen"
 
-#: ../calendar/gui/dialogs/event-editor.c:249
+#: ../calendar/gui/dialogs/event-editor.c:243
 msgid "All _Day Event"
 msgstr "_Ganztägiges Ereignis"
 
-#: ../calendar/gui/dialogs/event-editor.c:251
+#: ../calendar/gui/dialogs/event-editor.c:245
 msgid "Toggles whether to have All Day Event"
 msgstr "Festlegen, ob es ein ganztägiges Ereignis ist"
 
-#: ../calendar/gui/dialogs/event-editor.c:260
+#: ../calendar/gui/dialogs/event-editor.c:254
 msgid "_Free/Busy"
 msgstr "_Verfügbarkeit"
 
-#: ../calendar/gui/dialogs/event-editor.c:262
+#: ../calendar/gui/dialogs/event-editor.c:256
 msgid "Query free / busy information for the attendees"
 msgstr "Verfügbarkeitsinformationen der Teilnehmer abfragen"
 
-#: ../calendar/gui/dialogs/event-editor.c:313 ../calendar/gui/print.c:3468
+#: ../calendar/gui/dialogs/event-editor.c:307 ../calendar/gui/print.c:3505
 msgid "Appointment"
 msgstr "Termin"
 
-#: ../calendar/gui/dialogs/event-editor.c:383
+#: ../calendar/gui/dialogs/event-editor.c:377
 #: ../calendar/gui/dialogs/event-page.ui.h:24
 #: ../calendar/gui/e-meeting-list-view.c:165
 msgid "Attendees"
 msgstr "Teilnehmer"
 
-#: ../calendar/gui/dialogs/event-editor.c:580
+#: ../calendar/gui/dialogs/event-editor.c:574
 msgid "Print this event"
 msgstr "Dieses Ereignis drucken"
 
@@ -2912,7 +2905,7 @@ msgstr ""
 "Organisator sind"
 
 #: ../calendar/gui/dialogs/event-page.c:650
-#: ../calendar/gui/dialogs/event-page.c:3176
+#: ../calendar/gui/dialogs/event-page.c:3165
 msgid "This event has reminders"
 msgstr "Dieses Ereignis enthält Erinnerungen"
 
@@ -2931,7 +2924,7 @@ msgstr "Ereignis ohne Enddatum"
 
 #: ../calendar/gui/dialogs/event-page.c:1475
 #: ../calendar/gui/dialogs/memo-page.c:726
-#: ../calendar/gui/dialogs/task-page.c:853
+#: ../calendar/gui/dialogs/task-page.c:1027
 msgid "Start date is wrong"
 msgstr "Das Anfangsdatum ist falsch"
 
@@ -2949,12 +2942,12 @@ msgstr "Die Endzeit ist falsch"
 
 #: ../calendar/gui/dialogs/event-page.c:1682
 #: ../calendar/gui/dialogs/memo-page.c:765
-#: ../calendar/gui/dialogs/task-page.c:907
+#: ../calendar/gui/dialogs/task-page.c:1081
 msgid "An organizer is required."
 msgstr "Es ist ein Organisator erforderlich."
 
 #: ../calendar/gui/dialogs/event-page.c:1717
-#: ../calendar/gui/dialogs/task-page.c:942
+#: ../calendar/gui/dialogs/task-page.c:1116
 msgid "At least one attendee is required."
 msgstr "Es ist mindestens ein Teilnehmer erforderlich."
 
@@ -2966,33 +2959,33 @@ msgstr "_Vertreter"
 msgid "Atte_ndees"
 msgstr "Teil_nehmer"
 
-#: ../calendar/gui/dialogs/event-page.c:3456
+#: ../calendar/gui/dialogs/event-page.c:3445
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d Tag vor dem Termin"
 msgstr[1] "%d Tage vor dem Termin"
 
-#: ../calendar/gui/dialogs/event-page.c:3462
+#: ../calendar/gui/dialogs/event-page.c:3451
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d Stunde vor dem Termin"
 msgstr[1] "%d Stunden vor dem Termin"
 
-#: ../calendar/gui/dialogs/event-page.c:3468
+#: ../calendar/gui/dialogs/event-page.c:3457
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d Minute vor dem Termin"
 msgstr[1] "%d Minuten vor dem Termin"
 
-#: ../calendar/gui/dialogs/event-page.c:3489
+#: ../calendar/gui/dialogs/event-page.c:3478
 msgid "Customize"
 msgstr "Anpassen"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3496
+#: ../calendar/gui/dialogs/event-page.c:3485
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "Keine"
@@ -3033,8 +3026,8 @@ msgstr "O_rt:"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:12
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
-#: ../calendar/gui/dialogs/task-page.ui.h:7
-#: ../e-util/e-attachment-dialog.c:350
+#: ../calendar/gui/dialogs/task-page.ui.h:29
+#: ../e-util/e-attachment-dialog.c:357
 msgid "_Description:"
 msgstr "_Beschreibung:"
 
@@ -3043,7 +3036,7 @@ msgid "_Time:"
 msgstr "_Zeit:"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../modules/calendar/e-calendar-preferences.ui.h:20
+#: ../modules/calendar/e-calendar-preferences.ui.h:13
 msgid "Time _zone:"
 msgstr "Zeit_zone:"
 
@@ -3056,8 +3049,8 @@ msgid "Event Description"
 msgstr "Ereignisbeschreibung"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:23
-#: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../calendar/gui/e-meeting-time-sel.c:599
+#: ../calendar/gui/dialogs/task-page.ui.h:30
+#: ../calendar/gui/e-meeting-time-sel.c:547
 msgid "Atte_ndees..."
 msgstr "Teil_nehmer …"
 
@@ -3122,11 +3115,11 @@ msgid "Select Date"
 msgstr "Datum wählen"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:1403
+#: ../modules/calendar/e-cal-shell-view-actions.c:1400
 msgid "Select _Today"
 msgstr "_Heute wählen"
 
-#: ../calendar/gui/dialogs/memo-editor.c:106 ../calendar/gui/print.c:3472
+#: ../calendar/gui/dialogs/memo-editor.c:106 ../calendar/gui/print.c:3509
 msgid "Memo"
 msgstr "Notiz"
 
@@ -3150,23 +3143,23 @@ msgstr ""
 "Die Notiz kann nicht vollständig bearbeitet werden, weil Sie nicht der "
 "Organisator sind"
 
-#: ../calendar/gui/dialogs/memo-page.c:1176
-#: ../em-format/e-mail-formatter.c:1343
-#: ../em-format/e-mail-formatter-utils.c:194
-#: ../em-format/e-mail-formatter-utils.c:218 ../mail/em-filter-i18n.h:78
-#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:63
+#: ../calendar/gui/dialogs/memo-page.c:1161
+#: ../em-format/e-mail-formatter-utils.c:205
+#: ../em-format/e-mail-formatter-utils.c:229
+#: ../em-format/e-mail-part-headers.c:49 ../mail/em-filter-i18n.h:78
+#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:65
 msgid "To"
 msgstr "An"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:3
-#: ../calendar/gui/dialogs/task-page.c:336
-#: ../calendar/gui/dialogs/task-page.ui.h:9
+#: ../calendar/gui/dialogs/task-page.c:429
+#: ../calendar/gui/dialogs/task-page.ui.h:31
 msgid "_List:"
 msgstr "_Liste:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.c:344
-#: ../calendar/gui/dialogs/task-page.ui.h:2
+#: ../calendar/gui/dialogs/task-page.c:437
+#: ../calendar/gui/dialogs/task-page.ui.h:24
 msgid "Organi_zer:"
 msgstr "Or_ganisator:"
 
@@ -3175,12 +3168,12 @@ msgid "T_o:"
 msgstr "A_n:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
-#: ../calendar/gui/dialogs/task-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:26
 msgid "Sta_rt date:"
 msgstr "_Anfangsdatum:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.ui.h:1
+#: ../calendar/gui/dialogs/task-page.ui.h:23
 msgid "Su_mmary:"
 msgstr "Zusa_mmenfassung:"
 
@@ -3232,17 +3225,17 @@ msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Dieser Termin enthält Wiederholungen, die Evolution nicht bearbeiten kann."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:973
+#: ../calendar/gui/dialogs/recurrence-page.c:1000
 msgid "Recurrence date is invalid"
 msgstr "Das Wiederholungsdatum ist ungültig"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1017
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 msgid "End time of the recurrence was before event's start"
 msgstr "Die Zeit der letzten Wiederholung lag vor dem Start des Termins"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] 
[forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day 
always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
+#: ../calendar/gui/dialogs/recurrence-page.c:1073
 msgid "on"
 msgstr "am"
 
@@ -3250,7 +3243,7 @@ msgstr "am"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1110
+#: ../calendar/gui/dialogs/recurrence-page.c:1154
 msgid "first"
 msgstr "erster"
 
@@ -3259,7 +3252,7 @@ msgstr "erster"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/dialogs/recurrence-page.c:1160
 msgid "second"
 msgstr "zweiter"
 
@@ -3267,7 +3260,7 @@ msgstr "zweiter"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1121
+#: ../calendar/gui/dialogs/recurrence-page.c:1165
 msgid "third"
 msgstr "dritter"
 
@@ -3275,7 +3268,7 @@ msgstr "dritter"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1126
+#: ../calendar/gui/dialogs/recurrence-page.c:1170
 msgid "fourth"
 msgstr "vierter"
 
@@ -3283,7 +3276,7 @@ msgstr "vierter"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1131
+#: ../calendar/gui/dialogs/recurrence-page.c:1175
 msgid "fifth"
 msgstr "fünfter"
 
@@ -3291,13 +3284,13 @@ msgstr "fünfter"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1136
+#: ../calendar/gui/dialogs/recurrence-page.c:1180
 msgid "last"
 msgstr "letzter"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] 
[11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1160
+#: ../calendar/gui/dialogs/recurrence-page.c:1204
 msgid "Other Date"
 msgstr "Anderes Datum"
 
@@ -3305,7 +3298,7 @@ msgstr "Anderes Datum"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1166
+#: ../calendar/gui/dialogs/recurrence-page.c:1210
 msgid "1st to 10th"
 msgstr "1. bis 10."
 
@@ -3313,7 +3306,7 @@ msgstr "1. bis 10."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1172
+#: ../calendar/gui/dialogs/recurrence-page.c:1216
 msgid "11th to 20th"
 msgstr "11. bis 20."
 
@@ -3321,74 +3314,74 @@ msgstr "11. bis 20."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1178
+#: ../calendar/gui/dialogs/recurrence-page.c:1222
 msgid "21st to 31st"
 msgstr "21. bis 31."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1205
-#: ../modules/calendar/e-calendar-preferences.ui.h:1
+#: ../calendar/gui/dialogs/recurrence-page.c:1249
+#: ../modules/calendar/e-calendar-preferences.ui.h:25
 msgid "Monday"
 msgstr "Montag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1206
-#: ../modules/calendar/e-calendar-preferences.ui.h:2
+#: ../calendar/gui/dialogs/recurrence-page.c:1250
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1207
-#: ../modules/calendar/e-calendar-preferences.ui.h:3
+#: ../calendar/gui/dialogs/recurrence-page.c:1251
+#: ../modules/calendar/e-calendar-preferences.ui.h:31
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1208
-#: ../modules/calendar/e-calendar-preferences.ui.h:4
+#: ../calendar/gui/dialogs/recurrence-page.c:1252
+#: ../modules/calendar/e-calendar-preferences.ui.h:34
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1209
-#: ../modules/calendar/e-calendar-preferences.ui.h:5
+#: ../calendar/gui/dialogs/recurrence-page.c:1253
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
 msgid "Friday"
 msgstr "Freitag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1210
-#: ../modules/calendar/e-calendar-preferences.ui.h:6
+#: ../calendar/gui/dialogs/recurrence-page.c:1254
+#: ../modules/calendar/e-calendar-preferences.ui.h:40
 msgid "Saturday"
 msgstr "Samstag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1211
-#: ../modules/calendar/e-calendar-preferences.ui.h:7
+#: ../calendar/gui/dialogs/recurrence-page.c:1255
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
 msgid "Sunday"
 msgstr "Sonntag"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] 
[Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1342
+#: ../calendar/gui/dialogs/recurrence-page.c:1386
 msgid "on the"
 msgstr "am"
 
 # oder im Falle von Terminen: Wiederholungen ??
-#: ../calendar/gui/dialogs/recurrence-page.c:1527
+#: ../calendar/gui/dialogs/recurrence-page.c:1571
 msgid "occurrences"
 msgstr "Wiederholungen"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2253
+#: ../calendar/gui/dialogs/recurrence-page.c:2341
 msgid "Add exception"
 msgstr "Ausnahme hinzufügen"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2295
+#: ../calendar/gui/dialogs/recurrence-page.c:2383
 msgid "Could not get a selection to modify."
 msgstr "Keine zu verändernde Auswahl vorhanden."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2301
+#: ../calendar/gui/dialogs/recurrence-page.c:2389
 msgid "Modify exception"
 msgstr "Ausnahme verändern"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2347
+#: ../calendar/gui/dialogs/recurrence-page.c:2435
 msgid "Could not get a selection to delete."
 msgstr "Keine zu löschende Auswahl vorhanden."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2488
+#: ../calendar/gui/dialogs/recurrence-page.c:2576
 msgid "Date/Time"
 msgstr "Datum/Zeit"
 
@@ -3458,190 +3451,164 @@ msgstr "Meine Erinnerungen zusammen mit diesem Termin verschicken"
 msgid "Notify new attendees _only"
 msgstr "_Nur neue Teilnehmer benachrichtigen"
 
-#: ../calendar/gui/dialogs/task-details-page.c:352
-#: ../calendar/gui/dialogs/task-details-page.c:377
+#: ../calendar/gui/dialogs/task-editor.c:94
+msgid "_Send Options"
+msgstr "_Versandoptionen"
+
+#: ../calendar/gui/dialogs/task-editor.c:149 ../calendar/gui/print.c:3507
+#: ../e-util/e-send-options.c:553
+msgid "Task"
+msgstr "Aufgabe"
+
+#: ../calendar/gui/dialogs/task-editor.c:286
+msgid "Print this task"
+msgstr "Diese Aufgabe drucken"
+
+#: ../calendar/gui/dialogs/task-page.c:332
+msgid "Task's start date is in the past"
+msgstr "Beginn der Aufgabe liegt in der Vergangenheit"
+
+#: ../calendar/gui/dialogs/task-page.c:333
+msgid "Task's due date is in the past"
+msgstr "Fälligkeit der Aufgabe liegt in der Vergangenheit"
+
+#: ../calendar/gui/dialogs/task-page.c:367
+msgid "Task cannot be edited, because the selected task list is read only"
+msgstr ""
+"Die Aufgabe kann nicht bearbeitet werden, weil die gewählte Aufgabenliste "
+"nur gelesen werden darf"
+
+#: ../calendar/gui/dialogs/task-page.c:371
+msgid "Task cannot be fully edited, because you are not the organizer"
+msgstr ""
+"Die Aufgabe kann nicht vollständig bearbeitet werden, weil Sie nicht der "
+"Organisator sind"
+
+#: ../calendar/gui/dialogs/task-page.c:375
+msgid ""
+"Task cannot be edited, because the selected task list does not support "
+"assigned tasks"
+msgstr ""
+"Die Aufgabe kann nicht bearbeitet werden, weil die gewählte Aufgabenliste "
+"zugewiesene Aufgaben nicht unterstützt"
+
+#: ../calendar/gui/dialogs/task-page.c:1008
+msgid "Due date is wrong"
+msgstr "Das Fälligkeitsdatum ist falsch"
+
+#: ../calendar/gui/dialogs/task-page.c:1176
+#: ../calendar/gui/dialogs/task-page.c:1201
 msgid "Completed date is wrong"
 msgstr "Das Fertigstellungsdatum ist falsch"
 
-#: ../calendar/gui/dialogs/task-details-page.c:490
-msgid "Web Page"
-msgstr "Website"
-
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:2
+#: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../calendar/gui/e-cal-component-preview.c:348
 #: ../calendar/gui/e-task-table.c:571 ../calendar/gui/tasktypes.xml.h:19
-#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:1257
+#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:304
 msgid "High"
 msgstr "Hoch"
 
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:10
 #: ../calendar/gui/e-cal-component-preview.c:350
-#: ../calendar/gui/e-cal-model.c:1681 ../calendar/gui/e-task-table.c:572
+#: ../calendar/gui/e-cal-model.c:2071 ../calendar/gui/e-task-table.c:572
 #: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
-#: ../mail/message-list.c:1256
+#: ../mail/message-list.c:303
 msgid "Normal"
 msgstr "Normal"
 
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:6
+#: ../calendar/gui/dialogs/task-page.ui.h:12
 #: ../calendar/gui/e-cal-component-preview.c:352
 #: ../calendar/gui/e-task-table.c:573 ../calendar/gui/tasktypes.xml.h:21
-#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:1255
+#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:302
 msgid "Low"
 msgstr "Niedrig"
 
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:8
+#: ../calendar/gui/dialogs/task-page.ui.h:14
 #: ../calendar/gui/e-task-table.c:574 ../calendar/gui/tasktypes.xml.h:22
 #: ../e-util/e-send-options.ui.h:1
 msgid "Undefined"
 msgstr "Nicht festgelegt"
 
 #. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:10
+#: ../calendar/gui/dialogs/task-page.ui.h:16
 #: ../calendar/gui/e-cal-component-preview.c:333
 #: ../calendar/gui/e-cal-model-tasks.c:491
 #: ../calendar/gui/e-cal-model-tasks.c:777 ../calendar/gui/e-task-table.c:214
 #: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:654
-#: ../calendar/gui/print.c:3554 ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/print.c:3591 ../calendar/gui/tasktypes.xml.h:11
 msgid "Not Started"
 msgstr "Nicht begonnen"
 
 #. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:12
+#: ../calendar/gui/dialogs/task-page.ui.h:18
 #: ../calendar/gui/e-cal-component-preview.c:323
 #: ../calendar/gui/e-cal-model-tasks.c:493
 #: ../calendar/gui/e-cal-model-tasks.c:779
 #: ../calendar/gui/e-cal-model-tasks.c:857 ../calendar/gui/e-task-table.c:216
 #: ../calendar/gui/e-task-table.c:231 ../calendar/gui/e-task-table.c:655
-#: ../calendar/gui/print.c:3557
+#: ../calendar/gui/print.c:3594
 msgid "In Progress"
 msgstr "In Bearbeitung"
 
 #. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:14
+#: ../calendar/gui/dialogs/task-page.ui.h:20
 #: ../calendar/gui/e-cal-component-preview.c:326
 #: ../calendar/gui/e-cal-model-tasks.c:495
 #: ../calendar/gui/e-cal-model-tasks.c:781
-#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/e-meeting-store.c:231
+#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
 #: ../calendar/gui/e-task-table.c:218 ../calendar/gui/e-task-table.c:233
-#: ../calendar/gui/e-task-table.c:656 ../calendar/gui/print.c:3560
+#: ../calendar/gui/e-task-table.c:656 ../calendar/gui/print.c:3597
 #: ../calendar/gui/tasktypes.xml.h:13
 #: ../plugins/save-calendar/csv-format.c:380
 msgid "Completed"
 msgstr "Abgeschlossen"
 
 #. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:16
+#: ../calendar/gui/dialogs/task-page.ui.h:22
 #: ../calendar/gui/e-cal-component-preview.c:329
 #: ../calendar/gui/e-cal-model-tasks.c:497
 #: ../calendar/gui/e-cal-model-tasks.c:783 ../calendar/gui/e-task-table.c:220
 #: ../calendar/gui/e-task-table.c:235 ../calendar/gui/e-task-table.c:657
-#: ../calendar/gui/print.c:3563 ../mail/mail-send-recv.c:878
+#: ../calendar/gui/print.c:3600 ../mail/mail-send-recv.c:878
 msgid "Canceled"
 msgstr "Abgebrochen"
 
-#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
-#. * Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/dialogs/task-details-page.ui.h:17
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-cal-model.c:3520
-#: ../calendar/gui/e-meeting-list-view.c:692
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:75
-#: ../mail/message-list.etspec.h:1
-msgid "Status"
-msgstr "Status"
+#: ../calendar/gui/dialogs/task-page.ui.h:25
+msgid "D_ue date:"
+msgstr "_Fällig am:"
+
+#: ../calendar/gui/dialogs/task-page.ui.h:28
+msgid "Time zone:"
+msgstr "Zeitzone:"
+
+#: ../calendar/gui/dialogs/task-page.ui.h:32
+msgid "_Status:"
+msgstr "_Status:"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:18
-msgid "Stat_us:"
-msgstr "Stat_us:"
+#: ../calendar/gui/dialogs/task-page.ui.h:33
+msgid "Date _completed:"
+msgstr "_Abgeschlossen am:"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:19
-msgid "P_ercent complete:"
+#: ../calendar/gui/dialogs/task-page.ui.h:34
+msgid "_Percent complete:"
 msgstr "_Prozent abgeschlossen:"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../e-util/e-send-options.ui.h:26
-msgid "_Priority:"
+#: ../calendar/gui/dialogs/task-page.ui.h:35
+msgid "Priorit_y:"
 msgstr "_Priorität:"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:21
-msgid "_Date completed:"
-msgstr "A_bgeschlossen am:"
+#: ../calendar/gui/dialogs/task-page.ui.h:36
+msgid "C_lassification:"
+msgstr "E_instufung:"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:23
+#: ../calendar/gui/dialogs/task-page.ui.h:37
 msgid "_Web Page:"
 msgstr "_Website:"
 
-#: ../calendar/gui/dialogs/task-editor.c:113
-msgid "_Status Details"
-msgstr "S_tatusdetails"
-
-#: ../calendar/gui/dialogs/task-editor.c:115
-msgid "Click to change or view the status details of the task"
-msgstr ""
-"Klicken Sie hier, um die Statusdetails der Aufgabe anzusehen oder zu ändern."
-
-#: ../calendar/gui/dialogs/task-editor.c:123
-msgid "_Send Options"
-msgstr "_Versandoptionen"
-
-#: ../calendar/gui/dialogs/task-editor.c:183 ../calendar/gui/print.c:3470
-#: ../e-util/e-send-options.c:553
-msgid "Task"
-msgstr "Aufgabe"
-
-#: ../calendar/gui/dialogs/task-editor.c:304
-msgid "Task Details"
-msgstr "Aufgabendetails"
-
-#: ../calendar/gui/dialogs/task-editor.c:348
-msgid "Print this task"
-msgstr "Diese Aufgabe drucken"
-
-#: ../calendar/gui/dialogs/task-page.c:249
-msgid "Task's start date is in the past"
-msgstr "Beginn der Aufgabe liegt in der Vergangenheit"
-
-#: ../calendar/gui/dialogs/task-page.c:250
-msgid "Task's due date is in the past"
-msgstr "Fälligkeit der Aufgabe liegt in der Vergangenheit"
-
-#: ../calendar/gui/dialogs/task-page.c:283
-msgid "Task cannot be edited, because the selected task list is read only"
-msgstr ""
-"Die Aufgabe kann nicht bearbeitet werden, weil die gewählte Aufgabenliste "
-"nur gelesen werden darf"
-
-#: ../calendar/gui/dialogs/task-page.c:287
-msgid "Task cannot be fully edited, because you are not the organizer"
-msgstr ""
-"Die Aufgabe kann nicht vollständig bearbeitet werden, weil Sie nicht der "
-"Organisator sind"
-
-#: ../calendar/gui/dialogs/task-page.c:291
-msgid ""
-"Task cannot be edited, because the selected task list does not support "
-"assigned tasks"
-msgstr ""
-"Die Aufgabe kann nicht bearbeitet werden, weil die gewählte Aufgabenliste "
-"zugewiesene Aufgaben nicht unterstützt"
-
-#: ../calendar/gui/dialogs/task-page.c:834
-msgid "Due date is wrong"
-msgstr "Das Fälligkeitsdatum ist falsch"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:3
-msgid "D_ue date:"
-msgstr "_Fällig am:"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:6
-msgid "Time zone:"
-msgstr "Zeitzone:"
-
 #: ../calendar/gui/ea-cal-view.c:324
 msgid "New Appointment"
 msgstr "Neuer Termin"
@@ -3687,7 +3654,7 @@ msgstr "Kalender-Ereignis: Keine Zusammenfassung verfügbar."
 msgid "calendar view event"
 msgstr "Kalenderansicht Ereignis"
 
-#: ../calendar/gui/ea-cal-view-event.c:566
+#: ../calendar/gui/ea-cal-view-event.c:569
 msgid "Grab Focus"
 msgstr "Erhält Fokus"
 
@@ -3734,7 +3701,7 @@ msgid "Gnome Calendar"
 msgstr "GNOME Calendar"
 
 #: ../calendar/gui/ea-gnome-calendar.c:204
-#: ../modules/calendar/e-cal-shell-view-private.c:1143
+#: ../modules/calendar/e-cal-shell-view-private.c:1112
 msgid "%A %d %b %Y"
 msgstr "%A, %d. %B %Y"
 
@@ -3744,19 +3711,19 @@ msgstr "%A, %d. %B %Y"
 #. * %d = day of month, %b = abbreviated month name.
 #. * You can change the order but don't change the
 #. * specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:208 ../calendar/gui/e-day-view.c:1888
-#: ../calendar/gui/e-day-view-top-item.c:855
-#: ../calendar/gui/e-week-view-main-item.c:233
-#: ../modules/calendar/e-cal-shell-view-private.c:1147
+#: ../calendar/gui/ea-gnome-calendar.c:208 ../calendar/gui/e-day-view.c:2427
+#: ../calendar/gui/e-day-view-top-item.c:859
+#: ../calendar/gui/e-week-view-main-item.c:219
+#: ../modules/calendar/e-cal-shell-view-private.c:1116
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
 
 #: ../calendar/gui/ea-gnome-calendar.c:211
 #: ../calendar/gui/ea-gnome-calendar.c:217
 #: ../calendar/gui/ea-gnome-calendar.c:220
-#: ../modules/calendar/e-cal-shell-view-private.c:1150
-#: ../modules/calendar/e-cal-shell-view-private.c:1156
-#: ../modules/calendar/e-cal-shell-view-private.c:1159
+#: ../modules/calendar/e-cal-shell-view-private.c:1119
+#: ../modules/calendar/e-cal-shell-view-private.c:1125
+#: ../modules/calendar/e-cal-shell-view-private.c:1128
 msgid "%a %d %b %Y"
 msgstr "%a, %d. %Y"
 
@@ -3764,10 +3731,10 @@ msgstr "%a, %d. %Y"
 #: ../calendar/gui/ea-gnome-calendar.c:247
 #: ../calendar/gui/ea-gnome-calendar.c:254
 #: ../calendar/gui/ea-gnome-calendar.c:257
-#: ../modules/calendar/e-cal-shell-view-private.c:1176
-#: ../modules/calendar/e-cal-shell-view-private.c:1187
-#: ../modules/calendar/e-cal-shell-view-private.c:1194
-#: ../modules/calendar/e-cal-shell-view-private.c:1197
+#: ../modules/calendar/e-cal-shell-view-private.c:1145
+#: ../modules/calendar/e-cal-shell-view-private.c:1156
+#: ../modules/calendar/e-cal-shell-view-private.c:1163
+#: ../modules/calendar/e-cal-shell-view-private.c:1166
 msgid "%d %b %Y"
 msgstr "%d. %B %Y"
 
@@ -3776,10 +3743,10 @@ msgstr "%d. %B %Y"
 #. strftime format %d = day of month, %b = abbreviated
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:244 ../calendar/gui/e-day-view.c:1904
-#: ../calendar/gui/e-day-view-top-item.c:859
-#: ../calendar/gui/e-week-view-main-item.c:247
-#: ../modules/calendar/e-cal-shell-view-private.c:1183
+#: ../calendar/gui/ea-gnome-calendar.c:244 ../calendar/gui/e-day-view.c:2443
+#: ../calendar/gui/e-day-view-top-item.c:863
+#: ../calendar/gui/e-week-view-main-item.c:233
+#: ../modules/calendar/e-cal-shell-view-private.c:1152
 msgid "%d %b"
 msgstr "%d. %b"
 
@@ -3930,7 +3897,7 @@ msgid "Start date"
 msgstr "Anfangsdatum"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:3
-#: ../calendar/gui/e-meeting-list-view.c:649
+#: ../calendar/gui/e-meeting-list-view.c:652
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../calendar/gui/e-memo-table.etspec.h:3
 #: ../e-util/e-attachment-tree-view.c:586
@@ -3961,6 +3928,17 @@ msgstr "% abgeschlossen"
 msgid "Priority"
 msgstr "Priorität"
 
+#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
+#. * Status: Accepted: X   Declined: Y   ...
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+#: ../calendar/gui/e-cal-model.c:4019
+#: ../calendar/gui/e-meeting-list-view.c:695
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
+#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:75
+#: ../mail/message-list.etspec.h:1
+msgid "Status"
+msgstr "Status"
+
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-cal-list-view.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:6
@@ -4003,7 +3981,7 @@ msgstr "Objekte werden aktualisiert"
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1999 ../calendar/gui/e-memo-table.c:540
+#: ../calendar/gui/e-calendar-view.c:2003 ../calendar/gui/e-memo-table.c:540
 #: ../calendar/gui/e-task-table.c:827
 #, c-format
 msgid "Organizer: %s <%s>"
@@ -4012,21 +3990,21 @@ msgstr "Organisator: %s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c:2003 ../calendar/gui/e-memo-table.c:545
+#: ../calendar/gui/e-calendar-view.c:2007 ../calendar/gui/e-memo-table.c:545
 #: ../calendar/gui/e-task-table.c:831
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisator: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2019
-#: ../calendar/gui/e-meeting-time-sel.c:2790 ../calendar/gui/print.c:3508
+#: ../calendar/gui/e-calendar-view.c:2023
+#: ../calendar/gui/e-meeting-time-sel.c:2664 ../calendar/gui/print.c:3545
 #, c-format
 msgid "Location: %s"
 msgstr "Ort: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2050
+#: ../calendar/gui/e-calendar-view.c:2054
 #, c-format
 msgid "Time: %s %s"
 msgstr "Zeit: %s %s"
@@ -4040,67 +4018,68 @@ msgstr "Anfangsdatum"
 msgid "End Date"
 msgstr "Enddatum"
 
-#: ../calendar/gui/e-cal-model.c:854 ../calendar/gui/e-meeting-list-view.c:185
+#: ../calendar/gui/e-cal-model.c:1244
+#: ../calendar/gui/e-meeting-list-view.c:185
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:173
-#: ../calendar/gui/e-meeting-store.c:236 ../calendar/gui/print.c:1235
-#: ../calendar/gui/print.c:1252 ../e-util/e-charset.c:52
-#: ../modules/itip-formatter/itip-view.c:3505
-#: ../modules/itip-formatter/itip-view.c:5994
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:170
+#: ../calendar/gui/e-meeting-store.c:233 ../calendar/gui/print.c:1251
+#: ../calendar/gui/print.c:1268 ../e-util/e-charset.c:52
+#: ../modules/itip-formatter/itip-view.c:3496
+#: ../modules/itip-formatter/itip-view.c:5986
 #: ../modules/plugin-manager/evolution-plugin-manager.c:100
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../calendar/gui/e-cal-model.c:1683
+#: ../calendar/gui/e-cal-model.c:2073
 msgid "Recurring"
 msgstr "Wiederkehrend"
 
-#: ../calendar/gui/e-cal-model.c:1685
+#: ../calendar/gui/e-cal-model.c:2075
 msgid "Assigned"
 msgstr "Zugewiesen"
 
-#: ../calendar/gui/e-cal-model.c:1687 ../calendar/gui/e-cal-model-tasks.c:1148
+#: ../calendar/gui/e-cal-model.c:2077 ../calendar/gui/e-cal-model-tasks.c:1148
 #: ../calendar/gui/e-meeting-list-view.c:209
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:190
-#: ../calendar/gui/e-meeting-store.c:1074
+#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:187
+#: ../calendar/gui/e-meeting-store.c:1024
 msgid "Yes"
 msgstr "Ja"
 
-#: ../calendar/gui/e-cal-model.c:1687 ../calendar/gui/e-cal-model-tasks.c:1148
+#: ../calendar/gui/e-cal-model.c:2077 ../calendar/gui/e-cal-model-tasks.c:1148
 #: ../calendar/gui/e-meeting-list-view.c:210
-#: ../calendar/gui/e-meeting-store.c:192
+#: ../calendar/gui/e-meeting-store.c:189
 msgid "No"
 msgstr "Nein"
 
-#: ../calendar/gui/e-cal-model.c:3461
+#: ../calendar/gui/e-cal-model.c:3960
 #: ../calendar/gui/e-meeting-list-view.c:221
-#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
-#: ../modules/itip-formatter/itip-view.c:5982
+#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
+#: ../modules/itip-formatter/itip-view.c:5974
 msgid "Accepted"
 msgstr "Angenommen"
 
-#: ../calendar/gui/e-cal-model.c:3462
+#: ../calendar/gui/e-cal-model.c:3961
 #: ../calendar/gui/e-meeting-list-view.c:222
-#: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
-#: ../modules/itip-formatter/itip-view.c:5988
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
+#: ../modules/itip-formatter/itip-view.c:5980
 msgid "Declined"
 msgstr "Abgelehnt"
 
-#: ../calendar/gui/e-cal-model.c:3463
+#: ../calendar/gui/e-cal-model.c:3962
 #: ../calendar/gui/e-meeting-list-view.c:223
-#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../calendar/gui/e-meeting-time-sel.c:578
+#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid "Tentative"
 msgstr "Vorläufig"
 
-#: ../calendar/gui/e-cal-model.c:3464
+#: ../calendar/gui/e-cal-model.c:3963
 #: ../calendar/gui/e-meeting-list-view.c:224
-#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
-#: ../modules/itip-formatter/itip-view.c:5991
+#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
+#: ../modules/itip-formatter/itip-view.c:5983
 msgid "Delegated"
 msgstr "Delegiert"
 
-#: ../calendar/gui/e-cal-model.c:3465
+#: ../calendar/gui/e-cal-model.c:3964
 msgid "Needs action"
 msgstr "Erfordert Maßnahme"
 
@@ -4110,7 +4089,7 @@ msgid "Free"
 msgstr "Frei"
 
 #: ../calendar/gui/e-cal-model-calendar.c:161
-#: ../calendar/gui/e-meeting-time-sel.c:579 ../calendar/gui/e-task-table.c:630
+#: ../calendar/gui/e-meeting-time-sel.c:527 ../calendar/gui/e-task-table.c:630
 msgid "Busy"
 msgstr "Beschäftigt"
 
@@ -4150,16 +4129,16 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1026 ../calendar/gui/e-week-view.c:772
-#: ../calendar/gui/print.c:1058 ../calendar/gui/print.c:1077
-#: ../calendar/gui/print.c:2608 ../calendar/gui/print.c:2628
+#: ../calendar/gui/e-day-view.c:1686 ../calendar/gui/e-week-view.c:1536
+#: ../calendar/gui/print.c:1074 ../calendar/gui/print.c:1093
+#: ../calendar/gui/print.c:2637 ../calendar/gui/print.c:2657
 msgid "am"
 msgstr "AM"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1029 ../calendar/gui/e-week-view.c:775
-#: ../calendar/gui/print.c:1063 ../calendar/gui/print.c:1079
-#: ../calendar/gui/print.c:2613 ../calendar/gui/print.c:2630
+#: ../calendar/gui/e-day-view.c:1689 ../calendar/gui/e-week-view.c:1539
+#: ../calendar/gui/print.c:1079 ../calendar/gui/print.c:1095
+#: ../calendar/gui/print.c:2642 ../calendar/gui/print.c:2659
 msgid "pm"
 msgstr "PM"
 
@@ -4169,13 +4148,13 @@ msgstr "PM"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../calendar/gui/e-day-view.c:1871 ../calendar/gui/e-day-view-top-item.c:851
-#: ../calendar/gui/e-week-view-main-item.c:224 ../calendar/gui/print.c:2071
+#: ../calendar/gui/e-day-view.c:2410 ../calendar/gui/e-day-view-top-item.c:855
+#: ../calendar/gui/e-week-view-main-item.c:210 ../calendar/gui/print.c:2093
 msgid "%A %d %B"
 msgstr "%A, %d. %B"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2709
+#: ../calendar/gui/e-day-view.c:3066
 #, c-format
 msgid "Week %d"
 msgstr "Woche %d"
@@ -4186,27 +4165,27 @@ msgstr "Woche %d"
 #. * day view, e.g. a day is displayed in
 #. * 24 "60 minute divisions" or
 #. * 48 "30 minute divisions".
-#: ../calendar/gui/e-day-view-time-item.c:794
+#: ../calendar/gui/e-day-view-time-item.c:801
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i Minuten-Unterteilungen"
 
-#: ../calendar/gui/e-day-view-time-item.c:819
+#: ../calendar/gui/e-day-view-time-item.c:826
 msgid "Show the second time zone"
 msgstr "Zweite Zeitzone anzeigen"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:836
-#: ../modules/calendar/e-calendar-preferences.c:179
-#: ../modules/calendar/e-calendar-preferences.c:231
-#: ../modules/calendar/e-calendar-preferences.ui.h:18
+#: ../calendar/gui/e-day-view-time-item.c:843
+#: ../modules/calendar/e-calendar-preferences.c:306
+#: ../modules/calendar/e-calendar-preferences.c:358
+#: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Keine"
 
-#: ../calendar/gui/e-day-view-time-item.c:870
+#: ../calendar/gui/e-day-view-time-item.c:877
 #: ../calendar/gui/e-timezone-entry.c:324
-#: ../modules/calendar/e-calendar-preferences.c:262
+#: ../modules/calendar/e-calendar-preferences.c:389
 msgid "Select..."
 msgstr "Auswählen …"
 
@@ -4227,151 +4206,151 @@ msgid "Resources"
 msgstr "Ressourcen"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
-#: ../calendar/gui/e-meeting-store.c:1068 ../calendar/gui/print.c:1231
+#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:127
+#: ../calendar/gui/e-meeting-store.c:1018 ../calendar/gui/print.c:1247
 msgid "Individual"
 msgstr "Individuell"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
-#: ../calendar/gui/print.c:1232 ../e-util/e-table-config.ui.h:8
+#: ../calendar/gui/e-meeting-store.c:112 ../calendar/gui/e-meeting-store.c:129
+#: ../calendar/gui/print.c:1248 ../e-util/e-table-config.ui.h:8
 msgid "Group"
 msgstr "Gruppe"
 
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:117 ../calendar/gui/e-meeting-store.c:134
-#: ../calendar/gui/print.c:1233
+#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
+#: ../calendar/gui/print.c:1249
 msgid "Resource"
 msgstr "Ressource"
 
 #: ../calendar/gui/e-meeting-list-view.c:184
-#: ../calendar/gui/e-meeting-store.c:119 ../calendar/gui/e-meeting-store.c:136
-#: ../calendar/gui/print.c:1234
+#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
+#: ../calendar/gui/print.c:1250
 msgid "Room"
 msgstr "Raum"
 
 #: ../calendar/gui/e-meeting-list-view.c:195
-#: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
-#: ../calendar/gui/print.c:1248
+#: ../calendar/gui/e-meeting-store.c:145 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/print.c:1264
 msgid "Chair"
 msgstr "Vorsitzender"
 
 #: ../calendar/gui/e-meeting-list-view.c:196
-#: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
-#: ../calendar/gui/e-meeting-store.c:1071 ../calendar/gui/print.c:1249
+#: ../calendar/gui/e-meeting-store.c:147 ../calendar/gui/e-meeting-store.c:164
+#: ../calendar/gui/e-meeting-store.c:1021 ../calendar/gui/print.c:1265
 msgid "Required Participant"
 msgstr "Benötigter Teilnehmer"
 
 #: ../calendar/gui/e-meeting-list-view.c:197
-#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:169
-#: ../calendar/gui/print.c:1250
+#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/print.c:1266
 msgid "Optional Participant"
 msgstr "Optionaler Teilnehmer"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:154 ../calendar/gui/e-meeting-store.c:171
-#: ../calendar/gui/print.c:1251
+#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/print.c:1267
 msgid "Non-Participant"
 msgstr "Nicht-Teilnehmer"
 
 #: ../calendar/gui/e-meeting-list-view.c:220
-#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../calendar/gui/e-meeting-store.c:1081
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../calendar/gui/e-meeting-store.c:1031
 msgid "Needs Action"
 msgstr "Erfordert Maßnahme"
 
-#: ../calendar/gui/e-meeting-list-view.c:623
+#: ../calendar/gui/e-meeting-list-view.c:626
 msgid "Attendee                          "
 msgstr "Teilnehmer"
 
-#: ../calendar/gui/e-meeting-list-view.c:678
+#: ../calendar/gui/e-meeting-list-view.c:681
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "UAwg"
 
-#: ../calendar/gui/e-meeting-store.c:210 ../calendar/gui/e-meeting-store.c:233
+#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
 msgid "In Process"
 msgstr "In Bearbeitung"
 
-#: ../calendar/gui/e-meeting-store.c:1955
+#: ../calendar/gui/e-meeting-store.c:1910
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr ""
 "Geben Sie das Passwort für Benutzer %2$s auf dem Server %1$s ein, um auf "
 "Verfügbarkeitsinformationen zuzugreifen"
 
-#: ../calendar/gui/e-meeting-store.c:1965
+#: ../calendar/gui/e-meeting-store.c:1920
 #, c-format
 msgid "Failure reason: %s"
 msgstr "Fehlergrund: %s"
 
-#: ../calendar/gui/e-meeting-store.c:1970
+#: ../calendar/gui/e-meeting-store.c:1925
 #: ../plugins/publish-calendar/publish-calendar.c:341
-#: ../smime/gui/component.c:55
+#: ../smime/gui/component.c:64
 msgid "Enter password"
 msgstr "Passwort eingeben"
 
-#: ../calendar/gui/e-meeting-time-sel.c:580
+#: ../calendar/gui/e-meeting-time-sel.c:528
 msgid "Out of Office"
 msgstr "Nicht im Büro"
 
-#: ../calendar/gui/e-meeting-time-sel.c:582
+#: ../calendar/gui/e-meeting-time-sel.c:530
 msgid "No Information"
 msgstr "Keine Informationen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:622
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "O_ptions"
 msgstr "_Einstellungen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:590
 msgid "Show _only working hours"
 msgstr "Nur _Arbeitszeit anzeigen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:655
+#: ../calendar/gui/e-meeting-time-sel.c:603
 msgid "Show _zoomed out"
 msgstr "Ver_kleinert anzeigen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:673
+#: ../calendar/gui/e-meeting-time-sel.c:621
 msgid "_Update free/busy"
 msgstr "Verfügbarkeit _aktualisieren"
 
-#: ../calendar/gui/e-meeting-time-sel.c:690
+#: ../calendar/gui/e-meeting-time-sel.c:638
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:710
+#: ../calendar/gui/e-meeting-time-sel.c:658
 msgid "_Autopick"
 msgstr "_Auto-Auswählen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:727
+#: ../calendar/gui/e-meeting-time-sel.c:675
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:748
+#: ../calendar/gui/e-meeting-time-sel.c:696
 msgid "_All people and resources"
 msgstr "_Alle Personen und Ressourcen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:759
+#: ../calendar/gui/e-meeting-time-sel.c:707
 msgid "All _people and one resource"
 msgstr "Alle _Personen und eine Ressource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:770
+#: ../calendar/gui/e-meeting-time-sel.c:718
 msgid "_Required people"
 msgstr "_Benötigte Personen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:780
+#: ../calendar/gui/e-meeting-time-sel.c:728
 msgid "Required people and _one resource"
 msgstr "Benötigte Personen und _eine Ressource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:834
+#: ../calendar/gui/e-meeting-time-sel.c:767
 msgid "_Start time:"
 msgstr "_Anfangszeit:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:878
+#: ../calendar/gui/e-meeting-time-sel.c:796
 msgid "_End time:"
 msgstr "_Endzeit:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2786
+#: ../calendar/gui/e-meeting-time-sel.c:2660
 #, c-format
 msgid ""
 "Summary: %s\n"
@@ -4380,7 +4359,7 @@ msgstr ""
 "Zusammenfassung: %s\n"
 "Ort: %s"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2788 ../calendar/gui/print.c:3497
+#: ../calendar/gui/e-meeting-time-sel.c:2662 ../calendar/gui/print.c:3534
 #, c-format
 msgid "Summary: %s"
 msgstr "Zusammenfassung: %s"
@@ -4410,7 +4389,7 @@ msgid "Language"
 msgstr "Sprache"
 
 #: ../calendar/gui/e-memo-table.c:421
-#: ../modules/calendar/e-cal-shell-content.c:472
+#: ../modules/calendar/e-cal-shell-content.c:462
 #: ../modules/calendar/e-memo-shell-view-actions.c:232
 #: ../modules/calendar/e-memo-shell-view-actions.c:247
 #: ../modules/calendar/e-memo-shell-view.c:306
@@ -4444,7 +4423,7 @@ msgid "Paste memos from the clipboard"
 msgstr "Notiz aus der Zwischenablage einfügen"
 
 #: ../calendar/gui/e-memo-table.c:745
-#: ../modules/calendar/e-memo-shell-view-actions.c:610
+#: ../modules/calendar/e-memo-shell-view-actions.c:609
 msgid "Delete selected memos"
 msgstr "Die gewählten Notizen löschen"
 
@@ -4465,11 +4444,11 @@ msgstr "Klicken Sie hier, um eine Notiz hinzuzufügen"
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:708 ../calendar/gui/print.c:2389
+#: ../calendar/gui/e-task-table.c:708 ../calendar/gui/print.c:2418
 #: ../calendar/importers/icalendar-importer.c:79
 #: ../calendar/importers/icalendar-importer.c:1078
 #: ../modules/calendar/e-calendar-preferences.ui.h:61
-#: ../modules/calendar/e-cal-shell-content.c:433
+#: ../modules/calendar/e-cal-shell-content.c:423
 #: ../modules/calendar/e-task-shell-view-actions.c:255
 #: ../modules/calendar/e-task-shell-view-actions.c:270
 #: ../modules/calendar/e-task-shell-view.c:461
@@ -4489,7 +4468,7 @@ msgid "Paste tasks from the clipboard"
 msgstr "Aufgaben aus der Zwischenablage einfügen"
 
 #: ../calendar/gui/e-task-table.c:1043
-#: ../modules/calendar/e-task-shell-view-actions.c:734
+#: ../modules/calendar/e-task-shell-view-actions.c:733
 msgid "Delete selected tasks"
 msgstr "Die gewählten Aufgaben löschen"
 
@@ -4504,40 +4483,40 @@ msgstr "Zeitzone auswählen"
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:241 ../calendar/gui/print.c:2050
+#: ../calendar/gui/e-week-view-main-item.c:227 ../calendar/gui/print.c:2072
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: ../calendar/gui/gnome-cal.c:2319
+#: ../calendar/gui/gnome-cal.c:2373
 msgid "Purging"
 msgstr "Säuberungsvorgang"
 
-#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:707
-#: ../calendar/gui/itip-utils.c:818
+#: ../calendar/gui/itip-utils.c:646 ../calendar/gui/itip-utils.c:704
+#: ../calendar/gui/itip-utils.c:838
 msgid "An organizer must be set."
 msgstr "Es muss ein Organisator festgelegt werden."
 
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:695
 msgid "At least one attendee is necessary"
 msgstr "Es ist mindestens ein Teilnehmer erforderlich"
 
-#: ../calendar/gui/itip-utils.c:905 ../calendar/gui/itip-utils.c:1066
+#: ../calendar/gui/itip-utils.c:926 ../calendar/gui/itip-utils.c:1087
 msgid "Event information"
 msgstr "Ereignisinformationen"
 
-#: ../calendar/gui/itip-utils.c:908 ../calendar/gui/itip-utils.c:1069
+#: ../calendar/gui/itip-utils.c:929 ../calendar/gui/itip-utils.c:1090
 msgid "Task information"
 msgstr "Aufgabeninformationen"
 
-#: ../calendar/gui/itip-utils.c:911 ../calendar/gui/itip-utils.c:1072
+#: ../calendar/gui/itip-utils.c:932 ../calendar/gui/itip-utils.c:1093
 msgid "Memo information"
 msgstr "Notiz-Informationen"
 
-#: ../calendar/gui/itip-utils.c:914 ../calendar/gui/itip-utils.c:1090
+#: ../calendar/gui/itip-utils.c:935 ../calendar/gui/itip-utils.c:1111
 msgid "Free/Busy information"
 msgstr "Verfügbarkeitsinformationen"
 
-#: ../calendar/gui/itip-utils.c:917
+#: ../calendar/gui/itip-utils.c:938
 msgid "Calendar information"
 msgstr "Kalenderinformationen"
 
@@ -4545,7 +4524,7 @@ msgstr "Kalenderinformationen"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:954
+#: ../calendar/gui/itip-utils.c:975
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Angenommen"
@@ -4554,7 +4533,7 @@ msgstr "Angenommen"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:961
+#: ../calendar/gui/itip-utils.c:982
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Vorläufig angenommen"
@@ -4566,7 +4545,7 @@ msgstr "Vorläufig angenommen"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:968 ../calendar/gui/itip-utils.c:1016
+#: ../calendar/gui/itip-utils.c:989 ../calendar/gui/itip-utils.c:1037
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Abgelehnt"
@@ -4575,7 +4554,7 @@ msgstr "Abgelehnt"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:975
+#: ../calendar/gui/itip-utils.c:996
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegiert"
@@ -4583,7 +4562,7 @@ msgstr "Delegiert"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:988
+#: ../calendar/gui/itip-utils.c:1009
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Aktualisiert"
@@ -4591,7 +4570,7 @@ msgstr "Aktualisiert"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:995
+#: ../calendar/gui/itip-utils.c:1016
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Abgesagt"
@@ -4599,7 +4578,7 @@ msgstr "Abgesagt"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1002
+#: ../calendar/gui/itip-utils.c:1023
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Aktualisieren"
@@ -4608,250 +4587,259 @@ msgstr "Aktualisieren"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1009
+#: ../calendar/gui/itip-utils.c:1030
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Gegenvorschlag"
 
-#: ../calendar/gui/itip-utils.c:1087
+#: ../calendar/gui/itip-utils.c:1108
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Verfügbarkeitsinformationen (%s bis %s)"
 
-#: ../calendar/gui/itip-utils.c:1095
+#: ../calendar/gui/itip-utils.c:1116
 msgid "iCalendar information"
 msgstr "iCalendar-Informationen"
 
-#: ../calendar/gui/itip-utils.c:1122
+#: ../calendar/gui/itip-utils.c:1143
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
 "Eine Ressource kann nicht belegt werden, das neue Ereignis überschneidet "
 "sich mit anderen."
 
-#: ../calendar/gui/itip-utils.c:1127
+#: ../calendar/gui/itip-utils.c:1148
 #, c-format
 msgid "Unable to book a resource, error: %s"
 msgstr "Eine Ressource kann nicht belegt werden, Fehler: %s"
 
-#: ../calendar/gui/itip-utils.c:1304
+#: ../calendar/gui/itip-utils.c:1325
 msgid "You must be an attendee of the event."
 msgstr "Sie müssen ein Teilnehmer des Ereignisses sein."
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:661
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:661
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:661
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:661
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:661
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:662
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:662
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:662
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:662
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:662
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:663
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:663
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:663
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:663
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:663
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
 msgid "31st"
 msgstr "31."
 
-#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:721
-msgid "Su"
-msgstr "So"
-
-#: ../calendar/gui/print.c:721
+#. Translators: These are workday abbreviations,
+#. * e.g. Su=Sunday and Th=thursday
+#. G_DATE_BAD_WEEKDAY
+#. G_DATE_MONDAY
+#: ../calendar/gui/print.c:727
 msgid "Mo"
 msgstr "Mo"
 
-#: ../calendar/gui/print.c:721
+#. G_DATE_TUESDAY
+#: ../calendar/gui/print.c:728
 msgid "Tu"
 msgstr "Di"
 
-#: ../calendar/gui/print.c:721
+#. G_DATE_WEDNESDAY
+#: ../calendar/gui/print.c:729
 msgid "We"
 msgstr "Mi"
 
-#: ../calendar/gui/print.c:722
+#. G_DATE_THURSDAY
+#: ../calendar/gui/print.c:730
 msgid "Th"
 msgstr "Do"
 
-#: ../calendar/gui/print.c:722
+#. G_DATE_FRIDAY
+#: ../calendar/gui/print.c:731
 msgid "Fr"
 msgstr "Fr"
 
-#: ../calendar/gui/print.c:722
+#. G_DATE_SATURDAY
+#: ../calendar/gui/print.c:732
 msgid "Sa"
 msgstr "Sa"
 
+#. G_DATE_SUNDAY
+#: ../calendar/gui/print.c:733
+msgid "Su"
+msgstr "So"
+
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3296
+#: ../calendar/gui/print.c:3328
 msgid " to "
 msgstr " bis "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3306
+#: ../calendar/gui/print.c:3338
 msgid " (Completed "
 msgstr " (Abgeschlossen "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3312
+#: ../calendar/gui/print.c:3344
 msgid "Completed "
 msgstr "Abgeschlossen "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3322
+#: ../calendar/gui/print.c:3354
 msgid " (Due "
 msgstr " (Fällig am "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3329
+#: ../calendar/gui/print.c:3361
 msgid "Due "
 msgstr "Fällig am "
 
-#: ../calendar/gui/print.c:3527
+#: ../calendar/gui/print.c:3564
 msgid "Attendees: "
 msgstr "Teilnehmer: "
 
-#: ../calendar/gui/print.c:3571
+#: ../calendar/gui/print.c:3608
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:3587
+#: ../calendar/gui/print.c:3624
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorität: %s"
 
-#: ../calendar/gui/print.c:3605
+#: ../calendar/gui/print.c:3642
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prozent abgeschlossen: %i"
 
-#: ../calendar/gui/print.c:3619
+#: ../calendar/gui/print.c:3656
 #, c-format
 msgid "URL: %s"
 msgstr "Adresse: %s"
 
-#: ../calendar/gui/print.c:3633
+#: ../calendar/gui/print.c:3670
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorien: %s"
 
-#: ../calendar/gui/print.c:3644
+#: ../calendar/gui/print.c:3681
 msgid "Contacts: "
 msgstr "Kontakte: "
 
@@ -4914,25 +4902,25 @@ msgid "Evolution Calendar intelligent importer"
 msgstr "Intelligenter Evolution-Kalender-Importeur"
 
 #: ../calendar/importers/icalendar-importer.c:1186
-#: ../calendar/importers/icalendar-importer.c:1505
+#: ../calendar/importers/icalendar-importer.c:1500
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Besprechung"
 
 #: ../calendar/importers/icalendar-importer.c:1186
-#: ../calendar/importers/icalendar-importer.c:1505
+#: ../calendar/importers/icalendar-importer.c:1500
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Ereignis"
 
 #: ../calendar/importers/icalendar-importer.c:1189
-#: ../calendar/importers/icalendar-importer.c:1506
+#: ../calendar/importers/icalendar-importer.c:1501
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Aufgabe"
 
 #: ../calendar/importers/icalendar-importer.c:1192
-#: ../calendar/importers/icalendar-importer.c:1507
+#: ../calendar/importers/icalendar-importer.c:1502
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Notiz"
@@ -4983,7 +4971,7 @@ msgstr "Einstufung"
 
 #. Translators: Appointment's summary
 #: ../calendar/importers/icalendar-importer.c:1244
-#: ../calendar/importers/icalendar-importer.c:1549
+#: ../calendar/importers/icalendar-importer.c:1544
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Zusammenfassung"
@@ -4996,7 +4984,7 @@ msgstr "Ort"
 
 #. Translators: Appointment's start time
 #: ../calendar/importers/icalendar-importer.c:1258
-#: ../calendar/importers/icalendar-importer.c:1544
+#: ../calendar/importers/icalendar-importer.c:1539
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Anfang"
@@ -5050,7 +5038,7 @@ msgctxt "iCalImp"
 msgid "Description"
 msgstr "Beschreibung"
 
-#: ../calendar/importers/icalendar-importer.c:1539
+#: ../calendar/importers/icalendar-importer.c:1534
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Art"
@@ -6603,168 +6591,168 @@ msgstr "Pazifik/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pazifik/Yap"
 
-#: ../composer/e-composer-actions.c:207
+#: ../composer/e-composer-actions.c:203
 msgid "Save as..."
 msgstr "Speichern unter …"
 
-#: ../composer/e-composer-actions.c:294
+#: ../composer/e-composer-actions.c:276
 #: ../e-util/e-mail-signature-editor.c:303
 msgid "_Close"
 msgstr "S_chließen"
 
-#: ../composer/e-composer-actions.c:296
+#: ../composer/e-composer-actions.c:278
 msgid "Close the current file"
 msgstr "Die momentan geöffnete Datei schließen"
 
-#: ../composer/e-composer-actions.c:301
+#: ../composer/e-composer-actions.c:283
 msgid "New _Message"
 msgstr "Neue _Nachricht"
 
-#: ../composer/e-composer-actions.c:303
+#: ../composer/e-composer-actions.c:285
 msgid "Open New Message window"
 msgstr "Neues Nachrichtenfenster öffnen"
 
-#: ../composer/e-composer-actions.c:310 ../shell/e-shell-window-actions.c:925
+#: ../composer/e-composer-actions.c:292 ../shell/e-shell-window-actions.c:919
 msgid "Configure Evolution"
 msgstr "Evolution konfigurieren"
 
-#: ../composer/e-composer-actions.c:317
+#: ../composer/e-composer-actions.c:299
 msgid "Save the current file"
 msgstr "Die momentan geöffnete Datei speichern"
 
-#: ../composer/e-composer-actions.c:322
+#: ../composer/e-composer-actions.c:304
 msgid "Save _As..."
 msgstr "Speichern _unter …"
 
-#: ../composer/e-composer-actions.c:324
+#: ../composer/e-composer-actions.c:306
 msgid "Save the current file with a different name"
 msgstr "Die momentan geöffnete Datei unter einem anderem Namen speichern"
 
-#: ../composer/e-composer-actions.c:331
+#: ../composer/e-composer-actions.c:313
 msgid "Character _Encoding"
 msgstr "Zeichen_kodierung"
 
-#: ../composer/e-composer-actions.c:348
+#: ../composer/e-composer-actions.c:330
 msgid "_Print..."
 msgstr "_Drucken …"
 
-#: ../composer/e-composer-actions.c:355
+#: ../composer/e-composer-actions.c:337
 msgid "Print Pre_view"
 msgstr "Druck_vorschau"
 
-#: ../composer/e-composer-actions.c:362
+#: ../composer/e-composer-actions.c:344
 msgid "Save as _Draft"
 msgstr "Als _Entwurf speichern"
 
-#: ../composer/e-composer-actions.c:364
+#: ../composer/e-composer-actions.c:346
 msgid "Save as draft"
 msgstr "Als Entwurf speichern"
 
-#: ../composer/e-composer-actions.c:369 ../composer/e-composer-private.c:327
+#: ../composer/e-composer-actions.c:351
 msgid "S_end"
 msgstr "A_bschicken"
 
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:353
 msgid "Send this message"
 msgstr "Diese Nachricht verschicken"
 
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:361
 msgid "PGP _Encrypt"
 msgstr "Mit P_GP verschlüsseln"
 
-#: ../composer/e-composer-actions.c:381
+#: ../composer/e-composer-actions.c:363
 msgid "Encrypt this message with PGP"
 msgstr "Diese Nachricht mit PGP verschlüsseln"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:369
 msgid "PGP _Sign"
 msgstr "Mit _PGP signieren"
 
-#: ../composer/e-composer-actions.c:389
+#: ../composer/e-composer-actions.c:371
 msgid "Sign this message with your PGP key"
 msgstr "Diese Nachricht mit PGP signieren"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:377
 msgid "_Picture Gallery"
 msgstr "_Bildersammlung"
 
-#: ../composer/e-composer-actions.c:397
+#: ../composer/e-composer-actions.c:379
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr ""
 "Eine Bildersammlung anzeigen, die in Ihrer Nachricht abgelegt werden kann"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:385
 msgid "_Prioritize Message"
 msgstr "Nachricht _priorisieren"
 
-#: ../composer/e-composer-actions.c:405
+#: ../composer/e-composer-actions.c:387
 msgid "Set the message priority to high"
 msgstr "Die Priorität der Nachricht auf hoch setzen"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:393
 msgid "Re_quest Read Receipt"
 msgstr "_Lesebestätigung anfordern"
 
-#: ../composer/e-composer-actions.c:413
+#: ../composer/e-composer-actions.c:395
 msgid "Get delivery notification when your message is read"
 msgstr ""
 "Eine Zustellungsbestätigung erhalten, sobald Ihre Nachricht gelesen wurde"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:401
 msgid "S/MIME En_crypt"
 msgstr "Mit S/_MIME verschlüsseln"
 
-#: ../composer/e-composer-actions.c:421
+#: ../composer/e-composer-actions.c:403
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr ""
 "Diese Nachricht mit Ihrem S/MIME-Verschlüsselungszertifikat verschlüsseln"
 
-#: ../composer/e-composer-actions.c:427
+#: ../composer/e-composer-actions.c:409
 msgid "S/MIME Sig_n"
 msgstr "Mit _S/MIME signieren"
 
-#: ../composer/e-composer-actions.c:429
+#: ../composer/e-composer-actions.c:411
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Diese Nachricht mit Ihrem S/MIME-Signaturzertifikat signieren"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:417
 msgid "_Bcc Field"
 msgstr "_Blindkopie-Feld"
 
-#: ../composer/e-composer-actions.c:437
+#: ../composer/e-composer-actions.c:419
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Blindkopie-Feld anzeigen/verbergen"
 
-#: ../composer/e-composer-actions.c:443
+#: ../composer/e-composer-actions.c:425
 msgid "_Cc Field"
 msgstr "_Kopie-Feld"
 
-#: ../composer/e-composer-actions.c:445
+#: ../composer/e-composer-actions.c:427
 msgid "Toggles whether the CC field is displayed"
 msgstr "Kopie-Feld anzeigen/verbergen"
 
-#: ../composer/e-composer-actions.c:451
+#: ../composer/e-composer-actions.c:433
 msgid "_Reply-To Field"
 msgstr "An_twort-an-Feld"
 
-#: ../composer/e-composer-actions.c:453
+#: ../composer/e-composer-actions.c:435
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Antwort-an-Feld anzeigen/verbergen"
 
-#: ../composer/e-composer-actions.c:512
+#: ../composer/e-composer-actions.c:494
 msgid "Save Draft"
 msgstr "Entwurf speichern"
 
-#: ../composer/e-composer-header-table.c:41
+#: ../composer/e-composer-header-table.c:39
 msgid "Enter the recipients of the message"
 msgstr "Geben Sie die Empfänger der Nachricht ein"
 
-#: ../composer/e-composer-header-table.c:43
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 "Geben Sie die Adressen ein, die eine Kopie der Nachricht erhalten sollen"
 
-#: ../composer/e-composer-header-table.c:46
+#: ../composer/e-composer-header-table.c:44
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -6772,35 +6760,35 @@ msgstr ""
 "Geben Sie die Adressen ein, die eine Kopie erhalten, jedoch nicht in der "
 "Empfängerliste auftauchen sollen"
 
-#: ../composer/e-composer-header-table.c:837
+#: ../composer/e-composer-header-table.c:772
 msgid "Fr_om:"
 msgstr "V_on:"
 
-#: ../composer/e-composer-header-table.c:844
+#: ../composer/e-composer-header-table.c:779
 msgid "_Reply-To:"
 msgstr "Antwo_rt an:"
 
-#: ../composer/e-composer-header-table.c:849
+#: ../composer/e-composer-header-table.c:784
 msgid "_To:"
 msgstr "A_n:"
 
-#: ../composer/e-composer-header-table.c:855
+#: ../composer/e-composer-header-table.c:790
 msgid "_Cc:"
 msgstr "_Kopie an:"
 
-#: ../composer/e-composer-header-table.c:861
+#: ../composer/e-composer-header-table.c:796
 msgid "_Bcc:"
 msgstr "Blindko_pie an:"
 
-#: ../composer/e-composer-header-table.c:866
+#: ../composer/e-composer-header-table.c:801
 msgid "_Post To:"
 msgstr "_Veröffentlichen in:"
 
-#: ../composer/e-composer-header-table.c:870
+#: ../composer/e-composer-header-table.c:805
 msgid "S_ubject:"
 msgstr "Be_treff:"
 
-#: ../composer/e-composer-header-table.c:878
+#: ../composer/e-composer-header-table.c:813
 #: ../mail/e-mail-config-identity-page.c:488
 msgid "Si_gnature:"
 msgstr "Si_gnatur:"
@@ -6813,11 +6801,7 @@ msgstr "Klicken Sie hier, um das Adressbuch zu öffnen"
 msgid "Click here to select folders to post to"
 msgstr "Klicken Sie hier, um die Veröffentlichungsordner zu wählen"
 
-#: ../composer/e-composer-private.c:347
-msgid "Save draft"
-msgstr "Entwurf speichern"
-
-#: ../composer/e-msg-composer.c:862
+#: ../composer/e-msg-composer.c:869
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -6825,7 +6809,7 @@ msgstr ""
 "Ausgehende Nachricht konnte nicht signiert werden: Kein Signaturzertifikat "
 "für dieses Konto festgelegt"
 
-#: ../composer/e-msg-composer.c:871
+#: ../composer/e-msg-composer.c:878
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -6834,17 +6818,17 @@ msgstr ""
 "Ausgehende Nachricht konnte nicht verschlüsselt werden: Kein "
 "Verschlüsselungszertifikat für dieses Konto festgelegt"
 
-#: ../composer/e-msg-composer.c:1552 ../composer/e-msg-composer.c:1961
+#: ../composer/e-msg-composer.c:1557 ../composer/e-msg-composer.c:1958
 msgid "Compose Message"
 msgstr "Nachricht verfassen"
 
-#: ../composer/e-msg-composer.c:4215
+#: ../composer/e-msg-composer.c:4213
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
 "Der Editor enthält einen nicht-Text-Nachrichtenrumpf, der nicht bearbeitet "
 "werden kann."
 
-#: ../composer/e-msg-composer.c:4890
+#: ../composer/e-msg-composer.c:4886
 msgid "Untitled Message"
 msgstr "Namenlose Nachricht"
 
@@ -6988,7 +6972,7 @@ msgstr ""
 "Während des Verschickens ist ein Fehler aufgetreten. Wie möchten Sie "
 "fortfahren?"
 
-#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:152
+#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:156
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "Die Fehlermeldung war »{0}«."
 
@@ -7012,13 +6996,13 @@ msgstr "Nachricht wird im Nachrichtenausgang gespeichert"
 
 #: ../composer/mail-composer.error.xml.h:35
 msgid ""
-"Because you are working offline, the message will be saved to your local "
-"Outbox folder. When you are back online you can send the message by clicking "
-"the Send/Receive button in Evolution's toolbar."
+"The message will be saved to your local Outbox folder, because the "
+"destination service is currently unavailable. You can send the message by "
+"clicking the Send/Receive button in Evolution's toolbar."
 msgstr ""
-"Da sich Evolution im Offline-Modus befindet wird die Nachricht im "
-"Nachrichtenausgang gespeichert. Im Online-Modus können Sie die Nachricht mit "
-"der Schaltfläche »Verschicken/Abrufen« in der Werkzeugleiste verschicken."
+"Weil der Zielserver gerade nicht erreichbar ist, wird die Nachricht im "
+"Nachrichtenausgang gespeichert. Sie können die Nachricht mit dem Knopf "
+"»Verschicken/Abrufen« in der Werkzeugleiste verschicken."
 
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
 msgid "Evolution Alarm Notify"
@@ -7028,8 +7012,8 @@ msgstr "Evolution Alarm-Benachrichtigung"
 msgid "Calendar event notifications"
 msgstr "Benachrichtigungen über Kalenderereignisse"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:932
-#: ../modules/mailto-handler/evolution-mailto-handler.c:215
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1033
+#: ../modules/mailto-handler/evolution-mailto-handler.c:212
 #: ../shell/e-shell-window-private.c:243
 msgid "Evolution"
 msgstr "Evolution"
@@ -7050,14 +7034,6 @@ msgstr "Ihre E-Mails, Kontakte und Kalender verwalten"
 msgid "mail;calendar;contact;addressbook;task;"
 msgstr "Mail;Nachricht;Kalender;Kontakt;Adressbuch;Aufgabe;"
 
-#: ../data/evolution-settings.desktop.in.in.h:1
-msgid "Email Settings"
-msgstr "E-Mail-Einstellungen"
-
-#: ../data/evolution-settings.desktop.in.in.h:2
-msgid "Configure email accounts"
-msgstr "E-Mail-Konten konfigurieren"
-
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
 msgid "Enable address formatting"
 msgstr "Adressformatierung aktivieren"
@@ -7793,23 +7769,66 @@ msgstr ""
 "verwenden"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
-msgid "Week start"
-msgstr "Wochenanfang"
+msgid "First day of the week"
+msgstr "Erster Tag der Woche"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
-msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)"
-msgstr ""
-"Wochentag von Sonntag (»0«) bis Sonnabend (»6«), mit dem die Woche beginnt"
+msgid "Monday is a work day"
+msgstr "Montag ist ein Arbeitstag"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
-msgid "Work days"
-msgstr "Arbeitstage"
+msgid "Tuesday is a work day"
+msgstr "Dienstag ist ein Arbeitstag"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
-msgid "Days on which the start and end of work hours should be indicated"
+msgid "Wednesday is a work day"
+msgstr "Mittwoch ist ein Arbeitstag"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+msgid "Thursday is a work day"
+msgstr "Donnerstag ist ein Arbeitstag"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+msgid "Friday is a work day"
+msgstr "Freitag ist ein Arbeitstag"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
+msgid "Saturday is a work day"
+msgstr "Samstag ist ein Arbeitstag"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
+msgid "Sunday is a work day"
+msgstr "Sonntag ist ein Arbeitstag"
+
+# »Samstag« wird auch in Österreich und in der Schweiz verstanden ;)
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
+msgid "(Deprecated) First day of the week, from Sunday (0) to Saturday (6)"
+msgstr ""
+"(Veraltet) Wochentag von Sonntag (»0«) bis Samstag (»6«), mit dem die Woche "
+"beginnt"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"week-start-day-name\" instead."
+msgstr ""
+"Dieser Schlüssel ist seit Version 3.10 veraltet und soll nicht mehr "
+"verwendet werden. Verwenden Sie stattdessen »week-start-day-name«."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
+msgid "(Deprecated) Work days"
+msgstr "(Veraltet) Arbeitstage"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
+msgid ""
+"Days on which the start and end of work hours should be indicated. (This key "
+"was deprecated in version 3.10 and should no longer be used. Use the \"work-"
+"day-monday\", \"work-day-tuesday\", etc. keys instead.)"
 msgstr ""
-"Die Tage, bei denen der Anfang und das Ende der Arbeitsstunden "
-"gekennzeichnet werden soll"
+"Tage, an denen Beginn und Ende der Arbeitszeiten angezeigt werden sollen. "
+"(Dieser Schlüssel ist seit Version 3.10 veraltet und soll nicht mehr "
+"verwendet werden. Verwenden Sie stattdessen die Schlüssel »work-day-monday«, "
+"»work-day-tuesday«, usw.)"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:1
 msgid "Previous Evolution version"
@@ -8195,24 +8214,10 @@ msgid "Can be either 'mbox' or 'pdf'."
 msgstr "Kann entweder »mbox« oder »pdf« sein."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
-msgid "Save name format for drag-and-drop operation"
-msgstr "Namensformat für den Vorgang des Ziehen-und-Ablegens speichern"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
-msgid ""
-"Can be either 2 to use current date and time or any other value for sent "
-"date of the message. This has a meaning only when dropping just one message."
-msgstr ""
-"Kann entweder der Wert 2 sein, um das aktuelle Datum und die aktuelle Zeit "
-"zu verwenden, oder jeden anderen Wert, um das Sendedatum der Nachricht zu "
-"verwenden. Dies hat nur dann Bedeutung, wenn nur eine Nachricht abgelegt "
-"wird."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
 msgid "Show image animations"
 msgstr "Bildanimationen anzeigen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -8220,11 +8225,15 @@ msgstr ""
 "Bewegte Bilder in HTML-Nachrichten einschalten. Viele Benutzer empfinden "
 "animierte Bilder als störend und bevorzugen, ein statisches Bild zu sehen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
+msgid "Ellipsize mode for folder names in side bar"
+msgstr "Zu lange Ordnernamen in der Seitenleiste abkürzen"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
 msgid "Enable or disable type ahead search feature"
 msgstr "Schnellsuche an- oder abschalten"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -8232,20 +8241,11 @@ msgstr ""
 "Die Suchfunktion in der Seitenleiste einschalten für die interaktive Suche "
 "nach Ordnernamen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
-msgid "Disable or enable ellipsizing of folder names in side bar"
-msgstr "Zu lange Ordnernamen in Seitenleiste abkürzen"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
-msgid "Whether disable ellipsizing feature of folder names in side bar."
-msgstr ""
-"Legt fest, ob zu lange Ordnernamen in der Seitenleiste abgekürzt werden."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
 msgid "Enable or disable magic space bar"
 msgstr "Magische Leertaste ein-/ausschalten"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -8253,134 +8253,113 @@ msgstr ""
 "Legt fest, ob die Leertaste zum Blättern in der Nachrichtenvorschau, der "
 "Nachrichtenliste und den Ordnern benutzt werden soll."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr "Ähnliche Ansichten der Nachrichtenliste für alle Ordner aktivieren"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr "Ähnliche Ansichten der Nachrichtenliste für alle Ordner aktivieren."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
 msgid "Mark citations in the message \"Preview\""
 msgstr "Zitate in der Nachrichtenvorschau kennzeichnen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Zitate in der Nachrichtenvorschau kennzeichnen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
 msgid "Citation highlight color"
 msgstr "Hervorhebungsfarbe für Zitate"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 msgid "Citation highlight color."
 msgstr "Hervorhebungsfarbe für Zitate."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 msgid "Enable/disable caret mode"
 msgstr "Eingabezeiger aktivieren/deaktivieren"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 "Eingabezeiger aktivieren, so dass beim Lesen von E-Mails ein Cursor "
 "angezeigt wird."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid "Default charset in which to display messages"
 msgstr "Vorgabe-Zeichensatz beim Anzeigen von Nachrichten"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Default charset in which to display messages."
 msgstr "Vorgabe-Zeichensatz beim Anzeigen von Nachrichten."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
-msgid "Load images for HTML messages over HTTP"
-msgstr "Bilder für HTML-Nachrichten per HTTP laden"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
-msgid ""
-"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
-"Never load images off the net. \"1\" - Load images in messages from "
-"contacts. \"2\" - Always load images off the net."
-msgstr ""
-"Bilder von HTML-Nachrichten per HTTP(S) laden. Mögliche Werte sind: »0« - "
-"Niemals Bilder aus dem Netz laden, »1« - Bilder laden falls Absender im "
-"Adressbuch, »2« - Immer Bilder aus dem Netz laden."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+msgid "Automatically load images for HTML messages over HTTP"
+msgstr "Bilder für HTML-Nachrichten per HTTP automatisch herunterladen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Show Animations"
 msgstr "Animationen anzeigen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid "Show animated images as animations."
 msgstr "Animierte Bilder als Animationen anzeigen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 msgid "Show all message headers"
 msgstr "Alle Nachrichtenköpfe anzeigen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid "Show all the headers when viewing a messages."
 msgstr "Beim Anzeigen von Nachrichten alle Nachrichtenköpfe anzeigen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
-msgid "List of custom headers and whether they are enabled."
-msgstr ""
-"Liste der benutzerdefinierten Kopfzeilen und ihres Aktivierungszustands."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+msgid "List of headers to show when viewing a message."
+msgstr "Anzuzeigende Nachrichtenköpfe beim Ansehen von Nachrichten."
 
-# CHECK
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid ""
-"This key should contain a list of XML structures specifying custom headers, "
-"and whether they are to be displayed. The format of the XML structure is &lt;"
-"header enabled&gt; - set enabled if the header is to be displayed in the "
-"mail view."
+"Each header is represented as a pair: the header name, and a boolean "
+"indicating whether the header is enabled. Disabled headers are not shown "
+"when viewing a message, but are still listed in Preferences."
 msgstr ""
-"Dieser Schlüssel enthält eine Liste von XML-Strukturen, die "
-"benutzerdefinierte Kopfzeilen angeben, und ob diese angezeigt werden sollen. "
-"Das XML-Strukturformat ist &lt;Kopfzeile aktiviert&gt; - setzen Sie "
-"aktiviert, falls die Kopfzeile in der E-Mail-Ansicht angezeigt werden soll."
+"Jede Kopfzeile wird durch ein Paar dargestellt: Der Kopfzeilenname und ein "
+"Boolesch, welcher angibt, ob die Kopfzeile eingeschaltet ist. Ausgeschaltete "
+"Kopfzeilen werden beim Anschauen einer Nachricht nicht angezeigt, aber immer "
+"in den Einstellungen aufgeführt."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Show photo of the sender"
 msgstr "Foto des Absenders anzeigen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Fotos des Absenders in der Nachrichtenvorschau anzeigen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
-msgid "Search for the sender photo in local address books"
-msgstr "In den lokalen Adressbüchern nach dem Foto des Absenders suchen"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
-msgid "This option would help in improving the speed of fetching."
-msgstr "Beschleunigt das Abrufen."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "Mark as Seen after specified timeout"
 msgstr "Nach angegebenem Intervall als gelesen markieren"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid "Mark as Seen after specified timeout."
 msgstr "Nach angegebenem Intervall als gelesen markieren."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Timeout for marking messages as seen"
 msgstr "Zeitintervall bis zum Markieren von Nachrichten als gelesen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr ""
 "Zeitintervall in Millisekunden zum Markieren von Nachrichten als gelesen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid "Sender email-address column in the message list"
 msgstr "Spalte mit der E-Mail-Adresse des Absenders in der Nachrichtenliste"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -8388,7 +8367,7 @@ msgstr ""
 "Zeigt die E-Mail-Adresse des Absenders in einer eigenen Spalte in der "
 "Nachrichtenliste an."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view"
@@ -8396,7 +8375,7 @@ msgstr ""
 "Legt fest, ob die gleichen Schriften für die »Von«- und die »Betreff«-Zeile "
 "in der »Nachrichten«-Spalte der vertikalen Ansicht verwendet werden"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -8404,20 +8383,20 @@ msgstr ""
 "Legt fest, ob die gleichen Schriften für die »Von«- und die »Betreff«-Zeile "
 "in der »Nachrichten«-Spalte der vertikalen Ansicht verwendet werden."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid "Show deleted messages in the message-list"
 msgstr "Gelöschte Nachrichten in der Nachrichtenliste anzeigen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 "Gelöschte Nachrichten (durchgestrichen) in der Nachrichtenliste anzeigen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid "Enable Unmatched search folder"
 msgstr "Trefferlosen Suchordner aktivieren"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid ""
 "Enable Unmatched search folder within Search Folders. It does nothing if "
 "Search Folders are disabled."
@@ -8425,11 +8404,11 @@ msgstr ""
 "Trefferlosen Suchordner in den Suchordnern aktivieren. Hat keine Wirkung, "
 "wenn Suchordner ausgeschaltet sind."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Deaktiviert das Vorschaufenster und entfernt die Auswahl"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -8439,39 +8418,32 @@ msgstr ""
 "Vorschaufenster für diesen Ordner nicht angezeigt und keine Auswahl in der "
 "Nachrichtenliste gesetzt."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid "Height of the message-list pane"
 msgstr "Höhe des Nachrichtenlistenfelds"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid "Height of the message-list pane."
 msgstr "Höhe des Nachrichtenlistenfelds."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
-msgid "State of message headers in paned view"
-msgstr "Status von Nachrichtenköpfen in Zwei-Fenster-Ansicht"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
-msgid ""
-"Describes whether message headers in paned view should be collapsed or "
-"expanded by default. \"0\" = expanded and \"1\" = collapsed"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+msgid "Whether message headers are collapsed in the user interface"
 msgstr ""
-"Legt fest, ob Nachrichtenköpfe in der Zwei-Fenster-Ansicht standardmäßig "
-"ausgeklappt oder eingeklappt sein sollen. »0« = ausgeklappt »1« = eingeklappt"
+"Ob Nachrichtenkopfzeilen in der Benutzeroberfläche angezeigt werden sollen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Width of the message-list pane"
 msgstr "Breite der Nachrichtenliste"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 msgid "Width of the message-list pane."
 msgstr "Breite der Nachrichtenliste."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid "Layout style"
 msgstr "Anordnung"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. \"0\" (Classic View) places the preview pane below the "
@@ -8483,36 +8455,36 @@ msgstr ""
 "Vorschauleiste unter die Nachrichtenliste. »1« (vertikale Ansicht) setzt die "
 "Vorschauleiste neben die Nachrichtenliste. "
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "Variable width font"
 msgstr "Schrift variabler Breite"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid "The variable width font for mail display."
 msgstr "Die zum Anzeigen von E-Mails verwendete Schrift variabler Breite."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Terminal font"
 msgstr "Terminal-Schrift"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid "The terminal font for mail display."
 msgstr "Die zum Anzeigen von E-Mails verwendete Terminal-Schrift."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid "Use custom fonts"
 msgstr "Benutzerdefinierte Schriften verwenden"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Use custom fonts for displaying mail."
 msgstr "Benutzerdefinierte Schriften zum Anzeigen von E-Mails verwenden."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Kürzen der Adressanzeige in den Empfängerfeldern (An/Kopie/Blindkopie)"
 
 # CHECK
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -8520,13 +8492,13 @@ msgstr ""
 "Die Anzeige der Adressen in den Empfängerfeldern (An/Kopie/Blindkopie) auf "
 "die im Schlüssel »address_count« angegebene Anzahl reduzieren."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr ""
 "Anzahl der Adressen, die in den Empfängerfeldern (An/Kopie/Blindkopie"
 "( angezeigt werden"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -8534,12 +8506,12 @@ msgstr ""
 "Dies setzt die Anzahl der Adressen, die in der Standardansicht angezeigt "
 "werden, bevor »…« angezeigt wird."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid "Thread the message-list based on Subject"
 msgstr "Die Nachrichtenliste themenbasiert nach Threads sortieren"
 
 # CHECK - etwas schluderig, kommt aber hoffentlich hin.
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -8547,11 +8519,11 @@ msgstr ""
 "Auf Betreffbasis auf die Thread-Ordnung zurückgreifen, falls die Kopfzeilen "
 "einer Nachricht auf keine Referenznachricht verweisen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid "Default value for thread expand state"
 msgstr "Vorgabewert, ob Threads ausgeklappt angezeigt werden sollen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -8559,11 +8531,11 @@ msgstr ""
 "Legt fest, ob Threads standardmäßig ausgeklappt oder eingeklappt dargestellt "
 "werden sollen. Evolution muss zur Umsetzung der Änderung neu gestartet werden"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Threads nach der letzten Nachricht im jeweiligen Thread sortieren"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -8573,11 +8545,11 @@ msgstr ""
 "werden sollen anstatt nach dem Datum der Nachricht. Evolution muss nach "
 "Ändern dieses Wertes hierfür neu gestartet werden."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "Konten alphabetisch in einem Ordnerbau sortieren"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 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 "
@@ -8589,27 +8561,27 @@ msgstr ""
 "Ausnahme von »Auf diesem Rechner« und »Suchordner«, anderenfalls werden "
 "Konten nach einer vom Benutzer angegebenen Reihenfolge sortiert"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid "Log filter actions"
 msgstr "Filteraktionen protokollieren"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 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:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid "Logfile to log filter actions"
 msgstr "Protokolldatei für Filteraktionen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Logfile to log filter actions."
 msgstr "Protokolldatei für Filteraktionen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 msgid "Flush Outbox after filtering"
 msgstr "Nachrichtenausgang nach dem Filtern leeren"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 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 "
@@ -8619,42 +8591,46 @@ msgstr ""
 "Das geschieht nur, wenn ein »Weiterleiten an«-Filtervorgang angewendet "
 "wurde, etwa eine Minute nach der letzten Aktion."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid "Default forward style"
 msgstr "Vorgabe-Weiterleitungsstil"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+msgid "Default reply style"
+msgstr "Standard-Antwortstil"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid "Prompt on empty subject"
 msgstr "Bei leerem Betreff nachfragen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 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:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 msgid "Prompt when emptying the trash"
 msgstr "Beim Leeren des Papierkorbs nachfragen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 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:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid "Prompt when user expunges"
 msgstr "Beim Säubern nachfragen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 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:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 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:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
@@ -8663,21 +8639,21 @@ msgstr ""
 "Nachricht an Empfänger versendet, deren Adresse nicht als E-Mail-Adresse "
 "angegeben wurde"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 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:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Beim Verschicken von Nachrichten ohne An- und Kopie-Feld nachfragen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 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:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -8685,12 +8661,12 @@ msgstr ""
 "Beim Verschicken von HTML-Nachrichten an Kontakte, die keine wollen, "
 "nachfragen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 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:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -8698,19 +8674,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:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid "Prompt while marking multiple messages"
 msgstr "Anzeigen wenn mehrere Nachrichten markiert werden"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Die Anzeige beim Markieren mehrerer Nachrichten ein-/ausschalten"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 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:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 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 "
@@ -8720,13 +8696,13 @@ msgstr ""
 "Nachricht in einem Suchordner die Nachricht wirklich löscht und nicht nur "
 "aus den Suchergebnissen entfernt."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 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:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 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 "
@@ -8739,13 +8715,13 @@ msgstr ""
 "und »ask« (bzw. jeder andere Wert) führt dazu, dass der Benutzer stets "
 "gefragt wird."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 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:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 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 "
@@ -8758,11 +8734,11 @@ msgstr ""
 "und »ask« (bzw. jeder andere Wert) führt dazu, dass der Benutzer stets "
 "gefragt wird."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 msgid "Prompt when replying privately to list messages"
 msgstr "Bei privater Antwort auf Listennachrichten nachfragen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 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."
@@ -8771,13 +8747,13 @@ msgstr ""
 "private Antwort auf eine Nachricht versendet, die über eine Mailingliste "
 "eingegangen ist."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 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:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 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 "
@@ -8788,11 +8764,11 @@ msgstr ""
 "Nachricht an den privaten Absender antworten wollen, aber die »Antwort an«-"
 "Kopfzeile die Antwort normalerweise an die Mailingliste leiten würde."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 msgid "Prompt when replying to many recipients"
 msgstr "Beim Antworten an viele Empfänger nachfragen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
@@ -8800,62 +8776,53 @@ 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:162
-msgid ""
-"Asks whether to close the message window when the user forwards or replies "
-"to the message shown in the window"
-msgstr ""
-"Nachfragen, ob das Nachrichtenfenster geschlossen werden soll, wenn die "
-"Nachricht im Nachrichtenfenster weitergeleitet oder beantwortet wird."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 msgid ""
-"Possible values are: 'never' - to never close browser window, 'always' - to "
-"always close browser window or 'ask' - (or any other value) will ask user."
+"Policy for automatically closing the message browser window when forwarding "
+"or replying to the displayed message."
 msgstr ""
-"Mögliche Werte sind: »never«, um das Browserfenster niemals zu schließen, "
-"»always«, um das Browserfenster immer zu schließen. »ask« oder ein anderer "
-"Wert führt dazu, dass der Benutzer jedes Mal um Bestätigung gebeten wird."
+"Richtlinie zum automatischen Schließen des Nachrichtenfensters beim "
+"Weiterleiten oder Antworten auf die dargestellte Nachricht."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid "Empty Trash folders on exit"
 msgstr "Papierkorb-Ordner beim Beenden leeren"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 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:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 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:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 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:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid "Last time Empty Trash was run"
 msgstr "Letzte Papierkorbleerung"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 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:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 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:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 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:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -8863,11 +8830,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:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid "Show original \"Date\" header value."
 msgstr "Den originalen Wert der Kopfzeile »Datum« anzeigen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 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 "
@@ -8878,11 +8845,11 @@ msgstr ""
 "Kopfzeile »Datum« in einem benutzerdefinierten Format und der lokalen "
 "Zeitzone dargestellt."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 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:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 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."
@@ -8891,50 +8858,50 @@ msgstr ""
 "Liste enthält Zeichenketten der Form Name:Farbe, wobei die Farbe als HTML-"
 "Hextriplet anzugeben ist."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 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:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 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:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 msgid "Empty Junk folders on exit"
 msgstr "Unerwünscht-Ordner beim Beenden leeren"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 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:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 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:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 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:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 msgid "Last time Empty Junk was run"
 msgstr "Letzte Leerung des Unerwünscht-Ordners"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 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:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 msgid "The default plugin for Junk hook"
 msgstr "Vorgabe-Plugin für die Unerwünscht-Erkennung"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 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 "
@@ -8944,13 +8911,13 @@ msgstr ""
 "aktiviert sind. Falls das als Vorgabe aufgelistete Plugin deaktiviert ist, "
 "so wird nicht auf eines der anderen Plugins zurückgegriffen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 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:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 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 "
@@ -8963,7 +8930,7 @@ msgstr ""
 "markiert sind. Diese Funktion kann langsam sein falls entfernte Adressbücher "
 "(wie LDAP) für die Auto-Vervollständigung aktiviert sind."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -8971,7 +8938,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:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 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 "
@@ -8981,13 +8948,13 @@ msgstr ""
 "fest, ob Adressen im lokalen Adressbuch gesucht werden um sicherzustellen, "
 "dass E-Mails von Bekannten nicht als unerwünscht markiert werden."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 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:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 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 "
@@ -8998,13 +8965,13 @@ msgstr ""
 "eine angegebene Kopfzeile auftritt, so wird hierdurch die Prüfung auf "
 "Unerwünschtheit beschleunigt."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 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:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -9012,31 +8979,31 @@ msgstr ""
 "Benutzerdefinierte Kopfzeilen, die für die Prüfung auf Unerwünschtheit "
 "genutzt werden.Das Format ist »Kopfzeilenname=Wert« im GConf-Schlüssel."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 msgid "UID string of the default account."
 msgstr "UID-Zeichenkette für das Vorgabekonto."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid "Save directory"
 msgstr "Ordner speichern"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 msgid "Directory for saving mail component files."
 msgstr "Ordner zum Speichern der E-Mailkomponenten-Dateien."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Composer load/attach directory"
 msgstr "Vorgabeordner für Anlagen im Nachrichteneditor"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid "Directory for loading/attaching files to composer."
 msgstr "Vorgabeordner für Anlagen im Nachrichteneditor."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid "Check for new messages on start"
 msgstr "Beim Start nach neuen Nachrichten suchen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
@@ -9045,11 +9012,11 @@ msgstr ""
 "gestartet wurde. Dies schließt das Versenden von E-Mails aus dem "
 "Nachrichtenausgang mit ein."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 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:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 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 "
@@ -9060,11 +9027,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:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "Server synchronization interval"
 msgstr "Intervall für Datenabgleich mit Servern"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -9072,6 +9039,73 @@ msgstr ""
 "Legt fest, wie oft lokale Änderungen mit dem entfernen Mail-Server "
 "abgeglichen werden. Der Intervall muss mindestens 30 Sekunden betragen."
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+msgid "(Deprecated) Default forward style"
+msgstr "(Veraltet) Standard-Weiterleitungsstil"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"forward-style-name\" instead."
+msgstr ""
+"Dieser Schlüssel ist seit Version 3.10 veraltet und soll nicht mehr "
+"verwendet werden. Verwenden Sie stattdessen »forward-style-name«."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+msgid "(Deprecated) Default reply style"
+msgstr "(Veraltet) Standard-Antwortmethode"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"reply-style-name\" instead."
+msgstr ""
+"Dieser Schlüssel ist seit Version 3.10 veraltet und soll nicht mehr "
+"verwendet werden. Verwenden Sie stattdessen »reply-style-name«."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+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:204
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"show-headers\" instead."
+msgstr ""
+"Dieser Schlüssel ist seit Version 3.10 veraltet und soll nicht mehr "
+"verwendet werden. Verwenden Sie stattdessen »show-headers«."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+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:206
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"image-loading-policy\" instead."
+msgstr ""
+"Dieser Schlüssel ist seit Version 3.10 veraltet und soll nicht mehr "
+"verwendet werden. Verwenden Sie stattdessen »image-loading-policy«."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+msgid ""
+"(Deprecated) Asks whether to close the message window when the user forwards "
+"or replies to the message shown in the window"
+msgstr ""
+"(Veraltet)  Nachfragen, ob das Nachrichtenfenster geschlossen werden soll, "
+"wenn die Nachricht im Nachrichtenfenster weitergeleitet oder beantwortet "
+"wird."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"browser-close-on-reply-policy\" instead."
+msgstr ""
+"Dieser Schlüssel ist seit Version 3.10 veraltet und soll nicht mehr "
+"verwendet werden. Verwenden Sie stattdessen »browser-close-on-reply-policy«."
+
 #. Translators: This is the a list of words for the attach reminder plugin to look
 #. for in a message body. Please use any number of words here in your language that might
 #. indicate that an attachment should have been attached to the message.
@@ -9488,7 +9522,7 @@ msgstr "SpamAssassin-Dienst und -Client verwenden"
 msgid "Use spamc and spamd programs, if available."
 msgstr "Verwenden Sie die Programme spamc und spamd, sofern verfügbar."
 
-#: ../em-format/e-mail-formatter-attachment.c:370
+#: ../em-format/e-mail-formatter-attachment.c:397
 #: ../e-util/e-attachment-bar.c:101 ../e-util/e-attachment-bar.c:106
 #: ../e-util/e-attachment-paned.c:176 ../e-util/e-attachment-paned.c:181
 #: ../mail/message-list.etspec.h:4
@@ -9497,143 +9531,100 @@ msgid_plural "Attachments"
 msgstr[0] "Anlage"
 msgstr[1] "Anlagen"
 
-#: ../em-format/e-mail-formatter-attachment.c:371
+#: ../em-format/e-mail-formatter-attachment.c:398
 msgid "Display as attachment"
 msgstr "Als Anlage anzeigen"
 
-#: ../em-format/e-mail-formatter.c:1341 ../mail/e-mail-tag-editor.c:326
-#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:61
+#: ../em-format/e-mail-formatter-headers.c:107
+#: ../em-format/e-mail-part-headers.c:47 ../mail/e-mail-tag-editor.c:272
+#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:63
 msgid "From"
 msgstr "Von"
 
-#: ../em-format/e-mail-formatter.c:1342 ../modules/mail/em-mailer-prefs.c:62
-msgid "Reply-To"
-msgstr "Antwort an"
-
-#: ../em-format/e-mail-formatter.c:1344
-#: ../em-format/e-mail-formatter-utils.c:196
-#: ../em-format/e-mail-formatter-utils.c:220
-#: ../modules/mail/em-mailer-prefs.c:64
-msgid "Cc"
-msgstr "Kopie"
-
-#: ../em-format/e-mail-formatter.c:1345
-#: ../em-format/e-mail-formatter-utils.c:198
-#: ../em-format/e-mail-formatter-utils.c:222
-#: ../modules/mail/em-mailer-prefs.c:65
-msgid "Bcc"
-msgstr "Blindkopie"
-
-#: ../em-format/e-mail-formatter.c:1346
-#: ../em-format/e-mail-formatter-quote-headers.c:150
-#: ../mail/e-mail-tag-editor.c:331 ../mail/em-filter-i18n.h:77
-#: ../mail/message-list.etspec.h:6 ../modules/mail/em-mailer-prefs.c:66
-#: ../smime/lib/e-asn1-object.c:712
-msgid "Subject"
-msgstr "Betreff"
-
-#: ../em-format/e-mail-formatter.c:1347 ../e-util/e-dateedit.c:549
-#: ../e-util/e-dateedit.c:572 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:67
-msgid "Date"
-msgstr "Datum"
-
-#: ../em-format/e-mail-formatter.c:1348 ../modules/mail/em-mailer-prefs.c:68
-msgid "Newsgroups"
-msgstr "Newsgroups"
-
-#: ../em-format/e-mail-formatter.c:1349 ../modules/mail/em-mailer-prefs.c:69
-#: ../plugins/face/org-gnome-face.eplug.xml.h:1
-msgid "Face"
-msgstr "Gesicht"
-
-#. Translators: "From:" is preceding a new mail
-#. * sender address, like "From: user example com"
-#: ../em-format/e-mail-formatter-headers.c:100
-#: ../plugins/mail-notification/mail-notification.c:395
-#, c-format
-msgid "From: %s"
-msgstr "Von: %s"
-
-#: ../em-format/e-mail-formatter-headers.c:121
-#: ../em-format/e-mail-formatter-headers.c:126
+#: ../em-format/e-mail-formatter-headers.c:133
 msgid "(no subject)"
 msgstr "(Kein Betreff)"
 
-#: ../em-format/e-mail-formatter-headers.c:328
+#: ../em-format/e-mail-formatter-headers.c:333
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "Diese Nachricht wurde von %s im Namen von %s gesendet"
 
-#: ../em-format/e-mail-formatter-image.c:143
+#: ../em-format/e-mail-formatter-image.c:152
 msgid "Regular Image"
 msgstr "Normales Bild"
 
-#: ../em-format/e-mail-formatter-image.c:144
+#: ../em-format/e-mail-formatter-image.c:153
 msgid "Display part as an image"
 msgstr "Teil als Bild anzeigen"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:242
+#: ../em-format/e-mail-formatter-message-rfc822.c:252
 msgid "RFC822 message"
 msgstr "RFC822-Nachricht"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:243
+#: ../em-format/e-mail-formatter-message-rfc822.c:253
 msgid "Format part as an RFC822 message"
 msgstr "Teil als RFC822-Nachricht formatieren"
 
-#: ../em-format/e-mail-formatter-print.c:56
+#: ../em-format/e-mail-formatter-print.c:54
 #: ../e-util/gal-define-views-dialog.c:361
 #: ../e-util/gal-view-instance-save-as-dialog.c:95
 #: ../mail/e-mail-label-tree-view.c:99
 #: ../modules/cal-config-caldav/e-caldav-chooser.c:1328
-#: ../modules/cal-config-google/e-google-chooser.c:209
+#: ../modules/cal-config-google/e-google-chooser.c:237
 #: ../modules/plugin-manager/evolution-plugin-manager.c:67
 msgid "Name"
 msgstr "Name"
 
-#: ../em-format/e-mail-formatter-print.c:56
+#: ../em-format/e-mail-formatter-print.c:54
 #: ../e-util/e-attachment-tree-view.c:574 ../mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Größe"
 
-#. Add encryption/signature header
-#: ../em-format/e-mail-formatter-print-headers.c:120
-#: ../mail/e-mail-config-security-page.c:642
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:195
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:129
-msgid "Security"
-msgstr "Sicherheit"
-
-#: ../em-format/e-mail-formatter-print-headers.c:138
+#: ../em-format/e-mail-formatter-print-headers.c:144
 msgid "GPG signed"
 msgstr "Mit GPG signiert"
 
-#: ../em-format/e-mail-formatter-print-headers.c:144
+#: ../em-format/e-mail-formatter-print-headers.c:150
 msgid "GPG encrpyted"
 msgstr "Mit GPG verschlüsselt"
 
-#: ../em-format/e-mail-formatter-print-headers.c:150
+#: ../em-format/e-mail-formatter-print-headers.c:156
 msgid "S/MIME signed"
 msgstr "Mit S/MIME signiert"
 
-#: ../em-format/e-mail-formatter-print-headers.c:156
+#: ../em-format/e-mail-formatter-print-headers.c:162
 msgid "S/MIME encrpyted"
 msgstr "Mit S/MIME verschlüsselt"
 
+#: ../em-format/e-mail-formatter-print-headers.c:171
+#: ../mail/e-mail-config-security-page.c:642
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:195
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:129
+msgid "Security"
+msgstr "Sicherheit"
+
+#: ../em-format/e-mail-formatter-quote-headers.c:168
+#: ../em-format/e-mail-part-headers.c:52 ../mail/e-mail-tag-editor.c:277
+#: ../mail/em-filter-i18n.h:77 ../mail/message-list.etspec.h:6
+#: ../modules/mail/em-mailer-prefs.c:68 ../smime/lib/e-asn1-object.c:712
+msgid "Subject"
+msgstr "Betreff"
+
 #. pseudo-header
-#: ../em-format/e-mail-formatter-quote-headers.c:161
-#: ../em-format/e-mail-formatter-utils.c:346
-#: ../modules/mail/em-mailer-prefs.c:1117
+#: ../em-format/e-mail-formatter-quote-headers.c:187
+#: ../em-format/e-mail-formatter-utils.c:359
+#: ../modules/mail/em-mailer-prefs.c:1144
 msgid "Mailer"
 msgstr "Mailer"
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:88
-#: ../em-format/e-mail-formatter-text-enriched.c:102
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:91
+#: ../em-format/e-mail-formatter-text-enriched.c:104
 msgid "Richtext"
 msgstr "Richtext"
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:89
-#: ../em-format/e-mail-formatter-text-enriched.c:103
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:92
+#: ../em-format/e-mail-formatter-text-enriched.c:105
 msgid "Display part as enriched text"
 msgstr "Teil als »enriched text« formatieren"
 
@@ -9647,13 +9638,13 @@ msgstr "HTML"
 msgid "Format part as HTML"
 msgstr "Teil als HTML formatieren"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:111
-#: ../em-format/e-mail-formatter-text-plain.c:186
+#: ../em-format/e-mail-formatter-quote-text-plain.c:115
+#: ../em-format/e-mail-formatter-text-plain.c:194
 msgid "Plain Text"
 msgstr "Einfacher Text"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:112
-#: ../em-format/e-mail-formatter-text-plain.c:187
+#: ../em-format/e-mail-formatter-quote-text-plain.c:116
+#: ../em-format/e-mail-formatter-text-plain.c:195
 msgid "Format part as plain text"
 msgstr "Teil als einfachen Text formatieren"
 
@@ -9770,23 +9761,35 @@ msgstr ""
 "verschlüsselt. Daher können Dritte ihren Inhalt nur sehr schwerlich "
 "innerhalb eines praktikablen Zeitraums ausspähen."
 
-#: ../em-format/e-mail-formatter-secure-button.c:180
+#: ../em-format/e-mail-formatter-secure-button.c:182
 #: ../smime/gui/smime-ui.ui.h:20
 msgid "_View Certificate"
 msgstr "_Zertifikat anzeigen"
 
-#: ../em-format/e-mail-formatter-secure-button.c:195
+#: ../em-format/e-mail-formatter-secure-button.c:197
 msgid "This certificate is not viewable"
 msgstr "Dieses Zertifikat kann nicht angezeigt werden"
 
-#: ../em-format/e-mail-formatter-source.c:126
+#: ../em-format/e-mail-formatter-source.c:130
 msgid "Source"
 msgstr "Quelle"
 
-#: ../em-format/e-mail-formatter-source.c:127
+#: ../em-format/e-mail-formatter-source.c:131
 msgid "Display source of a MIME part"
 msgstr "Quelle als MIME-Teil anzeigen"
 
+#: ../em-format/e-mail-formatter-utils.c:207
+#: ../em-format/e-mail-formatter-utils.c:231
+#: ../em-format/e-mail-part-headers.c:50 ../modules/mail/em-mailer-prefs.c:66
+msgid "Cc"
+msgstr "Kopie"
+
+#: ../em-format/e-mail-formatter-utils.c:209
+#: ../em-format/e-mail-formatter-utils.c:233
+#: ../em-format/e-mail-part-headers.c:51 ../modules/mail/em-mailer-prefs.c:67
+msgid "Bcc"
+msgstr "Blindkopie"
+
 #: ../em-format/e-mail-parser-application-mbox.c:88
 #, c-format
 msgid "Error parsing MBOX part: %s"
@@ -9812,27 +9815,27 @@ msgstr "Fehler beim Überprüfen der Signatur: %s"
 msgid "Malformed external-body part"
 msgstr "Fehlerhaft formatierter external-body-Teil"
 
-#: ../em-format/e-mail-parser-message-external.c:101
+#: ../em-format/e-mail-parser-message-external.c:102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Zeiger auf FTP-Site (%s)"
 
-#: ../em-format/e-mail-parser-message-external.c:112
+#: ../em-format/e-mail-parser-message-external.c:113
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Zeiger auf lokale Datei (%s) gültig auf Seite »%s«"
 
-#: ../em-format/e-mail-parser-message-external.c:114
+#: ../em-format/e-mail-parser-message-external.c:115
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Zeiger auf lokale Datei (%s)"
 
-#: ../em-format/e-mail-parser-message-external.c:133
+#: ../em-format/e-mail-parser-message-external.c:134
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Zeiger auf ferne Daten (%s)"
 
-#: ../em-format/e-mail-parser-message-external.c:150
+#: ../em-format/e-mail-parser-message-external.c:152
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Zeiger auf unbekannte externe Daten (Typ »%s«)"
@@ -9857,6 +9860,25 @@ msgstr "PGP/MIME-Nachricht konnte nicht analysiert werden: %s"
 msgid "Unsupported signature format"
 msgstr "Nicht unterstütztes Signaturformat"
 
+#: ../em-format/e-mail-part-headers.c:48 ../modules/mail/em-mailer-prefs.c:64
+msgid "Reply-To"
+msgstr "Antwort an"
+
+#: ../em-format/e-mail-part-headers.c:53 ../e-util/e-dateedit.c:550
+#: ../e-util/e-dateedit.c:573 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:69
+msgid "Date"
+msgstr "Datum"
+
+#: ../em-format/e-mail-part-headers.c:54 ../modules/mail/em-mailer-prefs.c:70
+msgid "Newsgroups"
+msgstr "Newsgroups"
+
+#: ../em-format/e-mail-part-headers.c:55 ../modules/mail/em-mailer-prefs.c:71
+#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+msgid "Face"
+msgstr "Gesicht"
+
 #: ../em-format/e-mail-part-utils.c:500
 #, c-format
 msgid "%s attachment"
@@ -9941,6 +9963,10 @@ msgstr "_Bis"
 msgid "Delivery Options"
 msgstr "Zustellungsoptionen"
 
+#: ../e-util/e-send-options.ui.h:26
+msgid "_Priority:"
+msgstr "_Priorität:"
+
 #: ../e-util/e-send-options.ui.h:27
 msgid "_Classification:"
 msgstr "E_instufung:"
@@ -10108,7 +10134,7 @@ msgid "Timezone drop-down combination box"
 msgstr "Auswahlliste für die Zeitzone"
 
 #: ../e-util/filter.ui.h:1 ../e-util/e-filter-rule.c:1239
-#: ../mail/em-utils.c:293
+#: ../mail/em-utils.c:240
 msgid "Incoming"
 msgstr "Eingang"
 
@@ -10224,42 +10250,42 @@ msgstr "Art der Ansicht:"
 msgid "Type of View"
 msgstr "Art der Ansicht"
 
-#: ../e-util/e-activity-proxy.c:313
-#: ../modules/mail/e-mail-shell-view-actions.c:1484
+#: ../e-util/e-activity-proxy.c:311
+#: ../modules/mail/e-mail-shell-view-actions.c:1742
 msgid "Cancel"
 msgstr "Abbrechen"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:247
+#: ../e-util/e-activity.c:256
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (abgebrochen)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:250
+#: ../e-util/e-activity.c:259
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (abgeschlossen)"
 
 #. Translators: This is an activity waiting to run.
-#: ../e-util/e-activity.c:253
+#: ../e-util/e-activity.c:262
 #, c-format
 msgid "%s (waiting)"
 msgstr "%s (wartend)"
 
 #. Translators: This is a running activity which
 #. *              the user has requested to cancel.
-#: ../e-util/e-activity.c:257
+#: ../e-util/e-activity.c:266
 #, c-format
 msgid "%s (cancelling)"
 msgstr "%s (wird abgebrochen)"
 
-#: ../e-util/e-activity.c:259
+#: ../e-util/e-activity.c:268
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../e-util/e-activity.c:264
+#: ../e-util/e-activity.c:273
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (zu %d%% abgeschlossen)"
@@ -10276,19 +10302,19 @@ msgstr "Symbolansicht"
 msgid "List View"
 msgstr "Listenansicht"
 
-#: ../e-util/e-attachment-dialog.c:311
+#: ../e-util/e-attachment-dialog.c:318
 msgid "Attachment Properties"
 msgstr "Eigenschaften der Anlage"
 
-#: ../e-util/e-attachment-dialog.c:333 ../e-util/e-import-assistant.c:273
+#: ../e-util/e-attachment-dialog.c:340 ../e-util/e-import-assistant.c:273
 msgid "F_ilename:"
 msgstr "Datei_name:"
 
-#: ../e-util/e-attachment-dialog.c:368
+#: ../e-util/e-attachment-dialog.c:375
 msgid "MIME Type:"
 msgstr "MIME-Typ:"
 
-#: ../e-util/e-attachment-dialog.c:376 ../e-util/e-attachment-store.c:441
+#: ../e-util/e-attachment-dialog.c:383 ../e-util/e-attachment-store.c:483
 msgid "_Suggest automatic display of attachment"
 msgstr "Automatische Anzeige der Anlage _vorschlagen"
 
@@ -10332,60 +10358,60 @@ msgstr "Anla_genleiste verbergen"
 msgid "Show Attachment _Bar"
 msgstr "Anla_genleiste anzeigen"
 
-#: ../e-util/e-attachment-store.c:429
+#: ../e-util/e-attachment-store.c:463
 msgid "Add Attachment"
 msgstr "Anlage hinzufügen"
 
-#: ../e-util/e-attachment-store.c:432
+#: ../e-util/e-attachment-store.c:466
 msgid "A_ttach"
 msgstr "Bei_legen"
 
-#: ../e-util/e-attachment-store.c:495
+#: ../e-util/e-attachment-store.c:537
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Anlage speichern"
 msgstr[1] "Anlagen speichern"
 
 #. Translators: Default attachment filename.
-#: ../e-util/e-attachment-store.c:524 ../e-util/e-attachment.c:1841
-#: ../e-util/e-attachment.c:2477
+#: ../e-util/e-attachment-store.c:568 ../e-util/e-attachment.c:2055
+#: ../e-util/e-attachment.c:2711
 msgid "attachment.dat"
 msgstr "Anlage.dat"
 
-#: ../e-util/e-attachment-view.c:378
+#: ../e-util/e-attachment-view.c:379
 msgid "Open With Other Application..."
 msgstr "Mit anderer Anwendung öffnen …"
 
-#: ../e-util/e-attachment-view.c:385
+#: ../e-util/e-attachment-view.c:386
 msgid "S_ave All"
 msgstr "_Alle speichern"
 
-#: ../e-util/e-attachment-view.c:411
+#: ../e-util/e-attachment-view.c:412
 msgid "A_dd Attachment..."
 msgstr "Anlage _hinzufügen …"
 
-#: ../e-util/e-attachment-view.c:435
+#: ../e-util/e-attachment-view.c:436
 msgid "_Hide"
 msgstr "_Verbergen"
 
-#: ../e-util/e-attachment-view.c:442
+#: ../e-util/e-attachment-view.c:443
 msgid "Hid_e All"
 msgstr "_Alle verbergen"
 
-#: ../e-util/e-attachment-view.c:449
+#: ../e-util/e-attachment-view.c:450
 msgid "_View Inline"
 msgstr "_Eingebettet anzeigen"
 
-#: ../e-util/e-attachment-view.c:456
+#: ../e-util/e-attachment-view.c:457
 msgid "Vie_w All Inline"
 msgstr "_Alle eingebetteten anzeigen"
 
-#: ../e-util/e-attachment-view.c:777
+#: ../e-util/e-attachment-view.c:778
 #, c-format
 msgid "Open With \"%s\""
 msgstr "Mit »%s« öffnen"
 
-#: ../e-util/e-attachment-view.c:780
+#: ../e-util/e-attachment-view.c:781
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Diese Anlage mit »%s« öffnen"
@@ -10394,48 +10420,48 @@ msgstr "Diese Anlage mit »%s« öffnen"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../e-util/e-attachment.c:978
+#: ../e-util/e-attachment.c:1110
 msgid "Attached message"
 msgstr "Beigelegte Nachricht"
 
-#: ../e-util/e-attachment.c:1917 ../e-util/e-attachment.c:2779
+#: ../e-util/e-attachment.c:2135 ../e-util/e-attachment.c:3017
 msgid "A load operation is already in progress"
 msgstr "Ein Ladevorgang läuft bereits"
 
-#: ../e-util/e-attachment.c:1925 ../e-util/e-attachment.c:2787
+#: ../e-util/e-attachment.c:2143 ../e-util/e-attachment.c:3025
 msgid "A save operation is already in progress"
 msgstr "Ein Speichervorgang läuft bereits"
 
-#: ../e-util/e-attachment.c:2033
+#: ../e-util/e-attachment.c:2260
 #, c-format
 msgid "Could not load '%s'"
 msgstr "»%s« konnte nicht geladen werden"
 
-#: ../e-util/e-attachment.c:2036
+#: ../e-util/e-attachment.c:2263
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Die Anlage konnte nicht geladen werden"
 
-#: ../e-util/e-attachment.c:2334
+#: ../e-util/e-attachment.c:2566
 #, c-format
 msgid "Could not open '%s'"
 msgstr "»%s« konnte nicht geöffnet werden"
 
-#: ../e-util/e-attachment.c:2337
+#: ../e-util/e-attachment.c:2569
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Die Anlage konnte nicht geöffnet werden"
 
-#: ../e-util/e-attachment.c:2795
+#: ../e-util/e-attachment.c:3034
 msgid "Attachment contents not loaded"
 msgstr "Anlagen wurden nicht geladen"
 
-#: ../e-util/e-attachment.c:2871
+#: ../e-util/e-attachment.c:3110
 #, c-format
 msgid "Could not save '%s'"
 msgstr "»%s« konnte nicht gespeichert werden"
 
-#: ../e-util/e-attachment.c:2874
+#: ../e-util/e-attachment.c:3113
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Die Anlage konnte nicht gespeichert werden"
@@ -10489,19 +10515,19 @@ msgid "Copy memo list contents locally for offline operation"
 msgstr "Den Inhalt der Notizliste lokal zur Arbeit im Offline-Modus kopieren"
 
 #. This is a strftime() format. %B = Month name.
-#: ../e-util/e-calendar-item.c:1324 ../e-util/e-calendar-item.c:2186
+#: ../e-util/e-calendar-item.c:1327 ../e-util/e-calendar-item.c:2195
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%B"
 
 #. This is a strftime() format. %Y = Year.
-#: ../e-util/e-calendar-item.c:1326
+#: ../e-util/e-calendar-item.c:1329
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../e-util/e-calendar-item.c:1363
+#: ../e-util/e-calendar-item.c:1366
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%B %Y"
@@ -10582,7 +10608,7 @@ msgstr "Jetzt"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-cell-date-edit.c:307 ../e-util/e-datetime-format.c:209
-#: ../modules/calendar/e-cal-shell-view-actions.c:1924
+#: ../modules/calendar/e-cal-shell-view-actions.c:1921
 #: ../modules/itip-formatter/itip-view.c:230
 msgid "Today"
 msgstr "Heute"
@@ -10603,7 +10629,7 @@ msgstr "OK"
 msgid "The time must be in the format: %s"
 msgstr "Die Zeit muss folgendes Format haben: %s"
 
-#: ../e-util/e-cell-date.c:51 ../mail/message-list.c:1882
+#: ../e-util/e-cell-date.c:51 ../mail/message-list.c:1694
 msgid "?"
 msgstr "?"
 
@@ -10701,59 +10727,59 @@ msgstr "Ukrainisch"
 msgid "Visual"
 msgstr "Visuell"
 
-#: ../e-util/e-client-cache.c:1067
+#: ../e-util/e-client-cache.c:1162
 #, 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"
 
-#: ../e-util/e-dateedit.c:523
+#: ../e-util/e-dateedit.c:524
 msgid "Date and Time"
 msgstr "Datum und Uhrzeit"
 
-#: ../e-util/e-dateedit.c:548
+#: ../e-util/e-dateedit.c:549
 msgid "Text entry to input date"
 msgstr "Eingabefeld für das Datum"
 
-#: ../e-util/e-dateedit.c:571
+#: ../e-util/e-dateedit.c:572
 msgid "Click this button to show a calendar"
 msgstr "Diesen Knopf drücken, um den Kalender anzuzeigen"
 
-#: ../e-util/e-dateedit.c:625
+#: ../e-util/e-dateedit.c:626
 msgid "Drop-down combination box to select time"
 msgstr "Auswahlliste für die Zeit"
 
-#: ../e-util/e-dateedit.c:626
-#: ../modules/calendar/e-calendar-preferences.ui.h:16
+#: ../e-util/e-dateedit.c:627
+#: ../modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Time"
 msgstr "Uhrzeit"
 
-#: ../e-util/e-dateedit.c:700
+#: ../e-util/e-dateedit.c:701
 msgid "No_w"
 msgstr "_Jetzt"
 
-#: ../e-util/e-dateedit.c:707
+#: ../e-util/e-dateedit.c:708
 msgid "_Today"
 msgstr "_Heute"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. * is not permitted.
-#: ../e-util/e-dateedit.c:716
+#: ../e-util/e-dateedit.c:717
 msgid "_None"
 msgstr "_Keine"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../e-util/e-dateedit.c:1811 ../e-util/e-dateedit.c:2059
+#: ../e-util/e-dateedit.c:1813 ../e-util/e-dateedit.c:2061
 msgctxt "date"
 msgid "None"
 msgstr "Keine"
 
-#: ../e-util/e-dateedit.c:1951
+#: ../e-util/e-dateedit.c:1953
 msgid "Invalid Date Value"
 msgstr "Ungültiges Datum"
 
-#: ../e-util/e-dateedit.c:1996
+#: ../e-util/e-dateedit.c:1998
 msgid "Invalid Time Value"
 msgstr "Ungültige Zeitangabe"
 
@@ -10832,19 +10858,19 @@ msgstr "Lokale Vorgabe benutzen"
 msgid "Format:"
 msgstr "Format:"
 
-#: ../e-util/e-file-utils.c:150
+#: ../e-util/e-file-utils.c:121
 msgid "(Unknown Filename)"
 msgstr "(Unbekannter Dateiname)"
 
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:154
+#: ../e-util/e-file-utils.c:125
 #, c-format
 msgid "Writing \"%s\""
 msgstr "»%s« wird geschrieben"
 
 #. Translators: The first string value is the basename of a
 #. * remote file, the second string value is the hostname.
-#: ../e-util/e-file-utils.c:159
+#: ../e-util/e-file-utils.c:130
 #, c-format
 msgid "Writing \"%s\" to %s"
 msgstr "»%s« wird nach »%s« geschrieben"
@@ -11025,7 +11051,7 @@ msgstr "_Threads einschließen:"
 msgid "A_dd Condition"
 msgstr "Bedingung hin_zufügen"
 
-#: ../e-util/e-filter-rule.c:1239 ../mail/em-utils.c:294
+#: ../e-util/e-filter-rule.c:1239 ../mail/em-utils.c:241
 msgid "Outgoing"
 msgstr "Ausgehend"
 
@@ -11204,11 +11230,11 @@ msgstr ""
 "Tastaturbenutzer sollten die Zeitzone stattdessen mit der Auswahlliste im "
 "unteren Bereich festlegen."
 
-#: ../e-util/e-misc-utils.c:244
+#: ../e-util/e-misc-utils.c:242
 msgid "Could not open the link."
 msgstr "Verknüpfung konnte nicht geöffnet werden."
 
-#: ../e-util/e-misc-utils.c:291
+#: ../e-util/e-misc-utils.c:289
 msgid "Could not display help for Evolution."
 msgstr "Hilfe für Evolution konnte nicht angezeigt werden."
 
@@ -11231,9 +11257,9 @@ msgstr "_Suchen:"
 #: ../e-util/e-name-selector-dialog.c:367
 #: ../e-util/e-name-selector-dialog.c:1256
 #: ../modules/addressbook/e-book-shell-view-actions.c:1066
-#: ../modules/calendar/e-cal-shell-view-actions.c:1757
-#: ../modules/calendar/e-memo-shell-view-actions.c:788
-#: ../modules/calendar/e-task-shell-view-actions.c:959
+#: ../modules/calendar/e-cal-shell-view-actions.c:1754
+#: ../modules/calendar/e-memo-shell-view-actions.c:787
+#: ../modules/calendar/e-task-shell-view-actions.c:958
 msgid "Any Category"
 msgstr "Beliebige Kategorie"
 
@@ -11251,7 +11277,7 @@ msgid "Address Book"
 msgstr "Adressbuch"
 
 #: ../e-util/e-name-selector-dialog.c:452
-#: ../modules/addressbook/e-book-shell-backend.c:305
+#: ../modules/addressbook/e-book-shell-backend.c:304
 #: ../modules/addressbook/e-book-shell-view.c:356
 msgid "Contacts"
 msgstr "Kontakte"
@@ -11261,25 +11287,25 @@ msgid "Select Contacts from Address Book"
 msgstr "Kontakte aus dem Adressbuch wählen"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../e-util/e-name-selector-entry.c:3032
+#: ../e-util/e-name-selector-entry.c:3028
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "%s aus_klappen"
 
 #. Copy Contact Item
-#: ../e-util/e-name-selector-entry.c:3048
+#: ../e-util/e-name-selector-entry.c:3044
 #, c-format
 msgid "Cop_y %s"
 msgstr "%s _kopieren"
 
 #. Cut Contact Item
-#: ../e-util/e-name-selector-entry.c:3059
+#: ../e-util/e-name-selector-entry.c:3055
 #, c-format
 msgid "C_ut %s"
 msgstr "%s ausschnei_den"
 
 #. Edit Contact item
-#: ../e-util/e-name-selector-entry.c:3077
+#: ../e-util/e-name-selector-entry.c:3073
 #, c-format
 msgid "_Edit %s"
 msgstr "%s _bearbeiten"
@@ -11360,54 +11386,54 @@ msgstr "Regel hinzufügen"
 msgid "Edit Rule"
 msgstr "Regel bearbeiten"
 
-#: ../e-util/e-search-bar.c:79
+#: ../e-util/e-search-bar.c:81
 #, c-format
 msgid "Matches: %u"
 msgstr "Stimmt überein mit: %u"
 
-#: ../e-util/e-search-bar.c:527
+#: ../e-util/e-search-bar.c:565
 msgid "Close the find bar"
 msgstr "Die Suchleiste schließen"
 
-#: ../e-util/e-search-bar.c:535
+#: ../e-util/e-search-bar.c:573
 msgid "Fin_d:"
 msgstr "_Suchen:"
 
-#: ../e-util/e-search-bar.c:547
+#: ../e-util/e-search-bar.c:585
 msgid "Clear the search"
 msgstr "Das Suchfeld leeren"
 
-#: ../e-util/e-search-bar.c:571
+#: ../e-util/e-search-bar.c:609
 msgid "_Previous"
 msgstr "_Rückwärts suchen"
 
-#: ../e-util/e-search-bar.c:577
+#: ../e-util/e-search-bar.c:615
 msgid "Find the previous occurrence of the phrase"
 msgstr "Den letzten Suchtreffer finden"
 
-#: ../e-util/e-search-bar.c:590
+#: ../e-util/e-search-bar.c:624
 msgid "_Next"
 msgstr "_Weitersuchen"
 
-#: ../e-util/e-search-bar.c:596
+#: ../e-util/e-search-bar.c:630
 msgid "Find the next occurrence of the phrase"
 msgstr "Den nächsten Suchtreffer finden"
 
-#: ../e-util/e-search-bar.c:609
+#: ../e-util/e-search-bar.c:639
 msgid "Mat_ch case"
 msgstr "_Groß-/Kleinschreibung berücksichtigen"
 
-#: ../e-util/e-search-bar.c:637
+#: ../e-util/e-search-bar.c:667
 msgid "Reached bottom of page, continued from top"
 msgstr "Seitenende erreicht, ab Anfang wird fortgesetzt"
 
-#: ../e-util/e-search-bar.c:659
+#: ../e-util/e-search-bar.c:689
 msgid "Reached top of page, continued from bottom"
 msgstr "Seitenanfang erreicht, ab Ende wird fortgesetzt"
 
 #: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:331
 #: ../mail/importers/pine-importer.c:419
-#: ../modules/mail/e-mail-shell-view.c:1045
+#: ../modules/mail/e-mail-shell-view.c:1063
 msgid "Mail"
 msgstr "E-Mail"
 
@@ -11450,26 +11476,26 @@ msgid "Select destination"
 msgstr "Wählen Sie das Ziel"
 
 #. no suggestions. Put something in the menu anyway...
-#: ../e-util/e-spell-entry.c:352
+#: ../e-util/e-spell-entry.c:384
 msgid "(no suggestions)"
 msgstr "(Keine Vorschläge)"
 
-#: ../e-util/e-spell-entry.c:376
+#: ../e-util/e-spell-entry.c:408
 msgid "More..."
 msgstr "Mehr …"
 
 #. + Add to Dictionary
-#: ../e-util/e-spell-entry.c:445
+#: ../e-util/e-spell-entry.c:479
 #, c-format
 msgid "Add \"%s\" to Dictionary"
 msgstr "»%s« zum Wörterbuch hinzufügen"
 
 #. - Ignore All
-#: ../e-util/e-spell-entry.c:488
+#: ../e-util/e-spell-entry.c:530
 msgid "Ignore All"
 msgstr "Alle ignorieren"
 
-#: ../e-util/e-spell-entry.c:514
+#: ../e-util/e-spell-entry.c:558
 msgid "Spelling Suggestions"
 msgstr "Rechtschreibvorschläge"
 
@@ -11707,51 +11733,51 @@ msgstr "UTC"
 msgid "Click here to go to URL"
 msgstr "Klicken Sie hier, um zur Adresse zu gehen"
 
-#: ../e-util/e-web-view-gtkhtml.c:406 ../e-util/e-web-view.c:273
+#: ../e-util/e-web-view-gtkhtml.c:406 ../e-util/e-web-view.c:274
 msgid "_Copy Link Location"
 msgstr "Link-Ziel _kopieren"
 
-#: ../e-util/e-web-view-gtkhtml.c:408 ../e-util/e-web-view.c:275
+#: ../e-util/e-web-view-gtkhtml.c:408 ../e-util/e-web-view.c:276
 msgid "Copy the link to the clipboard"
 msgstr "Den Verweis in die Zwischenablage kopieren"
 
-#: ../e-util/e-web-view-gtkhtml.c:416 ../e-util/e-web-view.c:283
+#: ../e-util/e-web-view-gtkhtml.c:416 ../e-util/e-web-view.c:284
 msgid "_Open Link in Browser"
 msgstr "Link im Browser ö_ffnen"
 
-#: ../e-util/e-web-view-gtkhtml.c:418 ../e-util/e-web-view.c:285
+#: ../e-util/e-web-view-gtkhtml.c:418 ../e-util/e-web-view.c:286
 msgid "Open the link in a web browser"
 msgstr "Verweis im Browser ö_ffnen"
 
-#: ../e-util/e-web-view-gtkhtml.c:426 ../e-util/e-web-view.c:293
+#: ../e-util/e-web-view-gtkhtml.c:426 ../e-util/e-web-view.c:294
 msgid "_Copy Email Address"
 msgstr "_E-Mail-Adresse kopieren"
 
-#: ../e-util/e-web-view-gtkhtml.c:443 ../e-util/e-web-view.c:310
+#: ../e-util/e-web-view-gtkhtml.c:443 ../e-util/e-web-view.c:311
 msgid "_Copy Image"
 msgstr "Bild _kopieren"
 
-#: ../e-util/e-web-view-gtkhtml.c:445 ../e-util/e-web-view.c:312
+#: ../e-util/e-web-view-gtkhtml.c:445 ../e-util/e-web-view.c:313
 msgid "Copy the image to the clipboard"
 msgstr "Das Bild in die Zwischenablage kopieren"
 
 #: ../e-util/e-web-view-gtkhtml.c:465 ../e-util/e-web-view-gtkhtml.c:1308
-#: ../e-util/e-web-view.c:332 ../e-util/e-web-view.c:1419
+#: ../e-util/e-web-view.c:333 ../e-util/e-web-view.c:1297
 msgid "Select all text and images"
 msgstr "Den gesamten Text und Bilder in einer Nachricht markieren"
 
 #: ../e-util/e-web-view-gtkhtml.c:972 ../e-util/e-web-view-gtkhtml.c:974
-#: ../e-util/e-web-view-gtkhtml.c:976 ../e-util/e-web-view.c:1086
-#: ../e-util/e-web-view.c:1088 ../e-util/e-web-view.c:1090
+#: ../e-util/e-web-view-gtkhtml.c:976 ../e-util/e-web-view.c:964
+#: ../e-util/e-web-view.c:966 ../e-util/e-web-view.c:968
 #, c-format
 msgid "Click to call %s"
 msgstr "Klicken Sie hier, um %s anzurufen"
 
-#: ../e-util/e-web-view-gtkhtml.c:978 ../e-util/e-web-view.c:1092
+#: ../e-util/e-web-view-gtkhtml.c:978 ../e-util/e-web-view.c:970
 msgid "Click to hide/unhide addresses"
 msgstr "Adressen anzeigen/verbergen"
 
-#: ../e-util/e-web-view-gtkhtml.c:980 ../e-util/e-web-view.c:1094
+#: ../e-util/e-web-view-gtkhtml.c:980 ../e-util/e-web-view.c:972
 #, c-format
 msgid "Click to open %s"
 msgstr "Klicken Sie hier, um %s zu öffnen"
@@ -11928,71 +11954,64 @@ msgstr "Rückgabecode der Legitimation ist ungültig (%d)"
 msgid "Saving message to folder '%s'"
 msgstr "Nachricht wird in Ordner »%s« gespeichert"
 
-#: ../libemail-engine/e-mail-folder-utils.c:573
+#: ../libemail-engine/e-mail-folder-utils.c:572
 msgid "Forwarded messages"
 msgstr "Weitergeleitete Nachrichten"
 
-#: ../libemail-engine/e-mail-folder-utils.c:683
-#: ../libemail-engine/e-mail-folder-utils.c:934
+#: ../libemail-engine/e-mail-folder-utils.c:682
+#: ../libemail-engine/e-mail-folder-utils.c:933
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "%d Nachricht wird abgerufen"
 msgstr[1] "%d Nachrichten werden abgerufen"
 
-#: ../libemail-engine/e-mail-folder-utils.c:777
+#: ../libemail-engine/e-mail-folder-utils.c:776
 msgid "Scanning messages for duplicates"
 msgstr "Nachrichten werden auf Duplikate überprüft"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1185
+#: ../libemail-engine/e-mail-folder-utils.c:1184
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Ordner »%s« wird entfernt"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1322
+#: ../libemail-engine/e-mail-folder-utils.c:1321
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "Die Datei »%s« wurde gelöscht."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1326
+#: ../libemail-engine/e-mail-folder-utils.c:1325
 msgid "File has been removed."
 msgstr "Datei wurde gelöscht."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1385
+#: ../libemail-engine/e-mail-folder-utils.c:1384
 msgid "Removing attachments"
 msgstr "Anlagen werden gelöscht"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1549
+#: ../libemail-engine/e-mail-folder-utils.c:1548
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "%d Nachricht wird gespeichert"
 msgstr[1] "%d Nachrichten werden gespeichert"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1905 ../mail/em-folder-utils.c:610
+#: ../libemail-engine/e-mail-folder-utils.c:1926 ../mail/em-folder-utils.c:610
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "Ungültiger Ordneradresse »%s«"
 
 #: ../libemail-engine/e-mail-session-utils.c:540
-#, c-format
-msgid "No mail service found with UID '%s'"
-msgstr "Kein Mail-Dienst mit der UID »%s« gefunden"
-
-#: ../libemail-engine/e-mail-session-utils.c:549
-#, c-format
-msgid "UID '%s' is not a mail transport"
-msgstr "UID »%s« ist kein Nachrichtendienst"
+msgid "No mail transport service available"
+msgstr "Keine Email-Dienste verfügbar."
 
-#: ../libemail-engine/e-mail-session-utils.c:647
-#: ../libemail-engine/mail-ops.c:765
+#: ../libemail-engine/e-mail-session-utils.c:638
+#: ../libemail-engine/mail-ops.c:706
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Ausgangsfilter konnten nicht angewandt werden: %s"
 
-#: ../libemail-engine/e-mail-session-utils.c:676
-#: ../libemail-engine/e-mail-session-utils.c:710
-#: ../libemail-engine/mail-ops.c:784 ../libemail-engine/mail-ops.c:817
+#: ../libemail-engine/e-mail-session-utils.c:685
+#: ../libemail-engine/mail-ops.c:750
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -12001,48 +12020,48 @@ msgstr ""
 "Anhängen an %s gescheitert: %s\n"
 "Stattdessen wird versucht, an den lokalen »Verschickt«-Ordner anzuhängen."
 
-#: ../libemail-engine/e-mail-session-utils.c:730
-#: ../libemail-engine/mail-ops.c:839
+#: ../libemail-engine/e-mail-session-utils.c:711
+#: ../libemail-engine/mail-ops.c:774
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Anhängen an lokalen »Verschickt«-Ordner gescheitert: %s"
 
-#: ../libemail-engine/e-mail-session-utils.c:974
-#: ../libemail-engine/mail-ops.c:971 ../libemail-engine/mail-ops.c:1073
+#: ../libemail-engine/e-mail-session-utils.c:912
+#: ../libemail-engine/mail-ops.c:905 ../libemail-engine/mail-ops.c:1007
 msgid "Sending message"
 msgstr "Nachricht wird verschickt"
 
 #: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-properties.c:336
 #: ../mail/em-folder-tree-model.c:764
-#: ../modules/mail/e-mail-shell-view-private.c:1094
-#: ../modules/mail/e-mail-shell-view-private.c:1105
+#: ../modules/mail/e-mail-shell-view-private.c:1100
+#: ../modules/mail/e-mail-shell-view-private.c:1111
 msgid "Inbox"
 msgstr "Eingang"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
 #: ../libemail-engine/e-mail-session.c:121 ../mail/em-folder-tree-model.c:757
-#: ../modules/mail/e-mail-shell-view-private.c:1092
+#: ../modules/mail/e-mail-shell-view-private.c:1098
 msgid "Drafts"
 msgstr "Entwürfe"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
 #: ../libemail-engine/e-mail-session.c:122 ../mail/em-folder-tree-model.c:768
-#: ../modules/mail/e-mail-shell-view-private.c:1096
+#: ../modules/mail/e-mail-shell-view-private.c:1102
 msgid "Outbox"
 msgstr "Ausgang"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
 #: ../libemail-engine/e-mail-session.c:123 ../mail/em-folder-tree-model.c:772
-#: ../modules/mail/e-mail-shell-view-private.c:1098
+#: ../modules/mail/e-mail-shell-view-private.c:1104
 msgid "Sent"
 msgstr "Verschickt"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
 #: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-tree-model.c:760
-#: ../modules/mail/e-mail-shell-view-private.c:1100
+#: ../modules/mail/e-mail-shell-view-private.c:1106
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1071 ../plugins/templates/templates.c:1368
-#: ../plugins/templates/templates.c:1378
+#: ../plugins/templates/templates.c:1082 ../plugins/templates/templates.c:1381
+#: ../plugins/templates/templates.c:1391
 msgid "Templates"
 msgstr "Vorlagen"
 
@@ -12119,7 +12138,7 @@ msgstr ""
 msgid "Fetching mail from '%s'"
 msgstr "E-Mail wird von »%s« abgerufen"
 
-#: ../libemail-engine/mail-ops.c:759
+#: ../libemail-engine/mail-ops.c:700
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set "
@@ -12132,52 +12151,52 @@ msgstr ""
 "Bitte prüfen Sie Ihre Filter unter Bearbeiten->Nachrichtenfilter.\n"
 "Ursprüngliche Fehlermeldung ist: %s"
 
-#: ../libemail-engine/mail-ops.c:982
+#: ../libemail-engine/mail-ops.c:916
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Nachricht %d von %d wird verschickt"
 
-#: ../libemail-engine/mail-ops.c:1034
+#: ../libemail-engine/mail-ops.c:968
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
 msgstr[0] "Eine Nachricht konnte nicht verschickt werden"
 msgstr[1] "%d von %d Nachrichten konnten nicht verschickt werden"
 
-#: ../libemail-engine/mail-ops.c:1040
+#: ../libemail-engine/mail-ops.c:974
 msgid "Canceled."
 msgstr "Abgebrochen."
 
-#: ../libemail-engine/mail-ops.c:1042
+#: ../libemail-engine/mail-ops.c:976
 msgid "Complete."
 msgstr "Abgeschlossen."
 
-#: ../libemail-engine/mail-ops.c:1154
+#: ../libemail-engine/mail-ops.c:1088
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Nachrichten werden nach »%s« verschoben"
 
-#: ../libemail-engine/mail-ops.c:1155
+#: ../libemail-engine/mail-ops.c:1089
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Nachrichten werden nach »%s« kopiert"
 
-#: ../libemail-engine/mail-ops.c:1274
+#: ../libemail-engine/mail-ops.c:1208
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ordner »%s« wird gespeichert"
 
-#: ../libemail-engine/mail-ops.c:1402
+#: ../libemail-engine/mail-ops.c:1336
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Konto »%s« wird gesäubert und gespeichert"
 
-#: ../libemail-engine/mail-ops.c:1403
+#: ../libemail-engine/mail-ops.c:1337
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Konto »%s« wird gespeichert"
 
-#: ../libemail-engine/mail-ops.c:1477
+#: ../libemail-engine/mail-ops.c:1411
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Papierkorb in »%s« wird geleert"
@@ -12236,20 +12255,28 @@ msgstr[1] ""
 "entfernten Ordner verwenden:\n"
 "»%s«."
 
-#: ../mail/e-mail-account-manager.c:460
+#: ../mail/e-mail-account-manager.c:116 ../mail/e-mail-account-manager.c:203
+msgid "Open _Online Accounts"
+msgstr "_Online-Konten öffnen"
+
+#: ../mail/e-mail-account-manager.c:142 ../mail/e-mail-account-manager.c:229
+msgid "This account was created through the Online Accounts service."
+msgstr "Dieses Benutzerkonto wurde durch den »Online-Konten«-Dienst erstellt."
+
+#: ../mail/e-mail-account-manager.c:690
 msgid "_Restore Default"
 msgstr "Voreinstellung _wiederherstellen"
 
-#: ../mail/e-mail-account-manager.c:473
+#: ../mail/e-mail-account-manager.c:703
 msgid "You can drag and drop account names to reorder them."
 msgstr "Sie können Kontonamen durch Ziehen-und-Ablegen neu anordnen."
 
-#: ../mail/e-mail-account-manager.c:518
+#: ../mail/e-mail-account-manager.c:746
 msgid "De_fault"
 msgstr "_Vorgabe"
 
 #: ../mail/e-mail-account-tree-view.c:85
-#: ../modules/mail/em-composer-prefs.c:488
+#: ../modules/mail/em-composer-prefs.c:443
 #: ../modules/plugin-manager/evolution-plugin-manager.c:359
 #: ../plugins/publish-calendar/publish-calendar.c:876
 msgid "Enabled"
@@ -12261,29 +12288,29 @@ msgstr "Kontoname"
 
 #: ../mail/e-mail-account-tree-view.c:136
 #: ../mail/e-mail-config-security-page.c:333
-#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3707
-#: ../mail/mail-config.ui.h:44
+#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3652
+#: ../mail/mail-config.ui.h:49
 msgid "Default"
 msgstr "Vorgabe"
 
-#: ../mail/e-mail-autoconfig.c:525
+#: ../mail/e-mail-autoconfig.c:563
 msgid "No email address provided"
 msgstr "Keine E-Mail-Adresse angegeben"
 
-#: ../mail/e-mail-autoconfig.c:534
+#: ../mail/e-mail-autoconfig.c:572
 msgid "Missing domain in email address"
 msgstr "Domain in E-Mail-Adresse fehlt"
 
-#: ../mail/e-mail-backend.c:754
+#: ../mail/e-mail-backend.c:751
 msgid "Unknown background operation"
 msgstr "Unbekannter Vorgang im Hintergrund"
 
-#: ../mail/e-mail-browser.c:123 ../shell/e-shell-window-actions.c:848
-#: ../shell/e-shell-window-actions.c:855 ../shell/e-shell-window-actions.c:862
+#: ../mail/e-mail-browser.c:129 ../shell/e-shell-window-actions.c:842
+#: ../shell/e-shell-window-actions.c:849 ../shell/e-shell-window-actions.c:856
 msgid "Close this window"
 msgstr "Dieses Fenster schließen"
 
-#: ../mail/e-mail-browser.c:280
+#: ../mail/e-mail-browser.c:286
 msgid "(No Subject)"
 msgstr "(Kein Betreff)"
 
@@ -12482,7 +12509,8 @@ msgid "Receiving Email"
 msgstr "Abrufen von E-Mails"
 
 #: ../mail/e-mail-config-security-page.c:260
-#: ../mail/em-folder-properties.c:260 ../mail/mail-config.ui.h:19
+#: ../mail/em-folder-properties.c:260 ../mail/mail-config.ui.h:24
+#: ../modules/addressbook/autocompletion-config.c:114
 #: ../modules/calendar/e-calendar-preferences.ui.h:47
 #: ../modules/itip-formatter/plugin/config-ui.c:91
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
@@ -12507,22 +12535,22 @@ msgid "Si_gning algorithm:"
 msgstr "Si_gnaturalgorithmus:"
 
 #: ../mail/e-mail-config-security-page.c:336
-#: ../mail/e-mail-config-security-page.c:475 ../mail/mail-config.ui.h:45
+#: ../mail/e-mail-config-security-page.c:475 ../mail/mail-config.ui.h:50
 msgid "SHA1"
 msgstr "SHA1"
 
 #: ../mail/e-mail-config-security-page.c:339
-#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:46
+#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:51
 msgid "SHA256"
 msgstr "SHA256"
 
 #: ../mail/e-mail-config-security-page.c:342
-#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:47
+#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:52
 msgid "SHA384"
 msgstr "SHA384"
 
 #: ../mail/e-mail-config-security-page.c:345
-#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:48
+#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:53
 msgid "SHA512"
 msgstr "SHA512"
 
@@ -12657,35 +12685,35 @@ msgstr "Willkommen"
 msgid "Account Editor"
 msgstr "Konteneditor"
 
-#: ../mail/e-mail-display.c:113
+#: ../mail/e-mail-display.c:105
 msgid "_Add to Address Book..."
 msgstr "Zum Adressbuch _hinzufügen …"
 
-#: ../mail/e-mail-display.c:120
+#: ../mail/e-mail-display.c:112
 msgid "_To This Address"
 msgstr "_Zu dieser Adresse"
 
-#: ../mail/e-mail-display.c:127
+#: ../mail/e-mail-display.c:119
 msgid "_From This Address"
 msgstr "_Von dieser Adresse"
 
-#: ../mail/e-mail-display.c:134
+#: ../mail/e-mail-display.c:126
 msgid "Send _Reply To..."
 msgstr "Anwo_rt senden an …"
 
-#: ../mail/e-mail-display.c:136
+#: ../mail/e-mail-display.c:128
 msgid "Send a reply message to this address"
 msgstr "Eine Antwort an diese Adresse senden"
 
-#: ../mail/e-mail-display.c:143
+#: ../mail/e-mail-display.c:135
 msgid "Create Search _Folder"
 msgstr "_Suchordner anlegen"
 
-#: ../mail/e-mail-display.c:153
+#: ../mail/e-mail-display.c:145
 msgid "Save _Image..."
 msgstr "Bild spe_ichern …"
 
-#: ../mail/e-mail-display.c:155
+#: ../mail/e-mail-display.c:147
 msgid "Save the image to a file"
 msgstr "Das Bild in einer Datei speichern"
 
@@ -12724,7 +12752,7 @@ msgid "_Later"
 msgstr "S_päter"
 
 #: ../mail/e-mail-label-manager.c:170
-#: ../modules/mail/e-mail-shell-view-actions.c:771
+#: ../modules/mail/e-mail-shell-view-actions.c:1044
 msgid "Add Label"
 msgstr "Beschriftung hinzufügen"
 
@@ -12744,669 +12772,646 @@ msgstr ""
 msgid "Color"
 msgstr "Farbe"
 
-#: ../mail/e-mail-notebook-view.c:269
-msgid "Please select a folder"
-msgstr "Bitte wählen Sie einen Ordner"
+#: ../mail/e-mail-print-config-headers.c:479
+msgid "Move selection to top"
+msgstr "Auswahl nach oben verschieben"
 
-#: ../mail/e-mail-printer.c:123
-#, c-format
-msgid "Page %d of %d"
-msgstr "Seite %d von %d"
+#: ../mail/e-mail-print-config-headers.c:493
+msgid "Move selection up one row"
+msgstr "Auswahl eine Zeile nach oben verschieben"
 
-#: ../mail/e-mail-printer.c:573
-#: ../modules/calendar/e-cal-shell-view-actions.c:216
-#: ../modules/calendar/e-cal-shell-view-actions.c:245
-msgid "Print"
-msgstr "Drucken"
+#: ../mail/e-mail-print-config-headers.c:507
+msgid "Move selection down one row"
+msgstr "Auswahl eine Zeile nach unten verschieben"
+
+#: ../mail/e-mail-print-config-headers.c:521
+msgid "Move selection to bottom"
+msgstr "Auswahl nach unten verschieben"
+
+#: ../mail/e-mail-print-config-headers.c:535
+msgid "Select all headers"
+msgstr "Alle Kopfzeilen auswählen"
 
-#: ../mail/e-mail-printer.c:579
+#: ../mail/e-mail-print-config-headers.c:549
+msgid "Unselect all headers"
+msgstr "Alle Kopfzeilen abwählen"
+
+#: ../mail/e-mail-print-config-headers.c:570
 msgid "Header Name"
 msgstr "Name der Kopfzeile"
 
-#: ../mail/e-mail-printer.c:585
+#: ../mail/e-mail-print-config-headers.c:579
 msgid "Header Value"
 msgstr "Kopfzeilenwert"
 
-#: ../mail/e-mail-printer.c:639 ../mail/mail-config.ui.h:102
+#: ../mail/e-mail-printer.c:125 ../mail/mail-config.ui.h:101
 msgid "Headers"
 msgstr "Kopfzeilen"
 
-#: ../mail/e-mail-reader.c:370
+#: ../mail/e-mail-printer.c:167
+#, c-format
+msgid "Page %d of %d"
+msgstr "Seite %d von %d"
+
+#: ../mail/e-mail-reader.c:377
 msgid "Save Image"
 msgstr "Bild speichern"
 
-#: ../mail/e-mail-reader.c:452 ../mail/em-filter-i18n.h:12
+#: ../mail/e-mail-reader.c:468 ../mail/em-filter-i18n.h:12
 msgid "Copy to Folder"
 msgstr "In Ordner kopieren"
 
-#: ../mail/e-mail-reader.c:452 ../mail/em-folder-utils.c:489
+#: ../mail/e-mail-reader.c:468 ../mail/em-folder-utils.c:489
 msgid "C_opy"
 msgstr "K_opieren"
 
-#: ../mail/e-mail-reader.c:986 ../mail/em-filter-i18n.h:54
+#: ../mail/e-mail-reader.c:968 ../mail/em-filter-i18n.h:54
 msgid "Move to Folder"
 msgstr "In Ordner verschieben"
 
-#: ../mail/e-mail-reader.c:986 ../mail/em-folder-utils.c:489
+#: ../mail/e-mail-reader.c:968 ../mail/em-folder-utils.c:489
 msgid "_Move"
 msgstr "_Verschieben"
 
-#: ../mail/e-mail-reader.c:1334 ../mail/e-mail-reader.c:1534
-#: ../mail/e-mail-reader.c:1574
+#: ../mail/e-mail-reader.c:1294 ../mail/e-mail-reader.c:1504
+#: ../mail/e-mail-reader.c:1544
 msgid "_Do not ask me again."
 msgstr "_Nicht mehr nachfragen."
 
-#: ../mail/e-mail-reader.c:1580
+#: ../mail/e-mail-reader.c:1550
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "»_Antwort an« bei Mailinglisten immer ignorieren"
 
-#: ../mail/e-mail-reader.c:1775
+#: ../mail/e-mail-reader.c:1752
 msgid "Failed to retrieve message:"
 msgstr "Abrufen der Nachricht schlug fehl:"
 
-#: ../mail/e-mail-reader.c:1821 ../mail/e-mail-reader.c:2914
+#: ../mail/e-mail-reader.c:1792 ../mail/e-mail-reader.c:2894
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Nachricht »%s« wird abgerufen"
 
-#: ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:1980
 msgid "A_dd Sender to Address Book"
 msgstr "A_bsender zum Adressbuch hinzufügen"
 
-#: ../mail/e-mail-reader.c:2000
+#: ../mail/e-mail-reader.c:1982
 msgid "Add sender to address book"
 msgstr "Absender zum Adressbuch hinzufügen"
 
-#: ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:1987
 msgid "Check for _Junk"
 msgstr "Über_prüfung auf unerwünschte Nachrichten"
 
-#: ../mail/e-mail-reader.c:2007
+#: ../mail/e-mail-reader.c:1989
 msgid "Filter the selected messages for junk status"
 msgstr "Die gewählten Nachrichten auf den Status »Unerwünscht« filtern"
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:1994
 msgid "_Copy to Folder..."
 msgstr "In Ordner _kopieren …"
 
-#: ../mail/e-mail-reader.c:2014
+#: ../mail/e-mail-reader.c:1996
 msgid "Copy selected messages to another folder"
 msgstr "Die gewählten Nachrichten in einen anderen Ordner kopieren"
 
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:2001
 msgid "_Delete Message"
 msgstr "Nachricht _löschen"
 
-#: ../mail/e-mail-reader.c:2021
+#: ../mail/e-mail-reader.c:2003
 msgid "Mark the selected messages for deletion"
 msgstr "Die gewählten Nachrichten zum Löschen markieren"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:2008
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "Filterregel über Mailing_liste erstellen …"
 
-#: ../mail/e-mail-reader.c:2028
+#: ../mail/e-mail-reader.c:2010
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Eine Regel anlegen, um Nachrichten an diese Mailingliste zu filtern"
 
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:2015
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "Filterregel über _Empfänger erstellen …"
 
-#: ../mail/e-mail-reader.c:2035
+#: ../mail/e-mail-reader.c:2017
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Eine Regel anlegen, um Nachrichten an diese Empfänger zu filtern"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:2022
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "Filterregel über _Absender erstellen …"
 
-#: ../mail/e-mail-reader.c:2042
+#: ../mail/e-mail-reader.c:2024
 msgid "Create a rule to filter messages from this sender"
 msgstr "Eine Regel anlegen, um Nachrichten von diesem Absender zu filtern"
 
-#: ../mail/e-mail-reader.c:2047
+#: ../mail/e-mail-reader.c:2029
 msgid "Create a Filter Rule for _Subject..."
 msgstr "Filterregel über _Betreff erstellen …"
 
-#: ../mail/e-mail-reader.c:2049
+#: ../mail/e-mail-reader.c:2031
 msgid "Create a rule to filter messages with this subject"
 msgstr "Eine Regel anlegen, um Nachrichten mit diesem Betreff zu filtern"
 
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:2036
 msgid "A_pply Filters"
 msgstr "Filter an_wenden"
 
-#: ../mail/e-mail-reader.c:2056
+#: ../mail/e-mail-reader.c:2038
 msgid "Apply filter rules to the selected messages"
 msgstr "Filterregeln auf die gewählten Nachrichten anwenden"
 
-#: ../mail/e-mail-reader.c:2061
+#: ../mail/e-mail-reader.c:2043
 msgid "_Find in Message..."
 msgstr "In Nachricht _suchen …"
 
-#: ../mail/e-mail-reader.c:2063
+#: ../mail/e-mail-reader.c:2045
 msgid "Search for text in the body of the displayed message"
 msgstr "Im Rumpf der angezeigten Nachricht nach Text suchen"
 
-#: ../mail/e-mail-reader.c:2068
+#: ../mail/e-mail-reader.c:2050
 msgid "_Clear Flag"
 msgstr "Markierung _löschen"
 
-#: ../mail/e-mail-reader.c:2070
+#: ../mail/e-mail-reader.c:2052
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Die Folgemarkierung aus den gewählten Nachrichten entfernen"
 
-#: ../mail/e-mail-reader.c:2075
+#: ../mail/e-mail-reader.c:2057
 msgid "_Flag Completed"
 msgstr "Als abgeschlossen _markieren"
 
-#: ../mail/e-mail-reader.c:2077
+#: ../mail/e-mail-reader.c:2059
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr ""
 "Für die gewählten Nachrichten die Folgenachricht-Markierung auf "
 "»vollständig« setzen"
 
-#: ../mail/e-mail-reader.c:2082
+#: ../mail/e-mail-reader.c:2064
 msgid "Follow _Up..."
 msgstr "_Folgenachricht …"
 
-#: ../mail/e-mail-reader.c:2084
+#: ../mail/e-mail-reader.c:2066
 msgid "Flag the selected messages for follow-up"
 msgstr "Die gewählten Nachrichten zur Nachverfolgung markieren"
 
-#: ../mail/e-mail-reader.c:2089
+#: ../mail/e-mail-reader.c:2071
 msgid "_Attached"
 msgstr "_Anhang"
 
-#: ../mail/e-mail-reader.c:2091 ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2073 ../mail/e-mail-reader.c:2080
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Die gewählte Nachricht an jemanden als Anlage weiterleiten"
 
-#: ../mail/e-mail-reader.c:2096
+#: ../mail/e-mail-reader.c:2078
 msgid "Forward As _Attached"
 msgstr "Als _Anhang weiterleiten"
 
-#: ../mail/e-mail-reader.c:2103
+#: ../mail/e-mail-reader.c:2085
 msgid "_Inline"
 msgstr "_Eingebettet"
 
-#: ../mail/e-mail-reader.c:2105 ../mail/e-mail-reader.c:2112
+#: ../mail/e-mail-reader.c:2087 ../mail/e-mail-reader.c:2094
 msgid "Forward the selected message in the body of a new message"
 msgstr "Die gewählte Nachricht im Rumpf einer neuen Nachricht weiterleiten"
 
-#: ../mail/e-mail-reader.c:2110
+#: ../mail/e-mail-reader.c:2092
 msgid "Forward As _Inline"
 msgstr "_Eingebettet weiterleiten"
 
-#: ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2099
 msgid "_Quoted"
 msgstr "_Zitiert"
 
-#: ../mail/e-mail-reader.c:2119 ../mail/e-mail-reader.c:2126
+#: ../mail/e-mail-reader.c:2101 ../mail/e-mail-reader.c:2108
 msgid "Forward the selected message quoted like a reply"
 msgstr "Die gewählte Nachricht als Zitat wie in einer Antwort weiterleiten"
 
-#: ../mail/e-mail-reader.c:2124
+#: ../mail/e-mail-reader.c:2106
 msgid "Forward As _Quoted"
 msgstr "_Zitiert weiterleiten"
 
-#: ../mail/e-mail-reader.c:2131
+#: ../mail/e-mail-reader.c:2113
 msgid "_Load Images"
 msgstr "_Bilder laden"
 
-#: ../mail/e-mail-reader.c:2133
+#: ../mail/e-mail-reader.c:2115
 msgid "Force images in HTML mail to be loaded"
 msgstr "Laden von Bildern in HTML-E-Mail erzwingen"
 
-#: ../mail/e-mail-reader.c:2138
+#: ../mail/e-mail-reader.c:2120
 msgid "_Important"
 msgstr "_Wichtig"
 
-#: ../mail/e-mail-reader.c:2140
+#: ../mail/e-mail-reader.c:2122
 msgid "Mark the selected messages as important"
 msgstr "Die gewählten Nachrichten als wichtig markieren"
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2127
 msgid "_Junk"
 msgstr "Unerwü_nscht"
 
-#: ../mail/e-mail-reader.c:2147
+#: ../mail/e-mail-reader.c:2129
 msgid "Mark the selected messages as junk"
 msgstr "Die gewählten Nachrichten als unerwünscht markieren"
 
-#: ../mail/e-mail-reader.c:2152
+#: ../mail/e-mail-reader.c:2134
 msgid "_Not Junk"
 msgstr "E_rwünscht"
 
-#: ../mail/e-mail-reader.c:2154
+#: ../mail/e-mail-reader.c:2136
 msgid "Mark the selected messages as not being junk"
 msgstr "Die gewählten Nachrichten als nicht unerwünscht markieren"
 
-#: ../mail/e-mail-reader.c:2159
+#: ../mail/e-mail-reader.c:2141
 msgid "_Read"
 msgstr "Ge_lesen"
 
-#: ../mail/e-mail-reader.c:2161
+#: ../mail/e-mail-reader.c:2143
 msgid "Mark the selected messages as having been read"
 msgstr "Die gewählten Nachrichten als gelesen markieren"
 
-#: ../mail/e-mail-reader.c:2166
+#: ../mail/e-mail-reader.c:2148
 msgid "Uni_mportant"
 msgstr "_Unwichtig"
 
-#: ../mail/e-mail-reader.c:2168
+#: ../mail/e-mail-reader.c:2150
 msgid "Mark the selected messages as unimportant"
 msgstr "Die gewählten Nachrichten als unwichtig markieren"
 
-#: ../mail/e-mail-reader.c:2173
+#: ../mail/e-mail-reader.c:2155
 msgid "_Unread"
 msgstr "_Ungelesen"
 
-#: ../mail/e-mail-reader.c:2175
+#: ../mail/e-mail-reader.c:2157
 msgid "Mark the selected messages as not having been read"
 msgstr "Die gewählten Nachrichten als ungelesen markieren"
 
-#: ../mail/e-mail-reader.c:2180
+#: ../mail/e-mail-reader.c:2162
 msgid "_Edit as New Message..."
 msgstr "Als neue _Nachricht bearbeiten …"
 
-#: ../mail/e-mail-reader.c:2182
+#: ../mail/e-mail-reader.c:2164
 msgid "Open the selected messages in the composer for editing"
 msgstr "Die gewählten Nachrichten zum Bearbeiten im Editor öffnen"
 
-#: ../mail/e-mail-reader.c:2187
+#: ../mail/e-mail-reader.c:2169
 msgid "Compose _New Message"
 msgstr "_Nachricht verfassen"
 
-#: ../mail/e-mail-reader.c:2189
+#: ../mail/e-mail-reader.c:2171
 msgid "Open a window for composing a mail message"
 msgstr "Ein Fenster zum Verfassen einer E-Mail-Nachricht öffnen"
 
-#: ../mail/e-mail-reader.c:2194
+#: ../mail/e-mail-reader.c:2176
 msgid "_Open in New Window"
 msgstr "In neuem _Fenster öffnen"
 
-#: ../mail/e-mail-reader.c:2196
+#: ../mail/e-mail-reader.c:2178
 msgid "Open the selected messages in a new window"
 msgstr "Die gewählten Nachrichten in einem neuen Fenster öffnen"
 
-#: ../mail/e-mail-reader.c:2201
+#: ../mail/e-mail-reader.c:2183
 msgid "_Move to Folder..."
 msgstr "In Ordner _verschieben …"
 
-#: ../mail/e-mail-reader.c:2203
+#: ../mail/e-mail-reader.c:2185
 msgid "Move selected messages to another folder"
 msgstr "Die gewählten Nachrichten in einen anderen Ordner verschieben"
 
-#: ../mail/e-mail-reader.c:2208
-msgid "_Switch to Folder"
-msgstr "Zu Ordner _wechseln"
-
-#: ../mail/e-mail-reader.c:2210
-msgid "Display the parent folder"
-msgstr "Den Elternordner anzeigen"
-
-#: ../mail/e-mail-reader.c:2215
-msgid "Switch to _next tab"
-msgstr "Zum _nächsten Reiter wechseln"
-
-#: ../mail/e-mail-reader.c:2217
-msgid "Switch to the next tab"
-msgstr "Zum nächsten Reiter wechseln"
-
-#: ../mail/e-mail-reader.c:2222
-msgid "Switch to _previous tab"
-msgstr "Zum _vorherigen Reiter wechseln"
-
-#: ../mail/e-mail-reader.c:2224
-msgid "Switch to the previous tab"
-msgstr "Zum vorherigen Reiter wechseln"
-
-#: ../mail/e-mail-reader.c:2229
-msgid "Cl_ose current tab"
-msgstr "Den momentan geöffneten Reiter _schließen"
-
-#: ../mail/e-mail-reader.c:2231
-msgid "Close current tab"
-msgstr "Den momentan geöffneten Reiter schließen"
-
-#: ../mail/e-mail-reader.c:2236
+#: ../mail/e-mail-reader.c:2190
 msgid "_Next Message"
 msgstr "_Nächste Nachricht"
 
-#: ../mail/e-mail-reader.c:2238
+#: ../mail/e-mail-reader.c:2192
 msgid "Display the next message"
 msgstr "Die nächste Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:2243
+#: ../mail/e-mail-reader.c:2197
 msgid "Next _Important Message"
 msgstr "Nächste _wichtige Nachricht"
 
-#: ../mail/e-mail-reader.c:2245
+#: ../mail/e-mail-reader.c:2199
 msgid "Display the next important message"
 msgstr "Die nächste wichtige Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:2250
+#: ../mail/e-mail-reader.c:2204
 msgid "Next _Thread"
 msgstr "Nächster _Thread"
 
-#: ../mail/e-mail-reader.c:2252
+#: ../mail/e-mail-reader.c:2206
 msgid "Display the next thread"
 msgstr "Nächsten Thread anzeigen"
 
-#: ../mail/e-mail-reader.c:2257
+#: ../mail/e-mail-reader.c:2211
 msgid "Next _Unread Message"
 msgstr "Nächste _ungelesene Nachricht"
 
-#: ../mail/e-mail-reader.c:2259
+#: ../mail/e-mail-reader.c:2213
 msgid "Display the next unread message"
 msgstr "Die nächste ungelesene Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:2264
+#: ../mail/e-mail-reader.c:2218
 msgid "_Previous Message"
 msgstr "_Vorherige Nachricht"
 
-#: ../mail/e-mail-reader.c:2266
+#: ../mail/e-mail-reader.c:2220
 msgid "Display the previous message"
 msgstr "Die vorhergehende Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:2271
+#: ../mail/e-mail-reader.c:2225
 msgid "Pr_evious Important Message"
 msgstr "V_orherige wichtige Nachricht"
 
-#: ../mail/e-mail-reader.c:2273
+#: ../mail/e-mail-reader.c:2227
 msgid "Display the previous important message"
 msgstr "Die vorhergehende wichtige Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:2278
+#: ../mail/e-mail-reader.c:2232
 msgid "Previous T_hread"
 msgstr "Vo_rheriger Thread"
 
-#: ../mail/e-mail-reader.c:2280
+#: ../mail/e-mail-reader.c:2234
 msgid "Display the previous thread"
 msgstr "Den vorhergehenden Thread anzeigen"
 
-#: ../mail/e-mail-reader.c:2285
+#: ../mail/e-mail-reader.c:2239
 msgid "P_revious Unread Message"
 msgstr "_Vorherige ungelesene Nachricht"
 
-#: ../mail/e-mail-reader.c:2287
+#: ../mail/e-mail-reader.c:2241
 msgid "Display the previous unread message"
 msgstr "Die vorhergehende ungelesene Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:2294
+#: ../mail/e-mail-reader.c:2248
 msgid "Print this message"
 msgstr "Diese Nachricht drucken"
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2255
 msgid "Preview the message to be printed"
 msgstr "Eine Vorschau auf die zu druckende Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:2306
+#: ../mail/e-mail-reader.c:2260
 msgid "Re_direct"
 msgstr "_Umleiten"
 
-#: ../mail/e-mail-reader.c:2308
+#: ../mail/e-mail-reader.c:2262
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Die gewählte Nachricht an jemanden umleiten"
 
-#: ../mail/e-mail-reader.c:2313
+#: ../mail/e-mail-reader.c:2267
 msgid "Remo_ve Attachments"
 msgstr "Anlagen _löschen"
 
-#: ../mail/e-mail-reader.c:2315
+#: ../mail/e-mail-reader.c:2269
 msgid "Remove attachments"
 msgstr "Anlagen löschen"
 
-#: ../mail/e-mail-reader.c:2320
+#: ../mail/e-mail-reader.c:2274
 msgid "Remove Du_plicate Messages"
 msgstr "Do_ppelte Nachrichten löschen"
 
-#: ../mail/e-mail-reader.c:2322
+#: ../mail/e-mail-reader.c:2276
 msgid "Checks selected messages for duplicates"
 msgstr "Die gewählten Nachrichten auf Duplikate überprüfen"
 
-#: ../mail/e-mail-reader.c:2327 ../mail/mail.error.xml.h:27
-#: ../modules/calendar/e-cal-shell-view-actions.c:1571
-#: ../modules/mail/e-mail-attachment-handler.c:196
+#: ../mail/e-mail-reader.c:2281 ../mail/mail.error.xml.h:27
+#: ../modules/calendar/e-cal-shell-view-actions.c:1568
+#: ../modules/mail/e-mail-attachment-handler.c:214
 msgid "Reply to _All"
 msgstr "Antw_ort an alle"
 
-#: ../mail/e-mail-reader.c:2329
+#: ../mail/e-mail-reader.c:2283
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Eine Antwort an alle Empfänger der gewählten Nachricht verfassen"
 
-#: ../mail/e-mail-reader.c:2334 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2288 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "Antwort an Lis_te"
 
-#: ../mail/e-mail-reader.c:2336
+#: ../mail/e-mail-reader.c:2290
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Eine Antwort an die Mailingliste der gewählten Nachricht verfassen"
 
-#: ../mail/e-mail-reader.c:2341
-#: ../modules/mail/e-mail-attachment-handler.c:203
+#: ../mail/e-mail-reader.c:2295
+#: ../modules/mail/e-mail-attachment-handler.c:221
 msgid "_Reply to Sender"
 msgstr "_Antwort an Absender"
 
-#: ../mail/e-mail-reader.c:2343
+#: ../mail/e-mail-reader.c:2297
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Eine Antwort an den Absender der gewählten Nachricht verfassen"
 
-#: ../mail/e-mail-reader.c:2348
+#: ../mail/e-mail-reader.c:2302
 msgid "_Save as mbox..."
 msgstr "_Speichern als mbox …"
 
-#: ../mail/e-mail-reader.c:2350
+#: ../mail/e-mail-reader.c:2304
 msgid "Save selected messages as an mbox file"
 msgstr "Die gewählten Nachrichten als mbox-Datei speichern"
 
-#: ../mail/e-mail-reader.c:2355
+#: ../mail/e-mail-reader.c:2309
 msgid "_Message Source"
 msgstr "Nachrichten-_Quelltext"
 
-#: ../mail/e-mail-reader.c:2357
+#: ../mail/e-mail-reader.c:2311
 msgid "Show the raw email source of the message"
 msgstr "Den zugrunde liegenden E-Mail-Quelltext dieser Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:2369
+#: ../mail/e-mail-reader.c:2323
 msgid "_Undelete Message"
 msgstr "Löschen der Nachricht _rückgängig"
 
-#: ../mail/e-mail-reader.c:2371
+#: ../mail/e-mail-reader.c:2325
 msgid "Undelete the selected messages"
 msgstr "Löschen der gewählten Nachrichten rückgängig machen"
 
-#: ../mail/e-mail-reader.c:2376
+#: ../mail/e-mail-reader.c:2330
 msgid "_Normal Size"
 msgstr "_Normale Größe"
 
-#: ../mail/e-mail-reader.c:2378
+#: ../mail/e-mail-reader.c:2332
 msgid "Reset the text to its original size"
 msgstr "Den Text auf seine Originalgröße zurücksetzen"
 
-#: ../mail/e-mail-reader.c:2383
+#: ../mail/e-mail-reader.c:2337
 msgid "_Zoom In"
 msgstr "Ansicht ver_größern"
 
-#: ../mail/e-mail-reader.c:2385
+#: ../mail/e-mail-reader.c:2339
 msgid "Increase the text size"
 msgstr "Die Textgröße heraufsetzen"
 
-#: ../mail/e-mail-reader.c:2390
+#: ../mail/e-mail-reader.c:2344
 msgid "Zoom _Out"
 msgstr "Ansicht ver_kleinern"
 
-#: ../mail/e-mail-reader.c:2392
+#: ../mail/e-mail-reader.c:2346
 msgid "Decrease the text size"
 msgstr "Die Textgröße heruntersetzen"
 
-#: ../mail/e-mail-reader.c:2399
+#: ../mail/e-mail-reader.c:2353
 msgid "Cre_ate"
 msgstr "_Erstellen"
 
-#: ../mail/e-mail-reader.c:2406
+#: ../mail/e-mail-reader.c:2360
 msgid "Ch_aracter Encoding"
 msgstr "Zeichenko_dierung"
 
-#: ../mail/e-mail-reader.c:2413
+#: ../mail/e-mail-reader.c:2367
 msgid "F_orward As"
 msgstr "_Weiterleiten als …"
 
-#: ../mail/e-mail-reader.c:2420
+#: ../mail/e-mail-reader.c:2374
 msgid "_Group Reply"
 msgstr "Antwort an _Gruppe"
 
-#: ../mail/e-mail-reader.c:2427
+#: ../mail/e-mail-reader.c:2381
 msgid "_Go To"
 msgstr "_Gehe zu"
 
-#: ../mail/e-mail-reader.c:2434
+#: ../mail/e-mail-reader.c:2388
 msgid "Mar_k As"
 msgstr "Mar_kieren als"
 
-#: ../mail/e-mail-reader.c:2441
+#: ../mail/e-mail-reader.c:2395
 msgid "_Message"
 msgstr "_Nachricht"
 
-#: ../mail/e-mail-reader.c:2448
+#: ../mail/e-mail-reader.c:2402
 msgid "_Zoom"
 msgstr "Ansicht ver_größern"
 
-#: ../mail/e-mail-reader.c:2458
+#: ../mail/e-mail-reader.c:2412
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "Einen Suchordner für diese Mailing_liste anlegen …"
 
-#: ../mail/e-mail-reader.c:2460
+#: ../mail/e-mail-reader.c:2414
 msgid "Create a search folder for this mailing list"
 msgstr "Einen Suchordner für diese Mailingliste anlegen"
 
-#: ../mail/e-mail-reader.c:2465
+#: ../mail/e-mail-reader.c:2419
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "Einen Suchordner über _Empfänger anlegen …"
 
-#: ../mail/e-mail-reader.c:2467
+#: ../mail/e-mail-reader.c:2421
 msgid "Create a search folder for these recipients"
 msgstr "Einen Suchordner für diese Empfänger anlegen"
 
-#: ../mail/e-mail-reader.c:2472
+#: ../mail/e-mail-reader.c:2426
 msgid "Create a Search Folder from Sen_der..."
 msgstr "Einen Suchordner über _Absender anlegen …"
 
-#: ../mail/e-mail-reader.c:2474
+#: ../mail/e-mail-reader.c:2428
 msgid "Create a search folder for this sender"
 msgstr "Einen Suchordner für diesen Absender anlegen"
 
-#: ../mail/e-mail-reader.c:2479
+#: ../mail/e-mail-reader.c:2433
 msgid "Create a Search Folder from S_ubject..."
 msgstr "Einen Suchordner über _Betreff anlegen …"
 
-#: ../mail/e-mail-reader.c:2481
+#: ../mail/e-mail-reader.c:2435
 msgid "Create a search folder for this subject"
 msgstr "Einen Suchordner für diesen Betreff anlegen"
 
-#: ../mail/e-mail-reader.c:2504
+#: ../mail/e-mail-reader.c:2458
 msgid "Mark for Follo_w Up..."
 msgstr "Als _Folgenachricht markieren …"
 
-#: ../mail/e-mail-reader.c:2512
+#: ../mail/e-mail-reader.c:2466
 msgid "Mark as _Important"
 msgstr "Als w_ichtig markieren"
 
-#: ../mail/e-mail-reader.c:2516
+#: ../mail/e-mail-reader.c:2470
 msgid "Mark as _Junk"
 msgstr "Als un_erwünscht markieren"
 
-#: ../mail/e-mail-reader.c:2520
+#: ../mail/e-mail-reader.c:2474
 msgid "Mark as _Not Junk"
 msgstr "Als _nicht unerwünscht markieren"
 
-#: ../mail/e-mail-reader.c:2524
+#: ../mail/e-mail-reader.c:2478
 msgid "Mar_k as Read"
 msgstr "Als _gelesen markieren"
 
-#: ../mail/e-mail-reader.c:2528
+#: ../mail/e-mail-reader.c:2482
 msgid "Mark as Uni_mportant"
 msgstr "Als un_wichtig markieren"
 
-#: ../mail/e-mail-reader.c:2532
+#: ../mail/e-mail-reader.c:2486
 msgid "Mark as _Unread"
 msgstr "Als _ungelesen markieren"
 
-#: ../mail/e-mail-reader.c:2576
+#: ../mail/e-mail-reader.c:2530
 msgid "_Caret Mode"
 msgstr "Cursor-_Modus"
 
-#: ../mail/e-mail-reader.c:2578
+#: ../mail/e-mail-reader.c:2532
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Im Rumpf der angezeigten Nachricht einen blinkenden Cursor anzeigen"
 
-#: ../mail/e-mail-reader.c:2584
+#: ../mail/e-mail-reader.c:2538
 msgid "All Message _Headers"
 msgstr "Alle Nachrichtenk_öpfe"
 
-#: ../mail/e-mail-reader.c:2586
+#: ../mail/e-mail-reader.c:2540
 msgid "Show messages with all email headers"
 msgstr "Nachrichten mit allen E-Mail-Kopfzeilen anzeigen"
 
-#: ../mail/e-mail-reader.c:2920
+#: ../mail/e-mail-reader.c:2900
 msgid "Retrieving message"
 msgstr "Nachricht wird abgerufen"
 
-#: ../mail/e-mail-reader.c:3900
-#: ../modules/mail/e-mail-attachment-handler.c:189
+#: ../mail/e-mail-reader.c:3822
+#: ../modules/mail/e-mail-attachment-handler.c:207
 msgid "_Forward"
 msgstr "_Weiterleiten"
 
-#: ../mail/e-mail-reader.c:3901
+#: ../mail/e-mail-reader.c:3823
 msgid "Forward the selected message to someone"
 msgstr "Die gewählte Nachricht an jemanden weiterleiten"
 
-#: ../mail/e-mail-reader.c:3920
+#: ../mail/e-mail-reader.c:3842
 msgid "Group Reply"
 msgstr "Antwort an Gruppe"
 
-#: ../mail/e-mail-reader.c:3921
+#: ../mail/e-mail-reader.c:3843
 msgid "Reply to the mailing list, or to all recipients"
 msgstr ""
 "Eine Antwort an die Mailingliste oder an alle Empfänger der gewählten "
 "Nachricht verfassen"
 
-#: ../mail/e-mail-reader.c:3987 ../mail/em-filter-i18n.h:15
+#: ../mail/e-mail-reader.c:3909 ../mail/em-filter-i18n.h:15
 msgid "Delete"
 msgstr "Löschen"
 
-#: ../mail/e-mail-reader.c:4020
-#: ../modules/calendar/e-cal-shell-view-actions.c:1396
+#: ../mail/e-mail-reader.c:3921
+#: ../modules/calendar/e-cal-shell-view-actions.c:1393
 msgid "Next"
 msgstr "Weiter"
 
-#: ../mail/e-mail-reader.c:4024
-#: ../modules/calendar/e-cal-shell-view-actions.c:1389
+#: ../mail/e-mail-reader.c:3925
+#: ../modules/calendar/e-cal-shell-view-actions.c:1386
 msgid "Previous"
 msgstr "Vorherige"
 
-#: ../mail/e-mail-reader.c:4033 ../mail/mail-dialogs.ui.h:15
+#: ../mail/e-mail-reader.c:3934 ../mail/mail-dialogs.ui.h:15
 msgid "Reply"
 msgstr "Antworten"
 
-#: ../mail/e-mail-reader.c:4751
-#, c-format
-msgid "Folder '%s'"
-msgstr "Ordner »%s«"
-
-#: ../mail/e-mail-reader-utils.c:161
+#: ../mail/e-mail-reader-utils.c:151
 msgid "Do not warn me again"
 msgstr "Nicht mehr nachfragen"
 
-#: ../mail/e-mail-reader-utils.c:962
+#: ../mail/e-mail-reader-utils.c:977
 msgid "Printing"
 msgstr "Drucken"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1149
+#: ../mail/e-mail-reader-utils.c:1212
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -13421,7 +13426,7 @@ msgstr[1] ""
 "Der Ordner »%s« enthält %u doppelte Nachrichten. Sollen diese wirklich "
 "gelöscht werden?"
 
-#: ../mail/e-mail-reader-utils.c:1614
+#: ../mail/e-mail-reader-utils.c:2036
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Nachricht speichern"
@@ -13432,22 +13437,22 @@ msgstr[1] "Nachrichten speichern"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:1635
+#: ../mail/e-mail-reader-utils.c:2057
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Nachricht"
 msgstr[1] "Nachrichten"
 
-#: ../mail/e-mail-reader-utils.c:2085
+#: ../mail/e-mail-reader-utils.c:2426
 msgid "Parsing message"
 msgstr "Nachricht wird verarbeitet"
 
-#: ../mail/e-mail-request.c:181
+#: ../mail/e-mail-request.c:189
 #, c-format
 msgid "Failed to load part '%s'"
 msgstr "Teil »%s« konnte nicht geladen werden"
 
-#: ../mail/e-mail-tag-editor.c:292
+#: ../mail/e-mail-tag-editor.c:238
 msgid "Flag to Follow Up"
 msgstr "Als Folgenachricht markieren"
 
@@ -13455,7 +13460,7 @@ msgstr "Als Folgenachricht markieren"
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1278
+#: ../mail/em-composer-utils.c:1341
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -13463,23 +13468,23 @@ msgstr ""
 "Am ${WeekdayName}, den ${Day}.${Month}.${Year}, ${24Hour}:${Minute} "
 "${TimeZone} schrieb ${Sender}:"
 
-#: ../mail/em-composer-utils.c:1284
+#: ../mail/em-composer-utils.c:1347
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Weitergeleitete Nachricht --------"
 
-#: ../mail/em-composer-utils.c:1289
+#: ../mail/em-composer-utils.c:1352
 msgid "-----Original Message-----"
 msgstr "-------- Weitergeleitete Nachricht --------"
 
-#: ../mail/em-composer-utils.c:2611
+#: ../mail/em-composer-utils.c:2497
 msgid "an unknown sender"
 msgstr "ein unbekannter Absender"
 
-#: ../mail/em-composer-utils.c:3030
+#: ../mail/em-composer-utils.c:2918
 msgid "Posting destination"
 msgstr "Zielordner"
 
-#: ../mail/em-composer-utils.c:3031
+#: ../mail/em-composer-utils.c:2919
 msgid "Choose folders to post the message to."
 msgstr "Wählen Sie Ordner, in denen die Nachricht abgelegt werden soll."
 
@@ -13612,7 +13617,7 @@ msgstr "ist nicht gesetzt"
 msgid "is set"
 msgstr "ist gesetzt"
 
-#: ../mail/em-filter-i18n.h:44 ../mail/mail-config.ui.h:109
+#: ../mail/em-filter-i18n.h:44 ../mail/mail-config.ui.h:108
 msgid "Junk"
 msgstr "Unerwünscht"
 
@@ -13816,12 +13821,12 @@ msgstr "Ordner %s wird verschoben"
 msgid "Copying folder %s"
 msgstr "Ordner %s wird kopiert"
 
-#: ../mail/em-folder-tree.c:2140 ../mail/message-list.c:2283
+#: ../mail/em-folder-tree.c:2140 ../mail/message-list.c:2116
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Nachrichten werden in den Ordner %s verschoben"
 
-#: ../mail/em-folder-tree.c:2144 ../mail/message-list.c:2285
+#: ../mail/em-folder-tree.c:2144 ../mail/message-list.c:2118
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Nachrichten werden in den Ordner %s kopiert"
@@ -13870,8 +13875,8 @@ msgstr "_Gezeigte abonnieren"
 msgid "Subscribe To _All"
 msgstr "_Alle abonnieren"
 
-#: ../mail/em-subscription-editor.c:981 ../mail/em-subscription-editor.c:1842
-#: ../modules/mail/e-mail-shell-view-actions.c:1398
+#: ../mail/em-subscription-editor.c:981 ../mail/em-subscription-editor.c:1836
+#: ../modules/mail/e-mail-shell-view-actions.c:1649
 msgid "_Unsubscribe"
 msgstr "Ab_bestellen"
 
@@ -13887,52 +13892,52 @@ msgstr "_Alle abbestellen"
 msgid "Folder Subscriptions"
 msgstr "Ordnerabonnements"
 
-#: ../mail/em-subscription-editor.c:1717
+#: ../mail/em-subscription-editor.c:1716
 msgid "_Account:"
 msgstr "_Konto:"
 
-#: ../mail/em-subscription-editor.c:1732
+#: ../mail/em-subscription-editor.c:1729
 msgid "Clear Search"
 msgstr "Suchfeld leeren"
 
-#: ../mail/em-subscription-editor.c:1750
+#: ../mail/em-subscription-editor.c:1746
 msgid "Sho_w items that contain:"
 msgstr "Nur Einträge anzeigen, die Folgendes ent_halten:"
 
-#: ../mail/em-subscription-editor.c:1795
+#: ../mail/em-subscription-editor.c:1789
 msgid "Subscribe to the selected folder"
 msgstr "Den gewählten Ordner abonnieren"
 
-#: ../mail/em-subscription-editor.c:1796
+#: ../mail/em-subscription-editor.c:1790
 msgid "Su_bscribe"
 msgstr "A_bonnieren"
 
-#: ../mail/em-subscription-editor.c:1841
-#: ../modules/mail/e-mail-shell-view-actions.c:1400
+#: ../mail/em-subscription-editor.c:1835
+#: ../modules/mail/e-mail-shell-view-actions.c:1651
 msgid "Unsubscribe from the selected folder"
 msgstr "Den gewählten Ordner abbestellen"
 
-#: ../mail/em-subscription-editor.c:1881
+#: ../mail/em-subscription-editor.c:1875
 msgid "Collapse all folders"
 msgstr "Alle Ordner einklappen"
 
-#: ../mail/em-subscription-editor.c:1882
+#: ../mail/em-subscription-editor.c:1876
 msgid "C_ollapse All"
 msgstr "Alle _einklappen"
 
-#: ../mail/em-subscription-editor.c:1892
+#: ../mail/em-subscription-editor.c:1886
 msgid "Expand all folders"
 msgstr "Alle Ordner aufklappen"
 
-#: ../mail/em-subscription-editor.c:1893
+#: ../mail/em-subscription-editor.c:1887
 msgid "E_xpand All"
 msgstr "Alle _aufklappen"
 
-#: ../mail/em-subscription-editor.c:1903
+#: ../mail/em-subscription-editor.c:1897
 msgid "Refresh the folder list"
 msgstr "Die Ordnerliste auffrischen"
 
-#: ../mail/em-subscription-editor.c:1915
+#: ../mail/em-subscription-editor.c:1909
 msgid "Stop the current operation"
 msgstr "Den momentan ausgeführten Vorgang abbrechen"
 
@@ -13941,23 +13946,23 @@ msgstr "Den momentan ausgeführten Vorgang abbrechen"
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:97
+#: ../mail/em-utils.c:86
 #, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "Sind Sie sicher, dass Sie %d Nachricht auf einmal öffnen wollen?"
 msgstr[1] "Sind Sie sicher, dass Sie %d Nachrichten auf einmal öffnen wollen?"
 
-#: ../mail/em-utils.c:153
-#: ../modules/mailto-handler/evolution-mailto-handler.c:154
+#: ../mail/em-utils.c:142
+#: ../modules/mailto-handler/evolution-mailto-handler.c:150
 msgid "_Do not show this message again"
 msgstr "Diese _Meldung nicht mehr anzeigen"
 
-#: ../mail/em-utils.c:305
+#: ../mail/em-utils.c:252
 msgid "Message Filters"
 msgstr "Nachrichtenfilter"
 
-#: ../mail/em-utils.c:1060
+#: ../mail/em-utils.c:976
 #, c-format
 msgid "Messages from %s"
 msgstr "Nachrichten von %s"
@@ -14038,7 +14043,7 @@ msgid "From"
 msgstr "Von"
 
 #: ../mail/importers/evolution-mbox-importer.c:486
-#: ../shell/e-shell-utils.c:193
+#: ../shell/e-shell-utils.c:171
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
@@ -14201,23 +14206,48 @@ msgstr ""
 "Nachrichten digital _signieren, wenn die Originalnachricht signiert ist (PGP "
 "oder S/MIME)"
 
+#: ../mail/mail-config.ui.h:19
+msgctxt "ReplyForward"
+msgid "Attachment"
+msgstr "Anlage"
+
 #: ../mail/mail-config.ui.h:20
+msgctxt "ReplyForward"
+msgid "Inline (Outlook style)"
+msgstr "Eingebettet (Im Stil von Outlook)"
+
+#: ../mail/mail-config.ui.h:21
+msgctxt "ReplyForward"
+msgid "Quoted"
+msgstr "Zitiert"
+
+#: ../mail/mail-config.ui.h:22
+msgctxt "ReplyForward"
+msgid "Do Not Quote"
+msgstr "Nicht zitieren"
+
+#: ../mail/mail-config.ui.h:23
+msgctxt "ReplyForward"
+msgid "Inline"
+msgstr "Eingebettet"
+
+#: ../mail/mail-config.ui.h:25
 msgid "Sig_natures"
 msgstr "Sig_naturen"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:26
 msgid "Signatures"
 msgstr "Signaturen"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:27
 msgid "_Languages"
 msgstr "_Sprachen"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:28
 msgid "Languages Table"
 msgstr "Sprachtabelle"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:29
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -14225,24 +14255,24 @@ msgstr ""
 "Diese Sprachliste enthält ausschließlich die Sprachen, für die ein "
 "Wörterbuch installiert sind."
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:31
 msgid "Check spelling while I _type"
 msgstr "Rechtschreibprüfung während der Ein_gabe durchführen"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:32
 msgid "Color for _misspelled words:"
 msgstr "_Farbe für falsch geschriebene Wörter:"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:33
 #: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "Pick a color"
 msgstr "Eine Farbe auswählen"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:34
 msgid "Spell Checking"
 msgstr "Rechtschreibprüfung"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:35
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
@@ -14251,74 +14281,49 @@ msgstr ""
 "markierten Aktionen um Bestätigung nachfragen:"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:37
 msgid "Sending a message with an _empty subject line"
 msgstr "Nachrichten mit _leerem Betreff senden"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:39
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "Nachricht mit ausschließlich _Blindkopie-Empfängern senden"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:36
+#: ../mail/mail-config.ui.h:41
 msgid "Sending a _private reply to a mailing list message"
 msgstr "_Private Antwort auf eine Listennachricht senden"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:43
 msgid "Sending a reply to a large _number of recipients"
 msgstr "Antwort an zahlreiche Empfänger se_nden"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:45
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr "_Mailinglisten erlauben, private Antworten an die Liste zu leiten"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:47
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr ""
 "Nachricht mit Empfängern senden, die nicht als E-Mail-Ad_resse angegeben "
 "wurden"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:48
 msgid "Confirmations"
 msgstr "Bestätigungen"
 
-#: ../mail/mail-config.ui.h:49 ../smime/gui/smime-ui.ui.h:1
+#: ../mail/mail-config.ui.h:54 ../smime/gui/smime-ui.ui.h:1
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:50 ../smime/gui/smime-ui.ui.h:2
+#: ../mail/mail-config.ui.h:55 ../smime/gui/smime-ui.ui.h:2
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:51
-msgctxt "ReplyForward"
-msgid "Attachment"
-msgstr "Anlage"
-
-#: ../mail/mail-config.ui.h:52
-msgctxt "ReplyForward"
-msgid "Inline (Outlook style)"
-msgstr "Eingebettet (Im Stil von Outlook)"
-
-#: ../mail/mail-config.ui.h:53
-msgctxt "ReplyForward"
-msgid "Quoted"
-msgstr "Zitiert"
-
-#: ../mail/mail-config.ui.h:54
-msgctxt "ReplyForward"
-msgid "Do not quote"
-msgstr "Nicht zitieren"
-
-#: ../mail/mail-config.ui.h:55
-msgctxt "ReplyForward"
-msgid "Inline"
-msgstr "Eingebettet"
-
 #: ../mail/mail-config.ui.h:56
 msgid "Proxy Settings"
 msgstr "Proxy-Einstellungen"
@@ -14485,61 +14490,57 @@ msgid "_Show the photograph of sender in the message preview"
 msgstr "_Foto des Absenders in der Nachrichtenvorschau anzeigen"
 
 #: ../mail/mail-config.ui.h:98
-msgid "S_earch for sender photograph only in local address books"
-msgstr "_Nach Foto des Absenders nur in lokalen Adressbüchern suchen"
-
-#: ../mail/mail-config.ui.h:99
 msgid "Displayed Message Headers"
 msgstr "Angezeigte Nachrichtenköpfe"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:99
 msgid "Mail Headers Table"
 msgstr "E-Mail-Kopf-Tabelle"
 
-#: ../mail/mail-config.ui.h:101
-#: ../modules/addressbook/autocompletion-config.c:86
+#: ../mail/mail-config.ui.h:100
+#: ../modules/addressbook/autocompletion-config.c:117
 #: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "Date/Time Format"
 msgstr "Format von Datum/Zeit"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:102
 msgid "Check incoming _messages for junk"
 msgstr "_Eingehende E-Mail auf Unerwünschtheit prüfen"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:103
 msgid "_Delete junk messages"
 msgstr "Unerwünscht-Ordner beim Beenden _leeren"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:104
 msgid "Check cu_stom headers for junk"
 msgstr "_Benutzerdefinierte Kopfzeilen auf Unerwünschtheit prüfen"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:105
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
 "_Nachrichten nicht als Unerwünscht markieren, wenn Absender im Adressbuch"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:106
 msgid "_Lookup in local address book only"
 msgstr "Nur in _lokalen Adressbüchern suchen"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:107
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 "Einstellung wird ignoriert, falls eine benutzerdefinierte unerwünschte "
 "Kopfzeile gefunden wird."
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:109
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:225
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:159
 msgid "No encryption"
 msgstr "Keine Verschlüsselung"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:110
 msgid "TLS encryption"
 msgstr "TLS-Verschlüsselung"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:111
 msgid "SSL encryption"
 msgstr "SSL-Verschlüsselung"
 
@@ -14839,7 +14840,7 @@ msgstr ""
 "Ordnern entfernen wollen?"
 
 #: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1286
+#: ../modules/mail/e-mail-shell-view-actions.c:1537
 msgid "_Empty Trash"
 msgstr "_Papierkorb leeren"
 
@@ -15241,36 +15242,37 @@ msgid "This will mark all messages as read in the selected folder."
 msgstr "Dies wird alle Nachrichten im gewählten Ordner als gelesen markieren."
 
 #: ../mail/mail.error.xml.h:129
-msgid ""
-"This will mark all messages as read in the selected folder and its "
-"subfolders."
-msgstr ""
-"Dies wird alle Nachrichten im gewählten Ordner und seinen Unterordnern als "
-"gelesen markieren."
+msgid "Also mark messages in subfolders?"
+msgstr "Auch auf Unterordner anwenden?"
 
 #: ../mail/mail.error.xml.h:130
-msgid "Close message window."
-msgstr "Nachrichtenfenster schließen."
+msgid ""
+"Do you want to mark messages as read in the current folder only, or in the "
+"current folder as well as all subfolders?"
+msgstr ""
+"Sollen nur Nachrichten im gewählten Ordner als gelesen markiert werden, oder "
+"auch in seinen Unterordnern?"
 
 #: ../mail/mail.error.xml.h:131
-msgid "Would you like to close the message window?"
-msgstr "Wollen Sie das Nachrichtenfenster schließen?"
+msgid "In Current Folder and _Subfolders"
+msgstr "Im derzeitigen Ordner und in _Unterordnern"
 
 #: ../mail/mail.error.xml.h:132
-msgid "_Yes"
-msgstr "_Ja"
+msgid "In Current _Folder Only"
+msgstr "Nur im _derzeitigen Ordner"
 
 #: ../mail/mail.error.xml.h:133
-msgid "_No"
-msgstr "_Nein"
+msgid "Should Evolution close this window when replying or forwarding?"
+msgstr ""
+"Soll Evolution dieses Fenster beim Antworten oder Weiterleiten schließen:"
 
 #: ../mail/mail.error.xml.h:134
-msgid "_Always"
-msgstr "_Immer"
+msgid "_Yes, Always"
+msgstr "_Ja, Immer"
 
 #: ../mail/mail.error.xml.h:135
-msgid "N_ever"
-msgstr "Ni_e"
+msgid "_No, Never"
+msgstr "_Nein, Nie"
 
 #: ../mail/mail.error.xml.h:136
 msgid "Copy folder in folder tree."
@@ -15281,15 +15283,31 @@ msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
 msgstr "Sind Sie sicher, dass Sie den Ordner »{0}« nach »{1}« kopieren wollen?"
 
 #: ../mail/mail.error.xml.h:138
+msgid "_Yes"
+msgstr "_Ja"
+
+#: ../mail/mail.error.xml.h:139
+msgid "_No"
+msgstr "_Nein"
+
+#: ../mail/mail.error.xml.h:140
+msgid "_Always"
+msgstr "_Immer"
+
+#: ../mail/mail.error.xml.h:141
+msgid "N_ever"
+msgstr "Ni_e"
+
+#: ../mail/mail.error.xml.h:142
 msgid "Move folder in folder tree."
 msgstr "Ordner in Ordnerbaum verschieben."
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:143
 msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
 msgstr ""
 "Sind Sie sicher, dass Sie den Ordner »{0}« nach »{1}« verschieben wollen?"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:144
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -15297,91 +15315,95 @@ msgstr ""
 "Diese Nachricht konnte nicht verschickt werden, da das zum Verschicken "
 "gewählte Konto nicht aktiviert ist"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:145
 msgid "Please enable the account or send using another account."
 msgstr ""
 "Aktivieren Sie bitte das Konto oder verwenden Sie ein anderes Konto zum "
 "Senden."
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:146
 msgid "Mail Deletion Failed"
 msgstr "Löschen der E-Mail gescheitert"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:147
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Sie haben keine ausreichenden Rechte, um diese E-Mail zu löschen."
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:148
 msgid "\"Check Junk\" Failed"
 msgstr "Überprüfung auf Unerwünschtheit gescheitert"
 
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:149
 msgid "\"Report Junk\" Failed"
 msgstr "Bericht über Unerwünschtheit gescheitert"
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:150
 msgid "\"Report Not Junk\" Failed"
 msgstr "Bericht über Erwünschtheit gescheitert"
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:151
 msgid "Remove duplicate messages?"
 msgstr "Sollen die doppelten Nachrichten entfernt werden?"
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:152
 msgid "No duplicate messages found."
 msgstr "Keine doppelten Nachrichten gefunden."
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:154
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "Der Ordner »{0}« enthält keine doppelten Nachrichten."
 
-#: ../mail/mail.error.xml.h:151
+#: ../mail/mail.error.xml.h:155
 msgid "Failed to disconnect account &quot;{0}&quot;."
 msgstr "Verbindung zu Konto »{0}« konnte nicht getrennt werden."
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:157
 msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
 msgstr "Abbestellen des Ordners »{0}« schlug fehl."
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:158
 msgid "Unable to retrieve message."
 msgstr "Nachricht konnte nicht abgerufen werden."
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:159
 msgid "{0}"
 msgstr "{0}"
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:160
 msgid "Failed to open folder."
 msgstr "Ordner konnte nicht geöffnet werden."
 
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:161
 msgid "Failed to find duplicate messages."
 msgstr "Doppelte Nachrichten konnten nicht gefunden werden."
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:162
 msgid "Failed to retrieve messages."
 msgstr "Nachrichten konnten nicht abgerufen werden."
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:163
+msgid "Failed to mark messages as read."
+msgstr "Nachrichten konnten nicht als gelesen markiert werden."
+
+#: ../mail/mail.error.xml.h:164
 msgid "Failed to remove attachments from messages."
 msgstr "Anhänge konnten nicht von Nachrichten entfernt werden."
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:165
 msgid "Failed to download messages for offline viewing."
 msgstr ""
 "Nachrichten konnten nicht für Offline-Benutzung heruntergeladen werden."
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:166
 msgid "Failed to save messages to disk."
 msgstr "Nachrichten konnten nicht auf Festplatte gespeichert werden."
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:167
 msgid "Hidden file is attached."
 msgstr "Eine verborgene Datei wurde beigelegt."
 
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:168
 msgid ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
@@ -15389,19 +15411,19 @@ msgstr ""
 "Die Anlage namens {0} ist eine verborgene Datei und könnte sensible Daten "
 "enthalten. Bitte überprüfen Sie sie vor dem Abschicken."
 
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:169
 msgid "Printing failed."
 msgstr "Drucken ist fehlgeschlagen."
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:170
 msgid "The printer replied &quot;{0}&quot;."
 msgstr "Die Meldung des Druckers war »{0}«."
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:171
 msgid "Could not perform this operation on {0}."
 msgstr "Dieser Vorgang konnte auf {0} nicht ausgeführt werden."
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:172
 msgid "You must be working online to complete this operation."
 msgstr "Sie müssen online sein, damit dieser Vorgang abgeschlossen wird."
 
@@ -15442,87 +15464,86 @@ msgstr "Suchordner bearbeiten"
 msgid "New Search Folder"
 msgstr "Neuer Suchordner"
 
-#: ../mail/message-list.c:1244
+#: ../mail/message-list.c:282
 msgid "Unseen"
 msgstr "Ungelesen"
 
-#: ../mail/message-list.c:1245
+#: ../mail/message-list.c:283
 msgid "Seen"
 msgstr "Gelesen"
 
-#: ../mail/message-list.c:1246
+#: ../mail/message-list.c:284
 msgid "Answered"
 msgstr "Beantwortet"
 
-#: ../mail/message-list.c:1247
+#: ../mail/message-list.c:285
 msgid "Forwarded"
 msgstr "Weitergeleitet"
 
-#: ../mail/message-list.c:1248
+#: ../mail/message-list.c:286
 msgid "Multiple Unseen Messages"
 msgstr "Mehrere ungelesene Nachrichten"
 
-#: ../mail/message-list.c:1249
+#: ../mail/message-list.c:287
 msgid "Multiple Messages"
 msgstr "Mehrere Nachrichten"
 
-#: ../mail/message-list.c:1253
+#: ../mail/message-list.c:300
 msgid "Lowest"
 msgstr "Am niedrigsten"
 
-#: ../mail/message-list.c:1254
+#: ../mail/message-list.c:301
 msgid "Lower"
 msgstr "Niedriger"
 
-#: ../mail/message-list.c:1258
+#: ../mail/message-list.c:305
 msgid "Higher"
 msgstr "Höher"
 
-#: ../mail/message-list.c:1259
+#: ../mail/message-list.c:306
 msgid "Highest"
 msgstr "Am höchsten"
 
+#: ../mail/message-list.c:346 ../mail/message-list.c:5553
+msgid "Generating message list"
+msgstr "Nachrichtenliste wird erzeugt"
+
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1889 ../modules/itip-formatter/itip-view.c:244
+#: ../mail/message-list.c:1701 ../modules/itip-formatter/itip-view.c:244
 msgid "Today %l:%M %p"
 msgstr "Heute %I:%M %p"
 
-#: ../mail/message-list.c:1898
+#: ../mail/message-list.c:1710
 msgid "Yesterday %l:%M %p"
 msgstr "Gestern %l:%M %p"
 
-#: ../mail/message-list.c:1910
+#: ../mail/message-list.c:1722
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: ../mail/message-list.c:1918
+#: ../mail/message-list.c:1730
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b, %k:%M"
 
-#: ../mail/message-list.c:1920
+#: ../mail/message-list.c:1732
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2751
+#: ../mail/message-list.c:2601
 msgid "Select all visible messages"
 msgstr "Alle sichtbaren Nachrichten wählen"
 
-#: ../mail/message-list.c:2889 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3195 ../mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "Nachrichten"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4114
+#: ../mail/message-list.c:4548
 msgid "Follow-up"
 msgstr "Folgenachricht"
 
-#. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4616 ../mail/message-list.c:5020
-msgid "Generating message list"
-msgstr "Nachrichtenliste wird erzeugt"
-
-#: ../mail/message-list.c:4850
+#: ../mail/message-list.c:5425
 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 "
@@ -15535,7 +15556,7 @@ msgstr ""
 "Löschen mit dem Menüeintrag Suche->Löschen oder durch Ändern der Anfrage "
 "oben."
 
-#: ../mail/message-list.c:4855
+#: ../mail/message-list.c:5433
 msgid "There are no messages in this folder."
 msgstr "Es existieren keine Nachrichten in diesem Ordner."
 
@@ -15572,49 +15593,49 @@ msgid "Subject or Addresses contains"
 msgstr "Betreff oder Adresse enthält"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1762
+#: ../modules/mail/e-mail-shell-view-actions.c:2020
 msgid "Recipients contain"
 msgstr "Empfänger enthalten"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1755
+#: ../modules/mail/e-mail-shell-view-actions.c:2013
 msgid "Message contains"
 msgstr "Nachricht enthält"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1776
+#: ../modules/mail/e-mail-shell-view-actions.c:2034
 msgid "Subject contains"
 msgstr "Betreff enthält"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1769
+#: ../modules/mail/e-mail-shell-view-actions.c:2027
 msgid "Sender contains"
 msgstr "Absender enthält"
 
 #: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1748
+#: ../modules/mail/e-mail-shell-view-actions.c:2006
 msgid "Body contains"
 msgstr "Rumpf enthält"
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a 
date in message list
-#: ../modules/addressbook/autocompletion-config.c:92
-#: ../modules/mail/em-mailer-prefs.c:1139
+#: ../modules/addressbook/autocompletion-config.c:123
+#: ../modules/mail/em-mailer-prefs.c:1212
 msgid "_Table column:"
 msgstr "_Tabellenspalte:"
 
-#: ../modules/addressbook/autocompletion-config.c:95
+#: ../modules/addressbook/autocompletion-config.c:126
 msgid "Address formatting"
 msgstr "Adressformatierung"
 
-#: ../modules/addressbook/autocompletion-config.c:98
+#: ../modules/addressbook/autocompletion-config.c:129
 msgid "_Format address according to standard of its destination country"
 msgstr "Adresse anhand der Vorgaben des Ziellandes _formatieren"
 
-#: ../modules/addressbook/autocompletion-config.c:107
+#: ../modules/addressbook/autocompletion-config.c:137
 msgid "Autocompletion"
 msgstr "Auto-Vervollständigung"
 
-#: ../modules/addressbook/autocompletion-config.c:110
+#: ../modules/addressbook/autocompletion-config.c:140
 msgid "Always _show address of the autocompleted contact"
 msgstr "Immer Adresse des automatisch vervollständigten Kontakts an_zeigen"
 
@@ -15638,42 +15659,42 @@ msgstr "Kontaktinformationen"
 msgid "Contact information for %s"
 msgstr "Kontaktinformationen für %s"
 
-#: ../modules/addressbook/e-book-shell-backend.c:260
+#: ../modules/addressbook/e-book-shell-backend.c:259
 #: ../modules/addressbook/e-book-shell-view-actions.c:125
 msgid "New Address Book"
 msgstr "Neues Adressbuch"
 
-#: ../modules/addressbook/e-book-shell-backend.c:269
+#: ../modules/addressbook/e-book-shell-backend.c:268
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ../modules/addressbook/e-book-shell-backend.c:271
+#: ../modules/addressbook/e-book-shell-backend.c:270
 #: ../modules/addressbook/e-book-shell-view-actions.c:936
 msgid "Create a new contact"
 msgstr "Einen neuen Kontakt anlegen"
 
-#: ../modules/addressbook/e-book-shell-backend.c:276
+#: ../modules/addressbook/e-book-shell-backend.c:275
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Kontakt_liste"
 
-#: ../modules/addressbook/e-book-shell-backend.c:278
+#: ../modules/addressbook/e-book-shell-backend.c:277
 #: ../modules/addressbook/e-book-shell-view-actions.c:943
 msgid "Create a new contact list"
 msgstr "Eine neue Kontaktliste anlegen"
 
-#: ../modules/addressbook/e-book-shell-backend.c:286
+#: ../modules/addressbook/e-book-shell-backend.c:285
 msgctxt "New"
 msgid "Address _Book"
 msgstr "Adressb_uch"
 
-#: ../modules/addressbook/e-book-shell-backend.c:288
+#: ../modules/addressbook/e-book-shell-backend.c:287
 #: ../modules/addressbook/e-book-shell-view-actions.c:866
 msgid "Create a new address book"
 msgstr "Ein neues Adressbuch anlegen"
 
-#: ../modules/addressbook/e-book-shell-backend.c:316
+#: ../modules/addressbook/e-book-shell-backend.c:315
 msgid "Certificates"
 msgstr "Zertifikate"
 
@@ -15734,10 +15755,10 @@ msgid "Show map with all contacts from selected address book"
 msgstr "Karte mit allen Kontakten des gewählten Adressbuchs anzeigen"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:885
-#: ../modules/calendar/e-cal-shell-view-actions.c:1445
-#: ../modules/calendar/e-memo-shell-view-actions.c:664
-#: ../modules/calendar/e-task-shell-view-actions.c:788
-#: ../modules/mail/e-mail-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1442
+#: ../modules/calendar/e-memo-shell-view-actions.c:663
+#: ../modules/calendar/e-task-shell-view-actions.c:787
+#: ../modules/mail/e-mail-shell-view-actions.c:1628
 msgid "_Rename..."
 msgstr "_Umbenennen …"
 
@@ -15810,27 +15831,27 @@ msgid "Send a message to the selected contacts"
 msgstr "Eine Nachricht an die gewählten Kontakte schicken"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:964
-#: ../modules/calendar/e-cal-shell-view-actions.c:1601
-#: ../modules/calendar/e-task-shell-view-actions.c:846
+#: ../modules/calendar/e-cal-shell-view-actions.c:1598
+#: ../modules/calendar/e-task-shell-view-actions.c:845
 msgid "_Actions"
 msgstr "A_ktionen"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:971
-#: ../modules/calendar/e-memo-shell-view-actions.c:701
-#: ../modules/calendar/e-task-shell-view-actions.c:853
-#: ../modules/mail/e-mail-shell-view-actions.c:1535
+#: ../modules/calendar/e-memo-shell-view-actions.c:700
+#: ../modules/calendar/e-task-shell-view-actions.c:852
+#: ../modules/mail/e-mail-shell-view-actions.c:1793
 msgid "_Preview"
 msgstr "_Vorschau"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:980
-#: ../modules/calendar/e-cal-shell-view-actions.c:1618
-#: ../modules/calendar/e-memo-shell-view-actions.c:714
-#: ../modules/calendar/e-task-shell-view-actions.c:866
+#: ../modules/calendar/e-cal-shell-view-actions.c:1615
+#: ../modules/calendar/e-memo-shell-view-actions.c:713
+#: ../modules/calendar/e-task-shell-view-actions.c:865
 msgid "_Delete"
 msgstr "_Löschen"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:984
-#: ../modules/mail/e-mail-shell-view-actions.c:1293
+#: ../modules/mail/e-mail-shell-view-actions.c:1544
 msgid "_Properties"
 msgstr "Ei_genschaften"
 
@@ -15856,9 +15877,9 @@ msgstr "Karten im Kontakt-Vorschaufenster anzeigen"
 
 # CHECK
 #: ../modules/addressbook/e-book-shell-view-actions.c:1049
-#: ../modules/calendar/e-memo-shell-view-actions.c:771
-#: ../modules/calendar/e-task-shell-view-actions.c:935
-#: ../modules/mail/e-mail-shell-view-actions.c:1665
+#: ../modules/calendar/e-memo-shell-view-actions.c:770
+#: ../modules/calendar/e-task-shell-view-actions.c:934
+#: ../modules/mail/e-mail-shell-view-actions.c:1923
 msgid "_Classic View"
 msgstr "_Klassische Ansicht"
 
@@ -15868,9 +15889,9 @@ msgstr "Kontakt-Vorschaufenster unter der Kontaktliste anzeigen"
 
 # CHECK - macht überhaupt keinen Sinn
 #: ../modules/addressbook/e-book-shell-view-actions.c:1056
-#: ../modules/calendar/e-memo-shell-view-actions.c:778
-#: ../modules/calendar/e-task-shell-view-actions.c:942
-#: ../modules/mail/e-mail-shell-view-actions.c:1672
+#: ../modules/calendar/e-memo-shell-view-actions.c:777
+#: ../modules/calendar/e-task-shell-view-actions.c:941
+#: ../modules/mail/e-mail-shell-view-actions.c:1930
 msgid "_Vertical View"
 msgstr "_Vertikale Ansicht"
 
@@ -15879,17 +15900,17 @@ msgid "Show contact preview alongside the contact list"
 msgstr "Kontakt-Vorschaufenster neben der Kontaktliste anzeigen"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1073
-#: ../modules/calendar/e-cal-shell-view-actions.c:1778
-#: ../modules/calendar/e-memo-shell-view-actions.c:795
-#: ../modules/calendar/e-task-shell-view-actions.c:994
+#: ../modules/calendar/e-cal-shell-view-actions.c:1775
+#: ../modules/calendar/e-memo-shell-view-actions.c:794
+#: ../modules/calendar/e-task-shell-view-actions.c:993
 msgid "Unmatched"
 msgstr "Nicht einsortiert"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1083
-#: ../modules/calendar/e-cal-shell-view-actions.c:1788
-#: ../modules/calendar/e-memo-shell-view-actions.c:805
-#: ../modules/calendar/e-task-shell-view-actions.c:1004
-#: ../modules/mail/e-mail-shell-view-actions.c:1741
+#: ../modules/calendar/e-cal-shell-view-actions.c:1785
+#: ../modules/calendar/e-memo-shell-view-actions.c:804
+#: ../modules/calendar/e-task-shell-view-actions.c:1003
+#: ../modules/mail/e-mail-shell-view-actions.c:1999
 #: ../shell/e-shell-content.c:657
 msgid "Advanced Search"
 msgstr "Erweiterte Suche"
@@ -15944,11 +15965,11 @@ msgstr "_Nachricht an Liste schicken"
 msgid "_Send Message to Contact"
 msgstr "_Nachricht an Kontakt schicken"
 
-#: ../modules/audio-inline/e-mail-formatter-audio-inline.c:309
+#: ../modules/audio-inline/e-mail-formatter-audio.c:314
 msgid "Audio Player"
 msgstr "Audio-Player"
 
-#: ../modules/audio-inline/e-mail-formatter-audio-inline.c:310
+#: ../modules/audio-inline/e-mail-formatter-audio.c:315
 msgid "Play the attachment in embedded audio player"
 msgstr "Anhang im eingebetteten Audio-Player abspielen"
 
@@ -16035,84 +16056,84 @@ msgid "With Graphical User Interface"
 msgstr "Mit grafischer Oberfläche"
 
 #. FIXME Will the versioned setting always work?
-#: ../modules/backup-restore/evolution-backup-tool.c:317
-#: ../modules/backup-restore/evolution-backup-tool.c:511
+#: ../modules/backup-restore/evolution-backup-tool.c:321
+#: ../modules/backup-restore/evolution-backup-tool.c:515
 msgid "Shutting down Evolution"
 msgstr "Evolution wird heruntergefahren"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:326
+#: ../modules/backup-restore/evolution-backup-tool.c:330
 msgid "Backing Evolution accounts and settings"
 msgstr "Sichern der Evolution-Konten und -Einstellungen"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:343
+#: ../modules/backup-restore/evolution-backup-tool.c:347
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Sichern der Evolution-Daten (E-Mails, Kontakte, Kalender, Aufgaben, Notizen)"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:359
+#: ../modules/backup-restore/evolution-backup-tool.c:363
 msgid "Back up complete"
 msgstr "Sicherung komplett"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:366
-#: ../modules/backup-restore/evolution-backup-tool.c:698
+#: ../modules/backup-restore/evolution-backup-tool.c:370
+#: ../modules/backup-restore/evolution-backup-tool.c:702
 msgid "Restarting Evolution"
 msgstr "Evolution wird neugestartet"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:517
+#: ../modules/backup-restore/evolution-backup-tool.c:521
 msgid "Back up current Evolution data"
 msgstr "Aktuelle Evolution-Daten sichern"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:524
+#: ../modules/backup-restore/evolution-backup-tool.c:528
 msgid "Extracting files from back up"
 msgstr "Dateien werden aus dem Sicherungsarchiv entpackt"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:606
+#: ../modules/backup-restore/evolution-backup-tool.c:610
 msgid "Loading Evolution settings"
 msgstr "Evolution-Einstellungen laden"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:672
+#: ../modules/backup-restore/evolution-backup-tool.c:676
 msgid "Removing temporary back up files"
 msgstr "Temporäre Sicherungsdateien werden entfernt"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:683
+#: ../modules/backup-restore/evolution-backup-tool.c:687
 msgid "Reloading registry service"
 msgstr "Registrierungsdienst wird neu geladen"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:910
+#: ../modules/backup-restore/evolution-backup-tool.c:914
 msgid "Evolution Back Up"
 msgstr "Evolution-Datensicherung"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:911
+#: ../modules/backup-restore/evolution-backup-tool.c:915
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Sichern nach %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:915
+#: ../modules/backup-restore/evolution-backup-tool.c:919
 msgid "Evolution Restore"
 msgstr "Evolution-Wiederherstellung"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:916
+#: ../modules/backup-restore/evolution-backup-tool.c:920
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Wiederherstellen von %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:986
+#: ../modules/backup-restore/evolution-backup-tool.c:990
 msgid "Backing up Evolution Data"
 msgstr "Sichern der Evolution-Daten"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:987
+#: ../modules/backup-restore/evolution-backup-tool.c:991
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Bitte warten Sie, während Evolution Ihre Daten sichert."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:989
+#: ../modules/backup-restore/evolution-backup-tool.c:993
 msgid "Restoring Evolution Data"
 msgstr "Wiederherstellen der Evolution-Daten"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:990
+#: ../modules/backup-restore/evolution-backup-tool.c:994
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Bitte warten Sie, während Evolution Ihre Daten wiederherstellt."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:1012
+#: ../modules/backup-restore/evolution-backup-tool.c:1016
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "Dies kann abhängig von den Daten in Ihrem Konto einige Zeit dauern."
 
@@ -16408,12 +16429,12 @@ msgstr "Im Geburts- und Jahrestagskalender verwenden"
 msgid "Default User Calendar"
 msgstr "Vorgegebener Benutzerkalender"
 
-#: ../modules/cal-config-google/e-google-chooser.c:508
+#: ../modules/cal-config-google/e-google-chooser.c:515
 #, c-format
 msgid "Enter Google password for user '%s'."
 msgstr "Geben Sie das Google-Passwort für Benutzer »%s« ein."
 
-#: ../modules/cal-config-google/e-google-chooser.c:525
+#: ../modules/cal-config-google/e-google-chooser.c:532
 msgid "User declined to provide a password"
 msgstr "Benutzer hat die Angabe eines Passworts abgelehnt"
 
@@ -16437,145 +16458,145 @@ msgstr "Datei:"
 msgid "Allow Evolution to update the file"
 msgstr "Evolution erlauben, die Datei zu aktualisieren"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:318
+#: ../modules/calendar/e-cal-attachment-handler.c:320
 #: ../smime/gui/smime-ui.ui.h:9
 msgid "I_mport"
 msgstr "I_mportieren"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:404
+#: ../modules/calendar/e-cal-attachment-handler.c:406
 msgid "Select a Calendar"
 msgstr "Einen Kalender auswählen"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:431
+#: ../modules/calendar/e-cal-attachment-handler.c:433
 msgid "Select a Task List"
 msgstr "Eine Aufgabenliste auswählen"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:441
+#: ../modules/calendar/e-cal-attachment-handler.c:443
 msgid "I_mport to Calendar"
 msgstr "In _Kalender importieren"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:448
+#: ../modules/calendar/e-cal-attachment-handler.c:450
 msgid "I_mport to Tasks"
 msgstr "In _Aufgaben importieren"
 
-#: ../modules/calendar/e-calendar-preferences.c:401
+#: ../modules/calendar/e-calendar-preferences.c:517
 msgid "Selected Calendars for Alarms"
 msgstr "Ausgewählte Kalender für die Erinnerungen"
 
-#: ../modules/calendar/e-calendar-preferences.c:822
+#: ../modules/calendar/e-calendar-preferences.c:925
 msgid "Ti_me and date:"
 msgstr "_Zeit und Datum:"
 
-#: ../modules/calendar/e-calendar-preferences.c:823
+#: ../modules/calendar/e-calendar-preferences.c:926
 msgid "_Date only:"
 msgstr "Nur das _Datum:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:8
+#: ../modules/calendar/e-calendar-preferences.ui.h:1
 msgid "Minutes"
 msgstr "Minuten"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:9
+#: ../modules/calendar/e-calendar-preferences.ui.h:2
 msgid "Hours"
 msgstr "Stunden"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:10
+#: ../modules/calendar/e-calendar-preferences.ui.h:3
 msgid "Days"
 msgstr "Tage"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:11
+#: ../modules/calendar/e-calendar-preferences.ui.h:4
 msgid "60 minutes"
 msgstr "60 Minuten"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:12
+#: ../modules/calendar/e-calendar-preferences.ui.h:5
 msgid "30 minutes"
 msgstr "30 Minuten"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:13
+#: ../modules/calendar/e-calendar-preferences.ui.h:6
 msgid "15 minutes"
 msgstr "15 Minuten"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:14
+#: ../modules/calendar/e-calendar-preferences.ui.h:7
 msgid "10 minutes"
 msgstr "10 Minuten"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:15
+#: ../modules/calendar/e-calendar-preferences.ui.h:8
 msgid "05 minutes"
 msgstr "05 Minuten"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:17
+#: ../modules/calendar/e-calendar-preferences.ui.h:10
 msgid "Se_cond zone:"
 msgstr "Z_weite Zone:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:19
+#: ../modules/calendar/e-calendar-preferences.ui.h:12
 msgid "(Shown in a Day View)"
 msgstr "(in der Tagesansicht angezeigt)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:21
+#: ../modules/calendar/e-calendar-preferences.ui.h:14
 msgid "Use s_ystem time zone"
 msgstr "Zeitzone des S_ystems verwenden"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:22
+#: ../modules/calendar/e-calendar-preferences.ui.h:15
 msgid "Time format:"
 msgstr "Zeitformat:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:23
+#: ../modules/calendar/e-calendar-preferences.ui.h:16
 msgid "_12 hour (AM/PM)"
 msgstr "_12 Stunden"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:24
+#: ../modules/calendar/e-calendar-preferences.ui.h:17
 msgid "_24 hour"
 msgstr "_24 Stunden"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:25
-#: ../modules/calendar/e-cal-shell-view-actions.c:1740
+#: ../modules/calendar/e-calendar-preferences.ui.h:18
+#: ../modules/calendar/e-cal-shell-view-actions.c:1737
 msgid "Work Week"
 msgstr "Arbeitswoche"
 
 #. A weekday like "Monday" follows
-#: ../modules/calendar/e-calendar-preferences.ui.h:27
+#: ../modules/calendar/e-calendar-preferences.ui.h:20
 msgid "Wee_k starts on:"
 msgstr "W_oche beginnt am:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:28
+#: ../modules/calendar/e-calendar-preferences.ui.h:21
 msgid "Work days:"
 msgstr "Arbeitstage:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:29
+#: ../modules/calendar/e-calendar-preferences.ui.h:22
 msgid "_Day begins:"
 msgstr "_Tag beginnt:"
 
 #. Monday
-#: ../modules/calendar/e-calendar-preferences.ui.h:31
+#: ../modules/calendar/e-calendar-preferences.ui.h:24
 msgid "_Mon"
 msgstr "_Mo"
 
 #. Tuesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:33
+#: ../modules/calendar/e-calendar-preferences.ui.h:27
 msgid "_Tue"
 msgstr "_Di"
 
 #. Wednesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:35
+#: ../modules/calendar/e-calendar-preferences.ui.h:30
 msgid "_Wed"
 msgstr "M_i"
 
 #. Thursday
-#: ../modules/calendar/e-calendar-preferences.ui.h:37
+#: ../modules/calendar/e-calendar-preferences.ui.h:33
 msgid "T_hu"
 msgstr "D_o"
 
 #. Friday
-#: ../modules/calendar/e-calendar-preferences.ui.h:39
+#: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "_Fri"
 msgstr "_Fr"
 
 #. Saturday
-#: ../modules/calendar/e-calendar-preferences.ui.h:41
+#: ../modules/calendar/e-calendar-preferences.ui.h:39
 msgid "_Sat"
 msgstr "S_a"
 
 #. Sunday
-#: ../modules/calendar/e-calendar-preferences.ui.h:43
+#: ../modules/calendar/e-calendar-preferences.ui.h:42
 msgid "S_un"
 msgstr "_So"
 
@@ -16681,62 +16702,67 @@ msgstr ""
 msgid "Publishing Information"
 msgstr "Information zur Veröffentlichung"
 
-#: ../modules/calendar/e-cal-shell-backend.c:310
+#: ../modules/calendar/e-cal-shell-backend.c:313
 #: ../modules/calendar/e-cal-shell-view-actions.c:191
 msgid "New Calendar"
 msgstr "Neuer Kalender"
 
-#: ../modules/calendar/e-cal-shell-backend.c:319
+#: ../modules/calendar/e-cal-shell-backend.c:322
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Termin"
 
-#: ../modules/calendar/e-cal-shell-backend.c:321
-#: ../modules/calendar/e-cal-shell-view-actions.c:1545
+#: ../modules/calendar/e-cal-shell-backend.c:324
+#: ../modules/calendar/e-cal-shell-view-actions.c:1542
 msgid "Create a new appointment"
 msgstr "Einen neuen Termin anlegen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:326
+#: ../modules/calendar/e-cal-shell-backend.c:329
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "_Ganztagstermin"
 
-#: ../modules/calendar/e-cal-shell-backend.c:328
+#: ../modules/calendar/e-cal-shell-backend.c:331
 msgid "Create a new all-day appointment"
 msgstr "Einen neuen ganztägigen Termin anlegen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:333
+#: ../modules/calendar/e-cal-shell-backend.c:336
 msgctxt "New"
 msgid "M_eeting"
 msgstr "_Besprechung"
 
-#: ../modules/calendar/e-cal-shell-backend.c:335
+#: ../modules/calendar/e-cal-shell-backend.c:338
 msgid "Create a new meeting request"
 msgstr "Eine neue Besprechungsanfrage anlegen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:343
+#: ../modules/calendar/e-cal-shell-backend.c:346
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Kalen_der"
 
-#: ../modules/calendar/e-cal-shell-backend.c:345
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-backend.c:348
+#: ../modules/calendar/e-cal-shell-view-actions.c:1416
 msgid "Create a new calendar"
 msgstr "Einen neuen Kalender anlegen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:668
+#: ../modules/calendar/e-cal-shell-backend.c:703
 msgid "Calendar and Tasks"
 msgstr "Kalender und Aufgaben"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:565
-msgid "Calendar Selector"
-msgstr "Kalenderquellenauswahl"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:868
+#: ../modules/calendar/e-cal-shell-sidebar.c:119
 #, c-format
 msgid "Opening calendar '%s'"
 msgstr "Kalender »%s« wird geöffnet"
 
+#: ../modules/calendar/e-cal-shell-sidebar.c:593
+msgid "Calendar Selector"
+msgstr "Kalenderquellenauswahl"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:216
+#: ../modules/calendar/e-cal-shell-view-actions.c:245
+msgid "Print"
+msgstr "Drucken"
+
 #: ../modules/calendar/e-cal-shell-view-actions.c:291
 msgid "Calendar Properties"
 msgstr "Kalendereigenschaften"
@@ -16757,345 +16783,345 @@ msgstr ""
 msgid "Purge events older than"
 msgstr "Ereignisse löschen älter als"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:588
+#: ../modules/calendar/e-cal-shell-view-actions.c:585
 msgid "Copying Items"
 msgstr "Objekte werden kopiert"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:881
+#: ../modules/calendar/e-cal-shell-view-actions.c:878
 msgid "Moving Items"
 msgstr "Objekte werden verschoben"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1215
+#: ../modules/calendar/e-cal-shell-view-actions.c:1212
 msgid "event"
 msgstr "Ereignis"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1217
+#: ../modules/calendar/e-cal-shell-view-actions.c:1214
 #: ../modules/calendar/e-cal-shell-view-memopad.c:231
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:298
-#: ../modules/calendar/e-memo-shell-view-actions.c:548
-#: ../modules/calendar/e-task-shell-view-actions.c:665
+#: ../modules/calendar/e-memo-shell-view-actions.c:547
+#: ../modules/calendar/e-task-shell-view-actions.c:664
 msgid "Save as iCalendar"
 msgstr "Als iCalendar speichern"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1375
-#: ../modules/calendar/e-memo-shell-view-actions.c:629
+#: ../modules/calendar/e-cal-shell-view-actions.c:1372
+#: ../modules/calendar/e-memo-shell-view-actions.c:628
 msgid "_Copy..."
 msgstr "_Kopieren …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1382
+#: ../modules/calendar/e-cal-shell-view-actions.c:1379
 msgid "D_elete Calendar"
 msgstr "Kalender _löschen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1381
 msgid "Delete the selected calendar"
 msgstr "Den gewählten Kalender löschen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1388
 msgid "Go Back"
 msgstr "Zurück gehen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1395
 msgid "Go Forward"
 msgstr "Vor gehen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
+#: ../modules/calendar/e-cal-shell-view-actions.c:1402
 msgid "Select today"
 msgstr "Heute wählen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1410
+#: ../modules/calendar/e-cal-shell-view-actions.c:1407
 msgid "Select _Date"
 msgstr "_Datum wählen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../modules/calendar/e-cal-shell-view-actions.c:1409
 msgid "Select a specific date"
 msgstr "Ein bestimmtes Datum wählen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1417
+#: ../modules/calendar/e-cal-shell-view-actions.c:1414
 msgid "_New Calendar"
 msgstr "_Neuer Kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1431
-#: ../modules/calendar/e-task-shell-view-actions.c:837
+#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-task-shell-view-actions.c:836
 msgid "Purg_e"
 msgstr "_Säubern"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1433
+#: ../modules/calendar/e-cal-shell-view-actions.c:1430
 msgid "Purge old appointments and meetings"
 msgstr "Alte Termine und Besprechungen löschen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1438
-#: ../modules/calendar/e-memo-shell-view-actions.c:657
-#: ../modules/calendar/e-task-shell-view-actions.c:781
+#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+#: ../modules/calendar/e-memo-shell-view-actions.c:656
+#: ../modules/calendar/e-task-shell-view-actions.c:780
 msgid "Re_fresh"
 msgstr "Auf_frischen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1440
+#: ../modules/calendar/e-cal-shell-view-actions.c:1437
 msgid "Refresh the selected calendar"
 msgstr "Den gewählten Kalender aktualisieren"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1447
+#: ../modules/calendar/e-cal-shell-view-actions.c:1444
 msgid "Rename the selected calendar"
 msgstr "Den gewählten Kalender umbenennen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
+#: ../modules/calendar/e-cal-shell-view-actions.c:1449
 msgid "Find _next"
 msgstr "_Weitersuchen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1454
+#: ../modules/calendar/e-cal-shell-view-actions.c:1451
 msgid "Find next occurrence of the current search string"
 msgstr "Das nächste Vorkommen des aktuellen Suchbegriffs finden"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1459
+#: ../modules/calendar/e-cal-shell-view-actions.c:1456
 msgid "Find _previous"
 msgstr "_Rückwärts suchen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1461
+#: ../modules/calendar/e-cal-shell-view-actions.c:1458
 msgid "Find previous occurrence of the current search string"
 msgstr "Das vorherige Vorkommen des aktuellen Suchbegriffs finden"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1466
+#: ../modules/calendar/e-cal-shell-view-actions.c:1463
 msgid "Stop _running search"
 msgstr "Suchvorgang _anhalten"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1468
+#: ../modules/calendar/e-cal-shell-view-actions.c:1465
 msgid "Stop currently running search"
 msgstr "Derzeit laufende Suche stoppen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1473
+#: ../modules/calendar/e-cal-shell-view-actions.c:1470
 msgid "Show _Only This Calendar"
 msgstr "Nur diesen _Kalender anzeigen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1480
+#: ../modules/calendar/e-cal-shell-view-actions.c:1477
 msgid "Cop_y to Calendar..."
 msgstr "In Kalender k_opieren …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1487
+#: ../modules/calendar/e-cal-shell-view-actions.c:1484
 msgid "_Delegate Meeting..."
 msgstr "Besprechung dele_gieren …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1494
+#: ../modules/calendar/e-cal-shell-view-actions.c:1491
 msgid "_Delete Appointment"
 msgstr "Den Termin _löschen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1496
+#: ../modules/calendar/e-cal-shell-view-actions.c:1493
 msgid "Delete selected appointments"
 msgstr "Ausgewählte Termine löschen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1501
+#: ../modules/calendar/e-cal-shell-view-actions.c:1498
 msgid "Delete This _Occurrence"
 msgstr "Dieses V_orkommen löschen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1503
+#: ../modules/calendar/e-cal-shell-view-actions.c:1500
 msgid "Delete this occurrence"
 msgstr "Diesen Treffer löschen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1508
+#: ../modules/calendar/e-cal-shell-view-actions.c:1505
 msgid "Delete All Occ_urrences"
 msgstr "Alle _Vorkommen löschen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1510
+#: ../modules/calendar/e-cal-shell-view-actions.c:1507
 msgid "Delete all occurrences"
 msgstr "Alle Vorkommen löschen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1515
+#: ../modules/calendar/e-cal-shell-view-actions.c:1512
 msgid "New All Day _Event..."
 msgstr "Neues _ganztägiges Ereignis …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1517
+#: ../modules/calendar/e-cal-shell-view-actions.c:1514
 msgid "Create a new all day event"
 msgstr "Ein neues ganztägiges Ereignis anlegen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1522
+#: ../modules/calendar/e-cal-shell-view-actions.c:1519
 #: ../modules/calendar/e-cal-shell-view-memopad.c:265
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-memo-shell-view-actions.c:622
-#: ../modules/calendar/e-task-shell-view-actions.c:746
+#: ../modules/calendar/e-memo-shell-view-actions.c:621
+#: ../modules/calendar/e-task-shell-view-actions.c:745
 msgid "_Forward as iCalendar..."
 msgstr "Als i_Calendar weiterleiten …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1529
+#: ../modules/calendar/e-cal-shell-view-actions.c:1526
 msgid "New _Meeting..."
 msgstr "Neue Bes_prechung …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1531
+#: ../modules/calendar/e-cal-shell-view-actions.c:1528
 msgid "Create a new meeting"
 msgstr "Eine neue Besprechung anlegen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1536
+#: ../modules/calendar/e-cal-shell-view-actions.c:1533
 msgid "Mo_ve to Calendar..."
 msgstr "In Kalender _verschieben …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1543
+#: ../modules/calendar/e-cal-shell-view-actions.c:1540
 msgid "New _Appointment..."
 msgstr "Neuer _Termin …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1550
+#: ../modules/calendar/e-cal-shell-view-actions.c:1547
 msgid "Make this Occurrence _Movable"
 msgstr "Diese Wiederholung v_erschiebbar machen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-cal-shell-view-actions.c:1554
 msgid "_Open Appointment"
 msgstr "Termin ö_ffnen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+#: ../modules/calendar/e-cal-shell-view-actions.c:1556
 msgid "View the current appointment"
 msgstr "Den aktuellen Termin anzeigen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+#: ../modules/calendar/e-cal-shell-view-actions.c:1561
 msgid "_Reply"
 msgstr "_Antworten"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+#: ../modules/calendar/e-cal-shell-view-actions.c:1575
 msgid "_Schedule Meeting..."
 msgstr "Besprechung _ansetzen …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1577
 msgid "Converts an appointment to a meeting"
 msgstr "Wandelt einen Termin in eine Besprechung um"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1585
+#: ../modules/calendar/e-cal-shell-view-actions.c:1582
 msgid "Conv_ert to Appointment..."
 msgstr "In T_ermin umwandeln…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1587
+#: ../modules/calendar/e-cal-shell-view-actions.c:1584
 msgid "Converts a meeting to an appointment"
 msgstr "Wandelt eine Besprechung in einen Termin um"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1592
+#: ../modules/calendar/e-cal-shell-view-actions.c:1589
 msgid "Quit"
 msgstr "Beenden"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1712
+#: ../modules/calendar/e-cal-shell-view-actions.c:1709
 msgid "Day"
 msgstr "Tag"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1714
+#: ../modules/calendar/e-cal-shell-view-actions.c:1711
 msgid "Show one day"
 msgstr "Tagesansicht"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1719
+#: ../modules/calendar/e-cal-shell-view-actions.c:1716
 msgid "List"
 msgstr "Liste"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1721
+#: ../modules/calendar/e-cal-shell-view-actions.c:1718
 msgid "Show as list"
 msgstr "Listenansicht"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1726
+#: ../modules/calendar/e-cal-shell-view-actions.c:1723
 msgid "Month"
 msgstr "Monat"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1728
+#: ../modules/calendar/e-cal-shell-view-actions.c:1725
 msgid "Show one month"
 msgstr "Monatsansicht"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1733
+#: ../modules/calendar/e-cal-shell-view-actions.c:1730
 msgid "Week"
 msgstr "Woche"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1735
+#: ../modules/calendar/e-cal-shell-view-actions.c:1732
 msgid "Show one week"
 msgstr "Wochenansicht"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1742
+#: ../modules/calendar/e-cal-shell-view-actions.c:1739
 msgid "Show one work week"
 msgstr "Eine Arbeitswoche anzeigen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1750
+#: ../modules/calendar/e-cal-shell-view-actions.c:1747
 msgid "Active Appointments"
 msgstr "Aktuelle Termine"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1764
+#: ../modules/calendar/e-cal-shell-view-actions.c:1761
 msgid "Next 7 Days' Appointments"
 msgstr "Termine der nächsten 7 Tage"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1771
+#: ../modules/calendar/e-cal-shell-view-actions.c:1768
 msgid "Occurs Less Than 5 Times"
 msgstr "Kommt weniger als fünf Mal vor"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1802
-#: ../modules/calendar/e-memo-shell-view-actions.c:819
-#: ../modules/calendar/e-task-shell-view-actions.c:1018
+#: ../modules/calendar/e-cal-shell-view-actions.c:1799
+#: ../modules/calendar/e-memo-shell-view-actions.c:818
+#: ../modules/calendar/e-task-shell-view-actions.c:1017
 msgid "Description contains"
 msgstr "Beschreibung enthält"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1809
-#: ../modules/calendar/e-memo-shell-view-actions.c:826
-#: ../modules/calendar/e-task-shell-view-actions.c:1025
+#: ../modules/calendar/e-cal-shell-view-actions.c:1806
+#: ../modules/calendar/e-memo-shell-view-actions.c:825
+#: ../modules/calendar/e-task-shell-view-actions.c:1024
 msgid "Summary contains"
 msgstr "Zusammenfassung enthält"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1821
+#: ../modules/calendar/e-cal-shell-view-actions.c:1818
 msgid "Print this calendar"
 msgstr "Diesen Kalender drucken"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1828
+#: ../modules/calendar/e-cal-shell-view-actions.c:1825
 msgid "Preview the calendar to be printed"
 msgstr "Vorschau auf den zu druckenden Kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1850
+#: ../modules/calendar/e-cal-shell-view-actions.c:1847
 #: ../modules/calendar/e-cal-shell-view-memopad.c:306
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:393
-#: ../modules/calendar/e-memo-shell-view-actions.c:867
-#: ../modules/calendar/e-task-shell-view-actions.c:1066
+#: ../modules/calendar/e-memo-shell-view-actions.c:866
+#: ../modules/calendar/e-task-shell-view-actions.c:1065
 msgid "_Save as iCalendar..."
 msgstr "Als i_Calendar speichern …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1927
+#: ../modules/calendar/e-cal-shell-view-actions.c:1924
 msgid "Go To"
 msgstr "Gehe zu"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #: ../modules/calendar/e-cal-shell-view-memopad.c:229
-#: ../modules/calendar/e-memo-shell-view-actions.c:546
+#: ../modules/calendar/e-memo-shell-view-actions.c:545
 msgid "memo"
 msgstr "Notiz"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:272
-#: ../modules/calendar/e-memo-shell-view-actions.c:678
+#: ../modules/calendar/e-memo-shell-view-actions.c:677
 msgid "New _Memo"
 msgstr "Neue _Notiz"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:274
 #: ../modules/calendar/e-memo-shell-backend.c:219
-#: ../modules/calendar/e-memo-shell-view-actions.c:680
+#: ../modules/calendar/e-memo-shell-view-actions.c:679
 msgid "Create a new memo"
 msgstr "Eine neue Notiz anlegen"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:279
-#: ../modules/calendar/e-memo-shell-view-actions.c:685
+#: ../modules/calendar/e-memo-shell-view-actions.c:684
 msgid "_Open Memo"
 msgstr "Notiz ö_ffnen"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:281
-#: ../modules/calendar/e-memo-shell-view-actions.c:687
+#: ../modules/calendar/e-memo-shell-view-actions.c:686
 msgid "View the selected memo"
 msgstr "Die gewählte Notiz anzeigen"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:286
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:373
-#: ../modules/calendar/e-memo-shell-view-actions.c:692
-#: ../modules/calendar/e-task-shell-view-actions.c:830
+#: ../modules/calendar/e-memo-shell-view-actions.c:691
+#: ../modules/calendar/e-task-shell-view-actions.c:829
 msgid "Open _Web Page"
 msgstr "_Website öffnen"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:298
-#: ../modules/calendar/e-memo-shell-view-actions.c:852
+#: ../modules/calendar/e-memo-shell-view-actions.c:851
 msgid "Print the selected memo"
 msgstr "Die gewählte Notiz drucken"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1509
+#: ../modules/calendar/e-cal-shell-view-private.c:1481
 msgid "Searching next matching event"
 msgstr "Nächstes zutreffendes Ereignis suchen"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1510
+#: ../modules/calendar/e-cal-shell-view-private.c:1482
 msgid "Searching previous matching event"
 msgstr "Vorheriges zutreffendes Ereignis suchen"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1531
+#: ../modules/calendar/e-cal-shell-view-private.c:1503
 #, c-format
 msgid "Cannot find matching event in the next %d year"
 msgid_plural "Cannot find matching event in the next %d years"
@@ -17105,7 +17131,7 @@ msgstr[1] ""
 "Übereinstimmendes Ereignis konnte in den nächsten %d Jahren nicht gefunden "
 "werden"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1535
+#: ../modules/calendar/e-cal-shell-view-private.c:1507
 #, c-format
 msgid "Cannot find matching event in the previous %d year"
 msgid_plural "Cannot find matching event in the previous %d years"
@@ -17115,7 +17141,7 @@ msgstr[1] ""
 "Übereinstimmendes Ereignis konnte in den letzten %d Jahren nicht gefunden "
 "werden"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1560
+#: ../modules/calendar/e-cal-shell-view-private.c:1532
 msgid "Cannot search with no active calendar"
 msgstr "Suche kann ohne aktiven Kalender nicht ausgeführt werden"
 
@@ -17124,22 +17150,22 @@ msgstr "Suche kann ohne aktiven Kalender nicht ausgeführt werden"
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:296
-#: ../modules/calendar/e-task-shell-view-actions.c:663
+#: ../modules/calendar/e-task-shell-view-actions.c:662
 msgid "task"
 msgstr "Aufgabe"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:331
-#: ../modules/calendar/e-task-shell-view-actions.c:725
+#: ../modules/calendar/e-task-shell-view-actions.c:724
 msgid "_Assign Task"
 msgstr "Aufgabe _zuweisen"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:802
+#: ../modules/calendar/e-task-shell-view-actions.c:801
 msgid "_Mark as Complete"
 msgstr "Als abgeschlossen _markieren"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:804
+#: ../modules/calendar/e-task-shell-view-actions.c:803
 msgid "Mark selected tasks as complete"
 msgstr "Die gewählten Aufgaben als abgeschlossen markieren"
 
@@ -17148,33 +17174,33 @@ msgid "_Mark as Incomplete"
 msgstr "Als _offen markieren"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:354
-#: ../modules/calendar/e-task-shell-view-actions.c:811
+#: ../modules/calendar/e-task-shell-view-actions.c:810
 msgid "Mark selected tasks as incomplete"
 msgstr "Die gewählten Aufgaben als unvollständig markieren"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-task-shell-view-actions.c:816
+#: ../modules/calendar/e-task-shell-view-actions.c:815
 msgid "New _Task"
 msgstr "_Neue Aufgabe"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:361
 #: ../modules/calendar/e-task-shell-backend.c:216
-#: ../modules/calendar/e-task-shell-view-actions.c:818
+#: ../modules/calendar/e-task-shell-view-actions.c:817
 msgid "Create a new task"
 msgstr "Eine neue Aufgabe anlegen"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:366
-#: ../modules/calendar/e-task-shell-view-actions.c:823
+#: ../modules/calendar/e-task-shell-view-actions.c:822
 msgid "_Open Task"
 msgstr "Aufgabe ö_ffnen"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:368
-#: ../modules/calendar/e-task-shell-view-actions.c:825
+#: ../modules/calendar/e-task-shell-view-actions.c:824
 msgid "View the selected task"
 msgstr "Die gewählte Aufgabe anzeigen"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:385
-#: ../modules/calendar/e-task-shell-view-actions.c:1051
+#: ../modules/calendar/e-task-shell-view-actions.c:1050
 msgid "Print the selected task"
 msgstr "Die gewählte Aufgabe drucken"
 
@@ -17203,19 +17229,19 @@ msgid "Memo Li_st"
 msgstr "Notizli_ste"
 
 #: ../modules/calendar/e-memo-shell-backend.c:236
-#: ../modules/calendar/e-memo-shell-view-actions.c:645
+#: ../modules/calendar/e-memo-shell-view-actions.c:644
 msgid "Create a new memo list"
 msgstr "Eine neue Notizliste anlegen"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:499
-msgid "Memo List Selector"
-msgstr "Notizquellenauswahl"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:755
+#: ../modules/calendar/e-memo-shell-sidebar.c:117
 #, c-format
 msgid "Opening memo list '%s'"
 msgstr "Notizliste »%s« wird geöffnet"
 
+#: ../modules/calendar/e-memo-shell-sidebar.c:553
+msgid "Memo List Selector"
+msgstr "Notizquellenauswahl"
+
 #: ../modules/calendar/e-memo-shell-view-actions.c:232
 #: ../modules/calendar/e-memo-shell-view-actions.c:247
 msgid "Print Memos"
@@ -17225,63 +17251,63 @@ msgstr "Notizen drucken"
 msgid "Memo List Properties"
 msgstr "Notizlisteneigenschaften"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:608
+#: ../modules/calendar/e-memo-shell-view-actions.c:607
 msgid "_Delete Memo"
 msgstr "Notiz _löschen"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:615
+#: ../modules/calendar/e-memo-shell-view-actions.c:614
 msgid "_Find in Memo..."
 msgstr "In Notiz _suchen …"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:617
+#: ../modules/calendar/e-memo-shell-view-actions.c:616
 msgid "Search for text in the displayed memo"
 msgstr "In der angezeigten Notiz einen Text suchen"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:636
+#: ../modules/calendar/e-memo-shell-view-actions.c:635
 msgid "D_elete Memo List"
 msgstr "Notizlist_e löschen "
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:638
+#: ../modules/calendar/e-memo-shell-view-actions.c:637
 msgid "Delete the selected memo list"
 msgstr "Die gewählte Notizliste löschen"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:643
+#: ../modules/calendar/e-memo-shell-view-actions.c:642
 msgid "_New Memo List"
 msgstr "_Neue Notizliste"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:659
+#: ../modules/calendar/e-memo-shell-view-actions.c:658
 msgid "Refresh the selected memo list"
 msgstr "Die ausgewählte Notizliste aktualisieren"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:666
+#: ../modules/calendar/e-memo-shell-view-actions.c:665
 msgid "Rename the selected memo list"
 msgstr "Die ausgewählte Notizliste umbenennen"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:671
+#: ../modules/calendar/e-memo-shell-view-actions.c:670
 msgid "Show _Only This Memo List"
 msgstr "Nur diese N_otizliste anzeigen"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:750
+#: ../modules/calendar/e-memo-shell-view-actions.c:749
 msgid "Memo _Preview"
 msgstr "Notiz_vorschau"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:752
+#: ../modules/calendar/e-memo-shell-view-actions.c:751
 msgid "Show memo preview pane"
 msgstr "Vorschaufeld für Notizen anzeigen"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:773
+#: ../modules/calendar/e-memo-shell-view-actions.c:772
 msgid "Show memo preview below the memo list"
 msgstr "Notizvorschau unter der Notizliste anzeigen"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:780
+#: ../modules/calendar/e-memo-shell-view-actions.c:779
 msgid "Show memo preview alongside the memo list"
 msgstr "Notizvorschau neben der Notizliste anzeigen"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:838
+#: ../modules/calendar/e-memo-shell-view-actions.c:837
 msgid "Print the list of memos"
 msgstr "Die Liste von Notizen drucken"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:845
+#: ../modules/calendar/e-memo-shell-view-actions.c:844
 msgid "Preview the list of memos to be printed"
 msgstr "Vorschau auf die zu druckende Liste von Notizen anzeigen"
 
@@ -17293,15 +17319,15 @@ msgstr "Notizen löschen"
 msgid "Delete Memo"
 msgstr "Notiz löschen"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:465
+#: ../modules/calendar/e-memo-shell-view-private.c:460
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d Notiz"
 msgstr[1] "%d Notizen"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:469
-#: ../modules/calendar/e-task-shell-view-private.c:639
+#: ../modules/calendar/e-memo-shell-view-private.c:464
+#: ../modules/calendar/e-task-shell-view-private.c:668
 #, c-format
 msgid "%d selected"
 msgstr "%d gewählt"
@@ -17331,19 +17357,19 @@ msgid "Tas_k List"
 msgstr "_Aufgabenliste"
 
 #: ../modules/calendar/e-task-shell-backend.c:233
-#: ../modules/calendar/e-task-shell-view-actions.c:769
+#: ../modules/calendar/e-task-shell-view-actions.c:768
 msgid "Create a new task list"
 msgstr "Eine neue Aufgabenliste anlegen"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:499
-msgid "Task List Selector"
-msgstr "Aufgabenlistenauswahl"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:755
+#: ../modules/calendar/e-task-shell-sidebar.c:117
 #, c-format
 msgid "Opening task list '%s'"
 msgstr "Aufgabenliste »%s« wird geöffnet"
 
+#: ../modules/calendar/e-task-shell-sidebar.c:553
+msgid "Task List Selector"
+msgstr "Aufgabenlistenauswahl"
+
 #: ../modules/calendar/e-task-shell-view-actions.c:255
 #: ../modules/calendar/e-task-shell-view-actions.c:270
 msgid "Print Tasks"
@@ -17353,7 +17379,7 @@ msgstr "Aufgaben drucken"
 msgid "Task List Properties"
 msgstr "Aufgabenlisteneigenschaften"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:607
+#: ../modules/calendar/e-task-shell-view-actions.c:606
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -17366,99 +17392,99 @@ msgstr ""
 "\n"
 "Sollen die Aufgaben wirklich entfernt werden?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:614
+#: ../modules/calendar/e-task-shell-view-actions.c:613
 msgid "Do not ask me again"
 msgstr "Nicht mehr nachfragen."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:732
+#: ../modules/calendar/e-task-shell-view-actions.c:731
 msgid "_Delete Task"
 msgstr "Aufgabe _löschen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:739
+#: ../modules/calendar/e-task-shell-view-actions.c:738
 msgid "_Find in Task..."
 msgstr "In Aufgabe _suchen …"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:740
 msgid "Search for text in the displayed task"
 msgstr "In der angezeigten Aufgabe nach Text suchen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:753
+#: ../modules/calendar/e-task-shell-view-actions.c:752
 msgid "Copy..."
 msgstr "Kopieren …"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:760
+#: ../modules/calendar/e-task-shell-view-actions.c:759
 msgid "D_elete Task List"
 msgstr "Aufgabenlist_e löschen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:762
+#: ../modules/calendar/e-task-shell-view-actions.c:761
 msgid "Delete the selected task list"
 msgstr "Die gewählte Aufgabenliste löschen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:767
+#: ../modules/calendar/e-task-shell-view-actions.c:766
 msgid "_New Task List"
 msgstr "_Neue Aufgabenliste"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:783
+#: ../modules/calendar/e-task-shell-view-actions.c:782
 msgid "Refresh the selected task list"
 msgstr "Die gewählte Aufgabenliste aktualisieren"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:790
+#: ../modules/calendar/e-task-shell-view-actions.c:789
 msgid "Rename the selected task list"
 msgstr "Die gewählte Aufgabenliste umbenennen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:795
+#: ../modules/calendar/e-task-shell-view-actions.c:794
 msgid "Show _Only This Task List"
 msgstr "Nur diese Auf_gabenliste anzeigen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:809
+#: ../modules/calendar/e-task-shell-view-actions.c:808
 msgid "Mar_k as Incomplete"
 msgstr "Als unvollständig mar_kieren"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:839
+#: ../modules/calendar/e-task-shell-view-actions.c:838
 msgid "Delete completed tasks"
 msgstr "Die abgeschlossenen Aufgaben löschen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:914
+#: ../modules/calendar/e-task-shell-view-actions.c:913
 msgid "Task _Preview"
 msgstr "Aufgaben_vorschau"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:916
+#: ../modules/calendar/e-task-shell-view-actions.c:915
 msgid "Show task preview pane"
 msgstr "Aufgabenvorschaufeld anzeigen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:937
+#: ../modules/calendar/e-task-shell-view-actions.c:936
 msgid "Show task preview below the task list"
 msgstr "Aufgabenvorschau unter der Aufgabenliste anzeigen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:944
+#: ../modules/calendar/e-task-shell-view-actions.c:943
 msgid "Show task preview alongside the task list"
 msgstr "Aufgabenvorschau neben der Aufgabenliste anzeigen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:952
+#: ../modules/calendar/e-task-shell-view-actions.c:951
 msgid "Active Tasks"
 msgstr "Aktuelle Aufgaben"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:966
+#: ../modules/calendar/e-task-shell-view-actions.c:965
 msgid "Completed Tasks"
 msgstr "Abgeschlossene Aufgaben"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:973
+#: ../modules/calendar/e-task-shell-view-actions.c:972
 msgid "Next 7 Days' Tasks"
 msgstr "Aufgaben der nächsten 7 Tage"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:980
+#: ../modules/calendar/e-task-shell-view-actions.c:979
 msgid "Overdue Tasks"
 msgstr "Überfällige Aufgaben"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:987
+#: ../modules/calendar/e-task-shell-view-actions.c:986
 msgid "Tasks with Attachments"
 msgstr "Aufgaben mit Anlagen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1037
+#: ../modules/calendar/e-task-shell-view-actions.c:1036
 msgid "Print the list of tasks"
 msgstr "Die Aufgabenliste drucken"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1044
+#: ../modules/calendar/e-task-shell-view-actions.c:1043
 msgid "Preview the list of tasks to be printed"
 msgstr "Vorschau auf die zu druckende Aufgabenliste"
 
@@ -17470,22 +17496,22 @@ msgstr "Aufgaben löschen"
 msgid "Delete Task"
 msgstr "Aufgabe löschen"
 
-#: ../modules/calendar/e-task-shell-view-private.c:524
+#: ../modules/calendar/e-task-shell-view-private.c:553
 msgid "Expunging"
 msgstr "Wird gesäubert"
 
-#: ../modules/calendar/e-task-shell-view-private.c:635
+#: ../modules/calendar/e-task-shell-view-private.c:664
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d Aufgabe"
 msgstr[1] "%d Aufgaben"
 
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:146
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:149
 msgid "ITIP"
 msgstr "ITIP"
 
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:147
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:150
 msgid "Display part as an invitation"
 msgstr "Teil als Einladung anzeigen"
 
@@ -17964,159 +17990,159 @@ msgstr "_Notizen:"
 msgid "Sa_ve"
 msgstr "_Speichern"
 
-#: ../modules/itip-formatter/itip-view.c:3682
+#: ../modules/itip-formatter/itip-view.c:3673
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Ein Termin im Kalender »%s« überschneidet sich mit dieser Besprechung"
 
-#: ../modules/itip-formatter/itip-view.c:3711
+#: ../modules/itip-formatter/itip-view.c:3702
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Der Termin wurde im Kalender »%s« gefunden"
 
-#: ../modules/itip-formatter/itip-view.c:3824
+#: ../modules/itip-formatter/itip-view.c:3815
 msgid "Unable to find any calendars"
 msgstr "Es wurden keine Kalender gefunden"
 
-#: ../modules/itip-formatter/itip-view.c:3832
+#: ../modules/itip-formatter/itip-view.c:3823
 msgid "Unable to find this meeting in any calendar"
 msgstr "Diese Besprechung wurde in keinem Kalender gefunden"
 
-#: ../modules/itip-formatter/itip-view.c:3837
+#: ../modules/itip-formatter/itip-view.c:3828
 msgid "Unable to find this task in any task list"
 msgstr "Diese Aufgabe wurde in keiner Aufgabenliste gefunden"
 
-#: ../modules/itip-formatter/itip-view.c:3842
+#: ../modules/itip-formatter/itip-view.c:3833
 msgid "Unable to find this memo in any memo list"
 msgstr "Diese Notiz wurde in keiner Notizliste gefunden"
 
-#: ../modules/itip-formatter/itip-view.c:4187
+#: ../modules/itip-formatter/itip-view.c:4179
 msgid "Opening the calendar. Please wait..."
 msgstr "Kalender wird geöffnet. Bitte warten …"
 
-#: ../modules/itip-formatter/itip-view.c:4192
+#: ../modules/itip-formatter/itip-view.c:4184
 msgid "Searching for an existing version of this appointment"
 msgstr "Eine bestehende Version dieses Termins wird gesucht"
 
-#: ../modules/itip-formatter/itip-view.c:4583
+#: ../modules/itip-formatter/itip-view.c:4575
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Element kann nicht zu Kalender »%s« gesendet werden. %s"
 
-#: ../modules/itip-formatter/itip-view.c:4599
+#: ../modules/itip-formatter/itip-view.c:4591
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "In Kalender »%s« als »Angenommen« eingetragen"
 
-#: ../modules/itip-formatter/itip-view.c:4604
+#: ../modules/itip-formatter/itip-view.c:4596
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "In Kalender »%s« als »Vorläufig angenommen« eingetragen"
 
-#: ../modules/itip-formatter/itip-view.c:4610
+#: ../modules/itip-formatter/itip-view.c:4602
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "In Kalender »%s« als »Abgelehnt« eingetragen"
 
-#: ../modules/itip-formatter/itip-view.c:4616
+#: ../modules/itip-formatter/itip-view.c:4608
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "In Kalender »%s« als »Abgesagt« eingetragen"
 
-#: ../modules/itip-formatter/itip-view.c:4637
-#: ../modules/itip-formatter/itip-view.c:5084
-#: ../modules/itip-formatter/itip-view.c:5191
+#: ../modules/itip-formatter/itip-view.c:4629
+#: ../modules/itip-formatter/itip-view.c:5076
+#: ../modules/itip-formatter/itip-view.c:5183
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "Änderungen im Kalender werden gespeichert. Bitte warten …"
 
-#: ../modules/itip-formatter/itip-view.c:4678
+#: ../modules/itip-formatter/itip-view.c:4670
 msgid "Unable to parse item"
 msgstr "Element kann nicht analysiert werden"
 
-#: ../modules/itip-formatter/itip-view.c:4871
+#: ../modules/itip-formatter/itip-view.c:4863
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Der Organisator hat den Vertreter %s entfernt "
 
-#: ../modules/itip-formatter/itip-view.c:4888
+#: ../modules/itip-formatter/itip-view.c:4880
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Dem Vertreter wurde eine Absagenachricht zugestellt"
 
-#: ../modules/itip-formatter/itip-view.c:4892
+#: ../modules/itip-formatter/itip-view.c:4884
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Die Absagenachricht konnte dem Vertreter nicht zugestellt werden"
 
-#: ../modules/itip-formatter/itip-view.c:4943
+#: ../modules/itip-formatter/itip-view.c:4935
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Teilnehmer konnte nicht aktualisiert werden. %s"
 
-#: ../modules/itip-formatter/itip-view.c:4950
+#: ../modules/itip-formatter/itip-view.c:4942
 msgid "Attendee status updated"
 msgstr "Teilnehmerstatus aktualisiert"
 
-#: ../modules/itip-formatter/itip-view.c:4973
+#: ../modules/itip-formatter/itip-view.c:4965
 msgid "The meeting is invalid and cannot be updated"
 msgstr "Die Besprechung ist ungültig und kann nicht aktualisiert werden"
 
-#: ../modules/itip-formatter/itip-view.c:5049
+#: ../modules/itip-formatter/itip-view.c:5041
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "Teilnehmerstatus konnte auf Grund eines ungültigen Zustands nicht "
 "aktualisiert werden"
 
-#: ../modules/itip-formatter/itip-view.c:5121
-#: ../modules/itip-formatter/itip-view.c:5161
+#: ../modules/itip-formatter/itip-view.c:5113
+#: ../modules/itip-formatter/itip-view.c:5153
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
-"Teilnahmestatus konnte nicht aktualisiert werden, da der Eintrag nicht mehr "
-"existiert"
+"Teilnahmestatus konnte nicht aktualisiert werden, weil der Eintrag nicht "
+"mehr existiert"
 
-#: ../modules/itip-formatter/itip-view.c:5224
+#: ../modules/itip-formatter/itip-view.c:5216
 msgid "Meeting information sent"
 msgstr "Besprechungsinformationen wurden verschickt"
 
-#: ../modules/itip-formatter/itip-view.c:5229
+#: ../modules/itip-formatter/itip-view.c:5221
 msgid "Task information sent"
 msgstr "Aufgabeninformationen wurden verschickt"
 
-#: ../modules/itip-formatter/itip-view.c:5234
+#: ../modules/itip-formatter/itip-view.c:5226
 msgid "Memo information sent"
 msgstr "Notizinformationen wurden verschickt"
 
-#: ../modules/itip-formatter/itip-view.c:5245
+#: ../modules/itip-formatter/itip-view.c:5237
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr ""
 "Verschicken der Besprechungsinformationen nicht möglich, die Besprechung "
 "existiert nicht"
 
-#: ../modules/itip-formatter/itip-view.c:5250
+#: ../modules/itip-formatter/itip-view.c:5242
 msgid "Unable to send task information, the task does not exist"
 msgstr ""
 "Verschicken der Aufgabeninformationen nicht möglich, die Aufgabe existiert "
 "nicht"
 
-#: ../modules/itip-formatter/itip-view.c:5255
+#: ../modules/itip-formatter/itip-view.c:5247
 msgid "Unable to send memo information, the memo does not exist"
 msgstr ""
 "Verschicken der Notizinformationen nicht möglich, die Notiz existiert nicht"
 
 #. Translators: This is a default filename for a calendar.
-#: ../modules/itip-formatter/itip-view.c:5320
+#: ../modules/itip-formatter/itip-view.c:5312
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5325
+#: ../modules/itip-formatter/itip-view.c:5317
 msgid "Save Calendar"
 msgstr "Kalender speichern"
 
-#: ../modules/itip-formatter/itip-view.c:5378
-#: ../modules/itip-formatter/itip-view.c:5391
+#: ../modules/itip-formatter/itip-view.c:5366
+#: ../modules/itip-formatter/itip-view.c:5379
 msgid "The calendar attached is not valid"
 msgstr "Der beigelegte Kalender ist ungültig"
 
-#: ../modules/itip-formatter/itip-view.c:5379
-#: ../modules/itip-formatter/itip-view.c:5392
+#: ../modules/itip-formatter/itip-view.c:5367
+#: ../modules/itip-formatter/itip-view.c:5380
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -18124,15 +18150,15 @@ msgstr ""
 "Die Nachricht gibt an, einen Kalender zu enthalten. Dieser Kalender ist "
 "jedoch kein gültiger iCalendar."
 
-#: ../modules/itip-formatter/itip-view.c:5434
-#: ../modules/itip-formatter/itip-view.c:5464
-#: ../modules/itip-formatter/itip-view.c:5565
+#: ../modules/itip-formatter/itip-view.c:5422
+#: ../modules/itip-formatter/itip-view.c:5452
+#: ../modules/itip-formatter/itip-view.c:5553
 msgid "The item in the calendar is not valid"
 msgstr "Das Element im Kalender ist ungültig"
 
-#: ../modules/itip-formatter/itip-view.c:5435
-#: ../modules/itip-formatter/itip-view.c:5465
-#: ../modules/itip-formatter/itip-view.c:5566
+#: ../modules/itip-formatter/itip-view.c:5423
+#: ../modules/itip-formatter/itip-view.c:5453
+#: ../modules/itip-formatter/itip-view.c:5554
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18140,11 +18166,11 @@ msgstr ""
 "Die Nachricht enthält einen Kalender. Dieser beinhaltet allerdings keine "
 "Ereignisse, Aufgaben oder Verfügbarkeitsinformationen."
 
-#: ../modules/itip-formatter/itip-view.c:5480
+#: ../modules/itip-formatter/itip-view.c:5468
 msgid "The calendar attached contains multiple items"
 msgstr "Der beigelegte Kalender enthält mehrere Elemente."
 
-#: ../modules/itip-formatter/itip-view.c:5481
+#: ../modules/itip-formatter/itip-view.c:5469
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18152,24 +18178,24 @@ msgstr ""
 "Um alle diese Elemente weiterzuverarbeiten, sollte die Datei gespeichert und "
 "der Kalender importiert werden."
 
-#: ../modules/itip-formatter/itip-view.c:5969
+#: ../modules/itip-formatter/itip-view.c:5961
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Keine"
 
-#: ../modules/itip-formatter/itip-view.c:5985
+#: ../modules/itip-formatter/itip-view.c:5977
 msgid "Tentatively Accepted"
 msgstr "Vorläufig angenommen"
 
-#: ../modules/itip-formatter/itip-view.c:6128
+#: ../modules/itip-formatter/itip-view.c:6137
 msgid "This meeting recurs"
 msgstr "Diese Besprechung wird wiederholt"
 
-#: ../modules/itip-formatter/itip-view.c:6131
+#: ../modules/itip-formatter/itip-view.c:6140
 msgid "This task recurs"
 msgstr "Diese Aufgabe wird wiederholt"
 
-#: ../modules/itip-formatter/itip-view.c:6134
+#: ../modules/itip-formatter/itip-view.c:6143
 msgid "This memo recurs"
 msgstr "Diese Notiz wird wiederholt"
 
@@ -18270,7 +18296,7 @@ msgid "Choose a mbox spool directory"
 msgstr "Einen mbox-Spoolordner wählen"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:137
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:53
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:54
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:80
 #: ../modules/plugin-manager/evolution-plugin-manager.c:159
 msgid "Configuration"
@@ -18307,23 +18333,23 @@ msgstr "STARTTLS nach Verbinden"
 msgid "SSL on a dedicated port"
 msgstr "SSL auf einem dedizierten Port"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:69
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:70
 msgid "_Use custom binary, instead of 'sendmail'"
 msgstr "Benutzerdefinierte Binärdatei an Stelle von »sendmail« _verwenden"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:73
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:74
 msgid "_Custom binary:"
 msgstr "_Benutzerdefinierte Binärdatei:"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:90
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:91
 msgid "U_se custom arguments"
 msgstr "_Eigene Argumente verwenden"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:94
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:95
 msgid "Cus_tom arguments:"
 msgstr "_Eigene Argumente:"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:112
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:113
 msgid ""
 "Default arguments are '-i -f %F -- %R', where\n"
 "   %F - stands for the From address\n"
@@ -18333,6 +18359,10 @@ msgstr ""
 "   %F - repräsentiert die Von:-Adresse\n"
 "   %R - repräsentiert die Adresse des Empfängers"
 
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:128
+msgid "Send mail also when in offline _mode"
+msgstr "E-Mails auch im Offline-_Modus senden"
+
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:123
 msgid "Ser_ver requires authentication"
 msgstr "Server erfordert _Legitimation"
@@ -18349,440 +18379,446 @@ msgstr "Yahoo!-Funktionen"
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr "Ka_lender und Aufgabenlisten aus Yahoo! zu diesem Konto hinzufügen"
 
-#: ../modules/mail/e-mail-attachment-handler.c:404
+#: ../modules/mail/e-mail-attachment-handler.c:425
 #, c-format
 msgid "%d attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "%d beigelegte Nachricht"
 msgstr[1] "%d beigelegte Nachrichten"
 
-#: ../modules/mail/e-mail-shell-backend.c:238
+#: ../modules/mail/e-mail-shell-backend.c:237
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_E-Mail-Nachricht"
 
-#: ../modules/mail/e-mail-shell-backend.c:240
+#: ../modules/mail/e-mail-shell-backend.c:239
 msgid "Compose a new mail message"
 msgstr "Eine neue E-Mail-Nachricht verfassen"
 
-#: ../modules/mail/e-mail-shell-backend.c:248
+#: ../modules/mail/e-mail-shell-backend.c:247
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "E-Mail-Konto"
 
-#: ../modules/mail/e-mail-shell-backend.c:250
+#: ../modules/mail/e-mail-shell-backend.c:249
 msgid "Create a new mail account"
 msgstr "Ein neues E-Mail-Konto erstellen"
 
-#: ../modules/mail/e-mail-shell-backend.c:255
+#: ../modules/mail/e-mail-shell-backend.c:254
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "E-Mail-_Ordner"
 
-#: ../modules/mail/e-mail-shell-backend.c:257
+#: ../modules/mail/e-mail-shell-backend.c:256
 msgid "Create a new mail folder"
 msgstr "Einen neuen E-Mail-Ordner anlegen"
 
-#: ../modules/mail/e-mail-shell-backend.c:555
+#: ../modules/mail/e-mail-shell-backend.c:551
 msgid "Mail Accounts"
 msgstr "E-Mail-Konten"
 
-#: ../modules/mail/e-mail-shell-backend.c:564
+#: ../modules/mail/e-mail-shell-backend.c:560
 msgid "Mail Preferences"
 msgstr "E-Mail-Einstellungen"
 
-#: ../modules/mail/e-mail-shell-backend.c:573
+#: ../modules/mail/e-mail-shell-backend.c:569
 msgid "Composer Preferences"
 msgstr "Editoreinstellungen"
 
-#: ../modules/mail/e-mail-shell-backend.c:582
+#: ../modules/mail/e-mail-shell-backend.c:578
 msgid "Network Preferences"
 msgstr "Netzwerkeinstellungen"
 
 #. Translators: The first item in the list, to be able to set rule: [Label] [is/is-not] [None]
-#: ../modules/mail/e-mail-shell-backend.c:883
+#: ../modules/mail/e-mail-shell-backend.c:867
 msgctxt "label"
 msgid "None"
 msgstr "Keine"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1279
+#: ../modules/mail/e-mail-shell-view-actions.c:678
+msgid "Marking messages as read..."
+msgstr "Nachrichten werden als gelesen markiert …"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1530
 msgid "_Disable Account"
 msgstr "Konto _deaktivieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1281
+#: ../modules/mail/e-mail-shell-view-actions.c:1532
 msgid "Disable this account"
 msgstr "Dieses Konto deaktivieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1288
+#: ../modules/mail/e-mail-shell-view-actions.c:1539
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Alle gelöschten Nachrichten auf Dauer aus allen Ordnern entfernen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1295
+#: ../modules/mail/e-mail-shell-view-actions.c:1546
 msgid "Edit properties of this account"
 msgstr "Die Eigenschaften dieses Kontos bearbeiten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1300
+#: ../modules/mail/e-mail-shell-view-actions.c:1551
 msgid "_Refresh"
 msgstr "_Aktualisieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1302
+#: ../modules/mail/e-mail-shell-view-actions.c:1553
 msgid "Refresh list of folders of this account"
 msgstr "Die Ordnerliste dieses Kontos neu einlesen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1307
+#: ../modules/mail/e-mail-shell-view-actions.c:1558
 msgid "_Download Messages for Offline Usage"
 msgstr "_Nachrichten für Offline-Benutzung herunterladen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1309
+#: ../modules/mail/e-mail-shell-view-actions.c:1560
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 "Nachrichten von Konten/Ordnern herunterladen, die für den Offline-Modus "
 "markiert sind"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1314
+#: ../modules/mail/e-mail-shell-view-actions.c:1565
 msgid "Fl_ush Outbox"
 msgstr "E-Mails aus A_usgang verschicken"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1321
+#: ../modules/mail/e-mail-shell-view-actions.c:1572
 msgid "_Copy Folder To..."
 msgstr "Ordner _kopieren nach …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1323
+#: ../modules/mail/e-mail-shell-view-actions.c:1574
 msgid "Copy the selected folder into another folder"
 msgstr "Den gewählten Ordner in einen anderen Ordner kopieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1330
+#: ../modules/mail/e-mail-shell-view-actions.c:1581
 msgid "Permanently remove this folder"
 msgstr "Diesen Ordner dauerhaft entfernen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1335
+#: ../modules/mail/e-mail-shell-view-actions.c:1586
 msgid "E_xpunge"
 msgstr "_Säubern"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1337
+#: ../modules/mail/e-mail-shell-view-actions.c:1588
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Alle gelöschten Nachrichten auf Dauer aus diesem Ordner entfernen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1342
+#: ../modules/mail/e-mail-shell-view-actions.c:1593
+#: ../modules/mail/e-mail-shell-view-actions.c:1693
 msgid "Mar_k All Messages as Read"
 msgstr "Alle Nachrichten als gelesen _markieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1344
+#: ../modules/mail/e-mail-shell-view-actions.c:1595
+#: ../modules/mail/e-mail-shell-view-actions.c:1695
 msgid "Mark all messages in the folder as read"
 msgstr "Alle Nachrichten im Ordner als gelesen markieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1349
+#: ../modules/mail/e-mail-shell-view-actions.c:1600
 msgid "_Move Folder To..."
 msgstr "Ordner verschie_ben nach …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1351
+#: ../modules/mail/e-mail-shell-view-actions.c:1602
 msgid "Move the selected folder into another folder"
 msgstr "Den gewählten Ordner in einen anderen Ordner verschieben"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1356
+#: ../modules/mail/e-mail-shell-view-actions.c:1607
 msgid "_New..."
 msgstr "_Neu …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1358
+#: ../modules/mail/e-mail-shell-view-actions.c:1609
 msgid "Create a new folder for storing mail"
 msgstr "Einen neuen Ordner zum Ablegen von Nachrichten anlegen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1365
+#: ../modules/mail/e-mail-shell-view-actions.c:1616
 msgid "Change the properties of this folder"
 msgstr "Die Eigenschaften dieses Ordners ändern"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1372
+#: ../modules/mail/e-mail-shell-view-actions.c:1623
 msgid "Refresh the folder"
 msgstr "Den Ordner auffrischen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1379
+#: ../modules/mail/e-mail-shell-view-actions.c:1630
 msgid "Change the name of this folder"
 msgstr "Den Namen dieses Ordners ändern"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1384
+#: ../modules/mail/e-mail-shell-view-actions.c:1635
 msgid "Select Message _Thread"
 msgstr "Nachrichten-_Thread auswählen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1386
+#: ../modules/mail/e-mail-shell-view-actions.c:1637
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Alle Nachrichten im selben Thread wie die gewählte Nachricht markieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1391
+#: ../modules/mail/e-mail-shell-view-actions.c:1642
 msgid "Select Message S_ubthread"
 msgstr "Nachrichten-_Subthread auswählen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1393
+#: ../modules/mail/e-mail-shell-view-actions.c:1644
 msgid "Select all replies to the currently selected message"
 msgstr "Alle Antworten auf die momentan ausgewählten Nachricht auswählen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1405
+#: ../modules/mail/e-mail-shell-view-actions.c:1656
 msgid "Empty _Trash"
 msgstr "_Papierkorb leeren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1407
+#: ../modules/mail/e-mail-shell-view-actions.c:1658
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Alle gelöschten Nachrichten auf Dauer aus allen Konten entfernen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1412
+#: ../modules/mail/e-mail-shell-view-actions.c:1663
 msgid "_New Label"
 msgstr "_Neue Beschriftung"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1421
+#: ../modules/mail/e-mail-shell-view-actions.c:1672
 msgid "N_one"
 msgstr "_Keine"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1435
+#: ../modules/mail/e-mail-shell-view-actions.c:1686
 msgid "_Manage Subscriptions"
 msgstr "Abonnements _verwalten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1437
-#: ../modules/mail/e-mail-shell-view-actions.c:1514
+#: ../modules/mail/e-mail-shell-view-actions.c:1688
+#: ../modules/mail/e-mail-shell-view-actions.c:1772
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Ordner auf fernen Servern abonnieren oder abbestellen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1442
-#: ../modules/mail/e-mail-shell-view-actions.c:1463
+#: ../modules/mail/e-mail-shell-view-actions.c:1700
+#: ../modules/mail/e-mail-shell-view-actions.c:1721
 msgid "Send / _Receive"
 msgstr "Verschicken/Ab_rufen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1444
+#: ../modules/mail/e-mail-shell-view-actions.c:1702
 msgid "Send queued items and retrieve new items"
 msgstr "Objekte in der Warteschlange verschicken und neue Objekte abrufen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1449
+#: ../modules/mail/e-mail-shell-view-actions.c:1707
 msgid "R_eceive All"
-msgstr "Alle _empfangen"
+msgstr "Alle _abrufen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1451
+#: ../modules/mail/e-mail-shell-view-actions.c:1709
 msgid "Receive new items from all accounts"
 msgstr "Neue Objekte in von allen Konten empfangen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1456
+#: ../modules/mail/e-mail-shell-view-actions.c:1714
 msgid "_Send All"
 msgstr "Alle _verschicken"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1458
+#: ../modules/mail/e-mail-shell-view-actions.c:1716
 msgid "Send queued items in all accounts"
 msgstr "Objekte in den Warteschlangen aller Konten verschicken"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1486
+#: ../modules/mail/e-mail-shell-view-actions.c:1744
 msgid "Cancel the current mail operation"
 msgstr "Den momentan ausgeführten E-Mail-Vorgang abbrechen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1491
+#: ../modules/mail/e-mail-shell-view-actions.c:1749
 msgid "Collapse All _Threads"
 msgstr "Alle _Threads einklappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1493
+#: ../modules/mail/e-mail-shell-view-actions.c:1751
 msgid "Collapse all message threads"
 msgstr "Alle Nachrichten-Threads einklappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1498
+#: ../modules/mail/e-mail-shell-view-actions.c:1756
 msgid "E_xpand All Threads"
 msgstr "Alle Threads a_usklappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1500
+#: ../modules/mail/e-mail-shell-view-actions.c:1758
 msgid "Expand all message threads"
 msgstr "Alle Nachrichten-Threads ausklappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1505
+#: ../modules/mail/e-mail-shell-view-actions.c:1763
 msgid "_Message Filters"
 msgstr "Nachrichtenf_ilter"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1507
+#: ../modules/mail/e-mail-shell-view-actions.c:1765
 msgid "Create or edit rules for filtering new mail"
 msgstr "Regeln zum Filtern neuer E-Mails anlegen/bearbeiten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1512
+#: ../modules/mail/e-mail-shell-view-actions.c:1770
 msgid "_Subscriptions..."
 msgstr "A_bonnements …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1521
+#: ../modules/mail/e-mail-shell-view-actions.c:1779
 msgid "F_older"
 msgstr "_Ordner"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1528
+#: ../modules/mail/e-mail-shell-view-actions.c:1786
 msgid "_Label"
 msgstr "Bes_chriftung"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1545
+#: ../modules/mail/e-mail-shell-view-actions.c:1803
 msgid "C_reate Search Folder From Search..."
 msgstr "Sucho_rdner aus Suche anlegen …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1552
+#: ../modules/mail/e-mail-shell-view-actions.c:1810
 msgid "Search F_olders"
 msgstr "S_uchordner"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1554
+#: ../modules/mail/e-mail-shell-view-actions.c:1812
 msgid "Create or edit search folder definitions"
 msgstr "Suchordner-Definitionen anlegen oder bearbeiten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1593
+#: ../modules/mail/e-mail-shell-view-actions.c:1851
 msgid "_New Folder..."
 msgstr "Ordner a_nlegen …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1621
+#: ../modules/mail/e-mail-shell-view-actions.c:1879
 msgid "Show Message _Preview"
 msgstr "Nachrichten_vorschau anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1623
+#: ../modules/mail/e-mail-shell-view-actions.c:1881
 msgid "Show message preview pane"
 msgstr "Nachrichten-Vorschaufenster anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1629
+#: ../modules/mail/e-mail-shell-view-actions.c:1887
 msgid "Show _Deleted Messages"
 msgstr "Gel_öschte Nachrichten anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1631
+#: ../modules/mail/e-mail-shell-view-actions.c:1889
 msgid "Show deleted messages with a line through them"
 msgstr "Gelöschte Nachrichten (durchgestrichen) anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1637
+#: ../modules/mail/e-mail-shell-view-actions.c:1895
 msgid "_Group By Threads"
 msgstr "Nach Threads _gruppieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1639
+#: ../modules/mail/e-mail-shell-view-actions.c:1897
 msgid "Threaded message list"
 msgstr "Nachrichtenliste nach Threads sortieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1645
+#: ../modules/mail/e-mail-shell-view-actions.c:1903
 msgid "_Unmatched Folder Enabled"
 msgstr "Trefferlosen Suchordner _aktiviert"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1647
+#: ../modules/mail/e-mail-shell-view-actions.c:1905
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "Legt fest, ob trefferlose Suchordner aktiviert sind"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1667
+#: ../modules/mail/e-mail-shell-view-actions.c:1925
 msgid "Show message preview below the message list"
 msgstr "Nachrichtenvorschau unter der Nachrichtenliste anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1674
+#: ../modules/mail/e-mail-shell-view-actions.c:1932
 msgid "Show message preview alongside the message list"
 msgstr "Nachrichtenvorschau neben der Nachrichtenliste anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1682
+#: ../modules/mail/e-mail-shell-view-actions.c:1940
 msgid "All Messages"
 msgstr "Alle Nachrichten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1689
+#: ../modules/mail/e-mail-shell-view-actions.c:1947
 msgid "Important Messages"
 msgstr "Wichtige Nachrichten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1696
+#: ../modules/mail/e-mail-shell-view-actions.c:1954
 msgid "Last 5 Days' Messages"
 msgstr "Nachrichten der letzten fünf Tage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1703
+#: ../modules/mail/e-mail-shell-view-actions.c:1961
 msgid "Messages Not Junk"
 msgstr "Nachrichten sind nicht unerwünscht"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1710
+#: ../modules/mail/e-mail-shell-view-actions.c:1968
 msgid "Messages with Attachments"
 msgstr "Nachrichten mit Anlagen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1717
+#: ../modules/mail/e-mail-shell-view-actions.c:1975
 msgid "No Label"
 msgstr "Keine Beschriftung"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1724
+#: ../modules/mail/e-mail-shell-view-actions.c:1982
 msgid "Read Messages"
 msgstr "Gelesene Nachrichten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1731
+#: ../modules/mail/e-mail-shell-view-actions.c:1989
 msgid "Unread Messages"
 msgstr "Ungelesene Nachrichten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1783
+#: ../modules/mail/e-mail-shell-view-actions.c:2041
 msgid "Subject or Addresses contain"
 msgstr "Betreff oder Adresse enthält"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1793
+#: ../modules/mail/e-mail-shell-view-actions.c:2051
 msgid "All Accounts"
 msgstr "Alle Konten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1800
+#: ../modules/mail/e-mail-shell-view-actions.c:2058
 msgid "Current Account"
 msgstr "Derzeitiges Konto"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1807
+#: ../modules/mail/e-mail-shell-view-actions.c:2065
 msgid "Current Folder"
 msgstr "Derzeitiger Ordner"
 
-#: ../modules/mail/e-mail-shell-view.c:616
+#: ../modules/mail/e-mail-shell-view.c:617
 msgid "All Account Search"
 msgstr "Alle Konten durchsuchen"
 
-#: ../modules/mail/e-mail-shell-view.c:717
+#: ../modules/mail/e-mail-shell-view.c:721
 msgid "Account Search"
 msgstr "Konto durchsuchen"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1022
+#: ../modules/mail/e-mail-shell-view-private.c:1028
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d gewählt, "
 msgstr[1] "%d gewählt, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1033
+#: ../modules/mail/e-mail-shell-view-private.c:1039
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d gelöscht"
 msgstr[1] "%d gelöscht"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1039
-#: ../modules/mail/e-mail-shell-view-private.c:1046
+#: ../modules/mail/e-mail-shell-view-private.c:1045
+#: ../modules/mail/e-mail-shell-view-private.c:1052
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d unerwünscht"
 msgstr[1] "%d unerwünscht"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1052
+#: ../modules/mail/e-mail-shell-view-private.c:1058
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d Entwurf"
 msgstr[1] "%d Entwürfe"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1058
+#: ../modules/mail/e-mail-shell-view-private.c:1064
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d nicht verschickt"
 msgstr[1] "%d nicht verschickt"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1064
+#: ../modules/mail/e-mail-shell-view-private.c:1070
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d verschickt"
 msgstr[1] "%d verschickt"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1076
+#: ../modules/mail/e-mail-shell-view-private.c:1082
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d ungelesen, "
 msgstr[1] "%d ungelesen, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1079
+#: ../modules/mail/e-mail-shell-view-private.c:1085
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d insgesamt"
 msgstr[1] "%d insgesamt"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1102
+#: ../modules/mail/e-mail-shell-view-private.c:1108
 msgid "Trash"
 msgstr "Papierkorb"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1518
+#: ../modules/mail/e-mail-shell-view-private.c:1546
 msgid "Send / Receive"
 msgstr "Verschicken/Abrufen"
 
-#: ../modules/mail/em-composer-prefs.c:492
+#: ../modules/mail/em-composer-prefs.c:447
 msgid "Language(s)"
 msgstr "Sprache(n)"
 
@@ -18806,24 +18842,24 @@ msgstr "Einmal pro Monat beim Beenden"
 msgid "Immediately, on folder leave"
 msgstr "Sofort beim Verlassen des Ordners"
 
-#: ../modules/mail/em-mailer-prefs.c:313
+#: ../modules/mail/em-mailer-prefs.c:355
 msgid "Header"
 msgstr "Kopfzeile"
 
-#: ../modules/mail/em-mailer-prefs.c:317
+#: ../modules/mail/em-mailer-prefs.c:359
 msgid "Contains Value"
 msgstr "Enthält Wert"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail 
message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1141
+#: ../modules/mail/em-mailer-prefs.c:1214
 msgid "_Date header:"
 msgstr "_Datum in der Kopfzeile:"
 
-#: ../modules/mail/em-mailer-prefs.c:1142
+#: ../modules/mail/em-mailer-prefs.c:1215
 msgid "Show _original header value"
 msgstr "_Originalwert der Kopfzeile anzeigen"
 
-#: ../modules/mailto-handler/evolution-mailto-handler.c:146
+#: ../modules/mailto-handler/evolution-mailto-handler.c:142
 msgid "Do you want to make Evolution your default email client?"
 msgstr "Möchten Sie Evolution zu Ihrer bevorzugten E-Mail-Anwendung machen?"
 
@@ -18840,13 +18876,13 @@ msgstr "Ihre Nachricht an %s mit dem Betreff »%s« am %s wurde gelesen."
 msgid "Delivery Notification for \"%s\""
 msgstr "Zustellungsbestätigung für »%s«"
 
-#: ../modules/mdn/evolution-mdn.c:536
+#: ../modules/mdn/evolution-mdn.c:543
 #, c-format
 msgid "Send a read receipt to '%s'"
 msgstr "Eine Lesebestätigung an »%s« verschicken"
 
 #. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:541
+#: ../modules/mdn/evolution-mdn.c:548
 msgid "_Notify Sender"
 msgstr "Abse_nder benachrichtigen"
 
@@ -18884,26 +18920,6 @@ msgstr ""
 "Evolution wird in den Online-Modus zurückkehren, sobald eine "
 "Netzwerkverbindung hergestellt ist."
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:298
-msgid ""
-"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
-"from which to obtain an authentication token."
-msgstr ""
-"Es konnte kein zugehöriges Konto im org.gnome.OnlineAccounts-Dienst gefunden "
-"werden, von dem eine Authentifizierung bestätigt werden könnte."
-
-#: ../modules/online-accounts/camel-sasl-xoauth.c:380
-msgid "OAuth"
-msgstr "OAuth"
-
-#: ../modules/online-accounts/camel-sasl-xoauth.c:382
-msgid ""
-"This option will connect to the server by way of the GNOME Online Accounts "
-"service"
-msgstr ""
-"Diese Option stellt über den GNOME-Online-Konto-Dienst eine Verbindung zum "
-"Server her."
-
 #: ../modules/plugin-manager/evolution-plugin-manager.c:68
 msgid "Author(s)"
 msgstr "Autor(en)"
@@ -19076,7 +19092,7 @@ msgstr ""
 "Die folgenden Dialoge werden Ihnen helfen, Ihre E-Mail-Konten einzurichten "
 "und Dateien aus anderen Anwendungen zu importieren."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:239
+#: ../modules/startup-wizard/evolution-startup-wizard.c:229
 msgid "Loading accounts..."
 msgstr "Konten werden geladen …"
 
@@ -19088,11 +19104,11 @@ msgstr "_Formatieren als …"
 msgid "_Other languages"
 msgstr "_Andere Sprachen"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:371
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:367
 msgid "Text Highlight"
 msgstr "Texthervorhebung"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:372
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:368
 msgid "Syntax highlighting of mail parts"
 msgstr "Syntaxhervorhebung der Nachrichtenteile"
 
@@ -19312,36 +19328,36 @@ msgstr "_TCSH"
 msgid "_VHDL"
 msgstr "_VHDL"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:126
-#: ../modules/vcard-inline/e-mail-parser-vcard-inline.c:194
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:129
+#: ../modules/vcard-inline/e-mail-part-vcard.c:152
 msgid "Show F_ull vCard"
 msgstr "_Gesamte VCard anzeigen"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:129
-#: ../modules/vcard-inline/e-mail-parser-vcard-inline.c:212
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:132
+#: ../modules/vcard-inline/e-mail-part-vcard.c:170
 msgid "Show Com_pact vCard"
 msgstr "_Kompakte vCard anzeigen"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:153
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:157
 msgid "Save _To Addressbook"
 msgstr "_In Adressbuch speichern"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:173
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:178
 msgid "There is one other contact."
 msgstr "Es gibt einen weiteren Kontakt."
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:179
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:184
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "Es gibt %d weiteren Kontakt."
 msgstr[1] "Es gibt %d weitere Kontakte."
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:204
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:209
 msgid "Addressbook Contact"
 msgstr "Adressbuchkontakt"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:205
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:210
 msgid "Display the part as an addressbook contact"
 msgstr "Teil als Adressbuchkontakt anzeigen"
 
@@ -19354,7 +19370,7 @@ msgid "_Do not show this message again."
 msgstr "Diese _Meldung nicht mehr anzeigen."
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:583
-#: ../plugins/templates/templates.c:473
+#: ../plugins/templates/templates.c:480
 msgid "Keywords"
 msgstr "Schlüsselwörter"
 
@@ -19387,38 +19403,38 @@ msgstr "Anlagenerinnerung"
 msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr "Sie werden bei vergessener Anlage zur Nachricht erinnert."
 
-#: ../plugins/bbdb/bbdb.c:638 ../plugins/bbdb/bbdb.c:647
+#: ../plugins/bbdb/bbdb.c:627 ../plugins/bbdb/bbdb.c:636
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatische Kontakte"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:662
+#: ../plugins/bbdb/bbdb.c:651
 msgid "Create _address book entries when sending mails"
 msgstr ""
 "_Automatische Erstellung von Adressbucheinträgen bei Versendung von E-Mails"
 
-#: ../plugins/bbdb/bbdb.c:670
+#: ../plugins/bbdb/bbdb.c:658
 msgid "Select Address book for Automatic Contacts"
 msgstr "Adressbuch für automatische Kontakte auswählen"
 
-#: ../plugins/bbdb/bbdb.c:687
+#: ../plugins/bbdb/bbdb.c:675
 msgid "Instant Messaging Contacts"
 msgstr "Instant-Messaging-Kontakte"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:702
+#: ../plugins/bbdb/bbdb.c:690
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 "Kontaktinformationen und -bilder regelmäßig mit der Pidgin-Kontaktliste "
 "_abgleichen"
 
-#: ../plugins/bbdb/bbdb.c:710
+#: ../plugins/bbdb/bbdb.c:697
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Adressbuch für die Pidgin-Kontaktliste auswählen"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:723
+#: ../plugins/bbdb/bbdb.c:710
 msgid "Synchronize with _buddy list now"
 msgstr "Jetzt mit der _Buddy-Liste abgleichen"
 
@@ -19516,7 +19532,7 @@ msgid "Key"
 msgstr "Schlüssel"
 
 #: ../plugins/email-custom-header/email-custom-header.c:876
-#: ../plugins/templates/templates.c:482
+#: ../plugins/templates/templates.c:489
 msgid "Values"
 msgstr "Werte"
 
@@ -19657,56 +19673,56 @@ msgstr "Eingebettetes Bild"
 msgid "View image attachments directly in mail messages."
 msgstr "Bildanhänge direkt innerhalb von Nachrichten anzeigen."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:367
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:368
 msgid "Get List _Archive"
 msgstr "Listen_archiv abrufen"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:369
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:370
 msgid "Get an archive of the list this message belongs to"
 msgstr "Ein Archiv der Mailingliste dieser Nachricht abrufen"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:374
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:375
 msgid "Get List _Usage Information"
 msgstr "Ben_utzungsinformationen der Liste abrufen"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:376
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:377
 msgid "Get information about the usage of the list this message belongs to"
 msgstr ""
 "Informationen über die Nutzung der Mailingliste dieser Nachricht abrufen"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:381
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:382
 msgid "Contact List _Owner"
 msgstr "Kontaktlisten_besitzer"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:383
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:384
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "Kontakt zum Eigner der Mailingliste dieser Nachricht aufnehmen"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:388
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:389
 msgid "_Post Message to List"
 msgstr "_Nachricht an Liste schicken"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:390
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:391
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "Eine Nachricht an die Mailingliste der gewählten Nachricht verfassen"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:395
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:396
 msgid "_Subscribe to List"
 msgstr "Liste _abonnieren"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:397
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:398
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "Die Mailingliste der gewählten Nachricht abonnieren"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:402
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:403
 msgid "_Unsubscribe from List"
 msgstr "Liste _abbestellen"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:404
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:405
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "Die Mailingliste der gewählten Nachricht abbestellen"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:411
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:412
 msgid "Mailing _List"
 msgstr "Mailing_liste"
 
@@ -19809,6 +19825,13 @@ msgid_plural "You have received %d new messages."
 msgstr[0] "Sie haben %d neue Nachricht."
 msgstr[1] "Sie haben %d neue Nachrichten."
 
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user example com"
+#: ../plugins/mail-notification/mail-notification.c:395
+#, c-format
+msgid "From: %s"
+msgstr "Von: %s"
+
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
 #: ../plugins/mail-notification/mail-notification.c:409
@@ -19988,39 +20011,39 @@ msgstr ""
 "Die gewählte Notizliste ist schreibgeschützt, deshalb kann keine neue Notiz "
 "erstellt werden. Bitte wählen Sie eine andere Notizliste aus."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1199
+#: ../plugins/mail-to-task/mail-to-task.c:1196
 msgid "No writable calendar is available."
 msgstr "Keine schreibbarer Kalender verfügbar."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1277
+#: ../plugins/mail-to-task/mail-to-task.c:1273
 msgid "Create an _Appointment"
 msgstr "Einen neuen _Termin anlegen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1279
+#: ../plugins/mail-to-task/mail-to-task.c:1275
 msgid "Create a new event from the selected message"
 msgstr "Ein neues Ereignis mit Hilfe der gewählten Nachricht anlegen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1284
+#: ../plugins/mail-to-task/mail-to-task.c:1280
 msgid "Create a Mem_o"
 msgstr "Eine _Notiz anlegen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1286
+#: ../plugins/mail-to-task/mail-to-task.c:1282
 msgid "Create a new memo from the selected message"
 msgstr "Eine neue Notiz mit Hilfe der gewählten Nachricht anlegen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1291
+#: ../plugins/mail-to-task/mail-to-task.c:1287
 msgid "Create a _Task"
 msgstr "Eine _Aufgabe anlegen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1293
+#: ../plugins/mail-to-task/mail-to-task.c:1289
 msgid "Create a new task from the selected message"
 msgstr "Eine neue Aufgabe mit Hilfe der gewählten Nachricht anlegen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1301
+#: ../plugins/mail-to-task/mail-to-task.c:1297
 msgid "Create a _Meeting"
 msgstr "Eine _Besprechung anlegen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1303
+#: ../plugins/mail-to-task/mail-to-task.c:1299
 msgid "Create a new meeting from the selected message"
 msgstr "Eine neue Besprechung mit Hilfe der gewählten Nachricht anlegen"
 
@@ -20028,38 +20051,6 @@ msgstr "Eine neue Besprechung mit Hilfe der gewählten Nachricht anlegen"
 msgid "Convert a mail message to a task."
 msgstr "Eine Nachricht in eine neue Aufgabe umwandeln."
 
-#: ../plugins/mark-all-read/mark-all-read.c:42
-msgid "Also mark messages in subfolders?"
-msgstr "Auch auf Unterordner anwenden?"
-
-#: ../plugins/mark-all-read/mark-all-read.c:44
-msgid ""
-"Do you want to mark messages as read in the current folder only, or in the "
-"current folder as well as all subfolders?"
-msgstr ""
-"Sollen nur Nachrichten im gewählten Ordner als gelesen markiert werden, oder "
-"auch in seinen Unterordnern?"
-
-#: ../plugins/mark-all-read/mark-all-read.c:184
-msgid "In Current Folder and _Subfolders"
-msgstr "Im derzeitigen Ordner und in _Unterordnern"
-
-#: ../plugins/mark-all-read/mark-all-read.c:198
-msgid "In Current _Folder Only"
-msgstr "Nur im _derzeitigen Ordner"
-
-#: ../plugins/mark-all-read/mark-all-read.c:544
-msgid "Mark Me_ssages as Read"
-msgstr "Nachrichten als gelesen _markieren"
-
-#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
-msgid "Mark All Read"
-msgstr "Alles als gelesen markieren"
-
-#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-msgid "Mark all messages in a folder as read."
-msgstr "Alle Nachrichten in einem Ordner als gelesen markieren"
-
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Outlook PST import"
 msgstr "Outlook PST-Importeur"
@@ -20341,7 +20332,7 @@ msgstr "Variablen _einschließen in:"
 msgid "Comma separated values (.csv)"
 msgstr "Mit Kommata getrennte Werte (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:171 ../shell/e-shell-utils.c:197
+#: ../plugins/save-calendar/ical-format.c:171 ../shell/e-shell-utils.c:175
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
@@ -20398,31 +20389,31 @@ msgstr ""
 "durch die entsprechenden Werte aus einer Nachricht ersetzt, auf die Sie "
 "antworten."
 
-#: ../plugins/templates/templates.c:1135
+#: ../plugins/templates/templates.c:1148
 msgid "No Title"
 msgstr "Kein Titel"
 
-#: ../plugins/templates/templates.c:1244
+#: ../plugins/templates/templates.c:1257
 msgid "Save as _Template"
 msgstr "Als V_orlage speichern"
 
-#: ../plugins/templates/templates.c:1246
+#: ../plugins/templates/templates.c:1259
 msgid "Save as Template"
 msgstr "Als Vorlage speichern"
 
-#: ../shell/e-shell.c:307
+#: ../shell/e-shell.c:278
 msgid "Preparing to go offline..."
 msgstr "Offline-Betrieb wird vorbereitet …"
 
-#: ../shell/e-shell.c:360
+#: ../shell/e-shell.c:331
 msgid "Preparing to go online..."
 msgstr "Online-Betrieb wird vorbereitet …"
 
-#: ../shell/e-shell.c:434
+#: ../shell/e-shell.c:412
 msgid "Preparing to quit"
 msgstr "Beenden wird vorbereitet"
 
-#: ../shell/e-shell.c:440
+#: ../shell/e-shell.c:418
 msgid "Preparing to quit..."
 msgstr "Beenden wird vorbereitet …"
 
@@ -20438,31 +20429,31 @@ msgstr "Suche speichern"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:1143
+#: ../shell/e-shell-searchbar.c:1078
 msgid "Sho_w:"
 msgstr "An_zeigen: "
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1186
+#: ../shell/e-shell-searchbar.c:1112
 msgid "Sear_ch:"
 msgstr "S_uchen: "
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1272
+#: ../shell/e-shell-searchbar.c:1193
 msgid "i_n"
 msgstr " _in "
 
-#: ../shell/e-shell-utils.c:195
+#: ../shell/e-shell-utils.c:173
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:218
+#: ../shell/e-shell-utils.c:196
 msgid "All Files (*)"
 msgstr "Alle Dateien (*)"
 
-#: ../shell/e-shell-view.c:295
+#: ../shell/e-shell-view.c:293
 msgid "Saving user interface state"
 msgstr "Zustand der Benutzerschnittstelle wird gespeichert"
 
@@ -20493,273 +20484,273 @@ msgstr "Evolution-Webseite"
 msgid "Categories Editor"
 msgstr "Kategorien-Editor"
 
-#: ../shell/e-shell-window-actions.c:660
+#: ../shell/e-shell-window-actions.c:654
 msgid "Bug Buddy is not installed."
 msgstr "Bug-Buddy ist nicht installiert."
 
-#: ../shell/e-shell-window-actions.c:661
+#: ../shell/e-shell-window-actions.c:655
 msgid "Bug Buddy could not be run."
 msgstr "Bug-Buddy konnte nicht gestartet werden."
 
-#: ../shell/e-shell-window-actions.c:841
+#: ../shell/e-shell-window-actions.c:835
 msgid "Show information about Evolution"
 msgstr "Informationen zu Evolution anzeigen"
 
-#: ../shell/e-shell-window-actions.c:846 ../shell/e-shell-window-actions.c:860
+#: ../shell/e-shell-window-actions.c:840 ../shell/e-shell-window-actions.c:854
 msgid "_Close Window"
 msgstr "Fenster s_chließen"
 
-#: ../shell/e-shell-window-actions.c:867
+#: ../shell/e-shell-window-actions.c:861
 msgid "_Contents"
 msgstr "_Inhalte"
 
-#: ../shell/e-shell-window-actions.c:869
+#: ../shell/e-shell-window-actions.c:863
 msgid "Open the Evolution User Guide"
 msgstr "Das Benutzerhandbuch von Evolution öffnen"
 
-#: ../shell/e-shell-window-actions.c:895
+#: ../shell/e-shell-window-actions.c:889
 msgid "I_mport..."
 msgstr "Impor_tieren …"
 
-#: ../shell/e-shell-window-actions.c:897
+#: ../shell/e-shell-window-actions.c:891
 msgid "Import data from other programs"
 msgstr "Daten aus anderen Programmen importieren"
 
-#: ../shell/e-shell-window-actions.c:902
+#: ../shell/e-shell-window-actions.c:896
 msgid "New _Window"
 msgstr "Neues F_enster"
 
-#: ../shell/e-shell-window-actions.c:904
+#: ../shell/e-shell-window-actions.c:898
 msgid "Create a new window displaying this view"
 msgstr "Ein neues Fenster öffnen, das diese Ansicht anzeigt"
 
-#: ../shell/e-shell-window-actions.c:916
+#: ../shell/e-shell-window-actions.c:910
 msgid "Available Cate_gories"
 msgstr "Verfügbare Kate_gorien"
 
-#: ../shell/e-shell-window-actions.c:918
+#: ../shell/e-shell-window-actions.c:912
 msgid "Manage available categories"
 msgstr "Verfügbare Kategorien verwalten"
 
-#: ../shell/e-shell-window-actions.c:930
+#: ../shell/e-shell-window-actions.c:924
 msgid "_Quick Reference"
 msgstr "_Kurzreferenz"
 
-#: ../shell/e-shell-window-actions.c:932
+#: ../shell/e-shell-window-actions.c:926
 msgid "Show Evolution's shortcut keys"
 msgstr "Die Tastenkürzel von Evolution anzeigen"
 
-#: ../shell/e-shell-window-actions.c:939
+#: ../shell/e-shell-window-actions.c:933
 msgid "Exit the program"
 msgstr "Das Programm beenden"
 
-#: ../shell/e-shell-window-actions.c:944
+#: ../shell/e-shell-window-actions.c:938
 msgid "_Advanced Search..."
 msgstr "Er_weiterte Suche …"
 
-#: ../shell/e-shell-window-actions.c:946
+#: ../shell/e-shell-window-actions.c:940
 msgid "Construct a more advanced search"
 msgstr "Erweiterte Suche ausführen"
 
-#: ../shell/e-shell-window-actions.c:953
+#: ../shell/e-shell-window-actions.c:947
 msgid "Clear the current search parameters"
 msgstr "Die aktuellen Suchparameter leeren"
 
-#: ../shell/e-shell-window-actions.c:958
+#: ../shell/e-shell-window-actions.c:952
 msgid "_Edit Saved Searches..."
 msgstr "Gespeicherte Suchen _bearbeiten …"
 
-#: ../shell/e-shell-window-actions.c:960
+#: ../shell/e-shell-window-actions.c:954
 msgid "Manage your saved searches"
 msgstr "Ihre gespeicherten Suchvorgänge verwalten"
 
-#: ../shell/e-shell-window-actions.c:967
+#: ../shell/e-shell-window-actions.c:961
 msgid "Click here to change the search type"
 msgstr "Klicken Sie hier, um den Suchtypen zu ändern"
 
-#: ../shell/e-shell-window-actions.c:972
+#: ../shell/e-shell-window-actions.c:966
 msgid "_Find Now"
 msgstr "_Jetzt suchen"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:974
+#: ../shell/e-shell-window-actions.c:968
 msgid "Execute the current search parameters"
 msgstr "Die aktuellen Suchparameter anwenden"
 
-#: ../shell/e-shell-window-actions.c:979
+#: ../shell/e-shell-window-actions.c:973
 msgid "_Save Search..."
 msgstr "Suche _speichern …"
 
-#: ../shell/e-shell-window-actions.c:981
+#: ../shell/e-shell-window-actions.c:975
 msgid "Save the current search parameters"
 msgstr "Die aktuellen Suchparameter speichern"
 
-#: ../shell/e-shell-window-actions.c:993
+#: ../shell/e-shell-window-actions.c:987
 msgid "Submit _Bug Report..."
 msgstr "Fehler_bericht einschicken …"
 
-#: ../shell/e-shell-window-actions.c:995
+#: ../shell/e-shell-window-actions.c:989
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Einen Fehlerbericht mit Bug Buddy einschicken"
 
-#: ../shell/e-shell-window-actions.c:1000
+#: ../shell/e-shell-window-actions.c:994
 msgid "_Work Offline"
 msgstr "_Offline arbeiten"
 
-#: ../shell/e-shell-window-actions.c:1002
+#: ../shell/e-shell-window-actions.c:996
 msgid "Put Evolution into offline mode"
 msgstr "Evolution in den Offline-Modus versetzen"
 
-#: ../shell/e-shell-window-actions.c:1007
+#: ../shell/e-shell-window-actions.c:1001
 msgid "_Work Online"
 msgstr "_Online arbeiten"
 
-#: ../shell/e-shell-window-actions.c:1009
+#: ../shell/e-shell-window-actions.c:1003
 msgid "Put Evolution into online mode"
 msgstr "Evolution in den Online-Modus versetzen"
 
-#: ../shell/e-shell-window-actions.c:1037
+#: ../shell/e-shell-window-actions.c:1031
 msgid "Lay_out"
 msgstr "_Anordnung"
 
-#: ../shell/e-shell-window-actions.c:1044
+#: ../shell/e-shell-window-actions.c:1038
 msgid "_New"
 msgstr "_Neu"
 
-#: ../shell/e-shell-window-actions.c:1051
+#: ../shell/e-shell-window-actions.c:1045
 msgid "_Search"
 msgstr "_Suchen"
 
-#: ../shell/e-shell-window-actions.c:1058
+#: ../shell/e-shell-window-actions.c:1052
 msgid "_Switcher Appearance"
 msgstr "Erscheinungsbild der Knö_pfe"
 
-#: ../shell/e-shell-window-actions.c:1072
+#: ../shell/e-shell-window-actions.c:1066
 msgid "_Window"
 msgstr "_Fenster"
 
-#: ../shell/e-shell-window-actions.c:1101
+#: ../shell/e-shell-window-actions.c:1095
 msgid "Show Side _Bar"
 msgstr "Sei_tenleiste anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1103
+#: ../shell/e-shell-window-actions.c:1097
 msgid "Show the side bar"
 msgstr "Seitenleiste anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1109
+#: ../shell/e-shell-window-actions.c:1103
 msgid "Show _Buttons"
 msgstr "_Knöpfe anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1111
+#: ../shell/e-shell-window-actions.c:1105
 msgid "Show the switcher buttons"
 msgstr "Umschaltknöpfe anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1117
+#: ../shell/e-shell-window-actions.c:1111
 msgid "Show _Status Bar"
 msgstr "Stat_usleiste anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1119
+#: ../shell/e-shell-window-actions.c:1113
 msgid "Show the status bar"
 msgstr "Die Statusleiste anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1125
+#: ../shell/e-shell-window-actions.c:1119
 msgid "Show _Tool Bar"
 msgstr "_Werkzeugleiste anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1127
+#: ../shell/e-shell-window-actions.c:1121
 msgid "Show the tool bar"
 msgstr "Die Werkzeugleiste anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1149
+#: ../shell/e-shell-window-actions.c:1143
 msgid "_Icons Only"
 msgstr "Nur S_ymbole"
 
-#: ../shell/e-shell-window-actions.c:1151
+#: ../shell/e-shell-window-actions.c:1145
 msgid "Display window buttons with icons only"
 msgstr "Fensterknöpfe nur als Symbole anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1156
+#: ../shell/e-shell-window-actions.c:1150
 msgid "_Text Only"
 msgstr "Nur _Text"
 
-#: ../shell/e-shell-window-actions.c:1158
+#: ../shell/e-shell-window-actions.c:1152
 msgid "Display window buttons with text only"
 msgstr "Fensterknöpfe nur als Text anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1163
+#: ../shell/e-shell-window-actions.c:1157
 msgid "Icons _and Text"
 msgstr "Symbole _und Text"
 
-#: ../shell/e-shell-window-actions.c:1165
+#: ../shell/e-shell-window-actions.c:1159
 msgid "Display window buttons with icons and text"
 msgstr "Fensterknöpfe mit Symbolen und Text anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1170
+#: ../shell/e-shell-window-actions.c:1164
 msgid "Tool_bar Style"
 msgstr "_Werkzeugleistenstil"
 
-#: ../shell/e-shell-window-actions.c:1172
+#: ../shell/e-shell-window-actions.c:1166
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "Fensterknöpfe mit der Systemeinstellung für Werkzeugleisten anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1180
+#: ../shell/e-shell-window-actions.c:1174
 msgid "Define Views..."
 msgstr "Ansichten definieren …"
 
-#: ../shell/e-shell-window-actions.c:1182
+#: ../shell/e-shell-window-actions.c:1176
 msgid "Create or edit views"
 msgstr "Ansicht er_stellen oder bearbeiten"
 
-#: ../shell/e-shell-window-actions.c:1187
+#: ../shell/e-shell-window-actions.c:1181
 msgid "Save Custom View..."
 msgstr "Benutzerdefinierte Ansicht speichern …"
 
-#: ../shell/e-shell-window-actions.c:1189
+#: ../shell/e-shell-window-actions.c:1183
 msgid "Save current custom view"
 msgstr "Aktuelle benutzerdefinierte Ansicht speichern"
 
-#: ../shell/e-shell-window-actions.c:1196
+#: ../shell/e-shell-window-actions.c:1190
 msgid "C_urrent View"
 msgstr "A_ktuelle Ansicht"
 
-#: ../shell/e-shell-window-actions.c:1206
+#: ../shell/e-shell-window-actions.c:1200
 msgid "Custom View"
 msgstr "Benutzerdefinierte Ansicht"
 
-#: ../shell/e-shell-window-actions.c:1208
+#: ../shell/e-shell-window-actions.c:1202
 msgid "Current view is a customized view"
 msgstr "Aktuelle Ansicht ist eine benutzerdefinierte Ansicht"
 
-#: ../shell/e-shell-window-actions.c:1218
+#: ../shell/e-shell-window-actions.c:1212
 msgid "Change the page settings for your current printer"
 msgstr "Die Seiteneinstellungen für Ihren aktuellen Drucker ändern"
 
-#: ../shell/e-shell-window-actions.c:1608
+#: ../shell/e-shell-window-actions.c:1573
 #, c-format
 msgid "Switch to %s"
 msgstr "Zu %s wechseln"
 
-#: ../shell/e-shell-window-actions.c:1729
+#: ../shell/e-shell-window-actions.c:1694
 #, c-format
 msgid "Select view: %s"
 msgstr "Ansicht wählen: %s"
 
-#: ../shell/e-shell-window-actions.c:1830
+#: ../shell/e-shell-window-actions.c:1795
 msgid "Execute these search parameters"
 msgstr "Diese Suchparameter ausführen"
 
-#: ../shell/e-shell-window.c:497
+#: ../shell/e-shell-window.c:439
 msgid "New"
 msgstr "Neu"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:585
+#: ../shell/e-shell-window-private.c:580
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:182
+#: ../shell/main.c:184
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20798,7 +20789,7 @@ msgstr ""
 "Wir hoffen, dass Ihnen das Ergebnis unserer harten Arbeit\n"
 "gefällt und freuen uns auf Ihren Beitrag zu diesem Projekt!\n"
 
-#: ../shell/main.c:206
+#: ../shell/main.c:208
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20806,7 +20797,7 @@ msgstr ""
 "Vielen Dank\n"
 "Das Evolution-Team\n"
 
-#: ../shell/main.c:212
+#: ../shell/main.c:214
 msgid "Do not tell me again"
 msgstr "Nicht mehr anzeigen"
 
@@ -20832,33 +20823,29 @@ msgstr "Im Online-Modus starten"
 msgid "Ignore network availability"
 msgstr "Verfügbarkeit des Netzwerks ignorieren"
 
-#: ../shell/main.c:315
-msgid "Start in \"express\" mode"
-msgstr "Im Express-Modus starten"
-
-#: ../shell/main.c:318
+#: ../shell/main.c:316
 msgid "Forcibly shut down Evolution"
 msgstr "Evolution zum Herunterfahren zwingen"
 
-#: ../shell/main.c:321
+#: ../shell/main.c:319
 msgid "Disable loading of any plugins."
 msgstr "Das Laden von allen Plugins deaktivieren."
 
-#: ../shell/main.c:323
+#: ../shell/main.c:321
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Die Vorschau von E-Mails, Kontakten und Aufgaben deaktivieren."
 
-#: ../shell/main.c:327
+#: ../shell/main.c:325
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr ""
 "Adressen oder Dateinamen importieren, die als restliche Argumente angegeben "
 "wurden."
 
-#: ../shell/main.c:329
+#: ../shell/main.c:327
 msgid "Request a running Evolution process to quit"
 msgstr "Einen laufenden Evolution-Prozess zum Beenden auffordern"
 
-#: ../shell/main.c:419
+#: ../shell/main.c:404
 #, c-format
 msgid ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. "
@@ -20867,11 +20854,11 @@ msgstr ""
 "Evolution kann nicht gestartet werden. Eine andere Instanz von Evolution "
 "könnte nicht reagieren. Systemfehler: %s"
 
-#: ../shell/main.c:515 ../shell/main.c:520
+#: ../shell/main.c:500 ../shell/main.c:505
 msgid "- The Evolution PIM and Email Client"
 msgstr "– Die Evolution PIM- und E-Mail-Anwendung"
 
-#: ../shell/main.c:587
+#: ../shell/main.c:572
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20880,7 +20867,7 @@ msgstr ""
 "%s: »--online« und »--offline« können nicht gemeinsam verwendet werden.\n"
 "  Rufen Sie »%s --help« auf, um weitere Informationen zu erhalten.\n"
 
-#: ../shell/main.c:593
+#: ../shell/main.c:578
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -21127,17 +21114,23 @@ msgstr ""
 "ausgestellt hat. Daher vertrauen Sie der Authentizität dieses Zertifikats "
 "nicht, falls Sie es hier nicht anders angeben."
 
-#: ../smime/gui/component.c:51
+# token ?
+#: ../smime/gui/component.c:56
+#, c-format
+msgid "Enter the password for '%s', token '%s'"
+msgstr "Geben Sie das Passwort für »%s« ein, Token »%s«"
+
+#: ../smime/gui/component.c:58
 #, c-format
 msgid "Enter the password for '%s'"
 msgstr "Geben Sie das Passwort für »%s« ein"
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:77
+#: ../smime/gui/component.c:86
 msgid "Enter new password for certificate database"
 msgstr "Geben Sie ein neues Passwort für die Zertifikatdatenbank ein"
 
-#: ../smime/gui/component.c:80
+#: ../smime/gui/component.c:89
 msgid "Enter new password"
 msgstr "Neues Passwort eingeben"
 
@@ -21529,20 +21522,19 @@ msgstr "Mit _Fälligkeitsdatum"
 msgid "With _Status"
 msgstr "Mit _Status"
 
-#~ msgid "Export in asynchronous mode"
-#~ msgstr "Im asynchronen Modus exportieren"
+#~ msgid "Web Page"
+#~ msgstr "Website"
 
-#~ msgid ""
-#~ "The number of cards in one output file in asynchronous mode, default size "
-#~ "100."
-#~ msgstr ""
-#~ "Die Anzahl der Karten pro Ausgabedatei im asynchronen Modus, Vorgabe: 100."
+#~ msgid "Stat_us:"
+#~ msgstr "Stat_us:"
 
-#~ msgid "NUMBER"
-#~ msgstr "ANZAHL"
+#~ msgid "_Status Details"
+#~ msgstr "S_tatusdetails"
 
-#~ msgid "In async mode, output must be file."
-#~ msgstr "Im asynchronen Modus muss die Ausgabe in eine Datei erfolgen."
+#~ msgid "Click to change or view the status details of the task"
+#~ msgstr ""
+#~ "Klicken Sie hier, um die Statusdetails der Aufgabe anzusehen oder zu "
+#~ "ändern."
 
-#~ msgid "In normal mode, there is no need for the size option."
-#~ msgstr "Im normalen Modus müssen Sie die Größe nicht angeben."
+#~ msgid "Task Details"
+#~ msgstr "Aufgabendetails"



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