[evolution] [i18n] Updated German translation

From: Mario Blättermann <mariobl src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution] [i18n] Updated German translation
Date: Thu, 15 Jul 2010 19:56:11 +0000 (UTC)
commit 8a25ad9f15c2404f89c84b2e7fc051fba0f18b1f
Author: Mario BlÃ¤ttermann <mariobl gnome org>
Date:   Thu Jul 15 21:55:22 2010 +0200

    [i18n] Updated German translation

 po/de.po | 6665 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 3643 insertions(+), 3022 deletions(-)
---
diff --git a/po/de.po b/po/de.po
index f5a62ef..d5751fd 100644
--- a/po/de.po
+++ b/po/de.po
@@ -25,8 +25,8 @@ msgstr ""
 "Project-Id-Version: evolution master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution\n"
-"POT-Creation-Date: 2010-04-30 17:01+0000\n"
-"PO-Revision-Date: 2010-05-02 13:25+0100\n"
+"POT-Creation-Date: 2010-07-15 17:15+0000\n"
+"PO-Revision-Date: 2010-07-15 21:51+0100\n"
 "Last-Translator: Mario BlÃ¤ttermann <mariobl gnome org>\n"
 "Language-Team: Deutsch <gnome-de gnome org>\n"
 "MIME-Version: 1.0\n"
@@ -105,45 +105,50 @@ msgid "Delete address book '{0}'?"
 msgstr "Adressbuch Â»{0}Â« lÃ¶schen?"
 
 #: ../addressbook/addressbook.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
+msgid "Do _Not Delete"
+msgstr "_Nicht lÃ¶schen"
+
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Fehler beim Speichern von {0} in {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:15
 msgid "Failed to authenticate with LDAP server."
 msgstr "Legitimation am LDAP-Server gescheitert."
 
 #. Unknown error
-#: ../addressbook/addressbook.error.xml.h:15
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1266
+#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1273
 msgid "Failed to delete contact"
 msgstr "Kontakt konnte nicht gelÃ¶scht werden"
 
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "GroupWise Address book creation:"
 msgstr "GroupWise-Adressbucherstellung:"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "LDAP server did not respond with valid schema information."
 msgstr "Server antwortete nicht mit gÃ¼ltigen Schemainformationen."
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "Some features may not work properly with your current server"
 msgstr ""
 "Einige Funktionen werden mit Ihrem Server mÃ¶glicherweise nicht einwandfrei "
 "arbeiten"
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "Das Evolution-Adressbuch wurde unerwartet beendet."
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:21
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 "Das ausgewÃ¤hlte Bild ist groÃ?. MÃ¶chten Sie die GrÃ¶Ã?e des Bildes Ã¤ndern und es "
 "speichern?"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:22
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
@@ -153,16 +158,16 @@ msgstr ""
 "Funktionen nicht unterstÃ¼tzt, oder er ist fehlerhaft konfiguriert. Fragen Sie "
 "Ihren Systemadministrator nach unterstÃ¼tzten Suchbasen."
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "This address book could not be opened."
 msgstr "Dieses Adressbuch konnte nicht geÃ¶ffnet werden."
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "This address book server does not have any suggested search bases."
 msgstr ""
 "Dieser Adressbuch-Server verfÃ¼gt Ã¼ber keine der unterstÃ¼tzten Suchbasen."
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:25
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -170,31 +175,31 @@ msgstr ""
 "MÃ¶glicherweise ist dieser Adressbuch-Server nicht erreichbar, Sie haben den "
 "Server-Namen falsch angegeben oder Ihre Netzwerkverbindung ist inaktiv."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This address book will be removed permanently."
 msgstr "Dieses Adressbuch wird unwiderruflich gelÃ¶scht."
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Dieser Server unterstÃ¼tzt keine LDAPv3-Schemainformationen."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "Unable to open address book"
 msgstr "Adressbuch konnte nicht geÃ¶ffnet werden"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to perform search."
 msgstr "Suche konnte nicht durchgefÃ¼hrt werden."
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to save {0}."
 msgstr "{0} konnte nicht gespeichert werden."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Would you like to save your changes?"
 msgstr "Wollen Sie die vorgenommenen Ã?nderungen speichern?"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:32
 msgid ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -203,7 +208,7 @@ msgstr ""
 "dieser nicht aus dem Quelladressbuch entfernt werden. Wollen Sie stattdessen "
 "eine Kopie speichern?"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:33
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to a "
@@ -214,13 +219,13 @@ msgstr ""
 "eine bestmÃ¶gliche Zusammenarbeit sollte der Server auf eine unterstÃ¼tzte "
 "Version aktualisiert werden."
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "You do not have permission to delete contacts in this address book."
 msgstr ""
 "Sie haben keine ausreichenden Rechte um Kontakte in diesem Adressbuch zu "
 "lÃ¶schen."
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:35
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
@@ -228,53 +233,39 @@ msgstr ""
 "Sie haben Ã?nderungen an diesem Kontakt vorgenommen. Wollen Sie diese "
 "speichern?"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:36
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Ihre Kontakte fÃ¼r {0} sind nicht verfÃ¼gbar, solange Evolution nicht neu "
 "gestartet wurde."
 
-#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:521
+#: ../addressbook/addressbook.error.xml.h:37 ../mail/em-vfolder-rule.c:525
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
 #: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "_HinzufÃ¼gen"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:38
 msgid "_Discard"
 msgstr "_Verwerfen"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Do not save"
 msgstr "_Nicht speichern"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "_Resize"
 msgstr "_GrÃ¶Ã?e verÃ¤ndern"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:41
 msgid "_Use as it is"
 msgstr "_Wie es ist benutzen"
 
-#: ../addressbook/conduit/address-conduit.c:597
-msgid "Default Sync Address:"
-msgstr "Voreingestellte Adresse fÃ¼r Datenabgleich:"
-
-#: ../addressbook/conduit/address-conduit.c:1631
-#: ../addressbook/conduit/address-conduit.c:1632
-msgid "Could not load address book"
-msgstr "Adressbuch konnte nicht geladen werden"
-
-#: ../addressbook/conduit/address-conduit.c:1709
-#: ../addressbook/conduit/address-conduit.c:1712
-msgid "Could not read pilot's Address application block"
-msgstr "Adress-Anwendungsblock des Pilot konnte nicht gelesen werden"
-
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:2005
+#: ../calendar/gui/e-calendar-view.c:2022
 msgid "Anniversary"
 msgstr "Jahrestag"
 
@@ -285,19 +276,18 @@ msgstr "Jahrestag"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:2004 ../capplet/anjal-settings-main.c:118
-#: ../shell/main.c:107
+#: ../calendar/gui/e-calendar-view.c:2021 ../capplet/anjal-settings-main.c:118
+#: ../shell/main.c:118
 msgid "Birthday"
 msgstr "Geburtstag"
 
 #. Translators: an accessibility name
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
-#| msgid "Blog"
 msgid "Blog:"
 msgstr "Blog:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:7
+#: ../calendar/gui/dialogs/event-page.ui.h:10
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "Ka_tegorien â?¦"
@@ -307,23 +297,24 @@ msgid "Calendar:"
 msgstr "Kalender:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
+#: ../addressbook/importers/evolution-vcard-importer.c:934
 msgid "Contact"
 msgstr "Kontakt"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:590
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:605
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2568
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2584
 msgid "Contact Editor"
 msgstr "Kontakteditor"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:291
+#: ../addressbook/gui/merging/eab-contact-merging.c:295
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:517
 #: ../addressbook/gui/widgets/eab-contact-display.c:525
 #: ../addressbook/gui/widgets/eab-contact-display.c:811
-#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:823
+#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:832
 msgid "Email"
 msgstr "E-Mail"
 
@@ -382,7 +373,7 @@ msgstr "Notizen"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1711
+#: ../calendar/gui/e-calendar-view.c:1725
 msgid "Other"
 msgstr "Weitere"
 
@@ -403,111 +394,114 @@ msgid "Web Addresses"
 msgstr "Web-Adressen"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+msgid "Web addresses"
+msgstr "Web-Adressen"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:69
 #: ../addressbook/gui/widgets/eab-contact-display.c:569
 msgid "Work"
 msgstr "GeschÃ¤ftlich"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Anniversary:"
 msgstr "_Jahrestag:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
 msgid "_Assistant:"
 msgstr "_Assistent:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
 msgid "_Birthday:"
 msgstr "_Geburtstag:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
-#| msgid "Blog"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
 msgid "_Blog:"
 msgstr "_Blog:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
-#: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../calendar/gui/dialogs/event-page.c:882
+#: ../calendar/gui/dialogs/event-page.ui.h:17
 #: ../plugins/itip-formatter/itip-view.c:1921
 msgid "_Calendar:"
 msgstr "_Kalender:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_City:"
 msgstr "S_tadt:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_Company:"
 msgstr "_Firma:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_Country:"
 msgstr "_Land:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_Department:"
 msgstr "A_bteilung:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 msgid "_File under:"
 msgstr "_Einsortieren als:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "_Free/Busy:"
 msgstr "_VerfÃ¼gbarkeit:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "_Home Page:"
 msgstr "_Homepage:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Manager:"
 msgstr "V_orgesetzter:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_Office:"
 msgstr "BÃ¼_ro:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_PO Box:"
 msgstr "_Postfach:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
 msgid "_Profession:"
 msgstr "Ber_uf:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_Spouse:"
 msgstr "E_hepartner:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
 msgid "_State/Province:"
 msgstr "_Bundesstaat/Provinz:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 #: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Title:"
 msgstr "_Titel:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
 msgid "_Video Chat:"
 msgstr "_Video-Chat:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 msgid "_Wants to receive HTML mail"
 msgstr "WÃ¼nscht _HTML-E-Mails"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "_Where:"
 msgstr "_In:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:51
 msgid "_Zip/Postal Code:"
 msgstr "Postleit_zahl:"
 
@@ -552,7 +546,7 @@ msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:209
-#: ../addressbook/gui/widgets/eab-gui-util.c:377
+#: ../addressbook/gui/widgets/eab-gui-util.c:353
 msgid "Error adding contact"
 msgstr "Fehler beim HinzufÃ¼gen eines Kontakts"
 
@@ -565,20 +559,20 @@ msgid "Error removing contact"
 msgstr "Fehler beim Entfernen eines Kontakts"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2563
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2579
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontakteditor - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2971
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2987
 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:2972
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2988
 msgid "_No image"
 msgstr "_Kein Bild"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3245
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3261
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -586,23 +580,23 @@ msgstr ""
 "Die Kontaktdaten sind ungÃ¼ltig:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3249
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3265
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "Â»%sÂ« hat ein ungÃ¼ltiges Format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3256
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3272
 #, 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:3271
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3282
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3298
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%sÂ»%sÂ« ist leer"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3296
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3312
 msgid "Invalid contact."
 msgstr "Kontakt ungÃ¼ltig."
 
@@ -692,7 +686,7 @@ msgid "_Suffix:"
 msgstr "_Suffix:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:676
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:666
 msgid "Contact List Editor"
 msgstr "Kontaktlisteneditor"
 
@@ -709,7 +703,7 @@ msgid "_List name:"
 msgstr "_Listenname:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:173
 msgid "_Select..."
 msgstr "A_uswÃ¤hlen â?¦"
 
@@ -719,24 +713,24 @@ msgstr ""
 "_Geben Sie eine E-Mail-Adresse ein oder ziehen Sie einen Kontakt auf die "
 "unten stehende Liste:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:769
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
 msgid "Contact List Members"
 msgstr "Kontaktlistenmitglieder"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:917
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1333
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:911
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1328
 msgid "_Members"
 msgstr "_Mitglieder"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1172
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1166
 msgid "Error adding list"
 msgstr "Fehler beim HinzufÃ¼gen einer Liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1186
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1180
 msgid "Error modifying list"
 msgstr "Fehler beim Ã?ndern einer Liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1200
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1194
 msgid "Error removing list"
 msgstr "Fehler beim Entfernen einer Liste"
 
@@ -778,11 +772,17 @@ msgstr ""
 "bereits in diesem Ordner. Soll er dennoch hinzugefÃ¼gt werden?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:237
+#: ../addressbook/gui/merging/eab-contact-merging.c:241
 msgid "_Merge"
 msgstr "_ZusammenfÃ¼hren"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:220
+#: ../addressbook/gui/merging/eab-contact-merging.c:166
+#: ../addressbook/util/addressbook.c:245 ../calendar/gui/tasktypes.xml.h:7
+#, c-format
+msgid "Cancelled"
+msgstr "Abgebrochen"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:224
 msgid "Merge Contact"
 msgstr "Kontakte zusammenfÃ¼hren"
 
@@ -790,9 +790,9 @@ msgstr "Kontakte zusammenfÃ¼hren"
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
 #: ../modules/addressbook/e-book-shell-view-actions.c:904
-#: ../modules/calendar/e-cal-shell-view-actions.c:1653
-#: ../modules/calendar/e-memo-shell-view-actions.c:758
-#: ../modules/calendar/e-task-shell-view-actions.c:958
+#: ../modules/calendar/e-cal-shell-view-actions.c:1687
+#: ../modules/calendar/e-memo-shell-view-actions.c:768
+#: ../modules/calendar/e-task-shell-view-actions.c:967
 msgid "Any field contains"
 msgstr "Ein beliebiges Feld enthÃ¤lt"
 
@@ -806,22 +806,22 @@ msgstr "E-Mail-Adresse beginnt mit"
 msgid "Name contains"
 msgstr "Name enthÃ¤lt"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:142
+#: ../addressbook/gui/widgets/e-addressbook-model.c:143
 msgid "No contacts"
 msgstr "Keine Kontakte"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:146
+#: ../addressbook/gui/widgets/e-addressbook-model.c:147
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d Kontakte"
 msgstr[1] "%d Kontakte"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:307
+#: ../addressbook/gui/widgets/e-addressbook-model.c:317
 msgid "Error getting book view"
 msgstr "Fehler beim Abrufen der Buchansicht"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:706
+#: ../addressbook/gui/widgets/e-addressbook-model.c:716
 msgid "Search Interrupted"
 msgstr "Suche wurde unterbrochen"
 
@@ -829,54 +829,54 @@ msgstr "Suche wurde unterbrochen"
 msgid "Error modifying card"
 msgstr "Fehler beim Ã?ndern einer Karte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:618
+#: ../addressbook/gui/widgets/e-addressbook-view.c:622
 msgid "Cut selected contacts to the clipboard"
 msgstr "AusgewÃ¤hlte Kontakte in die Zwischenablage ausschneiden"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:624
+#: ../addressbook/gui/widgets/e-addressbook-view.c:628
 msgid "Copy selected contacts to the clipboard"
 msgstr "AusgewÃ¤hlte Kontakte in die Zwischenablage kopieren"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:630
+#: ../addressbook/gui/widgets/e-addressbook-view.c:634
 msgid "Paste contacts from the clipboard"
 msgstr "Kontakte aus der Zwischenablage einfÃ¼gen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:636
+#: ../addressbook/gui/widgets/e-addressbook-view.c:640
 #: ../modules/addressbook/e-book-shell-view-actions.c:729
 msgid "Delete selected contacts"
 msgstr "Die gewÃ¤hlten Kontakte lÃ¶schen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:642
+#: ../addressbook/gui/widgets/e-addressbook-view.c:646
 msgid "Select all visible contacts"
 msgstr "Alle sichtbaren Kontakte auswÃ¤hlen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1284
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1291
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Sind Sie sicher, dass Sie diese Kontaktlisten lÃ¶schen wollen?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1288
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1295
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Sind Sie sicher, dass Sie diese Kontaktliste lÃ¶schen wollen?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1292
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Sind Sie sicher, dass Sie diese Kontaktliste lÃ¶schen wollen (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1298
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1305
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Sind Sie sicher, dass Sie diese Kontakte lÃ¶schen wollen?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1302
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1309
 msgid "Are you sure you want to delete this contact?"
 msgstr "Sind Sie sicher, dass Sie diesen Kontakt lÃ¶schen wollen?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1306
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1313
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Sind Sie sicher, dass Sie diesen Kontakt lÃ¶schen wollen (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1461
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1468
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -885,11 +885,11 @@ msgstr ""
 "Das Ã?ffnen von %d Kontakten wÃ¼rde dazu fÃ¼hren, dass %d zusÃ¤tzliche Fenster "
 "geÃ¶ffnet werden. Wollen Sie wirklich diese Kontakte anzeigen?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1466
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1473
 msgid "_Don't Display"
 msgstr "_Nicht anzeigen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1467
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1474
 msgid "Display _All Contacts"
 msgstr "_Alle Kontakte anzeigen"
 
@@ -923,7 +923,7 @@ msgid "Car Phone"
 msgstr "Autotelefon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -1024,7 +1024,7 @@ msgid "Radio"
 msgstr "Funk"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:578
+#: ../calendar/gui/e-meeting-list-view.c:569
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Position"
@@ -1128,13 +1128,13 @@ msgid "Home Email"
 msgstr "E-Mail, privat"
 
 #: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:805
+#: ../addressbook/gui/widgets/e-minicard.c:807
 msgid "Other Email"
 msgstr "Weitere E-Mail-Adresse"
 
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:95
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:104
-#: ../addressbook/gui/widgets/ea-minicard-view.c:178
+#: ../addressbook/gui/widgets/ea-minicard-view.c:184
 msgid "evolution address book"
 msgstr "Evolution-Adressbuch"
 
@@ -1146,7 +1146,7 @@ msgstr "Neuer Kontakt"
 msgid "New Contact List"
 msgstr "Neue Kontaktliste"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:161
+#: ../addressbook/gui/widgets/ea-minicard-view.c:167
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -1174,17 +1174,17 @@ msgid "Copy _Email Address"
 msgstr "_E-Mail-Adresse kopieren"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:381
+#: ../widgets/misc/e-web-view.c:391
 msgid "Copy the email address to the clipboard"
 msgstr "E-Mail-Adresse in die Zwischenablage kopieren"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:386
+#: ../widgets/misc/e-web-view.c:396
 msgid "_Send New Message To..."
 msgstr "Neue Nachricht _schicken an â?¦"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:388
+#: ../widgets/misc/e-web-view.c:398
 msgid "Send a mail message to this address"
 msgstr "Eine Nachricht an diese Adresse senden"
 
@@ -1223,7 +1223,7 @@ msgstr "Video-Chat"
 #: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../modules/calendar/e-cal-shell-view-actions.c:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:496
+#: ../modules/calendar/e-cal-shell-view.c:488
 #: ../plugins/groupwise-features/camel-gw-listener.c:421
 #: ../plugins/groupwise-features/camel-gw-listener.c:446
 #: ../plugins/groupwise-features/camel-gw-listener.c:561
@@ -1234,7 +1234,8 @@ msgstr "Kalender"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:563
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
-#: ../calendar/gui/dialogs/event-editor.c:116
+#: ../calendar/gui/dialogs/event-editor.c:128
+#: ../calendar/gui/dialogs/event-editor.c:355
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "VerfÃ¼gbarkeit"
@@ -1267,14 +1268,14 @@ msgstr "Weblog"
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
 #: ../capplet/settings/mail-capplet-shell.c:350
-#: ../modules/addressbook/e-book-shell-backend.c:175
-#: ../modules/addressbook/e-book-shell-migrate.c:134
-#: ../modules/calendar/e-cal-shell-backend.c:171
+#: ../modules/addressbook/e-book-shell-backend.c:115
+#: ../modules/addressbook/e-book-shell-migrate.c:138
+#: ../modules/calendar/e-cal-shell-backend.c:127
 #: ../modules/calendar/e-cal-shell-migrate.c:151
-#: ../modules/calendar/e-memo-shell-backend.c:154
+#: ../modules/calendar/e-memo-shell-backend.c:112
 #: ../modules/calendar/e-memo-shell-migrate.c:112
-#: ../modules/calendar/e-task-shell-backend.c:158
-#: ../modules/calendar/e-task-shell-migrate.c:119
+#: ../modules/calendar/e-task-shell-backend.c:112
+#: ../modules/calendar/e-task-shell-migrate.c:121
 #: ../plugins/email-custom-header/email-custom-header.c:320
 msgid "Personal"
 msgstr "PersÃ¶nlich"
@@ -1292,118 +1293,12 @@ msgid "Blog"
 msgstr "Blog"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:1011
-#: ../widgets/misc/e-web-view.c:838
+#: ../widgets/misc/e-web-view.c:848
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klicken Sie hier, um eine E-Mail an %s zu verfassen"
 
-#. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
-msgid "Success"
-msgstr "Erfolg"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
-msgid "Backend busy"
-msgstr "Backend belegt"
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Repository offline"
-msgstr "Repository offline"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Address Book does not exist"
-msgstr "Adressbuch existiert nicht"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
-msgid "No Self Contact defined"
-msgstr "Kein eigener Kontakt festgelegt"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
-msgid "Permission denied"
-msgstr "Erlaubnis verweigert"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Contact not found"
-msgstr "Kontakt nicht gefunden"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Contact ID already exists"
-msgstr "Kontaktkennung existiert bereits"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Protocol not supported"
-msgstr "Protokoll nicht unterstÃ¼tzt"
-
-#. E_BOOK_ERROR_CANCELLED
-#. To Translators: This is task status
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:294
-#: ../calendar/gui/e-cal-model-tasks.c:443
-#: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:587
-#: ../calendar/gui/print.c:2659
-msgid "Canceled"
-msgstr "Abgebrochen"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
-msgid "Could not cancel"
-msgstr "Abbrechen gescheitert"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Authentication Failed"
-msgstr "Legitimation gescheitert"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Authentication Required"
-msgstr "Legitimation erforderlich"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
-msgid "TLS not Available"
-msgstr "TLS nicht verfÃ¼gbar"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
-msgid "No such source"
-msgstr "Keine derartige Quelle"
-
-#. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
 #: ../addressbook/gui/widgets/eab-gui-util.c:72
-msgid "Not available in offline mode"
-msgstr "Im Offline-Modus nicht verfÃ¼gbar"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
-msgid "Other error"
-msgstr "Anderer Fehler"
-
-#. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
-msgid "Invalid server version"
-msgstr "UngÃ¼ltige Server-Version"
-
-#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
-msgid "Unsupported authentication method"
-msgstr "Nicht unterstÃ¼tzte Legitimationsmethode"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:107
 msgid ""
 "This address book cannot be opened. This either means this book is not marked "
 "for offline usage or not yet downloaded for offline usage. Please load the "
@@ -1414,7 +1309,7 @@ msgstr ""
 "jetzt noch nicht fÃ¼r die Offline-Benutzung heruntergeladen wurde. Bitte laden "
 "Sie das Adressbuch einmal im Online-Modus, um dessen Inhalte herunterzuladen."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:116
+#: ../addressbook/gui/widgets/eab-gui-util.c:81
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists and "
@@ -1423,7 +1318,7 @@ msgstr ""
 "Dieses Adressbuch konnte nicht geÃ¶ffnet werden. Bitte Ã¼berprÃ¼fen Sie, ob der "
 "Pfad %s existiert und Sie darauf zugreifen dÃ¼rfen."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:128
+#: ../addressbook/gui/widgets/eab-gui-util.c:93
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -1432,7 +1327,7 @@ msgstr ""
 "Falls Sie LDAP in Evolution verwenden wollen, mÃ¼ssen Sie eine LDAP-mÃ¤chtige "
 "Evolution-Version installieren."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:137
+#: ../addressbook/gui/widgets/eab-gui-util.c:102
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1441,11 +1336,11 @@ msgstr ""
 "Sie eine falsche Adresse eingegeben haben, oder dass der Server nicht "
 "erreichbar ist."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:145
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
 msgid "Detailed error message:"
 msgstr "AusfÃ¼hrliche Fehlernachricht:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:168
+#: ../addressbook/gui/widgets/eab-gui-util.c:134
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1457,7 +1352,7 @@ msgstr ""
 "oder erhÃ¶hen Sie das Zeitlimit in den Einstellungen des\n"
 "Verzeichnis-Servers fÃ¼r dieses Adressbuch."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:174
+#: ../addressbook/gui/widgets/eab-gui-util.c:141
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -1469,48 +1364,54 @@ msgstr ""
 "Bitte prÃ¤zisieren Sie Ihre Suche oder erhÃ¶hen Sie das Zeitlimit in den\n"
 "Einstellungen des Verzeichnis-Servers fÃ¼r dieses Adressbuch."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:180
-msgid "The backend for this address book was unable to parse this query."
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:149
+#, c-format
+msgid "The backend for this address book was unable to parse this query. %s"
 msgstr ""
 "Die Hintergrundkomponente fÃ¼r dieses Adressbuch konnte die Syntax dieser "
-"Abfrage nicht analysieren."
+"Abfrage nicht analysieren. %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:183
-msgid "The backend for this address book refused to perform this query."
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:154
+#, c-format
+msgid "The backend for this address book refused to perform this query. %s"
 msgstr ""
 "Die Hintergrundkomponente fÃ¼r dieses Adressbuch konnte diese Abfrage nicht "
-"ausfÃ¼hren."
+"ausfÃ¼hren. %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:186
-msgid "This query did not complete successfully."
-msgstr "Diese Abfrage konnte nicht erfolgreich ausgefÃ¼hrt werden"
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:159
+#, c-format
+msgid "This query did not complete successfully. %s"
+msgstr "Diese Abfrage konnte nicht erfolgreich ausgefÃ¼hrt werden. %s"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:208
+#: ../addressbook/gui/widgets/eab-gui-util.c:184
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:248
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
 msgid "Select Address Book"
 msgstr "Adressbuch auswÃ¤hlen"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:311
+#: ../addressbook/gui/widgets/eab-gui-util.c:287
 msgid "list"
 msgstr "Liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:438
+#: ../addressbook/gui/widgets/eab-gui-util.c:414
 msgid "Move contact to"
 msgstr "Kontakt verschieben nach"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:440
+#: ../addressbook/gui/widgets/eab-gui-util.c:416
 msgid "Copy contact to"
 msgstr "Kontakt kopieren nach"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:443
+#: ../addressbook/gui/widgets/eab-gui-util.c:419
 msgid "Move contacts to"
 msgstr "Kontakt verschieben nach"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:445
+#: ../addressbook/gui/widgets/eab-gui-util.c:421
 msgid "Copy contacts to"
 msgstr "Kontakte kopieren nach"
 
@@ -1518,54 +1419,61 @@ msgstr "Kontakte kopieren nach"
 msgid "Card View"
 msgstr "Kartenansicht"
 
-#: ../addressbook/importers/evolution-csv-importer.c:654
+#: ../addressbook/importers/evolution-csv-importer.c:720
 #: ../addressbook/importers/evolution-ldif-importer.c:516
-#: ../addressbook/importers/evolution-vcard-importer.c:253
-#: ../calendar/importers/icalendar-importer.c:310
-#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:6
+#: ../addressbook/importers/evolution-vcard-importer.c:264
+#: ../calendar/importers/icalendar-importer.c:325
+#: ../calendar/importers/icalendar-importer.c:764 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Importieren â?¦"
 
-#: ../addressbook/importers/evolution-csv-importer.c:858
+#: ../addressbook/importers/evolution-csv-importer.c:1008
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV oder Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:859
+#: ../addressbook/importers/evolution-csv-importer.c:1009
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV- und Tab-Importeur"
 
-#: ../addressbook/importers/evolution-csv-importer.c:867
+#: ../addressbook/importers/evolution-csv-importer.c:1017
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV oder Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:868
+#: ../addressbook/importers/evolution-csv-importer.c:1018
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV- und Tab-Importeur"
 
-#: ../addressbook/importers/evolution-csv-importer.c:876
+#: ../addressbook/importers/evolution-csv-importer.c:1026
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV oder Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:877
+#: ../addressbook/importers/evolution-csv-importer.c:1027
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV- und Tab-Importeur"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:689
+#: ../addressbook/importers/evolution-ldif-importer.c:742
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP-Datenaustauschformat (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:690
+#: ../addressbook/importers/evolution-ldif-importer.c:743
 msgid "Evolution LDIF importer"
 msgstr "Evolution-LDIF-Importeur"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:556
+#: ../addressbook/importers/evolution-vcard-importer.c:623
 msgid "vCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:557
+#: ../addressbook/importers/evolution-vcard-importer.c:624
 msgid "Evolution vCard Importer"
 msgstr "Evolution-VCard-Importeur"
 
+#. Uncomment next if it is successful to get total number if pages in list view
+#. * g_object_get (operation, "n-pages", &n_pages, NULL)
+#: ../addressbook/printing/e-contact-print.c:746
+#, c-format
+msgid "Page %d"
+msgstr "Seite %d"
+
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
@@ -1640,18 +1548,18 @@ msgstr "Unbehandelter Fehler"
 msgid "Accessing LDAP Server anonymously"
 msgstr "Der Zugriff auf den LDAP-Server erfolgt anonym"
 
-#: ../addressbook/util/addressbook.c:210
+#: ../addressbook/util/addressbook.c:215
 #: ../plugins/groupwise-features/camel-gw-listener.c:526
 msgid "Failed to authenticate.\n"
 msgstr "Legitimation gescheitert.\n"
 
-#: ../addressbook/util/addressbook.c:217
+#: ../addressbook/util/addressbook.c:222
 #: ../plugins/groupwise-features/camel-gw-listener.c:506
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Geben Sie das Passwort fÃ¼r %s ein (Benutzer %s)"
 
-#: ../addressbook/util/addressbook.c:225 ../calendar/common/authentication.c:51
+#: ../addressbook/util/addressbook.c:230 ../calendar/common/authentication.c:55
 #: ../plugins/caldav/caldav-browse-server.c:813
 #: ../plugins/google-account-setup/google-source.c:438
 #: ../plugins/publish-calendar/publish-calendar.c:328
@@ -1678,9 +1586,6 @@ msgstr ""
 "und wÃ¤hlen Sie einen Kalender aus, der Termine akzeptieren kann."
 
 #: ../calendar/calendar.error.xml.h:5
-#| msgid ""
-#| "Adding a meaningful summary to your appointment will give your recipients "
-#| "an idea of what your appointment is about."
 msgid ""
 "Adding a meaningful summary to your appointment will give you an idea of what "
 "your appointment is about."
@@ -1689,9 +1594,6 @@ msgstr ""
 "verschafft Ihnen eine Vorstellung, worum es bei diesem Termin geht."
 
 #: ../calendar/calendar.error.xml.h:6
-#| msgid ""
-#| "Adding a meaningful summary to your task will give your recipients an idea "
-#| "of what your task is about."
 msgid ""
 "Adding a meaningful summary to your task will give you an idea of what your "
 "task is about."
@@ -1800,7 +1702,6 @@ msgid "Are you sure you want to delete this task?"
 msgstr "Sind Sie sicher, dass Sie diese Aufgabe lÃ¶schen wollen?"
 
 #: ../calendar/calendar.error.xml.h:26
-#| msgid "Are you sure you want to send the appointment without a summary?"
 msgid "Are you sure you want to save the appointment without a summary?"
 msgstr ""
 "Sind Sie sicher, dass Sie den Termin ohne eine Zusammenfassung speichern "
@@ -1813,7 +1714,6 @@ msgstr ""
 "wollen?"
 
 #: ../calendar/calendar.error.xml.h:28
-#| msgid "Are you sure you want to send the task without a summary?"
 msgid "Are you sure you want to save the task without a summary?"
 msgstr ""
 "Sind Sie sicher, dass Sie die Aufgabe ohne eine Zusammenfassung speichern "
@@ -1839,25 +1739,25 @@ msgstr "Notizliste Â»{0}Â« lÃ¶schen?"
 msgid "Delete task list '{0}'?"
 msgstr "Aufgabenliste Â»{0}Â« lÃ¶schen?"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:35
 msgid "Do _not Send"
 msgstr "_Nicht verschicken"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr ""
 "Das Herunterladen ist noch nicht beendet. MÃ¶chten Sie den Termin speichern?"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:37
 msgid "Download in progress. Do you want to save the task?"
 msgstr ""
 "Das Herunterladen ist noch nicht beendet. MÃ¶chten Sie die Aufgabe speichern?"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:38
 msgid "Editor could not be loaded."
 msgstr "Editor konnte nicht geladen werden."
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:39
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -1865,26 +1765,26 @@ msgstr ""
 "Es werden E-Mail-Einladungen an alle Teilnehmer verschickt, damit diese die "
 "Aufgabe Ã¼bernehmen kÃ¶nnen."
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:40
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "Es werden E-Mail-Einladungen an alle Teilnehmer verschickt, damit diese die "
 "Einladungen akzeptieren kÃ¶nnen."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading calendar"
 msgstr "Fehler beim Laden des Kalenders"
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:42
 msgid "Error loading memo list"
 msgstr "Fehler beim Laden der Notizliste"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:43
 msgid "Error loading task list"
 msgstr "Fehler beim Laden der Aufgabenliste"
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:44
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -1892,7 +1792,7 @@ msgstr ""
 "Falls Sie keine Absagenachricht verschicken, wissen die anderen Teilnehmer "
 "mÃ¶glicherweise nicht, dass die Besprechung abgesagt wurde."
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -1900,7 +1800,7 @@ msgstr ""
 "Falls Sie keine Absagenachricht verschicken, wissen die anderen Teilnehmer "
 "mÃ¶glicherweise nicht, dass die Notiz gelÃ¶scht wurde."
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -1908,7 +1808,7 @@ msgstr ""
 "Falls Sie keine Absagenachricht verschicken, wissen die anderen Teilnehmer "
 "mÃ¶glicherweise nicht, dass die Aufgabe gelÃ¶scht wurde."
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Sending updated information allows other participants to keep their calendars "
 "up to date."
@@ -1916,7 +1816,7 @@ msgstr ""
 "Es werden aktualisierte Informationen an andere Teilnehmer verschickt, um "
 "ihnen so zu ermÃ¶glichen, ihre Kalender auf dem neuesten Stand zu halten."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -1924,7 +1824,7 @@ msgstr ""
 "Es werden aktualisierte Informationen an andere Teilnehmer verschickt, um "
 "ihnen so zu ermÃ¶glichen, ihre Aufgabenlisten auf dem neuesten Stand zu halten."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:49
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result in "
 "the loss of these attachments."
@@ -1932,7 +1832,7 @@ msgstr ""
 "Einige Anlagen werden zurzeit noch heruntergeladen. Das Speichern dieses "
 "Termins wÃ¼rde den Verlust dieser Anlagen zur Folge haben."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:50
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -1940,96 +1840,96 @@ 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:50
+#: ../calendar/calendar.error.xml.h:51
 msgid "Some features may not work properly with your current server."
 msgstr ""
 "Einige Funktionen werden mit Ihrem Server mÃ¶glicherweise nicht einwandfrei "
 "arbeiten."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Der Evolution-Kalender wurde unerwartet beendet."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:53
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "Die Evolution-Kalender wurden unerwartet beendet."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:54
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Die Evolution-Notizen wurden unerwartet beendet."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:55
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Die Evolution-Aufgaben wurden unerwartet beendet."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:56
 msgid "The calendar is not marked for offline usage."
 msgstr "Der Kalender ist nicht fÃ¼r eine Offline-Benutzung markiert."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:57
 msgid "The memo list is not marked for offline usage."
 msgstr "Die Notizliste ist nicht fÃ¼r eine Offline-Benutzung markiert."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:58
 msgid "The task list is not marked for offline usage."
 msgstr "Die Aufgabenliste ist nicht fÃ¼r eine Offline-Benutzung markiert."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:59
 msgid "This calendar will be removed permanently."
 msgstr "Dieser Kalender wird unwiderruflich gelÃ¶scht."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:60
 msgid "This memo list will be removed permanently."
 msgstr "Diese Notizliste wird unwiderruflich gelÃ¶scht."
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:61
 msgid "This task list will be removed permanently."
 msgstr "Diese Aufgabenliste wird unwiderruflich gelÃ¶scht."
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Wollen Sie die an diesem Termin vorgenommenen Ã?nderungen speichern?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to save your changes to this meeting?"
 msgstr ""
 "Wollen Sie die an dieser Besprechung vorgenommenen Ã?nderungen speichern?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to save your changes to this memo?"
 msgstr "Wollen Sie die an dieser Notiz vorgenommenen Ã?nderungen speichern?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to save your changes to this task?"
 msgstr "Wollen Sie die an dieser Aufgabe vorgenommenen Ã?nderungen speichern?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Wollen Sie eine Absagenachricht fÃ¼r diese Notiz verschicken?"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Wollen Sie allen Teilnehmern eine Absagenachricht schicken?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Wollen Sie Einladungen zur Besprechung an die Teilnehmer verschicken?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send this task to participants?"
 msgstr "Wollen Sie diese Aufgabe an die Teilnehmer verschicken?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send updated meeting information to participants?"
 msgstr ""
 "Wollen Sie aktuelle Besprechungsinformationen an die Teilnehmer verschicken?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send updated task information to participants?"
 msgstr ""
 "Wollen Sie aktuelle Aufgabeninformationen an die Teilnehmer verschicken?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:72
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -2040,112 +1940,70 @@ msgstr ""
 "eine bestmÃ¶gliche Zusammenarbeit sollte der Server auf eine unterstÃ¼tzte "
 "Version aktualisiert werden."
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:73
 msgid "You have changed this appointment, but not yet saved it."
 msgstr ""
 "Sie haben Ã?nderungen an diesem Termin vorgenommen, diese jedoch noch nicht "
 "gespeichert."
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:74
 msgid "You have changed this meeting, but not yet saved it."
 msgstr ""
 "Sie haben Ã?nderungen an dieser Besprechung vorgenommen, diese jedoch noch "
 "nicht gespeichert."
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:75
 msgid "You have changed this task, but not yet saved it."
 msgstr ""
 "Sie haben Ã?nderungen an dieser Aufgabe vorgenommen, diese jedoch noch nicht "
 "gespeichert."
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:76
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr ""
 "Sie haben Ã?nderungen an dieser Notiz vorgenommen, diese jedoch noch nicht "
 "gespeichert."
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:77
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "Ihre Kalender sind nicht verfÃ¼gbar, solange Evolution nicht neu gestartet "
 "wurde."
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:78
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr ""
 "Ihre Notizen sind nicht verfÃ¼gbar, solange Evolution nicht neu gestartet "
 "wurde."
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:79
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 "Ihre Aufgaben sind nicht verfÃ¼gbar, solange Evolution nicht neu gestartet "
 "wurde."
 
-#: ../calendar/calendar.error.xml.h:79 ../composer/mail-composer.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:80 ../composer/mail-composer.error.xml.h:24
 msgid "_Discard Changes"
 msgstr "Ã?nderungen _verwerfen"
 
-#: ../calendar/calendar.error.xml.h:80 ../composer/e-composer-actions.c:309
+#: ../calendar/calendar.error.xml.h:81 ../composer/e-composer-actions.c:268
 msgid "_Save"
 msgstr "_Speichern"
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:82
 msgid "_Save Changes"
 msgstr "Ã?nderungen _speichern"
 
-#: ../calendar/calendar.error.xml.h:82 ../composer/mail-composer.error.xml.h:28
-#: ../mail/mail.error.xml.h:133
+#: ../calendar/calendar.error.xml.h:83 ../composer/mail-composer.error.xml.h:28
+#: ../mail/mail.error.xml.h:141
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "Ab_schicken"
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:84
 msgid "_Send Notice"
 msgstr "Nachricht ver_schicken"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:252
-msgid "Split Multi-Day Events:"
-msgstr "MehrtÃ¤gige Ereignisse aufteilen:"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:1532
-#: ../calendar/conduits/calendar/calendar-conduit.c:1533
-#: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/memo/memo-conduit.c:822
-#: ../calendar/conduits/todo/todo-conduit.c:1022
-#: ../calendar/conduits/todo/todo-conduit.c:1023
-msgid "Could not start evolution-data-server"
-msgstr "evolution-data-server konnte nicht gestartet werden"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:1640
-#: ../calendar/conduits/calendar/calendar-conduit.c:1643
-msgid "Could not read pilot's Calendar application block"
-msgstr "Kalender-Anwendungsblock des Pilot konnte nicht gelesen werden"
-
-#: ../calendar/conduits/memo/memo-conduit.c:915
-#: ../calendar/conduits/memo/memo-conduit.c:918
-msgid "Could not read pilot's Memo application block"
-msgstr "Notiz-Anwendungsblock des Pilot konnte nicht gelesen werden"
-
-#: ../calendar/conduits/memo/memo-conduit.c:962
-#: ../calendar/conduits/memo/memo-conduit.c:965
-msgid "Could not write pilot's Memo application block"
-msgstr "Notiz-Anwendungsblock des Pilot konnte nicht geschrieben werden"
-
-#: ../calendar/conduits/todo/todo-conduit.c:231
-msgid "Default Priority:"
-msgstr "Voreingestellte PrioritÃ¤t:"
-
-#: ../calendar/conduits/todo/todo-conduit.c:1106
-#: ../calendar/conduits/todo/todo-conduit.c:1109
-msgid "Could not read pilot's ToDo application block"
-msgstr "ToDo-Anwendungsblock des Pilot konnte nicht gelesen werden"
-
-#: ../calendar/conduits/todo/todo-conduit.c:1151
-#: ../calendar/conduits/todo/todo-conduit.c:1154
-msgid "Could not write pilot's ToDo application block"
-msgstr "ToDo-Anwendungsblock des Pilot konnte nicht geschrieben werden"
-
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
 msgid "minute"
 msgid_plural "minutes"
@@ -2173,8 +2031,8 @@ msgstr "_Alle verwerfen"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1573
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1579
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1596
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1602
 #: ../calendar/gui/e-itip-control.c:1175
 #: ../plugins/itip-formatter/itip-view.c:1043
 msgid "Location:"
@@ -2189,11 +2047,11 @@ msgid "_Dismiss"
 msgstr "_Verwerfen"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1015
+#: ../calendar/gui/dialogs/comp-editor.c:1060
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:151
+#: ../mail/e-mail-browser.c:153
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1625
+#: ../shell/e-shell-window-actions.c:1607
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "_Bearbeiten"
@@ -2204,7 +2062,7 @@ msgstr "_Schlummer"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:424
+#: ../calendar/gui/dialogs/event-page.ui.h:24 ../e-util/e-plugin-util.c:424
 #: ../filter/filter.ui.h:15
 #: ../plugins/google-account-setup/google-contacts-source.c:335
 msgid "hours"
@@ -2217,38 +2075,38 @@ msgstr "Ort des Termins"
 #. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
-#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:423
+#: ../calendar/gui/dialogs/event-page.ui.h:25 ../e-util/e-plugin-util.c:423
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
 #: ../plugins/google-account-setup/google-contacts-source.c:334
 msgid "minutes"
 msgstr "Minuten"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1434
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1556
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1579
 msgid "No summary available."
 msgstr "Keine Zusammenfassung verfÃ¼gbar."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1443
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1445
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
 msgid "No description available."
 msgstr "Keine Beschreibung verfÃ¼gbar."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
 msgstr "Keine Ortsinformationen verfÃ¼gbar."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1496
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1519
 #, c-format
 msgid "You have %d alarms"
 msgstr "Sie haben %d Alarme"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1669
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1725
 #: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "Warnung"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1673
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2261,7 +2119,7 @@ msgstr ""
 "Evolution wird stattdessen ein normales\n"
 "Erinnerungsdialogfenster anzeigen."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1708
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2278,7 +2136,7 @@ msgstr ""
 "\n"
 "Sind Sie sicher, dass Sie dieses Programm ausfÃ¼hren wollen?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1746
 msgid "Do not ask me about this program again."
 msgstr "Nicht mehr nach diesem Programm fragen."
 
@@ -2456,7 +2314,7 @@ msgid "Last alarm time"
 msgstr "Letzte Alarmzeit"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Level beyond which the message should be logged."
 msgstr "Protokolltyp, ab welchem die Nachricht protokolliert werden soll."
 
@@ -2660,14 +2518,12 @@ msgid "Show type field in the event/task/meeting editor"
 msgstr "Artenfeld im Ereignis-/Aufgaben-/Besprechungseditor anzeigen"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
-msgid "Show week number in Day and Work Week View"
-msgstr "Wochennummern in Tagesansicht und Arbeitswochenansicht anzeigen"
+msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
+msgstr ""
+"Wochennummern in Tagesansicht, Arbeitswochenansicht und Datumsnavigator "
+"anzeigen"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
-msgid "Show week numbers in date navigator"
-msgstr "Wochennummern im Datumsnavigator anzeigen"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key."
@@ -2676,23 +2532,23 @@ msgstr ""
 "diese definiert ist. Der SchlÃ¼sselwert hat das gleiche Format wie der "
 "SchlÃ¼ssel Â»timezoneÂ«."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "Task layout style"
 msgstr "Anordnung fÃ¼r Aufgaben"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Task preview pane position (horizontal)"
 msgstr "Position der horizontalen Aufgabenvorschau"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Task preview pane position (vertical)"
 msgstr "Position der vertikalen Aufgabenvorschau"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Tasks due today color"
 msgstr "Farbe heute fÃ¤lliger Aufgaben"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -2702,7 +2558,7 @@ msgstr ""
 "wird durch den Benutzerteil der E-Mail-Adresse und Â»%dÂ« durch die Domain "
 "ersetzt."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -2710,7 +2566,7 @@ msgstr ""
 "Die voreingestellte Zeitzone zur Verwendung fÃ¼r Datum und Zeit im Kalender "
 "als nicht Ã¼bersetzter Ort der Olsen-Zeitzonendatenbank, z.B. Â»Europe/BerlinÂ«."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the memo list. \"0\" (Classic View) places the preview pane below the memo "
@@ -2721,7 +2577,7 @@ msgstr ""
 "Notizliste. Â»1Â« (vertikale Ansicht) setzt die Vorschauleiste neben die "
 "Notizliste. "
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the task list. \"0\" (Classic View) places the preview pane below the task "
@@ -2732,11 +2588,11 @@ msgstr ""
 "Aufgabenliste. Â»1Â« (vertikale Ansicht) setzt die Vorschauleiste neben die "
 "Aufgabenliste. "
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "The second timezone for a Day View"
 msgstr "Die zweite Zeitzone fÃ¼r die Tagesansicht"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
@@ -2744,19 +2600,19 @@ msgstr ""
 "Hier sind drei verschiedene Werte mÃ¶glich: Â»0Â« fÃ¼r Fehler, Â»1Â« fÃ¼r Warnungen, "
 "Â»2Â« fÃ¼r Diagnosemeldungen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Time divisions"
 msgstr "Zeiteinteilungen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Time the last alarm ran, in time_t."
 msgstr "Zeit der letzten AlarmauslÃ¶sung im Â»time_tÂ«-Format."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Timezone"
 msgstr "Zeitzone"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid ""
 "Transparency of the events in calendar views, a value between 0 (transparent) "
 "and 1 (opaque)."
@@ -2764,70 +2620,70 @@ msgstr ""
 "Transparenz der Ereignisse in der Kalenderansicht; ein Wert zwischen 0 "
 "(transparent) und 1 (deckend)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Twenty four hour time format"
 msgstr "24-Stunden-Zeitformat"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "URI of the highlighted (\"primary\") calendar"
 msgstr "Adresse des hervorgehobenen (Â»primÃ¤renÂ«) Kalenders"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "URI of the highlighted (\"primary\") memo list"
 msgstr "Adresse der hervorgehobenen (Â»primÃ¤renÂ«) Notizliste"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "URI of the highlighted (\"primary\") task list"
 msgstr "Adresse der hervorgehobenen (Â»primÃ¤renÂ«) Aufgabenliste"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Einheit fÃ¼r eine voreingestellte Erinnerung (Â»minutesÂ«, Â»hoursÂ« oder Â»daysÂ«)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Einheit zur Festlegung, wann Aufgaben verborgen werden sollen (Â»minutesÂ«, "
 "Â»hoursÂ« oder Â»daysÂ«)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Use system timezone"
 msgstr "Zeitzone des Systems verwenden"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Use the system timezone instead of the timezone selected in Evolution."
 msgstr ""
 "Die Zeitzone des Systems anstatt der in Evolution gewÃ¤hlten Zeitzone "
 "verwenden."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Vertical pane position"
 msgstr "Position der vertikalen Schiebeleiste"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Week start"
 msgstr "Wochenanfang"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 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."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Soll das Benachrichtigungsfeld fÃ¼r Alarmausgaben verwendet werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Soll beim LÃ¶schen von Terminen oder Aufgaben nachgefragt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Soll beim SÃ¤ubern von Terminen oder Aufgaben nachgefragt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -2835,96 +2691,92 @@ msgstr ""
 "Sollen Wochenenden in der Monatsansicht komprimiert werden, wobei die Tage "
 "Sonnabend und Sonntag im Raum eines einzelnen Wochentages enthalten sind?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
 "Sollen die Endzeiten von Ereignissen in den Wochen- und Monatsansichten "
 "angezeigt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Soll eine Marcus-Bains-Linie (Linie auf der momentanen Zeit) im Kalender "
 "angezeigt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Sollen abgeschlossene Aufgaben in der Aufgabenansicht verborgen werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 msgid "Whether to scroll a Month View by a week, not by a month."
 msgstr ""
 "Soll in der Monatsansicht wochenweise geblÃ¤ttert werden anstatt monatsweise?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to set a default reminder for appointments."
 msgstr "Soll eine voreingestellte Erinnerung fÃ¼r Termine festgelegt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr ""
 "Soll das UAwg-Feld im Ereignis-/Aufgaben-/Besprechungseditor angezeigt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr ""
 "Soll das Kategoriefeld im Ereignis-/Besprechungseditor angezeigt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr ""
 "Soll das Positionsfeld im Ereignis-/Aufgaben-/Besprechungseditor angezeigt "
 "werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr ""
 "Soll das Statusfeld im Ereignis-/Aufgaben-/Besprechungseditor angezeigt "
 "werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 msgid "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr ""
 "Sollen Zeiten im 24-Stunden- und nicht im 12-Stunden-Format angezeigt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr ""
 "Soll das Zeitzonenfeld im Ereignis-/Besprechungseditor angezeigt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr ""
 "Soll das Artenfeld im Ereignis-/Aufgaben-/Besprechungseditor angezeigt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
-msgid "Whether to show week number in the Day and Work Week View."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
+msgid "Whether to show week numbers in various places in the Calendar."
 msgstr ""
-"Legt fest, ob die Wochennummern in der Tagesansicht und Arbeitswochenansicht "
-"angezeigt werden."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
-msgid "Whether to show week numbers in the date navigator."
-msgstr "Sollen die Wochennummern im Datumsnavigator angezeigt werden?"
+"Sollen die Wochennummern im Kalender an verschiedenen Stellen angezeigt "
+"werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
 msgid "Work days"
 msgstr "Arbeitstage"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
 msgid "Workday end hour"
 msgstr "Stunde, zu der der Arbeitstag endet"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
 msgid "Workday end minute"
 msgstr "Minute, zu der der Arbeitstag endet"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
 msgid "Workday start hour"
 msgstr "Stunde, zu der der Arbeitstag beginnt"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
 msgid "Workday start minute"
 msgstr "Minute, zu der der Arbeitstag beginnt"
 
@@ -2974,7 +2826,7 @@ msgid "Classification"
 msgstr "Einstufung"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:499 ../calendar/gui/e-task-table.c:489
+#: ../calendar/gui/e-cal-model.c:525 ../calendar/gui/e-task-table.c:490
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:323
 #: ../widgets/misc/e-send-options.ui.h:2
@@ -2984,7 +2836,7 @@ msgstr "Vertraulich"
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
 #: ../plugins/plugin-manager/plugin-manager.c:60
-#: ../widgets/misc/e-attachment-tree-view.c:496
+#: ../widgets/misc/e-attachment-tree-view.c:514
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "Beschreibung"
@@ -3018,18 +2870,19 @@ msgid "Organizer"
 msgstr "Organisator"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:497 ../calendar/gui/e-task-table.c:488
+#: ../calendar/gui/e-cal-model.c:523 ../calendar/gui/e-task-table.c:489
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Privat"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:488 ../calendar/gui/e-cal-model.c:495
-#: ../calendar/gui/e-task-table.c:487 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-cal-model.c:514 ../calendar/gui/e-cal-model.c:521
+#: ../calendar/gui/e-task-table.c:488 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Ã?ffentlich"
 
-#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/dialogs/event-editor.c:299
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/dialogs/event-editor.c:322
+#: ../calendar/gui/dialogs/event-editor.c:343
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "Wiederholung"
@@ -3095,6 +2948,7 @@ msgid "Add Alarm"
 msgstr "Alarm hinzufÃ¼gen"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
+#: ../calendar/gui/dialogs/event-editor.c:360
 msgid "Alarm"
 msgstr "Alarm"
 
@@ -3110,7 +2964,7 @@ msgstr "Benutzerdefinierter Alarmklang"
 msgid "Mes_sage:"
 msgstr "_Nachricht:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:77
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:81
 msgid "Options"
 msgstr "Optionen"
 
@@ -3150,8 +3004,9 @@ msgstr "nach"
 msgid "before"
 msgstr "vor"
 
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:7
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
 msgid "day(s)"
 msgstr "Tag(e)"
 
@@ -3197,35 +3052,33 @@ msgstr "_HinzufÃ¼gen"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:9
-#: ../calendar/gui/dialogs/event-page.ui.h:4
+#: ../calendar/gui/dialogs/event-page.ui.h:7
 msgid "Alarms"
 msgstr "Alarme"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:107
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:156
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:108
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:157
 #: ../calendar/gui/e-day-view-time-item.c:797
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Keine"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:184
 #: ../calendar/gui/e-day-view-time-item.c:824
 #: ../calendar/gui/e-timezone-entry.c:319
 msgid "Select..."
 msgstr "AuswÃ¤hlen â?¦"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:496
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:504
 msgid "Selected Calendars for Alarms"
 msgstr "AusgewÃ¤hlte Kalender fÃ¼r die Alarme"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:785
-#| msgid "Time and date:"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:789
 msgid "Ti_me and date:"
 msgstr "_Zeit und Datum:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:786
-#| msgid "Date only:"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
 msgid "_Date only:"
 msgstr "Nur das _Datum:"
 
@@ -3263,7 +3116,7 @@ msgstr "60 Minuten"
 msgid "Alerts"
 msgstr "Alarme"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11 ../mail/mail-config.ui.h:29
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11 ../mail/mail-config.ui.h:30
 #: ../modules/addressbook/autocompletion-config.c:153
 msgid "Date/Time Format"
 msgstr "Format von Datum/Zeit"
@@ -3298,9 +3151,9 @@ msgstr "Freitag"
 #: ../calendar/gui/dialogs/calendar-setup.c:369
 #: ../calendar/gui/dialogs/calendar-setup.c:380
 #: ../calendar/gui/dialogs/calendar-setup.c:391
-#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:54
+#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:56
 #: ../modules/addressbook/addressbook-config.c:1005
-#: ../plugins/itip-formatter/itip-formatter.c:2675
+#: ../plugins/itip-formatter/itip-formatter.c:2676
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
@@ -3328,7 +3181,7 @@ msgstr "Montag"
 msgid "None"
 msgstr "Keine"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24 ../mail/mail-config.ui.h:81
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24 ../mail/mail-config.ui.h:85
 msgid "Pick a color"
 msgstr "Eine Farbe auswÃ¤hlen"
 
@@ -3366,156 +3219,152 @@ msgid "Show a _reminder"
 msgstr "Eine _Erinnerung anzeigen"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
-msgid "Show week _numbers in date navigator"
-msgstr "_Wochennummern im Datumsnavigator anzeigen"
+msgid "Show week _numbers"
+msgstr "_Wochennummern anzeigen"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
-msgid "Show week n_umber in Day and Work Week View"
-msgstr "Wochenn_ummern in Tages- und Arbeitswochenansicht anzeigen"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
 #: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
 msgid "T_asks due today:"
 msgstr "Heute fÃ¤llige _Aufgaben:"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
 msgid "T_hu"
 msgstr "D_o"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
 #: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Task List"
 msgstr "Aufgabenliste"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
 msgid "Template:"
 msgstr "Vorlage:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 #: ../calendar/gui/dialogs/recurrence-page.c:1115
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
 #: ../e-util/e-non-intrusive-error-dialog.c:287
 #: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "Uhrzeit"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
-#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../calendar/gui/dialogs/event-page.ui.h:15
 msgid "Time _zone:"
 msgstr "Zeit_zone:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
 msgid "Time format:"
 msgstr "Zeitformat:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
 #: ../calendar/gui/dialogs/recurrence-page.c:1113
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
 msgid "Use s_ystem time zone"
 msgstr "Zeitzone des S_ystems verwenden"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
 #: ../calendar/gui/dialogs/recurrence-page.c:1114
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Mittwoch"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
 msgid "Wee_k starts on:"
 msgstr "W_oche beginnt am:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
-#: ../modules/calendar/e-cal-shell-view-actions.c:1605
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../modules/calendar/e-cal-shell-view-actions.c:1639
 msgid "Work Week"
 msgstr "Arbeitswoche"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
 msgid "Work days:"
 msgstr "Arbeitstage:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "_12 hour (AM/PM)"
 msgstr "_12 Stunden"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_24 hour"
 msgstr "_24 Stunden"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_Ask for confirmation when deleting items"
 msgstr "Beim _LÃ¶schen von Objekten nachfragen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Compress weekends in month view"
 msgstr "Wochenenden in Monatsansicht _komprimieren"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
 msgid "_Day begins:"
 msgstr "_Tag beginnt:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
 msgid "_Fri"
 msgstr "_Fr"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
 msgid "_Hide completed tasks after"
 msgstr "Erledigte Aufgaben _verbergen nach"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
 msgid "_Mon"
 msgstr "_Mo"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
 msgid "_Overdue tasks:"
 msgstr "_Ã?berfÃ¤llige Aufgaben:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:65
 msgid "_Sat"
 msgstr "S_a"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
 msgid "_Show appointment end times in week and month view"
 msgstr "_Endzeiten von Terminen in Wochen- und Monatsansicht anzeigen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:67
 msgid "_Time divisions:"
 msgstr "Zeit_unterteilungen:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:69
 msgid "_Tue"
 msgstr "_Di"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:72
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:71
 msgid "_Wed"
 msgstr "M_i"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:74
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:73
 msgid "before every anniversary/birthday"
 msgstr "vor jedem Jahrestag/Geburtstag"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:76
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:75
 msgid "before every appointment"
 msgstr "vor jedem Termin"
 
@@ -3528,7 +3377,7 @@ msgstr "Art:"
 msgid "_Type:"
 msgstr "A_rt:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:149
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:165
 #: ../modules/addressbook/ldap-config.ui.h:26
 #: ../plugins/groupwise-features/properties.ui.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
@@ -3634,244 +3483,240 @@ msgstr "%s  Sie haben keine Ã?nderungen vorgenommen, den Editor aktualisieren?"
 msgid "Validation error: %s"
 msgstr "Validierungsfehler: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:237
+#: ../calendar/gui/dialogs/comp-editor.c:246
 msgid "Could not save attachments"
 msgstr "Die Anlagen konnten nicht gespeichert werden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:505
+#: ../calendar/gui/dialogs/comp-editor.c:522
 msgid "Could not update object"
 msgstr "Objekt konnte nicht aktualisiert werden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:604
+#: ../calendar/gui/dialogs/comp-editor.c:637
 msgid "Edit Appointment"
 msgstr "Termin bearbeiten"
 
-#: ../calendar/gui/dialogs/comp-editor.c:611
+#: ../calendar/gui/dialogs/comp-editor.c:644
 #, c-format
 msgid "Meeting - %s"
 msgstr "Besprechung - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:613
+#: ../calendar/gui/dialogs/comp-editor.c:646
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:619
+#: ../calendar/gui/dialogs/comp-editor.c:652
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Zugewiesene Aufgabe - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:621
+#: ../calendar/gui/dialogs/comp-editor.c:654
 #, c-format
 msgid "Task - %s"
 msgstr "Aufgabe - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:626
+#: ../calendar/gui/dialogs/comp-editor.c:659
 #, c-format
 msgid "Memo - %s"
 msgstr "Notiz - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:642
+#: ../calendar/gui/dialogs/comp-editor.c:675
 msgid "No Summary"
 msgstr "Keine Zusammenfassung"
 
-#: ../calendar/gui/dialogs/comp-editor.c:751
+#: ../calendar/gui/dialogs/comp-editor.c:786
 msgid "Keep original item?"
 msgstr "Originaleintrag behalten?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:938
+#: ../calendar/gui/dialogs/comp-editor.c:983
 msgid "Click here to close the current window"
 msgstr "Klicken Sie hier, um das momentan geÃ¶ffnete Fenster zu schlieÃ?en"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945 ../mail/e-mail-browser.c:116
-#: ../shell/e-shell-window-actions.c:1464 ../widgets/misc/e-focus-tracker.c:115
-#: ../widgets/misc/e-focus-tracker.c:550 ../widgets/misc/e-web-view.c:398
-#: ../widgets/misc/e-web-view.c:1051
+#: ../calendar/gui/dialogs/comp-editor.c:990 ../mail/e-mail-browser.c:118
+#: ../shell/e-shell-window-actions.c:1453 ../widgets/misc/e-focus-tracker.c:115
+#: ../widgets/misc/e-focus-tracker.c:550 ../widgets/misc/e-web-view.c:408
+#: ../widgets/misc/e-web-view.c:1061
 msgid "Copy the selection"
 msgstr "Die Auswahl kopieren"
 
-#: ../calendar/gui/dialogs/comp-editor.c:952 ../mail/e-mail-browser.c:123
-#: ../shell/e-shell-window-actions.c:1471 ../widgets/misc/e-focus-tracker.c:108
-#: ../widgets/misc/e-focus-tracker.c:545 ../widgets/misc/e-web-view.c:1045
+#: ../calendar/gui/dialogs/comp-editor.c:997 ../mail/e-mail-browser.c:125
+#: ../shell/e-shell-window-actions.c:1460 ../widgets/misc/e-focus-tracker.c:108
+#: ../widgets/misc/e-focus-tracker.c:545 ../widgets/misc/e-web-view.c:1055
 msgid "Cut the selection"
 msgstr "Die Auswahl ausschneiden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:959
-#: ../shell/e-shell-window-actions.c:1478 ../widgets/misc/e-focus-tracker.c:129
+#: ../calendar/gui/dialogs/comp-editor.c:1004
+#: ../shell/e-shell-window-actions.c:1467 ../widgets/misc/e-focus-tracker.c:129
 #: ../widgets/misc/e-focus-tracker.c:560
 msgid "Delete the selection"
 msgstr "Die Auswahl lÃ¶schen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:966
+#: ../calendar/gui/dialogs/comp-editor.c:1011
 msgid "Click here to view help available"
 msgstr "Klicken Sie hier, um die verfÃ¼gbare Hilfe anzuzeigen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:973 ../mail/e-mail-browser.c:130
-#: ../shell/e-shell-window-actions.c:1513 ../widgets/misc/e-focus-tracker.c:122
-#: ../widgets/misc/e-focus-tracker.c:555 ../widgets/misc/e-web-view.c:1057
+#: ../calendar/gui/dialogs/comp-editor.c:1018 ../mail/e-mail-browser.c:132
+#: ../shell/e-shell-window-actions.c:1502 ../widgets/misc/e-focus-tracker.c:122
+#: ../widgets/misc/e-focus-tracker.c:555 ../widgets/misc/e-web-view.c:1067
 msgid "Paste the clipboard"
 msgstr "Den Inhalt der Zwischenablage einfÃ¼gen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:994
+#: ../calendar/gui/dialogs/comp-editor.c:1039
 msgid "Click here to save the current window"
 msgstr "Klicken Sie hier, um das momentan geÃ¶ffnete Fenster zu speichern"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1001 ../mail/e-mail-browser.c:137
-#: ../shell/e-shell-window-actions.c:1583 ../widgets/misc/e-focus-tracker.c:136
+#: ../calendar/gui/dialogs/comp-editor.c:1046 ../mail/e-mail-browser.c:139
+#: ../shell/e-shell-window-actions.c:1572 ../widgets/misc/e-focus-tracker.c:136
 #: ../widgets/misc/e-focus-tracker.c:565
 msgid "Select all text"
 msgstr "Den gesamten Text markieren"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1008
+#: ../calendar/gui/dialogs/comp-editor.c:1053
 msgid "_Classification"
 msgstr "E_instufung"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1022 ../mail/e-mail-browser.c:144
-#: ../shell/e-shell-window-actions.c:1632
+#: ../calendar/gui/dialogs/comp-editor.c:1067 ../mail/e-mail-browser.c:146
+#: ../shell/e-shell-window-actions.c:1614
 #: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "_Datei"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1029
-#: ../shell/e-shell-window-actions.c:1639
+#: ../calendar/gui/dialogs/comp-editor.c:1074
+#: ../shell/e-shell-window-actions.c:1621
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1036
+#: ../calendar/gui/dialogs/comp-editor.c:1081
 msgid "_Insert"
 msgstr "Ein_fÃ¼gen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1043
-#: ../composer/e-composer-actions.c:353
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../composer/e-composer-actions.c:312
 msgid "_Options"
 msgstr "_Optionen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1050 ../mail/e-mail-browser.c:158
-#: ../shell/e-shell-window-actions.c:1674 ../smime/gui/smime-ui.ui.h:45
+#: ../calendar/gui/dialogs/comp-editor.c:1095 ../mail/e-mail-browser.c:160
+#: ../shell/e-shell-window-actions.c:1656 ../smime/gui/smime-ui.ui.h:45
 msgid "_View"
 msgstr "_Ansicht"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1060
-#: ../composer/e-composer-actions.c:281
+#: ../calendar/gui/dialogs/comp-editor.c:1105
+#: ../composer/e-composer-actions.c:240
 msgid "_Attachment..."
 msgstr "_Anlage â?¦"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1062
+#: ../calendar/gui/dialogs/comp-editor.c:1107
 msgid "Click here to attach a file"
 msgstr "Klicken Sie hier, um eine Datei beizulegen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1070
+#: ../calendar/gui/dialogs/comp-editor.c:1115
 msgid "_Categories"
 msgstr "_Kategorien"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1072
+#: ../calendar/gui/dialogs/comp-editor.c:1117
 msgid "Toggles whether to display categories"
 msgstr "Kategorien anzeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1078
+#: ../calendar/gui/dialogs/comp-editor.c:1123
 msgid "Time _Zone"
 msgstr "Zeit_zone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1080
+#: ../calendar/gui/dialogs/comp-editor.c:1125
 msgid "Toggles whether the time zone is displayed"
 msgstr "Zeitzone anzeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1089
+#: ../calendar/gui/dialogs/comp-editor.c:1134
 msgid "Pu_blic"
 msgstr "Ã?_ffentlich"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1091
+#: ../calendar/gui/dialogs/comp-editor.c:1136
 msgid "Classify as public"
 msgstr "Als Ã¶ffentlich einstufen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1096
+#: ../calendar/gui/dialogs/comp-editor.c:1141
 msgid "_Private"
 msgstr "_Privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1098
+#: ../calendar/gui/dialogs/comp-editor.c:1143
 msgid "Classify as private"
 msgstr "Als privat einstufen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1103
+#: ../calendar/gui/dialogs/comp-editor.c:1148
 msgid "_Confidential"
 msgstr "Ver_traulich"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1105
+#: ../calendar/gui/dialogs/comp-editor.c:1150
 msgid "Classify as confidential"
 msgstr "Als vertraulich einstufen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1113
+#: ../calendar/gui/dialogs/comp-editor.c:1158
 msgid "R_ole Field"
 msgstr "_Positions-Feld"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1115
+#: ../calendar/gui/dialogs/comp-editor.c:1160
 msgid "Toggles whether the Role field is displayed"
 msgstr "Feld fÃ¼r die Position angezeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1121
+#: ../calendar/gui/dialogs/comp-editor.c:1166
 msgid "_RSVP"
 msgstr "_UAwg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1123
+#: ../calendar/gui/dialogs/comp-editor.c:1168
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "UAwg-Feld angezeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129
+#: ../calendar/gui/dialogs/comp-editor.c:1174
 msgid "_Status Field"
 msgstr "_Statusfeld"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1131
+#: ../calendar/gui/dialogs/comp-editor.c:1176
 msgid "Toggles whether the Status field is displayed"
 msgstr "Statusfeld anzeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1137
+#: ../calendar/gui/dialogs/comp-editor.c:1182
 msgid "_Type Field"
 msgstr "A_rt-Feld"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1139
+#: ../calendar/gui/dialogs/comp-editor.c:1184
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Feld fÃ¼r die Teilnehmerart angezeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1163
+#: ../calendar/gui/dialogs/comp-editor.c:1208
 #: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "_Zuletzt geÃ¶ffnet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1683
-#: ../composer/e-composer-actions.c:477
+#: ../calendar/gui/dialogs/comp-editor.c:1743
+#: ../composer/e-composer-actions.c:428
 msgid "Attach"
 msgstr "Beilegen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1738
-msgid "Save"
-msgstr "Speichern"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2015
-#: ../calendar/gui/dialogs/comp-editor.c:2064
-#: ../calendar/gui/dialogs/comp-editor.c:2958
+#: ../calendar/gui/dialogs/comp-editor.c:2072
+#: ../calendar/gui/dialogs/comp-editor.c:2121
+#: ../calendar/gui/dialogs/comp-editor.c:3086
 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:2926
+#: ../calendar/gui/dialogs/comp-editor.c:3050
 #: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "Anlage"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2988
+#: ../calendar/gui/dialogs/comp-editor.c:3118
 msgid "Unable to use current version!"
 msgstr "Aktuelle Version konnte nicht verwendet werden!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:91
+#: ../calendar/gui/dialogs/copy-source-dialog.c:92
 msgid "Could not open source"
 msgstr "Quelle konnte nicht geÃ¶ffnet werden"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:99
+#: ../calendar/gui/dialogs/copy-source-dialog.c:100
 msgid "Could not open destination"
 msgstr "Ziel konnte nicht geÃ¶ffnet werden"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:108
+#: ../calendar/gui/dialogs/copy-source-dialog.c:109
 msgid "Destination is read only"
 msgstr "Ziel ist nur lesbar"
 
@@ -3882,61 +3727,80 @@ msgstr ""
 "werden?"
 
 #: ../calendar/gui/dialogs/delete-comp.c:217
-#| msgid "P_ercent complete:"
 msgid "_Retract comment"
 msgstr "Kommentar zur_Ã¼ckziehen"
 
-#: ../calendar/gui/dialogs/delete-error.c:55
-msgid "The event could not be deleted due to a corba error"
-msgstr "Das Ereignis konnte auf Grund eines Corba-Fehlers nicht gelÃ¶scht werden"
-
-#: ../calendar/gui/dialogs/delete-error.c:58
-msgid "The task could not be deleted due to a corba error"
-msgstr "Die Aufgabe konnte auf Grund eines Corba-Fehlers nicht gelÃ¶scht werden"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:56
+#, c-format
+msgid "The event could not be deleted due to a dbus error: %s"
+msgstr ""
+"Das Ereignis konnte auf Grund eines D-Bus-Fehlers nicht gelÃ¶scht werden: %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:61
-msgid "The memo could not be deleted due to a corba error"
-msgstr "Die Notiz konnte auf Grund eines Corba-Fehlers nicht gelÃ¶scht werden"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:60
+#, c-format
+msgid "The task could not be deleted due to a dbus error: %s"
+msgstr ""
+"Die Aufgabe konnte auf Grund eines D-Bus-Fehlers nicht gelÃ¶scht werden: %s"
 
+#. Translators: The '%s' is replaced with a detailed error message
 #: ../calendar/gui/dialogs/delete-error.c:64
-msgid "The item could not be deleted due to a corba error"
-msgstr "Das Objekt konnte auf Grund eines Corba-Fehlers nicht gelÃ¶scht werden"
+#, c-format
+msgid "The memo could not be deleted due to a dbus error: %s"
+msgstr ""
+"Die Notiz konnte auf Grund eines D-Bus-Fehlers nicht gelÃ¶scht werden: %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:71
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:68
+#, c-format
+msgid "The item could not be deleted due to a dbus error: %s"
+msgstr ""
+"Das Objekt konnte auf Grund eines D-Bus-Fehlers nicht gelÃ¶scht werden: %s"
+
+#: ../calendar/gui/dialogs/delete-error.c:75
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 "Das Ereignis konnte nicht gelÃ¶scht werden, da der Zugriff verweigert wurde"
 
-#: ../calendar/gui/dialogs/delete-error.c:74
+#: ../calendar/gui/dialogs/delete-error.c:78
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 "Die Aufgabe konnte nicht gelÃ¶scht werden, da der Zugriff verweigert wurde"
 
-#: ../calendar/gui/dialogs/delete-error.c:77
+#: ../calendar/gui/dialogs/delete-error.c:81
 msgid "The memo could not be deleted because permission was denied"
 msgstr ""
 "Diese Notiz konnte nicht gelÃ¶scht werden, da der Zugriff verweigert wurde"
 
-#: ../calendar/gui/dialogs/delete-error.c:80
+#: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 "Das Objekt konnte nicht gelÃ¶scht werden, da der Zugriff verweigert wurde"
 
-#: ../calendar/gui/dialogs/delete-error.c:87
-msgid "The event could not be deleted due to an error"
-msgstr "Das Ereignis konnte auf Grund eines Fehlers nicht gelÃ¶scht werden"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:92
+#, c-format
+msgid "The event could not be deleted due to an error: %s"
+msgstr "Das Ereignis konnte auf Grund eines Fehlers nicht gelÃ¶scht werden: %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:90
-msgid "The task could not be deleted due to an error"
-msgstr "Die Aufgabe konnte auf Grund eines Fehlers nicht gelÃ¶scht werden"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:96
+#, c-format
+msgid "The task could not be deleted due to an error: %s"
+msgstr "Die Aufgabe konnte auf Grund eines Fehlers nicht gelÃ¶scht werden: %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:93
-msgid "The memo could not be deleted due to an error"
-msgstr "Die Notiz konnte auf Grund eines Fehlers nicht gelÃ¶scht werden"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:100
+#, c-format
+msgid "The memo could not be deleted due to an error: %s"
+msgstr "Die Notiz konnte auf Grund eines Fehlers nicht gelÃ¶scht werden: %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:96
-msgid "The item could not be deleted due to an error"
-msgstr "Das Objekt konnte auf Grund eines Fehlers nicht gelÃ¶scht werden"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:104
+#, c-format
+msgid "The item could not be deleted due to an error: %s"
+msgstr "Das Objekt konnte auf Grund eines Fehlers nicht gelÃ¶scht werden: %s"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
 msgid "Contacts..."
@@ -3948,139 +3812,153 @@ msgstr "Delegieren an:"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
 msgid "Enter Delegate"
-msgstr "Delegaten eingeben"
+msgstr "Vertreter eingeben"
 
-#: ../calendar/gui/dialogs/event-editor.c:205
+#: ../calendar/gui/dialogs/event-editor.c:217
 msgid "_Alarms"
 msgstr "_Alarme"
 
-#: ../calendar/gui/dialogs/event-editor.c:207
+#: ../calendar/gui/dialogs/event-editor.c:219
 msgid "Click here to set or unset alarms for this event"
 msgstr "Klicken Sie hier, um Alarme fÃ¼r dieses Ereignis einzustellen"
 
-#: ../calendar/gui/dialogs/event-editor.c:212
+#: ../calendar/gui/dialogs/event-editor.c:227
+msgid "Show Time as _Busy"
+msgstr "Zeit als b_eschÃ¤ftigt anzeigen"
+
+#: ../calendar/gui/dialogs/event-editor.c:229
+msgid "Toggles whether to show time as busy"
+msgstr "Festlegen, ob die Zeit als beschÃ¤ftigt angezeigt wird"
+
+#: ../calendar/gui/dialogs/event-editor.c:238
 msgid "_Recurrence"
 msgstr "_Wiederholung"
 
-#: ../calendar/gui/dialogs/event-editor.c:214
+#: ../calendar/gui/dialogs/event-editor.c:240
 msgid "Make this a recurring event"
 msgstr "Dies zu einem wiederkehrenden Ereignis machen"
 
-#: ../calendar/gui/dialogs/event-editor.c:219
+#: ../calendar/gui/dialogs/event-editor.c:245
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
 #: ../plugins/groupwise-features/send-options.c:210
 #: ../widgets/misc/e-send-options.ui.h:19
 msgid "Send Options"
 msgstr "Versandoptionen"
 
-#: ../calendar/gui/dialogs/event-editor.c:221
-#: ../calendar/gui/dialogs/task-editor.c:124
+#: ../calendar/gui/dialogs/event-editor.c:247
+#: ../calendar/gui/dialogs/task-editor.c:129
 msgid "Insert advanced send options"
 msgstr "Erweiterte Versandoptionen einfÃ¼gen"
 
-#: ../calendar/gui/dialogs/event-editor.c:229
+#: ../calendar/gui/dialogs/event-editor.c:255
 msgid "All _Day Event"
 msgstr "_GanztÃ¤giges Ereignis"
 
-#: ../calendar/gui/dialogs/event-editor.c:231
+#: ../calendar/gui/dialogs/event-editor.c:257
 msgid "Toggles whether to have All Day Event"
 msgstr "Festlegen, ob es ein ganztÃ¤giges Ereignis ist"
 
-#: ../calendar/gui/dialogs/event-editor.c:237
-msgid "Show Time as _Busy"
-msgstr "Zeit als b_eschÃ¤ftigt anzeigen"
-
-#: ../calendar/gui/dialogs/event-editor.c:239
-msgid "Toggles whether to show time as busy"
-msgstr "Festlegen, ob die Zeit als beschÃ¤ftigt angezeigt wird"
-
-#: ../calendar/gui/dialogs/event-editor.c:248
+#: ../calendar/gui/dialogs/event-editor.c:266
 msgid "_Free/Busy"
 msgstr "_VerfÃ¼gbarkeit"
 
-#: ../calendar/gui/dialogs/event-editor.c:250
+#: ../calendar/gui/dialogs/event-editor.c:268
 msgid "Query free / busy information for the attendees"
 msgstr "VerfÃ¼gbarkeitsinformationen der Teilnehmer abfragen"
 
-#: ../calendar/gui/dialogs/event-editor.c:296
-msgid "Appoint_ment"
-msgstr "_Termin"
+#: ../calendar/gui/dialogs/event-editor.c:319 ../calendar/gui/print.c:2588
+msgid "Appointment"
+msgstr "Termin"
 
-#: ../calendar/gui/dialogs/event-page.c:751
+#: ../calendar/gui/dialogs/event-editor.c:385
+#: ../calendar/gui/dialogs/event-page.ui.h:9
+#: ../calendar/gui/e-meeting-list-view.c:148
+msgid "Attendees"
+msgstr "Teilnehmer"
+
+#: ../calendar/gui/dialogs/event-editor.c:578
+msgid "Print this event"
+msgstr "Dieses Ereignis drucken"
+
+#: ../calendar/gui/dialogs/event-page.c:766
+msgid "Event's start time is in the past"
+msgstr "Beginn des Ereignisses liegt in der Vergangenheit"
+
+#: ../calendar/gui/dialogs/event-page.c:807
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr ""
 "Das Ereignis kann nicht bearbeitet werden, weil der gewÃ¤hlte Kalender nur "
 "gelesen werden darf"
 
-#: ../calendar/gui/dialogs/event-page.c:755
+#: ../calendar/gui/dialogs/event-page.c:811
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr ""
 "Das Ereignis kann nicht vollstÃ¤ndig bearbeitet werden, weil Sie nicht der "
 "Organisator sind"
 
-#: ../calendar/gui/dialogs/event-page.c:767
-#: ../calendar/gui/dialogs/event-page.c:2718
+#: ../calendar/gui/dialogs/event-page.c:823
+#: ../calendar/gui/dialogs/event-page.c:2775
 msgid "This event has alarms"
 msgstr "Dieses Ereignis enthÃ¤lt Alarme"
 
-#: ../calendar/gui/dialogs/event-page.c:830
-#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/event-page.c:890
+#: ../calendar/gui/dialogs/event-page.ui.h:14
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganisator:"
 
-#: ../calendar/gui/dialogs/event-page.c:877
+#: ../calendar/gui/dialogs/event-page.c:937
 msgid "_Delegatees"
-msgstr "_Delegaten"
+msgstr "_Vertreter"
 
-#: ../calendar/gui/dialogs/event-page.c:879
+#: ../calendar/gui/dialogs/event-page.c:939
 msgid "Atte_ndees"
 msgstr "Teil_nehmer"
 
-#: ../calendar/gui/dialogs/event-page.c:1094
+#: ../calendar/gui/dialogs/event-page.c:1154
 msgid "Event with no start date"
 msgstr "Ereignis ohne Anfangsdatum"
 
-#: ../calendar/gui/dialogs/event-page.c:1097
+#: ../calendar/gui/dialogs/event-page.c:1157
 msgid "Event with no end date"
 msgstr "Ereignis ohne Enddatum"
 
-#: ../calendar/gui/dialogs/event-page.c:1268
-#: ../calendar/gui/dialogs/memo-page.c:657
-#: ../calendar/gui/dialogs/task-page.c:861
+#: ../calendar/gui/dialogs/event-page.c:1328
+#: ../calendar/gui/dialogs/memo-page.c:686
+#: ../calendar/gui/dialogs/task-page.c:907
 msgid "Start date is wrong"
 msgstr "Das Anfangsdatum ist falsch"
 
-#: ../calendar/gui/dialogs/event-page.c:1278
+#: ../calendar/gui/dialogs/event-page.c:1338
 msgid "End date is wrong"
 msgstr "Das Enddatum ist falsch"
 
-#: ../calendar/gui/dialogs/event-page.c:1301
+#: ../calendar/gui/dialogs/event-page.c:1361
 msgid "Start time is wrong"
 msgstr "Die Anfangszeit ist falsch"
 
-#: ../calendar/gui/dialogs/event-page.c:1308
+#: ../calendar/gui/dialogs/event-page.c:1368
 msgid "End time is wrong"
 msgstr "Die Endzeit ist falsch"
 
-#: ../calendar/gui/dialogs/event-page.c:1470
-#: ../calendar/gui/dialogs/memo-page.c:698
-#: ../calendar/gui/dialogs/task-page.c:921
+#: ../calendar/gui/dialogs/event-page.c:1530
+#: ../calendar/gui/dialogs/memo-page.c:727
+#: ../calendar/gui/dialogs/task-page.c:967
 msgid "The organizer selected no longer has an account."
 msgstr "Dem gewÃ¤hlten Organisator ist kein Konto mehr zugeordnet."
 
-#: ../calendar/gui/dialogs/event-page.c:1476
-#: ../calendar/gui/dialogs/memo-page.c:704
-#: ../calendar/gui/dialogs/task-page.c:927
+#: ../calendar/gui/dialogs/event-page.c:1536
+#: ../calendar/gui/dialogs/memo-page.c:733
+#: ../calendar/gui/dialogs/task-page.c:973
 msgid "An organizer is required."
 msgstr "Es ist ein Organisator erforderlich."
 
-#: ../calendar/gui/dialogs/event-page.c:1501
-#: ../calendar/gui/dialogs/task-page.c:951
+#: ../calendar/gui/dialogs/event-page.c:1561
+#: ../calendar/gui/dialogs/task-page.c:997
 msgid "At least one attendee is required."
 msgstr "Es ist mindestens ein Teilnehmer erforderlich."
 
-#: ../calendar/gui/dialogs/event-page.c:2591
+#: ../calendar/gui/dialogs/event-page.c:2649
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Der Kalender Â»%sÂ« konnte nicht geÃ¶ffnet werden."
@@ -4091,135 +3969,144 @@ msgstr "Der Kalender Â»%sÂ« konnte nicht geÃ¶ffnet werden."
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2635
-#: ../calendar/gui/dialogs/memo-page.c:917
-#: ../calendar/gui/dialogs/task-page.c:1743
+#: ../calendar/gui/dialogs/event-page.c:2693
+#: ../calendar/gui/dialogs/memo-page.c:946
+#: ../calendar/gui/dialogs/task-page.c:1787
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Sie handeln im Namen von %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2937
+#: ../calendar/gui/dialogs/event-page.c:2994
 #, 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:2943
+#: ../calendar/gui/dialogs/event-page.c:3000
 #, 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:2949
+#: ../calendar/gui/dialogs/event-page.c:3006
 #, 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:2962
+#: ../calendar/gui/dialogs/event-page.c:3019
 msgid "Customize"
 msgstr "Anpassen"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:2964
+#: ../calendar/gui/dialogs/event-page.c:3021
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "Keine"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:1
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:2
 msgid "1 day before appointment"
 msgstr "1 Tag vor dem Termin"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:2
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 msgid "1 hour before appointment"
 msgstr "1 Stunde vor dem Termin"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:3
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:6
 msgid "15 minutes before appointment"
 msgstr "15 Minuten vor dem Termin"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:8
 #: ../calendar/gui/dialogs/task-page.ui.h:1
 #: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Atte_ndees..."
 msgstr "Teil_nehmer â?¦"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-#: ../calendar/gui/e-meeting-list-view.c:148
-msgid "Attendees"
-msgstr "Teilnehmer"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:9
+#: ../calendar/gui/dialogs/event-page.ui.h:12
 msgid "Custom Alarm:"
 msgstr "Benutzerdefinierter Alarm:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:10
+#: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "Event Description"
 msgstr "Ereignisbeschreibung"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/event-page.ui.h:16
 msgid "_Alarm"
 msgstr "A_larm"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:15
+#: ../calendar/gui/dialogs/event-page.ui.h:18
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "_Beschreibung:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:19
 #: ../plugins/calendar-weather/calendar-weather.c:358
 msgid "_Location:"
 msgstr "O_rt:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-#| msgid "Summary:"
+#: ../calendar/gui/dialogs/event-page.ui.h:20
 msgid "_Summary:"
 msgstr "Zu_sammenfassung:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:18
+#: ../calendar/gui/dialogs/event-page.ui.h:21
 msgid "_Time:"
 msgstr "_Zeit:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:19
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
+#. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] minutes
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/event-page.ui.h:23
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
 msgid "for"
 msgstr "fÃ¼r"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:11
+#. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/event-page.ui.h:27
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:16
 msgid "until"
 msgstr "bis"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2576
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2592
 msgid "Memo"
 msgstr "Notiz"
 
-#: ../calendar/gui/dialogs/memo-page.c:350
+#: ../calendar/gui/dialogs/memo-editor.c:156
+msgid "Print this memo"
+msgstr "Diese Notiz drucken"
+
+#: ../calendar/gui/dialogs/memo-page.c:338
+msgid "Memo's start date is in the past"
+msgstr "Beginn der Notiz liegt in der Vergangenheit"
+
+#: ../calendar/gui/dialogs/memo-page.c:376
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr ""
 "Die Notiz kann nicht bearbeitet werden, weil die gewÃ¤hlte Notizliste nur "
 "gelesen werden darf"
 
-#: ../calendar/gui/dialogs/memo-page.c:354
+#: ../calendar/gui/dialogs/memo-page.c:380
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr ""
 "Die Notiz kann nicht vollstÃ¤ndig bearbeitet werden, weil Sie nicht der "
 "Organisator sind"
 
-#: ../calendar/gui/dialogs/memo-page.c:878
+#: ../calendar/gui/dialogs/memo-page.c:907
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Notizen in Â»%sÂ« konnten nicht geÃ¶ffnet werden."
 
-#: ../calendar/gui/dialogs/memo-page.c:1045 ../em-format/em-format-quote.c:215
-#: ../em-format/em-format.c:939 ../mail/em-format-html.c:2242
-#: ../mail/em-format-html.c:2301 ../mail/em-format-html.c:2325
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
+#: ../calendar/gui/dialogs/memo-page.c:1078 ../em-format/em-format-quote.c:215
+#: ../em-format/em-format.c:942 ../mail/em-format-html.c:2284
+#: ../mail/em-format-html.c:2343 ../mail/em-format-html.c:2367
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:80
 msgid "To"
 msgstr "An"
 
@@ -4238,7 +4125,7 @@ msgid "T_o:"
 msgstr "A_n:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:380
+#: ../calendar/gui/dialogs/task-page.c:426
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "_Gruppe:"
@@ -4431,7 +4318,7 @@ msgstr "Alle"
 msgid "Exceptions"
 msgstr "Ausnahmen"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:85
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:89
 msgid "Preview"
 msgstr "Vorschau"
 
@@ -4439,19 +4326,23 @@ msgstr "Vorschau"
 msgid "This appointment rec_urs"
 msgstr "Dieser Termin wird _wiederholt"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:9
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
 msgid "forever"
 msgstr "stÃ¤ndig"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:14
 msgid "month(s)"
 msgstr "Monat(e)"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:18
 msgid "week(s)"
 msgstr "Woche(n)"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:13
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
 msgid "year(s)"
 msgstr "Jahr(e)"
 
@@ -4463,70 +4354,82 @@ msgstr "Meine Alarme zusammen mit diesem Termin verschicken"
 msgid "Notify new attendees _only"
 msgstr "_Nur neue Teilnehmer benachrichtigen"
 
-#: ../calendar/gui/dialogs/task-details-page.c:379
-#: ../calendar/gui/dialogs/task-details-page.c:399
+#: ../calendar/gui/dialogs/task-details-page.c:350
+#: ../calendar/gui/dialogs/task-details-page.c:372
 msgid "Completed date is wrong"
 msgstr "Das Fertigstellungsdatum ist falsch"
 
-#: ../calendar/gui/dialogs/task-details-page.c:486
+#: ../calendar/gui/dialogs/task-details-page.c:483
 msgid "Web Page"
 msgstr "Website"
 
 #. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:2
+#: ../calendar/gui/e-cal-component-preview.c:295
+#: ../calendar/gui/e-cal-model-tasks.c:443
+#: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:588
+#: ../calendar/gui/print.c:2675 ../mail/em-sync-stream.c:151
+#: ../mail/em-sync-stream.c:178 ../mail/em-sync-stream.c:199
+#, c-format
+msgid "Canceled"
+msgstr "Abgebrochen"
+
+#. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:291
+#: ../calendar/gui/e-cal-component-preview.c:292
 #: ../calendar/gui/e-cal-model-tasks.c:441
 #: ../calendar/gui/e-cal-model-tasks.c:715 ../calendar/gui/e-itip-control.c:931
 #: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
 #: ../calendar/gui/e-task-table.c:213 ../calendar/gui/e-task-table.c:228
-#: ../calendar/gui/e-task-table.c:586 ../calendar/gui/print.c:2656
+#: ../calendar/gui/e-task-table.c:587 ../calendar/gui/print.c:2672
 #: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
 msgstr "Abgeschlossen"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:313
-#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1123 ../widgets/misc/e-send-options.ui.h:8
+#: ../calendar/gui/e-cal-component-preview.c:314
+#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1172 ../widgets/misc/e-send-options.ui.h:8
 msgid "High"
 msgstr "Hoch"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:288
+#: ../calendar/gui/e-cal-component-preview.c:289
 #: ../calendar/gui/e-cal-model-tasks.c:439
 #: ../calendar/gui/e-cal-model-tasks.c:713
 #: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
-#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:585
-#: ../calendar/gui/print.c:2653
+#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:586
+#: ../calendar/gui/print.c:2669
 msgid "In Progress"
 msgstr "In Bearbeitung"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:317
-#: ../calendar/gui/e-task-table.c:512 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1121 ../widgets/misc/e-send-options.ui.h:9
+#: ../calendar/gui/e-cal-component-preview.c:318
+#: ../calendar/gui/e-task-table.c:513 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1170 ../widgets/misc/e-send-options.ui.h:9
 msgid "Low"
 msgstr "Niedrig"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
-#: ../calendar/gui/e-cal-component-preview.c:315
-#: ../calendar/gui/e-cal-model.c:1243 ../calendar/gui/e-task-table.c:511
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1122
+#: ../calendar/gui/e-cal-component-preview.c:316
+#: ../calendar/gui/e-cal-model.c:1269 ../calendar/gui/e-task-table.c:512
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1171
 #: ../widgets/misc/e-send-options.ui.h:13
 msgid "Normal"
 msgstr "Normal"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
-#: ../calendar/gui/e-cal-component-preview.c:298
+#: ../calendar/gui/e-cal-component-preview.c:299
 #: ../calendar/gui/e-cal-model-tasks.c:437
 #: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
-#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:584
-#: ../calendar/gui/print.c:2650 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:585
+#: ../calendar/gui/print.c:2666 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Nicht begonnen"
 
@@ -4542,8 +4445,8 @@ msgstr "Stat_us:"
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1759
-#: ../calendar/gui/e-meeting-list-view.c:603
+#: ../calendar/gui/e-calendar-view.c:1773
+#: ../calendar/gui/e-meeting-list-view.c:594
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
@@ -4552,7 +4455,7 @@ msgstr "Status"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:513 ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-task-table.c:514 ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:24
 msgid "Undefined"
 msgstr "Nicht festgelegt"
@@ -4570,50 +4473,63 @@ msgstr "_PrioritÃ¤t:"
 msgid "_Web Page:"
 msgstr "_Website:"
 
-#: ../calendar/gui/dialogs/task-editor.c:112
+#: ../calendar/gui/dialogs/task-editor.c:117
 msgid "_Status Details"
 msgstr "S_tatusdetails"
 
-#: ../calendar/gui/dialogs/task-editor.c:114
+#: ../calendar/gui/dialogs/task-editor.c:119
 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:122
+#: ../calendar/gui/dialogs/task-editor.c:127
 #: ../plugins/groupwise-features/mail-send-options.c:200
 msgid "_Send Options"
 msgstr "_Versandoptionen"
 
-#: ../calendar/gui/dialogs/task-editor.c:322
-msgid "_Task"
-msgstr "_Aufgabe"
+#: ../calendar/gui/dialogs/task-editor.c:328 ../calendar/gui/print.c:2590
+#: ../widgets/misc/e-send-options.c:502
+msgid "Task"
+msgstr "Aufgabe"
 
-#: ../calendar/gui/dialogs/task-editor.c:325
+#: ../calendar/gui/dialogs/task-editor.c:331
 msgid "Task Details"
 msgstr "Aufgabendetails"
 
-#: ../calendar/gui/dialogs/task-page.c:336
+#: ../calendar/gui/dialogs/task-editor.c:373
+msgid "Print this task"
+msgstr "Diese Aufgabe drucken"
+
+#: ../calendar/gui/dialogs/task-page.c:343
+msgid "Task's start date is in the past"
+msgstr "Beginn der Aufgabe liegt in der Vergangenheit"
+
+#: ../calendar/gui/dialogs/task-page.c:344
+msgid "Task's due date is in the past"
+msgstr "FÃ¤lligkeit der Aufgabe liegt in der Vergangenheit"
+
+#: ../calendar/gui/dialogs/task-page.c:379
 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:340
+#: ../calendar/gui/dialogs/task-page.c:383
 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:388
+#: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "Or_ganisator:"
 
-#: ../calendar/gui/dialogs/task-page.c:834
+#: ../calendar/gui/dialogs/task-page.c:880
 msgid "Due date is wrong"
 msgstr "Das FÃ¤lligkeitsdatum ist falsch"
 
-#: ../calendar/gui/dialogs/task-page.c:1700
+#: ../calendar/gui/dialogs/task-page.c:1744
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Aufgaben in Â»%sÂ« konnten nicht geÃ¶ffnet werden."
@@ -4706,46 +4622,46 @@ msgstr "%s um %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s fÃ¼r einen unbekannten AuslÃ¶sertyp."
 
-#: ../calendar/gui/e-cal-component-preview.c:191 ../filter/e-filter-rule.c:664
+#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:664
 msgid "Untitled"
 msgstr "Namenlos"
 
-#: ../calendar/gui/e-cal-component-preview.c:197
+#: ../calendar/gui/e-cal-component-preview.c:198
 msgid "Categories:"
 msgstr "Kategorien:"
 
-#: ../calendar/gui/e-cal-component-preview.c:236
+#: ../calendar/gui/e-cal-component-preview.c:237
 #: ../calendar/gui/e-itip-control.c:1164 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "Zusammenfassung:"
 
-#: ../calendar/gui/e-cal-component-preview.c:245
-#: ../calendar/gui/e-cal-component-preview.c:258
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-cal-component-preview.c:259
 msgid "Start Date:"
 msgstr "Anfangsdatum:"
 
-#: ../calendar/gui/e-cal-component-preview.c:271
+#: ../calendar/gui/e-cal-component-preview.c:272
 msgid "Due Date:"
 msgstr "FÃ¤llig am:"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:284
+#: ../calendar/gui/e-cal-component-preview.c:285
 #: ../calendar/gui/e-itip-control.c:1189
 #: ../plugins/itip-formatter/itip-view.c:1074
 msgid "Status:"
 msgstr "Status:"
 
-#: ../calendar/gui/e-cal-component-preview.c:311
+#: ../calendar/gui/e-cal-component-preview.c:312
 msgid "Priority:"
 msgstr "PrioritÃ¤t:"
 
-#: ../calendar/gui/e-cal-component-preview.c:336
+#: ../calendar/gui/e-cal-component-preview.c:337
 #: ../calendar/gui/e-itip-control.c:1227 ../calendar/gui/e-itip-control.ui.h:4
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:37
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: ../calendar/gui/e-cal-component-preview.c:367
+#: ../calendar/gui/e-cal-component-preview.c:368
 msgid "Web Page:"
 msgstr "Website:"
 
@@ -4772,12 +4688,12 @@ msgid "Start Date"
 msgstr "Anfangsdatum"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:562
+#: ../calendar/gui/e-task-table.c:563
 msgid "Free"
 msgstr "Frei"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:561 ../calendar/gui/e-task-table.c:563
+#: ../calendar/gui/e-meeting-time-sel.c:561 ../calendar/gui/e-task-table.c:564
 msgid "Busy"
 msgstr "BeschÃ¤ftigt"
 
@@ -4797,44 +4713,42 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "Keine"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
 #: ../calendar/gui/e-meeting-list-view.c:187
 #: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
-#: ../calendar/gui/e-meeting-store.c:829
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
+#: ../calendar/gui/e-meeting-store.c:856
 msgid "Yes"
 msgstr "Ja"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
 #: ../calendar/gui/e-meeting-list-view.c:188
 #: ../calendar/gui/e-meeting-store.c:181
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Nein"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:501 ../calendar/gui/e-itip-control.c:1210
+#: ../calendar/gui/e-cal-model.c:527 ../calendar/gui/e-itip-control.c:1210
 #: ../calendar/gui/e-itip-control.c:1349
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
 #: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:978
+#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:967
 #: ../plugins/itip-formatter/itip-formatter.c:457
-#: ../plugins/itip-formatter/itip-formatter.c:2342
+#: ../plugins/itip-formatter/itip-formatter.c:2343
 #: ../plugins/plugin-manager/plugin-manager.c:89
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../calendar/gui/e-cal-model.c:1245
+#: ../calendar/gui/e-cal-model.c:1271
 msgid "Recurring"
 msgstr "Wiederkehrend"
 
-#: ../calendar/gui/e-cal-model.c:1247
+#: ../calendar/gui/e-cal-model.c:1273
 msgid "Assigned"
 msgstr "Zugewiesen"
 
-#: ../calendar/gui/e-cal-model.c:2141
+#: ../calendar/gui/e-cal-model.c:2175
 #, c-format
 msgid "Opening %s"
 msgstr "%s wird geÃ¶ffnet â?¦"
@@ -4870,95 +4784,95 @@ msgid "Start date"
 msgstr "Anfangsdatum"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:566
+#: ../calendar/gui/e-meeting-list-view.c:557
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:554
+#: ../widgets/misc/e-attachment-tree-view.c:572
 msgid "Type"
 msgstr "Art"
 
-#: ../calendar/gui/e-calendar-view.c:404
+#: ../calendar/gui/e-calendar-view.c:407
 msgid "Cut selected events to the clipboard"
 msgstr "Die gewÃ¤hlten Ereignisse in die Zwischenablage ausschneiden"
 
-#: ../calendar/gui/e-calendar-view.c:410
+#: ../calendar/gui/e-calendar-view.c:413
 msgid "Copy selected events to the clipboard"
 msgstr "Die gewÃ¤hlten Ereignisse in die Zwischenablage kopieren"
 
-#: ../calendar/gui/e-calendar-view.c:416
+#: ../calendar/gui/e-calendar-view.c:419
 msgid "Paste events from the clipboard"
 msgstr "Die in der Zwischenablage befindlichen Ereignisse einfÃ¼gen"
 
-#: ../calendar/gui/e-calendar-view.c:422
+#: ../calendar/gui/e-calendar-view.c:425
 msgid "Delete selected events"
 msgstr "Die gewÃ¤hlten Ereignisse lÃ¶schen"
 
-#: ../calendar/gui/e-calendar-view.c:441 ../calendar/gui/e-memo-table.c:187
-#: ../calendar/gui/e-task-table.c:265
+#: ../calendar/gui/e-calendar-view.c:444 ../calendar/gui/e-memo-table.c:188
+#: ../calendar/gui/e-task-table.c:266
 msgid "Deleting selected objects"
 msgstr "GewÃ¤hlte Objekte werden gelÃ¶scht"
 
-#: ../calendar/gui/e-calendar-view.c:629 ../calendar/gui/e-memo-table.c:844
-#: ../calendar/gui/e-task-table.c:1067
+#: ../calendar/gui/e-calendar-view.c:638 ../calendar/gui/e-memo-table.c:845
+#: ../calendar/gui/e-task-table.c:1068
 msgid "Updating objects"
 msgstr "Objekte werden aktualisiert"
 
-#: ../calendar/gui/e-calendar-view.c:1706 ../calendar/gui/e-itip-control.c:1195
+#: ../calendar/gui/e-calendar-view.c:1720 ../calendar/gui/e-itip-control.c:1195
 #: ../calendar/gui/e-meeting-list-view.c:199
 #: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
-#: ../plugins/itip-formatter/itip-formatter.c:2330
+#: ../plugins/itip-formatter/itip-formatter.c:2331
 msgid "Accepted"
 msgstr "Angenommen"
 
-#: ../calendar/gui/e-calendar-view.c:1707 ../calendar/gui/e-itip-control.c:1205
+#: ../calendar/gui/e-calendar-view.c:1721 ../calendar/gui/e-itip-control.c:1205
 #: ../calendar/gui/e-meeting-list-view.c:200
 #: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
-#: ../plugins/itip-formatter/itip-formatter.c:2336
+#: ../plugins/itip-formatter/itip-formatter.c:2337
 msgid "Declined"
 msgstr "Abgelehnt"
 
-#: ../calendar/gui/e-calendar-view.c:1708
+#: ../calendar/gui/e-calendar-view.c:1722
 #: ../calendar/gui/e-meeting-list-view.c:201
 #: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "Tentative"
 msgstr "VorlÃ¤ufig"
 
-#: ../calendar/gui/e-calendar-view.c:1709
+#: ../calendar/gui/e-calendar-view.c:1723
 #: ../calendar/gui/e-meeting-list-view.c:202
 #: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
-#: ../plugins/itip-formatter/itip-formatter.c:2339
+#: ../plugins/itip-formatter/itip-formatter.c:2340
 msgid "Delegated"
 msgstr "Delegiert"
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1724
 msgid "Needs action"
 msgstr "Erfordert MaÃ?nahme"
 
 #. 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:1852 ../calendar/gui/e-memo-table.c:527
-#: ../calendar/gui/e-task-table.c:742
+#: ../calendar/gui/e-calendar-view.c:1869 ../calendar/gui/e-memo-table.c:528
+#: ../calendar/gui/e-task-table.c:743
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organisator: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1856 ../calendar/gui/e-memo-table.c:532
-#: ../calendar/gui/e-task-table.c:745
+#: ../calendar/gui/e-calendar-view.c:1873 ../calendar/gui/e-memo-table.c:533
+#: ../calendar/gui/e-task-table.c:746
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisator: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1872 ../calendar/gui/print.c:2608
+#: ../calendar/gui/e-calendar-view.c:1889 ../calendar/gui/print.c:2624
 #, c-format
 msgid "Location: %s"
 msgstr "Ort: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1903
+#: ../calendar/gui/e-calendar-view.c:1920
 #, c-format
 msgid "Time: %s %s"
 msgstr "Zeit: %s %s"
@@ -5001,8 +4915,8 @@ msgstr "Zweite Zeitzone anzeigen"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:865 ../calendar/gui/e-day-view.c:1879
-#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1735
+#: ../calendar/gui/e-day-view-top-item.c:897 ../calendar/gui/e-day-view.c:1878
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1744
 msgid "%A %d %B"
 msgstr "%A, %d. %B"
 
@@ -5012,10 +4926,10 @@ msgstr "%A, %d. %B"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:869 ../calendar/gui/e-day-view.c:1896
+#: ../calendar/gui/e-day-view-top-item.c:901 ../calendar/gui/e-day-view.c:1895
 #: ../calendar/gui/e-week-view-main-item.c:227
-#: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:913
+#: ../calendar/gui/ea-gnome-calendar.c:202
+#: ../modules/calendar/e-cal-shell-view-private.c:1014
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
 
@@ -5024,33 +4938,32 @@ msgstr "%a, %d. %b"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:873 ../calendar/gui/e-day-view.c:1912
+#: ../calendar/gui/e-day-view-top-item.c:905 ../calendar/gui/e-day-view.c:1911
 #: ../calendar/gui/e-week-view-main-item.c:241
-#: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:949
+#: ../calendar/gui/ea-gnome-calendar.c:232
+#: ../modules/calendar/e-cal-shell-view-private.c:1050
 msgid "%d %b"
 msgstr "%d. %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1076 ../calendar/gui/e-week-view.c:748
+#: ../calendar/gui/e-day-view.c:1077 ../calendar/gui/e-week-view.c:749
 #: ../calendar/gui/print.c:819
 msgid "am"
 msgstr "AM"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1079 ../calendar/gui/e-week-view.c:751
+#: ../calendar/gui/e-day-view.c:1080 ../calendar/gui/e-week-view.c:752
 #: ../calendar/gui/print.c:821
 msgid "pm"
 msgstr "PM"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2609
+#: ../calendar/gui/e-day-view.c:2645
 #, c-format
 msgid "Week %d"
 msgstr "Woche %d"
 
 #: ../calendar/gui/e-itip-control.c:761
-#| msgid "Recurring"
 msgid "Recurring:"
 msgstr "Wiederkehrend:"
 
@@ -5157,9 +5070,6 @@ msgid "An unknown person"
 msgstr "Eine unbekannte Person"
 
 #: ../calendar/gui/e-itip-control.c:1145
-#| msgid ""
-#| "<br> Please review the following information, and then select an action "
-#| "from the menu below."
 msgid ""
 "Please review the following information, and then select an action from the "
 "menu below."
@@ -5169,13 +5079,13 @@ msgstr ""
 
 #. Translators: "None" used as a default value for events without Summary received by mail
 #: ../calendar/gui/e-itip-control.c:1160
-#: ../plugins/itip-formatter/itip-formatter.c:2317
+#: ../plugins/itip-formatter/itip-formatter.c:2318
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Keine"
 
 #: ../calendar/gui/e-itip-control.c:1200
-#: ../plugins/itip-formatter/itip-formatter.c:2333
+#: ../plugins/itip-formatter/itip-formatter.c:2334
 msgid "Tentatively Accepted"
 msgstr "VorlÃ¤ufig angenommen"
 
@@ -5195,7 +5105,6 @@ msgstr ""
 
 #: ../calendar/gui/e-itip-control.c:1369
 #, c-format
-#| msgid "<b>%s</b> has published meeting information."
 msgid "%s has published meeting information."
 msgstr "%s hat Besprechungsinformationen verÃ¶ffentlicht."
 
@@ -5205,13 +5114,11 @@ msgstr "Besprechungsinformationen"
 
 #: ../calendar/gui/e-itip-control.c:1376
 #, c-format
-#| msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgid "%s requests the presence of %s at a meeting."
 msgstr "%s wÃ¼nscht die Teilnahme von %s an einer Besprechung."
 
 #: ../calendar/gui/e-itip-control.c:1378
 #, c-format
-#| msgid "<b>%s</b> requests your presence at a meeting."
 msgid "%s requests your presence at a meeting."
 msgstr "%s wÃ¼nscht Ihre Teilnahme an einer Besprechung."
 
@@ -5222,7 +5129,6 @@ msgstr "Besprechungsvorschlag"
 #. FIXME Whats going on here?
 #: ../calendar/gui/e-itip-control.c:1385
 #, c-format
-#| msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgid "%s wishes to be added to an existing meeting."
 msgstr "%s wÃ¼nscht zu einer existierenden Besprechung hinzugefÃ¼gt zu werden."
 
@@ -5232,7 +5138,6 @@ msgstr "Besprechungsaktualisierung"
 
 #: ../calendar/gui/e-itip-control.c:1390
 #, c-format
-#| msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgid "%s wishes to receive the latest meeting information."
 msgstr "%s wÃ¼nscht aktuelle Besprechungsinformationen zu erhalten."
 
@@ -5242,7 +5147,6 @@ msgstr "Besprechungs-Aktualisierungsanfrage"
 
 #: ../calendar/gui/e-itip-control.c:1398
 #, c-format
-#| msgid "<b>%s</b> has replied to a meeting request."
 msgid "%s has replied to a meeting request."
 msgstr "%s hat auf eine Besprechungsanfrage geantwortet."
 
@@ -5252,7 +5156,6 @@ msgstr "Besprechungsantwort"
 
 #: ../calendar/gui/e-itip-control.c:1406
 #, c-format
-#| msgid "<b>%s</b> has canceled a meeting."
 msgid "%s has canceled a meeting."
 msgstr "%s hat eine Besprechung abgesagt."
 
@@ -5263,7 +5166,6 @@ msgstr "Besprechungsabsage"
 #: ../calendar/gui/e-itip-control.c:1417 ../calendar/gui/e-itip-control.c:1494
 #: ../calendar/gui/e-itip-control.c:1534
 #, c-format
-#| msgid "<b>%s</b> has sent an unintelligible message."
 msgid "%s has sent an unintelligible message."
 msgstr "%s hat eine unverstÃ¤ndliche Nachricht verschickt."
 
@@ -5273,7 +5175,6 @@ msgstr "Fehlerhafte Besprechungsmitteilung"
 
 #: ../calendar/gui/e-itip-control.c:1445
 #, c-format
-#| msgid "<b>%s</b> has published task information."
 msgid "%s has published task information."
 msgstr "%s hat Aufgabeninformationen verÃ¶ffentlicht."
 
@@ -5283,13 +5184,11 @@ msgstr "Aufgabeninformationen"
 
 #: ../calendar/gui/e-itip-control.c:1453
 #, c-format
-#| msgid "<b>%s</b> requests %s to perform a task."
 msgid "%s requests %s to perform a task."
 msgstr "%s wÃ¼nscht, dass %s eine Aufgabe ausfÃ¼hrt."
 
 #: ../calendar/gui/e-itip-control.c:1455
 #, c-format
-#| msgid "<b>%s</b> requests you perform a task."
 msgid "%s requests you perform a task."
 msgstr "%s wÃ¼nscht, dass Sie eine Aufgabe ausfÃ¼hren."
 
@@ -5300,7 +5199,6 @@ msgstr "Aufgabenvorschlag"
 #. FIXME Whats going on here?
 #: ../calendar/gui/e-itip-control.c:1462
 #, c-format
-#| msgid "<b>%s</b> wishes to be added to an existing task."
 msgid "%s wishes to be added to an existing task."
 msgstr "%s wÃ¼nscht zu einer bestehenden Aufgabe hinzugefÃ¼gt zu werden."
 
@@ -5310,7 +5208,6 @@ msgstr "Aufgabenaktualisierung"
 
 #: ../calendar/gui/e-itip-control.c:1467
 #, c-format
-#| msgid "<b>%s</b> wishes to receive the latest task information."
 msgid "%s wishes to receive the latest task information."
 msgstr "%s wÃ¼nscht aktuelle Aufgabeninformationen zu erhalten."
 
@@ -5320,7 +5217,6 @@ msgstr "Aufgaben-Aktualisierungsanfrage"
 
 #: ../calendar/gui/e-itip-control.c:1475
 #, c-format
-#| msgid "<b>%s</b> has replied to a task assignment."
 msgid "%s has replied to a task assignment."
 msgstr "%s hat auf eine Aufgabenzuweisung geantwortet."
 
@@ -5330,7 +5226,6 @@ msgstr "Aufgaben-Antwort"
 
 #: ../calendar/gui/e-itip-control.c:1483
 #, c-format
-#| msgid "<b>%s</b> has canceled a task."
 msgid "%s has canceled a task."
 msgstr "%s hat eine Aufgabe abgesagt."
 
@@ -5344,7 +5239,6 @@ msgstr "Fehlerhafte Aufgabenmitteilung"
 
 #: ../calendar/gui/e-itip-control.c:1519
 #, c-format
-#| msgid "<b>%s</b> has published free/busy information."
 msgid "%s has published free/busy information."
 msgstr "%s hat VerfÃ¼gbarkeitsinformationen verÃ¶ffentlicht."
 
@@ -5354,7 +5248,6 @@ msgstr "VerfÃ¼gbarkeitsinformationen"
 
 #: ../calendar/gui/e-itip-control.c:1524
 #, c-format
-#| msgid "<b>%s</b> requests your free/busy information."
 msgid "%s requests your free/busy information."
 msgstr "%s fordert Ihre VerfÃ¼gbarkeitsinformationen an."
 
@@ -5364,7 +5257,6 @@ msgstr "VerfÃ¼gbarkeitsanfrage"
 
 #: ../calendar/gui/e-itip-control.c:1529
 #, c-format
-#| msgid "<b>%s</b> has replied to a free/busy request."
 msgid "%s has replied to a free/busy request."
 msgstr "%s hat auf eine Verfugbarkeitsanfrage geantwortet."
 
@@ -5417,7 +5309,7 @@ msgid "Attendee status updated\n"
 msgstr "Teilnahmestatus aktualisiert\n"
 
 #: ../calendar/gui/e-itip-control.c:2084
-#: ../plugins/itip-formatter/itip-formatter.c:1420
+#: ../plugins/itip-formatter/itip-formatter.c:1421
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Teilnahmestatus konnte nicht aktualisiert werden, da der Eintrag nicht mehr "
@@ -5437,7 +5329,7 @@ msgstr "Eine Aktion wÃ¤hlen:"
 
 #. To translators: RSVP means "please reply"
 #: ../calendar/gui/e-itip-control.c:2302
-#: ../calendar/gui/e-meeting-list-view.c:591
+#: ../calendar/gui/e-meeting-list-view.c:582
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "UAwg"
@@ -5473,7 +5365,7 @@ msgid "Send Latest Information"
 msgstr "Neueste Informationen Ã¼bermitteln"
 
 #: ../calendar/gui/e-itip-control.c:2465
-#: ../modules/mail/e-mail-shell-view-actions.c:970
+#: ../modules/mail/e-mail-shell-view-actions.c:976
 #: ../widgets/misc/e-activity-proxy.c:298
 msgid "Cancel"
 msgstr "Abbrechen"
@@ -5524,7 +5416,7 @@ msgstr "Ressourcen"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
 #: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
-#: ../calendar/gui/e-meeting-store.c:823 ../calendar/gui/print.c:968
+#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
 msgid "Individual"
 msgstr "Individuell"
 
@@ -5554,7 +5446,7 @@ msgstr "Vorsitzender"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
 #: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
-#: ../calendar/gui/e-meeting-store.c:826 ../calendar/gui/print.c:986
+#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
 msgid "Required Participant"
 msgstr "BenÃ¶tigter Teilnehmer"
 
@@ -5572,12 +5464,12 @@ msgstr "Nicht-Teilnehmer"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
 #: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
-#: ../calendar/gui/e-meeting-store.c:836
+#: ../calendar/gui/e-meeting-store.c:863
 msgid "Needs Action"
 msgstr "Erfordert MaÃ?nahme"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:546
+#: ../calendar/gui/e-meeting-list-view.c:537
 msgid "Attendee                          "
 msgstr "Teilnehmer"
 
@@ -5588,7 +5480,7 @@ msgstr "In Bearbeitung"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:458
-#: ../calendar/gui/e-meeting-time-sel.c:2366
+#: ../calendar/gui/e-meeting-time-sel.c:2376
 msgid "%A, %B %d, %Y"
 msgstr "%a, %d. %B %Y"
 
@@ -5597,7 +5489,7 @@ msgstr "%a, %d. %B %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:462
-#: ../calendar/gui/e-meeting-time-sel.c:2397
+#: ../calendar/gui/e-meeting-time-sel.c:2407
 msgid "%a %m/%d/%Y"
 msgstr "%a, %d.%m.%Y"
 
@@ -5691,8 +5583,8 @@ msgstr "Sprache"
 msgid "Member"
 msgstr "Mitglied"
 
-#: ../calendar/gui/e-memo-table.c:411
-#: ../modules/calendar/e-cal-shell-content.c:461
+#: ../calendar/gui/e-memo-table.c:412
+#: ../modules/calendar/e-cal-shell-content.c:468
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
 #: ../modules/calendar/e-memo-shell-view.c:289
@@ -5700,38 +5592,38 @@ msgstr "Mitglied"
 msgid "Memos"
 msgstr "Notizen"
 
-#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:706
+#: ../calendar/gui/e-memo-table.c:490 ../calendar/gui/e-task-table.c:707
 msgid "* No Summary *"
 msgstr "* Keine Zusammenfassung *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:574 ../calendar/gui/e-task-table.c:786
+#: ../calendar/gui/e-memo-table.c:575 ../calendar/gui/e-task-table.c:787
 msgid "Start: "
 msgstr "Anfang:"
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:593 ../calendar/gui/e-task-table.c:804
+#: ../calendar/gui/e-memo-table.c:594 ../calendar/gui/e-task-table.c:805
 msgid "Due: "
 msgstr "FÃ¤lligkeit:"
 
-#: ../calendar/gui/e-memo-table.c:709
+#: ../calendar/gui/e-memo-table.c:710
 msgid "Cut selected memos to the clipboard"
 msgstr "Die gewÃ¤hlten Notizen in die Zwischenablage ausschneiden"
 
-#: ../calendar/gui/e-memo-table.c:715
+#: ../calendar/gui/e-memo-table.c:716
 msgid "Copy selected memos to the clipboard"
 msgstr "Die gewÃ¤hlten Notizen in die Zwischenablage kopieren"
 
-#: ../calendar/gui/e-memo-table.c:721
+#: ../calendar/gui/e-memo-table.c:722
 msgid "Paste memos from the clipboard"
 msgstr "Notiz aus der Zwischenablage einfÃ¼gen"
 
-#: ../calendar/gui/e-memo-table.c:727
-#: ../modules/calendar/e-memo-shell-view-actions.c:556
+#: ../calendar/gui/e-memo-table.c:728
+#: ../modules/calendar/e-memo-shell-view-actions.c:566
 msgid "Delete selected memos"
 msgstr "Die gewÃ¤hlten Notizen lÃ¶schen"
 
-#: ../calendar/gui/e-memo-table.c:733
+#: ../calendar/gui/e-memo-table.c:734
 msgid "Select all visible memos"
 msgstr "Alle sichtbaren Notizen wÃ¤hlen"
 
@@ -5743,16 +5635,15 @@ msgstr "Klicken Sie hier, um eine Notiz hinzuzufÃ¼gen"
 #. %d is the actual value, %% is replaced with a percent sign.
 #. Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:538
+#: ../calendar/gui/e-task-table.c:539
 #, c-format
-#| msgid "%d %b"
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:628 ../calendar/gui/print.c:2043
-#: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:749
-#: ../modules/calendar/e-cal-shell-content.c:423
+#: ../calendar/gui/e-task-table.c:629 ../calendar/gui/print.c:2052
+#: ../calendar/importers/icalendar-importer.c:81
+#: ../calendar/importers/icalendar-importer.c:828
+#: ../modules/calendar/e-cal-shell-content.c:429
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
 #: ../modules/calendar/e-task-shell-view.c:437
@@ -5763,24 +5654,24 @@ msgstr "%d%%"
 msgid "Tasks"
 msgstr "Aufgaben"
 
-#: ../calendar/gui/e-task-table.c:932
+#: ../calendar/gui/e-task-table.c:933
 msgid "Cut selected tasks to the clipboard"
 msgstr "Die gewÃ¤hlten Aufgaben in die Zwischenablage ausschneiden"
 
-#: ../calendar/gui/e-task-table.c:938
+#: ../calendar/gui/e-task-table.c:939
 msgid "Copy selected tasks to the clipboard"
 msgstr "Die gewÃ¤hlten Aufgaben in die Zwischenablage kopieren"
 
-#: ../calendar/gui/e-task-table.c:944
+#: ../calendar/gui/e-task-table.c:945
 msgid "Paste tasks from the clipboard"
 msgstr "Aufgaben aus der Zwischenablage einfÃ¼gen"
 
-#: ../calendar/gui/e-task-table.c:950
-#: ../modules/calendar/e-task-shell-view-actions.c:681
+#: ../calendar/gui/e-task-table.c:951
+#: ../modules/calendar/e-task-shell-view-actions.c:690
 msgid "Delete selected tasks"
 msgstr "Die gewÃ¤hlten Aufgaben lÃ¶schen"
 
-#: ../calendar/gui/e-task-table.c:956
+#: ../calendar/gui/e-task-table.c:957
 msgid "Select all visible tasks"
 msgstr "Alle sichtbaren Aufgaben wÃ¤hlen"
 
@@ -5791,56 +5682,56 @@ 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:235 ../calendar/gui/print.c:1716
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1725
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: ../calendar/gui/ea-cal-view-event.c:276
+#: ../calendar/gui/ea-cal-view-event.c:286
 msgid "It has alarms."
 msgstr "Es enthÃ¤lt Alarme."
 
-#: ../calendar/gui/ea-cal-view-event.c:279
+#: ../calendar/gui/ea-cal-view-event.c:289
 msgid "It has recurrences."
 msgstr "Es enthÃ¤lt Wiederholungen."
 
-#: ../calendar/gui/ea-cal-view-event.c:282
+#: ../calendar/gui/ea-cal-view-event.c:292
 msgid "It is a meeting."
 msgstr "Es ist eine Besprechung."
 
-#: ../calendar/gui/ea-cal-view-event.c:288
+#: ../calendar/gui/ea-cal-view-event.c:298
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Kalender-Ereignis: Die Zusammenfassung lautet %s."
 
-#: ../calendar/gui/ea-cal-view-event.c:290
+#: ../calendar/gui/ea-cal-view-event.c:300
 msgid "Calendar Event: It has no summary."
 msgstr "Kalender-Ereignis: Keine Zusammenfassung verfÃ¼gbar."
 
-#: ../calendar/gui/ea-cal-view-event.c:312
+#: ../calendar/gui/ea-cal-view-event.c:322
 msgid "calendar view event"
 msgstr "Kalenderansicht Ereignis"
 
-#: ../calendar/gui/ea-cal-view-event.c:541
+#: ../calendar/gui/ea-cal-view-event.c:551
 msgid "Grab Focus"
 msgstr "ErhÃ¤lt Fokus"
 
-#: ../calendar/gui/ea-cal-view.c:300
+#: ../calendar/gui/ea-cal-view.c:304
 msgid "New Appointment"
 msgstr "Neuer Termin"
 
-#: ../calendar/gui/ea-cal-view.c:301
+#: ../calendar/gui/ea-cal-view.c:305
 msgid "New All Day Event"
 msgstr "Neues ganztÃ¤giges Ereignis"
 
-#: ../calendar/gui/ea-cal-view.c:302
+#: ../calendar/gui/ea-cal-view.c:306
 msgid "New Meeting"
 msgstr "Neue Besprechung"
 
-#: ../calendar/gui/ea-cal-view.c:303
+#: ../calendar/gui/ea-cal-view.c:307
 msgid "Go to Today"
 msgstr "Zum heutigen Tag"
 
-#: ../calendar/gui/ea-cal-view.c:304
+#: ../calendar/gui/ea-cal-view.c:308
 msgid "Go to Date"
 msgstr "Gehe zu Datum"
 
@@ -5849,7 +5740,7 @@ msgstr "Gehe zu Datum"
 msgid "a table to view and select the current time range"
 msgstr "Eine Tabelle zur Ansicht und Auswahl der momentanen Zeitspanne"
 
-#: ../calendar/gui/ea-day-view.c:148 ../calendar/gui/ea-week-view.c:146
+#: ../calendar/gui/ea-day-view.c:150 ../calendar/gui/ea-week-view.c:149
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -5858,14 +5749,14 @@ msgstr[1] "Sie enthÃ¤lt %d Ereignisse."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:153 ../calendar/gui/ea-week-view.c:148
+#: ../calendar/gui/ea-day-view.c:155 ../calendar/gui/ea-week-view.c:152
 msgid "It has no events."
 msgstr "Sie enthÃ¤lt keine Ereignisse."
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:160
+#: ../calendar/gui/ea-day-view.c:162
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Arbeitswochenansicht: %s. %s"
@@ -5873,47 +5764,47 @@ msgstr "Arbeitswochenansicht: %s. %s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:166
+#: ../calendar/gui/ea-day-view.c:168
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Tagesansicht: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:197
+#: ../calendar/gui/ea-day-view.c:202
 msgid "calendar view for a work week"
 msgstr "Kalenderansicht fÃ¼r eine Arbeitswoche"
 
-#: ../calendar/gui/ea-day-view.c:199
+#: ../calendar/gui/ea-day-view.c:204
 msgid "calendar view for one or more days"
 msgstr "Kalenderansicht fÃ¼r einen oder mehrere Tage"
 
-#: ../calendar/gui/ea-gnome-calendar.c:46
-#: ../calendar/gui/ea-gnome-calendar.c:54
-#: ../calendar/importers/icalendar-importer.c:780
+#: ../calendar/gui/ea-gnome-calendar.c:48
+#: ../calendar/gui/ea-gnome-calendar.c:56
+#: ../calendar/importers/icalendar-importer.c:860
 msgid "Gnome Calendar"
 msgstr "GNOME Calendar"
 
-#: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:909
+#: ../calendar/gui/ea-gnome-calendar.c:199
+#: ../modules/calendar/e-cal-shell-view-private.c:1010
 msgid "%A %d %b %Y"
 msgstr "%A, %d. %B %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:202
-#: ../calendar/gui/ea-gnome-calendar.c:207
+#: ../calendar/gui/ea-gnome-calendar.c:204
 #: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../modules/calendar/e-cal-shell-view-private.c:916
-#: ../modules/calendar/e-cal-shell-view-private.c:922
-#: ../modules/calendar/e-cal-shell-view-private.c:925
+#: ../calendar/gui/ea-gnome-calendar.c:211
+#: ../modules/calendar/e-cal-shell-view-private.c:1017
+#: ../modules/calendar/e-cal-shell-view-private.c:1023
+#: ../modules/calendar/e-cal-shell-view-private.c:1026
 msgid "%a %d %b %Y"
 msgstr "%a, %d. %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:226
-#: ../calendar/gui/ea-gnome-calendar.c:232
-#: ../calendar/gui/ea-gnome-calendar.c:238
+#: ../calendar/gui/ea-gnome-calendar.c:228
+#: ../calendar/gui/ea-gnome-calendar.c:234
 #: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../modules/calendar/e-cal-shell-view-private.c:942
-#: ../modules/calendar/e-cal-shell-view-private.c:953
-#: ../modules/calendar/e-cal-shell-view-private.c:960
-#: ../modules/calendar/e-cal-shell-view-private.c:963
+#: ../calendar/gui/ea-gnome-calendar.c:242
+#: ../modules/calendar/e-cal-shell-view-private.c:1043
+#: ../modules/calendar/e-cal-shell-view-private.c:1054
+#: ../modules/calendar/e-cal-shell-view-private.c:1061
+#: ../modules/calendar/e-cal-shell-view-private.c:1064
 msgid "%d %b %Y"
 msgstr "%d. %B %Y"
 
@@ -5925,25 +5816,25 @@ msgstr "Sprungknopf"
 msgid "Click here, you can find more events."
 msgstr "Klicken Sie hier, um weitere Ereignisse zu sehen."
 
-#: ../calendar/gui/ea-week-view.c:153
+#: ../calendar/gui/ea-week-view.c:157
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Monatsansicht: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:157
+#: ../calendar/gui/ea-week-view.c:161
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Wochenansicht: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:188
+#: ../calendar/gui/ea-week-view.c:195
 msgid "calendar view for a month"
 msgstr "Kalenderansicht fÃ¼r einen Monat"
 
-#: ../calendar/gui/ea-week-view.c:190
+#: ../calendar/gui/ea-week-view.c:197
 msgid "calendar view for one or more weeks"
 msgstr "Kalenderansicht fÃ¼r eine oder mehrere Wochen"
 
-#: ../calendar/gui/gnome-cal.c:2242
+#: ../calendar/gui/gnome-cal.c:2287
 msgid "Purging"
 msgstr "SÃ¤uberungsvorgang"
 
@@ -5996,7 +5887,7 @@ msgid "Select Date"
 msgstr "Datum wÃ¤hlen"
 
 #: ../calendar/gui/goto-dialog.ui.h:13
-#: ../modules/calendar/e-cal-shell-view-actions.c:1278
+#: ../modules/calendar/e-cal-shell-view-actions.c:1312
 msgid "Select _Today"
 msgstr "_Heute wÃ¤hlen"
 
@@ -6280,74 +6171,73 @@ msgstr "Fr"
 msgid "Sa"
 msgstr "Sa"
 
-#. Translators: This is part of "START to END" text, where START and END are date/times
-#: ../calendar/gui/print.c:2419
+#. Translators: This is part of "START to END" text,
+#. * where START and END are date/times.
+#: ../calendar/gui/print.c:2429
 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:2425
+#. Translators: This is part of "START to END
+#. * (Completed COMPLETED)", where COMPLETED is a
+#. * completed date/time.
+#: ../calendar/gui/print.c:2437
 msgid " (Completed "
 msgstr " (Abgeschlossen "
 
-#. Translators: This is part of "Completed COMPLETED", where COMPLETED is a completed date/time
-#: ../calendar/gui/print.c:2428
+#. Translators: This is part of "Completed COMPLETED",
+#. * where COMPLETED is a completed date/time.
+#: ../calendar/gui/print.c:2441
 msgid "Completed "
 msgstr "Abgeschlossen "
 
-#. Translators: This is part of "START (Due DUE)", where START and DUE are dates/times
-#: ../calendar/gui/print.c:2435
+#. Translators: This is part of "START (Due DUE)",
+#. * where START and DUE are dates/times.
+#: ../calendar/gui/print.c:2449
 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:2438
+#. Translators: This is part of "Due DUE",
+#. * where DUE is a date/time due the event
+#. * should be finished.
+#: ../calendar/gui/print.c:2454
 msgid "Due "
 msgstr "FÃ¤llig am "
 
-#: ../calendar/gui/print.c:2572
-msgid "Appointment"
-msgstr "Termin"
-
-#: ../calendar/gui/print.c:2574 ../widgets/misc/e-send-options.c:502
-msgid "Task"
-msgstr "Aufgabe"
-
-#: ../calendar/gui/print.c:2599
+#: ../calendar/gui/print.c:2615
 #, c-format
 msgid "Summary: %s"
 msgstr "Zusammenfassung: %s"
 
-#: ../calendar/gui/print.c:2623
+#: ../calendar/gui/print.c:2639
 msgid "Attendees: "
 msgstr "Teilnehmer: "
 
-#: ../calendar/gui/print.c:2666
+#: ../calendar/gui/print.c:2682
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:2681
+#: ../calendar/gui/print.c:2697
 #, c-format
 msgid "Priority: %s"
 msgstr "PrioritÃ¤t: %s"
 
-#: ../calendar/gui/print.c:2699
+#: ../calendar/gui/print.c:2715
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prozent abgeschlossen: %i"
 
-#: ../calendar/gui/print.c:2710
+#: ../calendar/gui/print.c:2726
 #, c-format
 msgid "URL: %s"
 msgstr "Adresse: %s"
 
-#: ../calendar/gui/print.c:2723
+#: ../calendar/gui/print.c:2739
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorien: %s"
 
-#: ../calendar/gui/print.c:2734
+#: ../calendar/gui/print.c:2750
 msgid "Contacts: "
 msgstr "Kontakte: "
 
@@ -6356,10 +6246,6 @@ msgstr "Kontakte: "
 msgid "% Completed"
 msgstr "% abgeschlossen"
 
-#: ../calendar/gui/tasktypes.xml.h:7
-msgid "Cancelled"
-msgstr "Abgebrochen"
-
 #: ../calendar/gui/tasktypes.xml.h:15
 msgid "In progress"
 msgstr "In Bearbeitung"
@@ -6372,44 +6258,189 @@ msgstr "ist grÃ¶Ã?er als"
 msgid "is less than"
 msgstr "ist kleiner als"
 
-#: ../calendar/importers/icalendar-importer.c:75
+#: ../calendar/importers/icalendar-importer.c:80
 msgid "Appointments and Meetings"
 msgstr "Termine und Besprechungen"
 
-#: ../calendar/importers/icalendar-importer.c:335
-#: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1832
+#: ../calendar/importers/icalendar-importer.c:350
+#: ../calendar/importers/icalendar-importer.c:707
+#: ../plugins/itip-formatter/itip-formatter.c:1833
 msgid "Opening calendar"
 msgstr "Kalender wird geÃ¶ffnet"
 
-#: ../calendar/importers/icalendar-importer.c:442
+#: ../calendar/importers/icalendar-importer.c:493
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar-Dateien (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:443
+#: ../calendar/importers/icalendar-importer.c:494
 msgid "Evolution iCalendar importer"
 msgstr "Evolution-iCalendar-Importeur"
 
-#: ../calendar/importers/icalendar-importer.c:531
+#: ../calendar/importers/icalendar-importer.c:582
 msgid "Reminder!"
 msgstr "Erinnerung!"
 
-#: ../calendar/importers/icalendar-importer.c:583
-msgid "vCalendar files (.vcf)"
-msgstr "vCalendar-Dateien (.vcf)"
+#: ../calendar/importers/icalendar-importer.c:662
+msgid "vCalendar files (.vcs)"
+msgstr "vCalendar-Dateien (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:584
+#: ../calendar/importers/icalendar-importer.c:663
 msgid "Evolution vCalendar importer"
 msgstr "Evolution-vCalendar-Importeur"
 
-#: ../calendar/importers/icalendar-importer.c:744
+#: ../calendar/importers/icalendar-importer.c:823
 msgid "Calendar Events"
 msgstr "Kalender-Ereignisse"
 
-#: ../calendar/importers/icalendar-importer.c:781
+#: ../calendar/importers/icalendar-importer.c:861
 msgid "Evolution Calendar intelligent importer"
 msgstr "Intelligenter Evolution-Kalender-Importeur"
 
+#: ../calendar/importers/icalendar-importer.c:926
+#: ../calendar/importers/icalendar-importer.c:1243
+msgctxt "iCalImp"
+msgid "Meeting"
+msgstr "Besprechung"
+
+#: ../calendar/importers/icalendar-importer.c:926
+#: ../calendar/importers/icalendar-importer.c:1243
+msgctxt "iCalImp"
+msgid "Event"
+msgstr "Ereignis"
+
+#: ../calendar/importers/icalendar-importer.c:929
+#: ../calendar/importers/icalendar-importer.c:1244
+msgctxt "iCalImp"
+msgid "Task"
+msgstr "Aufgabe"
+
+#: ../calendar/importers/icalendar-importer.c:932
+#: ../calendar/importers/icalendar-importer.c:1245
+msgctxt "iCalImp"
+msgid "Memo"
+msgstr "Notiz"
+
+#: ../calendar/importers/icalendar-importer.c:941
+msgctxt "iCalImp"
+msgid "has recurrences"
+msgstr "enthÃ¤lt Wiederholungen"
+
+#: ../calendar/importers/icalendar-importer.c:946
+msgctxt "iCalImp"
+msgid "is an instance"
+msgstr "ist eine Instanz"
+
+#: ../calendar/importers/icalendar-importer.c:951
+msgctxt "iCalImp"
+msgid "has alarms"
+msgstr "enthÃ¤lt Alarme"
+
+#: ../calendar/importers/icalendar-importer.c:956
+msgctxt "iCalImp"
+msgid "has attachments"
+msgstr "enthÃ¤lt Anlagen"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:969
+msgctxt "iCalImp"
+msgid "Public"
+msgstr "Ã?ffentlich"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:972
+msgctxt "iCalImp"
+msgid "Private"
+msgstr "Privat"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:975
+msgctxt "iCalImp"
+msgid "Confidential"
+msgstr "Vertraulich"
+
+#. Translators: Appointment's classification section name
+#: ../calendar/importers/icalendar-importer.c:979
+msgctxt "iCalImp"
+msgid "Classification"
+msgstr "Einstufung"
+
+#. Translators: Appointment's summary
+#. Translators: Column header for a component summary
+#: ../calendar/importers/icalendar-importer.c:984
+#: ../calendar/importers/icalendar-importer.c:1284
+msgctxt "iCalImp"
+msgid "Summary"
+msgstr "Zusammenfassung"
+
+#. Translators: Appointment's location
+#: ../calendar/importers/icalendar-importer.c:990
+msgctxt "iCalImp"
+msgid "Location"
+msgstr "Ort"
+
+#. Translators: Appointment's start time
+#. Translators: Column header for a component start date/time
+#: ../calendar/importers/icalendar-importer.c:998
+#: ../calendar/importers/icalendar-importer.c:1280
+msgctxt "iCalImp"
+msgid "Start"
+msgstr "Anfang"
+
+#. Translators: 'Due' like the time due a task should be finished
+#: ../calendar/importers/icalendar-importer.c:1009
+msgctxt "iCalImp"
+msgid "Due"
+msgstr "FÃ¤llig"
+
+#. Translators: Appointment's end time
+#: ../calendar/importers/icalendar-importer.c:1021
+msgctxt "iCalImp"
+msgid "End"
+msgstr "Ende"
+
+#. Translators: Appointment's categories
+#: ../calendar/importers/icalendar-importer.c:1031
+msgctxt "iCalImp"
+msgid "Categories"
+msgstr "Kategorien"
+
+#. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
+#: ../calendar/importers/icalendar-importer.c:1055
+msgctxt "iCalImp"
+msgid "Completed"
+msgstr "Abgeschlossen"
+
+#. Translators: Appointment's URL
+#: ../calendar/importers/icalendar-importer.c:1063
+msgctxt "iCalImp"
+msgid "URL"
+msgstr "Adresse"
+
+#. Translators: Appointment's organizer
+#: ../calendar/importers/icalendar-importer.c:1074
+#: ../calendar/importers/icalendar-importer.c:1077
+msgctxt "iCalImp"
+msgid "Organizer"
+msgstr "Organisator"
+
+#. Translators: Appointment's attendees
+#: ../calendar/importers/icalendar-importer.c:1097
+#: ../calendar/importers/icalendar-importer.c:1100
+msgctxt "iCalImp"
+msgid "Attendees"
+msgstr "Teilnehmer"
+
+#: ../calendar/importers/icalendar-importer.c:1114
+msgctxt "iCalImp"
+msgid "Description"
+msgstr "Beschreibung"
+
+#. Translators: Column header for a component type; it can be Event, Task or Memo
+#: ../calendar/importers/icalendar-importer.c:1276
+msgctxt "iCalImp"
+msgid "Type"
+msgstr "Art"
+
 #.
 #. *
 #. * This program is free software; you can redistribute it and/or
@@ -7959,169 +7990,149 @@ msgstr "Pazifik/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pazifik/Yap"
 
-#: ../composer/e-composer-actions.c:81
-msgid "Untitled Message"
-msgstr "Namenlose Nachricht"
-
-#: ../composer/e-composer-actions.c:204
+#: ../composer/e-composer-actions.c:163
 msgid "Save as..."
 msgstr "Speichern unter â?¦"
 
-#: ../composer/e-composer-actions.c:283 ../widgets/misc/e-attachment-view.c:327
+#: ../composer/e-composer-actions.c:242 ../widgets/misc/e-attachment-view.c:329
 msgid "Attach a file"
 msgstr "Eine Datei beilegen"
 
-#: ../composer/e-composer-actions.c:288
+#: ../composer/e-composer-actions.c:247
 #: ../widgets/misc/e-signature-editor.c:203
 msgid "_Close"
 msgstr "S_chlieÃ?en"
 
-#: ../composer/e-composer-actions.c:290
+#: ../composer/e-composer-actions.c:249
 msgid "Close the current file"
 msgstr "Die momentan geÃ¶ffnete Datei schlieÃ?en"
 
-#: ../composer/e-composer-actions.c:295
+#: ../composer/e-composer-actions.c:254
 msgid "_Print..."
 msgstr "_Drucken â?¦"
 
-#: ../composer/e-composer-actions.c:302
+#: ../composer/e-composer-actions.c:261
 msgid "Print Pre_view"
 msgstr "Druck_vorschau"
 
-#: ../composer/e-composer-actions.c:311
+#: ../composer/e-composer-actions.c:270
 msgid "Save the current file"
 msgstr "Die momentan geÃ¶ffnete Datei speichern"
 
-#: ../composer/e-composer-actions.c:316
+#: ../composer/e-composer-actions.c:275
 msgid "Save _As..."
 msgstr "Speichern _unter â?¦"
 
-#: ../composer/e-composer-actions.c:318
+#: ../composer/e-composer-actions.c:277
 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:323
+#: ../composer/e-composer-actions.c:282
 msgid "Save as _Draft"
 msgstr "Als _Entwurf speichern"
 
-#: ../composer/e-composer-actions.c:325
+#: ../composer/e-composer-actions.c:284
 msgid "Save as draft"
 msgstr "Als Entwurf speichern"
 
-#: ../composer/e-composer-actions.c:330 ../composer/e-composer-private.c:281
+#: ../composer/e-composer-actions.c:289 ../composer/e-composer-private.c:293
 msgid "S_end"
 msgstr "A_bschicken"
 
-#: ../composer/e-composer-actions.c:332
+#: ../composer/e-composer-actions.c:291
 msgid "Send this message"
 msgstr "Diese Nachricht verschicken"
 
-#: ../composer/e-composer-actions.c:337
+#: ../composer/e-composer-actions.c:296
 msgid "New _Message"
 msgstr "Neue _Nachricht"
 
-#: ../composer/e-composer-actions.c:339
+#: ../composer/e-composer-actions.c:298
 msgid "Open New Message window"
 msgstr "Neues Nachrichtenfenster Ã¶ffnen"
 
-#: ../composer/e-composer-actions.c:346
+#: ../composer/e-composer-actions.c:305
 msgid "Character _Encoding"
 msgstr "Zeichen_kodierung"
 
-#: ../composer/e-composer-actions.c:363
+#: ../composer/e-composer-actions.c:322
 msgid "PGP _Encrypt"
 msgstr "Mit P_GP verschlÃ¼sseln"
 
-#: ../composer/e-composer-actions.c:365
+#: ../composer/e-composer-actions.c:324
 msgid "Encrypt this message with PGP"
 msgstr "Diese Nachricht mit PGP verschlÃ¼sseln"
 
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:330
 msgid "PGP _Sign"
 msgstr "Mit _PGP signieren"
 
-#: ../composer/e-composer-actions.c:373
+#: ../composer/e-composer-actions.c:332
 msgid "Sign this message with your PGP key"
 msgstr "Diese Nachricht mit PGP signieren"
 
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:338
 msgid "_Prioritize Message"
 msgstr "Nachricht _priorisieren"
 
-#: ../composer/e-composer-actions.c:381
+#: ../composer/e-composer-actions.c:340
 msgid "Set the message priority to high"
 msgstr "Die PrioritÃ¤t der Nachricht auf hoch setzen"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:346
 msgid "Re_quest Read Receipt"
 msgstr "_LesebestÃ¤tigung anfordern"
 
-#: ../composer/e-composer-actions.c:389
+#: ../composer/e-composer-actions.c:348
 msgid "Get delivery notification when your message is read"
 msgstr ""
 "Eine ZustellungsbestÃ¤tigung erhalten, sobald Ihre Nachricht gelesen wurde"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:354
 msgid "S/MIME En_crypt"
 msgstr "Mit S/_MIME verschlÃ¼sseln"
 
-#: ../composer/e-composer-actions.c:397
+#: ../composer/e-composer-actions.c:356
 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:403
+#: ../composer/e-composer-actions.c:362
 msgid "S/MIME Sig_n"
 msgstr "Mit _S/MIME signieren"
 
-#: ../composer/e-composer-actions.c:405
+#: ../composer/e-composer-actions.c:364
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Diese Nachricht mit Ihrem S/MIME-Signaturzertifikat signieren"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:370
 msgid "_Bcc Field"
 msgstr "_Blindkopie-Feld"
 
-#: ../composer/e-composer-actions.c:413
+#: ../composer/e-composer-actions.c:372
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Blindkopie-Feld anzeigen/verbergen"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:378
 msgid "_Cc Field"
 msgstr "_Kopie-Feld"
 
-#: ../composer/e-composer-actions.c:421
+#: ../composer/e-composer-actions.c:380
 msgid "Toggles whether the CC field is displayed"
 msgstr "Kopie-Feld anzeigen/verbergen"
 
-#: ../composer/e-composer-actions.c:427
-msgid "_From Field"
-msgstr "_Von-Feld"
-
-#: ../composer/e-composer-actions.c:429
-msgid "Toggles whether the From chooser is displayed"
-msgstr "Von-WÃ¤hler anzeigen/verbergen"
-
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:386
 msgid "_Reply-To Field"
 msgstr "An_twort-an-Feld"
 
-#: ../composer/e-composer-actions.c:437
+#: ../composer/e-composer-actions.c:388
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Antwort-an-Feld anzeigen/verbergen"
 
-#: ../composer/e-composer-actions.c:480
+#: ../composer/e-composer-actions.c:431
 msgid "Save Draft"
 msgstr "Entwurf speichern"
 
-#: ../composer/e-composer-header.c:129
-msgid "Show"
-msgstr "Anzeigen"
-
-#: ../composer/e-composer-header.c:137
-msgid "Hide"
-msgstr "Verbergen"
-
 #: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "Geben Sie die EmpfÃ¤nger der Nachricht ein"
@@ -8139,49 +8150,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:958
+#: ../composer/e-composer-header-table.c:1005
 msgid "Fr_om:"
 msgstr "V_on:"
 
-#: ../composer/e-composer-header-table.c:958 ../em-format/em-format-quote.c:215
-#: ../em-format/em-format.c:937 ../mail/e-mail-tag-editor.c:323
-#: ../mail/message-list.etspec.h:7 ../modules/mail/em-mailer-prefs.c:77
-msgid "From"
-msgstr "Von"
-
-#: ../composer/e-composer-header-table.c:967
+#: ../composer/e-composer-header-table.c:1014
 msgid "_Reply-To:"
 msgstr "Antwo_rt an:"
 
-#: ../composer/e-composer-header-table.c:972
+#: ../composer/e-composer-header-table.c:1018
 msgid "_To:"
 msgstr "A_n:"
 
-#: ../composer/e-composer-header-table.c:978
+#: ../composer/e-composer-header-table.c:1023
 msgid "_Cc:"
 msgstr "_Kopie an:"
 
-#: ../composer/e-composer-header-table.c:978 ../mail/em-filter-i18n.h:8
-msgid "CC"
-msgstr "CC"
-
-#: ../composer/e-composer-header-table.c:984
+#: ../composer/e-composer-header-table.c:1028
 msgid "_Bcc:"
 msgstr "Blindko_pie an:"
 
-#: ../composer/e-composer-header-table.c:984 ../mail/em-filter-i18n.h:6
-msgid "BCC"
-msgstr "BCC"
-
-#: ../composer/e-composer-header-table.c:989
+#: ../composer/e-composer-header-table.c:1033
 msgid "_Post To:"
 msgstr "_VerÃ¶ffentlichen in:"
 
-#: ../composer/e-composer-header-table.c:993
+#: ../composer/e-composer-header-table.c:1037
 msgid "S_ubject:"
 msgstr "Be_treff:"
 
-#: ../composer/e-composer-header-table.c:1002
+#: ../composer/e-composer-header-table.c:1046
 msgid "Si_gnature:"
 msgstr "Si_gnatur:"
 
@@ -8193,40 +8190,42 @@ 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:199
+#: ../composer/e-composer-private.c:211
 msgid "Undo the last action"
 msgstr "Die letzte Aktion rÃ¼ckgÃ¤ngig machen"
 
-#: ../composer/e-composer-private.c:203
+#: ../composer/e-composer-private.c:215
 msgid "Redo the last undone action"
 msgstr "Die zuletzt rÃ¼ckgÃ¤ngig gemachte Aktion wiederholen"
 
-#: ../composer/e-composer-private.c:207
+#: ../composer/e-composer-private.c:219
 msgid "Search for text"
 msgstr "Nach Text suchen"
 
-#: ../composer/e-composer-private.c:211
+#: ../composer/e-composer-private.c:223
 msgid "Search for and replace text"
 msgstr "Nach Text suchen und diesen ersetzen"
 
-#: ../composer/e-composer-private.c:301
+#: ../composer/e-composer-private.c:313
 msgid "Save draft"
 msgstr "Entwurf speichern"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:188 ../mail/em-utils.c:152
-#: ../plugins/attachment-reminder/attachment-reminder.c:122
+#: ../composer/e-msg-composer.c:199
+#: ../plugins/attachment-reminder/attachment-reminder.c:117
 msgid "_Do not show this message again."
 msgstr "Diese _Meldung nicht mehr anzeigen."
 
-#: ../composer/e-msg-composer.c:988
+#: ../composer/e-msg-composer.c:1029
+#, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Ausgehende Nachricht konnte nicht signiert werden: Kein Signaturzertifikat "
 "fÃ¼r dieses Konto festgelegt"
 
-#: ../composer/e-msg-composer.c:995
+#: ../composer/e-msg-composer.c:1041
+#, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -8234,25 +8233,26 @@ msgstr ""
 "Ausgehende Nachricht konnte nicht verschlÃ¼sselt werden: Kein "
 "VerschlÃ¼sselungszertifikat fÃ¼r dieses Konto festgelegt"
 
-#: ../composer/e-msg-composer.c:1386
+#: ../composer/e-msg-composer.c:1465
 msgid "Unable to reconstruct message from autosave file"
 msgstr ""
 "Nachricht konnte nicht aus der automatisch gespeicherten Datei "
 "wiederhergestellt werden"
 
-#: ../composer/e-msg-composer.c:1452 ../composer/e-msg-composer.c:1648
+#: ../composer/e-msg-composer.c:1533 ../composer/e-msg-composer.c:1817
 msgid "Compose Message"
 msgstr "Nachricht verfassen"
 
-#: ../composer/e-msg-composer.c:3314
-#| msgid ""
-#| "<b>(The composer contains a non-text message body, which cannot be edited.)"
-#| "</b>"
+#: ../composer/e-msg-composer.c:3538
 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:4144
+msgid "Untitled Message"
+msgstr "Namenlose Nachricht"
+
 #: ../composer/mail-composer.error.xml.h:1
 msgid ""
 " There are few attachments getting downloaded. Sending the mail will cause "
@@ -8337,7 +8337,6 @@ msgstr ""
 "kÃ¶nnen Sie dort mit dem Verfassen fortfahren, wo Sie zuletzt aufgehÃ¶rt haben."
 
 #: ../composer/mail-composer.error.xml.h:16
-#| msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgid "The file '{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 "Die Datei Â»{0}Â« ist keine gewÃ¶hnliche Datei und kann daher nicht in einer "
@@ -8360,7 +8359,6 @@ msgid "Unable to activate the address selector control."
 msgstr "Bedienelement zur Adresswahl konnte nicht aktiviert werden."
 
 #: ../composer/mail-composer.error.xml.h:21
-#| msgid "You cannot attach the file `{0}' to this message."
 msgid "You cannot attach the file n{0}' to this message."
 msgstr "Sie kÃ¶nnen die Datei Â»{0}Â« dieser Nachricht nicht beilegen."
 
@@ -8389,7 +8387,6 @@ msgid "Run Anjal in a window"
 msgstr "Anjal in einem Fenster ausfÃ¼hren"
 
 #: ../capplet/anjal-settings-main.c:200
-#| msgid "Mark as _default memo list"
 msgid "Make Anjal the default email client"
 msgstr "Anjal als vorgegebenes E-Mail-Programm festlegen"
 
@@ -8399,83 +8396,86 @@ msgid "ID of the socket to embed in"
 msgstr "Kennung des Sockets zur Einbettung"
 
 #: ../capplet/anjal-settings-main.c:208
-#| msgid "sort"
 msgid "socket"
 msgstr "socket"
 
 #: ../capplet/anjal-settings-main.c:221
-#| msgid "Default Mail Client"
 msgid "Anjal email client"
 msgstr "Anjal E-Mail-Programm"
 
-#: ../capplet/settings/mail-account-view.c:56
+#: ../capplet/settings/mail-account-view.c:74
 msgid "Please enter your full name."
 msgstr "Bitte geben Sie Ihre vollstÃ¤ndigen Namen ein."
 
-#: ../capplet/settings/mail-account-view.c:57
+#: ../capplet/settings/mail-account-view.c:75
 msgid "Please enter your email address."
 msgstr "Bitte geben Sie Ihre E-Mail-Adresse ein."
 
-#: ../capplet/settings/mail-account-view.c:58
+#: ../capplet/settings/mail-account-view.c:76
 msgid "The email address you have entered is invalid."
 msgstr "Die von Ihnen eingegebene E-Mail-Adresse ist ungÃ¼ltig."
 
-#: ../capplet/settings/mail-account-view.c:182
-#| msgid "Personal"
+#: ../capplet/settings/mail-account-view.c:77
+msgid "Please enter your password."
+msgstr "Bitte geben Sie Ihr Passwort ein."
+
+#: ../capplet/settings/mail-account-view.c:256
+#: ../plugins/caldav/caldav-source.c:66
+msgid "CalDAV"
+msgstr "CalDAV"
+
+#: ../capplet/settings/mail-account-view.c:360
+#: ../plugins/google-account-setup/google-contacts-source.c:53
+#: ../plugins/google-account-setup/google-source.c:81
+msgid "Google"
+msgstr "Google"
+
+#: ../capplet/settings/mail-account-view.c:464
 msgid "Personal details:"
 msgstr "PersÃ¶nliche Angaben:"
 
-#: ../capplet/settings/mail-account-view.c:189
-#| msgid "_Name:"
+#: ../capplet/settings/mail-account-view.c:471
 msgid "Name:"
 msgstr "Name:"
 
-#: ../capplet/settings/mail-account-view.c:198
-#| msgid "Email address"
+#: ../capplet/settings/mail-account-view.c:480
 msgid "Email address:"
 msgstr "E-Mail-Adresse:"
 
-#: ../capplet/settings/mail-account-view.c:208
-#| msgid "Receiving Email"
-msgid "Receiving details:"
-msgstr "Empfangen von E-Mails:"
+#: ../capplet/settings/mail-account-view.c:490
+msgid "<span size=\"large\" weight=\"bold\">Details:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Details:</span>"
 
-#: ../capplet/settings/mail-account-view.c:215
-#: ../capplet/settings/mail-account-view.c:265
-#| msgid "Server _Type:"
+#: ../capplet/settings/mail-account-view.c:496
+msgid "<span size=\"large\" weight=\"bold\">Receiving</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Empfang</span>"
+
+#: ../capplet/settings/mail-account-view.c:501
 msgid "Server type:"
 msgstr "Servertyp:"
 
-#: ../capplet/settings/mail-account-view.c:224
-#: ../capplet/settings/mail-account-view.c:274
-#| msgid "Server Message:"
+#: ../capplet/settings/mail-account-view.c:510
 msgid "Server address:"
 msgstr "Serveradresse:"
 
-#: ../capplet/settings/mail-account-view.c:233
-#: ../capplet/settings/mail-account-view.c:283
-#| msgid "Us_ername:"
+#: ../capplet/settings/mail-account-view.c:519
 msgid "Username:"
 msgstr "Benutzername:"
 
-#: ../capplet/settings/mail-account-view.c:242
-#: ../capplet/settings/mail-account-view.c:292
-#| msgid "No encryption"
+#: ../capplet/settings/mail-account-view.c:528
 msgid "Use encryption:"
 msgstr "VerschlÃ¼sselung benutzen:"
 
-#: ../capplet/settings/mail-account-view.c:247
-#: ../capplet/settings/mail-account-view.c:297
-#| msgid "Never"
+#: ../capplet/settings/mail-account-view.c:533
+#: ../capplet/settings/mail-account-view.c:566
 msgid "never"
 msgstr "Nie"
 
-#: ../capplet/settings/mail-account-view.c:258
-#| msgid "Sending Mail"
-msgid "Sending details:"
-msgstr "Verschicken von E-Mails:"
+#: ../capplet/settings/mail-account-view.c:545
+msgid "<span size=\"large\" weight=\"bold\">Sending</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Senden</span>"
 
-#: ../capplet/settings/mail-account-view.c:316
+#: ../capplet/settings/mail-account-view.c:585
 msgid ""
 "To use the email application you'll need to setup an account. Put your email "
 "address and password in below and we'll try and work out all the settings. If "
@@ -8486,7 +8486,7 @@ msgstr ""
 "versucht, die entsprechenden Einstellungen automatisch vorzunehmen. Falls "
 "dies nicht mÃ¶glich sein sollte, werden Sie Ihre Servereinstellungen benÃ¶tigen."
 
-#: ../capplet/settings/mail-account-view.c:318
+#: ../capplet/settings/mail-account-view.c:587
 msgid ""
 "Sorry, we can't work out the settings to get your mail automatically. Please "
 "enter them below. We've tried to make a start with the details you just "
@@ -8497,12 +8497,11 @@ msgstr ""
 "versucht, zunÃ¤chst einige der von Ihnen gerade eingegebenen Werten zu "
 "verwenden, doch Sie werden wahrscheinlich Ã?nderungen vornehmen mÃ¼ssen."
 
-#: ../capplet/settings/mail-account-view.c:320
-#| msgid "You may only configure a single Exchange account."
+#: ../capplet/settings/mail-account-view.c:589
 msgid "You can specify more options to configure the account."
 msgstr "Sie dÃ¼rfen bei der Konfiguration Ihres Kontos weitere Optionen angeben."
 
-#: ../capplet/settings/mail-account-view.c:322
+#: ../capplet/settings/mail-account-view.c:591
 msgid ""
 "Now we need your settings for sending mail. We've tried to make some guesses "
 "but you should check them over to make sure."
@@ -8511,11 +8510,11 @@ msgstr ""
 "wird versucht, einige Einstellungen bereits vorauszuwÃ¤hlen, jedoch sollten "
 "Sie diese sicherheitshalber Ã¼berprÃ¼fen."
 
-#: ../capplet/settings/mail-account-view.c:323
+#: ../capplet/settings/mail-account-view.c:592
 msgid "You can specify your default settings for your account."
 msgstr "Sie kÃ¶nnen Ihre Vorgabeeinstellungen fÃ¼r Ihr Konto festlegen."
 
-#: ../capplet/settings/mail-account-view.c:324
+#: ../capplet/settings/mail-account-view.c:593
 msgid ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
@@ -8523,130 +8522,153 @@ msgstr ""
 "Nun ist Zeit, alles zu Ã¼berprÃ¼fen, bevor versucht wird, eine Verbindung zum "
 "Server herzustellen und Ihre Nachrichten abzurufen."
 
-#: ../capplet/settings/mail-account-view.c:339 ../mail/em-account-editor.c:2059
-#: ../mail/em-account-editor.c:2191 ../mail/mail-config.ui.h:59
+#: ../capplet/settings/mail-account-view.c:608 ../mail/em-account-editor.c:2098
+#: ../mail/em-account-editor.c:2219 ../mail/mail-config.ui.h:62
 msgid "Identity"
 msgstr "IdentitÃ¤t"
 
-#: ../capplet/settings/mail-account-view.c:339
-#| msgid "Receiving Email"
+#: ../capplet/settings/mail-account-view.c:608
 msgid "Next - Receiving mail"
 msgstr "Weiter - Abrufen von E-Mails"
 
-#: ../capplet/settings/mail-account-view.c:340
-#| msgid "Receiving Email"
+#: ../capplet/settings/mail-account-view.c:609
 msgid "Receiving mail"
 msgstr "Abrufen von E-Mails"
 
-#: ../capplet/settings/mail-account-view.c:340
-#: ../capplet/settings/mail-account-view.c:341
-#| msgid "Sending Email"
+#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:610
 msgid "Next - Sending mail"
 msgstr "Weiter - Verschicken von E-Mails"
 
-#: ../capplet/settings/mail-account-view.c:340
-#| msgid "Identity"
+#: ../capplet/settings/mail-account-view.c:609
 msgid "Back - Identity"
 msgstr "ZurÃ¼ck - IdentitÃ¤t"
 
-#: ../capplet/settings/mail-account-view.c:340
-#| msgid "Receiving Options"
+#: ../capplet/settings/mail-account-view.c:609
 msgid "Next - Receiving options"
 msgstr "Weiter - Empfangsoptionen"
 
-#: ../capplet/settings/mail-account-view.c:341
-#| msgid "Receiving Options"
+#: ../capplet/settings/mail-account-view.c:610
 msgid "Receiving options"
 msgstr "Empfangsoptionen"
 
-#: ../capplet/settings/mail-account-view.c:341
-#: ../capplet/settings/mail-account-view.c:343
-#| msgid "Receiving Email"
+#: ../capplet/settings/mail-account-view.c:610
+#: ../capplet/settings/mail-account-view.c:612
 msgid "Back - Receiving mail"
 msgstr "ZurÃ¼ck - Abrufen von E-Mails"
 
-#: ../capplet/settings/mail-account-view.c:343
-#| msgid "Sending Email"
+#: ../capplet/settings/mail-account-view.c:612
 msgid "Sending mail"
 msgstr "Abrufen von E-Mails"
 
-#: ../capplet/settings/mail-account-view.c:343
-#: ../capplet/settings/mail-account-view.c:344
-#| msgid "Delete account?"
+#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:613
 msgid "Next - Review account"
 msgstr "Weiter - Konto Ã¼berprÃ¼fen"
 
-#: ../capplet/settings/mail-account-view.c:343
-#| msgid "Defaults"
+#: ../capplet/settings/mail-account-view.c:612
 msgid "Next - Defaults"
 msgstr "Weiter - Vorgaben"
 
-#: ../capplet/settings/mail-account-view.c:343
-#| msgid "Receiving Options"
+#: ../capplet/settings/mail-account-view.c:612
 msgid "Back - Receiving options"
 msgstr "ZurÃ¼ck - Empfangsoptionen"
 
-#: ../capplet/settings/mail-account-view.c:344 ../mail/em-account-editor.c:2770
-#: ../mail/mail-config.ui.h:32
+#: ../capplet/settings/mail-account-view.c:613 ../mail/em-account-editor.c:2983
+#: ../mail/mail-config.ui.h:34
 msgid "Defaults"
 msgstr "Vorgaben"
 
-#: ../capplet/settings/mail-account-view.c:344
-#| msgid "Sending Email"
+#: ../capplet/settings/mail-account-view.c:613
 msgid "Back - Sending mail"
 msgstr "ZurÃ¼ck - Verschicken von E-Mails"
 
-#: ../capplet/settings/mail-account-view.c:346
-#| msgid "Delete account?"
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Review account"
 msgstr "Konto Ã¼berprÃ¼fen"
 
-#: ../capplet/settings/mail-account-view.c:346
-#| msgid "Fiji"
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Finish"
 msgstr "Beenden"
 
-#: ../capplet/settings/mail-account-view.c:346
-#| msgid "Ascending"
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Back - Sending"
 msgstr "ZurÃ¼ck - Senden"
 
-#: ../capplet/settings/mail-account-view.c:680
+#: ../capplet/settings/mail-account-view.c:719
+msgid "Setup Google contacts with Evolution"
+msgstr "Google-Kontakte fÃ¼r Evolution einrichten"
+
+#: ../capplet/settings/mail-account-view.c:720
+msgid "Setup Google calendar with Evolution"
+msgstr "Google-Kalender fÃ¼r Evolution einrichten"
+
+#: ../capplet/settings/mail-account-view.c:725
+msgid "You may need to enable IMAP access."
+msgstr "Es wird nÃ¶tig sein, den IMAP-Zugriff zu aktivieren."
+
+#: ../capplet/settings/mail-account-view.c:733
+msgid "<span size=\"large\" weight=\"bold\">Google account settings:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Google-Konteneinstellungen:</span>"
+
+#: ../capplet/settings/mail-account-view.c:757
+msgid "Setup Yahoo calendar with Evolution"
+msgstr "Yahoo-Kalender fÃ¼r Evolution einrichten"
+
+#: ../capplet/settings/mail-account-view.c:761
+msgid ""
+"Yahoo calendars are named as firstname_lastname. We have tried to form the "
+"calendar name. So please confirm and re-enter the calendar name if it is not "
+"correct."
+msgstr ""
+"Yahoo-Kalender werden als Vorname_Nachname benannt. Wir haben versucht, den "
+"Kalendernamen auf diese Weise zu ermitteln. Bitte bestÃ¤tigen Sie oder geben "
+"Sie den Kalendernamen neu ein, falls dieser nicht korrekt ist."
+
+#: ../capplet/settings/mail-account-view.c:768
+msgid "<span size=\"large\" weight=\"bold\">Yahoo account settings:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Yahoo-Konteneinstellungen:</span>"
+
+#: ../capplet/settings/mail-account-view.c:780
+msgid "Yahoo Calendar name:"
+msgstr "Name des Yahoo-Kalenders:"
+
+#: ../capplet/settings/mail-account-view.c:1023
+msgid "Password:"
+msgstr "Passwort:"
+
+#: ../capplet/settings/mail-account-view.c:1091
 #: ../capplet/settings/mail-settings-view.c:267
-#| msgid "Close"
 msgid "Close Tab"
 msgstr "Reiter schlieÃ?en"
 
-#: ../capplet/settings/mail-account-view.c:690
-#| msgid "Account Editor"
+#: ../capplet/settings/mail-account-view.c:1101
 msgid "Account Wizard"
 msgstr "Kontenassistent"
 
 #: ../capplet/settings/mail-capplet-shell.c:208
-#| msgid "Evolution Account Assistant"
 msgid "Evolution account assistant"
 msgstr "Evolution-Kontoassistent"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:342 ../mail/e-mail-migrate.c:659
-#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:145
-#: ../mail/em-folder-tree-model.c:148 ../mail/em-folder-tree-model.c:151
-#: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:160
-#: ../mail/em-folder-tree-model.c:162 ../mail/mail-vfolder.c:211
-#: ../mail/message-list.c:1605
-#: ../modules/addressbook/e-book-shell-backend.c:125
-#: ../modules/addressbook/e-book-shell-migrate.c:126
-#: ../modules/calendar/e-cal-shell-backend.c:121
+#: ../capplet/settings/mail-capplet-shell.c:342 ../mail/e-mail-migrate.c:664
+#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:148
+#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
+#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:163
+#: ../mail/em-folder-tree-model.c:165 ../mail/mail-vfolder.c:207
+#: ../mail/message-list.c:1655 ../modules/addressbook/e-book-shell-backend.c:95
+#: ../modules/addressbook/e-book-shell-migrate.c:130
+#: ../modules/calendar/e-cal-shell-backend.c:102
 #: ../modules/calendar/e-cal-shell-migrate.c:141
-#: ../modules/calendar/e-memo-shell-backend.c:108
+#: ../modules/calendar/e-memo-shell-backend.c:92
 #: ../modules/calendar/e-memo-shell-migrate.c:102
-#: ../modules/calendar/e-task-shell-backend.c:111
-#: ../modules/calendar/e-task-shell-migrate.c:109
+#: ../modules/calendar/e-task-shell-backend.c:92
+#: ../modules/calendar/e-task-shell-migrate.c:111
 msgid "On This Computer"
 msgstr "Auf diesem Rechner"
 
 #: ../capplet/settings/mail-settings-view.c:146
-#: ../plugins/groupwise-features/share-folder.c:747
+#: ../plugins/groupwise-features/share-folder.c:737
 msgid "Modify"
 msgstr "Ã?ndern"
 
@@ -8655,12 +8677,10 @@ msgid "Add a new account"
 msgstr "Ein neues Konto hinzufÃ¼gen"
 
 #: ../capplet/settings/mail-settings-view.c:184
-#| msgid "Account Management"
 msgid "Account management"
 msgstr "Kontenverwaltung"
 
 #: ../capplet/settings/mail-settings-view.c:277
-#| msgid "Junk Settings"
 msgid "Settings"
 msgstr "Einstellungen"
 
@@ -8672,8 +8692,8 @@ msgstr "Benachrichtigungen Ã¼ber Kalenderereignisse"
 msgid "Evolution Alarm Notify"
 msgstr "Evolution Alarm-Benachrichtigung"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:823
-#: ../shell/e-shell-window-private.c:251
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:865
+#: ../shell/e-shell-window-private.c:253
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -8690,23 +8710,13 @@ msgid "Manage your email, contacts and schedule"
 msgstr "Ihre E-Mails, Kontakte und Kalender verwalten"
 
 #: ../data/evolution-settings.desktop.in.in.h:1
-#| msgid "Configure your email accounts here"
 msgid "Configure email accounts"
 msgstr "E-Mail-Konten konfigurieren"
 
 #: ../data/evolution-settings.desktop.in.in.h:2
-#| msgid "Junk Mail Settings"
 msgid "Email Settings"
 msgstr "E-Mail-Einstellungen"
 
-#: ../data/evolution.keys.in.in.h:1
-msgid "address card"
-msgstr "Adresskarte"
-
-#: ../data/evolution.keys.in.in.h:2
-msgid "calendar information"
-msgstr "Kalenderinformationen"
-
 #. Translators: This is a cancelled activity.
 #: ../e-util/e-activity.c:224
 #, c-format
@@ -8731,15 +8741,15 @@ msgstr "%s â?¦"
 msgid "%s (%d%% complete)"
 msgstr "%s (zu %d%% abgeschlossen)"
 
-#: ../e-util/e-alert.c:72 ../e-util/e-alert.c:73
+#: ../e-util/e-alert.c:73 ../e-util/e-alert.c:76
 msgid "Evolution Error"
 msgstr "Evolution-Fehler"
 
-#: ../e-util/e-alert.c:74 ../e-util/e-alert.c:75
+#: ../e-util/e-alert.c:79 ../e-util/e-alert.c:82
 msgid "Evolution Warning"
 msgstr "Evolution-Warnung"
 
-#: ../e-util/e-alert.c:634
+#: ../e-util/e-alert.c:649
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Interner Fehler, unbekannter Fehler Â»%sÂ« angefordert"
@@ -8824,7 +8834,7 @@ msgstr "Visuell"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:196
-#: ../modules/calendar/e-cal-shell-view-actions.c:1756
+#: ../modules/calendar/e-cal-shell-view-actions.c:1790
 #: ../plugins/itip-formatter/itip-view.c:191
 #: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
@@ -8842,7 +8852,6 @@ msgstr "Gestern"
 #. Translators: %d is replaced with a number of days. It's always greater than 1
 #: ../e-util/e-datetime-format.c:211
 #, c-format
-#| msgid "%d days from now"
 msgid "%d day from now"
 msgid_plural "%d days from now"
 msgstr[0] "In %d Tag"
@@ -8851,7 +8860,6 @@ msgstr[1] "In %d Tagen"
 #. Translators: %d is replaced with a number of days. It's always greater than 1
 #: ../e-util/e-datetime-format.c:214
 #, c-format
-#| msgid "%d days ago"
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "Vor %d Tag"
@@ -8906,13 +8914,15 @@ msgstr "Protokollmeldungen:"
 msgid "Log Level"
 msgstr "Protokolltyp"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2683
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2741
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Nachrichten"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:109
-#: ../shell/e-shell-window-actions.c:1450
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:111
+#: ../shell/e-shell-window-actions.c:1425
+#: ../shell/e-shell-window-actions.c:1432
+#: ../shell/e-shell-window-actions.c:1439
 msgid "Close this window"
 msgstr "Dieses Fenster schlieÃ?en"
 
@@ -8981,129 +8991,135 @@ msgstr "Soll sie Ã¼berschrieben werden?"
 msgid "File exists \"{0}\"."
 msgstr "Die Datei Â»{0}Â« existiert bereits."
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:132
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:140
 msgid "_Overwrite"
 msgstr "Ã?_berschreiben"
 
-#: ../e-util/e-util.c:169
+#: ../e-util/e-util.c:146
 msgid "Could not open the link."
 msgstr "VerknÃ¼pfung konnte nicht geÃ¶ffnet werden."
 
-#: ../e-util/e-util.c:219
+#: ../e-util/e-util.c:193
 msgid "Could not display help for Evolution."
 msgstr "Hilfe fÃ¼r Evolution konnte nicht angezeigt werden."
 
-#: ../e-util/gconf-bridge.c:1303
+#: ../e-util/gconf-bridge.c:1281
 #, c-format
 msgid "GConf error: %s"
 msgstr "GConf-Fehler: %s"
 
-#: ../e-util/gconf-bridge.c:1314
+#: ../e-util/gconf-bridge.c:1292
 msgid "All further errors shown only on terminal."
 msgstr "Weitere Fehler werden nur im Terminal ausgegeben."
 
-#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:938
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:940
+#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:78
+msgid "From"
+msgstr "Von"
+
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:941
+#: ../modules/mail/em-mailer-prefs.c:79
 msgid "Reply-To"
 msgstr "Antwort an"
 
-#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:940
-#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2305
-#: ../mail/em-format-html.c:2328 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:943
+#: ../mail/em-format-html.c:2285 ../mail/em-format-html.c:2347
+#: ../mail/em-format-html.c:2370 ../modules/mail/em-mailer-prefs.c:81
 msgid "Cc"
 msgstr "Kopie"
 
-#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:941
-#: ../mail/em-format-html.c:2244 ../mail/em-format-html.c:2309
-#: ../mail/em-format-html.c:2331 ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:944
+#: ../mail/em-format-html.c:2286 ../mail/em-format-html.c:2351
+#: ../mail/em-format-html.c:2373 ../modules/mail/em-mailer-prefs.c:82
 msgid "Bcc"
 msgstr "Blindkopie"
 
-#: ../em-format/em-format-quote.c:347 ../em-format/em-format.c:942
+#: ../em-format/em-format-quote.c:347 ../em-format/em-format.c:945
 #: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:82
-#: ../plugins/groupwise-features/properties.ui.h:6 ../smime/lib/e-cert.c:1131
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:83
+#: ../plugins/groupwise-features/properties.ui.h:6 ../smime/lib/e-cert.c:1140
 msgid "Subject"
 msgstr "Betreff"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:358 ../mail/em-format-html.c:2425
-#: ../modules/mail/em-mailer-prefs.c:1138
+#: ../em-format/em-format-quote.c:358 ../mail/em-format-html.c:2467
+#: ../modules/mail/em-mailer-prefs.c:1144
 msgid "Mailer"
 msgstr "Mailer"
 
-#: ../em-format/em-format-quote.c:423 ../mail/em-composer-utils.c:1220
+#: ../em-format/em-format-quote.c:423 ../mail/em-composer-utils.c:1190
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Weitergeleitete Nachricht --------"
 
-#: ../em-format/em-format.c:943 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:524
+#: ../em-format/em-format.c:946 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:84 ../widgets/misc/e-dateedit.c:524
 #: ../widgets/misc/e-dateedit.c:546
 msgid "Date"
 msgstr "Datum"
 
-#: ../em-format/em-format.c:944 ../modules/mail/em-mailer-prefs.c:84
+#: ../em-format/em-format.c:947 ../modules/mail/em-mailer-prefs.c:85
 msgid "Newsgroups"
 msgstr "Newsgroups"
 
-#: ../em-format/em-format.c:945 ../modules/mail/em-mailer-prefs.c:85
+#: ../em-format/em-format.c:948 ../modules/mail/em-mailer-prefs.c:86
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "Gesicht"
 
-#: ../em-format/em-format.c:1302
+#: ../em-format/em-format.c:1310
 #, c-format
 msgid "%s attachment"
 msgstr "%s-Anlage"
 
-#: ../em-format/em-format.c:1361
+#: ../em-format/em-format.c:1370
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr ""
 "Die Syntax der S/MIME-Nachricht konnte nicht analysiert werden: Unbekannter "
 "Fehler"
 
-#: ../em-format/em-format.c:1515 ../em-format/em-format.c:1685
+#: ../em-format/em-format.c:1525 ../em-format/em-format.c:1699
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "Die Syntax der MIME-Nachricht konnte nicht analysiert werden und wird daher "
 "als Quelltext angezeigt."
 
-#: ../em-format/em-format.c:1523
+#: ../em-format/em-format.c:1533
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Nicht unterstÃ¼tzter VerschlÃ¼sselungstyp fÃ¼r multipart/encrypted"
 
-#: ../em-format/em-format.c:1535
+#: ../em-format/em-format.c:1546
 msgid "Could not parse PGP/MIME message"
 msgstr "Die Syntax der PGP/MIME-Nachricht konnte nicht analysiert werden"
 
-#: ../em-format/em-format.c:1535
+#: ../em-format/em-format.c:1547
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr ""
 "Die Syntax der PGP/MIME-Nachricht konnte nicht analysiert werden: Unbekannter "
 "Fehler"
 
-#: ../em-format/em-format.c:1709
+#: ../em-format/em-format.c:1723
 msgid "Unsupported signature format"
 msgstr "Nicht unterstÃ¼tztes Signaturformat"
 
-#: ../em-format/em-format.c:1717 ../em-format/em-format.c:1867
+#: ../em-format/em-format.c:1733 ../em-format/em-format.c:1889
 msgid "Error verifying signature"
 msgstr "Fehler beim Ã?berprÃ¼fen der Signatur"
 
-#: ../em-format/em-format.c:1717 ../em-format/em-format.c:1856
-#: ../em-format/em-format.c:1867
+#: ../em-format/em-format.c:1734 ../em-format/em-format.c:1877
+#: ../em-format/em-format.c:1890
 msgid "Unknown error verifying signature"
 msgstr "Unbekannter Fehler beim Ã?berprÃ¼fen der Signatur"
 
-#: ../em-format/em-format.c:1946
-msgid "Could not parse PGP message"
-msgstr "Die Syntax der PGP-Nachricht konnte nicht analysiert werden"
+#: ../em-format/em-format.c:1970
+msgid "Could not parse PGP message: "
+msgstr "Die Syntax der PGP-Nachricht konnte nicht analysiert werden:"
 
-#: ../em-format/em-format.c:1946
-msgid "Could not parse PGP message: Unknown error"
-msgstr ""
-"Die Syntax der PGP-Nachricht konnte nicht analysiert werden: Unbekannter "
-"Fehler"
+#: ../em-format/em-format.c:1976 ../plugins/caldav/caldav-browse-server.c:203
+#: ../plugins/caldav/caldav-browse-server.c:1254 ../plugins/face/face.c:169
+#: ../smime/gui/certificate-manager.c:100
+msgid "Unknown error"
+msgstr "Unbekannter Fehler"
 
 #: ../filter/e-filter-datespec.c:74
 #, c-format
@@ -9307,7 +9323,7 @@ msgstr "Datum fehlt."
 msgid "Missing file name."
 msgstr "Dateiname fehlt."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:74
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "Name fehlt."
 
@@ -9365,7 +9381,7 @@ msgstr ""
 "Das Datum der Nachricht wird mit dem Datum\n"
 "verglichen, an dem der Filter angewandt wird."
 
-#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:185
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:189
 msgid "_Filter Rules"
 msgstr "_Filterregeln"
 
@@ -9386,7 +9402,7 @@ msgstr "in der Zukunft"
 msgid "months"
 msgstr "Monaten"
 
-#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:173
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:190
 msgid "seconds"
 msgstr "Sekunden"
 
@@ -9402,25 +9418,24 @@ msgstr "die von Ihnen angegebene Zeit"
 msgid "years"
 msgstr "Jahren"
 
-#: ../mail/e-mail-attachment-bar.c:120 ../mail/e-mail-attachment-bar.c:125
-#: ../mail/em-format-html-display.c:1020 ../mail/mail-config.ui.h:14
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:148
-#: ../widgets/misc/e-attachment-paned.c:153
+#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
+#: ../mail/em-format-html-display.c:1027 ../mail/mail-config.ui.h:15
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:118
+#: ../widgets/misc/e-attachment-paned.c:123
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Anlage"
 msgstr[1] "Anlagen"
 
-#: ../mail/e-mail-attachment-bar.c:617 ../widgets/misc/e-attachment-paned.c:612
+#: ../mail/e-mail-attachment-bar.c:586 ../widgets/misc/e-attachment-paned.c:581
 msgid "Icon View"
 msgstr "Symbolansicht"
 
-#: ../mail/e-mail-attachment-bar.c:618 ../widgets/misc/e-attachment-paned.c:613
+#: ../mail/e-mail-attachment-bar.c:587 ../widgets/misc/e-attachment-paned.c:582
 msgid "List View"
 msgstr "Listenansicht"
 
-#: ../mail/e-mail-browser.c:262
-#| msgid "Subject"
+#: ../mail/e-mail-browser.c:266
 msgid "(No Subject)"
 msgstr "(Kein Betreff)"
 
@@ -9469,7 +9484,7 @@ msgid "_Later"
 msgstr "S_pÃ¤ter"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:472
+#: ../modules/mail/e-mail-shell-view-actions.c:478
 msgid "Add Label"
 msgstr "Beschriftung hinzufÃ¼gen"
 
@@ -9493,32 +9508,32 @@ msgstr "Farbe"
 #: ../plugins/caldav/caldav-browse-server.c:1163
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
 #: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/menus/gal-define-views-dialog.c:327
+#: ../widgets/menus/gal-define-views-dialog.c:334
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
 msgid "Name"
 msgstr "Name"
 
 #: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:283
-#: ../mail/em-folder-tree-model.c:675 ../mail/em-folder-tree.c:2682
-#: ../modules/mail/e-mail-shell-view-private.c:953
+#: ../mail/em-folder-tree-model.c:700 ../mail/em-folder-tree.c:2759
+#: ../modules/mail/e-mail-shell-view-private.c:959
 msgid "Inbox"
 msgstr "Eingang"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:668
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:693
 msgid "Drafts"
 msgstr "EntwÃ¼rfe"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:678
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:703
 msgid "Outbox"
 msgstr "Ausgang"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:680
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:705
 msgid "Sent"
 msgstr "Verschickt"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:671
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:696
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:572
+#: ../plugins/templates/templates.c:573
 msgid "Templates"
 msgstr "Vorlagen"
 
@@ -9535,11 +9550,11 @@ msgstr "Migration"
 msgid "Migrating '%s':"
 msgstr "Â»%sÂ« wird migriert:"
 
-#: ../mail/e-mail-migrate.c:643
+#: ../mail/e-mail-migrate.c:649
 msgid "Migrating Folders"
 msgstr "Ordner werden migriert"
 
-#: ../mail/e-mail-migrate.c:644
+#: ../mail/e-mail-migrate.c:650
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -9551,37 +9566,46 @@ msgstr ""
 "\n"
 "Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner â?¦"
 
-#: ../mail/e-mail-migrate.c:740
+#: ../mail/e-mail-migrate.c:739
 #, c-format
-#| msgid "Unable to create local mail folders at `%s': %s"
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "Lokale E-Mail-Ordner unter Â»%sÂ« konnten nicht angelegt werden: %s"
 
 #. XXX e-error should provide a widget layout and API suitable
 #. *     for packing additional widgets to the right of the alert
 #. *     icon.  But for now, screw it.
-#: ../mail/e-mail-reader-utils.c:108
-#: ../modules/calendar/e-task-shell-view-actions.c:561
+#: ../mail/e-mail-reader-utils.c:109
+#: ../modules/calendar/e-task-shell-view-actions.c:570
 msgid "Do not ask me again"
 msgstr "Nicht mehr nachfragen."
 
-#: ../mail/e-mail-reader.c:266 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:265 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "In Ordner kopieren"
 
-#: ../mail/e-mail-reader.c:266 ../mail/em-folder-utils.c:378
+#: ../mail/e-mail-reader.c:265 ../mail/em-folder-utils.c:402
 msgid "C_opy"
 msgstr "K_opieren"
 
-#: ../mail/e-mail-reader.c:640 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:639 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "In Ordner verschieben"
 
-#: ../mail/e-mail-reader.c:640 ../mail/em-folder-utils.c:378
+#: ../mail/e-mail-reader.c:639 ../mail/em-folder-utils.c:402
 msgid "_Move"
 msgstr "_Verschieben"
 
-#: ../mail/e-mail-reader.c:866
+#. Check buttons
+#: ../mail/e-mail-reader.c:854 ../mail/e-mail-reader.c:964
+#: ../mail/e-mail-reader.c:998
+msgid "_Do not ask me again."
+msgstr "_Nicht mehr nachfragen."
+
+#: ../mail/e-mail-reader.c:1002
+msgid "_Always ignore Reply-To: for mailing lists."
+msgstr ""
+
+#: ../mail/e-mail-reader.c:1087
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Nachricht speichern"
@@ -9593,505 +9617,508 @@ msgstr[1] "Nachrichten speichern"
 #. * Subject. The extension ".mbox" is appended to this
 #. * string, thus it will be something like "Message.mbox"
 #. * at the end.
-#: ../mail/e-mail-reader.c:887 ../plugins/groupwise-features/properties.ui.h:4
+#: ../mail/e-mail-reader.c:1108 ../plugins/groupwise-features/properties.ui.h:4
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Nachricht"
 msgstr[1] "Nachrichten"
 
-#: ../mail/e-mail-reader.c:1145
+#: ../mail/e-mail-reader.c:1366
 msgid "A_dd Sender to Address Book"
 msgstr "A_bsender zum Adressbuch hinzufÃ¼gen"
 
-#: ../mail/e-mail-reader.c:1147
+#: ../mail/e-mail-reader.c:1368
 msgid "Add sender to address book"
 msgstr "Absender zum Adressbuch hinzufÃ¼gen"
 
-#: ../mail/e-mail-reader.c:1152
+#: ../mail/e-mail-reader.c:1373
 msgid "Check for _Junk"
 msgstr "Ã?ber_prÃ¼fung auf unerwÃ¼nschte Nachrichten"
 
-#: ../mail/e-mail-reader.c:1154
+#: ../mail/e-mail-reader.c:1375
 msgid "Filter the selected messages for junk status"
 msgstr "Die gewÃ¤hlten Nachrichten auf den Status Â»UnerwÃ¼nschtÂ« filtern"
 
-#: ../mail/e-mail-reader.c:1159
+#: ../mail/e-mail-reader.c:1380
 msgid "_Copy to Folder..."
 msgstr "In Ordner _kopieren â?¦"
 
-#: ../mail/e-mail-reader.c:1161
+#: ../mail/e-mail-reader.c:1382
 msgid "Copy selected messages to another folder"
 msgstr "Die gewÃ¤hlten Nachrichten in einen anderen Ordner kopieren"
 
-#: ../mail/e-mail-reader.c:1166
+#: ../mail/e-mail-reader.c:1387
 msgid "_Delete Message"
 msgstr "Nachricht _lÃ¶schen"
 
-#: ../mail/e-mail-reader.c:1168
+#: ../mail/e-mail-reader.c:1389
 msgid "Mark the selected messages for deletion"
 msgstr "Die gewÃ¤hlten Nachrichten als zu lÃ¶schend markieren"
 
-#: ../mail/e-mail-reader.c:1173
+#: ../mail/e-mail-reader.c:1394
 msgid "Filter on Mailing _List..."
 msgstr "Filter Ã¼ber Mailing_liste â?¦"
 
-#: ../mail/e-mail-reader.c:1175
+#: ../mail/e-mail-reader.c:1396
 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:1180
+#: ../mail/e-mail-reader.c:1401
 msgid "Filter on _Recipients..."
 msgstr "Filter Ã¼ber _EmpfÃ¤nger â?¦"
 
-#: ../mail/e-mail-reader.c:1182
+#: ../mail/e-mail-reader.c:1403
 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:1187
+#: ../mail/e-mail-reader.c:1408
 msgid "Filter on Se_nder..."
 msgstr "Filter Ã¼ber _Absender â?¦"
 
-#: ../mail/e-mail-reader.c:1189
+#: ../mail/e-mail-reader.c:1410
 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:1194
+#: ../mail/e-mail-reader.c:1415
 msgid "Filter on _Subject..."
 msgstr "Filter Ã¼ber _Betreff â?¦"
 
-#: ../mail/e-mail-reader.c:1196
+#: ../mail/e-mail-reader.c:1417
 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:1201
+#: ../mail/e-mail-reader.c:1422
 msgid "A_pply Filters"
 msgstr "Filter an_wenden"
 
-#: ../mail/e-mail-reader.c:1203
+#: ../mail/e-mail-reader.c:1424
 msgid "Apply filter rules to the selected messages"
 msgstr "Filterregeln auf die gewÃ¤hlten Nachrichten anwenden"
 
-#: ../mail/e-mail-reader.c:1208
+#: ../mail/e-mail-reader.c:1429
 msgid "_Find in Message..."
 msgstr "In Nachricht _suchen â?¦"
 
-#: ../mail/e-mail-reader.c:1210
+#: ../mail/e-mail-reader.c:1431
 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:1215
+#: ../mail/e-mail-reader.c:1436
 msgid "_Clear Flag"
 msgstr "Markierung _lÃ¶schen"
 
-#: ../mail/e-mail-reader.c:1217
+#: ../mail/e-mail-reader.c:1438
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Die Folgemarkierung aus den gewÃ¤hlten Nachrichten entfernen"
 
-#: ../mail/e-mail-reader.c:1222
+#: ../mail/e-mail-reader.c:1443
 msgid "_Flag Completed"
 msgstr "Als abgeschlossen _markieren"
 
-#: ../mail/e-mail-reader.c:1224
+#: ../mail/e-mail-reader.c:1445
 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:1229
+#: ../mail/e-mail-reader.c:1450
 msgid "Follow _Up..."
 msgstr "_Folgenachricht â?¦"
 
-#: ../mail/e-mail-reader.c:1231
+#: ../mail/e-mail-reader.c:1452
 msgid "Flag the selected messages for follow-up"
 msgstr "Die gewÃ¤hlten Nachrichten zur Nachverfolgung markieren"
 
-#: ../mail/e-mail-reader.c:1236
+#: ../mail/e-mail-reader.c:1457
 msgid "_Attached"
 msgstr "_Anhang"
 
-#: ../mail/e-mail-reader.c:1238 ../mail/e-mail-reader.c:1245
+#: ../mail/e-mail-reader.c:1459 ../mail/e-mail-reader.c:1466
 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:1243
+#: ../mail/e-mail-reader.c:1464
 msgid "Forward As _Attached"
 msgstr "Als _Anhang weiterleiten"
 
-#: ../mail/e-mail-reader.c:1250
+#: ../mail/e-mail-reader.c:1471
 msgid "_Inline"
 msgstr "_Eingebettet"
 
-#: ../mail/e-mail-reader.c:1252 ../mail/e-mail-reader.c:1259
+#: ../mail/e-mail-reader.c:1473 ../mail/e-mail-reader.c:1480
 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:1257
+#: ../mail/e-mail-reader.c:1478
 msgid "Forward As _Inline"
 msgstr "_Eingebettet weiterleiten"
 
-#: ../mail/e-mail-reader.c:1264
+#: ../mail/e-mail-reader.c:1485
 msgid "_Quoted"
 msgstr "_Zitiert"
 
-#: ../mail/e-mail-reader.c:1266 ../mail/e-mail-reader.c:1273
+#: ../mail/e-mail-reader.c:1487 ../mail/e-mail-reader.c:1494
 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:1271
+#: ../mail/e-mail-reader.c:1492
 msgid "Forward As _Quoted"
 msgstr "_Zitiert weiterleiten"
 
-#: ../mail/e-mail-reader.c:1278
+#: ../mail/e-mail-reader.c:1499
 msgid "_Load Images"
 msgstr "_Bilder laden"
 
-#: ../mail/e-mail-reader.c:1280
+#: ../mail/e-mail-reader.c:1501
 msgid "Force images in HTML mail to be loaded"
 msgstr "Laden von Bildern in HTML-E-Mail erzwingen"
 
-#: ../mail/e-mail-reader.c:1285
+#: ../mail/e-mail-reader.c:1506
 msgid "_Important"
 msgstr "_Wichtig"
 
-#: ../mail/e-mail-reader.c:1287
+#: ../mail/e-mail-reader.c:1508
 msgid "Mark the selected messages as important"
 msgstr "Die gewÃ¤hlten Nachrichten als wichtig markieren"
 
-#: ../mail/e-mail-reader.c:1292
+#: ../mail/e-mail-reader.c:1513
 msgid "_Junk"
 msgstr "UnerwÃ¼_nscht"
 
-#: ../mail/e-mail-reader.c:1294
+#: ../mail/e-mail-reader.c:1515
 msgid "Mark the selected messages as junk"
 msgstr "Die gewÃ¤hlten Nachrichten als unerwÃ¼nscht markieren"
 
-#: ../mail/e-mail-reader.c:1299
+#: ../mail/e-mail-reader.c:1520
 msgid "_Not Junk"
 msgstr "E_rwÃ¼nscht"
 
-#: ../mail/e-mail-reader.c:1301
+#: ../mail/e-mail-reader.c:1522
 msgid "Mark the selected messages as not being junk"
 msgstr "Die gewÃ¤hlten Nachrichten als nicht unerwÃ¼nscht markieren"
 
-#: ../mail/e-mail-reader.c:1306
+#: ../mail/e-mail-reader.c:1527
 msgid "_Read"
 msgstr "Ge_lesen"
 
-#: ../mail/e-mail-reader.c:1308
+#: ../mail/e-mail-reader.c:1529
 msgid "Mark the selected messages as having been read"
 msgstr "Die gewÃ¤hlten Nachrichten als gelesen markieren"
 
-#: ../mail/e-mail-reader.c:1313
+#: ../mail/e-mail-reader.c:1534
 msgid "Uni_mportant"
 msgstr "_Unwichtig"
 
-#: ../mail/e-mail-reader.c:1315
+#: ../mail/e-mail-reader.c:1536
 msgid "Mark the selected messages as unimportant"
 msgstr "Die gewÃ¤hlten Nachrichten als unwichtig markieren"
 
-#: ../mail/e-mail-reader.c:1320
+#: ../mail/e-mail-reader.c:1541
 msgid "_Unread"
 msgstr "_Ungelesen"
 
-#: ../mail/e-mail-reader.c:1322
+#: ../mail/e-mail-reader.c:1543
 msgid "Mark the selected messages as not having been read"
 msgstr "Die gewÃ¤hlten Nachrichten als ungelesen markieren"
 
-#: ../mail/e-mail-reader.c:1327
+#: ../mail/e-mail-reader.c:1548
 msgid "_Edit as New Message..."
 msgstr "Als neue _Nachricht bearbeiten â?¦"
 
-#: ../mail/e-mail-reader.c:1329
+#: ../mail/e-mail-reader.c:1550
 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:1334
+#: ../mail/e-mail-reader.c:1555
 msgid "Compose _New Message"
 msgstr "_Nachricht verfassen"
 
-#: ../mail/e-mail-reader.c:1336
+#: ../mail/e-mail-reader.c:1557
 msgid "Open a window for composing a mail message"
 msgstr "Ein Fenster zum Verfassen einer E-Mail-Nachricht Ã¶ffnen"
 
-#: ../mail/e-mail-reader.c:1341
+#: ../mail/e-mail-reader.c:1562
 msgid "_Open in New Window"
 msgstr "In neuem _Fenster Ã¶ffnen"
 
-#: ../mail/e-mail-reader.c:1343
+#: ../mail/e-mail-reader.c:1564
 msgid "Open the selected messages in a new window"
 msgstr "Die gewÃ¤hlten Nachrichten in einem neuen Fenster Ã¶ffnen"
 
-#: ../mail/e-mail-reader.c:1348
+#: ../mail/e-mail-reader.c:1569
 msgid "_Move to Folder..."
 msgstr "In Ordner _verschieben â?¦"
 
-#: ../mail/e-mail-reader.c:1350
+#: ../mail/e-mail-reader.c:1571
 msgid "Move selected messages to another folder"
 msgstr "Die gewÃ¤hlten Nachrichten in einen anderen Ordner verschieben"
 
-#: ../mail/e-mail-reader.c:1355
+#: ../mail/e-mail-reader.c:1576
 msgid "_Next Message"
 msgstr "_NÃ¤chste Nachricht"
 
-#: ../mail/e-mail-reader.c:1357
+#: ../mail/e-mail-reader.c:1578
 msgid "Display the next message"
 msgstr "Die nÃ¤chste Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:1362
+#: ../mail/e-mail-reader.c:1583
 msgid "Next _Important Message"
 msgstr "NÃ¤chste _wichtige Nachricht"
 
-#: ../mail/e-mail-reader.c:1364
+#: ../mail/e-mail-reader.c:1585
 msgid "Display the next important message"
 msgstr "Die nÃ¤chste wichtige Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:1369
+#: ../mail/e-mail-reader.c:1590
 msgid "Next _Thread"
 msgstr "NÃ¤chster _Thread"
 
-#: ../mail/e-mail-reader.c:1371
+#: ../mail/e-mail-reader.c:1592
 msgid "Display the next thread"
 msgstr "NÃ¤chsten Thread anzeigen"
 
-#: ../mail/e-mail-reader.c:1376
+#: ../mail/e-mail-reader.c:1597
 msgid "Next _Unread Message"
 msgstr "NÃ¤chste _ungelesene Nachricht"
 
-#: ../mail/e-mail-reader.c:1378
+#: ../mail/e-mail-reader.c:1599
 msgid "Display the next unread message"
 msgstr "Die nÃ¤chste ungelesene Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:1383
+#: ../mail/e-mail-reader.c:1604
 msgid "_Previous Message"
 msgstr "_Vorherige Nachricht"
 
-#: ../mail/e-mail-reader.c:1385
+#: ../mail/e-mail-reader.c:1606
 msgid "Display the previous message"
 msgstr "Die vorhergehende Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:1390
+#: ../mail/e-mail-reader.c:1611
 msgid "Pr_evious Important Message"
 msgstr "V_orherige wichtige Nachricht"
 
-#: ../mail/e-mail-reader.c:1392
+#: ../mail/e-mail-reader.c:1613
 msgid "Display the previous important message"
 msgstr "Die vorhergehende wichtige Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:1397
+#: ../mail/e-mail-reader.c:1618
 msgid "P_revious Unread Message"
 msgstr "_Vorherige ungelesene Nachricht"
 
-#: ../mail/e-mail-reader.c:1399
+#: ../mail/e-mail-reader.c:1620
 msgid "Display the previous unread message"
 msgstr "Die vorhergehende ungelesene Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:1406
+#: ../mail/e-mail-reader.c:1627
 msgid "Print this message"
 msgstr "Diese Nachricht drucken"
 
-#: ../mail/e-mail-reader.c:1413
+#: ../mail/e-mail-reader.c:1634
 msgid "Preview the message to be printed"
 msgstr "Eine Vorschau auf die zu druckende Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:1418
+#: ../mail/e-mail-reader.c:1639
 msgid "Re_direct"
 msgstr "_Umleiten"
 
-#: ../mail/e-mail-reader.c:1420
+#: ../mail/e-mail-reader.c:1641
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Die gewÃ¤hlte Nachricht an jemanden umleiten"
 
-#: ../mail/e-mail-reader.c:1425
-#: ../modules/calendar/e-cal-shell-view-actions.c:1425
+#: ../mail/e-mail-reader.c:1646 ../mail/mail.error.xml.h:91
+#: ../modules/calendar/e-cal-shell-view-actions.c:1459
 #: ../modules/mail/e-mail-attachment-handler.c:139
 msgid "Reply to _All"
 msgstr "Antw_ort an alle"
 
-#: ../mail/e-mail-reader.c:1427
+#: ../mail/e-mail-reader.c:1648
 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:1432
+#: ../mail/e-mail-reader.c:1653 ../mail/mail.error.xml.h:92
 msgid "Reply to _List"
 msgstr "Antwort an Lis_te"
 
-#: ../mail/e-mail-reader.c:1434
+#: ../mail/e-mail-reader.c:1655
 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:1439 ../modules/mail/e-mail-attachment-handler.c:146
+#: ../mail/e-mail-reader.c:1660 ../modules/mail/e-mail-attachment-handler.c:146
 msgid "_Reply to Sender"
 msgstr "_Antwort an Absender"
 
-#: ../mail/e-mail-reader.c:1441
+#: ../mail/e-mail-reader.c:1662
 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:1446
+#: ../mail/e-mail-reader.c:1667
 msgid "_Save as mbox..."
 msgstr "_Speichern als mbox â?¦"
 
-#: ../mail/e-mail-reader.c:1448
+#: ../mail/e-mail-reader.c:1669
 msgid "Save selected messages as an mbox file"
 msgstr "Die gewÃ¤hlten Nachrichten als mbox-Datei speichern"
 
-#: ../mail/e-mail-reader.c:1453
+#: ../mail/e-mail-reader.c:1674
 msgid "Search Folder from Mailing _List..."
 msgstr "Suchordner Ã¼ber Mailing_liste â?¦"
 
-#: ../mail/e-mail-reader.c:1455
+#: ../mail/e-mail-reader.c:1676
 msgid "Create a search folder for this mailing list"
 msgstr "Einen Suchordner fÃ¼r diese Mailingliste anlegen"
 
-#: ../mail/e-mail-reader.c:1460
+#: ../mail/e-mail-reader.c:1681
 msgid "Search Folder from Recipien_ts..."
 msgstr "Suchordner Ã¼ber _EmpfÃ¤nger â?¦"
 
-#: ../mail/e-mail-reader.c:1462
+#: ../mail/e-mail-reader.c:1683
 msgid "Create a search folder for these recipients"
 msgstr "Einen Suchordner fÃ¼r diese EmpfÃ¤nger anlegen"
 
-#: ../mail/e-mail-reader.c:1467
+#: ../mail/e-mail-reader.c:1688
 msgid "Search Folder from Sen_der..."
 msgstr "Suchordner Ã¼ber _Absender â?¦"
 
-#: ../mail/e-mail-reader.c:1469
+#: ../mail/e-mail-reader.c:1690
 msgid "Create a search folder for this sender"
 msgstr "Einen Suchordner fÃ¼r diesen Absender anlegen"
 
-#: ../mail/e-mail-reader.c:1474
+#: ../mail/e-mail-reader.c:1695
 msgid "Search Folder from S_ubject..."
 msgstr "Suchordner Ã¼ber _Betreff â?¦"
 
-#: ../mail/e-mail-reader.c:1476
+#: ../mail/e-mail-reader.c:1697
 msgid "Create a search folder for this subject"
 msgstr "Einen Suchordner fÃ¼r diesen Betreff anlegen"
 
-#: ../mail/e-mail-reader.c:1481
+#: ../mail/e-mail-reader.c:1702
 msgid "_Message Source"
 msgstr "Nachrichten-_Quelltext"
 
-#: ../mail/e-mail-reader.c:1483
+#: ../mail/e-mail-reader.c:1704
 msgid "Show the raw email source of the message"
 msgstr "Den zugrunde liegenden E-Mail-Quelltext dieser Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:1495
+#: ../mail/e-mail-reader.c:1716
 msgid "_Undelete Message"
 msgstr "LÃ¶schen der Nachricht _rÃ¼ckgÃ¤ngig"
 
-#: ../mail/e-mail-reader.c:1497
+#: ../mail/e-mail-reader.c:1718
 msgid "Undelete the selected messages"
 msgstr "LÃ¶schen der gewÃ¤hlten Nachrichten rÃ¼ckgÃ¤ngig machen"
 
-#: ../mail/e-mail-reader.c:1502
+#: ../mail/e-mail-reader.c:1723
 msgid "_Normal Size"
 msgstr "_Normale GrÃ¶Ã?e"
 
-#: ../mail/e-mail-reader.c:1504
+#: ../mail/e-mail-reader.c:1725
 msgid "Reset the text to its original size"
 msgstr "Den Text auf seine OriginalgrÃ¶Ã?e zurÃ¼cksetzen"
 
-#: ../mail/e-mail-reader.c:1509
+#: ../mail/e-mail-reader.c:1730
 msgid "_Zoom In"
 msgstr "Ansicht ver_grÃ¶Ã?ern"
 
-#: ../mail/e-mail-reader.c:1511
+#: ../mail/e-mail-reader.c:1732
 msgid "Increase the text size"
 msgstr "Die TextgrÃ¶Ã?e heraufsetzen"
 
-#: ../mail/e-mail-reader.c:1516
+#: ../mail/e-mail-reader.c:1737
 msgid "Zoom _Out"
 msgstr "Ansicht ver_kleinern"
 
-#: ../mail/e-mail-reader.c:1518
+#: ../mail/e-mail-reader.c:1739
 msgid "Decrease the text size"
 msgstr "Die TextgrÃ¶Ã?e heruntersetzen"
 
-#: ../mail/e-mail-reader.c:1525
+#: ../mail/e-mail-reader.c:1746
 msgid "Create R_ule"
 msgstr "_Regel anlegen"
 
-#: ../mail/e-mail-reader.c:1532
+#: ../mail/e-mail-reader.c:1753
 msgid "Ch_aracter Encoding"
 msgstr "Zeichenko_dierung"
 
-#: ../mail/e-mail-reader.c:1539
+#: ../mail/e-mail-reader.c:1760
 msgid "F_orward As"
 msgstr "_Weiterleiten als â?¦"
 
-#: ../mail/e-mail-reader.c:1546
+#: ../mail/e-mail-reader.c:1767
+msgid "_Group Reply"
+msgstr "Antwort an _Gruppe"
+
+#: ../mail/e-mail-reader.c:1774
 msgid "_Go To"
 msgstr "_Gehe zu"
 
-#: ../mail/e-mail-reader.c:1553
+#: ../mail/e-mail-reader.c:1781
 msgid "Mar_k As"
 msgstr "Mar_kieren als"
 
-#: ../mail/e-mail-reader.c:1560
+#: ../mail/e-mail-reader.c:1788
 msgid "_Message"
 msgstr "_Nachricht"
 
-#: ../mail/e-mail-reader.c:1567
+#: ../mail/e-mail-reader.c:1795
 msgid "_Zoom"
 msgstr "Ansicht ver_grÃ¶Ã?ern"
 
-#: ../mail/e-mail-reader.c:1592
+#: ../mail/e-mail-reader.c:1820
 msgid "Mark for Follo_w Up..."
 msgstr "Als _Folgenachricht markieren â?¦"
 
-#: ../mail/e-mail-reader.c:1600
+#: ../mail/e-mail-reader.c:1828
 msgid "Mark as _Important"
 msgstr "Als w_ichtig markieren"
 
-#: ../mail/e-mail-reader.c:1604
+#: ../mail/e-mail-reader.c:1832
 msgid "Mark as _Junk"
 msgstr "Als un_erwÃ¼nscht markieren"
 
-#: ../mail/e-mail-reader.c:1608
+#: ../mail/e-mail-reader.c:1836
 msgid "Mark as _Not Junk"
 msgstr "Als _nicht unerwÃ¼nscht markieren"
 
-#: ../mail/e-mail-reader.c:1612
+#: ../mail/e-mail-reader.c:1840
 msgid "Mar_k as Read"
 msgstr "Als _gelesen markieren"
 
-#: ../mail/e-mail-reader.c:1616
+#: ../mail/e-mail-reader.c:1844
 msgid "Mark as Uni_mportant"
 msgstr "Als un_wichtig markieren"
 
-#: ../mail/e-mail-reader.c:1620
+#: ../mail/e-mail-reader.c:1848
 msgid "Mark as _Unread"
 msgstr "Als _ungelesen markieren"
 
-#: ../mail/e-mail-reader.c:1656
+#: ../mail/e-mail-reader.c:1884
 msgid "_Caret Mode"
 msgstr "Cursor-_Modus"
 
-#: ../mail/e-mail-reader.c:1658
+#: ../mail/e-mail-reader.c:1886
 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:1664
+#: ../mail/e-mail-reader.c:1892
 msgid "All Message _Headers"
 msgstr "Alle Nachrichtenk_Ã¶pfe"
 
-#: ../mail/e-mail-reader.c:1666
+#: ../mail/e-mail-reader.c:1894
 msgid "Show messages with all email headers"
 msgstr "Nachrichten mit allen E-Mail-Kopfzeilen anzeigen"
 
-#: ../mail/e-mail-reader.c:1880
+#: ../mail/e-mail-reader.c:2115
 msgid "Unable to retrieve message"
 msgstr "Nachricht konnte nicht abgerufen werden"
 
-#: ../mail/e-mail-reader.c:1884 ../mail/e-mail-reader.c:1944
-#: ../mail/mail-ops.c:1843
+#: ../mail/e-mail-reader.c:2175 ../mail/mail-ops.c:1891
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Nachricht Â»%sÂ« wird abgerufen"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:2460
+#: ../mail/e-mail-reader.c:2701 ../mail/mail-config.ui.h:31
 #: ../plugins/google-account-setup/google-source.c:303
 #: ../plugins/google-account-setup/google-source.c:537
 #: ../plugins/google-account-setup/google-source.c:659
@@ -10099,32 +10126,42 @@ msgstr "Nachricht Â»%sÂ« wird abgerufen"
 msgid "Default"
 msgstr "Vorgabe"
 
-#: ../mail/e-mail-reader.c:2581 ../modules/mail/e-mail-attachment-handler.c:132
+#: ../mail/e-mail-reader.c:2841 ../modules/mail/e-mail-attachment-handler.c:132
 msgid "_Forward"
 msgstr "_Weiterleiten"
 
-#: ../mail/e-mail-reader.c:2582
+#: ../mail/e-mail-reader.c:2842
 msgid "Forward the selected message to someone"
 msgstr "Die gewÃ¤hlte Nachricht an jemanden weiterleiten"
 
-#: ../mail/e-mail-reader.c:2626 ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:753
+#: ../mail/e-mail-reader.c:2857
+msgid "Group Reply"
+msgstr "Antwort an Gruppe"
+
+#: ../mail/e-mail-reader.c:2858
+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:2903 ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:743
 msgid "Delete"
 msgstr "LÃ¶schen"
 
-#: ../mail/e-mail-reader.c:2630
-#: ../modules/calendar/e-cal-shell-view-actions.c:1271
+#: ../mail/e-mail-reader.c:2915
+#: ../modules/calendar/e-cal-shell-view-actions.c:1305
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "Weiter"
 
-#: ../mail/e-mail-reader.c:2634
-#: ../modules/calendar/e-cal-shell-view-actions.c:1264
+#: ../mail/e-mail-reader.c:2919
+#: ../modules/calendar/e-cal-shell-view-actions.c:1298
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "Vorherige"
 
-#: ../mail/e-mail-reader.c:2638 ../mail/mail-dialogs.ui.h:17
+#: ../mail/e-mail-reader.c:2929 ../mail/mail-dialogs.ui.h:19
 msgid "Reply"
 msgstr "Antworten"
 
@@ -10134,7 +10171,7 @@ msgstr "Als Folgenachricht markieren"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:73
+#: ../mail/em-account-editor.c:508 ../mail/mail-config.ui.h:77
 #: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "Keine VerschlÃ¼sselung"
@@ -10142,7 +10179,7 @@ msgstr "Keine VerschlÃ¼sselung"
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:503 ../mail/mail-config.ui.h:121
+#: ../mail/em-account-editor.c:512 ../mail/mail-config.ui.h:136
 #: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "TLS-VerschlÃ¼sselung"
@@ -10150,18 +10187,18 @@ msgstr "TLS-VerschlÃ¼sselung"
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:507 ../mail/mail-config.ui.h:94
+#: ../mail/em-account-editor.c:516 ../mail/mail-config.ui.h:105
 #: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "SSL-VerschlÃ¼sselung"
 
 # CHECK gibt's ne Ã?bersetzung fÃ¼r diese Methode?
-#: ../mail/em-account-editor.c:594
+#: ../mail/em-account-editor.c:603
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s-Lizenzvereinbarung"
 
-#: ../mail/em-account-editor.c:601
+#: ../mail/em-account-editor.c:610
 #, c-format
 msgid ""
 "\n"
@@ -10175,34 +10212,34 @@ msgstr ""
 "Haken Sie das KontrollkÃ¤stchen ab, um sie zu akzeptieren.\n"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:876 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:897 ../widgets/misc/e-signature-combo-box.c:75
 msgctxt "mail-signature"
 msgid "None"
 msgstr "Keine"
 
-#: ../mail/em-account-editor.c:960
+#: ../mail/em-account-editor.c:981
 msgid "Never"
 msgstr "Nie"
 
-#: ../mail/em-account-editor.c:961
+#: ../mail/em-account-editor.c:982
 msgid "Always"
 msgstr "Immer"
 
-#: ../mail/em-account-editor.c:962
+#: ../mail/em-account-editor.c:983
 msgid "Ask for each message"
 msgstr "Bei jeder Nachricht nachfragen"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1699 ../widgets/misc/e-account-tree-view.c:124
+#: ../mail/em-account-editor.c:1720 ../widgets/misc/e-account-tree-view.c:124
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "Keine"
 
-#: ../mail/em-account-editor.c:2056
+#: ../mail/em-account-editor.c:2095
 msgid "Mail Configuration"
 msgstr "E-Mail-Konfiguration"
 
-#: ../mail/em-account-editor.c:2057
+#: ../mail/em-account-editor.c:2096
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10212,7 +10249,7 @@ msgstr ""
 "\n"
 "Klicken Sie auf Â»VorÂ«, um die Konfiguration zu beginnen."
 
-#: ../mail/em-account-editor.c:2060
+#: ../mail/em-account-editor.c:2099
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields below "
 "do not need to be filled in, unless you wish to include this information in "
@@ -10223,20 +10260,20 @@ msgstr ""
 "ausgefÃ¼llt werden, es sei denn, Sie wollen diese Informationen in von Ihnen "
 "verschickten E-Mails einschlieÃ?en."
 
-#: ../mail/em-account-editor.c:2062 ../mail/em-account-editor.c:2228
-#: ../mail/mail-config.ui.h:91
+#: ../mail/em-account-editor.c:2101 ../mail/em-account-editor.c:2258
+#: ../mail/mail-config.ui.h:98
 msgid "Receiving Email"
 msgstr "Abrufen von E-Mails"
 
-#: ../mail/em-account-editor.c:2063
+#: ../mail/em-account-editor.c:2102
 msgid "Please configure the following account settings."
 msgstr "Bitte konfigurieren Sie die folgenden Konteneinstellungen."
 
-#: ../mail/em-account-editor.c:2065 ../mail/em-account-editor.c:2706
+#: ../mail/em-account-editor.c:2104 ../mail/em-account-editor.c:2738
 msgid "Sending Email"
 msgstr "Verschicken von E-Mails"
 
-#: ../mail/em-account-editor.c:2066
+#: ../mail/em-account-editor.c:2105
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -10245,11 +10282,11 @@ msgstr ""
 "Mails verschicken wollen. Falls Sie sich nicht sicher sind, wenden Sie sich "
 "bitte an Ihren Systemadministrator oder Internet-Provider."
 
-#: ../mail/em-account-editor.c:2068
+#: ../mail/em-account-editor.c:2107
 msgid "Account Management"
 msgstr "Kontenverwaltung"
 
-#: ../mail/em-account-editor.c:2069
+#: ../mail/em-account-editor.c:2108
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -10257,11 +10294,11 @@ msgstr ""
 "Bitte geben Sie unten einen bezeichnenden Namen fÃ¼r dieses Konto ein.\n"
 "Dieser Name wird nur zum Anzeigen verwendet."
 
-#: ../mail/em-account-editor.c:2073
+#: ../mail/em-account-editor.c:2112
 msgid "Done"
 msgstr "Fertig"
 
-#: ../mail/em-account-editor.c:2074
+#: ../mail/em-account-editor.c:2113
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10278,56 +10315,52 @@ msgstr ""
 "Klicken Sie auf Â»AnwendenÂ«, um Ihre Einstellungen zu\n"
 "speichern."
 
-#: ../mail/em-account-editor.c:2515
+#: ../mail/em-account-editor.c:2554
 msgid "Check for _new messages every"
 msgstr "_Automatisch nach neuen E-Mails sehen alle"
 
-#: ../mail/em-account-editor.c:2523
+#: ../mail/em-account-editor.c:2562
 msgid "minu_tes"
 msgstr "Minu_ten"
 
-#: ../mail/em-account-editor.c:2832 ../mail/mail-config.ui.h:101
+#: ../mail/em-account-editor.c:2836
+msgid "Please select a folder from the current account."
+msgstr "Bitte wÃ¤hlen Sie einen Ordner des aktuellen Kontos aus."
+
+#: ../mail/em-account-editor.c:3106 ../mail/mail-config.ui.h:112
 msgid "Security"
 msgstr "Sicherheit"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2877 ../mail/em-account-editor.c:2945
+#: ../mail/em-account-editor.c:3151 ../mail/em-account-editor.c:3219
 msgid "Receiving Options"
 msgstr "Empfangsoptionen"
 
-#: ../mail/em-account-editor.c:2878 ../mail/em-account-editor.c:2946
+#: ../mail/em-account-editor.c:3152 ../mail/em-account-editor.c:3220
 msgid "Checking for New Messages"
 msgstr "Nach neuen E-Mails sehen"
 
-#: ../mail/em-account-editor.c:3414
-msgid "Account Editor"
-msgstr "Konteneditor"
-
-#: ../mail/em-account-editor.c:3414
-msgid "Evolution Account Assistant"
-msgstr "Evolution-Kontoassistent"
-
 #. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
-#: ../mail/em-composer-utils.c:1570
+#: ../mail/em-composer-utils.c:1539
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "Ihre Nachricht an %s mit dem Betreff Â»%sÂ« am %s wurde gelesen."
 
 #. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1618
+#: ../mail/em-composer-utils.c:1587
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "ZustellungsbestÃ¤tigung fÃ¼r: Â»%sÂ«"
 
-#: ../mail/em-composer-utils.c:1947
+#: ../mail/em-composer-utils.c:1991
 msgid "an unknown sender"
 msgstr "ein unbekannter Absender"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1994
+#: ../mail/em-composer-utils.c:2038
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10335,15 +10368,15 @@ msgstr ""
 "Am ${WeekdayName}, den ${Day}.${Month}.${Year}, ${24Hour}:${Minute} "
 "${TimeZone} schrieb ${Sender}:"
 
-#: ../mail/em-composer-utils.c:2138
+#: ../mail/em-composer-utils.c:2182
 msgid "-----Original Message-----"
 msgstr "-------- Weitergeleitete Nachricht --------"
 
-#: ../mail/em-composer-utils.c:2319
+#: ../mail/em-composer-utils.c:2372
 msgid "Posting destination"
 msgstr "Zielordner"
 
-#: ../mail/em-composer-utils.c:2320
+#: ../mail/em-composer-utils.c:2373
 msgid "Choose folders to post the message to."
 msgstr "WÃ¤hlen Sie Ordner, in denen die Nachricht abgelegt werden soll."
 
@@ -10364,10 +10397,18 @@ msgstr "Farbe zuweisen"
 msgid "Assign Score"
 msgstr "Bewertung zuweisen"
 
+#: ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "BCC"
+
 #: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "Signalton"
 
+#: ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "CC"
+
 #: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
 msgstr "Abgeschlossen am"
@@ -10456,7 +10497,7 @@ msgstr "ist nicht gesetzt"
 msgid "is set"
 msgstr "ist gesetzt"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:62
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:66
 msgid "Junk"
 msgstr "UnerwÃ¼nscht"
 
@@ -10505,7 +10546,7 @@ msgid "Play Sound"
 msgstr "Klang abspielen"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:16
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:18
 msgid "Read"
 msgstr "Gelesen"
 
@@ -10637,29 +10678,29 @@ msgid "Folder _name:"
 msgstr "Ordner_name:"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:146 ../mail/em-folder-tree-model.c:149
-#: ../mail/em-folder-tree-model.c:155 ../mail/em-folder-tree-model.c:157
-#: ../mail/em-folder-tree-model.c:164 ../mail/em-folder-tree-model.c:166
-#: ../mail/mail-vfolder.c:1079 ../mail/mail-vfolder.c:1144
+#: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
+#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:160
+#: ../mail/em-folder-tree-model.c:167 ../mail/em-folder-tree-model.c:169
+#: ../mail/mail-vfolder.c:1061 ../mail/mail-vfolder.c:1126
 msgid "Search Folders"
 msgstr "Suchordner"
 
 # CHECK
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:171 ../mail/em-folder-tree-model.c:173
+#: ../mail/em-folder-tree-model.c:174 ../mail/em-folder-tree-model.c:176
 msgid "UNMATCHED"
 msgstr "OHNE TREFFER"
 
-#: ../mail/em-folder-tree-model.c:743 ../mail/em-folder-tree-model.c:1080
+#: ../mail/em-folder-tree-model.c:768 ../mail/em-folder-tree-model.c:1111
 msgid "Loading..."
 msgstr "Ladevorgang â?¦"
 
-#: ../mail/em-folder-tree.c:183
+#: ../mail/em-folder-tree.c:184
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Ordner in Â»%sÂ« werden eingelesen"
 
-#: ../mail/em-folder-tree.c:596
+#: ../mail/em-folder-tree.c:601
 msgid "Folder names cannot contain '/'"
 msgstr "Ordnernamen dÃ¼rfen das Slash-Zeichen Â»/Â« nicht enthalten"
 
@@ -10681,72 +10722,72 @@ msgstr "Ordnernamen dÃ¼rfen das Slash-Zeichen Â»/Â« nicht enthalten"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:1078
+#: ../mail/em-folder-tree.c:1084
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1286
+#: ../mail/em-folder-tree.c:1318
 msgid "Mail Folder Tree"
 msgstr "E-Mail-Ordnerbaum"
 
-#: ../mail/em-folder-tree.c:1583 ../mail/em-folder-utils.c:92
+#: ../mail/em-folder-tree.c:1623 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Moving folder %s"
 msgstr "Ordner %s wird verschoben"
 
-#: ../mail/em-folder-tree.c:1585 ../mail/em-folder-utils.c:94
+#: ../mail/em-folder-tree.c:1625 ../mail/em-folder-utils.c:94
 #, c-format
 msgid "Copying folder %s"
 msgstr "Ordner %s wird kopiert"
 
-#: ../mail/em-folder-tree.c:1592 ../mail/message-list.c:2104
+#: ../mail/em-folder-tree.c:1632 ../mail/message-list.c:2153
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Nachrichten werden in den Ordner %s verschoben"
 
-#: ../mail/em-folder-tree.c:1594 ../mail/message-list.c:2106
+#: ../mail/em-folder-tree.c:1634 ../mail/message-list.c:2155
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Nachrichten werden in den Ordner %s kopiert"
 
-#: ../mail/em-folder-tree.c:1609
+#: ../mail/em-folder-tree.c:1650
+#, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 "Sie kÃ¶nnen Nachrichten nicht im Speicher auf der obersten Ebene abgelegen"
 
-#: ../mail/em-folder-utils.c:379
+#: ../mail/em-folder-utils.c:403
 msgid "Move Folder To"
 msgstr "Ordner verschieben nach"
 
-#: ../mail/em-folder-utils.c:379
+#: ../mail/em-folder-utils.c:403
 msgid "Copy Folder To"
 msgstr "Ordner kopieren nach"
 
-#: ../mail/em-folder-utils.c:509
-#: ../plugins/groupwise-features/share-folder-common.c:138
+#: ../mail/em-folder-utils.c:533
+#: ../plugins/groupwise-features/share-folder-common.c:136
 #, c-format
-#| msgid "Creating folder `%s'"
 msgid "Creating folder '%s'"
 msgstr "Ordner Â»%sÂ« wird angelegt"
 
-#: ../mail/em-folder-utils.c:672
+#: ../mail/em-folder-utils.c:693
 msgid "Create Folder"
 msgstr "Ordner anlegen"
 
-#: ../mail/em-folder-utils.c:673
-#: ../plugins/groupwise-features/install-shared.c:167
-#: ../plugins/groupwise-features/share-folder-common.c:349
+#: ../mail/em-folder-utils.c:694
+#: ../plugins/groupwise-features/install-shared.c:165
+#: ../plugins/groupwise-features/share-folder-common.c:343
 msgid "Specify where to create the folder:"
 msgstr "Angeben, wo der Ordner angelegt werden soll:"
 
-#: ../mail/em-folder-utils.c:689
+#: ../mail/em-folder-utils.c:714
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Abbestellen des Ordners Â»%sÂ«"
 
-#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1533
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1571
 msgid "Unsigned"
 msgstr "Unsigniert"
 
@@ -10758,7 +10799,7 @@ msgstr ""
 "Diese Nachricht ist nicht signiert. Die AuthentizitÃ¤t des Absenders ist daher "
 "nicht sichergestellt."
 
-#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1534
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1572
 msgid "Valid signature"
 msgstr "GÃ¼ltige Signatur"
 
@@ -10771,7 +10812,7 @@ msgstr ""
 "Diese Nachricht ist signiert und gÃ¼ltig. Es ist daher sehr wahrscheinlich, "
 "dass der Absender der ist, der er vorgibt zu sein."
 
-#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1535
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1573
 msgid "Invalid signature"
 msgstr "UngÃ¼ltige Signatur"
 
@@ -10783,7 +10824,7 @@ msgstr ""
 "Die Signatur dieser Nachricht konnte nicht verifiziert werden. MÃ¶glicherweise "
 "wurde sie bei der Ã?bertragung verÃ¤ndert."
 
-#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1536
+#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1574
 msgid "Valid signature, but cannot verify sender"
 msgstr "GÃ¼ltige Signatur, Absender konnte jedoch nicht verifiziert werden"
 
@@ -10795,7 +10836,7 @@ msgstr ""
 "Diese Nachricht wurde mit einer gÃ¼ltigen Signatur signiert, der Absender der "
 "Nachricht konnte jedoch nicht verifiziert werden."
 
-#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1537
+#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1575
 msgid "Signature exists, but need public key"
 msgstr "Signatur existiert, jedoch wird der Ã¶ffentliche SchlÃ¼ssel benÃ¶tigt"
 
@@ -10807,7 +10848,7 @@ msgstr ""
 "Diese Nachricht wurde mit einer gÃ¼ltigen Signatur signiert, jedoch ist kein "
 "passender Ã¶ffentlicher SchlÃ¼ssel vorhanden."
 
-#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1543
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1581
 msgid "Unencrypted"
 msgstr "Nicht verschlÃ¼sselt"
 
@@ -10819,7 +10860,7 @@ msgstr ""
 "Diese Nachricht ist nicht verschlÃ¼sselt. Daher kann ihr Inhalt bei der "
 "Ã?bertragung Ã¼ber das Internet mÃ¶glicherweise ausgespÃ¤ht werden."
 
-#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1544
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1582
 msgid "Encrypted, weak"
 msgstr "Schwach verschlÃ¼sselt"
 
@@ -10833,7 +10874,7 @@ msgstr ""
 "schwach. Daher kÃ¶nnen Dritte ihren Inhalt zwar nur schwerlich, jedoch nicht "
 "unmÃ¶glich innerhalb eines praktikablen Zeitraums ausspÃ¤hen."
 
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1545
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1583
 msgid "Encrypted"
 msgstr "VerschlÃ¼sselt"
 
@@ -10845,7 +10886,7 @@ msgstr ""
 "Diese Nachricht ist verschlÃ¼sselt. Daher kÃ¶nnen Dritte ihren Inhalt nur "
 "schwerlich ausspÃ¤hen."
 
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1546
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1584
 msgid "Encrypted, strong"
 msgstr "Stark verschlÃ¼sselt"
 
@@ -10875,110 +10916,114 @@ msgstr ""
 "Evolution kann diese E-Mail nicht wiedergeben, da sie zu groÃ? ist um sie zu "
 "verarbeiten. Sie kÃ¶nnen Sie unformatiert oder in einem Texteditor betrachten."
 
-#: ../mail/em-format-html-display.c:726
+#: ../mail/em-format-html-display.c:725
 msgid "Completed on"
 msgstr "Abgeschlossen am"
 
-#: ../mail/em-format-html-display.c:734
+#: ../mail/em-format-html-display.c:733
 msgid "Overdue:"
 msgstr "Ã?berfÃ¤llig:"
 
 #. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:738
+#: ../mail/em-format-html-display.c:737
 msgid "by"
 msgstr "am"
 
-#: ../mail/em-format-html-display.c:948 ../mail/em-format-html-display.c:992
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html-display.c:999
 msgid "View _Unformatted"
 msgstr "_Unformatierte ansehen"
 
-#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html-display.c:954
 msgid "Hide _Unformatted"
 msgstr "_Unformatierte verstecken"
 
-#: ../mail/em-format-html-display.c:1012
+#: ../mail/em-format-html-display.c:1019
 msgid "O_pen With"
 msgstr "Ã?_ffnen mit"
 
-#: ../mail/em-format-html-print.c:163
+#: ../mail/em-format-html-print.c:162
 #, c-format
 msgid "Page %d of %d"
 msgstr "Seite %d von %d"
 
-#: ../mail/em-format-html.c:147
+#: ../mail/em-format-html.c:151
 msgid "Formatting message"
 msgstr "Nachricht wird formatiert"
 
-#: ../mail/em-format-html.c:338
+#: ../mail/em-format-html.c:347
 msgid "Formatting Message..."
 msgstr "Nachricht wird formatiert  â?¦"
 
-#: ../mail/em-format-html.c:1380 ../mail/em-format-html.c:1389
+#: ../mail/em-format-html.c:1416 ../mail/em-format-html.c:1425
 #, c-format
-#| msgid "Retrieving `%s'"
 msgid "Retrieving '%s'"
 msgstr "Â»%sÂ« wird abgerufen"
 
-#: ../mail/em-format-html.c:1854
+#: ../mail/em-format-html.c:1896
 msgid "Unknown external-body part."
 msgstr "Unbekannter external-body-Teil."
 
-#: ../mail/em-format-html.c:1862
+#: ../mail/em-format-html.c:1904
 msgid "Malformed external-body part."
 msgstr "Fehlerhaft formatierter external-body-Teil."
 
-#: ../mail/em-format-html.c:1892
+#: ../mail/em-format-html.c:1934
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Zeiger auf FTP-Site (%s)"
 
-#: ../mail/em-format-html.c:1903
+#: ../mail/em-format-html.c:1945
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Zeiger auf lokale Datei (%s) gÃ¼ltig auf Site Â»%sÂ«"
 
-#: ../mail/em-format-html.c:1905
+#: ../mail/em-format-html.c:1947
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Zeiger auf lokale Datei (%s)"
 
-#: ../mail/em-format-html.c:1926
+#: ../mail/em-format-html.c:1968
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Zeiger auf ferne Daten (%s)"
 
-#: ../mail/em-format-html.c:1937
+#: ../mail/em-format-html.c:1979
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Zeiger auf unbekannte externe Daten (Typ Â»%sÂ«)"
 
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
-#: ../mail/em-format-html.c:2600
+#: ../mail/em-format-html.c:2642
 #, c-format
-#| msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgid "This message was sent by %s on behalf of %s"
 msgstr "Diese Nachricht wurde von %s im Namen von %s gesendet"
 
-#: ../mail/em-subscribe-editor.c:583
+#: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
+#: ../mail/em-html-stream.c:122
+#, c-format
+msgid "No HTML stream available"
+msgstr "Kein HTML-Datenstrom verfÃ¼gbar"
+
+#: ../mail/em-subscribe-editor.c:677
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 "Dieser Speicher unterstÃ¼tzt keine Abonnements oder sie sind nicht aktiviert."
 
-#: ../mail/em-subscribe-editor.c:616
+#: ../mail/em-subscribe-editor.c:728
 msgid "Subscribed"
 msgstr "Abonniert"
 
-#: ../mail/em-subscribe-editor.c:620
+#: ../mail/em-subscribe-editor.c:732
 msgid "Folder"
 msgstr "Ordner"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:837
+#: ../mail/em-subscribe-editor.c:1120
 msgid "Please select a server."
 msgstr "Bitte wÃ¤hlen Sie einen Server."
 
-#: ../mail/em-subscribe-editor.c:873
+#: ../mail/em-subscribe-editor.c:1166
 msgid "No server has been selected"
 msgstr "Es wurde kein Server gewÃ¤hlt"
 
@@ -10987,17 +11032,21 @@ msgstr "Es wurde kein Server gewÃ¤hlt"
 #. then write it doubled, like '%%'.
 #: ../mail/em-utils.c:106
 #, c-format
-#| msgid "Are you sure you want to open {0} messages at once?"
 msgid "Are you sure you want to open %d messages at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "Sind Sie sicher, dass Sie %d Nachrichten auf einmal Ã¶ffnen wollen?"
 msgstr[1] "Sind Sie sicher, dass Sie %d Nachrichten auf einmal Ã¶ffnen wollen?"
 
+#: ../mail/em-utils.c:152
+#: ../modules/mailto-handler/evolution-mailto-handler.c:146
+msgid "_Do not show this message again"
+msgstr "Diese _Meldung nicht mehr anzeigen"
+
 #: ../mail/em-utils.c:314
 msgid "Message Filters"
 msgstr "Nachrichtenfilter"
 
-#: ../mail/em-utils.c:853
+#: ../mail/em-utils.c:848
 #, c-format
 msgid "Messages from %s"
 msgstr "Nachrichten von %s"
@@ -11006,7 +11055,7 @@ msgstr "Nachrichten von %s"
 msgid "Search _Folders"
 msgstr "Such_ordner"
 
-#: ../mail/em-vfolder-rule.c:521
+#: ../mail/em-vfolder-rule.c:525
 msgid "Add Folder"
 msgstr "Ordner hinzufÃ¼gen"
 
@@ -11324,14 +11373,22 @@ msgstr ""
 "Â»message_text_part_limitÂ« angegebene GrÃ¶Ã?e nicht Ã¼bersteigen."
 
 #: ../mail/evolution-mail.schemas.in.h:65
+msgid "Enable to use a similar message list view settings for all folders"
+msgstr "Ã?hnliche Ansichten der Nachrichtenliste fÃ¼r alle Ordner aktivieren"
+
+#: ../mail/evolution-mail.schemas.in.h:66
+msgid "Enable to use a similar message list view settings for all folders."
+msgstr "Ã?hnliche Ansichten der Nachrichtenliste fÃ¼r alle Ordner aktivieren."
+
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Enable/disable caret mode"
 msgstr "Eingabezeiger aktivieren/deaktivieren"
 
-#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:46
+#: ../mail/evolution-mail.schemas.in.h:68 ../mail/mail-config.ui.h:48
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Dateinamen wie Outlook und GMail kodieren"
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
 "Encode file names in the mail headers same as Outlook or GMail do, to let "
 "them display correctly file names with UTF-8 letters sent by Evolution, "
@@ -11343,19 +11400,27 @@ msgstr ""
 "darstellen. Beide ignorieren den Standard RFC 2231 und benutzen den "
 "inkorrekten Standard RFC 2047."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:70
+msgid "Flush Outbox after filtering"
+msgstr "Nachrichtenausgang nach dem Filtern leeren"
+
+#: ../mail/evolution-mail.schemas.in.h:71
+msgid "Group Reply replies to list"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Height of the message-list pane"
 msgstr "HÃ¶he des Nachrichtenlistenfelds"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Height of the message-list pane."
 msgstr "HÃ¶he des Nachrichtenlistenfelds."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Deaktiviert das Vorschaufenster und entfernt die Auswahl"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if they "
 "really want to do it."
@@ -11365,7 +11430,7 @@ msgstr ""
 
 # CHECK - etwas holprig
 # IMMER NOCH CHECK - aber schon etwas weniger holprig
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
@@ -11375,7 +11440,11 @@ msgstr ""
 "dieser Liste vorhandenen MIME-Typ gibt, so wird der Inhalt mit einem in der "
 "GNOME-MIME-Datenbank verknÃ¼pften Bonobo-Komponentenbetrachter angezeigt."
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:77
+msgid "Ignore list Reply-To:"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid ""
 "Initial height of the \"Filter Editor\" window. The value updates as the user "
 "resizes the window vertically."
@@ -11383,7 +11452,7 @@ msgstr ""
 "Legt fest, wie hoch das Fenster Â»FiltereditorÂ« anfÃ¤nglich ist. Der Wert Ã¤ndert "
 "sich, wenn der Benutzer das Fenster vertikal vergrÃ¶Ã?ert."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid ""
 "Initial height of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window vertically."
@@ -11391,7 +11460,7 @@ msgstr ""
 "Legt fest, wie hoch das Fenster Â»Editor fÃ¼r SuchordnerÂ« ist. Der Wert Ã¤ndert "
 "sich, wenn der Benutzer das Fenster vertikal vergrÃ¶Ã?ert."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -11399,7 +11468,7 @@ msgstr ""
 "Legt fest, wie hoch das Fenster Â»E-Mails verschicken und abrufenÂ« ist. Der "
 "Wert Ã¤ndert sich, wenn der Benutzer das Fenster vertikal vergrÃ¶Ã?ert."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
 "Initial maximize state of the \"Filter Editor\" window. The value updates "
 "when the user maximizes or unmaximizes the window. Note, this particular "
@@ -11412,7 +11481,7 @@ msgstr ""
 "nicht maximiert werden kann. Dieser SchlÃ¼ssel existiert nur als "
 "Implementierungsdetail."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid ""
 "Initial maximize state of the \"Search Folder Editor\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11425,7 +11494,7 @@ msgstr ""
 "nicht maximiert werden kann. Dieser SchlÃ¼ssel existiert nur als "
 "Implementierungsdetail."
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11438,7 +11507,7 @@ msgstr ""
 "verwendet, da das Fenster nicht maximiert werden kann. Dieser SchlÃ¼ssel "
 "existiert nur als Implementierungsdetail."
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid ""
 "Initial width of the \"Filter Editor\" window. The value updates as the user "
 "resizes the window horizontally."
@@ -11446,7 +11515,7 @@ msgstr ""
 "Legt fest, wie breit des Fenster Â»FiltereditorÂ« anfÃ¤nglich ist. Der Wert "
 "Ã¤ndert sich, wenn der Benutzer das Fenster horizontal vergrÃ¶Ã?ert."
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -11454,7 +11523,7 @@ msgstr ""
 "Legt fest, wie breit des Fenster Â»Editor fÃ¼r SuchordnerÂ« ist. Der Wert Ã¤ndert "
 "sich, wenn der Benutzer das Fenster horizontal vergrÃ¶Ã?ert."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -11462,7 +11531,15 @@ msgstr ""
 "Legt fest, wie breit des Fenster Â»E-Mails verschicken und empfangenÂ« ist. Der "
 "Wert Ã¤ndert sich, wenn der Benutzer das Fenster horizontal vergrÃ¶Ã?ert."
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:87
+msgid ""
+"Instead of the normal \"Reply to All\" behaviour, this option will make the "
+"'Group Reply' toolbar button try to reply only to the mailing list through "
+"which you happened to receive the copy of the message to which you're "
+"replying."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:88
 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 "
@@ -11472,40 +11549,62 @@ msgstr ""
 "Nachricht in einem Suchordner die Nachricht wirklich lÃ¶scht und nicht nur aus "
 "den Suchergebnissen entfernt."
 
-#: ../mail/evolution-mail.schemas.in.h:83
-#| msgid "Last time empty junk was run"
+#: ../mail/evolution-mail.schemas.in.h:89
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"private reply to a message which arrived via a mailing list."
+msgstr ""
+"Legt fest, ob der Benutzer wiederholt gewarnt werden soll, dass er eine "
+"private Antwort auf eine Nachricht versendet, die Ã¼ber eine Mailingliste "
+"eingegangen ist."
+
+#: ../mail/evolution-mail.schemas.in.h:90
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a reply "
+"to many people."
+msgstr ""
+"Legt fest, ob der Benutzer wiederholt gewarnt werden soll, dass er eine "
+"Anwort an viele Personen versendet."
+
+#: ../mail/evolution-mail.schemas.in.h:91
+msgid ""
+"It disables/enables the repeated prompts to warn that you are trying sending "
+"a private reply to a message which arrived via a mailing list, but the list "
+"sets a Reply-To: header which redirects your reply back to the list"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Last time Empty Junk was run"
 msgstr "Letzte Leerung des UnerwÃ¼nscht-Ordners"
 
-#: ../mail/evolution-mail.schemas.in.h:84
-#| msgid "Last time empty trash was run"
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Last time Empty Trash was run"
 msgstr "Letzte MÃ¼llleerung"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Layout style"
 msgstr "Anordnung"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "List of Labels and their associated colors"
 msgstr "Liste mit Beschriftungen und damit assoziierter Farben"
 
 # CHECK
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr ""
 "Liste der MIME-Typen, die auf Bonobo-Komponentenbetrachter hin Ã¼berprÃ¼ft "
 "werden sollen"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "List of accepted licenses"
 msgstr "Liste akzeptierter Lizenzen"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "List of accounts"
 msgstr "Kontenliste"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -11514,18 +11613,18 @@ msgstr ""
 "enthÃ¤lt Zeichenketten, die Unterordner relativ zu Â»/appsÂ«/evolution/mail/"
 "accountsÂ« angeben."
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 "Liste der benutzerdefinierten Kopfzeilen und ihres Aktivierungszustands."
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "List of dictionary language codes used for spell checking."
 msgstr ""
 "Liste der Sprach-Codes der WÃ¶rterbÃ¼cher, die fÃ¼r die RechtschreibprÃ¼fung "
 "verwendet werden."
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:103
 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."
@@ -11534,15 +11633,15 @@ msgstr ""
 "Liste enthÃ¤lt Zeichenketten der Form Name:Farbe, wobei die Farbe als HTML-"
 "Hextriplet anzugeben ist."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "List of protocol names whose license has been accepted."
 msgstr "Liste der Protokollnamen, deren Lizenzen akzeptiert wurden."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Load images for HTML messages over HTTP"
 msgstr "Bilder fÃ¼r HTML-Nachrichten per HTTP laden"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:106
 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. "
@@ -11552,120 +11651,136 @@ msgstr ""
 "Niemals Bilder aus dem Netz laden, Â»1Â« - Bilder laden falls Absender im "
 "Adressbuch, Â»2Â« - Immer Bilder aus dem Netz laden."
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Log filter actions"
 msgstr "Filteraktionen protokollieren"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Log filter actions to the specified log file."
 msgstr "Filteraktionen in der angegebenen Protokolldatei protokollieren."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Logfile to log filter actions"
 msgstr "Protokolldatei fÃ¼r Filteraktionen"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Logfile to log filter actions."
 msgstr "Protokolldatei fÃ¼r Filteraktionen."
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Mail browser height"
 msgstr "HÃ¶he des Nachrichtenbrowsers"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Mail browser maximized"
 msgstr "Nachrichtenbrowser ist maximiert"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Mail browser width"
 msgstr "Breite des Nachrichtenbrowsers"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Mark as Seen after specified timeout"
 msgstr "Nach angegebenem Intervall als gelesen markieren"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Mark as Seen after specified timeout."
 msgstr "Nach angegebenem Intervall als gelesen markieren."
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Mark citations in the message \"Preview\""
 msgstr "Zitate in der Nachrichtenvorschau kennzeichnen"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Zitate in der Nachrichtenvorschau kennzeichnen."
 
-#: ../mail/evolution-mail.schemas.in.h:109
-#| msgid "Message Display"
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Message text limit for display"
 msgstr "Anzeigebegrenzung des Nachrichtentexts"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Stil der Nachrichtenanzeige. ZulÃ¤ssige Werte: Â»normalÂ« (normal), Â»full "
 "headersÂ« (alle Kopfzeilen), Â»sourceÂ« (Quelltext)"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Minimum days between emptying the junk on exit"
 msgstr ""
 "Minimale Anzahl der Tage zwischen dem Leeren des UnerwÃ¼nscht-Ordners beim "
 "Beenden"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Minimale Anzahl der Tage zwischen dem Leeren des MÃ¼lls beim Beenden"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:122
 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."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Minimale Anzahl der Tage zwischen dem Leeren des MÃ¼lls beim Beenden."
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr ""
 "Anzahl der Adressen, die in den EmpfÃ¤ngerfeldern (An/Kopie/Blindkopie"
 "( angezeigt werden"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Prompt on empty subject"
 msgstr "Bei leerem Betreff nachfragen"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:126
 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."
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:127
 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."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Prompt when deleting messages in search folder"
 msgstr "Nachfrage beim LÃ¶schen von Nachrichten in Suchordner"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:129
+#, fuzzy
+msgid "Prompt when mailing list hijacks private replies"
+msgstr "Anzeigen wenn mehrere Nachrichten markiert werden"
+
+#: ../mail/evolution-mail.schemas.in.h:130
+#, fuzzy
+msgid "Prompt when replying privately to list messages"
+msgstr "Anzeigen wenn mehrere Nachrichten markiert werden"
+
+#: ../mail/evolution-mail.schemas.in.h:131
+#, fuzzy
+msgid "Prompt when replying to many recipients"
+msgstr ""
+"Beim Abschicken von Nachrichten mit ausschlieÃ?lich _Blindkopie-EmpfÃ¤ngern "
+"nachfragen"
+
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Prompt when user expunges"
 msgstr "Beim SÃ¤ubern nachfragen"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Prompt when user only fills Bcc"
 msgstr "RÃ¼ckfragen, falls der Benutzer nur das Blindkopie-Feld ausfÃ¼llt"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:134
 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"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -11673,64 +11788,64 @@ msgstr ""
 "Beim Verschicken von HTML-Nachrichten an Kontakte, die keine wollen, "
 "nachfragen."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:136
 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."
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 "RÃ¼ckfragen, falls der Benutzer versucht, nicht erwÃ¼nschtes HTML zu verschicken"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "Prompt while marking multiple messages"
 msgstr "Anzeigen wenn mehrere Nachrichten markiert werden"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Put personalized signatures at the top of replies"
 msgstr "Beim Antworten eigene Signaturen an den Anfang stellen"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Put the cursor at the bottom of replies"
 msgstr "Beim Antworten auf Mails unten mit dem Schreiben beginnen"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Emoticons im Text erkennen und durch Bilder ersetzen."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Recognize links in text and replace them."
 msgstr "Links im Text erkennen und ersetzen."
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Run junk test on incoming mail."
 msgstr "UnerwÃ¼nscht-Test auf eingehende E-Mails anwenden."
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Save directory"
 msgstr "Ordner speichern"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Search for the sender photo in local address books"
 msgstr "In den lokalen AdressbÃ¼chern nach dem Foto des Absenders suchen"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Send HTML mail by default"
 msgstr "Per Vorgabe HTML-E-Mails verschicken?"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Send HTML mail by default."
 msgstr "Per Vorgabe HTML-E-Mails verschicken?"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Sender email-address column in the message list"
 msgstr "Spalte mit der E-Mail-Adresse des Absenders in der Nachrichtenliste"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Server synchronization interval"
 msgstr "Intervall fÃ¼r Datenabgleich mit Servern"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
@@ -11738,69 +11853,65 @@ msgstr ""
 "Setzen Sie dies auf Â»wahrÂ«, wenn Sie kein beim Verfassen von Nachrichten kein "
 "Signaturtrennzeichen vor Ihre Signatur setzen wollen."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Das Feld Â»Blindkopie anÂ« beim Verfassen einer Nachricht anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "Das Feld Â»Kopie anÂ« beim Verfassen einer Nachricht anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "Das Feld Â»VonÂ« beim Verfassen einer Nachricht an eine Newsgroup anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:142
-msgid "Show \"From\" field when sending a mail message"
-msgstr "Das Feld Â»VonÂ« beim Verfassen einer Nachricht anzeigen"
-
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr ""
 "Das Feld Â»Antwort anÂ« beim Verfassen einer Nachricht an eine Newsgroup anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Das Feld Â»Antwort anÂ« beim Verfassen einer Nachricht anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Show Animations"
 msgstr "Animationen anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Show all message headers"
 msgstr "Alle NachrichtenkÃ¶pfe anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Show all the headers when viewing a messages."
 msgstr "Beim Anzeigen von Nachrichten alle NachrichtenkÃ¶pfe anzeigen."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Show animated images as animations."
 msgstr "Animierte Bilder als Animationen anzeigen."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 "GelÃ¶schte Nachrichten (durchgestrichen) in der Nachrichtenliste anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Show deleted messages in the message-list"
 msgstr "GelÃ¶schte Nachrichten in der Nachrichtenliste anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Show image animations"
 msgstr "Bildanimationen anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Show original \"Date\" header value."
 msgstr "Den originalen Wert der Kopfzeile Â»DatumÂ« anzeigen."
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Show photo of the sender"
 msgstr "Foto des Absenders anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11808,7 +11919,7 @@ msgstr ""
 "Das Feld Â»Blindkopie anÂ« beim Verfassen einer Nachricht anzeigen. Die "
 "Einstellung kann im MenÃ¼ Â»AnsichtÂ« beim Verfassen angepasst werden."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11816,7 +11927,7 @@ msgstr ""
 "Das Feld Â»Kopie anÂ« beim Verfassen einer Nachricht anzeigen. Die Einstellung "
 "kann im MenÃ¼ Â»AnsichtÂ« beim Verfassen angepasst werden."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -11824,15 +11935,7 @@ msgstr ""
 "Das Feld Â»VonÂ« beim Verfassen einer Nachricht an eine Newsgroup anzeigen. Die "
 "Einstellung kann im MenÃ¼ Â»AnsichtÂ« beim Verfassen angepasst werden."
 
-#: ../mail/evolution-mail.schemas.in.h:157
-msgid ""
-"Show the \"From\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
-msgstr ""
-"Das Feld Â»VonÂ« beim Verfassen einer Nachricht anzeigen. Die Einstellung kann "
-"im MenÃ¼ Â»AnsichtÂ« beim Verfassen angepasst werden."
-
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -11841,7 +11944,7 @@ msgstr ""
 "anzeigen. Die Einstellung kann im MenÃ¼ Â»AnsichtÂ« beim Verfassen angepasst "
 "werden."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -11849,14 +11952,14 @@ msgstr ""
 "Das Feld Â»Antwort anÂ« beim Verfassen einer Nachricht anzeigen. Die Einstellung "
 "kann im MenÃ¼ Â»AnsichtÂ« beim Verfassen angepasst werden."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid ""
 "Show the email-address of the sender in a separate column in the message list."
 msgstr ""
 "Zeigt die E-Mail-Adresse des Absenders in einer eigenen Spalte in der "
 "Nachrichtenliste an."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:171
 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 "
@@ -11867,53 +11970,62 @@ msgstr ""
 "Kopfzeile Â»DatumÂ« in einem benutzerdefinierten Format und der lokalen Zeitzone "
 "dargestellt."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Fotos des Absenders in der Nachrichtenvorschau anzeigen."
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:173
+msgid ""
+"Some mailing lists set a Reply-To: header to trick users into sending replies "
+"to the list, even when they ask Evolution to make a private reply. Setting "
+"this option to TRUE will attempt to ignore such Reply-To: headers, so that "
+"Evolution will do as you ask it. If you use the private reply action, it will "
+"reply privately, while if you use the 'Reply to List' action it will do that. "
+"It works by comparing the Reply-To: header with a List-Post: header, if there "
+"is one."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Spell check inline"
 msgstr "RechtschreibprÃ¼fung an Ort und Stelle"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Spell checking color"
 msgstr "Farbe fÃ¼r RechtschreibprÃ¼fung"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Spell checking languages"
 msgstr "Sprachen fÃ¼r RechtschreibprÃ¼fung"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Subscribe dialog default height"
 msgstr "Voreingestellte HÃ¶he des Abonnementdialogs"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Subscribe dialog default width"
 msgstr "Voreingestellte Breite des Abonnementdialogs"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Terminal font"
 msgstr "Terminal-Schrift"
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "The default plugin for Junk hook"
 msgstr "Vorgabe-Plugin fÃ¼r die UnerwÃ¼nscht-Erkennung"
 
-#: ../mail/evolution-mail.schemas.in.h:170
-#| msgid "The last time empty junk was run, in days since the epoch."
+#: ../mail/evolution-mail.schemas.in.h:181
 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."
 
-#: ../mail/evolution-mail.schemas.in.h:171
-#| msgid "The last time empty trash was run, in days since the epoch."
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Die Zeit seit der letzten MÃ¼llleerung in Tagen seit dem 01.01.1970."
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:183
 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 "
@@ -11925,15 +12037,15 @@ msgstr ""
 "Vorschauleiste unter die Nachrichtenliste. Â»1Â« (vertikale Ansicht) setzt die "
 "Vorschauleiste neben die Nachrichtenliste. "
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid "The terminal font for mail display."
 msgstr "Die zum Anzeigen von E-Mails verwendete Terminal-Schrift."
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "The variable width font for mail display."
 msgstr "Die zum Anzeigen von E-Mails verwendete Schrift variabler Breite."
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. \"2"
 "\" for debug messages."
@@ -11941,10 +12053,7 @@ msgstr ""
 "Hier sind drei verschiedene Werte mÃ¶glich: Â»0Â« fÃ¼r Fehler, Â»1Â« fÃ¼r Warnungen, "
 "Â»2Â« fÃ¼r Diagnosemeldungen."
 
-#: ../mail/evolution-mail.schemas.in.h:176
-#| msgid ""
-#| "This decides the max size of the text part that can be formatted under "
-#| "Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid ""
 "This decides the max size of the message text that will be displayed under "
 "Evolution, specified in terms of KB. The default is 4096 (4MB). This value is "
@@ -11954,7 +12063,7 @@ msgstr ""
 "wird, angegeben in kB. Die Vorgabe sind 4MB/4096kB. Dieser Wert wird nur dann "
 "verwendet, wenn der SchlÃ¼ssel Â»force_message_limitÂ« aktiviert ist."
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back to "
@@ -11964,7 +12073,7 @@ msgstr ""
 "sind. Falls das als Vorgabe aufgelistete Plugin deaktiviert ist, so wird "
 "nicht auf eines der anderen Plugins zurÃ¼ckgegriffen."
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:189
 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."
@@ -11975,7 +12084,7 @@ msgstr ""
 "Nachrichtenliste gesetzt."
 
 # CHECK
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:190
 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;"
@@ -11987,7 +12096,7 @@ msgstr ""
 "Das XML-Strukturformat ist &lt;Kopfzeile aktiviert&gt; - setzen Sie "
 "aktiviert, falls die Kopfzeile in der E-Mail-Ansicht angezeigt werden soll."
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid ""
 "This option is related to the key lookup_addressbook and is used to determine "
 "whether to look up addresses in local address book only to exclude mail sent "
@@ -11997,11 +12106,11 @@ msgstr ""
 "fest, ob Adressen im lokalen Adressbuch gesucht werden um sicherzustellen, "
 "dass E-Mails von Bekannten nicht als unerwÃ¼nscht markiert werden."
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:192
 msgid "This option would help in improving the speed of fetching."
 msgstr "Beschleunigt das Abrufen."
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -12009,7 +12118,7 @@ msgstr ""
 "Dies setzt die Anzahl der Adressen, die in der Standardansicht angezeigt "
 "werden, bevor Â»â?¦Â« angezeigt wird."
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid ""
 "This setting specifies whether the threads should be in expanded or collapsed "
 "state by default. Evolution requires a restart."
@@ -12018,7 +12127,7 @@ msgstr ""
 "werden sollen. Evolution muss nach Ã?ndern dieses Wertes hierfÃ¼r neu gestartet "
 "werden."
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:195
 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 "
@@ -12028,51 +12137,51 @@ msgstr ""
 "werden sollen anstatt nach dem Datum der Nachricht. Evolution muss nach "
 "Ã?ndern dieses Wertes hierfÃ¼r neu gestartet werden."
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:196
 msgid "Thread the message-list based on Subject"
 msgstr "Die Nachrichtenliste themenbasiert nach Threads sortieren"
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid "Timeout for marking message as seen"
 msgstr "Intervall zum Markieren von Nachrichten als gelesen"
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "Timeout for marking message as seen."
 msgstr "Intervall zum Markieren von Nachrichten als gelesen."
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid "UID string of the default account."
 msgstr "UID-Zeichenkette fÃ¼r das Vorgabekonto."
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "Farbe fÃ¼r falsch geschriebene WÃ¶rter wÃ¤hrend der Eingabe"
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid "Use SpamAssassin daemon and client"
 msgstr "SpamAssassin-Daemon und -Client verwenden"
 
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "SpamAssassin-Daemon und -Client verwenden (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid "Use custom fonts"
 msgstr "Benutzerdefinierte Schriften verwenden"
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid "Use custom fonts for displaying mail."
 msgstr "Benutzerdefinierte Schriften zum Anzeigen von E-Mails verwenden."
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid "Use only local spam tests."
 msgstr "AusschlieÃ?lich lokale Spam-Tests verwenden."
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid "Use only the local spam tests (no DNS)."
 msgstr "AusschlieÃ?lich lokale Spam-Tests verwenden (kein DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:207
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
@@ -12082,7 +12191,7 @@ msgstr ""
 "platziert werden soll. Dies legt fest, ob die Marke zu Beginn oder am Ende "
 "der Nachricht platziert wird."
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:208
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
@@ -12092,23 +12201,23 @@ msgstr ""
 "werden soll. Dies legt fest, ob die Signatur zu Beginn oder am Ende der "
 "Nachricht platziert wird."
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:209
 msgid "Variable width font"
 msgstr "Schrift variabler Breite"
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:210
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr ""
 "Legt fest, ob die Anforderung einer LesebestÃ¤tigung standardmÃ¤Ã?ig zu jeder "
 "Nachricht hinzugefÃ¼gt wird."
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:211
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr ""
 "Legt fest, ob zu lange Ordnernamen in der Seitenleiste abgekÃ¼rzt werden."
 
 # CHECK - etwas schluderig, kommt aber hoffentlich hin.
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:212
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do not "
 "contain In-Reply-To or References headers."
@@ -12116,15 +12225,25 @@ msgstr ""
 "Auf Betreffbasis auf die Thread-Ordnung zurÃ¼ckgreifen, falls die Kopfzeilen "
 "einer Nachricht auf keine Referenznachricht verweisen."
 
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:213
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Threads nach der letzten Nachricht im jeweiligen Thread sortieren"
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:214
+msgid ""
+"Whether to flush Outbox after filtering is done. Outbox flush will happen "
+"only when there was used any 'Forward to' filter action and approximately one "
+"minute after the last action invocation."
+msgstr ""
+"Legt fest. ob der Nachrichtenausgang nach dem Filtern geleert werden soll. "
+"Das geschieht nur, wenn ein Â»Weiterleiten anÂ«-Filtervorgang angewendet wurde, "
+"etwa eine Minute nach der letzten Aktion."
+
+#: ../mail/evolution-mail.schemas.in.h:215
 msgid "Width of the message-list pane"
 msgstr "Breite der Nachrichtenliste"
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:216
 msgid "Width of the message-list pane."
 msgstr "Breite der Nachrichtenliste."
 
@@ -12132,41 +12251,54 @@ msgstr "Breite der Nachrichtenliste."
 msgid "Importing Elm data"
 msgstr "Elm-Daten werden importiert"
 
-#: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:372
+#: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:400
 #: ../modules/mail/e-mail-shell-view.c:952
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
 #: ../widgets/misc/e-send-options.c:499
 msgid "Mail"
 msgstr "E-Mail"
 
-#: ../mail/importers/elm-importer.c:365
+#: ../mail/importers/elm-importer.c:366
 msgid "Evolution Elm importer"
 msgstr "Evolution-Elm-Importeur"
 
-#: ../mail/importers/elm-importer.c:366
+#: ../mail/importers/elm-importer.c:367
 msgid "Import mail from Elm."
 msgstr "E-Mail von Elm importieren."
 
-#: ../mail/importers/evolution-mbox-importer.c:114
-#| msgid "Destination folder:"
+#: ../mail/importers/evolution-mbox-importer.c:116
+#: ../plugins/dbx-import/dbx-importer.c:226
 msgid "_Destination folder:"
 msgstr "Zielor_dner:"
 
-#: ../mail/importers/evolution-mbox-importer.c:120
-#: ../plugins/pst-import/pst-importer.c:301
+#: ../mail/importers/evolution-mbox-importer.c:122
+#: ../plugins/dbx-import/dbx-importer.c:232
+#: ../plugins/pst-import/pst-importer.c:300
 msgid "Select folder"
 msgstr "Ordner wÃ¤hlen"
 
-#: ../mail/importers/evolution-mbox-importer.c:120
-#: ../plugins/pst-import/pst-importer.c:301
+#: ../mail/importers/evolution-mbox-importer.c:122
+#: ../plugins/pst-import/pst-importer.c:300
 msgid "Select folder to import into"
 msgstr "WÃ¤hlen Sie den Ordner, in den importiert werden soll"
 
-#: ../mail/importers/evolution-mbox-importer.c:262 ../shell/e-shell-utils.c:251
+#. Translators: Column header for a message subject
+#: ../mail/importers/evolution-mbox-importer.c:372
+msgctxt "mboxImp"
+msgid "Subject"
+msgstr "Betreff"
+
+#. Translators: Column header for a message From address
+#: ../mail/importers/evolution-mbox-importer.c:376
+msgctxt "mboxImp"
+msgid "From"
+msgstr "Von"
+
+#: ../mail/importers/evolution-mbox-importer.c:412 ../shell/e-shell-utils.c:251
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:263
+#: ../mail/importers/evolution-mbox-importer.c:413
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importeur fÃ¼r Ordner im Berkeley-Mailbox-Format"
 
@@ -12175,33 +12307,33 @@ msgid "Importing mailbox"
 msgstr "E-Mail-Postfach wird importiert"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:149
-#: ../plugins/pst-import/pst-importer.c:453
-#: ../plugins/pst-import/pst-importer.c:559
+#: ../mail/importers/mail-importer.c:150
+#: ../plugins/dbx-import/dbx-importer.c:554
+#: ../plugins/pst-import/pst-importer.c:452
+#: ../plugins/pst-import/pst-importer.c:558
 #, c-format
-#| msgid "Importing `%s'"
 msgid "Importing '%s'"
 msgstr "Â»%sÂ« wird importiert"
 
-#: ../mail/importers/mail-importer.c:293
+#: ../mail/importers/mail-importer.c:295
 #, c-format
 msgid "Scanning %s"
 msgstr "%s wird eingelesen"
 
-#: ../mail/importers/pine-importer.c:219
+#: ../mail/importers/pine-importer.c:221
 msgid "Importing Pine data"
 msgstr "Pine-Daten werden importiert"
 
-#: ../mail/importers/pine-importer.c:377
+#: ../mail/importers/pine-importer.c:405
 #: ../modules/addressbook/addressbook-config.c:1006
 msgid "Address Book"
 msgstr "Adressbuch"
 
-#: ../mail/importers/pine-importer.c:418
+#: ../mail/importers/pine-importer.c:447
 msgid "Evolution Pine importer"
 msgstr "Evolution-Pine-Importeur"
 
-#: ../mail/importers/pine-importer.c:419
+#: ../mail/importers/pine-importer.c:448
 msgid "Import mail from Pine."
 msgstr "E-Mail von Pine importieren."
 
@@ -12298,214 +12430,224 @@ msgstr ""
 msgid "Always request rea_d receipt"
 msgstr "_LesebestÃ¤tigung immer anfordern"
 
-#: ../mail/mail-config.ui.h:15 ../modules/addressbook/addressbook-config.c:1013
+#: ../mail/mail-config.ui.h:14
+msgid "Apply the same _view settings to all folders"
+msgstr "Ansichts_einstellungen auf alle Ordner anwenden"
+
+#: ../mail/mail-config.ui.h:16 ../modules/addressbook/addressbook-config.c:1013
 msgid "Authentication"
 msgstr "Legitimation"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:17
 msgid "Automatically insert _emoticon images"
 msgstr "_Emoticon-Bilder automatisch einfÃ¼gen"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:18
 msgid "C_haracter set:"
 msgstr "_Zeichensatz:"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:19
 msgid "Ch_eck for Supported Types"
 msgstr "_PrÃ¼fen, welche Arten unterstÃ¼tzt werden"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:20
 msgid "Check cu_stom headers for junk"
 msgstr "_Benutzerdefinierte Kopfzeilen auf UnerwÃ¼nschtheit prÃ¼fen"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:21
 msgid "Check incoming _messages for junk"
 msgstr "_Eingehende E-Mail auf UnerwÃ¼nschtheit prÃ¼fen"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:22
 msgid "Check spelling while I _type"
 msgstr "RechtschreibprÃ¼fung wÃ¤hrend der Ein_gabe durchfÃ¼hren"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:23
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Ã?berprÃ¼ft, ob eingehende Nachrichten unerwÃ¼nscht sind"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:24
 msgid "Cle_ar"
 msgstr "En_tfernen"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:25
 msgid "Clea_r"
 msgstr "Ent_fernen"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:26
 msgid "Color for _misspelled words:"
 msgstr "_Farbe fÃ¼r falsch geschriebene WÃ¶rter:"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:27
 msgid "Composing Messages"
 msgstr "Verfassen von Nachrichten"
 
-#: ../mail/mail-config.ui.h:27 ../plugins/plugin-manager/plugin-manager.c:146
+#: ../mail/mail-config.ui.h:28 ../plugins/plugin-manager/plugin-manager.c:146
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:29
 msgid "Confirm _when expunging a folder"
 msgstr "Beim _SÃ¤ubern eines Ordners nachfragen"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:32
 msgid "Default Behavior"
 msgstr "Vorgabeverhalten"
 
-#: ../mail/mail-config.ui.h:31
+#: ../mail/mail-config.ui.h:33
 msgid "Default character e_ncoding:"
 msgstr "Voreingestellte _Zeichenkodierung:"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:35
 msgid "Delete Mail"
 msgstr "Nachricht lÃ¶schen"
 
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:36
 msgid "Delete junk messages on e_xit"
 msgstr "UnerwÃ¼nscht-Ordner beim Beenden lee_ren"
 
-#: ../mail/mail-config.ui.h:36
+#: ../mail/mail-config.ui.h:38
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Ausgehende Nachrichten (per Vorgabe) digital _signieren"
 
-#: ../mail/mail-config.ui.h:37
-#| msgid "Displayed Message _Headers"
+#: ../mail/mail-config.ui.h:39
 msgid "Displayed Message Headers"
 msgstr "Angezeigte NachrichtenkÃ¶pfe"
 
-#: ../mail/mail-config.ui.h:38
-#| msgid "Do not format messages when text si_ze exceeds"
+#: ../mail/mail-config.ui.h:40
 msgid "Do not display messages when text si_ze exceeds"
 msgstr "Nachrichten nicht anzeigen, wenn Text _grÃ¶Ã?er als"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:41
 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:40
+#: ../mail/mail-config.ui.h:42
 msgid "Do not quote"
 msgstr "Nicht zitieren"
 
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:43
 msgid "Drafts _Folder:"
 msgstr "_Entwurfsordner:"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:44
 msgid "Email _Address:"
 msgstr "_E-Mail-Adresse:"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:45
 msgid "Empty trash folders on e_xit"
 msgstr "MÃ¼llordner beim Beenden _leeren"
 
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:46
 msgid "Enable Magic S_pacebar"
 msgstr "Magische _Leertaste einschalten"
 
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:47
 msgid "Enable Sea_rch Folders"
 msgstr "Such_ordner aktivieren"
 
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:49
 msgid "Encry_ption certificate:"
 msgstr "_VerschlÃ¼sselungszertifikat:"
 
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:50
 msgid "Encrypt out_going messages (by default)"
 msgstr "Ausgehende Nachrichten _verschlÃ¼sseln (per Vorgabe)"
 
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:51
 msgid "Fi_xed-width:"
 msgstr "_Dicktengleich:"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:52
 msgid "Fix_ed width Font:"
 msgstr "_Dicktengleiche Schrift:"
 
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:53
 msgid "Font Properties"
 msgstr "Schrifteigenschaften"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:54
 msgid "Format messages in _HTML"
 msgstr "Nachrichten in _HTML formatieren"
 
-#: ../mail/mail-config.ui.h:53
+#: ../mail/mail-config.ui.h:55
 msgid "Full Nam_e:"
 msgstr "_Voller Name:"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:57
+msgid "Group Reply goes only to mailing list, if possible"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:58
 msgid "HTML Messages"
 msgstr "HTML-Nachrichten"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:59
 msgid "H_TTP Proxy:"
 msgstr "H_TTP-Proxy:"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:60
 msgid "Headers"
 msgstr "Kopfzeilen"
 
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:61
 msgid "Highlight _quotations with"
 msgstr "Zitate _hervorheben mit"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:63
+msgid "Ignore Reply-To: for mailing lists"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:64
 msgid "Inline"
 msgstr "Eingebettet"
 
-#: ../mail/mail-config.ui.h:61
+#: ../mail/mail-config.ui.h:65
 msgid "Inline (Outlook style)"
 msgstr "Eingebettet (Outlook-Stil)"
 
-#: ../mail/mail-config.ui.h:63
+#: ../mail/mail-config.ui.h:67
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.ui.h:64 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:68 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Beschriftungen"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:69
 msgid "Languages Table"
 msgstr "Sprachtabelle"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:70
 msgid "Loading Images"
 msgstr "Bilder werden geladen"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:71
 msgid "Mail Headers Table"
 msgstr "E-Mail-Kopf-Tabelle"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:72
 msgid "Mailbox location"
 msgstr "Ort des Postfachs"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:73
 msgid "Message Display"
 msgstr "Nachrichtenanzeige"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:74
 msgid "Message Fonts"
 msgstr "Nachrichtenschriften"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:75
 msgid "Message Receipts"
 msgstr "LesebestÃ¤tigungen"
 
-#: ../mail/mail-config.ui.h:72
+#: ../mail/mail-config.ui.h:76
 msgid "No _Proxy for:"
 msgstr "Kein _Proxy fÃ¼r:"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:78
 msgid ""
 "Note: you will not be prompted for a password until you connect for the first "
 "time"
@@ -12513,176 +12655,224 @@ msgstr ""
 "Hinweis: Sie werden erst nach dem Passwort gefragt, wenn Sie das erste Mal "
 "eine Verbindung mit dem Server aufbauen"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:79
 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:76
+#: ../mail/mail-config.ui.h:80
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "ZusÃ¤tzliche Informationen"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:82
 msgid "Or_ganization:"
 msgstr "_Organisation:"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-_SchlÃ¼sselkennung:"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:84
 msgid "Pass_word:"
 msgstr "_Passwort:"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:86
 msgid "Port:"
 msgstr "Port:"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:87
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Beim Abschicken von Nachrichten mit ausschlieÃ?lich _Blindkopie-EmpfÃ¤ngern "
 "nachfragen"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:88
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:90
 msgid "Printed Fonts"
 msgstr "Gedruckte Schriften"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:91
+msgid "Prompt when mailing list redirects private reply back to list"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:92
+#, fuzzy
+msgid "Prompt when sending private replies to mailing _list messages"
+msgstr "Anzeigen wenn mehrere Nachrichten markiert werden"
+
+#: ../mail/mail-config.ui.h:93
+#, fuzzy
+msgid "Prompt when sending replies to _many recipients"
+msgstr ""
+"Beim Abschicken von Nachrichten mit ausschlieÃ?lich _Blindkopie-EmpfÃ¤ngern "
+"nachfragen"
+
+#: ../mail/mail-config.ui.h:94
 msgid "Proxy Settings"
 msgstr "Proxy-Einstellungen"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:95
 msgid "Quoted"
 msgstr "Zitiert"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:96
 msgid "Re_member password"
 msgstr "An Passwort _erinnern"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:97
 msgid "Re_ply-To:"
 msgstr "_Antwort an:"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:99
 msgid "Remember _password"
 msgstr "An _Passwort erinnern"
 
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:100
 msgid "Required Information"
 msgstr "BenÃ¶tigte Informationen"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:101
+msgid "SHA1"
+msgstr "SHA1"
+
+#: ../mail/mail-config.ui.h:102
+msgid "SHA256"
+msgstr "SHA256"
+
+#: ../mail/mail-config.ui.h:103
+msgid "SHA384"
+msgstr "SHA384"
+
+#: ../mail/mail-config.ui.h:104
+msgid "SHA512"
+msgstr "SHA512"
+
+#: ../mail/mail-config.ui.h:106
 msgid "SSL is not supported in this build of Evolution"
 msgstr "SSL wird von dieser Erstellung von Evolution nicht unterstÃ¼tzt"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:107
 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:97
+#: ../mail/mail-config.ui.h:108
 msgid "S_elect..."
 msgstr "A_uswÃ¤hlen â?¦"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:109
 msgid "S_end message receipts:"
 msgstr "Lese_bestÃ¤tigungen verschicken:"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:110
 msgid "S_tandard Font:"
 msgstr "_Standard-Schrift:"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:111
 msgid "Secure MIME (S/MIME)"
 msgstr "Sicheres MIME (S/MIME)"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:113
 msgid "Select Drafts Folder"
 msgstr "Ordner fÃ¼r EntwÃ¼rfe wÃ¤hlen"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:114
 msgid "Select HTML fixed width font"
 msgstr "Dicktengleiche HTML-Schrift wÃ¤hlen"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:115
 msgid "Select HTML fixed width font for printing"
 msgstr "Dicktengleiche HTML-Druckschrift wÃ¤hlen"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:116
 msgid "Select HTML variable width font"
 msgstr "HTML-Proportionalschrift wÃ¤hlen"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:117
 msgid "Select HTML variable width font for printing"
 msgstr "HTML-Proportionaldruckschrift wÃ¤hlen"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:118
+msgid "Select Junk Folder"
+msgstr "UnerwÃ¼nscht-Ordner wÃ¤hlen"
+
+#: ../mail/mail-config.ui.h:119
 msgid "Select Sent Folder"
 msgstr "Gesendet-Ordner wÃ¤hlen"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:120
+msgid "Select Trash Folder"
+msgstr "Ordner fÃ¼r MÃ¼ll wÃ¤hlen"
+
+#: ../mail/mail-config.ui.h:121
 msgid "Sender Photograph"
 msgstr "Foto des Absenders"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:122
 msgid "Sending Mail"
 msgstr "Verschicken von E-Mails"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:123
 msgid "Sent _Messages Folder:"
 msgstr "Ordner fÃ¼r _verschickte Nachrichten:"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:124
 msgid "Sent and Draft Messages"
 msgstr "Verschickte und entworfene Nachrichten"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:125
 msgid "Ser_ver requires authentication"
 msgstr "Server erfordert _Legitimation"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:126
 msgid "Server Configuration"
 msgstr "Serverkonfiguration"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:127
 msgid "Server _Type:"
 msgstr "_Server-Art:"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:128
+msgid "Si_gning algorithm:"
+msgstr "Si_gnaturalgorithmus:"
+
+#: ../mail/mail-config.ui.h:129
 msgid "Sig_natures"
 msgstr "Sig_naturen"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:130
 msgid "Sig_ning certificate:"
 msgstr "Signatur_zertifikat:"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:131
 msgid "Signat_ure:"
 msgstr "_Signatur:"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:132
 msgid "Signatures"
 msgstr "Signaturen"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:133
+msgid "Signing _algorithm:"
+msgstr "Signatur_algorithmus:"
+
+#: ../mail/mail-config.ui.h:134
 msgid "Spell Checking"
 msgstr "RechtschreibprÃ¼fung"
 
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:135
 msgid "Start _typing at the bottom on replying"
 msgstr "Beim Antworten auf Mails _unten mit dem Schreiben beginnen"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:137
 msgid "T_ype:"
 msgstr "T_yp:"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:138
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -12690,7 +12880,7 @@ msgstr ""
 "Diese Sprachliste enthÃ¤lt ausschlieÃ?lich die Sprachen, fÃ¼r die ein WÃ¶rterbuch "
 "installiert sind."
 
-#: ../mail/mail-config.ui.h:124
+#: ../mail/mail-config.ui.h:139
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12701,12 +12891,11 @@ msgstr ""
 "wird lediglich zur Anzeige verwendet."
 
 #. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
-#: ../mail/mail-config.ui.h:128
-#| msgid "Posting destination"
+#: ../mail/mail-config.ui.h:143
 msgid "Top Posting Option"
 msgstr "Top-Posting-Option"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:144
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12714,160 +12903,168 @@ msgstr ""
 "Geben Sie einen Namen an, den Sie mit diesem Konto assoziieren,\n"
 "zum Beispiel Â»GeschÃ¤ftlichÂ« oder Â»PersÃ¶nlichÂ«."
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:146
 msgid "Us_ername:"
 msgstr "_Benutzername:"
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:147
 msgid "Use Authe_ntication"
 msgstr "_Legitimation benutzen"
 
-#: ../mail/mail-config.ui.h:133 ../plugins/caldav/caldav-source.c:222
+#: ../mail/mail-config.ui.h:148 ../plugins/caldav/caldav-source.c:225
 #: ../plugins/google-account-setup/google-contacts-source.c:286
 #: ../plugins/google-account-setup/google-source.c:623
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
 msgid "User_name:"
 msgstr "_Benutzername:"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:149
 msgid "V_ariable-width:"
 msgstr "_Proportional:"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:150
 msgid "_Add Signature"
 msgstr "Signatur _hinzufÃ¼gen"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:151
 msgid "_Always load images from the Internet"
 msgstr "Bilder _immer aus dem Internet laden"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:152
 msgid "_Authentication Type"
 msgstr "_Legitimationsart"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:153
 msgid "_Default junk plugin:"
 msgstr "_Vorgabe-UnerwÃ¼nscht-Plugin:"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:154
 msgid "_Direct connection to the Internet"
 msgstr "_Direkte Internetverbindung"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:155
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Besprechungsanfragen nicht signieren (zur KompatibilitÃ¤t mit Outlook)"
 
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:156
 msgid "_Forward style:"
 msgstr "_Weiterleitungsstil:"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:157
+msgid "_Junk Folder:"
+msgstr "_UnerwÃ¼nscht-Ordner:"
+
+#: ../mail/mail-config.ui.h:158
 msgid "_Keep Signature above the original message on replying"
 msgstr "Signat_ur beim Antworten Ã¼ber der Original-Nachricht behalten"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:159
 msgid "_Languages"
 msgstr "_Sprachen"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:160
 msgid "_Load images in messages from contacts"
 msgstr "Bilder in Nachrichten von Kontakten _laden"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:161
 msgid "_Lookup in local address book only"
 msgstr "Nur in _lokalen AdressbÃ¼chern suchen"
 
-#: ../mail/mail-config.ui.h:146
+#: ../mail/mail-config.ui.h:162
 msgid "_Make this my default account"
 msgstr "Dieses zum Vo_rgabekonto machen"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:163
 msgid "_Manual proxy configuration:"
 msgstr "_Manuelle Proxy-Konfiguration:"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:164
 msgid "_Mark messages as read after"
 msgstr "_Nachrichten als gelesen markieren nach"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:166
 msgid "_Never load images from the Internet"
 msgstr "Bilder _nie aus dem Internet laden"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:167
 msgid "_Path:"
 msgstr "_Pfad:"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:168
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr ""
 "_Nachfrage beim Abschicken von HTML-Nachrichten an Kontakte, die dies nicht "
 "wÃ¼nschen"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:169
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Nachfrage beim Abschicken von Nachrichten mit _leerem Betreff"
 
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:170
 msgid "_Reply style:"
 msgstr "_Antwortstil:"
 
-#: ../mail/mail-config.ui.h:155
+#: ../mail/mail-config.ui.h:171
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: ../mail/mail-config.ui.h:156
+#: ../mail/mail-config.ui.h:172
 msgid "_Secure HTTP Proxy:"
 msgstr "_Sicherer HTTP-Proxy:"
 
-#: ../mail/mail-config.ui.h:158 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:174 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "_Server:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:176
 msgid "_Show image animations"
 msgstr "Bildanimationen an_zeigen"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:177
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Foto des Absenders in der Nachrichtenvorschau anzeigen"
 
 #. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:179
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "EmpfÃ¤ngerkopfzeilen (An/Kopie/Blindkopie) _verkleinern zu "
 
-#: ../mail/mail-config.ui.h:164
+#: ../mail/mail-config.ui.h:180
+msgid "_Trash Folder:"
+msgstr "M_Ã¼llordner:"
+
+#: ../mail/mail-config.ui.h:181
 msgid "_Use Secure Connection:"
 msgstr "_Sichere Verbindung verwenden:"
 
-#: ../mail/mail-config.ui.h:165
+#: ../mail/mail-config.ui.h:182
 msgid "_Use system defaults"
 msgstr "_Vorgabe benutzen"
 
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:183
 msgid "_Use the same fonts as other applications"
 msgstr "Dieselben Schriften wie andere Anwendungen _verwenden"
 
-#: ../mail/mail-config.ui.h:167 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/mail-config.ui.h:184 ../smime/gui/smime-ui.ui.h:47
 msgid "a"
 msgstr "a"
 
 #. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
-#: ../mail/mail-config.ui.h:169
+#: ../mail/mail-config.ui.h:186
 msgid "addresses"
 msgstr "Adressen"
 
-#: ../mail/mail-config.ui.h:170 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:187 ../smime/gui/smime-ui.ui.h:48
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:171
+#: ../mail/mail-config.ui.h:188
 msgid "color"
 msgstr "Farbe"
 
-#: ../mail/mail-config.ui.h:172
+#: ../mail/mail-config.ui.h:189
 msgid "description"
 msgstr "Beschreibung"
 
@@ -12892,66 +13089,78 @@ msgid "Co_mpleted"
 msgstr "Abges_chlossen"
 
 #: ../mail/mail-dialogs.ui.h:6
+msgid "Collapse _all"
+msgstr "Alle _einklappen"
+
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Digital Signature"
 msgstr "Digitale Signatur"
 
-#: ../mail/mail-dialogs.ui.h:7
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Do Not Forward"
 msgstr "Nicht weiterleiten"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:9
+msgid "E_xpand all"
+msgstr "Alle _aufklappen"
+
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Encryption"
 msgstr "VerschlÃ¼sselung"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:11
 msgid "Folder Subscriptions"
 msgstr "Ordnerabonnements"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Follow-Up"
 msgstr "Folgenachricht"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:13
 msgid "For Your Information"
 msgstr "Zu Ihrer Information"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:14
 msgid "Forward"
 msgstr "Weiterleiten"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:15
 msgid "License Agreement"
 msgstr "Lizenzvereinbarung"
 
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:16
 msgid "No Response Necessary"
 msgstr "Keine Antwort erforderlich"
 
-#: ../mail/mail-dialogs.ui.h:18
+#: ../mail/mail-dialogs.ui.h:20
 msgid "Reply to All"
 msgstr "Antwort an alle"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Review"
 msgstr "Ã?berprÃ¼fen"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:22
 msgid "S_erver:"
 msgstr "_Server:"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:23
+msgid "S_how only items containing:"
+msgstr "Nur EintrÃ¤ge anzeigen, die Folgendes ent_halten:"
+
+#: ../mail/mail-dialogs.ui.h:24
 msgid "Search Folder Sources"
 msgstr "Ordnerquellen durchsuchen"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:25
 msgid "Security Information"
 msgstr "Sicherheitsinformationen"
 
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:26
 msgid "Specific folders"
 msgstr "Bestimmte Ordner"
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:27
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -12959,23 +13168,23 @@ msgstr ""
 "Dies ist eine Liste der von Ihnen als Folgenachricht markierten Nachrichten.\n"
 "Bitte wÃ¤hlen Sie eine Aktion fÃ¼r die Folgenachricht aus dem MenÃ¼ Â»MarkierungÂ«."
 
-#: ../mail/mail-dialogs.ui.h:26
+#: ../mail/mail-dialogs.ui.h:29
 msgid "_Accept License"
 msgstr "Lizenz _akzeptieren"
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:30
 msgid "_Due By:"
 msgstr "_FÃ¤llig am:"
 
-#: ../mail/mail-dialogs.ui.h:28
+#: ../mail/mail-dialogs.ui.h:31
 msgid "_Flag:"
 msgstr "_Markierung:"
 
-#: ../mail/mail-dialogs.ui.h:29
+#: ../mail/mail-dialogs.ui.h:32
 msgid "_Tick this to accept the license agreement"
 msgstr "Ha_ken Sie dies ab, um die Lizenzvereinbarung zu akzeptieren"
 
-#: ../mail/mail-folder-cache.c:896
+#: ../mail/mail-folder-cache.c:783
 #, c-format
 msgid "Pinging %s"
 msgstr "Ping zu %s wird ermittelt"
@@ -12984,21 +13193,17 @@ msgstr "Ping zu %s wird ermittelt"
 msgid "Filtering Selected Messages"
 msgstr "GewÃ¤hlte Nachrichten filtern"
 
-#: ../mail/mail-ops.c:243
+#: ../mail/mail-ops.c:245
 msgid "Fetching Mail"
 msgstr "E-Mail wird abgerufen"
 
-#. sending mail, filtering failed
-#: ../mail/mail-ops.c:576
+#: ../mail/mail-ops.c:592
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Ausgangsfilter konnten nicht angewandt werden: %s"
 
-#: ../mail/mail-ops.c:588 ../mail/mail-ops.c:616
+#: ../mail/mail-ops.c:608 ../mail/mail-ops.c:635
 #, c-format
-#| msgid ""
-#| "Failed to append to %s: %s\n"
-#| "Appending to local `Sent' folder instead."
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local 'Sent' folder instead."
@@ -13006,140 +13211,135 @@ msgstr ""
 "AnhÃ¤ngen an %s gescheitert: %s\n"
 "Stattdessen wird versucht, an den lokalen Â»VerschickenÂ«-Ordner anzuhÃ¤ngen."
 
-#: ../mail/mail-ops.c:633
+#: ../mail/mail-ops.c:654
 #, c-format
-#| msgid "Failed to append to local `Sent' folder: %s"
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "AnhÃ¤ngen an lokalen Â»VerschicktÂ«-Ordner gescheitert: %s"
 
-#: ../mail/mail-ops.c:744 ../mail/mail-ops.c:825
+#: ../mail/mail-ops.c:774 ../mail/mail-ops.c:866
 msgid "Sending message"
 msgstr "Nachricht wird verschickt"
 
-#: ../mail/mail-ops.c:754
+#: ../mail/mail-ops.c:782
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Nachricht %d von %d wird verschickt"
 
-#: ../mail/mail-ops.c:781
+#: ../mail/mail-ops.c:826
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "%d von %d Nachrichten konnten nicht verschickt werden"
 
-#: ../mail/mail-ops.c:783 ../mail/mail-send-recv.c:761
+#: ../mail/mail-ops.c:828 ../mail/mail-send-recv.c:758
 msgid "Canceled."
 msgstr "Abgebrochen."
 
-#: ../mail/mail-ops.c:785 ../mail/mail-send-recv.c:763
+#: ../mail/mail-ops.c:830 ../mail/mail-send-recv.c:760
 msgid "Complete."
 msgstr "Abgeschlossen."
 
-#: ../mail/mail-ops.c:897
+#: ../mail/mail-ops.c:938
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "Nachricht wird in Ordner Â»%sÂ« gespeichert"
 
-#: ../mail/mail-ops.c:974
+#: ../mail/mail-ops.c:1018
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Nachrichten werden nach Â»%sÂ« verschoben"
 
-#: ../mail/mail-ops.c:974
+#: ../mail/mail-ops.c:1018
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Nachrichten werden nach Â»%sÂ« kopiert"
 
-#: ../mail/mail-ops.c:1083
+#: ../mail/mail-ops.c:1127
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "Ordner in Â»%sÂ« werden eingelesen"
 
-#: ../mail/mail-ops.c:1191
+#: ../mail/mail-ops.c:1235
 msgid "Forwarded messages"
 msgstr "Weitergeleitete Nachrichten"
 
-#: ../mail/mail-ops.c:1232
+#: ../mail/mail-ops.c:1276
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "Ordner Â»%sÂ« wird geÃ¶ffnet"
 
-#: ../mail/mail-ops.c:1298
+#: ../mail/mail-ops.c:1342
 #, c-format
 msgid "Retrieving quota information for folder '%s'"
 msgstr "Informationen Ã¼ber Speicherplatzlimit fÃ¼r Ordner Â»%sÂ« werden abgerufen"
 
-#: ../mail/mail-ops.c:1370
+#: ../mail/mail-ops.c:1414
 #, c-format
 msgid "Opening store '%s'"
 msgstr "Speicher Â»%sÂ« wird geÃ¶ffnet"
 
-#: ../mail/mail-ops.c:1441
+#: ../mail/mail-ops.c:1485
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Ordner Â»%sÂ« wird entfernt"
 
-#: ../mail/mail-ops.c:1561
+#: ../mail/mail-ops.c:1609
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ordner Â»%sÂ« wird gespeichert"
 
-#: ../mail/mail-ops.c:1624
+#: ../mail/mail-ops.c:1672
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Konto Â»%sÂ« wird gesÃ¤ubert und gespeichert"
 
-#: ../mail/mail-ops.c:1625
+#: ../mail/mail-ops.c:1673
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Konto Â»%sÂ« wird gespeichert"
 
-#: ../mail/mail-ops.c:1679
+#: ../mail/mail-ops.c:1727
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Ordner Â»%sÂ« wird aufgefrischt"
 
-#: ../mail/mail-ops.c:1719
+#: ../mail/mail-ops.c:1767
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Ordner Â»%sÂ« wird gesÃ¤ubert"
 
-#: ../mail/mail-ops.c:1764
+#: ../mail/mail-ops.c:1812
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "MÃ¼ll in Â»%sÂ« wird geleert"
 
-#: ../mail/mail-ops.c:1765
+#: ../mail/mail-ops.c:1813
 msgid "Local Folders"
 msgstr "Lokale Ordner"
 
-#: ../mail/mail-ops.c:1961
+#: ../mail/mail-ops.c:2016
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "%d Nachricht wird abgerufen"
 msgstr[1] "%d Nachrichten werden abgerufen"
 
-#: ../mail/mail-ops.c:2050
+#: ../mail/mail-ops.c:2105
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "%d Nachricht wird gespeichert"
 msgstr[1] "%d Nachrichten werden gespeichert"
 
-#: ../mail/mail-ops.c:2131
+#: ../mail/mail-ops.c:2192
 #, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr ""
-"Fehler beim Speichern der Nachrichten in: %s\n"
-"%s"
+msgid "Error saving messages to: %s:\n"
+msgstr "Fehler beim Speichern der Nachrichten in: %s:\n"
 
-#: ../mail/mail-ops.c:2203
+#: ../mail/mail-ops.c:2265
 msgid "Saving attachment"
 msgstr "Anlage wird gespeichert"
 
-#: ../mail/mail-ops.c:2221 ../mail/mail-ops.c:2229
+#: ../mail/mail-ops.c:2285 ../mail/mail-ops.c:2295
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13148,27 +13348,26 @@ msgstr ""
 "Ausgabedatei konnte nicht angelegt werden: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2244
-#, c-format
-msgid "Could not write data: %s"
-msgstr "Daten konnten nicht geschrieben werden: %s"
+#: ../mail/mail-ops.c:2310
+msgid "Could not write data: "
+msgstr "Daten konnten nicht geschrieben werden:"
 
-#: ../mail/mail-ops.c:2389
+#: ../mail/mail-ops.c:2454
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "Verbindung mit Â»%sÂ« wird getrennt"
 
-#: ../mail/mail-ops.c:2389
+#: ../mail/mail-ops.c:2454
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Verbindung mit Â»%sÂ« wird erneut hergestellt"
 
-#: ../mail/mail-ops.c:2485
+#: ../mail/mail-ops.c:2550
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Konto Â»%sÂ« wird fÃ¼r Offline-Betrieb vorbereitet"
 
-#: ../mail/mail-ops.c:2571
+#: ../mail/mail-ops.c:2636
 msgid "Checking Service"
 msgstr "Dienst wird Ã¼berprÃ¼ft"
 
@@ -13176,86 +13375,86 @@ msgstr "Dienst wird Ã¼berprÃ¼ft"
 msgid "Canceling..."
 msgstr "Absagevorgang â?¦"
 
-#: ../mail/mail-send-recv.c:427
+#: ../mail/mail-send-recv.c:424
 msgid "Send & Receive Mail"
 msgstr "E-Mails verschicken und abrufen"
 
-#: ../mail/mail-send-recv.c:444
+#: ../mail/mail-send-recv.c:441
 msgid "Cancel _All"
 msgstr "A_lles abbrechen"
 
-#: ../mail/mail-send-recv.c:554
+#: ../mail/mail-send-recv.c:551
 msgid "Updating..."
 msgstr "Aktualisieren â?¦"
 
-#: ../mail/mail-send-recv.c:554 ../mail/mail-send-recv.c:631
+#: ../mail/mail-send-recv.c:551 ../mail/mail-send-recv.c:628
 msgid "Waiting..."
 msgstr "Warten â?¦"
 
-#: ../mail/mail-send-recv.c:874
+#: ../mail/mail-send-recv.c:866
 #, c-format
 msgid "Checking for new mail"
 msgstr "Nach neuen E-Mails sehen"
 
-#: ../mail/mail-session.c:208
+#: ../mail/mail-session.c:225
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Passwort fÃ¼r %s eingeben"
 
-#: ../mail/mail-session.c:210
+#: ../mail/mail-session.c:227
 msgid "Enter Passphrase"
 msgstr "Geben Sie das Passwort ein"
 
-#: ../mail/mail-session.c:213
+#: ../mail/mail-session.c:230
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Passwort fÃ¼r %s eingeben"
 
-#: ../mail/mail-session.c:215
+#: ../mail/mail-session.c:232
 msgid "Enter Password"
 msgstr "Geben Sie das Passwort ein"
 
-#: ../mail/mail-session.c:257
+#: ../mail/mail-session.c:277
+#, c-format
 msgid "User canceled operation."
 msgstr "Benutzer hat Vorgang abgebrochen."
 
-#: ../mail/mail-session.c:667
+#: ../mail/mail-session.c:723
+#, c-format
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr ""
 "Das Weiterleiten der Nachricht wurde abgebrochen, da keine Zieladresse "
 "angegeben wurde."
 
-#: ../mail/mail-session.c:673
+#: ../mail/mail-session.c:732
+#, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr ""
 "Das Weiterleiten der Nachricht wurde abgebrochen, da kein nutzbares Konto "
 "gefunden wurde."
 
-#: ../mail/mail-tools.c:119
+#: ../mail/mail-tools.c:128
 #, c-format
-#| msgid "Could not create spool directory `%s': %s"
 msgid "Could not create spool directory '%s': %s"
 msgstr "Spool-Ordner Â»%sÂ« konnte nicht angelegt werden: %s"
 
-#: ../mail/mail-tools.c:149
+#: ../mail/mail-tools.c:161
 #, c-format
-#| msgid "Trying to movemail a non-mbox source `%s'"
 msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "Es wurde versucht, movemail auf eine nicht-mbox-Quelle Â»%sÂ« auszufÃ¼hren"
 
-#: ../mail/mail-tools.c:255
+#: ../mail/mail-tools.c:273
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Weitergeleitete Nachricht - %s"
 
-#: ../mail/mail-tools.c:257
+#: ../mail/mail-tools.c:275
 msgid "Forwarded message"
 msgstr "Weitergeleitete Nachricht"
 
-#: ../mail/mail-tools.c:297
+#: ../mail/mail-tools.c:318
 #, c-format
-#| msgid "Invalid folder: `%s'"
 msgid "Invalid folder: '%s'"
 msgstr "UngÃ¼ltiger Ordner: Â»%sÂ«"
 
@@ -13264,12 +13463,12 @@ msgstr "UngÃ¼ltiger Ordner: Â»%sÂ«"
 msgid "Setting up Search Folder: %s"
 msgstr "Suchordner wird eingerichtet: %s"
 
-#: ../mail/mail-vfolder.c:228
+#: ../mail/mail-vfolder.c:224
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Suchordner fÃ¼r Â»%s:%sÂ« werden aktualisiert"
 
-#: ../mail/mail-vfolder.c:235
+#: ../mail/mail-vfolder.c:231
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Suchordner fÃ¼r Â»%sÂ« werden aktualisiert"
@@ -13278,7 +13477,7 @@ msgstr "Suchordner fÃ¼r Â»%sÂ« werden aktualisiert"
 #. the second %s is uri of the removed folder. For more than one search
 #. folder is each of them on a separate line, with four spaces in front
 #. of its name, without quotes.
-#: ../mail/mail-vfolder.c:678
+#: ../mail/mail-vfolder.c:674
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been updated, because it used just removed "
@@ -13297,26 +13496,23 @@ msgstr[1] ""
 "entfernten Ordner verwenden:\n"
 "Â»%sÂ«."
 
-#: ../mail/mail-vfolder.c:1197
+#: ../mail/mail-vfolder.c:1179
 msgid "Edit Search Folder"
 msgstr "Suchordner bearbeiten"
 
-#: ../mail/mail-vfolder.c:1302
+#: ../mail/mail-vfolder.c:1284
 msgid "New Search Folder"
 msgstr "Neuer Suchordner"
 
 #: ../mail/mail.error.xml.h:1
-#| msgid "Check Junk Failed"
 msgid "\"Check Junk\" Failed"
 msgstr "Ã?berprÃ¼fung auf UnerwÃ¼nschtheit gescheitert"
 
 #: ../mail/mail.error.xml.h:2
-#| msgid "Report Junk Failed"
 msgid "\"Report Junk\" Failed"
 msgstr "Bericht Ã¼ber UnerwÃ¼nschtheit gescheitert"
 
 #: ../mail/mail.error.xml.h:3
-#| msgid "Report Not Junk Failed"
 msgid "\"Report Not Junk\" Failed"
 msgstr "Bericht Ã¼ber ErwÃ¼nschtheit gescheitert"
 
@@ -13470,7 +13666,6 @@ msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Ordner Â»{0}Â« konnte nicht nach Â»{1}Â« verschoben werden."
 
 #: ../mail/mail.error.xml.h:32
-#| msgid "Cannot open source \"{1}\""
 msgid "Cannot open source \"{1}\"."
 msgstr "Quelle Â»{1}Â« konnte nicht geÃ¶ffnet werden."
 
@@ -13532,19 +13727,19 @@ msgstr "Signaturdatei konnte nicht gespeichert werden."
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "Nachrichten im Suchordner Â»{0}Â« lÃ¶schen?"
 
-#: ../mail/mail.error.xml.h:45
-msgid "Do not d_elete"
-msgstr "Nicht l_Ã¶schen"
-
 #: ../mail/mail.error.xml.h:46
-msgid "Do not delete"
-msgstr "Nicht lÃ¶schen"
+msgid "Do _Not Disable"
+msgstr "_Nicht deaktivieren"
 
 #: ../mail/mail.error.xml.h:47
-msgid "Do not disable"
-msgstr "Nicht deaktivieren"
+msgid "Do _Not Send"
+msgstr "_Nicht verschicken"
 
 #: ../mail/mail.error.xml.h:48
+msgid "Do _Not Synchronize"
+msgstr "_Nicht abgleichen"
+
+#: ../mail/mail.error.xml.h:49
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -13552,51 +13747,48 @@ msgstr ""
 "Sollen die fÃ¼r die Benutzung im Offline-Modus markierten Ordner lokal "
 "abgeglichen werden?"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
 msgid "Do you want to mark all messages as read?"
 msgstr "Sollen alle Nachrichten als gelesen markiert werden?"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
 msgid "Do you wish to save your changes?"
 msgstr "Sollen die vorgenommenen Ã?nderungen gespeichert werden?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:52
 msgid "Enter password."
 msgstr "Passwort eingeben."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:53
 msgid "Error loading filter definitions."
 msgstr "Fehler beim Laden der Filterdefinitionen."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:54
 msgid "Error while performing operation."
 msgstr "Fehler beim AusfÃ¼hren eines Vorgangs."
 
 #. Translators: the {0} is replaced with an operation name, which failed.
 #. It can be basically anything run asynchronously, like "Fetching Mail",
 #. "Sending message" and others, mostly from mail-ops.c file.
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:58
 msgid "Error while {0}."
 msgstr "Fehler bei Â»{0}Â«."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but cannot overwrite it."
 msgstr "Die Datei existiert, das Ã?berschreiben ist jedoch nicht mÃ¶glich."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:60
 msgid "File exists but is not a regular file."
 msgstr "Die Datei existiert, ist jedoch keine gewÃ¶hnliche Datei"
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:61
 msgid "If you continue, you will not be able to recover these messages."
 msgstr ""
 "Falls Sie fortfahren, kÃ¶nnen Sie diese Nachrichten nicht mehr "
 "wiederherstellen."
 
-#: ../mail/mail.error.xml.h:61
-#| msgid ""
-#| "If you delete the folder, all of its contents and its subfolders contents "
-#| "will be deleted permanently."
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
@@ -13604,17 +13796,17 @@ msgstr ""
 "Falls Sie einen Ordner lÃ¶schen, geht sein gesamter Inhalt sowie der Inhalt "
 "seiner Unterordner dauerhaft verloren."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:63
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr ""
 "Falls Sie einen Ordner lÃ¶schen, geht sein gesamter Inhalt dauerhaft verloren."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:64
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Falls Sie fortfahren, werden alle Vertretungskonten dauerhaft gelÃ¶scht."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:65
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13622,35 +13814,35 @@ msgstr ""
 "Falls Sie fortfahren, werden die Konten- und\n"
 "Vertretungsinformationen dauerhaft gelÃ¶scht."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:67
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 "Falls Sie fortfahren, werden die Konteninformationen dauerhaft gelÃ¶scht."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:68
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started again."
 msgstr ""
 "Falls Sie Evolution beenden, werden diese Nachrichten nicht verschickt, "
 "solange Evolution nicht neu gestartet wurde."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:69
 msgid "Ignore"
 msgstr "Ignorieren"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:70
 msgid "Invalid authentication"
 msgstr "Legitimation ungÃ¼ltig"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:71
 msgid "Mail Deletion Failed"
 msgstr "LÃ¶schen der E-Mail gescheitert"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:72
 msgid "Mail filters automatically updated."
 msgstr "E-Mail-Filter automatisch aktualisiert."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:73
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have BCC "
 "recipients. This header, if added, will list all of your recipients to your "
@@ -13663,32 +13855,32 @@ msgstr ""
 "Um dies zu umgehen, sollten Sie mindestens einen Â»An:Â«- oder Â»Kopie an:-"
 "EmpfÃ¤nger hinzufÃ¼gen.Â«"
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:74
 msgid "Missing folder."
 msgstr "Ordner fehlt."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "Keine Quellen gewÃ¤hlt."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:77
 msgid "Opening too many messages at once may take a long time."
 msgstr ""
 "Zu viele Nachrichten auf einmal zu Ã¶ffnen, kÃ¶nnte eine lÃ¤ngere Zeit in "
 "Anspruch nehmen."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
 msgstr ""
 "Bitte Ã¼berprÃ¼fen Sie ihre Kontoeinstellungen und versuchen Sie es erneut."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:79
 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:79
+#: ../mail/mail.error.xml.h:80
 msgid ""
 "Please enter a valid email address in the To: field. You can search for email "
 "addresses by clicking on the To: button next to the entry box."
@@ -13696,7 +13888,7 @@ msgstr ""
 "Bitte geben Sie eine gÃ¼ltige E-Mail-Adresse im An-Feld ein. Sie kÃ¶nnen nach E-"
 "Mail-Adressen suchen, indem Sie den An-Knopf neben dem Eingabefeld anklicken."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13707,57 +13899,61 @@ msgstr ""
 "{0}\n"
 "Dennoch abschicken?"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
 msgstr "Geben Sie bitte einen eindeutigen Namen fÃ¼r diese Signatur ein."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr "Bitte warten."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Probleme beim Migrieren des alten E-Mail-Ordners Â»{0}Â«."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:86
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Abfrage des Servers nach einer Liste der unterstÃ¼tzten "
 "Legitimationsmechanismen."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:87
 msgid "Read receipt requested."
 msgstr "LesebestÃ¤tigung angefordert."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:88
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Ordner Â»{0}Â« und alle seine Unterordner wirklich lÃ¶schen?"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:89
 msgid "Really delete folder \"{0}\"?"
 msgstr "Soll der Ordner Â»{0}Â« wirklich gelÃ¶scht werden?"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:90
+msgid "Reply _Privately"
+msgstr "_Privat antworten"
+
+#: ../mail/mail.error.xml.h:93
 msgid "Search Folders automatically updated."
 msgstr "Suchordner automatisch aktualisiert."
 
-#: ../mail/mail.error.xml.h:90
-msgid "Send Receipt"
-msgstr "BestÃ¤tigung senden"
+#: ../mail/mail.error.xml.h:94
+msgid "Send private reply?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:95
+msgid "Send reply to all recipients?"
+msgstr "Antwort an alle EmpfÃ¤nger senden?"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:96
 msgid "Signature Already Exists"
 msgstr "Signatur existiert bereits"
 
-#: ../mail/mail.error.xml.h:92
-msgid "Synchronize"
-msgstr "Abgleichen"
-
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:97
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Ordner lokal fÃ¼r Offline-Benutzung abgleichen?"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "System folders are required for Evolution to function correctly and cannot be "
 "renamed, moved, or deleted."
@@ -13765,7 +13961,7 @@ msgstr ""
 "Evolution benÃ¶tigt Systemordner, um korrekt zu funktionieren. Diese kÃ¶nnen "
 "weder umbenannt, noch verschoben oder gelÃ¶scht werden."
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13782,7 +13978,7 @@ msgstr ""
 "Um dies zu umgehen, sollten Sie mindestens einen Â»An:Â«- oder Â»Kopie an:-"
 "EmpfÃ¤nger hinzufÃ¼gen.Â«"
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:102
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -13790,7 +13986,7 @@ msgstr ""
 "Der folgende EmpfÃ¤nger wurden als ungÃ¼ltige E-Mail-Adresse erkannt:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -13798,11 +13994,11 @@ msgstr ""
 "Die folgenden EmpfÃ¤nger wurden als ungÃ¼ltige E-Mail-Adressen erkannt:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:106
 msgid "The script file must exist and be executable."
 msgstr "Die Skriptdatei muss existieren und ausfÃ¼hrbar sein."
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -13810,7 +14006,7 @@ msgstr ""
 "MÃ¶glicherweise wurde dieser Ordner implizit hinzugefÃ¼gt. Falls erforderlich, "
 "kÃ¶nnen Sie zum Editor fÃ¼r Suchordner gehen, um ihn explizit hinzuzufÃ¼gen."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "This message cannot be sent because the account you chose to send with is not "
 "enabled"
@@ -13818,14 +14014,14 @@ msgstr ""
 "Diese Nachricht konnte nicht verschickt werden, da das zum Verschicken "
 "gewÃ¤hlte Konto nicht aktiviert ist"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "Diese Nachricht konnte nicht verschickt werden, da Sie keine EmpfÃ¤nger "
 "angegeben haben"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -13833,22 +14029,26 @@ msgstr ""
 "Dieser Server unterstÃ¼tzt diese Art der Legitimation nicht. MÃ¶glicherweise "
 "unterstÃ¼tzt er keinerlei Legitimation."
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:112
 msgid "This signature has been changed, but has not been saved."
 msgstr "Diese Signatur wurde geÃ¤ndert, aber nicht gespeichert"
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:113
 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."
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:114
+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:115
 msgid "Unable to connect to the GroupWise server."
 msgstr "Verbindungsaufbau zum GroupWise-Server gescheitert."
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -13856,19 +14056,19 @@ msgstr ""
 "Der Entwurfsordner fÃ¼r dieses Konto konnte nicht geÃ¶ffnet werden. Soll "
 "stattdessen der System-Entwurfsordner verwendet werden?"
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:117
 msgid "Unable to read license file."
 msgstr "Die Lizenzdatei konnte nicht gelesen werden."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:118
 msgid "Use _Default"
 msgstr "_Vorgabe benutzen"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:119
 msgid "Use default drafts folder?"
 msgstr "Soll der vorgegebene Entwurfsordner benutzt werden?"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
@@ -13878,33 +14078,56 @@ msgstr ""
 "Nachrichtenordnern, in denen sich diese E-Mails physikalisch befinden.\n"
 "MÃ¶chten Sie wirklich lÃ¶schen?"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:122
+msgid ""
+"You are replying privately to a message which arrived via a mailing list, but "
+"the list is trying to redirect your reply to go back to the list. Are you "
+"sure you want to proceed?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:123
+msgid ""
+"You are replying to a message which arrived via a mailing list, but you are "
+"replying privately to the sender; not to the list. Are you sure you want to "
+"proceed?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:124
+#, fuzzy
+msgid ""
+"You are replying to a message which was sent to many recipients. Are you sure "
+"you want to reply to ALL of them?"
+msgstr ""
+"Das ZurÃ¼ckziehen einer Nachricht entfernt diese mÃ¶glicherweise aus dem "
+"Posteingang des EmpfÃ¤ngers. Sind Sie sicher, dass Sie dies tun mÃ¶chten?"
+
+#: ../mail/mail.error.xml.h:125
 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:118
+#: ../mail/mail.error.xml.h:126
 msgid "You have not filled in all of the required information."
 msgstr "Sie haben nicht alle erforderlichen Felder ausgefÃ¼llt."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:127
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 "Es existieren unverschickte Nachrichten. Wollen Sie Evolution dennoch beenden?"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:128
 msgid "You may not create two accounts with the same name."
 msgstr "Sie kÃ¶nnen keine zwei Konten mit dem selben Namen anlegen."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:129
 msgid "You must name this Search Folder."
 msgstr "Sie mÃ¼ssen einen Namen fÃ¼r diesen Suchordner vergeben."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:130
 msgid "You must specify a folder."
 msgstr "Sie mÃ¼ssen einen Ordner angeben."
 
 # CHECK
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:131
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -13914,110 +14137,120 @@ msgstr ""
 "Dies geschieht entweder durch individuelle Auswahl der Ordner und/oder durch "
 "das WÃ¤hlen aller lokalen, aller fernen Ordner oder beider."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:133
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Anmedlung am Server Â»{0}Â« als Â»{0}Â« ist gescheitert."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:134
 msgid "_Append"
 msgstr "An_hÃ¤ngen"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:135
+#: ../plugins/groupwise-features/junk-settings.ui.h:5
+#: ../plugins/publish-calendar/publish-calendar.c:596
+msgid "_Disable"
+msgstr "_Deaktivieren"
+
+#: ../mail/mail.error.xml.h:136
 msgid "_Discard changes"
 msgstr "Ã?nderungen _verwerfen"
 
-#: ../mail/mail.error.xml.h:128
-msgid "_Do not Synchronize"
-msgstr "_Nicht abgleichen"
-
-#: ../mail/mail.error.xml.h:129 ../modules/mail/e-mail-shell-view-actions.c:821
+#: ../mail/mail.error.xml.h:137 ../modules/mail/e-mail-shell-view-actions.c:827
 msgid "_Empty Trash"
 msgstr "_MÃ¼ll leeren"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:138
 msgid "_Expunge"
 msgstr "_SÃ¤ubern"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:139
 msgid "_Open Messages"
 msgstr "Nachrichten Ã¶_ffnen"
 
-#: ../mail/message-list.c:1110
+#: ../mail/mail.error.xml.h:142
+msgid "_Send Receipt"
+msgstr "BestÃ¤tigung _senden"
+
+#: ../mail/mail.error.xml.h:143
+msgid "_Synchronize"
+msgstr "_Abgleichen"
+
+#: ../mail/message-list.c:1159
 msgid "Unseen"
 msgstr "Ungelesen"
 
-#: ../mail/message-list.c:1111
+#: ../mail/message-list.c:1160
 msgid "Seen"
 msgstr "Gelesen"
 
-#: ../mail/message-list.c:1112
+#: ../mail/message-list.c:1161
 msgid "Answered"
 msgstr "Beantwortet"
 
-#: ../mail/message-list.c:1113
+#: ../mail/message-list.c:1162
 msgid "Forwarded"
 msgstr "Weitergeleitet"
 
-#: ../mail/message-list.c:1114
+#: ../mail/message-list.c:1163
 msgid "Multiple Unseen Messages"
 msgstr "Mehrere ungelesene Nachrichten"
 
-#: ../mail/message-list.c:1115
+#: ../mail/message-list.c:1164
 msgid "Multiple Messages"
 msgstr "Mehrere Nachrichten"
 
-#: ../mail/message-list.c:1119
+#: ../mail/message-list.c:1168
 msgid "Lowest"
 msgstr "Am niedrigsten"
 
-#: ../mail/message-list.c:1120
+#: ../mail/message-list.c:1169
 msgid "Lower"
 msgstr "Niedriger"
 
-#: ../mail/message-list.c:1124
+#: ../mail/message-list.c:1173
 msgid "Higher"
 msgstr "HÃ¶her"
 
-#: ../mail/message-list.c:1125
+#: ../mail/message-list.c:1174
 msgid "Highest"
 msgstr "Am hÃ¶chsten"
 
-#: ../mail/message-list.c:1735 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1784 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1742 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1791 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "Heute %I:%M %p"
 
-#: ../mail/message-list.c:1751
+#: ../mail/message-list.c:1800
 msgid "Yesterday %l:%M %p"
 msgstr "Gestern %l:%M %p"
 
-#: ../mail/message-list.c:1763
+#: ../mail/message-list.c:1812
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: ../mail/message-list.c:1771
+#: ../mail/message-list.c:1820
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b, %k:%M"
 
-#: ../mail/message-list.c:1773
+#: ../mail/message-list.c:1822
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2524
+#: ../mail/message-list.c:2582
 msgid "Select all visible messages"
 msgstr "Alle sichtbaren Nachrichten wÃ¤hlen"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4204 ../mail/message-list.c:4600
+#: ../mail/message-list.c:4329 ../mail/message-list.c:4721
 msgid "Generating message list"
 msgstr "Nachrichtenliste wird erzeugt"
 
-#: ../mail/message-list.c:4437
+#: ../mail/message-list.c:4560
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -14025,7 +14258,7 @@ msgstr ""
 "Auf Ihr Suchkriterium treffen keine Nachrichten zu. Leeren Sie die Suche mit "
 "Suchen->Verwerfen oder Ã¤ndern Sie sie."
 
-#: ../mail/message-list.c:4439
+#: ../mail/message-list.c:4562
 msgid "There are no messages in this folder."
 msgstr "Es existieren keine Nachrichten in diesem Ordner."
 
@@ -14054,7 +14287,7 @@ msgid "Sent Messages"
 msgstr "Nachrichten verschicken"
 
 #: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:542
+#: ../widgets/misc/e-attachment-tree-view.c:560
 msgid "Size"
 msgstr "GrÃ¶Ã?e"
 
@@ -14062,23 +14295,23 @@ msgstr "GrÃ¶Ã?e"
 msgid "Subject - Trimmed"
 msgstr "Betreff - GekÃ¼rzt"
 
-#: ../mail/searchtypes.xml.h:1 ../modules/mail/e-mail-shell-view-actions.c:1212
+#: ../mail/searchtypes.xml.h:1 ../modules/mail/e-mail-shell-view-actions.c:1218
 msgid "Body contains"
 msgstr "Rumpf enthÃ¤lt"
 
-#: ../mail/searchtypes.xml.h:2 ../modules/mail/e-mail-shell-view-actions.c:1219
+#: ../mail/searchtypes.xml.h:2 ../modules/mail/e-mail-shell-view-actions.c:1225
 msgid "Message contains"
 msgstr "Nachricht enthÃ¤lt"
 
-#: ../mail/searchtypes.xml.h:3 ../modules/mail/e-mail-shell-view-actions.c:1226
+#: ../mail/searchtypes.xml.h:3 ../modules/mail/e-mail-shell-view-actions.c:1232
 msgid "Recipients contain"
 msgstr "EmpfÃ¤nger enthalten"
 
-#: ../mail/searchtypes.xml.h:4 ../modules/mail/e-mail-shell-view-actions.c:1233
+#: ../mail/searchtypes.xml.h:4 ../modules/mail/e-mail-shell-view-actions.c:1239
 msgid "Sender contains"
 msgstr "Absender enthÃ¤lt"
 
-#: ../mail/searchtypes.xml.h:5 ../modules/mail/e-mail-shell-view-actions.c:1240
+#: ../mail/searchtypes.xml.h:5 ../modules/mail/e-mail-shell-view-actions.c:1246
 msgid "Subject contains"
 msgstr "Betreff enthÃ¤lt"
 
@@ -14113,7 +14346,6 @@ msgstr ""
 "unsicher ist und dadurch ein Sicherheitsproblem entsteht."
 
 #: ../modules/addressbook/addressbook-config.c:602
-#| msgid "Use in _Birthday & Anniversaries calendar"
 msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "Im Geburt_s- und Jahrestagskalender verwenden"
 
@@ -14262,7 +14494,7 @@ msgstr "Soll das Vorschaufeld angezeigt werden?"
 
 #. 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:159
-#: ../modules/mail/em-mailer-prefs.c:1159
+#: ../modules/mail/em-mailer-prefs.c:1165
 msgid "_Table column:"
 msgstr "_Tabellenspalte:"
 
@@ -14275,45 +14507,45 @@ msgid "Always _show address of the autocompleted contact"
 msgstr "Immer Adresse des automatisch vervollstÃ¤ndigten Kontakts an_zeigen"
 
 #. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:190
-#: ../modules/addressbook/e-book-shell-migrate.c:144
+#: ../modules/addressbook/e-book-shell-backend.c:97
+#: ../modules/addressbook/e-book-shell-migrate.c:148
 msgid "On LDAP Servers"
 msgstr "Auf LDAP-Servern"
 
-#: ../modules/addressbook/e-book-shell-backend.c:340
+#: ../modules/addressbook/e-book-shell-backend.c:267
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ../modules/addressbook/e-book-shell-backend.c:342
+#: ../modules/addressbook/e-book-shell-backend.c:269
 #: ../modules/addressbook/e-book-shell-view-actions.c:757
 msgid "Create a new contact"
 msgstr "Einen neuen Kontakt anlegen"
 
-#: ../modules/addressbook/e-book-shell-backend.c:347
+#: ../modules/addressbook/e-book-shell-backend.c:274
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Kontakt_liste"
 
-#: ../modules/addressbook/e-book-shell-backend.c:349
+#: ../modules/addressbook/e-book-shell-backend.c:276
 #: ../modules/addressbook/e-book-shell-view-actions.c:764
 msgid "Create a new contact list"
 msgstr "Eine neue Kontaktliste anlegen"
 
-#: ../modules/addressbook/e-book-shell-backend.c:357
+#: ../modules/addressbook/e-book-shell-backend.c:284
 msgctxt "New"
 msgid "Address _Book"
 msgstr "Adressb_uch"
 
-#: ../modules/addressbook/e-book-shell-backend.c:359
+#: ../modules/addressbook/e-book-shell-backend.c:286
 #: ../modules/addressbook/e-book-shell-view-actions.c:687
 msgid "Create a new address book"
 msgstr "Ein neues Adressbuch anlegen"
 
 #. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:376
-#: ../modules/addressbook/e-book-shell-view.c:394
-#: ../modules/calendar/e-cal-shell-backend.c:123
+#: ../modules/addressbook/e-book-shell-backend.c:303
+#: ../modules/addressbook/e-book-shell-view.c:398
+#: ../modules/calendar/e-cal-shell-backend.c:104
 #: ../modules/calendar/e-cal-shell-migrate.c:57
 msgid "Contacts"
 msgstr "Kontakte"
@@ -14363,10 +14595,10 @@ msgid "Show properties of the selected address book"
 msgstr "Die Eigenschaften des gewÃ¤hlten Adressbuchs anzeigen"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:699
-#: ../modules/calendar/e-cal-shell-view-actions.c:1320
-#: ../modules/calendar/e-memo-shell-view-actions.c:610
-#: ../modules/calendar/e-task-shell-view-actions.c:735
-#: ../modules/mail/e-mail-shell-view-actions.c:905
+#: ../modules/calendar/e-cal-shell-view-actions.c:1354
+#: ../modules/calendar/e-memo-shell-view-actions.c:620
+#: ../modules/calendar/e-task-shell-view-actions.c:744
+#: ../modules/mail/e-mail-shell-view-actions.c:911
 msgid "_Rename..."
 msgstr "_Umbenennen â?¦"
 
@@ -14447,22 +14679,22 @@ 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:785
-#: ../modules/calendar/e-cal-shell-view-actions.c:1462
-#: ../modules/calendar/e-task-shell-view-actions.c:793
+#: ../modules/calendar/e-cal-shell-view-actions.c:1496
+#: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "_Actions"
 msgstr "A_ktionen"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:792
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
-#: ../modules/calendar/e-task-shell-view-actions.c:800
-#: ../modules/mail/e-mail-shell-view-actions.c:1028
+#: ../modules/calendar/e-memo-shell-view-actions.c:657
+#: ../modules/calendar/e-task-shell-view-actions.c:809
+#: ../modules/mail/e-mail-shell-view-actions.c:1034
 msgid "_Preview"
 msgstr "_Vorschau"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:801
-#: ../modules/calendar/e-cal-shell-view-actions.c:1479
-#: ../modules/calendar/e-memo-shell-view-actions.c:660
-#: ../modules/calendar/e-task-shell-view-actions.c:813
+#: ../modules/calendar/e-cal-shell-view-actions.c:1513
+#: ../modules/calendar/e-memo-shell-view-actions.c:670
+#: ../modules/calendar/e-task-shell-view-actions.c:822
 msgid "_Delete"
 msgstr "_LÃ¶schen"
 
@@ -14486,9 +14718,9 @@ msgstr "Kontakt-Vorschaufenster anzeigen"
 
 # CHECK
 #: ../modules/addressbook/e-book-shell-view-actions.c:863
-#: ../modules/calendar/e-memo-shell-view-actions.c:717
-#: ../modules/calendar/e-task-shell-view-actions.c:882
-#: ../modules/mail/e-mail-shell-view-actions.c:1122
+#: ../modules/calendar/e-memo-shell-view-actions.c:727
+#: ../modules/calendar/e-task-shell-view-actions.c:891
+#: ../modules/mail/e-mail-shell-view-actions.c:1128
 msgid "_Classic View"
 msgstr "_Klassische Ansicht"
 
@@ -14498,9 +14730,9 @@ msgstr "Kontakt-Vorschaufenster unter der Kontaktliste anzeigen"
 
 # CHECK - macht Ã¼berhaupt keinen Sinn
 #: ../modules/addressbook/e-book-shell-view-actions.c:870
-#: ../modules/calendar/e-memo-shell-view-actions.c:724
-#: ../modules/calendar/e-task-shell-view-actions.c:889
-#: ../modules/mail/e-mail-shell-view-actions.c:1129
+#: ../modules/calendar/e-memo-shell-view-actions.c:734
+#: ../modules/calendar/e-task-shell-view-actions.c:898
+#: ../modules/mail/e-mail-shell-view-actions.c:1135
 msgid "_Vertical View"
 msgstr "_Vertikale Ansicht"
 
@@ -14509,25 +14741,25 @@ msgid "Show contact preview alongside the contact list"
 msgstr "Kontakt-Vorschaufenster neben der Kontaktliste anzeigen"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:880
-#: ../modules/calendar/e-cal-shell-view-actions.c:1622
-#: ../modules/calendar/e-memo-shell-view-actions.c:734
-#: ../modules/calendar/e-task-shell-view-actions.c:906
+#: ../modules/calendar/e-cal-shell-view-actions.c:1656
+#: ../modules/calendar/e-memo-shell-view-actions.c:744
+#: ../modules/calendar/e-task-shell-view-actions.c:915
 msgid "Any Category"
 msgstr "Beliebige Kategorie"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:887
-#: ../modules/calendar/e-cal-shell-view-actions.c:1636
-#: ../modules/calendar/e-memo-shell-view-actions.c:741
-#: ../modules/calendar/e-task-shell-view-actions.c:941
+#: ../modules/calendar/e-cal-shell-view-actions.c:1670
+#: ../modules/calendar/e-memo-shell-view-actions.c:751
+#: ../modules/calendar/e-task-shell-view-actions.c:950
 msgid "Unmatched"
 msgstr "Nicht einsortiert"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:897
-#: ../modules/calendar/e-cal-shell-view-actions.c:1646
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
-#: ../modules/calendar/e-task-shell-view-actions.c:951
-#: ../modules/mail/e-mail-shell-view-actions.c:1205
-#: ../shell/e-shell-content.c:441
+#: ../modules/calendar/e-cal-shell-view-actions.c:1680
+#: ../modules/calendar/e-memo-shell-view-actions.c:761
+#: ../modules/calendar/e-task-shell-view-actions.c:960
+#: ../modules/mail/e-mail-shell-view-actions.c:1211
+#: ../shell/e-shell-content.c:459
 msgid "Advanced Search"
 msgstr "Erweiterte Suche"
 
@@ -14547,23 +14779,23 @@ msgstr "Die gewÃ¤hlten Kontakte drucken"
 msgid "Save selected contacts as a vCard"
 msgstr "GewÃ¤hlte Kontakte als vCard speichern"
 
-#: ../modules/addressbook/e-book-shell-view.c:338
+#: ../modules/addressbook/e-book-shell-view.c:342
 msgid "_Forward Contacts"
 msgstr "Kontakte weiter_leiten"
 
-#: ../modules/addressbook/e-book-shell-view.c:340
+#: ../modules/addressbook/e-book-shell-view.c:344
 msgid "_Forward Contact"
 msgstr "Kontakt weiter_leiten"
 
-#: ../modules/addressbook/e-book-shell-view.c:371
+#: ../modules/addressbook/e-book-shell-view.c:375
 msgid "_Send Message to Contacts"
 msgstr "_Nachricht an Kontakte schicken"
 
-#: ../modules/addressbook/e-book-shell-view.c:373
+#: ../modules/addressbook/e-book-shell-view.c:377
 msgid "_Send Message to List"
 msgstr "_Nachricht an Liste schicken"
 
-#: ../modules/addressbook/e-book-shell-view.c:375
+#: ../modules/addressbook/e-book-shell-view.c:379
 msgid "_Send Message to Contact"
 msgstr "_Nachricht an Kontakt schicken"
 
@@ -14708,69 +14940,69 @@ msgid "I_mport to Tasks"
 msgstr "In _Aufgaben importieren"
 
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:125
+#: ../modules/calendar/e-cal-shell-backend.c:106
 #: ../modules/calendar/e-cal-shell-migrate.c:176
-#: ../modules/calendar/e-memo-shell-backend.c:110
+#: ../modules/calendar/e-memo-shell-backend.c:94
 #: ../modules/calendar/e-memo-shell-migrate.c:136
-#: ../modules/calendar/e-task-shell-backend.c:113
-#: ../modules/calendar/e-task-shell-migrate.c:143
+#: ../modules/calendar/e-task-shell-backend.c:94
+#: ../modules/calendar/e-task-shell-migrate.c:145
 msgid "On The Web"
 msgstr "Im Web"
 
-#: ../modules/calendar/e-cal-shell-backend.c:127
+#: ../modules/calendar/e-cal-shell-backend.c:108
 #: ../plugins/calendar-weather/calendar-weather.c:117
 msgid "Weather"
 msgstr "Wetter"
 
-#: ../modules/calendar/e-cal-shell-backend.c:242
+#: ../modules/calendar/e-cal-shell-backend.c:193
 #: ../modules/calendar/e-cal-shell-migrate.c:60
 msgid "Birthdays & Anniversaries"
 msgstr "Geburts- und Jahrestage"
 
-#: ../modules/calendar/e-cal-shell-backend.c:446
+#: ../modules/calendar/e-cal-shell-backend.c:396
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Termin"
 
-#: ../modules/calendar/e-cal-shell-backend.c:448
-#: ../modules/calendar/e-cal-shell-view-actions.c:1399
+#: ../modules/calendar/e-cal-shell-backend.c:398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1433
 msgid "Create a new appointment"
 msgstr "Einen neuen Termin anlegen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:453
+#: ../modules/calendar/e-cal-shell-backend.c:403
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "_Ganztagstermin"
 
-#: ../modules/calendar/e-cal-shell-backend.c:455
+#: ../modules/calendar/e-cal-shell-backend.c:405
 msgid "Create a new all-day appointment"
 msgstr "Einen neuen ganztÃ¤tigen Termin anlegen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:460
+#: ../modules/calendar/e-cal-shell-backend.c:410
 msgctxt "New"
 msgid "M_eeting"
 msgstr "_Besprechung"
 
-#: ../modules/calendar/e-cal-shell-backend.c:462
+#: ../modules/calendar/e-cal-shell-backend.c:412
 msgid "Create a new meeting request"
 msgstr "Eine neue Besprechungsanfrage anlegen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:470
+#: ../modules/calendar/e-cal-shell-backend.c:420
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Kalen_der"
 
-#: ../modules/calendar/e-cal-shell-backend.c:472
-#: ../modules/calendar/e-cal-shell-view-actions.c:1294
+#: ../modules/calendar/e-cal-shell-backend.c:422
+#: ../modules/calendar/e-cal-shell-view-actions.c:1328
 msgid "Create a new calendar"
 msgstr "Einen neuen Kalender anlegen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:507
-#: ../plugins/itip-formatter/itip-formatter.c:2666
+#: ../modules/calendar/e-cal-shell-backend.c:457
+#: ../plugins/itip-formatter/itip-formatter.c:2667
 msgid "Calendar and Tasks"
 msgstr "Kalender und Aufgaben"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:168
+#: ../modules/calendar/e-cal-shell-sidebar.c:169
 #: ../modules/calendar/e-memo-shell-sidebar.c:163
 #: ../modules/calendar/e-task-shell-sidebar.c:163
 #, c-format
@@ -14781,16 +15013,20 @@ msgstr ""
 "Fehler bei %s\n"
 " %s"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:227
+#: ../modules/calendar/e-cal-shell-sidebar.c:230
 msgid "Loading calendars"
 msgstr "Kalender werden geladen"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:617
+#: ../modules/calendar/e-cal-shell-sidebar.c:652
+msgid "_New Calendar..."
+msgstr "_Neuer Kalender â?¦"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:669
 msgid "Calendar Selector"
 msgstr "Kalenderquellenauswahl"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:952
+#: ../modules/calendar/e-cal-shell-sidebar.c:1010
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Kalender auf %s wird geÃ¶ffnet"
@@ -14819,299 +15055,298 @@ msgstr "Ereignisse lÃ¶schen Ã¤lter als"
 msgid "Copying Items"
 msgstr "Objekte werden kopiert"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:796
+#: ../modules/calendar/e-cal-shell-view-actions.c:804
 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:1098
+#: ../modules/calendar/e-cal-shell-view-actions.c:1126
 msgid "event"
 msgstr "Ereignis"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1100
-#: ../modules/calendar/e-cal-shell-view-memopad.c:209
+#: ../modules/calendar/e-cal-shell-view-actions.c:1128
+#: ../modules/calendar/e-cal-shell-view-memopad.c:210
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:277
-#: ../modules/calendar/e-memo-shell-view-actions.c:494
-#: ../modules/calendar/e-task-shell-view-actions.c:612
+#: ../modules/calendar/e-memo-shell-view-actions.c:504
+#: ../modules/calendar/e-task-shell-view-actions.c:621
 msgid "Save as iCalendar"
 msgstr "Als iCalendar speichern"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1250
-#: ../modules/calendar/e-memo-shell-view-actions.c:575
+#: ../modules/calendar/e-cal-shell-view-actions.c:1284
+#: ../modules/calendar/e-memo-shell-view-actions.c:585
 msgid "_Copy..."
 msgstr "_Kopieren â?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1257
+#: ../modules/calendar/e-cal-shell-view-actions.c:1291
 msgid "D_elete Calendar"
 msgstr "Kalender _lÃ¶schen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1259
+#: ../modules/calendar/e-cal-shell-view-actions.c:1293
 msgid "Delete the selected calendar"
 msgstr "Den gewÃ¤hlten Kalender lÃ¶schen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1266
+#: ../modules/calendar/e-cal-shell-view-actions.c:1300
 msgid "Go Back"
 msgstr "ZurÃ¼ck gehen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1273
+#: ../modules/calendar/e-cal-shell-view-actions.c:1307
 msgid "Go Forward"
 msgstr "Vor gehen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1280
+#: ../modules/calendar/e-cal-shell-view-actions.c:1314
 msgid "Select today"
 msgstr "Heute wÃ¤hlen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1285
+#: ../modules/calendar/e-cal-shell-view-actions.c:1319
 msgid "Select _Date"
 msgstr "_Datum wÃ¤hlen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1287
+#: ../modules/calendar/e-cal-shell-view-actions.c:1321
 msgid "Select a specific date"
 msgstr "Ein bestimmtes Datum wÃ¤hlen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1292
+#: ../modules/calendar/e-cal-shell-view-actions.c:1326
 msgid "_New Calendar"
 msgstr "_Neuer Kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1306
-#: ../modules/calendar/e-task-shell-view-actions.c:784
+#: ../modules/calendar/e-cal-shell-view-actions.c:1340
+#: ../modules/calendar/e-task-shell-view-actions.c:793
 msgid "Purg_e"
 msgstr "_SÃ¤ubern"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1308
+#: ../modules/calendar/e-cal-shell-view-actions.c:1342
 msgid "Purge old appointments and meetings"
 msgstr "Alte Termine und Besprechungen lÃ¶schen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1313
-#: ../modules/calendar/e-memo-shell-view-actions.c:603
-#: ../modules/calendar/e-task-shell-view-actions.c:728
+#: ../modules/calendar/e-cal-shell-view-actions.c:1347
+#: ../modules/calendar/e-memo-shell-view-actions.c:613
+#: ../modules/calendar/e-task-shell-view-actions.c:737
 msgid "Re_fresh"
 msgstr "Auf_frischen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1315
+#: ../modules/calendar/e-cal-shell-view-actions.c:1349
 msgid "Refresh the selected calendar"
 msgstr "Den gewÃ¤hlten Kalender aktualisieren"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1322
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
 msgid "Rename the selected calendar"
 msgstr "Den gewÃ¤hlten Kalender umbenennen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1327
+#: ../modules/calendar/e-cal-shell-view-actions.c:1361
 msgid "Show _Only This Calendar"
 msgstr "Nur diesen _Kalender anzeigen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1334
+#: ../modules/calendar/e-cal-shell-view-actions.c:1368
 msgid "Cop_y to Calendar..."
 msgstr "In Kalender k_opieren â?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1341
+#: ../modules/calendar/e-cal-shell-view-actions.c:1375
 msgid "_Delegate Meeting..."
 msgstr "Besprechung dele_gieren â?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1348
+#: ../modules/calendar/e-cal-shell-view-actions.c:1382
 msgid "_Delete Appointment"
 msgstr "Den Termin _lÃ¶schen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1350
+#: ../modules/calendar/e-cal-shell-view-actions.c:1384
 msgid "Delete selected appointments"
 msgstr "AusgewÃ¤hlte Termine lÃ¶schen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1355
+#: ../modules/calendar/e-cal-shell-view-actions.c:1389
 msgid "Delete This _Occurrence"
 msgstr "Dieses V_orkommen lÃ¶schen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1357
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
 msgid "Delete this occurrence"
 msgstr "Diesen Treffer lÃ¶schen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1362
+#: ../modules/calendar/e-cal-shell-view-actions.c:1396
 msgid "Delete All Occ_urrences"
 msgstr "Alle _Vorkommen lÃ¶schen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1364
+#: ../modules/calendar/e-cal-shell-view-actions.c:1398
 msgid "Delete all occurrences"
 msgstr "Alle Vorkommen lÃ¶schen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1369
+#: ../modules/calendar/e-cal-shell-view-actions.c:1403
 msgid "New All Day _Event..."
 msgstr "Neues _ganztÃ¤giges Ereignis â?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1371
+#: ../modules/calendar/e-cal-shell-view-actions.c:1405
 msgid "Create a new all day event"
 msgstr "Ein neues ganztÃ¤giges Ereignis anlegen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1376
-#: ../modules/calendar/e-cal-shell-view-memopad.c:243
+#: ../modules/calendar/e-cal-shell-view-actions.c:1410
+#: ../modules/calendar/e-cal-shell-view-memopad.c:244
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:317
-#: ../modules/calendar/e-memo-shell-view-actions.c:568
-#: ../modules/calendar/e-task-shell-view-actions.c:693
+#: ../modules/calendar/e-memo-shell-view-actions.c:578
+#: ../modules/calendar/e-task-shell-view-actions.c:702
 msgid "_Forward as iCalendar..."
 msgstr "Als i_Calendar weiterleiten â?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1383
+#: ../modules/calendar/e-cal-shell-view-actions.c:1417
 msgid "New _Meeting..."
 msgstr "Neue Bes_prechung â?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1385
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
 msgid "Create a new meeting"
 msgstr "Eine neue Besprechung anlegen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1390
+#: ../modules/calendar/e-cal-shell-view-actions.c:1424
 msgid "Mo_ve to Calendar..."
 msgstr "In Kalender _verschieben â?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1397
+#: ../modules/calendar/e-cal-shell-view-actions.c:1431
 msgid "New _Appointment..."
 msgstr "Neuer _Termin â?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1404
+#: ../modules/calendar/e-cal-shell-view-actions.c:1438
 msgid "Make this Occurrence _Movable"
 msgstr "Diese Wiederholung v_erschiebbar machen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1411
+#: ../modules/calendar/e-cal-shell-view-actions.c:1445
 msgid "_Open Appointment"
 msgstr "Termin Ã¶_ffnen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1413
+#: ../modules/calendar/e-cal-shell-view-actions.c:1447
 msgid "View the current appointment"
 msgstr "Den aktuellen Termin anzeigen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1418
+#: ../modules/calendar/e-cal-shell-view-actions.c:1452
 msgid "_Reply"
 msgstr "_Antworten"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1432
-#: ../modules/calendar/e-cal-shell-view-memopad.c:271
+#: ../modules/calendar/e-cal-shell-view-actions.c:1466
+#: ../modules/calendar/e-cal-shell-view-memopad.c:272
 msgid "Save as iCalendar..."
 msgstr "Als iCalendar speichern â?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1439
+#: ../modules/calendar/e-cal-shell-view-actions.c:1473
 msgid "_Schedule Meeting..."
 msgstr "Besprechung _ansetzen â?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1441
+#: ../modules/calendar/e-cal-shell-view-actions.c:1475
 msgid "Converts an appointment to a meeting"
 msgstr "Wandelt einen Termin in eine Besprechung um"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1446
+#: ../modules/calendar/e-cal-shell-view-actions.c:1480
 msgid "Conv_ert to Appointment..."
 msgstr "In T_ermin umwandelnâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1448
+#: ../modules/calendar/e-cal-shell-view-actions.c:1482
 msgid "Converts a meeting to an appointment"
 msgstr "Wandelt eine Besprechung in einen Termin um"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1453
-#| msgid "_Quit"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1487
 msgid "Quit"
 msgstr "Beenden"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1577
+#: ../modules/calendar/e-cal-shell-view-actions.c:1611
 msgid "Day"
 msgstr "Tag"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1579
+#: ../modules/calendar/e-cal-shell-view-actions.c:1613
 msgid "Show one day"
 msgstr "Tagesansicht"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1584
+#: ../modules/calendar/e-cal-shell-view-actions.c:1618
 msgid "List"
 msgstr "Liste"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1586
+#: ../modules/calendar/e-cal-shell-view-actions.c:1620
 msgid "Show as list"
 msgstr "Listenansicht"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1591
+#: ../modules/calendar/e-cal-shell-view-actions.c:1625
 msgid "Month"
 msgstr "Monat"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1593
+#: ../modules/calendar/e-cal-shell-view-actions.c:1627
 msgid "Show one month"
 msgstr "Monatsansicht"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1598
+#: ../modules/calendar/e-cal-shell-view-actions.c:1632
 msgid "Week"
 msgstr "Woche"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1600
+#: ../modules/calendar/e-cal-shell-view-actions.c:1634
 msgid "Show one week"
 msgstr "Wochenansicht"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1607
+#: ../modules/calendar/e-cal-shell-view-actions.c:1641
 msgid "Show one work week"
 msgstr "Eine Arbeitswoche anzeigen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1615
+#: ../modules/calendar/e-cal-shell-view-actions.c:1649
 msgid "Active Appointments"
 msgstr "Aktuelle Termine"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1629
+#: ../modules/calendar/e-cal-shell-view-actions.c:1663
 msgid "Next 7 Days' Appointments"
 msgstr "Termine der nÃ¤chsten 7 Tage"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1660
-#: ../modules/calendar/e-memo-shell-view-actions.c:765
-#: ../modules/calendar/e-task-shell-view-actions.c:965
+#: ../modules/calendar/e-cal-shell-view-actions.c:1694
+#: ../modules/calendar/e-memo-shell-view-actions.c:775
+#: ../modules/calendar/e-task-shell-view-actions.c:974
 msgid "Description contains"
 msgstr "Beschreibung enthÃ¤lt"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1667
-#: ../modules/calendar/e-memo-shell-view-actions.c:772
-#: ../modules/calendar/e-task-shell-view-actions.c:972
+#: ../modules/calendar/e-cal-shell-view-actions.c:1701
+#: ../modules/calendar/e-memo-shell-view-actions.c:782
+#: ../modules/calendar/e-task-shell-view-actions.c:981
 msgid "Summary contains"
 msgstr "Zusammenfassung enthÃ¤lt"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1679
+#: ../modules/calendar/e-cal-shell-view-actions.c:1713
 msgid "Print this calendar"
 msgstr "Diesen Kalender drucken"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1686
+#: ../modules/calendar/e-cal-shell-view-actions.c:1720
 msgid "Preview the calendar to be printed"
 msgstr "Vorschau auf den zu druckenden Kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1759
+#: ../modules/calendar/e-cal-shell-view-actions.c:1793
 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:207
-#: ../modules/calendar/e-memo-shell-view-actions.c:492
+#: ../modules/calendar/e-cal-shell-view-memopad.c:208
+#: ../modules/calendar/e-memo-shell-view-actions.c:502
 msgid "memo"
 msgstr "Notiz"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:250
-#: ../modules/calendar/e-memo-shell-view-actions.c:624
+#: ../modules/calendar/e-cal-shell-view-memopad.c:251
+#: ../modules/calendar/e-memo-shell-view-actions.c:634
 msgid "New _Memo"
 msgstr "Neue _Notiz"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:252
-#: ../modules/calendar/e-memo-shell-backend.c:320
-#: ../modules/calendar/e-memo-shell-view-actions.c:626
+#: ../modules/calendar/e-cal-shell-view-memopad.c:253
+#: ../modules/calendar/e-memo-shell-backend.c:279
+#: ../modules/calendar/e-memo-shell-view-actions.c:636
 msgid "Create a new memo"
 msgstr "Eine neue Notiz anlegen"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../modules/calendar/e-memo-shell-view-actions.c:631
+#: ../modules/calendar/e-cal-shell-view-memopad.c:258
+#: ../modules/calendar/e-memo-shell-view-actions.c:641
 msgid "_Open Memo"
 msgstr "Notiz Ã¶_ffnen"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:259
-#: ../modules/calendar/e-memo-shell-view-actions.c:633
+#: ../modules/calendar/e-cal-shell-view-memopad.c:260
+#: ../modules/calendar/e-memo-shell-view-actions.c:643
 msgid "View the selected memo"
 msgstr "Die gewÃ¤hlte Notiz anzeigen"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../modules/calendar/e-cal-shell-view-memopad.c:265
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:352
-#: ../modules/calendar/e-memo-shell-view-actions.c:638
-#: ../modules/calendar/e-task-shell-view-actions.c:777
+#: ../modules/calendar/e-memo-shell-view-actions.c:648
+#: ../modules/calendar/e-task-shell-view-actions.c:786
 msgid "Open _Web Page"
 msgstr "_Website Ã¶ffnen"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:283
-#: ../modules/calendar/e-memo-shell-view-actions.c:798
+#: ../modules/calendar/e-cal-shell-view-memopad.c:284
+#: ../modules/calendar/e-memo-shell-view-actions.c:808
 msgid "Print the selected memo"
 msgstr "Die gewÃ¤hlte Notiz drucken"
 
@@ -15120,22 +15355,22 @@ msgstr "Die gewÃ¤hlte Notiz drucken"
 #. 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:275
-#: ../modules/calendar/e-task-shell-view-actions.c:610
+#: ../modules/calendar/e-task-shell-view-actions.c:619
 msgid "task"
 msgstr "Aufgabe"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:310
-#: ../modules/calendar/e-task-shell-view-actions.c:672
+#: ../modules/calendar/e-task-shell-view-actions.c:681
 msgid "_Assign Task"
 msgstr "Aufgabe _zuweisen"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:749
+#: ../modules/calendar/e-task-shell-view-actions.c:758
 msgid "_Mark as Complete"
 msgstr "Als abgeschlossen _markieren"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-task-shell-view-actions.c:751
+#: ../modules/calendar/e-task-shell-view-actions.c:760
 msgid "Mark selected tasks as complete"
 msgstr "Die gewÃ¤hlten Aufgaben als abgeschlossen markieren"
 
@@ -15144,76 +15379,76 @@ msgid "_Mark as Incomplete"
 msgstr "Als _offen markieren"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:758
+#: ../modules/calendar/e-task-shell-view-actions.c:767
 msgid "Mark selected tasks as incomplete"
 msgstr "Die gewÃ¤hlten Aufgaben als unvollstÃ¤ndig markieren"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-task-shell-view-actions.c:763
+#: ../modules/calendar/e-task-shell-view-actions.c:772
 msgid "New _Task"
 msgstr "_Neue Aufgabe"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:340
-#: ../modules/calendar/e-task-shell-backend.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:765
+#: ../modules/calendar/e-task-shell-backend.c:277
+#: ../modules/calendar/e-task-shell-view-actions.c:774
 msgid "Create a new task"
 msgstr "Eine neue Aufgabe anlegen"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:770
+#: ../modules/calendar/e-task-shell-view-actions.c:779
 msgid "_Open Task"
 msgstr "Aufgabe Ã¶_ffnen"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:772
+#: ../modules/calendar/e-task-shell-view-actions.c:781
 msgid "View the selected task"
 msgstr "Die gewÃ¤hlte Aufgabe anzeigen"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-memo-shell-view-actions.c:813
-#: ../modules/calendar/e-task-shell-view-actions.c:1013
+#: ../modules/calendar/e-memo-shell-view-actions.c:823
+#: ../modules/calendar/e-task-shell-view-actions.c:1022
 msgid "_Save as iCalendar..."
 msgstr "Als i_Calendar speichern â?¦"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:371
-#: ../modules/calendar/e-task-shell-view-actions.c:998
+#: ../modules/calendar/e-task-shell-view-actions.c:1007
 msgid "Print the selected task"
 msgstr "Die gewÃ¤hlte Aufgabe drucken"
 
-#: ../modules/calendar/e-memo-shell-backend.c:318
+#: ../modules/calendar/e-memo-shell-backend.c:277
 msgctxt "New"
 msgid "Mem_o"
 msgstr "_Notiz"
 
-#: ../modules/calendar/e-memo-shell-backend.c:325
+#: ../modules/calendar/e-memo-shell-backend.c:284
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "Ge_meinsame Notiz"
 
-#: ../modules/calendar/e-memo-shell-backend.c:327
+#: ../modules/calendar/e-memo-shell-backend.c:286
 msgid "Create a new shared memo"
 msgstr "Eine neue gemeinsame Notiz anlegen"
 
-#: ../modules/calendar/e-memo-shell-backend.c:335
+#: ../modules/calendar/e-memo-shell-backend.c:294
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Notizli_ste"
 
-#: ../modules/calendar/e-memo-shell-backend.c:337
-#: ../modules/calendar/e-memo-shell-view-actions.c:591
+#: ../modules/calendar/e-memo-shell-backend.c:296
+#: ../modules/calendar/e-memo-shell-view-actions.c:601
 msgid "Create a new memo list"
 msgstr "Eine neue Notizliste anlegen"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:222
+#: ../modules/calendar/e-memo-shell-sidebar.c:224
 msgid "Loading memos"
 msgstr "Notizen werden geladen"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:571
+#: ../modules/calendar/e-memo-shell-sidebar.c:591
 msgid "Memo List Selector"
 msgstr "Notizquellenauswahl"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:870
+#: ../modules/calendar/e-memo-shell-sidebar.c:896
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Notizen unter %s werden geÃ¶ffnet"
@@ -15223,63 +15458,63 @@ msgstr "Notizen unter %s werden geÃ¶ffnet"
 msgid "Print Memos"
 msgstr "Notizen drucken"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:554
+#: ../modules/calendar/e-memo-shell-view-actions.c:564
 msgid "_Delete Memo"
 msgstr "Notiz _lÃ¶schen"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:561
+#: ../modules/calendar/e-memo-shell-view-actions.c:571
 msgid "_Find in Memo..."
 msgstr "In Notiz _suchen â?¦"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:563
+#: ../modules/calendar/e-memo-shell-view-actions.c:573
 msgid "Search for text in the displayed memo"
 msgstr "In der angezeigten Notiz einen Text suchen"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:582
+#: ../modules/calendar/e-memo-shell-view-actions.c:592
 msgid "D_elete Memo List"
 msgstr "Notizlist_e lÃ¶schen "
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:584
+#: ../modules/calendar/e-memo-shell-view-actions.c:594
 msgid "Delete the selected memo list"
 msgstr "Die gewÃ¤hlte Notizliste lÃ¶schen"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:589
+#: ../modules/calendar/e-memo-shell-view-actions.c:599
 msgid "_New Memo List"
 msgstr "_Neue Notizliste"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:605
+#: ../modules/calendar/e-memo-shell-view-actions.c:615
 msgid "Refresh the selected memo list"
 msgstr "Die ausgewÃ¤hlte Notizliste aktualisieren"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:612
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
 msgid "Rename the selected memo list"
 msgstr "Die ausgewÃ¤hlte Notizliste umbenennen"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:617
+#: ../modules/calendar/e-memo-shell-view-actions.c:627
 msgid "Show _Only This Memo List"
 msgstr "Nur diese N_otizliste anzeigen"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:696
+#: ../modules/calendar/e-memo-shell-view-actions.c:706
 msgid "Memo _Preview"
 msgstr "Notiz_vorschau"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:698
+#: ../modules/calendar/e-memo-shell-view-actions.c:708
 msgid "Show memo preview pane"
 msgstr "Vorschaufeld fÃ¼r Notizen anzeigen"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:719
+#: ../modules/calendar/e-memo-shell-view-actions.c:729
 msgid "Show memo preview below the memo list"
 msgstr "Notizvorschau unter der Notizliste anzeigen"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:726
+#: ../modules/calendar/e-memo-shell-view-actions.c:736
 msgid "Show memo preview alongside the memo list"
 msgstr "Notizvorschau neben der Notizliste anzeigen"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:784
+#: ../modules/calendar/e-memo-shell-view-actions.c:794
 msgid "Print the list of memos"
 msgstr "Die Liste von Notizen drucken"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:791
+#: ../modules/calendar/e-memo-shell-view-actions.c:801
 msgid "Preview the list of memos to be printed"
 msgstr "Vorschau auf die zu druckende Liste von Notizen anzeigen"
 
@@ -15304,40 +15539,40 @@ msgstr "Notizen lÃ¶schen"
 msgid "Delete Memo"
 msgstr "Notiz lÃ¶schen"
 
-#: ../modules/calendar/e-task-shell-backend.c:322
+#: ../modules/calendar/e-task-shell-backend.c:275
 msgctxt "New"
 msgid "_Task"
 msgstr "_Aufgabe"
 
-#: ../modules/calendar/e-task-shell-backend.c:329
+#: ../modules/calendar/e-task-shell-backend.c:282
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Zuge_wiesene Aufgabe"
 
-#: ../modules/calendar/e-task-shell-backend.c:331
+#: ../modules/calendar/e-task-shell-backend.c:284
 msgid "Create a new assigned task"
 msgstr "Eine neue zugewiesene Aufgabe anlegen"
 
-#: ../modules/calendar/e-task-shell-backend.c:339
+#: ../modules/calendar/e-task-shell-backend.c:292
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "_Aufgabenliste"
 
-#: ../modules/calendar/e-task-shell-backend.c:341
-#: ../modules/calendar/e-task-shell-view-actions.c:716
+#: ../modules/calendar/e-task-shell-backend.c:294
+#: ../modules/calendar/e-task-shell-view-actions.c:725
 msgid "Create a new task list"
 msgstr "Eine neue Aufgabenliste anlegen"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:222
+#: ../modules/calendar/e-task-shell-sidebar.c:224
 msgid "Loading tasks"
 msgstr "Aufgaben werden geladen"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:571
+#: ../modules/calendar/e-task-shell-sidebar.c:591
 msgid "Task List Selector"
 msgstr "Aufgabenlistenauswahl"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:870
+#: ../modules/calendar/e-task-shell-sidebar.c:896
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Aufgaben unter %s werden geÃ¶ffnet"
@@ -15347,7 +15582,7 @@ msgstr "Aufgaben unter %s werden geÃ¶ffnet"
 msgid "Print Tasks"
 msgstr "Aufgaben drucken"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:554
+#: ../modules/calendar/e-task-shell-view-actions.c:563
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15360,95 +15595,95 @@ msgstr ""
 "\n"
 "Sollen die Aufgaben wirklich entfernt werden?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:679
+#: ../modules/calendar/e-task-shell-view-actions.c:688
 msgid "_Delete Task"
 msgstr "Aufgabe _lÃ¶schen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:686
+#: ../modules/calendar/e-task-shell-view-actions.c:695
 msgid "_Find in Task..."
 msgstr "In Aufgabe _suchen â?¦"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:688
+#: ../modules/calendar/e-task-shell-view-actions.c:697
 msgid "Search for text in the displayed task"
 msgstr "In der angezeigten Aufgabe nach Text suchen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:700
+#: ../modules/calendar/e-task-shell-view-actions.c:709
 msgid "Copy..."
 msgstr "Kopieren â?¦"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:707
+#: ../modules/calendar/e-task-shell-view-actions.c:716
 msgid "D_elete Task List"
 msgstr "Aufgabenlist_e lÃ¶schen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:709
+#: ../modules/calendar/e-task-shell-view-actions.c:718
 msgid "Delete the selected task list"
 msgstr "Die gewÃ¤hlte Aufgabenliste lÃ¶schen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:714
+#: ../modules/calendar/e-task-shell-view-actions.c:723
 msgid "_New Task List"
 msgstr "_Neue Aufgabenliste"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:730
+#: ../modules/calendar/e-task-shell-view-actions.c:739
 msgid "Refresh the selected task list"
 msgstr "Die gewÃ¤hlte Aufgabenliste aktualisieren"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:737
+#: ../modules/calendar/e-task-shell-view-actions.c:746
 msgid "Rename the selected task list"
 msgstr "Die gewÃ¤hlte Aufgabenliste umbenennen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:742
+#: ../modules/calendar/e-task-shell-view-actions.c:751
 msgid "Show _Only This Task List"
 msgstr "Nur diese Auf_gabenliste anzeigen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:756
+#: ../modules/calendar/e-task-shell-view-actions.c:765
 msgid "Mar_k as Incomplete"
 msgstr "Als unvollstÃ¤ndig mar_kieren"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:786
+#: ../modules/calendar/e-task-shell-view-actions.c:795
 msgid "Delete completed tasks"
 msgstr "Die abgeschlossenen Aufgaben lÃ¶schen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:861
+#: ../modules/calendar/e-task-shell-view-actions.c:870
 msgid "Task _Preview"
 msgstr "Aufgaben_vorschau"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:863
+#: ../modules/calendar/e-task-shell-view-actions.c:872
 msgid "Show task preview pane"
 msgstr "Aufgabenvorschaufeld anzeigen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:884
+#: ../modules/calendar/e-task-shell-view-actions.c:893
 msgid "Show task preview below the task list"
 msgstr "Aufgabenvorschau unter der Aufgabenliste anzeigen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:891
+#: ../modules/calendar/e-task-shell-view-actions.c:900
 msgid "Show task preview alongside the task list"
 msgstr "Aufgabenvorschau neben der Aufgabenliste anzeigen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:899
+#: ../modules/calendar/e-task-shell-view-actions.c:908
 msgid "Active Tasks"
 msgstr "Aktuelle Aufgaben"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:913
+#: ../modules/calendar/e-task-shell-view-actions.c:922
 msgid "Completed Tasks"
 msgstr "Abgeschlossene Aufgaben"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:920
+#: ../modules/calendar/e-task-shell-view-actions.c:929
 msgid "Next 7 Days' Tasks"
 msgstr "Aufgaben der nÃ¤chsten 7 Tage"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:927
+#: ../modules/calendar/e-task-shell-view-actions.c:936
 msgid "Overdue Tasks"
 msgstr "Ã?berfÃ¤llige Aufgaben"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:934
+#: ../modules/calendar/e-task-shell-view-actions.c:943
 msgid "Tasks with Attachments"
 msgstr "Aufgaben mit Anlagen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:984
+#: ../modules/calendar/e-task-shell-view-actions.c:993
 msgid "Print the list of tasks"
 msgstr "Die Aufgabenliste drucken"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:991
+#: ../modules/calendar/e-task-shell-view-actions.c:1000
 msgid "Preview the list of tasks to be printed"
 msgstr "Vorschau auf die zu druckende Aufgabenliste"
 
@@ -15484,360 +15719,358 @@ msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "Kein"
 
-#: ../modules/mail/e-mail-shell-backend.c:164
+#: ../modules/mail/e-mail-shell-backend.c:169
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_E-Mail-Nachricht"
 
-#: ../modules/mail/e-mail-shell-backend.c:166
+#: ../modules/mail/e-mail-shell-backend.c:171
 msgid "Compose a new mail message"
 msgstr "Eine neue E-Mail-Nachricht verfassen"
 
-#: ../modules/mail/e-mail-shell-backend.c:174
+#: ../modules/mail/e-mail-shell-backend.c:179
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "E-Mail-_Ordner"
 
-#: ../modules/mail/e-mail-shell-backend.c:176
+#: ../modules/mail/e-mail-shell-backend.c:181
 msgid "Create a new mail folder"
 msgstr "Einen neuen E-Mail-Ordner anlegen"
 
-#: ../modules/mail/e-mail-shell-backend.c:195
+#: ../modules/mail/e-mail-shell-backend.c:200
 msgid "Mail Accounts"
 msgstr "E-Mail-Konten"
 
-#: ../modules/mail/e-mail-shell-backend.c:203
+#: ../modules/mail/e-mail-shell-backend.c:208
 msgid "Mail Preferences"
 msgstr "E-Mail-Einstellungen"
 
-#: ../modules/mail/e-mail-shell-backend.c:211
+#: ../modules/mail/e-mail-shell-backend.c:216
 msgid "Composer Preferences"
 msgstr "Editoreinstellungen"
 
-#: ../modules/mail/e-mail-shell-backend.c:219
+#: ../modules/mail/e-mail-shell-backend.c:224
 msgid "Network Preferences"
 msgstr "Netzwerkeinstellungen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:814
-#: ../modules/mail/e-mail-shell-view.c:875
+#: ../modules/mail/e-mail-shell-view-actions.c:820
+#: ../modules/mail/e-mail-shell-view.c:871
 msgid "_Disable Account"
 msgstr "Konto _deaktivieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:816
+#: ../modules/mail/e-mail-shell-view-actions.c:822
 msgid "Disable this account"
 msgstr "Dieses Konto deaktivieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:823
+#: ../modules/mail/e-mail-shell-view-actions.c:829
 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:828
+#: ../modules/mail/e-mail-shell-view-actions.c:834
 msgid "C_reate Search Folder From Search..."
 msgstr "Sucho_rdner aus Suche anlegen â?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:835
+#: ../modules/mail/e-mail-shell-view-actions.c:841
 msgid "_Download Messages for Offline Usage"
 msgstr "_Nachrichten fÃ¼r Offline-Benutzung herunterladen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:837
+#: ../modules/mail/e-mail-shell-view-actions.c:843
 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:842
+#: ../modules/mail/e-mail-shell-view-actions.c:848
 msgid "Fl_ush Outbox"
 msgstr "E-Mails aus A_usgang verschicken"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:849
+#: ../modules/mail/e-mail-shell-view-actions.c:855
 msgid "_Copy Folder To..."
 msgstr "Ordner _kopieren nach â?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:851
+#: ../modules/mail/e-mail-shell-view-actions.c:857
 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:858
+#: ../modules/mail/e-mail-shell-view-actions.c:864
 msgid "Permanently remove this folder"
 msgstr "Diesen Ordner dauerhaft entfernen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:863
+#: ../modules/mail/e-mail-shell-view-actions.c:869
 msgid "E_xpunge"
 msgstr "_SÃ¤ubern"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:865
+#: ../modules/mail/e-mail-shell-view-actions.c:871
 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:870
+#: ../modules/mail/e-mail-shell-view-actions.c:876
 msgid "Mar_k All Messages as Read"
 msgstr "Alle Nachrichten als gelesen _markieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:872
+#: ../modules/mail/e-mail-shell-view-actions.c:878
 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:877
+#: ../modules/mail/e-mail-shell-view-actions.c:883
 msgid "_Move Folder To..."
 msgstr "Ordner verschie_ben nach â?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:879
+#: ../modules/mail/e-mail-shell-view-actions.c:885
 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:884
+#: ../modules/mail/e-mail-shell-view-actions.c:890
 msgid "_New..."
 msgstr "_Neu â?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:886
+#: ../modules/mail/e-mail-shell-view-actions.c:892
 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:893
+#: ../modules/mail/e-mail-shell-view-actions.c:899
 msgid "Change the properties of this folder"
 msgstr "Die Eigenschaften dieses Ordners Ã¤ndern"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:900
+#: ../modules/mail/e-mail-shell-view-actions.c:906
 msgid "Refresh the folder"
 msgstr "Den Ordner auffrischen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:907
+#: ../modules/mail/e-mail-shell-view-actions.c:913
 msgid "Change the name of this folder"
 msgstr "Den Namen dieses Ordners Ã¤ndern"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:912
+#: ../modules/mail/e-mail-shell-view-actions.c:918
 msgid "Select Message _Thread"
 msgstr "Nachrichten-_Thread auswÃ¤hlen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:914
+#: ../modules/mail/e-mail-shell-view-actions.c:920
 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:919
+#: ../modules/mail/e-mail-shell-view-actions.c:925
 msgid "Select Message S_ubthread"
 msgstr "Nachrichten-_Subthread auswÃ¤hlen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:921
+#: ../modules/mail/e-mail-shell-view-actions.c:927
 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:926
+#: ../modules/mail/e-mail-shell-view-actions.c:932
 msgid "_Unsubscribe"
 msgstr "Ab_bestellen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:928
+#: ../modules/mail/e-mail-shell-view-actions.c:934
 msgid "Unsubscribe from the selected folder"
 msgstr "Den gewÃ¤hlten Ordner abbestellen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:933
+#: ../modules/mail/e-mail-shell-view-actions.c:939
 msgid "Empty _Trash"
 msgstr "_MÃ¼ll leeren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:935
+#: ../modules/mail/e-mail-shell-view-actions.c:941
 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:940
+#: ../modules/mail/e-mail-shell-view-actions.c:946
 msgid "_New Label"
 msgstr "_Neue Beschriftung"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:949
+#: ../modules/mail/e-mail-shell-view-actions.c:955
 msgid "N_one"
 msgstr "_Keine"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:972
+#: ../modules/mail/e-mail-shell-view-actions.c:978
 msgid "Cancel the current mail operation"
 msgstr "Den momentan ausgefÃ¼hrten E-Mail-Vorgang abbrechen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:977
+#: ../modules/mail/e-mail-shell-view-actions.c:983
 msgid "Collapse All _Threads"
 msgstr "Alle _Threads einklappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:979
+#: ../modules/mail/e-mail-shell-view-actions.c:985
 msgid "Collapse all message threads"
 msgstr "Alle Nachrichten-Threads einklappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:984
+#: ../modules/mail/e-mail-shell-view-actions.c:990
 msgid "E_xpand All Threads"
 msgstr "Alle Threads a_usklappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:986
+#: ../modules/mail/e-mail-shell-view-actions.c:992
 msgid "Expand all message threads"
 msgstr "Alle Nachrichten-Threads ausklappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:991
+#: ../modules/mail/e-mail-shell-view-actions.c:997
 msgid "_Message Filters"
 msgstr "Nachrichtenf_ilter"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:993
+#: ../modules/mail/e-mail-shell-view-actions.c:999
 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:998
+#: ../modules/mail/e-mail-shell-view-actions.c:1004
 msgid "Search F_olders"
 msgstr "S_uchordner"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1000
+#: ../modules/mail/e-mail-shell-view-actions.c:1006
 msgid "Create or edit search folder definitions"
 msgstr "Suchordner-Definitionen anlegen oder bearbeiten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1005
+#: ../modules/mail/e-mail-shell-view-actions.c:1011
 msgid "_Subscriptions..."
 msgstr "A_bonnements â?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1007
+#: ../modules/mail/e-mail-shell-view-actions.c:1013
 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:1014
+#: ../modules/mail/e-mail-shell-view-actions.c:1020
 msgid "F_older"
 msgstr "_Ordner"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1021
+#: ../modules/mail/e-mail-shell-view-actions.c:1027
 msgid "_Label"
 msgstr "Bes_chriftung"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1061
+#: ../modules/mail/e-mail-shell-view-actions.c:1067
 msgid "_New Folder..."
 msgstr "Ordner a_nlegen â?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1085
+#: ../modules/mail/e-mail-shell-view-actions.c:1091
 msgid "Show Message _Preview"
 msgstr "Nachrichten_vorschau anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1087
+#: ../modules/mail/e-mail-shell-view-actions.c:1093
 msgid "Show message preview pane"
 msgstr "Nachrichten-Vorschaufenster anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1093
-#| msgid "Show deleted messages"
+#: ../modules/mail/e-mail-shell-view-actions.c:1099
 msgid "Show _Deleted Messages"
 msgstr "Gel_Ã¶schte Nachrichten anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1095
-#| msgid "Show deleted messages (with a strike-through) in the message-list."
+#: ../modules/mail/e-mail-shell-view-actions.c:1101
 msgid "Show deleted messages with a line through them"
 msgstr "GelÃ¶schte Nachrichten (durchgestrichen) anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1101
+#: ../modules/mail/e-mail-shell-view-actions.c:1107
 msgid "_Group By Threads"
 msgstr "Nach Threads _gruppieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1103
+#: ../modules/mail/e-mail-shell-view-actions.c:1109
 msgid "Threaded message list"
 msgstr "Nachrichtenliste nach Threads sortieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1124
+#: ../modules/mail/e-mail-shell-view-actions.c:1130
 msgid "Show message preview below the message list"
 msgstr "Nachrichtenvorschau unter der Nachrichtenliste anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1131
+#: ../modules/mail/e-mail-shell-view-actions.c:1137
 msgid "Show message preview alongside the message list"
 msgstr "Nachrichtenvorschau neben der Nachrichtenliste anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1139
+#: ../modules/mail/e-mail-shell-view-actions.c:1145
 msgid "All Messages"
 msgstr "Alle Nachrichten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1146
+#: ../modules/mail/e-mail-shell-view-actions.c:1152
 msgid "Important Messages"
 msgstr "Wichtige Nachrichten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1153
+#: ../modules/mail/e-mail-shell-view-actions.c:1159
 msgid "Last 5 Days' Messages"
 msgstr "Nachrichten der letzten fÃ¼nf Tage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1160
+#: ../modules/mail/e-mail-shell-view-actions.c:1166
 msgid "Messages Not Junk"
 msgstr "Nachrichten sind nicht unerwÃ¼nscht"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1167
+#: ../modules/mail/e-mail-shell-view-actions.c:1173
 msgid "Messages with Attachments"
 msgstr "Nachrichten mit Anlagen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1174
+#: ../modules/mail/e-mail-shell-view-actions.c:1180
 msgid "No Label"
 msgstr "Keine Beschriftung"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1181
+#: ../modules/mail/e-mail-shell-view-actions.c:1187
 msgid "Read Messages"
 msgstr "Gelesene Nachrichten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1188
+#: ../modules/mail/e-mail-shell-view-actions.c:1194
 msgid "Recent Messages"
 msgstr "Letzte Nachrichten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1195
+#: ../modules/mail/e-mail-shell-view-actions.c:1201
 msgid "Unread Messages"
 msgstr "Ungelesene Nachrichten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1247
+#: ../modules/mail/e-mail-shell-view-actions.c:1253
 msgid "Subject or Addresses contain"
 msgstr "Betreff oder Adresse enthÃ¤lt"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1257
+#: ../modules/mail/e-mail-shell-view-actions.c:1263
 msgid "All Accounts"
 msgstr "Alle Konten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1264
+#: ../modules/mail/e-mail-shell-view-actions.c:1270
 msgid "Current Account"
 msgstr "Derzeitiges Konto"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1271
+#: ../modules/mail/e-mail-shell-view-actions.c:1277
 msgid "Current Folder"
 msgstr "Derzeitiger Ordner"
 
-#: ../modules/mail/e-mail-shell-view-private.c:881
+#: ../modules/mail/e-mail-shell-view-private.c:887
 #, 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:892
+#: ../modules/mail/e-mail-shell-view-private.c:898
 #, 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:898
-#: ../modules/mail/e-mail-shell-view-private.c:905
+#: ../modules/mail/e-mail-shell-view-private.c:904
+#: ../modules/mail/e-mail-shell-view-private.c:911
 #, 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:911
+#: ../modules/mail/e-mail-shell-view-private.c:917
 #, 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:917
+#: ../modules/mail/e-mail-shell-view-private.c:923
 #, 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:923
+#: ../modules/mail/e-mail-shell-view-private.c:929
 #, 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:935
+#: ../modules/mail/e-mail-shell-view-private.c:941
 #, 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:938
+#: ../modules/mail/e-mail-shell-view-private.c:944
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -15848,69 +16081,77 @@ msgstr[1] "%d insgesamt"
 msgid "All Account Search"
 msgstr "Alle Konten durchsuchen"
 
-#: ../modules/mail/e-mail-shell-view.c:685
+#: ../modules/mail/e-mail-shell-view.c:675
 msgid "Account Search"
 msgstr "Konto durchsuchen"
 
-#: ../modules/mail/e-mail-shell-view.c:873
+#: ../modules/mail/e-mail-shell-view.c:869
 msgid "Proxy _Logout"
 msgstr "Vertretungsa_bmeldung"
 
-#: ../modules/mail/em-composer-prefs.c:472
+#: ../modules/mail/em-account-prefs.c:129
+msgid "Evolution Account Assistant"
+msgstr "Evolution-Kontoassistent"
+
+#: ../modules/mail/em-account-prefs.c:178
+msgid "Account Editor"
+msgstr "Konteneditor"
+
+#: ../modules/mail/em-composer-prefs.c:498
 #: ../plugins/plugin-manager/plugin-manager.c:349
 #: ../plugins/publish-calendar/publish-calendar.c:827
 #: ../widgets/misc/e-account-tree-view.c:205
 msgid "Enabled"
 msgstr "Aktiv"
 
-#: ../modules/mail/em-composer-prefs.c:476
+#: ../modules/mail/em-composer-prefs.c:502
 msgid "Language(s)"
 msgstr "Sprache(n)"
 
-#: ../modules/mail/em-mailer-prefs.c:96
+#: ../modules/mail/em-mailer-prefs.c:97
 msgid "Every time"
 msgstr "Jedes Mal"
 
-#: ../modules/mail/em-mailer-prefs.c:97
+#: ../modules/mail/em-mailer-prefs.c:98
 msgid "Once per day"
 msgstr "Einmal pro Tag"
 
-#: ../modules/mail/em-mailer-prefs.c:98
+#: ../modules/mail/em-mailer-prefs.c:99
 msgid "Once per week"
 msgstr "Einmal pro Woche"
 
-#: ../modules/mail/em-mailer-prefs.c:99
+#: ../modules/mail/em-mailer-prefs.c:100
 msgid "Once per month"
 msgstr "Einmal pro Monat"
 
-#: ../modules/mail/em-mailer-prefs.c:224
+#: ../modules/mail/em-mailer-prefs.c:225
 msgid "Add Custom Junk Header"
 msgstr "Benutzerdefinierte UnerwÃ¼nscht-Kopfzeile hinzufÃ¼gen"
 
-#: ../modules/mail/em-mailer-prefs.c:232
+#: ../modules/mail/em-mailer-prefs.c:233
 msgid "Header Name:"
 msgstr "Name der Kopfzeile:"
 
-#: ../modules/mail/em-mailer-prefs.c:233
+#: ../modules/mail/em-mailer-prefs.c:234
 msgid "Header Value Contains:"
 msgstr "Wert der Kopfzeile enthÃ¤lt:"
 
-#: ../modules/mail/em-mailer-prefs.c:333
+#: ../modules/mail/em-mailer-prefs.c:334
 msgid "Header"
 msgstr "Kopfzeile"
 
-#: ../modules/mail/em-mailer-prefs.c:337
+#: ../modules/mail/em-mailer-prefs.c:338
 msgid "Contains Value"
 msgstr "EnthÃ¤lt Wert"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:730 ../modules/mail/em-mailer-prefs.c:801
+#: ../modules/mail/em-mailer-prefs.c:731 ../modules/mail/em-mailer-prefs.c:802
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s-Plugin ist verfÃ¼gbar und das zugehÃ¶rige Programm ist installiert."
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:738 ../modules/mail/em-mailer-prefs.c:810
+#: ../modules/mail/em-mailer-prefs.c:739 ../modules/mail/em-mailer-prefs.c:811
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
@@ -15918,19 +16159,34 @@ msgstr ""
 "%s-Plugin ist nicht verfÃ¼gbar. Bitte prÃ¼fen Sie, ob das zugehÃ¶rige "
 "Programmpaket installiert ist."
 
-#: ../modules/mail/em-mailer-prefs.c:774
+#: ../modules/mail/em-mailer-prefs.c:775
 msgid "No junk plugin available"
 msgstr "Kein UnerwÃ¼nscht-Plugin verfÃ¼gbar"
 
 #. 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:1161
+#: ../modules/mail/em-mailer-prefs.c:1167
 msgid "_Date header:"
 msgstr "_Datum in der Kopfzeile:"
 
-#: ../modules/mail/em-mailer-prefs.c:1162
+#: ../modules/mail/em-mailer-prefs.c:1168
 msgid "Show _original header value"
 msgstr "_Originalwert der Kopfzeile anzeigen"
 
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
+msgid "Check whether Evolution is the default mailer"
+msgstr "Ã?berprÃ¼fen, ob Evolution die Vorgabeanwendung zur E-Mail-Verwaltung ist"
+
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
+msgstr ""
+"Bei jedem Start Ã¼berprÃ¼fen, ob Evolution die Vorgabeanwendung zur E-Mail-"
+"Verwaltung ist."
+
+#: ../modules/mailto-handler/evolution-mailto-handler.c:138
+msgid "Do you want to make Evolution your default email client?"
+msgstr "MÃ¶chten Sie Evolution zu Ihrer bevorzugten E-Mail-Anwendung machen?"
+
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "Hello Python"
@@ -15947,6 +16203,50 @@ msgstr "Python-Plugin"
 msgid "Test Plugin for Python EPlugin loader."
 msgstr "Python-Plugin-Loader."
 
+#: ../modules/startup-wizard/evolution-startup-wizard.c:270
+#: ../widgets/misc/e-import-assistant.c:389
+msgid "Please select the information that you would like to import:"
+msgstr "Bitte wÃ¤hlen Sie die Informationen, die Sie importieren wollen:"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:302
+#: ../widgets/misc/e-import-assistant.c:545
+#, c-format
+msgid "From %s:"
+msgstr "Von %s:"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:313
+#: ../modules/startup-wizard/evolution-startup-wizard.c:410
+msgid "Importing Files"
+msgstr "Dateien werden importiert"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:388
+msgid "Import cancelled. Click \"Forward\" to continue."
+msgstr "Import wurde abgebrochen. Klicken Sie auf Â»WeiterÂ«, um fortzufahren."
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:406
+msgid "Import complete. Click \"Forward\" to continue."
+msgstr "Import ist abgeschlossen. Klicken Sie auf Â»WeiterÂ«, um fortzufahren."
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:466
+msgid "Evolution Setup Assistant"
+msgstr "Evolution-Einrichtungsassistent"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:472
+msgid "Welcome"
+msgstr "Willkommen"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:477
+msgid ""
+"Welcome to Evolution. The next few screens will allow Evolution to connect to "
+"your email accounts, and to import files from other applications. \n"
+"\n"
+"Please click the \"Forward\" button to continue. "
+msgstr ""
+"Willkommen bei Evolution. Die folgenden Dialoge werden Ihnen helfen, Ihre E-"
+"Mail-Konten einzurichten und Dateien aus anderen Anwendungen zu importieren.\n"
+"\n"
+"Klicken Sie auf Â»VorÂ«, um fortzufahren. "
+
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 msgid "Add local address books to Evolution."
 msgstr "Lokale AdressbÃ¼cher zu Evolution hinzufÃ¼gen."
@@ -15962,7 +16262,7 @@ msgstr ""
 "Liste der Begriffe, nach denen die Anlagenerinnerung im Text der Nachricht "
 "sucht"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:509
+#: ../plugins/attachment-reminder/attachment-reminder.c:451
 #: ../plugins/templates/templates.c:409
 msgid "Keywords"
 msgstr "SchlÃ¼sselwÃ¶rter"
@@ -16047,7 +16347,6 @@ msgid "Restore from backup"
 msgstr "Aus Sicherungsdatei wiederherstellen"
 
 #: ../plugins/backup-restore/backup-restore.c:361
-#| msgid "_Backup Settings..."
 msgid "_Backup Evolution Settings..."
 msgstr "Evolution-Einstellungen sic_hern â?¦"
 
@@ -16058,7 +16357,6 @@ msgstr ""
 "Archivdatei"
 
 #: ../plugins/backup-restore/backup-restore.c:368
-#| msgid "R_estore Settings..."
 msgid "R_estore Evolution Settings..."
 msgstr "Evolution-Einstellungen wiederherstell_en â?¦"
 
@@ -16113,7 +16411,6 @@ msgid "Restarting Evolution"
 msgstr "Evolution wird neugestartet"
 
 #: ../plugins/backup-restore/backup.c:255
-#| msgid "Backup current Evolution data"
 msgid "Back up current Evolution data"
 msgstr "Aktuelle Evolution-Daten sichern"
 
@@ -16256,7 +16553,6 @@ msgstr "Instant-Messaging-Kontakte"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:745
-#| msgid "Synchronize contact info and images from Pidgin buddy list"
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 "Kontaktinformationen und -bilder regelmÃ¤Ã?ig mit der Pidgin-Kontaktliste "
@@ -16289,33 +16585,33 @@ msgstr ""
 "Nachrichten geantwortet wird und fÃ¼gt auch Instant-Messaging-"
 "Kontaktinformationen aus Ihren Buddy-Listen hinzu."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:153
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:154
 #, c-format
 msgid "Bogofilter is not available. Please install it first."
 msgstr "Bogofilter ist nicht verfÃ¼gbar. Bitte installieren Sie es zunÃ¤chst."
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:157
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "Beim Aufrufen von %s ist ein Fehler aufgetreten: %s"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Bogofilter-Kindprozess antwortet nicht. Wird abgewÃ¼rgt â?¦"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:189
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Warten auf Bogofilter-Kindprozess abgebrochen. Wird beendet â?¦"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:210
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:212
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "Weiterleitung an Bogofilter gescheitert, Fehler-Code: %d"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:394
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
 msgid "Convert message text to _Unicode"
 msgstr "Nachrichtentext nach _Unicode konvertieren"
 
@@ -16361,11 +16657,6 @@ msgstr ""
 "Server gab unerwartete Daten zurÃ¼ck.\n"
 "%d - %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:203
-#: ../plugins/caldav/caldav-browse-server.c:1254 ../plugins/face/face.c:169
-msgid "Unknown error"
-msgstr "Unbekannter Fehler"
-
 #: ../plugins/caldav/caldav-browse-server.c:333
 #: ../plugins/caldav/caldav-browse-server.c:584
 msgid "Failed to parse server response."
@@ -16406,7 +16697,6 @@ msgstr "Vorheriger Versuch scheiterte mit Code %d"
 
 #: ../plugins/caldav/caldav-browse-server.c:801
 #, c-format
-#| msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
 msgid "Enter password for user %s on server %s"
 msgstr "Geben Sie das Passwort fÃ¼r Benutzer %s auf dem Server %s ein"
 
@@ -16442,26 +16732,22 @@ msgstr "Serveradresse Â»%sÂ« ist keine gÃ¼ltige Adresse"
 msgid "Browse for a CalDAV calendar"
 msgstr "Nach einem CalDAV-Kalender suchen"
 
-#: ../plugins/caldav/caldav-source.c:66
-msgid "CalDAV"
-msgstr "CalDAV"
-
 #: ../plugins/caldav/caldav-source.c:216
 #: ../plugins/calendar-http/calendar-http.c:100
 msgid "_URL:"
 msgstr "_Adresse:"
 
-#: ../plugins/caldav/caldav-source.c:220
+#: ../plugins/caldav/caldav-source.c:223
 #: ../plugins/google-account-setup/google-contacts-source.c:308
 msgid "Use _SSL"
 msgstr "_SSL verwenden"
 
-#: ../plugins/caldav/caldav-source.c:229
+#: ../plugins/caldav/caldav-source.c:235
 msgid "Brows_e server for a calendar"
 msgstr "Server nach einem Kal_ender durchsuchen"
 
-#: ../plugins/caldav/caldav-source.c:241
-#: ../plugins/calendar-file/calendar-file.c:190
+#: ../plugins/caldav/caldav-source.c:251
+#: ../plugins/calendar-file/calendar-file.c:191
 #: ../plugins/calendar-http/calendar-http.c:119
 #: ../plugins/calendar-weather/calendar-weather.c:395
 #: ../plugins/google-account-setup/google-contacts-source.c:326
@@ -16477,31 +16763,31 @@ msgstr "CalDAV-UnterstÃ¼tzung zu Evolution hinzufÃ¼gen."
 msgid "CalDAV Support"
 msgstr "CalDAV-UnterstÃ¼tzung"
 
-#: ../plugins/calendar-file/calendar-file.c:124
+#: ../plugins/calendar-file/calendar-file.c:125
 msgid "_Customize options"
 msgstr "Optionen _anpassen"
 
-#: ../plugins/calendar-file/calendar-file.c:143
+#: ../plugins/calendar-file/calendar-file.c:144
 msgid "File _name:"
 msgstr "Datei_name:"
 
-#: ../plugins/calendar-file/calendar-file.c:147
+#: ../plugins/calendar-file/calendar-file.c:148
 msgid "Choose calendar file"
 msgstr "WÃ¤hlen Sie eine Kalenderdatei"
 
-#: ../plugins/calendar-file/calendar-file.c:195
+#: ../plugins/calendar-file/calendar-file.c:196
 msgid "On open"
 msgstr "Beim Ã?ffnen"
 
-#: ../plugins/calendar-file/calendar-file.c:196
+#: ../plugins/calendar-file/calendar-file.c:197
 msgid "On file change"
 msgstr "Bei DateiÃ¤nderungen"
 
-#: ../plugins/calendar-file/calendar-file.c:197
+#: ../plugins/calendar-file/calendar-file.c:198
 msgid "Periodically"
 msgstr "RegelmÃ¤Ã?ig"
 
-#: ../plugins/calendar-file/calendar-file.c:212
+#: ../plugins/calendar-file/calendar-file.c:213
 msgid "Force read _only"
 msgstr "_Nur lesen erzwingen"
 
@@ -16613,30 +16899,27 @@ msgstr "Wenn mÃ¶glich, eine Karte hinzufÃ¼gen, die den Ort von Kontakten anzeigt
 msgid "Map for contacts"
 msgstr "Karte fÃ¼r Kontakte"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
-msgid "Check whether Evolution is the default mailer"
-msgstr "Ã?berprÃ¼fen, ob Evolution die Vorgabeanwendung zur E-Mail-Verwaltung ist"
-
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
+#: ../plugins/dbx-import/dbx-importer.c:232
+msgid "Select folder to import OE folder into"
 msgstr ""
-"Bei jedem Start Ã¼berprÃ¼fen, ob Evolution die Vorgabeanwendung zur E-Mail-"
-"Verwaltung ist."
+"WÃ¤hlen Sie den Ordner, in den der Outlook-Express-Ordner importiert werden "
+"soll"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
-msgid "Check whether Evolution is the default mail client on startup."
-msgstr ""
-"Beim Start Ã¼berprÃ¼fen, ob Evolution die bevorzugte Anwendung zur E-Mail-"
-"Verwaltung ist."
+#: ../plugins/dbx-import/dbx-importer.c:251
+msgid "Importing Outlook Express data"
+msgstr "Daten aus Outlook Express werden importiert"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
-msgid "Default Mail Client"
-msgstr "Bevorzugte E-Mail-Verwaltung"
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:1
+msgid "Import Outlook Express messages from DBX file"
+msgstr "Outlook-Express-Nachrichten aus einer DBX-Datei importieren"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
-msgid "Do you want to make Evolution your default e-mail client?"
-msgstr "MÃ¶chten Sie Evolution zu Ihrer bevorzugten E-Mail-Anwendung machen?"
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
+msgid "Outlook DBX import"
+msgstr "Outlook DBX-Importeur"
+
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
+msgid "Outlook Express 5/6 personal folders (.dbx)"
+msgstr "PersÃ¶nliche Ordner aus Outlook Express 5/6 (.dbx)"
 
 #: ../plugins/default-source/default-source.c:83
 msgid "Mark as _default address book"
@@ -16716,7 +16999,7 @@ msgstr "Benutzerdefinierte _Kopfzeile"
 # CHECK
 #  to specifying the format of the key values
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:896
+#: ../plugins/email-custom-header/email-custom-header.c:830
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -16724,11 +17007,11 @@ msgstr ""
 "Das Format zum Festlegen einer eigenen Kopfzeile lautet:\n"
 "Name der eigenen Kopfzeile;WertÂ«"
 
-#: ../plugins/email-custom-header/email-custom-header.c:950
+#: ../plugins/email-custom-header/email-custom-header.c:884
 msgid "Key"
 msgstr "SchlÃ¼ssel"
 
-#: ../plugins/email-custom-header/email-custom-header.c:961
+#: ../plugins/email-custom-header/email-custom-header.c:900
 #: ../plugins/templates/templates.c:415
 msgid "Values"
 msgstr "Werte"
@@ -16888,14 +17171,8 @@ msgstr ""
 "Die von Ihnen ausgewÃ¤hlte Datei scheint keine gÃ¼ltige *.png-Datei zu sein. "
 "Fehler: {0}"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:53
-#: ../plugins/google-account-setup/google-source.c:81
-msgid "Google"
-msgstr "Google"
-
 #: ../plugins/google-account-setup/google-contacts-source.c:274
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:236
-#| msgid "_Server:"
 msgid "Server"
 msgstr "Server"
 
@@ -16916,8 +17193,8 @@ msgstr ""
 "%s"
 
 #: ../plugins/google-account-setup/google-source.c:548
-#: ../plugins/mail-to-task/mail-to-task.c:718
-#: ../plugins/mail-to-task/mail-to-task.c:934
+#: ../plugins/mail-to-task/mail-to-task.c:736
+#: ../plugins/mail-to-task/mail-to-task.c:952
 msgid "Unknown error."
 msgstr "Unbekannter Fehler."
 
@@ -16926,7 +17203,6 @@ msgid "Cal_endar:"
 msgstr "_Kalender:"
 
 #: ../plugins/google-account-setup/google-source.c:669
-#| msgid "Retrieve _list"
 msgid "Retrieve _List"
 msgstr "_Liste abrufen"
 
@@ -16970,12 +17246,12 @@ msgstr "VorlÃ¤ufig annehmen"
 msgid "Rese_nd Meeting..."
 msgstr "Besprechung er_neut versenden â?¦"
 
-#: ../plugins/groupwise-features/install-shared.c:167
-#: ../plugins/groupwise-features/share-folder-common.c:349
+#: ../plugins/groupwise-features/install-shared.c:165
+#: ../plugins/groupwise-features/share-folder-common.c:343
 msgid "Create folder"
 msgstr "Ordner anlegen"
 
-#: ../plugins/groupwise-features/install-shared.c:219
+#: ../plugins/groupwise-features/install-shared.c:217
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17000,11 +17276,11 @@ msgstr ""
 "Klicken Sie auf Â»AnwendenÂ«, um den gemeinsamen Ordner einzurichten\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:231
+#: ../plugins/groupwise-features/install-shared.c:229
 msgid "Install the shared folder"
 msgstr "Gemeinsamen Ordner einrichten"
 
-#: ../plugins/groupwise-features/install-shared.c:235
+#: ../plugins/groupwise-features/install-shared.c:233
 msgid "Shared Folder Installation"
 msgstr "Einrichten von Gemeinsamen Ordnern"
 
@@ -17025,11 +17301,6 @@ msgstr "E-Mail:"
 msgid "Junk List:"
 msgstr "UnerwÃ¼nscht-Liste:"
 
-#: ../plugins/groupwise-features/junk-settings.ui.h:5
-#: ../plugins/publish-calendar/publish-calendar.c:596
-msgid "_Disable"
-msgstr "_Deaktivieren"
-
 #: ../plugins/groupwise-features/junk-settings.ui.h:6
 msgid "_Enable"
 msgstr "A_ktivieren"
@@ -17205,7 +17476,6 @@ msgid "The participants will receive the following notification.\n"
 msgstr "Die berechtigten Nutzer werden folgende Benachrichtigung erhalten.\n"
 
 #: ../plugins/groupwise-features/properties.ui.h:9
-#| msgid "Users"
 msgid "Users:"
 msgstr "Benutzer:"
 
@@ -17283,24 +17553,23 @@ msgid "%sEnter password for %s (user %s)"
 msgstr "%sPasswort fÃ¼r %s (Benutzer %s) eingeben"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:690
+#: ../plugins/groupwise-features/proxy.c:689
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "Der Vertretungsreiter ist nur verfÃ¼gbar, wenn das Konto online ist."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:696
+#: ../plugins/groupwise-features/proxy.c:695
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Der Vertretungsreiter ist nur verfÃ¼gbar, wenn das Konto aktiviert ist."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:701
-#| msgid "Proxy"
+#: ../plugins/groupwise-features/proxy.c:700
 msgctxt "GW"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../plugins/groupwise-features/proxy.c:929
-#: ../plugins/groupwise-features/share-folder.c:701
+#: ../plugins/groupwise-features/proxy.c:926
+#: ../plugins/groupwise-features/share-folder.c:691
 msgid "Add User"
 msgstr "Benutzer hinzufÃ¼gen"
 
@@ -17308,16 +17577,16 @@ msgstr "Benutzer hinzufÃ¼gen"
 msgid "Advanced send options"
 msgstr "Erweiterte Versandoptionen"
 
-#: ../plugins/groupwise-features/share-folder-common.c:315
-#: ../plugins/groupwise-features/share-folder.c:736
+#: ../plugins/groupwise-features/share-folder-common.c:309
+#: ../plugins/groupwise-features/share-folder.c:726
 msgid "Users"
 msgstr "Benutzer"
 
-#: ../plugins/groupwise-features/share-folder-common.c:316
+#: ../plugins/groupwise-features/share-folder-common.c:310
 msgid "Enter the users and set permissions"
 msgstr "Eingabe der Benutzer und Festlegen der Rechte"
 
-#: ../plugins/groupwise-features/share-folder-common.c:416
+#: ../plugins/groupwise-features/share-folder-common.c:410
 msgid "Sharing"
 msgstr "Freigeben"
 
@@ -17325,7 +17594,7 @@ msgstr "Freigeben"
 msgid "Custom Notification"
 msgstr "Eigene Benachrichtigung"
 
-#: ../plugins/groupwise-features/share-folder.c:741
+#: ../plugins/groupwise-features/share-folder.c:731
 msgid "Add   "
 msgstr "HinzufÃ¼gen   "
 
@@ -17386,12 +17655,12 @@ msgstr "Eingebettetes Bild"
 msgid "View image attachments directly in mail messages."
 msgstr "BildanhÃ¤nge direkt innerhalb von Nachrichten anzeigen."
 
-#: ../plugins/imap-features/imap-headers.c:332
+#: ../plugins/imap-features/imap-headers.c:330
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "Benutzerdefinierte Kopfzeilen"
 
-#: ../plugins/imap-features/imap-headers.c:345
+#: ../plugins/imap-features/imap-headers.c:343
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "IMAP-Kopfzeilen"
@@ -17438,147 +17707,149 @@ msgstr "IMAP-Konten detailliert einstellen."
 msgid "IMAP Features"
 msgstr "IMAP-Funktionen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:482
+#. Translators: The first '%s' is replaced with a calendar name,
+#. the second '%s' with an error message
+#: ../plugins/itip-formatter/itip-formatter.c:485
 #, c-format
-msgid "Failed to load the calendar '%s'"
-msgstr "Der Kalender Â»%sÂ« konnte nicht geladen werden"
+msgid "Failed to load the calendar '%s' (%s)"
+msgstr "Der Kalender Â»%sÂ« konnte nicht geladen werden (%s)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:648
+#: ../plugins/itip-formatter/itip-formatter.c:649
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Ein Termin im Kalender Â»%sÂ« Ã¼berschneidet sich mit dieser Besprechung"
 
-#: ../plugins/itip-formatter/itip-formatter.c:684
+#: ../plugins/itip-formatter/itip-formatter.c:685
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Der Termin wurde im Kalender Â»%sÂ« gefunden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:783
+#: ../plugins/itip-formatter/itip-formatter.c:784
 msgid "Unable to find any calendars"
 msgstr "Es wurden keine Kalender gefunden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:790
+#: ../plugins/itip-formatter/itip-formatter.c:791
 msgid "Unable to find this meeting in any calendar"
 msgstr "Diese Besprechung wurde in keinem Kalender gefunden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:794
+#: ../plugins/itip-formatter/itip-formatter.c:795
 msgid "Unable to find this task in any task list"
 msgstr "Diese Aufgabe wurde in keiner Aufgabenliste gefunden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:798
+#: ../plugins/itip-formatter/itip-formatter.c:799
 msgid "Unable to find this memo in any memo list"
 msgstr "Diese Notiz wurde in keiner Notizliste gefunden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:872
+#: ../plugins/itip-formatter/itip-formatter.c:873
 msgid "Opening the calendar. Please wait.."
 msgstr "Kalender wird geÃ¶ffnet. Bitte warten â?¦"
 
-#: ../plugins/itip-formatter/itip-formatter.c:875
+#: ../plugins/itip-formatter/itip-formatter.c:876
 msgid "Searching for an existing version of this appointment"
 msgstr "Eine bestehende Version dieses Termins wird gesucht"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1056
+#: ../plugins/itip-formatter/itip-formatter.c:1057
 msgid "Unable to parse item"
 msgstr "Element kann nicht analysiert werden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1143
+#: ../plugins/itip-formatter/itip-formatter.c:1144
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Element kann nicht zu Kalender Â»%sÂ« gesendet werden. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1155
+#: ../plugins/itip-formatter/itip-formatter.c:1156
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "In Kalender Â»%sÂ« als Â»AngenommenÂ« eingetragen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1159
+#: ../plugins/itip-formatter/itip-formatter.c:1160
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "In Kalender Â»%sÂ« als Â»VorlÃ¤ufig angenommenÂ« eingetragen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1164
+#: ../plugins/itip-formatter/itip-formatter.c:1165
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "In Kalender Â»%sÂ« als Â»AbgelehntÂ« eingetragen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1169
+#: ../plugins/itip-formatter/itip-formatter.c:1170
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "In Kalender Â»%sÂ« als Â»AbgesagtÂ« eingetragen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1263
+#: ../plugins/itip-formatter/itip-formatter.c:1264
 #, c-format
 msgid "Organizer has removed the delegate %s "
-msgstr "Der Organisator hat den Delegaten %s entfernt "
+msgstr "Der Organisator hat den Vertreter %s entfernt "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1270
+#: ../plugins/itip-formatter/itip-formatter.c:1271
 msgid "Sent a cancelation notice to the delegate"
-msgstr "Dem Delegaten wurde eine Absagenachricht zugestellt"
+msgstr "Dem Vertreter wurde eine Absagenachricht zugestellt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1272
+#: ../plugins/itip-formatter/itip-formatter.c:1273
 msgid "Could not send the cancelation notice to the delegate"
-msgstr "Die Absagenachricht konnte dem Delegaten nicht zugestellt werden"
+msgstr "Die Absagenachricht konnte dem Vertreter nicht zugestellt werden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1383
+#: ../plugins/itip-formatter/itip-formatter.c:1384
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "Teilnehmerstatus konnte auf Grund eines ungÃ¼ltigen Zustands nicht "
 "aktualisiert werden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1412
+#: ../plugins/itip-formatter/itip-formatter.c:1413
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Teilnehmer konnte nicht aktualisiert werden. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1416
+#: ../plugins/itip-formatter/itip-formatter.c:1417
 msgid "Attendee status updated"
 msgstr "Teilnehmerstatus aktualisiert"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1442
+#: ../plugins/itip-formatter/itip-formatter.c:1443
 msgid "Meeting information sent"
 msgstr "Besprechungsinformationen wurden verschickt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1445
+#: ../plugins/itip-formatter/itip-formatter.c:1446
 msgid "Task information sent"
 msgstr "Aufgabeninformationen wurden verschickt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1448
+#: ../plugins/itip-formatter/itip-formatter.c:1449
 msgid "Memo information sent"
 msgstr "Notizinformationen wurden verschickt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1457
+#: ../plugins/itip-formatter/itip-formatter.c:1458
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr ""
 "Verschicken der Besprechungsinformationen nicht mÃ¶glich, die Besprechung "
 "existiert nicht"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1460
+#: ../plugins/itip-formatter/itip-formatter.c:1461
 msgid "Unable to send task information, the task does not exist"
 msgstr ""
 "Verschicken der Aufgabeninformationen nicht mÃ¶glich, die Aufgabe existiert "
 "nicht"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1463
+#: ../plugins/itip-formatter/itip-formatter.c:1464
 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.
-#: ../plugins/itip-formatter/itip-formatter.c:1528
+#: ../plugins/itip-formatter/itip-formatter.c:1529
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1533
+#: ../plugins/itip-formatter/itip-formatter.c:1534
 msgid "Save Calendar"
 msgstr "Kalender speichern"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1586
-#: ../plugins/itip-formatter/itip-formatter.c:1597
+#: ../plugins/itip-formatter/itip-formatter.c:1587
+#: ../plugins/itip-formatter/itip-formatter.c:1598
 msgid "The calendar attached is not valid"
 msgstr "Der beigelegte Kalender ist ungÃ¼ltig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1587
-#: ../plugins/itip-formatter/itip-formatter.c:1598
+#: ../plugins/itip-formatter/itip-formatter.c:1588
+#: ../plugins/itip-formatter/itip-formatter.c:1599
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17586,15 +17857,15 @@ msgstr ""
 "Die Nachricht gibt an, einen Kalender zu enthalten. Dieser Kalender ist "
 "jedoch kein gÃ¼ltiger iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1638
-#: ../plugins/itip-formatter/itip-formatter.c:1666
-#: ../plugins/itip-formatter/itip-formatter.c:1772
-msgid "The item in the calendar is not valid"
-msgstr "Das Element im Kalender ist ungÃ¼ltig"
-
 #: ../plugins/itip-formatter/itip-formatter.c:1639
 #: ../plugins/itip-formatter/itip-formatter.c:1667
 #: ../plugins/itip-formatter/itip-formatter.c:1773
+msgid "The item in the calendar is not valid"
+msgstr "Das Element im Kalender ist ungÃ¼ltig"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1640
+#: ../plugins/itip-formatter/itip-formatter.c:1668
+#: ../plugins/itip-formatter/itip-formatter.c:1774
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17602,11 +17873,11 @@ msgstr ""
 "Die Nachricht enthÃ¤lt einen Kalender. Dieser beinhaltet allerdings keine "
 "Ereignisse, Aufgaben oder VerfÃ¼gbarkeitsinformationen."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1680
+#: ../plugins/itip-formatter/itip-formatter.c:1681
 msgid "The calendar attached contains multiple items"
 msgstr "Der beigelegte Kalender enthÃ¤lt mehrere Elemente."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1681
+#: ../plugins/itip-formatter/itip-formatter.c:1682
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17614,31 +17885,31 @@ msgstr ""
 "Um alle diese Elemente weiterzuverarbeiten, sollte die Datei gespeichert und "
 "der Kalender importiert werden."
 
-#: ../plugins/itip-formatter/itip-formatter.c:2451
+#: ../plugins/itip-formatter/itip-formatter.c:2452
 msgid "This meeting recurs"
 msgstr "Diese Besprechung wird wiederholt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2454
+#: ../plugins/itip-formatter/itip-formatter.c:2455
 msgid "This task recurs"
 msgstr "Diese Aufgabe wird wiederholt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2457
+#: ../plugins/itip-formatter/itip-formatter.c:2458
 msgid "This memo recurs"
 msgstr "Diese Notiz wird wiederholt"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2691
+#: ../plugins/itip-formatter/itip-formatter.c:2692
 msgid "_Delete message after acting"
 msgstr "_LÃ¶schen der Nachricht nach Abarbeitung"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2701
-#: ../plugins/itip-formatter/itip-formatter.c:2734
+#: ../plugins/itip-formatter/itip-formatter.c:2702
+#: ../plugins/itip-formatter/itip-formatter.c:2735
 msgid "Conflict Search"
 msgstr "Konfliktsuche"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2716
+#: ../plugins/itip-formatter/itip-formatter.c:2717
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Kalender zur Suche nach Besprechungskonflikten auswÃ¤hlen"
 
@@ -17778,7 +18049,6 @@ msgstr "%A, %e. %B %Y %l:%M:%S %p"
 #: ../plugins/itip-formatter/itip-view.c:455
 #: ../plugins/itip-formatter/itip-view.c:542
 #, c-format
-#| msgid "Please respond on behalf of <b>%s</b>"
 msgid "Please respond on behalf of %s"
 msgstr "Bitte antworten Sie im Namen von %s"
 
@@ -17786,57 +18056,46 @@ msgstr "Bitte antworten Sie im Namen von %s"
 #: ../plugins/itip-formatter/itip-view.c:457
 #: ../plugins/itip-formatter/itip-view.c:544
 #, c-format
-#| msgid "Received on behalf of <b>%s</b>"
 msgid "Received on behalf of %s"
 msgstr "Erhalten im Namen von %s"
 
 #: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
-#| msgid "<b>%s</b> through %s has published the following meeting information:"
 msgid "%s through %s has published the following meeting information:"
 msgstr "%s hat durch %s folgende Besprechungsinformationen verÃ¶ffentlicht:"
 
 #: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
-#| msgid "<b>%s</b> has published the following meeting information:"
 msgid "%s has published the following meeting information:"
 msgstr "%s hat folgende Besprechungsinformationen verÃ¶ffentlicht:"
 
 #: ../plugins/itip-formatter/itip-view.c:381
 #, c-format
-#| msgid "<b>%s</b> has delegated the following meeting to you:"
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s hat folgende Besprechung an Sie delegiert:"
 
 #: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
-#| msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "%s wÃ¼nscht durch %s Ihre Teilnahme an folgender Besprechung:"
 
 #: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
-#| msgid "<b>%s</b> requests your presence at the following meeting:"
 msgid "%s requests your presence at the following meeting:"
 msgstr "%s wÃ¼nscht Ihre Teilnahme an folgender Besprechung:"
 
 #: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
-#| msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "%s wÃ¼nscht durch %s zu einer existierenden Besprechung hinzuzufÃ¼gen:"
 
 #: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
-#| msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgid "%s wishes to add to an existing meeting:"
 msgstr "%s wÃ¼nscht zu einer existierenden Besprechung hinzuzufÃ¼gen:"
 
 #: ../plugins/itip-formatter/itip-view.c:398
 #, c-format
-#| msgid ""
-#| "<b>%s</b> through %s wishes to receive the latest information for the "
-#| "following meeting:"
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
 "meeting:"
@@ -17846,108 +18105,87 @@ msgstr ""
 
 #: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
-#| msgid ""
-#| "<b>%s</b> wishes to receive the latest information for the following "
-#| "meeting:"
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr ""
 "%s wÃ¼nscht, aktuelle Informationen zu folgender Besprechung zu erhalten:"
 
 #: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
-#| msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "%s durch %s hat folgende BesprechungsrÃ¼ckmeldung geschickt:"
 
 #: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
-#| msgid "<b>%s</b> has sent back the following meeting response:"
 msgid "%s has sent back the following meeting response:"
 msgstr "%s hat folgende BesprechungsrÃ¼ckmeldung geschickt:"
 
 #: ../plugins/itip-formatter/itip-view.c:410
 #, c-format
-#| msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgid "%s through %s has canceled the following meeting:"
 msgstr "%s hat durch %s folgende Besprechung abgesagt:"
 
 #: ../plugins/itip-formatter/itip-view.c:412
 #, c-format
-#| msgid "<b>%s</b> has canceled the following meeting."
 msgid "%s has canceled the following meeting."
 msgstr "%s hat folgende Besprechung abgesagt:"
 
 #: ../plugins/itip-formatter/itip-view.c:416
 #, c-format
-#| msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "%s durch %s hat folgende BesprechungsÃ¤nderungen vorgeschlagen:"
 
 #: ../plugins/itip-formatter/itip-view.c:418
 #, c-format
-#| msgid "<b>%s</b> has proposed the following meeting changes."
 msgid "%s has proposed the following meeting changes."
 msgstr "%s hat folgende BesprechungsÃ¤nderungen vorgeschlagen:"
 
 #: ../plugins/itip-formatter/itip-view.c:422
 #, c-format
-#| msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "%s hat durch %s folgende BesprechungsÃ¤nderungen abgelehnt:"
 
 #: ../plugins/itip-formatter/itip-view.c:424
 #, c-format
-#| msgid "<b>%s</b> has declined the following meeting changes."
 msgid "%s has declined the following meeting changes."
 msgstr "%s hat folgende BesprechungsÃ¤nderungen abgelehnt:"
 
 #: ../plugins/itip-formatter/itip-view.c:462
 #, c-format
-#| msgid "<b>%s</b> through %s has published the following task:"
 msgid "%s through %s has published the following task:"
 msgstr "%s hat durch %s folgende Aufgabe verÃ¶ffentlicht:"
 
 #: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
-#| msgid "<b>%s</b> has published the following task:"
 msgid "%s has published the following task:"
 msgstr "%s hat folgende Aufgabe verÃ¶ffentlicht:"
 
 #: ../plugins/itip-formatter/itip-view.c:469
 #, c-format
-#| msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "%s wÃ¼nscht die Zuweisung folgender Aufgabe an %s:"
 
 #: ../plugins/itip-formatter/itip-view.c:472
 #, c-format
-#| msgid "<b>%s</b> through %s has assigned you a task:"
 msgid "%s through %s has assigned you a task:"
 msgstr "%s hat Ihnen durch %s eine Aufgabe zugewiesen:"
 
 #: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
-#| msgid "<b>%s</b> has assigned you a task:"
 msgid "%s has assigned you a task:"
 msgstr "%s hat Ihnen eine Aufgabe zugewiesen:"
 
 #: ../plugins/itip-formatter/itip-view.c:480
 #, c-format
-#| msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "%s wÃ¼nscht durch %s zu einer bestehenden Aufgabe hinzuzufÃ¼gen:"
 
 #: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
-#| msgid "<b>%s</b> wishes to add to an existing task:"
 msgid "%s wishes to add to an existing task:"
 msgstr "%s wÃ¼nscht zu einer bestehenden Aufgabe hinzuzufÃ¼gen:"
 
 #: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
-#| msgid ""
-#| "<b>%s</b> through %s wishes to receive the latest information for the "
-#| "following assigned task:"
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
 "assigned task:"
@@ -17957,9 +18195,6 @@ msgstr ""
 
 #: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
-#| msgid ""
-#| "<b>%s</b> wishes to receive the latest information for the following "
-#| "assigned task:"
 msgid ""
 "%s wishes to receive the latest information for the following assigned task:"
 msgstr ""
@@ -17968,89 +18203,73 @@ msgstr ""
 
 #: ../plugins/itip-formatter/itip-view.c:492
 #, c-format
-#| msgid ""
-#| "<b>%s</b> through %s has sent back the following assigned task response:"
 msgid "%s through %s has sent back the following assigned task response:"
 msgstr ""
 "%s durch %s hat folgende RÃ¼ckmeldung zu einer zugewiesenen Aufgabe geschickt:"
 
 #: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
-#| msgid "<b>%s</b> has sent back the following assigned task response:"
 msgid "%s has sent back the following assigned task response:"
 msgstr "%s hat folgende RÃ¼ckmeldung zu einer zugewiesenen Aufgabe geschickt:"
 
 #: ../plugins/itip-formatter/itip-view.c:498
 #, c-format
-#| msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgid "%s through %s has canceled the following assigned task:"
 msgstr "%s hat durch %s folgende zugewiesene Aufgabe zurÃ¼ckgezogen:"
 
 #: ../plugins/itip-formatter/itip-view.c:500
 #, c-format
-#| msgid "<b>%s</b> has canceled the following assigned task:"
 msgid "%s has canceled the following assigned task:"
 msgstr "%s hat folgende zugewiesene Aufgabe zurÃ¼ckgezogen:"
 
 #: ../plugins/itip-formatter/itip-view.c:504
 #, c-format
-#| msgid ""
-#| "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr ""
 "%s durch %s hat folgende Ã?nderungen an der Aufgabenzuweisung vorgeschlagen:"
 
 #: ../plugins/itip-formatter/itip-view.c:506
 #, c-format
-#| msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgid "%s has proposed the following task assignment changes:"
 msgstr "%s hat folgende Ã?nderungen an der Aufgabenzuweisung vorgeschlagen:"
 
 #: ../plugins/itip-formatter/itip-view.c:510
 #, c-format
-#| msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgid "%s through %s has declined the following assigned task:"
 msgstr "%s hat durch %s folgende zugewiesene Aufgabe abgelehnt:"
 
 #: ../plugins/itip-formatter/itip-view.c:512
 #, c-format
-#| msgid "<b>%s</b> has declined the following assigned task:"
 msgid "%s has declined the following assigned task:"
 msgstr "%s hat die folgende zugewiesene Aufgabe abgelehnt:"
 
 #: ../plugins/itip-formatter/itip-view.c:549
 #, c-format
-#| msgid "<b>%s</b> through %s has published the following memo:"
 msgid "%s through %s has published the following memo:"
 msgstr "%s hat durch %s folgende Notiz verÃ¶ffentlicht:"
 
 #: ../plugins/itip-formatter/itip-view.c:551
 #, c-format
-#| msgid "<b>%s</b> has published the following memo:"
 msgid "%s has published the following memo:"
 msgstr "%s hat folgende Notiz verÃ¶ffentlicht:"
 
 #: ../plugins/itip-formatter/itip-view.c:556
 #, c-format
-#| msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "%s wÃ¼nscht durch %s zu einer existierenden Notiz hinzuzufÃ¼gen:"
 
 #: ../plugins/itip-formatter/itip-view.c:558
 #, c-format
-#| msgid "<b>%s</b> wishes to add to an existing memo:"
 msgid "%s wishes to add to an existing memo:"
 msgstr "%s wÃ¼nscht zu einer existierenden Notiz hinzuzufÃ¼gen:"
 
 #: ../plugins/itip-formatter/itip-view.c:562
 #, c-format
-#| msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgid "%s through %s has canceled the following shared memo:"
 msgstr "%s hat durch %s folgende gemeinsame Notiz gelÃ¶scht:"
 
 #: ../plugins/itip-formatter/itip-view.c:564
 #, c-format
-#| msgid "<b>%s</b> has canceled the following shared memo:"
 msgid "%s has canceled the following shared memo:"
 msgstr "%s hat folgende gemeinsame Notiz gelÃ¶scht:"
 
@@ -18096,7 +18315,6 @@ msgstr "Ab_lehnen"
 #: ../plugins/itip-formatter/itip-view.c:862
 #: ../plugins/itip-formatter/itip-view.c:878
 #: ../plugins/itip-formatter/itip-view.c:883
-#| msgid "Accept"
 msgid "A_ccept"
 msgstr "Anneh_men"
 
@@ -18116,7 +18334,6 @@ msgid "_Tentative"
 msgstr "_VorlÃ¤ufig"
 
 #: ../plugins/itip-formatter/itip-view.c:855
-#| msgid "_Accept all"
 msgid "A_ccept all"
 msgstr "Alles anneh_men"
 
@@ -18182,17 +18399,15 @@ msgid "Itip Formatter"
 msgstr "Itip-Formatierung"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid ""
-"&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
+msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
 msgstr ""
-"Â»{0}Â« hat die Besprechung delegiert. MÃ¶chten Sie den Delegaten Â»{1}Â« hinzufÃ¼gen?"
+"Â»{0}Â« hat die Besprechung delegiert. MÃ¶chten Sie den Vertreter Â»{1}Â« hinzufÃ¼gen?"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "This meeting has been delegated"
 msgstr "Die Besprechung wurde delegiert"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid ""
 "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr ""
@@ -18285,16 +18500,15 @@ msgstr ""
 "Legt fest, ob nur Ã¼ber Nachrichten im Eingangsordner benachrichtigt werden "
 "soll."
 
-#: ../plugins/mail-notification/mail-notification.c:346
+#: ../plugins/mail-notification/mail-notification.c:355
 msgid "Evolution's Mail Notification"
 msgstr "Benachrichtigung bei neuen E-Mails"
 
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:377
 msgid "Mail Notification Properties"
 msgstr "Einstellungen zur E-Mail-Benachrichtigung"
 
-#. To translators: '%d' is the count of mails received and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:499
+#: ../plugins/mail-notification/mail-notification.c:513
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18309,67 +18523,69 @@ msgstr[1] ""
 "Sie haben %d neue Nachrichten\n"
 "im %s."
 
-#. To Translators: "From:" is preceding a new mail sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:510
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user example com"
+#: ../plugins/mail-notification/mail-notification.c:525
 #, c-format
 msgid "From: %s"
 msgstr "Von: %s"
 
-#. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:522
+#. Translators: "Subject:" is preceding a new mail
+#. * subject, like "Subject: It happened again"
+#: ../plugins/mail-notification/mail-notification.c:538
 #, c-format
 msgid "Subject: %s"
 msgstr "Betreff: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:531
+#: ../plugins/mail-notification/mail-notification.c:548
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Sie haben %d neue Nachricht."
 msgstr[1] "Sie haben %d neue Nachrichten."
 
-#: ../plugins/mail-notification/mail-notification.c:549
-#: ../plugins/mail-notification/mail-notification.c:554
+#: ../plugins/mail-notification/mail-notification.c:570
+#: ../plugins/mail-notification/mail-notification.c:577
 msgid "New email"
 msgstr "Neue E-Mail"
 
-#: ../plugins/mail-notification/mail-notification.c:608
+#: ../plugins/mail-notification/mail-notification.c:638
 msgid "Show icon in _notification area"
 msgstr "Symbol im _Benachrichtigungsfeld anzeigen"
 
-#: ../plugins/mail-notification/mail-notification.c:636
+#: ../plugins/mail-notification/mail-notification.c:666
 msgid "B_link icon in notification area"
 msgstr "_Blinkendes Symbol im Benachrichtigungsfeld"
 
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:676
 msgid "Popup _message together with the icon"
 msgstr "Popup-_Nachricht zusammen mit Symbol anzeigen"
 
-#: ../plugins/mail-notification/mail-notification.c:831
+#: ../plugins/mail-notification/mail-notification.c:863
 msgid "_Play sound when new messages arrive"
 msgstr "Beim Eintreffen neuer E-Mails _Klang abspielen"
 
-#: ../plugins/mail-notification/mail-notification.c:860
+#: ../plugins/mail-notification/mail-notification.c:892
 msgid "_Beep"
 msgstr "_Signalton ausgeben"
 
-#: ../plugins/mail-notification/mail-notification.c:873
+#: ../plugins/mail-notification/mail-notification.c:905
 msgid "Use sound _theme"
 msgstr "Klang_thema verwenden"
 
-#: ../plugins/mail-notification/mail-notification.c:892
+#: ../plugins/mail-notification/mail-notification.c:924
 msgid "Play _file:"
 msgstr "Klang_datei abspielen:"
 
-#: ../plugins/mail-notification/mail-notification.c:903
+#: ../plugins/mail-notification/mail-notification.c:935
 msgid "Select sound file"
 msgstr "Klangdatei auswÃ¤hlen"
 
-#: ../plugins/mail-notification/mail-notification.c:961
+#: ../plugins/mail-notification/mail-notification.c:993
 msgid "Notify new messages for _Inbox only"
 msgstr "Nur Ã¼ber neue Nachrichten im _Eingangsordner benachrichtigen."
 
-#: ../plugins/mail-notification/mail-notification.c:970
+#: ../plugins/mail-notification/mail-notification.c:1002
 msgid "Generate a _D-Bus message"
 msgstr "Eine _D-Bus-Nachricht erzeugen"
 
@@ -18414,7 +18630,10 @@ msgstr ""
 "Die ausgewÃ¤hlte Notizliste enthÃ¤lt bereits die Notiz Â»%sÂ«. MÃ¶chten Sie die "
 "alte Notiz bearbeiten?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:512
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:515
 msgid ""
 "Selected calendar contains some events for the given mails already. Would you "
 "like to create new events anyway?"
@@ -18422,7 +18641,10 @@ msgstr ""
 "Der ausgewÃ¤hlte Kalender enthÃ¤lt bereits einige Ereignisse fÃ¼r die "
 "vorliegenden E-Mails. MÃ¶chten Sie dennoch neue Ereignisse erstellen?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:515
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:521
 msgid ""
 "Selected task list contains some tasks for the given mails already. Would you "
 "like to create new tasks anyway?"
@@ -18430,7 +18652,10 @@ msgstr ""
 "Die ausgewÃ¤hlte Aufgabenliste enthÃ¤lt bereits einige Aufgaben fÃ¼r die "
 "vorliegenden E-Mails. MÃ¶chten Sie dennoch neue Aufgaben erstellen?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:518
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:527
 msgid ""
 "Selected memo list contains some memos for the given mails already. Would you "
 "like to create new memos anyway?"
@@ -18438,7 +18663,10 @@ msgstr ""
 "Die ausgewÃ¤hlte Notizliste enthÃ¤lt bereits einige Notizen fÃ¼r die "
 "vorliegenden E-Mails. MÃ¶chten Sie dennoch neue Notizen erstellen?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:536
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:548
 msgid ""
 "Selected calendar contains an event for the given mail already. Would you "
 "like to create new event anyway?"
@@ -18452,7 +18680,10 @@ msgstr[1] ""
 "Der ausgewÃ¤hlte Kalender enthÃ¤lt bereits Ereignisse fÃ¼r die vorliegenden E-"
 "Mails. MÃ¶chten Sie dennoch neue Ereignisse erstellen?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:542
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:557
 msgid ""
 "Selected task list contains a task for the given mail already. Would you like "
 "to create new task anyway?"
@@ -18466,7 +18697,10 @@ msgstr[1] ""
 "Die ausgewÃ¤hlte Aufgabenliste enthÃ¤lt bereits einige Aufgaben fÃ¼r die "
 "vorliegenden E-Mails. MÃ¶chten Sie dennoch neue Aufgaben erstellen?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:548
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:566
 msgid ""
 "Selected memo list contains a memo for the given mail already. Would you like "
 "to create new memo anyway?"
@@ -18480,25 +18714,25 @@ msgstr[1] ""
 "Die ausgewÃ¤hlte Notizliste enthÃ¤lt bereits einige Notizen fÃ¼r die "
 "vorliegenden E-Mails. MÃ¶chten Sie dennoch neue Notizen erstellen?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:607
+#: ../plugins/mail-to-task/mail-to-task.c:625
 msgid "[No Summary]"
 msgstr "[Keine Zusammenfassung]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:618
+#: ../plugins/mail-to-task/mail-to-task.c:636
 msgid "Invalid object returned from a server"
 msgstr "Ein ungÃ¼ltiges Objekt wurde vom Server zurÃ¼ckgegeben."
 
-#: ../plugins/mail-to-task/mail-to-task.c:689
+#: ../plugins/mail-to-task/mail-to-task.c:707
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Ein Fehler ist wÃ¤hrend der Verarbeitung aufgetreten: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:718
+#: ../plugins/mail-to-task/mail-to-task.c:736
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Kalender konnte nicht geÃ¶ffnet werden. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:725
+#: ../plugins/mail-to-task/mail-to-task.c:743
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -18506,7 +18740,7 @@ msgstr ""
 "Die gewÃ¤hlte Quelle ist schreibgeschÃ¼tzt, daher kann kein neues Ereignis "
 "erstellt werden. Bitte wÃ¤hlen Sie eine andere Quelle aus."
 
-#: ../plugins/mail-to-task/mail-to-task.c:728
+#: ../plugins/mail-to-task/mail-to-task.c:746
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18514,7 +18748,7 @@ msgstr ""
 "Die gewÃ¤hlte Quelle ist schreibgeschÃ¼tzt, daher kann keine neue Aufgabe "
 "erstellt werden. Bitte wÃ¤hlen Sie eine andere Quelle aus."
 
-#: ../plugins/mail-to-task/mail-to-task.c:731
+#: ../plugins/mail-to-task/mail-to-task.c:749
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -18522,40 +18756,40 @@ msgstr ""
 "Die gewÃ¤hlte Quelle ist schreibgeschÃ¼tzt, daher kann keine neue Notiz "
 "erstellt werden. Bitte wÃ¤hlen Sie eine andere Quelle aus."
 
-#: ../plugins/mail-to-task/mail-to-task.c:934
+#: ../plugins/mail-to-task/mail-to-task.c:952
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "Die Liste der Quelle konnte nicht erhalten werden. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1053
+#: ../plugins/mail-to-task/mail-to-task.c:1071
 msgid "Create an _Event"
 msgstr "Ein _Ereignis anlegen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1055
+#: ../plugins/mail-to-task/mail-to-task.c:1073
 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:1060
+#: ../plugins/mail-to-task/mail-to-task.c:1078
 msgid "Create a Mem_o"
 msgstr "Eine _Notiz anlegen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1062
+#: ../plugins/mail-to-task/mail-to-task.c:1080
 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:1067
+#: ../plugins/mail-to-task/mail-to-task.c:1085
 msgid "Create a _Task"
 msgstr "Eine _Aufgabe anlegen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1069
+#: ../plugins/mail-to-task/mail-to-task.c:1087
 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:1077
+#: ../plugins/mail-to-task/mail-to-task.c:1095
 msgid "Create a _Meeting"
 msgstr "Eine _Besprechung anlegen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1079
+#: ../plugins/mail-to-task/mail-to-task.c:1097
 msgid "Create a new meeting from the selected message"
 msgstr "Eine neue Besprechung mit Hilfe der gewÃ¤hlten Nachricht anlegen"
 
@@ -18706,11 +18940,11 @@ msgstr "Nachricht _bearbeiten"
 msgid "_Send message"
 msgstr "Nachricht ver_schicken"
 
-#: ../plugins/mark-all-read/mark-all-read.c:41
+#: ../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:43
+#: ../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?"
@@ -18718,15 +18952,15 @@ 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:175
+#: ../plugins/mark-all-read/mark-all-read.c:194
 msgid "In Current Folder and _Subfolders"
 msgstr "Im derzeitigen Ordner und in _Unterordnern"
 
-#: ../plugins/mark-all-read/mark-all-read.c:189
+#: ../plugins/mark-all-read/mark-all-read.c:208
 msgid "In Current _Folder Only"
 msgstr "Nur im _derzeitigen Ordner"
 
-#: ../plugins/mark-all-read/mark-all-read.c:412
+#: ../plugins/mark-all-read/mark-all-read.c:437
 msgid "Mark Me_ssages as Read"
 msgstr "Nachrichten als gelesen _markieren"
 
@@ -18846,35 +19080,35 @@ msgstr "Outlook PST-Importeur"
 msgid "Outlook personal folders (.pst)"
 msgstr "PersÃ¶nliche Outlook-Ordner (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:296
+#: ../plugins/pst-import/pst-importer.c:295
 msgid "_Mail"
 msgstr "_E-Mail"
 
-#: ../plugins/pst-import/pst-importer.c:308
+#: ../plugins/pst-import/pst-importer.c:307
 msgid "Destination folder:"
 msgstr "Zielordner:"
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:314
+#: ../plugins/pst-import/pst-importer.c:313
 msgid "_Address Book"
 msgstr "_Adressbuch"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:321
+#: ../plugins/pst-import/pst-importer.c:320
 msgid "A_ppointments"
 msgstr "_Termine"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:327 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:326 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Aufgaben"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:333
+#: ../plugins/pst-import/pst-importer.c:332
 msgid "_Journal entries"
 msgstr "_Journal-EintrÃ¤ge"
 
-#: ../plugins/pst-import/pst-importer.c:348
+#: ../plugins/pst-import/pst-importer.c:347
 msgid "Importing Outlook data"
 msgstr "Outlook-Daten werden importiert"
 
@@ -19042,47 +19276,47 @@ msgstr "Neuer Ort"
 msgid "Edit Location"
 msgstr "Ort bearbeiten"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:120
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:121
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "SpamAssassin nicht gefunden, Fehler-Code: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:129
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:137
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "Weiterleitung konnte nicht angelegt werden: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:175
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:176
 #, c-format
 msgid "Error after fork: %s"
 msgstr "Fehler nach Fork: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:230
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:232
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "SpamAssassin-Kindprozess antwortet nicht. Wird abgewÃ¼rgt â?¦"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:232
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:234
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "Warten auf SpamAssassin-Kindprozess abgebrochen. Wird beendet â?¦"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:241
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "Weiterleitung an SpamAssassin gescheitert, Fehler-Code: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:504
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:506
 #, c-format
 msgid "SpamAssassin is not available. Please install it first."
 msgstr "SpamAssassin ist nicht verfÃ¼gbar. Bitte installieren Sie es zunÃ¤chst."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:924
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:927
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "Dies erhÃ¶ht die ZuverlÃ¤ssigkeit des Filters, verlangsamt ihn jedoch"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:932
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:935
 msgid "I_nclude remote tests"
 msgstr "ZusÃ¤tzliche _Ferntests durchfÃ¼hren"
 
@@ -19219,57 +19453,6 @@ msgstr "Die gewÃ¤hlte Notizliste auf einem DatentrÃ¤ger speichern"
 msgid "Save the selected task list to disk"
 msgstr "Die gewÃ¤hlte Aufgabenliste auf einem DatentrÃ¤ger speichern."
 
-#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "Guides you through your initial account setup."
-msgstr "Hilft Ihnen beim erstmaligen Erstellen von Konten."
-
-#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
-msgid "Setup Assistant"
-msgstr "Setup-Assistent"
-
-#: ../plugins/startup-wizard/startup-wizard.c:117
-msgid "Evolution Setup Assistant"
-msgstr "Evolution-Einrichtungsassistent"
-
-#: ../plugins/startup-wizard/startup-wizard.c:122
-msgid "Welcome"
-msgstr "Willkommen"
-
-#: ../plugins/startup-wizard/startup-wizard.c:125
-msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect to "
-"your email accounts, and to import files from other applications. \n"
-"\n"
-"Please click the \"Forward\" button to continue. "
-msgstr ""
-"Willkommen bei Evolution. Die folgenden Dialoge werden Ihnen helfen, Ihre E-"
-"Mail-Konten einzurichten und Dateien aus anderen Anwendungen zu importieren.\n"
-"\n"
-"Klicken Sie auf Â»VorÂ«, um fortzufahren. "
-
-#: ../plugins/startup-wizard/startup-wizard.c:160
-#: ../widgets/misc/e-import-assistant.c:385
-msgid "Please select the information that you would like to import:"
-msgstr "Bitte wÃ¤hlen Sie die Informationen, die Sie importieren wollen:"
-
-#: ../plugins/startup-wizard/startup-wizard.c:175
-#: ../widgets/misc/e-import-assistant.c:542
-#, c-format
-msgid "From %s:"
-msgstr "Von %s:"
-
-#: ../plugins/startup-wizard/startup-wizard.c:192
-msgid "Importing files"
-msgstr "Dateien werden importiert"
-
-#: ../plugins/startup-wizard/startup-wizard.c:258
-msgid "Importing data."
-msgstr "Daten werden importiert."
-
-#: ../plugins/startup-wizard/startup-wizard.c:264
-msgid "Please wait"
-msgstr "Bitte warten"
-
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Sort mail message threads by subject."
 msgstr "Nachrichtenthreads nach ihrem Betreff sortieren."
@@ -19299,15 +19482,15 @@ msgstr ""
 msgid "Drafts based template plugin"
 msgstr "Vorlagen-Plugin basierend auf EntwÃ¼rfen"
 
-#: ../plugins/templates/templates.c:615
+#: ../plugins/templates/templates.c:616
 msgid "No Title"
 msgstr "Kein Titel"
 
-#: ../plugins/templates/templates.c:686
+#: ../plugins/templates/templates.c:687
 msgid "Save as _Template"
 msgstr "Als V_orlage speichern"
 
-#: ../plugins/templates/templates.c:688
+#: ../plugins/templates/templates.c:689
 msgid "Save as Template"
 msgstr "Als Vorlage speichern"
 
@@ -19408,7 +19591,6 @@ msgid "Default window width"
 msgstr "Voreingestellte Fensterbreite"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:10
-#| msgid "Enable search folders"
 msgid "Enable express mode"
 msgstr "Express-Modus aktivieren"
 
@@ -19535,7 +19717,7 @@ msgstr "Seitenleiste anzeigen"
 msgid "Skip development warning dialog"
 msgstr "Entwicklungs-Warndialog nicht anzeigen"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:305
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:326
 msgid "Start in offline mode"
 msgstr "Im Offline-Modus starten"
 
@@ -19693,11 +19875,11 @@ msgstr "Fensterknopfstil"
 msgid "Window buttons are visible"
 msgstr "FensterknÃ¶pfe sind sichtbar"
 
-#: ../shell/e-shell-content.c:502 ../shell/e-shell-content.c:503
+#: ../shell/e-shell-content.c:520 ../shell/e-shell-content.c:521
 msgid "Searches"
 msgstr "Suchen"
 
-#: ../shell/e-shell-content.c:545
+#: ../shell/e-shell-content.c:563
 msgid "Save Search"
 msgstr "Suche speichern"
 
@@ -19705,19 +19887,19 @@ msgstr "Suche speichern"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:918
+#: ../shell/e-shell-searchbar.c:921
 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:949
+#: ../shell/e-shell-searchbar.c:952
 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:1010
+#: ../shell/e-shell-searchbar.c:1013
 msgid "i_n"
 msgstr " _in "
 
@@ -19754,316 +19936,301 @@ msgstr ""
 msgid "Evolution Website"
 msgstr "Evolution-Webseite"
 
-#: ../shell/e-shell-window-actions.c:1228
+#: ../shell/e-shell-window-actions.c:1235
 msgid "Bug Buddy is not installed."
 msgstr "Bug-Buddy ist nicht installiert."
 
-#: ../shell/e-shell-window-actions.c:1230
+#: ../shell/e-shell-window-actions.c:1237
 msgid "Bug Buddy could not be run."
 msgstr "Bug-Buddy konnte nicht gestartet werden."
 
-#: ../shell/e-shell-window-actions.c:1347
-msgid "GNOME Pilot is not installed."
-msgstr "GNOME Pilot ist nicht installiert."
-
-#: ../shell/e-shell-window-actions.c:1349
-msgid "GNOME Pilot could not be run."
-msgstr "GNOME Pilot konnte nicht gestartet werden."
-
-#: ../shell/e-shell-window-actions.c:1443
+#: ../shell/e-shell-window-actions.c:1418
 msgid "Show information about Evolution"
 msgstr "Informationen zu Evolution anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1448
+#: ../shell/e-shell-window-actions.c:1423
+#: ../shell/e-shell-window-actions.c:1437
 msgid "_Close Window"
 msgstr "Fenster s_chlieÃ?en"
 
-#: ../shell/e-shell-window-actions.c:1455
+#: ../shell/e-shell-window-actions.c:1444
 msgid "_Contents"
 msgstr "_Inhalte"
 
-#: ../shell/e-shell-window-actions.c:1457
+#: ../shell/e-shell-window-actions.c:1446
 msgid "Open the Evolution User Guide"
 msgstr "Das Benutzerhandbuch von Evolution Ã¶ffnen"
 
-#: ../shell/e-shell-window-actions.c:1483
+#: ../shell/e-shell-window-actions.c:1472
 msgid "Evolution _FAQ"
 msgstr "HÃ¤ufig gestellte _Fragen"
 
-#: ../shell/e-shell-window-actions.c:1485
+#: ../shell/e-shell-window-actions.c:1474
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "Ã?ffnet die Webseite mit den am hÃ¤ufigsten gestellten Fragen"
 
-#: ../shell/e-shell-window-actions.c:1490
+#: ../shell/e-shell-window-actions.c:1479
 msgid "_Forget Passwords"
 msgstr "PasswÃ¶rter ver_werfen"
 
-#: ../shell/e-shell-window-actions.c:1492
+#: ../shell/e-shell-window-actions.c:1481
 msgid "Forget all remembered passwords"
 msgstr "Alle gemerkten PasswÃ¶rter verwerfen"
 
-#: ../shell/e-shell-window-actions.c:1497
+#: ../shell/e-shell-window-actions.c:1486
 msgid "I_mport..."
 msgstr "Impor_tieren â?¦"
 
-#: ../shell/e-shell-window-actions.c:1499
+#: ../shell/e-shell-window-actions.c:1488
 msgid "Import data from other programs"
 msgstr "Daten aus anderen Programmen importieren"
 
-#: ../shell/e-shell-window-actions.c:1504
+#: ../shell/e-shell-window-actions.c:1493
 msgid "New _Window"
 msgstr "Neues F_enster"
 
-#: ../shell/e-shell-window-actions.c:1506
+#: ../shell/e-shell-window-actions.c:1495
 msgid "Create a new window displaying this view"
 msgstr "Ein neues Fenster Ã¶ffnen, das diese Ansicht anzeigt"
 
-#: ../shell/e-shell-window-actions.c:1520
+#: ../shell/e-shell-window-actions.c:1509
 msgid "Configure Evolution"
 msgstr "Evolution konfigurieren"
 
-#: ../shell/e-shell-window-actions.c:1525
+#: ../shell/e-shell-window-actions.c:1514
 msgid "_Quick Reference"
 msgstr "_Kurzreferenz"
 
-#: ../shell/e-shell-window-actions.c:1527
+#: ../shell/e-shell-window-actions.c:1516
 msgid "Show Evolution's shortcut keys"
 msgstr "Die TastenkÃ¼rzel von Evolution anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1534
+#: ../shell/e-shell-window-actions.c:1523
 msgid "Exit the program"
 msgstr "Das Programm beenden"
 
-#: ../shell/e-shell-window-actions.c:1539
+#: ../shell/e-shell-window-actions.c:1528
 msgid "_Advanced Search..."
 msgstr "Er_weiterte Suche â?¦"
 
-#: ../shell/e-shell-window-actions.c:1541
+#: ../shell/e-shell-window-actions.c:1530
 msgid "Construct a more advanced search"
 msgstr "Erweiterte Suche ausfÃ¼hren"
 
-#: ../shell/e-shell-window-actions.c:1548
+#: ../shell/e-shell-window-actions.c:1537
 msgid "Clear the current search parameters"
 msgstr "Die aktuellen Suchparameter leeren"
 
-#: ../shell/e-shell-window-actions.c:1553
+#: ../shell/e-shell-window-actions.c:1542
 msgid "_Edit Saved Searches..."
 msgstr "Gespeicherte Suchen _bearbeiten â?¦"
 
-#: ../shell/e-shell-window-actions.c:1555
+#: ../shell/e-shell-window-actions.c:1544
 msgid "Manage your saved searches"
 msgstr "Ihre gespeicherten SuchvorgÃ¤nge verwalten"
 
-#: ../shell/e-shell-window-actions.c:1562
+#: ../shell/e-shell-window-actions.c:1551
 msgid "Click here to change the search type"
 msgstr "Klicken Sie hier, um den Suchtypen zu Ã¤ndern"
 
-#: ../shell/e-shell-window-actions.c:1567
+#: ../shell/e-shell-window-actions.c:1556
 msgid "_Find Now"
 msgstr "_Jetzt suchen"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1569
+#: ../shell/e-shell-window-actions.c:1558
 msgid "Execute the current search parameters"
 msgstr "Die aktuellen Suchparameter anwenden"
 
-#: ../shell/e-shell-window-actions.c:1574
+#: ../shell/e-shell-window-actions.c:1563
 msgid "_Save Search..."
 msgstr "Suche _speichern â?¦"
 
-#: ../shell/e-shell-window-actions.c:1576
+#: ../shell/e-shell-window-actions.c:1565
 msgid "Save the current search parameters"
 msgstr "Die aktuellen Suchparameter speichern"
 
-#: ../shell/e-shell-window-actions.c:1588
+#: ../shell/e-shell-window-actions.c:1577
 msgid "Send / _Receive"
 msgstr "Verschicken/Ab_rufen"
 
-#: ../shell/e-shell-window-actions.c:1590
+#: ../shell/e-shell-window-actions.c:1579
 msgid "Send queued items and retrieve new items"
 msgstr "Objekte in der Warteschlange verschicken und neue Objekte abrufen"
 
-#: ../shell/e-shell-window-actions.c:1595
+#: ../shell/e-shell-window-actions.c:1584
 msgid "Submit _Bug Report..."
 msgstr "Fehler_bericht einschicken â?¦"
 
-#: ../shell/e-shell-window-actions.c:1597
+#: ../shell/e-shell-window-actions.c:1586
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Einen Fehlerbericht mit Bug Buddy einschicken"
 
-#: ../shell/e-shell-window-actions.c:1602
-msgid "GNOME Pilot _Synchronization..."
-msgstr "GNOME Pilot-_Datenabgleich â?¦"
-
-#: ../shell/e-shell-window-actions.c:1604
-msgid "Set up GNOME Pilot configuration"
-msgstr "Die Pilot-Einstellungen festlegen"
-
-#: ../shell/e-shell-window-actions.c:1609
+#: ../shell/e-shell-window-actions.c:1591
 msgid "_Work Offline"
 msgstr "_Offline arbeiten"
 
-#: ../shell/e-shell-window-actions.c:1611
+#: ../shell/e-shell-window-actions.c:1593
 msgid "Put Evolution into offline mode"
 msgstr "Evolution in den Offline-Modus versetzen"
 
-#: ../shell/e-shell-window-actions.c:1616
+#: ../shell/e-shell-window-actions.c:1598
 msgid "_Work Online"
 msgstr "_Online arbeiten"
 
-#: ../shell/e-shell-window-actions.c:1618
+#: ../shell/e-shell-window-actions.c:1600
 msgid "Put Evolution into online mode"
 msgstr "Evolution in den Online-Modus versetzen"
 
-#: ../shell/e-shell-window-actions.c:1646
+#: ../shell/e-shell-window-actions.c:1628
 msgid "Lay_out"
 msgstr "_Anordnung"
 
-#: ../shell/e-shell-window-actions.c:1653
+#: ../shell/e-shell-window-actions.c:1635
 msgid "_New"
 msgstr "_Neu"
 
-#: ../shell/e-shell-window-actions.c:1660
+#: ../shell/e-shell-window-actions.c:1642
 msgid "_Search"
 msgstr "_Suchen"
 
-#: ../shell/e-shell-window-actions.c:1667
+#: ../shell/e-shell-window-actions.c:1649
 msgid "_Switcher Appearance"
 msgstr "Erscheinungsbild der KnÃ¶_pfe"
 
-#: ../shell/e-shell-window-actions.c:1681
+#: ../shell/e-shell-window-actions.c:1663
 msgid "_Window"
 msgstr "_Fenster"
 
-#: ../shell/e-shell-window-actions.c:1710
+#: ../shell/e-shell-window-actions.c:1692
 msgid "Show Side _Bar"
 msgstr "Sei_tenleiste anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1712
+#: ../shell/e-shell-window-actions.c:1694
 msgid "Show the side bar"
 msgstr "Seitenleiste anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1718
+#: ../shell/e-shell-window-actions.c:1700
 msgid "Show _Buttons"
 msgstr "_KnÃ¶pfe anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1720
+#: ../shell/e-shell-window-actions.c:1702
 msgid "Show the switcher buttons"
 msgstr "UmschaltknÃ¶pfe anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1726
+#: ../shell/e-shell-window-actions.c:1708
 msgid "Show _Status Bar"
 msgstr "Stat_usleiste anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1728
+#: ../shell/e-shell-window-actions.c:1710
 msgid "Show the status bar"
 msgstr "Die Statusleiste anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1734
+#: ../shell/e-shell-window-actions.c:1716
 msgid "Show _Tool Bar"
 msgstr "_Werkzeugleiste anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1736
+#: ../shell/e-shell-window-actions.c:1718
 msgid "Show the tool bar"
 msgstr "Die Werkzeugleiste anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1758
+#: ../shell/e-shell-window-actions.c:1740
 msgid "_Icons Only"
 msgstr "Nur S_ymbole"
 
-#: ../shell/e-shell-window-actions.c:1760
+#: ../shell/e-shell-window-actions.c:1742
 msgid "Display window buttons with icons only"
 msgstr "FensterknÃ¶pfe nur als Symbole anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1765
+#: ../shell/e-shell-window-actions.c:1747
 msgid "_Text Only"
 msgstr "Nur _Text"
 
-#: ../shell/e-shell-window-actions.c:1767
+#: ../shell/e-shell-window-actions.c:1749
 msgid "Display window buttons with text only"
 msgstr "FensterknÃ¶pfe nur als Text anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1772
+#: ../shell/e-shell-window-actions.c:1754
 msgid "Icons _and Text"
 msgstr "Symbole _und Text"
 
-#: ../shell/e-shell-window-actions.c:1774
+#: ../shell/e-shell-window-actions.c:1756
 msgid "Display window buttons with icons and text"
 msgstr "FensterknÃ¶pfe mit Symbolen und Text anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1779
+#: ../shell/e-shell-window-actions.c:1761
 msgid "Tool_bar Style"
 msgstr "_Werkzeugleistenstil"
 
-#: ../shell/e-shell-window-actions.c:1781
+#: ../shell/e-shell-window-actions.c:1763
 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:1789
+#: ../shell/e-shell-window-actions.c:1771
 msgid "Define Views..."
 msgstr "Ansichten definieren â?¦"
 
-#: ../shell/e-shell-window-actions.c:1791
+#: ../shell/e-shell-window-actions.c:1773
 msgid "Create or edit views"
 msgstr "Ansicht er_stellen oder bearbeiten"
 
-#: ../shell/e-shell-window-actions.c:1796
+#: ../shell/e-shell-window-actions.c:1778
 msgid "Save Custom View..."
 msgstr "Benutzerdefinierte Ansicht speichern â?¦"
 
-#: ../shell/e-shell-window-actions.c:1798
+#: ../shell/e-shell-window-actions.c:1780
 msgid "Save current custom view"
 msgstr "Aktuelle benutzerdefinierte Ansicht speichern"
 
-#: ../shell/e-shell-window-actions.c:1805
+#: ../shell/e-shell-window-actions.c:1787
 msgid "C_urrent View"
 msgstr "A_ktuelle Ansicht"
 
-#: ../shell/e-shell-window-actions.c:1815
+#: ../shell/e-shell-window-actions.c:1797
 msgid "Custom View"
 msgstr "Benutzerdefinierte Ansicht"
 
-#: ../shell/e-shell-window-actions.c:1817
+#: ../shell/e-shell-window-actions.c:1799
 msgid "Current view is a customized view"
 msgstr "Aktuelle Ansicht ist eine benutzerdefinierte Ansicht"
 
-#: ../shell/e-shell-window-actions.c:1827
+#: ../shell/e-shell-window-actions.c:1809
 msgid "Change the page settings for your current printer"
 msgstr "Die Seiteneinstellungen fÃ¼r Ihren aktuellen Drucker Ã¤ndern"
 
-#: ../shell/e-shell-window-actions.c:2204
+#: ../shell/e-shell-window-actions.c:2182
 #, c-format
 msgid "Switch to %s"
 msgstr "Zu %s wechseln"
 
-#: ../shell/e-shell-window-actions.c:2417
+#: ../shell/e-shell-window-actions.c:2395
 msgid "Execute these search parameters"
 msgstr "Diese Suchparameter ausfÃ¼hren"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:573
+#: ../shell/e-shell-window-private.c:576
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:382
+#: ../shell/e-shell-window.c:416
 msgid "New"
 msgstr "Neu"
 
-#: ../shell/e-shell.c:218
+#: ../shell/e-shell.c:226
 msgid "Preparing to go offline..."
 msgstr "Offline-Betrieb wird vorbereitet â?¦"
 
-#: ../shell/e-shell.c:268
+#: ../shell/e-shell.c:276
 msgid "Preparing to go online..."
 msgstr "Online-Betrieb wird vorbereitet â?¦"
 
-#: ../shell/e-shell.c:336
+#: ../shell/e-shell.c:335
 msgid "Preparing to quit..."
 msgstr "Beenden wird vorbereitet â?¦"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:164
+#: ../shell/main.c:175
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20102,7 +20269,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:188
+#: ../shell/main.c:199
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20110,56 +20277,55 @@ msgstr ""
 "Vielen Dank\n"
 "Das Evolution-Team\n"
 
-#: ../shell/main.c:195
+#: ../shell/main.c:206
 msgid "Do not tell me again"
 msgstr "Nicht mehr anzeigen"
 
-#: ../shell/main.c:301
+#: ../shell/main.c:322
 msgid "Start Evolution activating the specified component"
 msgstr "Beim Start von Evolution die angegebene Komponente aktivieren"
 
-#: ../shell/main.c:303
+#: ../shell/main.c:324
 msgid "Apply the given geometry to the main window"
 msgstr "Die angegebene Geometrie auf das Hauptfenster anwenden"
 
-#: ../shell/main.c:307
+#: ../shell/main.c:328
 msgid "Start in online mode"
 msgstr "Im Online-Modus starten"
 
-#: ../shell/main.c:309
-#| msgid "Start in online mode"
+#: ../shell/main.c:330
 msgid "Start in \"express\" mode"
 msgstr "Im Express-Modus starten"
 
-#: ../shell/main.c:312
+#: ../shell/main.c:333
 msgid "Forcibly shut down Evolution"
 msgstr "Evolution zum Herunterfahren zwingen"
 
-#: ../shell/main.c:315
+#: ../shell/main.c:336
 msgid "Send the debugging output of all components to a file."
 msgstr "Die Diagnoseausgabe aller Komponenten in eine Datei umleiten."
 
-#: ../shell/main.c:317
+#: ../shell/main.c:338
 msgid "Disable loading of any plugins."
 msgstr "Das Laden von allen Plugins deaktivieren."
 
-#: ../shell/main.c:319
+#: ../shell/main.c:340
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Die Vorschau von E-Mails, Kontakten und Aufgaben deaktivieren."
 
-#: ../shell/main.c:323
+#: ../shell/main.c:344
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "Die Adressen oder Dateinamen in den restlichen Argumenten importieren."
 
-#: ../shell/main.c:325
+#: ../shell/main.c:346
 msgid "Request a running Evolution process to quit"
 msgstr "Einen laufenden Evolution-Prozess zum Beenden auffordern"
 
-#: ../shell/main.c:440
+#: ../shell/main.c:469
 msgid "- The Evolution PIM and Email Client"
 msgstr "â?? Die Evolution PIM- und E-Mail-Anwendung"
 
-#: ../shell/main.c:466
+#: ../shell/main.c:531
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20174,12 +20340,10 @@ msgstr ""
 "Sind Sie sicher, dass alle Passworterinnerungen verworfen werden sollen?"
 
 #: ../shell/shell.error.xml.h:2
-#| msgid "Delete old data from version {0}?"
 msgid "Cannot upgrade directly from version {0}"
 msgstr "Versionsaktualisierung direkt von Version {0} ist nicht mÃ¶glich"
 
 #: ../shell/shell.error.xml.h:3
-#| msgid "Continue"
 msgid "Continue Anyway"
 msgstr "Trotzdem fortsetzen"
 
@@ -20203,7 +20367,6 @@ msgstr ""
 "Eingabeaufforderung angezeigt."
 
 #: ../shell/shell.error.xml.h:7
-#| msgid "_Quit"
 msgid "Quit Now"
 msgstr "Jetzt beenden"
 
@@ -20340,55 +20503,67 @@ msgstr ""
 "ausgestellt hat. Daher vertrauen Sie der AuthentizitÃ¤t dieses Zertifikats "
 "nicht, falls Sie es hier nicht anders angeben."
 
-#: ../smime/gui/certificate-manager.c:135
-#: ../smime/gui/certificate-manager.c:382
-#: ../smime/gui/certificate-manager.c:610
+#: ../smime/gui/certificate-manager.c:148
+#: ../smime/gui/certificate-manager.c:460
+#: ../smime/gui/certificate-manager.c:697
 msgid "Select a certificate to import..."
 msgstr "WÃ¤hlen Sie ein zu importierendes Zertifikat â?¦"
 
-#: ../smime/gui/certificate-manager.c:144
+#: ../smime/gui/certificate-manager.c:157
 msgid "All PKCS12 files"
 msgstr "Alle PKCS12-Dateien"
 
-#: ../smime/gui/certificate-manager.c:150
-#: ../smime/gui/certificate-manager.c:397
-#: ../smime/gui/certificate-manager.c:624
+#: ../smime/gui/certificate-manager.c:163
+#: ../smime/gui/certificate-manager.c:475
+#: ../smime/gui/certificate-manager.c:711
 msgid "All files"
 msgstr "Alle Dateien"
 
-#: ../smime/gui/certificate-manager.c:274
-#: ../smime/gui/certificate-manager.c:487
-#: ../smime/gui/certificate-manager.c:712
+#: ../smime/gui/certificate-manager.c:182
+msgid "Failed to import user's certificate"
+msgstr "Benutzerzertifikat konnte nicht importiert werden"
+
+#: ../smime/gui/certificate-manager.c:352
+#: ../smime/gui/certificate-manager.c:574
+#: ../smime/gui/certificate-manager.c:808
 msgid "Certificate Name"
 msgstr "Zertifikatname"
 
-#: ../smime/gui/certificate-manager.c:283
-#: ../smime/gui/certificate-manager.c:505
+#: ../smime/gui/certificate-manager.c:361
+#: ../smime/gui/certificate-manager.c:592
 msgid "Purposes"
 msgstr "Verwendungszwecke"
 
-#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:32
+#: ../smime/gui/certificate-manager.c:370 ../smime/gui/smime-ui.ui.h:32
 #: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "Seriennummer"
 
-#: ../smime/gui/certificate-manager.c:300
+#: ../smime/gui/certificate-manager.c:378
 msgid "Expires"
 msgstr "LÃ¤uft aus"
 
-#: ../smime/gui/certificate-manager.c:391
+#: ../smime/gui/certificate-manager.c:469
 msgid "All email certificate files"
 msgstr "Alle E-Mail-Zertifikatdateien"
 
-#: ../smime/gui/certificate-manager.c:496
+#: ../smime/gui/certificate-manager.c:502
+msgid "Failed to import contact's certificate"
+msgstr "Zertifikat des Kontakts konnte nicht importiert werden"
+
+#: ../smime/gui/certificate-manager.c:583
 msgid "E-Mail Address"
 msgstr "E-Mail-Adresse"
 
-#: ../smime/gui/certificate-manager.c:619
+#: ../smime/gui/certificate-manager.c:706
 msgid "All CA certificate files"
 msgstr "Alle CA-Zertifikatdateien"
 
-#: ../smime/gui/certificate-manager.c:1052
+#: ../smime/gui/certificate-manager.c:737
+msgid "Failed to import certificate authority's certificate"
+msgstr "Das Zertifikat der Zertifizierungsstelle konnte nicht importiert werden"
+
+#: ../smime/gui/certificate-manager.c:1156
 msgid "Certificates"
 msgstr "Zertifikate"
 
@@ -20399,7 +20574,6 @@ msgstr "Zertifikatbetrachter: %s"
 
 #: ../smime/gui/component.c:46
 #, c-format
-#| msgid "Enter the password for `%s'"
 msgid "Enter the password for '%s'"
 msgstr "Geben Sie das Passwort fÃ¼r Â»%sÂ« ein"
 
@@ -20444,7 +20618,6 @@ msgid "Authorities"
 msgstr "Zertifizierungsstellen"
 
 #: ../smime/gui/smime-ui.ui.h:3
-#| msgid "Backup All"
 msgid "Backup _All"
 msgstr "_Alle sichern"
 
@@ -20458,7 +20631,7 @@ msgstr ""
 "sein Zertifikat und seine Verfahrensweisen unter die Lupe nehmen (falls "
 "mÃ¶glich)."
 
-#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1077
+#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1086
 msgid "Certificate"
 msgstr "Zertifikat"
 
@@ -20546,11 +20719,11 @@ msgstr "Organisationseinheit (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1-Fingerabdruck"
 
-#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:815
+#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:824
 msgid "SSL Client Certificate"
 msgstr "SSL-Client-Zertifikat"
 
-#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:828
 msgid "SSL Server Certificate"
 msgstr "SSL-Server-Zertifikat"
 
@@ -20571,7 +20744,6 @@ msgid "Trust this CA to identify software developers."
 msgstr "Dieser CA bei der Identifikation von Software-Entwicklern vertrauen."
 
 #: ../smime/gui/smime-ui.ui.h:37
-#| msgid "Trust this CA to identify web sites."
 msgid "Trust this CA to identify websites."
 msgstr "Dieser Zertifizierungsstelle bei der Website-Identifikation vertrauen."
 
@@ -20598,7 +20770,6 @@ msgid "Your Certificates"
 msgstr "Ihre Zertifikate"
 
 #: ../smime/gui/smime-ui.ui.h:43
-#| msgid "Backup"
 msgid "_Backup"
 msgstr "_Sichern"
 
@@ -20606,8 +20777,7 @@ msgstr "_Sichern"
 msgid "_Edit CA Trust"
 msgstr "CA-VertrauenswÃ¼rdigkeit _bearbeiten"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:711
+#: ../smime/lib/e-cert-db.c:906
 msgid "Certificate already exists"
 msgstr "Zertifikat existiert bereits"
 
@@ -20652,102 +20822,114 @@ msgstr "PKCS #1 MD5 mit RSA-VerschlÃ¼sselung"
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 mit RSA-VerschlÃ¼sselung"
 
-#: ../smime/lib/e-cert.c:663
+#: ../smime/lib/e-cert.c:639
+msgid "PKCS #1 SHA-256 With RSA Encryption"
+msgstr "PKCS #1 SHA-256 mit RSA-VerschlÃ¼sselung"
+
+#: ../smime/lib/e-cert.c:642
+msgid "PKCS #1 SHA-384 With RSA Encryption"
+msgstr "PKCS #1 SHA-384 mit RSA-VerschlÃ¼sselung"
+
+#: ../smime/lib/e-cert.c:645
+msgid "PKCS #1 SHA-512 With RSA Encryption"
+msgstr "PKCS #1 SHA-512 mit RSA-VerschlÃ¼sselung"
+
+#: ../smime/lib/e-cert.c:672
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1-RSA-VerschlÃ¼sselung"
 
-#: ../smime/lib/e-cert.c:666
+#: ../smime/lib/e-cert.c:675
 msgid "Certificate Key Usage"
 msgstr "Verwendungszweck des ZertifikatsschlÃ¼ssels"
 
-#: ../smime/lib/e-cert.c:669
+#: ../smime/lib/e-cert.c:678
 msgid "Netscape Certificate Type"
 msgstr "Netscape-Zertifikatart"
 
-#: ../smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:681
 msgid "Certificate Authority Key Identifier"
 msgstr "SchlÃ¼sselidentifikator der Zertifizierungsstelle"
 
-#: ../smime/lib/e-cert.c:684
+#: ../smime/lib/e-cert.c:693
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Objektidentifikator (%s)"
 
-#: ../smime/lib/e-cert.c:735
+#: ../smime/lib/e-cert.c:744
 msgid "Algorithm Identifier"
 msgstr "Algorithmusidentifikator"
 
-#: ../smime/lib/e-cert.c:743
+#: ../smime/lib/e-cert.c:752
 msgid "Algorithm Parameters"
 msgstr "Algorithmus-Parameter"
 
-#: ../smime/lib/e-cert.c:765
+#: ../smime/lib/e-cert.c:774
 msgid "Subject Public Key Info"
 msgstr "Infos zum Ã¶ffentlichen EmpfÃ¤ngerschlÃ¼ssel"
 
-#: ../smime/lib/e-cert.c:770
+#: ../smime/lib/e-cert.c:779
 msgid "Subject Public Key Algorithm"
 msgstr "Algorithmus des Ã¶ffentlichen EmpfÃ¤ngerschlÃ¼ssels"
 
-#: ../smime/lib/e-cert.c:785
+#: ../smime/lib/e-cert.c:794
 msgid "Subject's Public Key"
 msgstr "Ã?ffentlicher SchlÃ¼ssel des EmpfÃ¤ngers"
 
-#: ../smime/lib/e-cert.c:806 ../smime/lib/e-cert.c:855
+#: ../smime/lib/e-cert.c:815 ../smime/lib/e-cert.c:864
 msgid "Error: Unable to process extension"
 msgstr "Fehler: Erweiterung konnte nicht verarbeitet werden"
 
-#: ../smime/lib/e-cert.c:827 ../smime/lib/e-cert.c:839
+#: ../smime/lib/e-cert.c:836 ../smime/lib/e-cert.c:848
 msgid "Object Signer"
 msgstr "Objektunterzeichner"
 
-#: ../smime/lib/e-cert.c:831
+#: ../smime/lib/e-cert.c:840
 msgid "SSL Certificate Authority"
 msgstr "SSL-Zertifizierungsstelle"
 
-#: ../smime/lib/e-cert.c:835
+#: ../smime/lib/e-cert.c:844
 msgid "Email Certificate Authority"
 msgstr "E-Mail-Zertifizierungsstelle"
 
-#: ../smime/lib/e-cert.c:863
+#: ../smime/lib/e-cert.c:872
 msgid "Signing"
 msgstr "Signieren"
 
 # CHECK
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-cert.c:876
 msgid "Non-repudiation"
 msgstr "Unleugbarkeit"
 
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-cert.c:880
 msgid "Key Encipherment"
 msgstr "SchlÃ¼sselverschlÃ¼sselung"
 
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-cert.c:884
 msgid "Data Encipherment"
 msgstr "DatenverschlÃ¼sselung"
 
 # CHECK gibt's ne Ã?bersetzung fÃ¼r diese Methode?
-#: ../smime/lib/e-cert.c:879
+#: ../smime/lib/e-cert.c:888
 msgid "Key Agreement"
 msgstr "Key-Agreement"
 
-#: ../smime/lib/e-cert.c:883
+#: ../smime/lib/e-cert.c:892
 msgid "Certificate Signer"
 msgstr "Zertifikatunterzeichner"
 
-#: ../smime/lib/e-cert.c:887
+#: ../smime/lib/e-cert.c:896
 msgid "CRL Signer"
 msgstr "CRL-Unterzeichner"
 
-#: ../smime/lib/e-cert.c:935
+#: ../smime/lib/e-cert.c:944
 msgid "Critical"
 msgstr "Kritisch"
 
-#: ../smime/lib/e-cert.c:937 ../smime/lib/e-cert.c:940
+#: ../smime/lib/e-cert.c:946 ../smime/lib/e-cert.c:949
 msgid "Not Critical"
 msgstr "Nicht-kritisch"
 
-#: ../smime/lib/e-cert.c:961
+#: ../smime/lib/e-cert.c:970
 msgid "Extensions"
 msgstr "Erweiterungen"
 
@@ -20757,28 +20939,28 @@ msgstr "Erweiterungen"
 #. need to change this string, unless changing the order of name and value.
 #. As a result example: "OU = VeriSign Trust Network"
 #.
-#: ../smime/lib/e-cert.c:1036
+#: ../smime/lib/e-cert.c:1045
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1091 ../smime/lib/e-cert.c:1214
+#: ../smime/lib/e-cert.c:1100 ../smime/lib/e-cert.c:1223
 msgid "Certificate Signature Algorithm"
 msgstr "Algorithmus der Zertifikatsignatur"
 
-#: ../smime/lib/e-cert.c:1100
+#: ../smime/lib/e-cert.c:1109
 msgid "Issuer"
 msgstr "Aussteller"
 
-#: ../smime/lib/e-cert.c:1155
+#: ../smime/lib/e-cert.c:1164
 msgid "Issuer Unique ID"
 msgstr "Eindeutige Ausstellerkennung"
 
-#: ../smime/lib/e-cert.c:1174
+#: ../smime/lib/e-cert.c:1183
 msgid "Subject Unique ID"
 msgstr "Eindeutige EmpfÃ¤ngerkennung"
 
-#: ../smime/lib/e-cert.c:1220
+#: ../smime/lib/e-cert.c:1229
 msgid "Certificate Signature Value"
 msgstr "Wert der Zertifikatsignatur"
 
@@ -20902,14 +21084,14 @@ msgstr ""
 msgid "_Selection"
 msgstr "Au_swahl"
 
-#: ../widgets/menus/gal-define-views-dialog.c:339
+#: ../widgets/menus/gal-define-views-dialog.c:346
 #: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Ansichten fÃ¼r %s definieren"
 
-#: ../widgets/menus/gal-define-views-dialog.c:347
-#: ../widgets/menus/gal-define-views-dialog.c:349
+#: ../widgets/menus/gal-define-views-dialog.c:354
+#: ../widgets/menus/gal-define-views-dialog.c:356
 msgid "Define Views"
 msgstr "Ansichten definieren"
 
@@ -20922,7 +21104,7 @@ msgstr "Ansichten fÃ¼r Â»%sÂ« definieren"
 msgid "Table"
 msgstr "Tabelle"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:274
 msgid "Save Current View"
 msgstr "Aktuelle Ansicht speichern"
 
@@ -20997,13 +21179,13 @@ msgstr "_Senden an â?¦"
 msgid "Send the selected attachments somewhere"
 msgstr "Die ausgewÃ¤hlten Anlagen versenden"
 
-#: ../widgets/misc/e-attachment-icon-view.c:480
-#: ../widgets/misc/e-attachment-tree-view.c:517
+#: ../widgets/misc/e-attachment-icon-view.c:495
+#: ../widgets/misc/e-attachment-tree-view.c:535
 msgid "Loading"
 msgstr "Wird geladen"
 
-#: ../widgets/misc/e-attachment-icon-view.c:492
-#: ../widgets/misc/e-attachment-tree-view.c:529
+#: ../widgets/misc/e-attachment-icon-view.c:507
+#: ../widgets/misc/e-attachment-tree-view.c:547
 msgid "Saving"
 msgstr "Wird gespeichert"
 
@@ -21012,7 +21194,7 @@ msgid "Hide Attachment _Bar"
 msgstr "Anla_genleiste verbergen"
 
 #: ../widgets/misc/e-attachment-paned.c:89
-#: ../widgets/misc/e-attachment-paned.c:636
+#: ../widgets/misc/e-attachment-paned.c:605
 msgid "Show Attachment _Bar"
 msgstr "Anla_genleiste anzeigen"
 
@@ -21031,33 +21213,33 @@ msgstr[0] "Anlage speichern"
 msgstr[1] "Anlagen speichern"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:633 ../widgets/misc/e-attachment.c:1773
-#: ../widgets/misc/e-attachment.c:2313
+#: ../widgets/misc/e-attachment-store.c:633 ../widgets/misc/e-attachment.c:1808
+#: ../widgets/misc/e-attachment.c:2348
 msgid "attachment.dat"
 msgstr "Anlage.dat"
 
-#: ../widgets/misc/e-attachment-view.c:299
+#: ../widgets/misc/e-attachment-view.c:301
 msgid "S_ave All"
 msgstr "_Alle speichern"
 
-#: ../widgets/misc/e-attachment-view.c:325
+#: ../widgets/misc/e-attachment-view.c:327
 msgid "A_dd Attachment..."
 msgstr "Anlage _hinzufÃ¼gen â?¦"
 
-#: ../widgets/misc/e-attachment-view.c:349
+#: ../widgets/misc/e-attachment-view.c:351
 msgid "_Hide"
 msgstr "_Verbergen"
 
-#: ../widgets/misc/e-attachment-view.c:356
+#: ../widgets/misc/e-attachment-view.c:358
 msgid "_View Inline"
 msgstr "_Eingebettet anzeigen"
 
-#: ../widgets/misc/e-attachment-view.c:638
+#: ../widgets/misc/e-attachment-view.c:640
 #, c-format
 msgid "Open with \"%s\""
 msgstr "Mit Â»%sÂ« Ã¶ffnen"
 
-#: ../widgets/misc/e-attachment-view.c:641
+#: ../widgets/misc/e-attachment-view.c:643
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Diese Anlage mit Â»%sÂ« Ã¶ffnen"
@@ -21066,48 +21248,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.
-#: ../widgets/misc/e-attachment.c:994
+#: ../widgets/misc/e-attachment.c:1021
 msgid "Attached message"
 msgstr "Beigelegte Nachricht"
 
-#: ../widgets/misc/e-attachment.c:1814 ../widgets/misc/e-attachment.c:2615
+#: ../widgets/misc/e-attachment.c:1849 ../widgets/misc/e-attachment.c:2650
 msgid "A load operation is already in progress"
 msgstr "Ein Ladevorgang lÃ¤uft bereits"
 
-#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2623
+#: ../widgets/misc/e-attachment.c:1857 ../widgets/misc/e-attachment.c:2658
 msgid "A save operation is already in progress"
 msgstr "Ein Speichervorgang lÃ¤uft bereits"
 
-#: ../widgets/misc/e-attachment.c:1914
+#: ../widgets/misc/e-attachment.c:1949
 #, c-format
 msgid "Could not load '%s'"
 msgstr "Â»%sÂ« konnte nicht geladen werden"
 
-#: ../widgets/misc/e-attachment.c:1917
+#: ../widgets/misc/e-attachment.c:1952
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Die Anlage konnte nicht geladen werden"
 
-#: ../widgets/misc/e-attachment.c:2193
+#: ../widgets/misc/e-attachment.c:2228
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Â»%sÂ« konnte nicht geÃ¶ffnet werden"
 
-#: ../widgets/misc/e-attachment.c:2196
+#: ../widgets/misc/e-attachment.c:2231
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Die Anlage konnte nicht geÃ¶ffnet werden"
 
-#: ../widgets/misc/e-attachment.c:2631
+#: ../widgets/misc/e-attachment.c:2666
 msgid "Attachment contents not loaded"
 msgstr "Anlagen wurden nicht geladen"
 
-#: ../widgets/misc/e-attachment.c:2707
+#: ../widgets/misc/e-attachment.c:2742
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Â»%sÂ« konnte nicht gespeichert werden"
 
-#: ../widgets/misc/e-attachment.c:2710
+#: ../widgets/misc/e-attachment.c:2745
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Die Anlage konnte nicht gespeichert werden"
@@ -21118,7 +21300,7 @@ msgid "Ctrl-click to open a link"
 msgstr "DrÃ¼cken Sie Strg und klicken Sie, um einen Link zu Ã¶ffnen"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1254
+#: ../widgets/misc/e-calendar-item.c:1255
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -21183,7 +21365,7 @@ msgstr "UngÃ¼ltiges Datum"
 msgid "Invalid Time Value"
 msgstr "UngÃ¼ltige Zeitangabe"
 
-#: ../widgets/misc/e-import-assistant.c:238
+#: ../widgets/misc/e-import-assistant.c:242
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
@@ -21191,40 +21373,37 @@ msgstr ""
 "WÃ¤hlen Sie die Datei, die Sie in Evolution importieren wollen und legen Sie "
 "den Dateitypenanhand der Auswahlliste fest."
 
-#: ../widgets/misc/e-import-assistant.c:255
+#: ../widgets/misc/e-import-assistant.c:259
 msgid "F_ilename:"
 msgstr "Datei_name:"
 
-#: ../widgets/misc/e-import-assistant.c:265
+#: ../widgets/misc/e-import-assistant.c:269
 msgid "Select a file"
 msgstr "Eine Datei wÃ¤hlen"
 
-#: ../widgets/misc/e-import-assistant.c:279
-#: ../widgets/misc/e-import-assistant.c:455
+#: ../widgets/misc/e-import-assistant.c:283
+#: ../widgets/misc/e-import-assistant.c:458
 msgid "File _type:"
 msgstr "Datei_typ:"
 
-#: ../widgets/misc/e-import-assistant.c:322
+#: ../widgets/misc/e-import-assistant.c:326
+#: ../widgets/misc/e-import-assistant.c:909
 msgid "Choose the destination for this import"
 msgstr "WÃ¤hlen Sie das Ziel dieses Imports"
 
-#: ../widgets/misc/e-import-assistant.c:347
+#: ../widgets/misc/e-import-assistant.c:351
 msgid "Choose the type of importer to run:"
 msgstr "WÃ¤hlen Sie den auszufÃ¼hrenden Importeur:"
 
-#: ../widgets/misc/e-import-assistant.c:355
+#: ../widgets/misc/e-import-assistant.c:359
 msgid "Import data and settings from _older programs"
 msgstr "Daten und Einstellungen aus Ã¤_lteren Programmen importieren"
 
-#: ../widgets/misc/e-import-assistant.c:363
+#: ../widgets/misc/e-import-assistant.c:367
 msgid "Import a _single file"
 msgstr "Eine _einzelne Datei importieren"
 
-#: ../widgets/misc/e-import-assistant.c:439
-msgid "Select what type of file you want to import from the list."
-msgstr "WÃ¤hlen Sie den aus der Liste zu importierenden Dateityp."
-
-#: ../widgets/misc/e-import-assistant.c:516
+#: ../widgets/misc/e-import-assistant.c:519
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
@@ -21235,17 +21414,38 @@ msgstr ""
 "Einstellungen gefunden. Klicken Sie bitte auf den Knopf Â»ZurÃ¼ckÂ«, falls Sie es "
 "noch einmal versuchen wollen."
 
-#: ../widgets/misc/e-import-assistant.c:1187
-#: ../widgets/misc/e-import-assistant.c:1214
+#. Install a custom "Cancel Import" button.
+#: ../widgets/misc/e-import-assistant.c:766
+msgid "_Cancel Import"
+msgstr "Import abbre_chen"
+
+#: ../widgets/misc/e-import-assistant.c:908
+msgid "Preview data to be imported"
+msgstr "Vorschau der zu importierenden Daten"
+
+#: ../widgets/misc/e-import-assistant.c:914
+#: ../widgets/misc/e-import-assistant.c:927
+#: ../widgets/misc/e-import-assistant.c:1276
+#: ../widgets/misc/e-import-assistant.c:1342
+#: ../widgets/misc/e-import-assistant.c:1351
+msgid "Import Data"
+msgstr "Daten importieren"
+
+#: ../widgets/misc/e-import-assistant.c:922
+msgid "Select what type of file you want to import from the list."
+msgstr "WÃ¤hlen Sie den aus der Liste zu importierenden Dateityp."
+
+#: ../widgets/misc/e-import-assistant.c:1268
+#: ../widgets/misc/e-import-assistant.c:1300
 msgid "Evolution Import Assistant"
 msgstr "Evolution-Importassistent"
 
-#: ../widgets/misc/e-import-assistant.c:1196
-#: ../widgets/misc/e-import-assistant.c:1248
+#: ../widgets/misc/e-import-assistant.c:1283
+#: ../widgets/misc/e-import-assistant.c:1330
 msgid "Import Location"
 msgstr "Ort importieren"
 
-#: ../widgets/misc/e-import-assistant.c:1207
+#: ../widgets/misc/e-import-assistant.c:1294
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -21255,28 +21455,23 @@ msgstr ""
 "Dieser Assistent fÃ¼hrt Sie durch das Importieren externer Dateien in "
 "Evolution."
 
-#: ../widgets/misc/e-import-assistant.c:1223
+#: ../widgets/misc/e-import-assistant.c:1308
 msgid "Importer Type"
 msgstr "Importeurtyp"
 
-#: ../widgets/misc/e-import-assistant.c:1232
+#: ../widgets/misc/e-import-assistant.c:1316
 msgid "Select Information to Import"
 msgstr "Zu importierende Informationen auswÃ¤hlen"
 
-#: ../widgets/misc/e-import-assistant.c:1240
+#: ../widgets/misc/e-import-assistant.c:1323
 msgid "Select a File"
 msgstr "WÃ¤hlen Sie eine Datei"
 
-#: ../widgets/misc/e-import-assistant.c:1255
+#: ../widgets/misc/e-import-assistant.c:1337
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr ""
 "Klicken Sie auf Â»AnwendenÂ«, um den Import der Datei in Evolution zu beginnen."
 
-#: ../widgets/misc/e-import-assistant.c:1261
-#: ../widgets/misc/e-import-assistant.c:1271
-msgid "Import Data"
-msgstr "Daten importieren"
-
 #: ../widgets/misc/e-map.c:624
 msgid "World Map"
 msgstr "Weltkarte"
@@ -21307,19 +21502,7 @@ msgid "Evolution is currently offline because the network is unavailable."
 msgstr ""
 "Evolution ist im Augenblick offline, weil das Netzwerk nicht verfÃ¼gbar ist."
 
-#: ../widgets/misc/e-pilot-settings.c:95
-msgid "Sync with:"
-msgstr "Abgleichen mit:"
-
-#: ../widgets/misc/e-pilot-settings.c:103
-msgid "Sync Private Records:"
-msgstr "Private EintrÃ¤ge abgleichen:"
-
-#: ../widgets/misc/e-pilot-settings.c:112
-msgid "Sync Categories:"
-msgstr "Kategorien abgleichen:"
-
-#: ../widgets/misc/e-preferences-window.c:218
+#: ../widgets/misc/e-preferences-window.c:266
 msgid "Evolution Preferences"
 msgstr "Evolution-Einstellungen"
 
@@ -21447,7 +21630,6 @@ msgstr "B_innen"
 
 #. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
 #: ../widgets/misc/e-send-options.ui.h:31
-#| msgid "_After:"
 msgid "_After"
 msgstr "D_anach"
 
@@ -21473,7 +21655,6 @@ msgstr "_Verfallsdatum angeben"
 
 #. Translators: This is part of 'Until [ date ]', where [ date ] is a date picker
 #: ../widgets/misc/e-send-options.ui.h:39
-#| msgid "_Until:"
 msgid "_Until"
 msgstr "_Bis"
 
@@ -21538,41 +21719,41 @@ msgstr "Die Skriptdatei muss ausfÃ¼hrbar sein."
 msgid "Click here to go to URL"
 msgstr "Klicken Sie hier, um zur Adresse zu gehen"
 
-#: ../widgets/misc/e-web-view.c:359
+#: ../widgets/misc/e-web-view.c:369
 msgid "_Copy Link Location"
 msgstr "Link-Ziel _kopieren"
 
-#: ../widgets/misc/e-web-view.c:361
+#: ../widgets/misc/e-web-view.c:371
 msgid "Copy the link to the clipboard"
 msgstr "Den Verweis in die Zwischenablage kopieren"
 
-#: ../widgets/misc/e-web-view.c:369
+#: ../widgets/misc/e-web-view.c:379
 msgid "_Open Link in Browser"
 msgstr "Link im Browser Ã¶_ffnen"
 
-#: ../widgets/misc/e-web-view.c:371
+#: ../widgets/misc/e-web-view.c:381
 msgid "Open the link in a web browser"
 msgstr "Verweis im Browser Ã¶_ffnen"
 
-#: ../widgets/misc/e-web-view.c:379
+#: ../widgets/misc/e-web-view.c:389
 msgid "_Copy Email Address"
 msgstr "_E-Mail-Adresse kopieren"
 
-#: ../widgets/misc/e-web-view.c:408 ../widgets/misc/e-web-view.c:1063
+#: ../widgets/misc/e-web-view.c:418 ../widgets/misc/e-web-view.c:1073
 msgid "Select all text and images"
 msgstr "Den gesamten Text und Bilder in einer Nachricht markieren"
 
-#: ../widgets/misc/e-web-view.c:840 ../widgets/misc/e-web-view.c:842
-#: ../widgets/misc/e-web-view.c:844
+#: ../widgets/misc/e-web-view.c:850 ../widgets/misc/e-web-view.c:852
+#: ../widgets/misc/e-web-view.c:854
 #, c-format
 msgid "Click to call %s"
 msgstr "Klicken Sie hier, um %s anzurufen"
 
-#: ../widgets/misc/e-web-view.c:846
+#: ../widgets/misc/e-web-view.c:856
 msgid "Click to hide/unhide addresses"
 msgstr "Adressen anzeigen/verbergen"
 
-#: ../widgets/misc/e-web-view.c:848
+#: ../widgets/misc/e-web-view.c:858
 #, c-format
 msgid "Click to open %s"
 msgstr "Klicken Sie hier, um %s zu Ã¶ffnen"
@@ -21654,7 +21835,7 @@ msgid "A_vailable Fields:"
 msgstr "_VerfÃ¼gbare Felder:"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1697
+#: ../widgets/table/e-table-header-item.c:1702
 msgid "Ascending"
 msgstr "Aufsteigend"
 
@@ -21667,7 +21848,7 @@ msgid "Clear _All"
 msgstr "Alles _entfernen"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1697
+#: ../widgets/table/e-table-header-item.c:1702
 msgid "Descending"
 msgstr "Absteigend"
 
@@ -21748,8 +21929,6 @@ msgstr ""
 #.
 #: ../widgets/table/e-table-group-container.c:351
 #, c-format
-#| msgid "%s : %s (%d item)"
-#| msgid_plural "%s : %s (%d items)"
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
 msgstr[0] "%s: %s (%d Objekt)"
@@ -21768,60 +21947,60 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d Objekt)"
 msgstr[1] "%s (%d Objekte)"
 
-#: ../widgets/table/e-table-header-item.c:1541
+#: ../widgets/table/e-table-header-item.c:1546
 msgid "Customize Current View"
 msgstr "Aktuelle Ansicht anpassen"
 
-#: ../widgets/table/e-table-header-item.c:1562
+#: ../widgets/table/e-table-header-item.c:1567
 msgid "Sort _Ascending"
 msgstr "A_ufsteigend sortieren"
 
-#: ../widgets/table/e-table-header-item.c:1565
+#: ../widgets/table/e-table-header-item.c:1570
 msgid "Sort _Descending"
 msgstr "A_bsteigend sortieren"
 
-#: ../widgets/table/e-table-header-item.c:1568
+#: ../widgets/table/e-table-header-item.c:1573
 msgid "_Unsort"
 msgstr "_Nicht sortieren"
 
-#: ../widgets/table/e-table-header-item.c:1571
+#: ../widgets/table/e-table-header-item.c:1576
 msgid "Group By This _Field"
 msgstr "Nach diesem _Feld gruppieren"
 
-#: ../widgets/table/e-table-header-item.c:1574
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Group By _Box"
 msgstr "Nach FÃ¤c_hern gruppieren"
 
-#: ../widgets/table/e-table-header-item.c:1578
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Remove This _Column"
 msgstr "_Diese Spalte entfernen"
 
-#: ../widgets/table/e-table-header-item.c:1581
+#: ../widgets/table/e-table-header-item.c:1586
 msgid "Add a C_olumn..."
 msgstr "Spalte hin_zufÃ¼gen â?¦"
 
-#: ../widgets/table/e-table-header-item.c:1585
+#: ../widgets/table/e-table-header-item.c:1590
 msgid "A_lignment"
 msgstr "Aus_richtung"
 
-#: ../widgets/table/e-table-header-item.c:1588
+#: ../widgets/table/e-table-header-item.c:1593
 msgid "B_est Fit"
 msgstr "_Optimal"
 
-#: ../widgets/table/e-table-header-item.c:1591
+#: ../widgets/table/e-table-header-item.c:1596
 msgid "Format Column_s..."
 msgstr "Spalten for_matieren â?¦"
 
-#: ../widgets/table/e-table-header-item.c:1595
+#: ../widgets/table/e-table-header-item.c:1600
 msgid "Custo_mize Current View..."
 msgstr "A_ktuelle Ansicht anpassen â?¦"
 
-#: ../widgets/table/e-table-header-item.c:1654
+#: ../widgets/table/e-table-header-item.c:1659
 msgid "_Sort By"
 msgstr "_Sortieren nach"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1672
+#: ../widgets/table/e-table-header-item.c:1677
 msgid "_Custom"
 msgstr "_Benutzerdefiniert"
 
@@ -21862,14 +22041,549 @@ msgstr "Klicken"
 msgid "sort"
 msgstr "Sortieren"
 
-#: ../widgets/text/e-text.c:2474
+#: ../widgets/text/e-text.c:2533
 msgid "Select All"
 msgstr "Alle auswÃ¤hlen"
 
-#: ../widgets/text/e-text.c:2486
+#: ../widgets/text/e-text.c:2545
 msgid "Input Methods"
 msgstr "Eingabemethoden"
 
+#~ msgid "Success"
+#~ msgstr "Erfolg"
+
+#~ msgid "Backend busy"
+#~ msgstr "Backend belegt"
+
+#~ msgid "Repository offline"
+#~ msgstr "Repository offline"
+
+#~ msgid "Address Book does not exist"
+#~ msgstr "Adressbuch existiert nicht"
+
+#~ msgid "No Self Contact defined"
+#~ msgstr "Kein eigener Kontakt festgelegt"
+
+#~ msgid "Permission denied"
+#~ msgstr "Erlaubnis verweigert"
+
+#~ msgid "Contact not found"
+#~ msgstr "Kontakt nicht gefunden"
+
+#~ msgid "Contact ID already exists"
+#~ msgstr "Kontaktkennung existiert bereits"
+
+#~ msgid "Protocol not supported"
+#~ msgstr "Protokoll nicht unterstÃ¼tzt"
+
+#~ msgid "Could not cancel"
+#~ msgstr "Abbrechen gescheitert"
+
+#~ msgid "Authentication Failed"
+#~ msgstr "Legitimation gescheitert"
+
+#~ msgid "Authentication Required"
+#~ msgstr "Legitimation erforderlich"
+
+#~ msgid "TLS not Available"
+#~ msgstr "TLS nicht verfÃ¼gbar"
+
+#~ msgid "No such source"
+#~ msgstr "Keine derartige Quelle"
+
+#~ msgid "Not available in offline mode"
+#~ msgstr "Im Offline-Modus nicht verfÃ¼gbar"
+
+#~ msgid "Other error"
+#~ msgstr "Anderer Fehler"
+
+#~ msgid "Invalid server version"
+#~ msgstr "UngÃ¼ltige Server-Version"
+
+#~ msgid "Unsupported authentication method"
+#~ msgstr "Nicht unterstÃ¼tzte Legitimationsmethode"
+
+#~ msgid "The event could not be deleted due to a corba error"
+#~ msgstr ""
+#~ "Das Ereignis konnte auf Grund eines Corba-Fehlers nicht gelÃ¶scht werden"
+
+#~ msgid "The task could not be deleted due to a corba error"
+#~ msgstr ""
+#~ "Die Aufgabe konnte auf Grund eines Corba-Fehlers nicht gelÃ¶scht werden"
+
+#~ msgid "The memo could not be deleted due to a corba error"
+#~ msgstr "Die Notiz konnte auf Grund eines Corba-Fehlers nicht gelÃ¶scht werden"
+
+#~ msgid "The item could not be deleted due to a corba error"
+#~ msgstr ""
+#~ "Das Objekt konnte auf Grund eines Corba-Fehlers nicht gelÃ¶scht werden"
+
+#~ msgid "Could not parse PGP message: Unknown error"
+#~ msgstr ""
+#~ "Die Syntax der PGP-Nachricht konnte nicht analysiert werden: Unbekannter "
+#~ "Fehler"
+
+#~ msgid "Text"
+#~ msgstr "Text"
+
+#~| msgid "Text Model"
+#~ msgid "Text to display"
+#~ msgstr "Darzustellender Text"
+
+#~| msgid "X1"
+#~ msgid "X"
+#~ msgstr "X"
+
+#~| msgid "Position"
+#~ msgid "X position"
+#~ msgstr "X-Position"
+
+#~| msgid "Y1"
+#~ msgid "Y"
+#~ msgstr "Y"
+
+#~| msgid "Position"
+#~ msgid "Y position"
+#~ msgstr "Y-Position"
+
+#~ msgid "Width"
+#~ msgstr "Breite"
+
+#~| msgid "Search for text"
+#~ msgid "Width for text box"
+#~ msgstr "Breite des Textfeldes"
+
+#~ msgid "Height"
+#~ msgstr "HÃ¶he"
+
+#~| msgid "Search for text"
+#~ msgid "Height for text box"
+#~ msgstr "HÃ¶he des Textfeldes"
+
+#~ msgid "Editable"
+#~ msgstr "Editierbar"
+
+#~ msgid "Is this rich text item editable?"
+#~ msgstr "Ist dieses Rich-Text-Objekt editierbar?"
+
+#~| msgid "_Disable"
+#~ msgid "Visible"
+#~ msgstr "Sichtbar"
+
+#~ msgid "Is this rich text item visible?"
+#~ msgstr "Ist dieses Rich-Text-Objekt sichtbar?"
+
+#~| msgid "Toolbar Visible"
+#~ msgid "Cursor Visible"
+#~ msgstr "Cursor sichtbar"
+
+#~ msgid "Is the cursor visible in this rich text item?"
+#~ msgstr "Ist der Cursor in diesem Rich-Text-Objekt sichtbar?"
+
+#~| msgid "Cursor Column"
+#~ msgid "Cursor Blink"
+#~ msgstr "Blinkender Cursor"
+
+#~ msgid "Does the cursor blink in this rich text item?"
+#~ msgstr "Blinkt der Cursor in diesem Rich-Text-Objekt?"
+
+#~| msgid "Height"
+#~ msgid "Grow Height"
+#~ msgstr "HÃ¶he vergrÃ¶Ã?ern"
+
+#~ msgid "Should the text box height grow if the text does not fit?"
+#~ msgstr ""
+#~ "Soll die HÃ¶he des Textfeldes angepasst werden, wenn der Text nicht passt?"
+
+#~| msgid "Safe Mode"
+#~ msgid "Wrap Mode"
+#~ msgstr "Umbruchmodus"
+
+#~ msgid "Wrap mode for multiline text"
+#~ msgstr "Umbruch-Modus in mehrzeiligem Text"
+
+#~ msgid "Justification"
+#~ msgstr "Ausrichtung"
+
+#~| msgid "Justification"
+#~ msgid "Justification mode"
+#~ msgstr "Blocksatz-Modus"
+
+#~| msgid "Description"
+#~ msgid "Direction"
+#~ msgstr "Richtung"
+
+#~| msgid "Save directory"
+#~ msgid "Text direction"
+#~ msgstr "Textrichtung"
+
+#~ msgid "Anchor"
+#~ msgstr "Verankerung"
+
+#~| msgid "Search for text"
+#~ msgid "Anchor point for text"
+#~ msgstr "Verankerungspunkt fÃ¼r Text"
+
+#~ msgid "Pixels Above Lines"
+#~ msgstr "Pixel Ã¼ber den Zeilen"
+
+#~ msgid "Number of pixels to put above lines"
+#~ msgstr "Anzahl Pixel, die Ã¼ber den Zeilen eingefÃ¼gt werden"
+
+#~ msgid "Pixels Below Lines"
+#~ msgstr "Pixel unterhalb der Zeilen"
+
+#~ msgid "Number of pixels to put below lines"
+#~ msgstr "Anzahl Pixel, die unter den Zeilen eingefÃ¼gt werden"
+
+#~ msgid "Pixels Inside Wrap"
+#~ msgstr "Pixel innerhalb des Umbruchs"
+
+#~ msgid "Number of pixels to put inside the wrap"
+#~ msgstr "Anzahl Pixel, die innerhalb des Umbruchs eingefÃ¼gt werden"
+
+#~ msgid "Left Margin"
+#~ msgstr "Linker Rand"
+
+#~ msgid "Number of pixels in the left margin"
+#~ msgstr "Anzahl Pixel am linken Rand"
+
+#~ msgid "Right Margin"
+#~ msgstr "Rechter Rand"
+
+#~ msgid "Number of pixels in the right margin"
+#~ msgstr "Anzahl Pixel am rechten Rand"
+
+#~ msgid "Indentation"
+#~ msgstr "EinrÃ¼ckung"
+
+#~| msgid "Number of units for determining a default reminder."
+#~ msgid "Number of pixels for indentation"
+#~ msgstr "Anzahl Pixel fÃ¼r die EinrÃ¼ckung"
+
+#~| msgid "_Reply to Sender"
+#~ msgid "Text to render"
+#~ msgstr "Darzustellender Text"
+
+#~| msgid "_Backup"
+#~ msgid "Markup"
+#~ msgstr "Markup"
+
+#~| msgid "Send _updates to attendees"
+#~ msgid "Marked up text to render"
+#~ msgstr "Der darzustellende Markup-Text"
+
+#~ msgid "Font"
+#~ msgstr "Schrift"
+
+#~| msgid "Font Description"
+#~ msgid "Font description as a string"
+#~ msgstr "Schriftbeschreibung als Zeichenkette"
+
+#~| msgid "Font Description"
+#~ msgid "Font description"
+#~ msgstr "Schriftbeschreibung"
+
+#~ msgid "Font description as a PangoFontDescription struct"
+#~ msgstr "Schriftbeschreibung als PangoFontDescription-Struktur"
+
+#~ msgid "Font family"
+#~ msgstr "Schriftfamilie"
+
+#~ msgid "Name of the font family, e.g. Sans, Helvetica, Times, Monospace"
+#~ msgstr "Der Name der Schriftfamilie, z.B. Sans, Helvetica, Times, Monospace"
+
+#~| msgid "Layout style"
+#~ msgid "Font style"
+#~ msgstr "Schriftstil"
+
+#~| msgid "contains"
+#~ msgid "Font variant"
+#~ msgstr "Schriftvariante"
+
+#~| msgid "Text height"
+#~ msgid "Font weight"
+#~ msgstr "SchriftstÃ¤rke"
+
+#~ msgid "Font stretch"
+#~ msgstr "Laufweite"
+
+#~ msgid "Font size"
+#~ msgstr "SchriftgrÃ¶Ã?e"
+
+#~ msgid ""
+#~ "Font size (as a multiple of PANGO_SCALE, eg. 12*PANGO_SCALE for a 12pt "
+#~ "font size)"
+#~ msgstr ""
+#~ "SchriftgrÃ¶Ã?e (ein Mehrfaches von PANGO_SCALE, z.B. 12*PANGO_SCALE fÃ¼r eine "
+#~ "GrÃ¶Ã?e von 12pt)"
+
+#~| msgid "contains"
+#~ msgid "Font points"
+#~ msgstr "Schriftpunkt"
+
+#~ msgid "Font size in points (eg. 12 for a 12pt font size)"
+#~ msgstr "SchriftgrÃ¶Ã?e in Punkten (z.B. 12 fÃ¼r eine GrÃ¶Ã?e von 12pt)"
+
+#~| msgid "is"
+#~ msgid "Rise"
+#~ msgstr "Hochstellen"
+
+#~ msgid ""
+#~ "Offset of text above the baseline (below the baseline if rise is negative)"
+#~ msgstr ""
+#~ "Hochstellen des Texts Ã¼ber der Grundlinie (Tiefstellen, wenn der Wert "
+#~ "negativ ist)"
+
+#~| msgid "Strikeout"
+#~ msgid "Strikethrough"
+#~ msgstr "Durchgestrichen"
+
+#~ msgid "Whether to strike through the text"
+#~ msgstr "Soll der Text durchgestrichen werden?"
+
+#~| msgid "Undefined"
+#~ msgid "Underline"
+#~ msgstr "Unterstrichen"
+
+#~ msgid "Style of underline for this text"
+#~ msgstr "Unterstreichungsstil fÃ¼r diesen Text"
+
+#~| msgid "Save"
+#~ msgid "Scale"
+#~ msgstr "Skalieren"
+
+#~ msgid "Size of font, relative to default size"
+#~ msgstr "GrÃ¶Ã?e der Schrift, relativ zur VorgabegrÃ¶Ã?e"
+
+#~ msgid "Text color, as string"
+#~ msgstr "Textfarbe als Zeichenkette"
+
+#~ msgid "Text color, as a GdkColor"
+#~ msgstr "Textfarbe als GdkColor"
+
+#~ msgid "Text color, as an R/G/B/A combined integer"
+#~ msgstr "Textfarbe als kombinierte Ganzzahl der Form R/G/B/A"
+
+#~ msgid "Text width"
+#~ msgstr "Textbreite"
+
+#~| msgid "Width of the message-list pane"
+#~ msgid "Width of the rendered text"
+#~ msgstr "Breite des dargestellten Texts"
+
+#~ msgid "Text height"
+#~ msgstr "TexthÃ¶he"
+
+#~| msgid "Height of the message-list pane"
+#~ msgid "Height of the rendered text"
+#~ msgstr "HÃ¶he des dargestellten Texts"
+
+#~| msgid "Family Name"
+#~ msgid "Font family set"
+#~ msgstr "Schriftfamilie einstellen"
+
+#~ msgid "Whether this tag affects the font family"
+#~ msgstr "Soll diese Markierung die Schriftfamilie beeinflussen?"
+
+#~| msgid "Layout style"
+#~ msgid "Font style set"
+#~ msgstr "Schriftstil einstellen"
+
+#~ msgid "Whether this tag affects the font style"
+#~ msgstr "Soll diese Markierung den Schriftstil beeinflussen?"
+
+#~ msgid "Font variant set"
+#~ msgstr "Schriftvariante einstellen"
+
+#~ msgid "Whether this tag affects the font variant"
+#~ msgstr "Soll diese Markierung die Schriftvariante beeinflussen?"
+
+#~ msgid "Font weight set"
+#~ msgstr "SchriftstÃ¤rke einstellen"
+
+#~ msgid "Whether this tag affects the font weight"
+#~ msgstr "Soll diese Markierung die SchriftstÃ¤rke beeinflussen?"
+
+#~ msgid "Font stretch set"
+#~ msgstr "Laufweite einstellen"
+
+#~ msgid "Whether this tag affects the font stretch"
+#~ msgstr "Soll sich diese Markierung auf die Laufweite auswirken?"
+
+#~ msgid "Font size set"
+#~ msgstr "SchriftgrÃ¶Ã?e einstellen"
+
+#~ msgid "Whether this tag affects the font size"
+#~ msgstr "Soll sich diese Markierung auf die SchriftgrÃ¶Ã?e auswirken?"
+
+#~| msgid "is set"
+#~ msgid "Rise set"
+#~ msgstr "Hochstellung einstellen"
+
+#~| msgid "Whether the shell is online"
+#~ msgid "Whether this tag affects the rise"
+#~ msgstr "Soll diese Markierung die Hochstellung bewirken?"
+
+#~| msgid "Strikeout"
+#~ msgid "Strikethrough set"
+#~ msgstr "Durchstreichung einstellen"
+
+#~ msgid "Whether this tag affects strikethrough"
+#~ msgstr "Soll sich diese Makierung auf die Durchstreichung auswirken?"
+
+#~| msgid "Underline Column"
+#~ msgid "Underline set"
+#~ msgstr "Unterstreichung einstellen"
+
+#~ msgid "Whether this tag affects underlining"
+#~ msgstr "Soll sich diese Markierung auf die Unterstreichungsart auswirken?"
+
+#~| msgid "Date sent"
+#~ msgid "Scale set"
+#~ msgstr "Skalierung einstellen"
+
+#~ msgid "Whether this tag affects font scaling"
+#~ msgstr "Soll sich diese Markierung auf die Schriftskalierung auswirken?"
+
+#~| msgid "Untitled"
+#~ msgid "Antialiased"
+#~ msgstr "KantengeglÃ¤ttet"
+
+#~| msgid "There is one other contact."
+#~ msgid "The antialiasing mode of the canvas."
+#~ msgstr "Der KantenglÃ¤ttung-Modus des Darstellungsbereichs."
+
+#~ msgid "Default Sync Address:"
+#~ msgstr "Voreingestellte Adresse fÃ¼r Datenabgleich:"
+
+#~ msgid "Could not load address book"
+#~ msgstr "Adressbuch konnte nicht geladen werden"
+
+#~ msgid "Could not read pilot's Address application block"
+#~ msgstr "Adress-Anwendungsblock des Pilot konnte nicht gelesen werden"
+
+#~ msgid "Split Multi-Day Events:"
+#~ msgstr "MehrtÃ¤gige Ereignisse aufteilen:"
+
+#~ msgid "Could not start evolution-data-server"
+#~ msgstr "evolution-data-server konnte nicht gestartet werden"
+
+#~ msgid "Could not read pilot's Calendar application block"
+#~ msgstr "Kalender-Anwendungsblock des Pilot konnte nicht gelesen werden"
+
+#~ msgid "Could not read pilot's Memo application block"
+#~ msgstr "Notiz-Anwendungsblock des Pilot konnte nicht gelesen werden"
+
+#~ msgid "Could not write pilot's Memo application block"
+#~ msgstr "Notiz-Anwendungsblock des Pilot konnte nicht geschrieben werden"
+
+#~ msgid "Default Priority:"
+#~ msgstr "Voreingestellte PrioritÃ¤t:"
+
+#~ msgid "Could not read pilot's ToDo application block"
+#~ msgstr "ToDo-Anwendungsblock des Pilot konnte nicht gelesen werden"
+
+#~ msgid "Could not write pilot's ToDo application block"
+#~ msgstr "ToDo-Anwendungsblock des Pilot konnte nicht geschrieben werden"
+
+#~ msgid "GNOME Pilot is not installed."
+#~ msgstr "GNOME Pilot ist nicht installiert."
+
+#~ msgid "GNOME Pilot could not be run."
+#~ msgstr "GNOME Pilot konnte nicht gestartet werden."
+
+#~ msgid "GNOME Pilot _Synchronization..."
+#~ msgstr "GNOME Pilot-_Datenabgleich â?¦"
+
+#~ msgid "Set up GNOME Pilot configuration"
+#~ msgstr "Die Pilot-Einstellungen festlegen"
+
+#~ msgid "Sync with:"
+#~ msgstr "Abgleichen mit:"
+
+#~ msgid "Sync Private Records:"
+#~ msgstr "Private EintrÃ¤ge abgleichen:"
+
+#~ msgid "Sync Categories:"
+#~ msgstr "Kategorien abgleichen:"
+
+#~ msgid "Do not d_elete"
+#~ msgstr "Nicht l_Ã¶schen"
+
+#~ msgid "Guides you through your initial account setup."
+#~ msgstr "Hilft Ihnen beim erstmaligen Erstellen von Konten."
+
+#~ msgid "Setup Assistant"
+#~ msgstr "Setup-Assistent"
+
+#~ msgid "Importing data."
+#~ msgstr "Daten werden importiert."
+
+#~ msgid "Please wait"
+#~ msgstr "Bitte warten"
+
+#~ msgid "Show week numbers in date navigator"
+#~ msgstr "Wochennummern im Datumsnavigator anzeigen"
+
+#~ msgid "Whether to show week number in the Day and Work Week View."
+#~ msgstr ""
+#~ "Legt fest, ob die Wochennummern in der Tagesansicht und "
+#~ "Arbeitswochenansicht angezeigt werden."
+
+#~ msgid "Show week n_umber in Day and Work Week View"
+#~ msgstr "Wochenn_ummern in Tages- und Arbeitswochenansicht anzeigen"
+
+#~ msgid "Appoint_ment"
+#~ msgstr "_Termin"
+
+#~ msgid "_Task"
+#~ msgstr "_Aufgabe"
+
+#~ msgid "_From Field"
+#~ msgstr "_Von-Feld"
+
+#~ msgid "Toggles whether the From chooser is displayed"
+#~ msgstr "Von-WÃ¤hler anzeigen/verbergen"
+
+#~ msgid "Show"
+#~ msgstr "Anzeigen"
+
+#~ msgid "Hide"
+#~ msgstr "Verbergen"
+
+#~| msgid "Receiving Email"
+#~ msgid "Receiving details:"
+#~ msgstr "Empfangen von E-Mails:"
+
+#~| msgid "Sending Mail"
+#~ msgid "Sending details:"
+#~ msgstr "Verschicken von E-Mails:"
+
+#~ msgid "address card"
+#~ msgstr "Adresskarte"
+
+#~ msgid "calendar information"
+#~ msgstr "Kalenderinformationen"
+
+#~ msgid "Show \"From\" field when sending a mail message"
+#~ msgstr "Das Feld Â»VonÂ« beim Verfassen einer Nachricht anzeigen"
+
+#~ msgid ""
+#~ "Show the \"From\" field when sending a mail message. This is controlled "
+#~ "from the View menu when a mail account is chosen."
+#~ msgstr ""
+#~ "Das Feld Â»VonÂ« beim Verfassen einer Nachricht anzeigen. Die Einstellung "
+#~ "kann im MenÃ¼ Â»AnsichtÂ« beim Verfassen angepasst werden."
+
+#~ msgid "Check whether Evolution is the default mail client on startup."
+#~ msgstr ""
+#~ "Beim Start Ã¼berprÃ¼fen, ob Evolution die bevorzugte Anwendung zur E-Mail-"
+#~ "Verwaltung ist."
+
+#~ msgid "Default Mail Client"
+#~ msgstr "Bevorzugte E-Mail-Verwaltung"
+
 #~ msgid "{0}"
 #~ msgstr "{0}"
 
@@ -21882,9 +22596,6 @@ msgstr "Eingabemethoden"
 #~ msgid "_Web Log:"
 #~ msgstr "_Weblog:"
 
-#~ msgid "Editable"
-#~ msgstr "Editierbar"
-
 #~ msgid "Source Book"
 #~ msgstr "Quellbuch"
 
@@ -21927,12 +22638,6 @@ msgstr "Eingabemethoden"
 #~ msgid "Source"
 #~ msgstr "Quelle"
 
-#~ msgid "Width"
-#~ msgstr "Breite"
-
-#~ msgid "Height"
-#~ msgstr "HÃ¶he"
-
 #~ msgid "Has Focus"
 #~ msgstr "Hat Fokus"
 
@@ -21942,9 +22647,6 @@ msgstr "Eingabemethoden"
 #~ msgid "Field Name"
 #~ msgstr "Feldname"
 
-#~ msgid "Text Model"
-#~ msgstr "Textmodell"
-
 #~ msgid "Max field name length"
 #~ msgstr "Maximale LÃ¤nge des Feldnamens"
 
@@ -22396,9 +23098,6 @@ msgstr "Eingabemethoden"
 #~ msgid "The switcher's toolbar style"
 #~ msgstr "Der Werkzeugleistenstil des Umschalters"
 
-#~ msgid "Toolbar Visible"
-#~ msgstr "Werkzeugleiste anzeigen"
-
 #~ msgid "Whether the switcher is visible"
 #~ msgstr "Legt fest, ob der Umschalter sichtbar ist"
 
@@ -22476,9 +23175,6 @@ msgstr "Eingabemethoden"
 #~ msgid "Initial window geometry string"
 #~ msgstr "Zeichenkette fÃ¼r die anfÃ¤ngliche Fenstergeometrie"
 
-#~ msgid "Safe Mode"
-#~ msgstr "Sicherer Modus"
-
 #~ msgid "Whether the shell window is in safe mode"
 #~ msgstr "Legt fest, ob sich das Shellfenster im sicheren Modus befindet"
 
@@ -22524,9 +23220,6 @@ msgstr "Eingabemethoden"
 #~ msgid "Online"
 #~ msgstr "Online"
 
-#~ msgid "Whether the shell is online"
-#~ msgstr "Legt fest, ob die Shell online ist"
-
 #~ msgid "Forcibly re-migrate from Evolution 1.4"
 #~ msgstr "Remigrierung von Evolution 1.4 erzwingen"
 
@@ -22629,15 +23322,9 @@ msgstr "Eingabemethoden"
 #~ msgid "Fill stipple"
 #~ msgstr "GetÃ¼pfelt fÃ¼llen"
 
-#~ msgid "X1"
-#~ msgstr "X1"
-
 #~ msgid "X2"
 #~ msgstr "X2"
 
-#~ msgid "Y1"
-#~ msgstr "Y1"
-
 #~ msgid "Y2"
 #~ msgstr "Y2"
 
@@ -22680,9 +23367,6 @@ msgstr "Eingabemethoden"
 #~ msgid "Cursor Row"
 #~ msgstr "Cursor-Zeile"
 
-#~ msgid "Cursor Column"
-#~ msgstr "Cursor-Spalte"
-
 #~ msgid "Sorter"
 #~ msgstr "Sortierer"
 
@@ -22704,9 +23388,6 @@ msgstr "Eingabemethoden"
 #~ msgid "Strikeout Column"
 #~ msgstr "Durchgestrichene Spalte"
 
-#~ msgid "Underline Column"
-#~ msgstr "Unterstrichene Spalte"
-
 #~ msgid "Bold Column"
 #~ msgstr "Fette Spalte"
 
@@ -22802,27 +23483,12 @@ msgstr "Eingabemethoden"
 #~ msgid "expand"
 #~ msgstr "Ausklappen"
 
-#~ msgid "collapse"
-#~ msgstr "Einrollen"
-
 #~ msgid "Event Processor"
 #~ msgstr "Ereignisprozessor"
 
-#~ msgid "Text"
-#~ msgstr "Text"
-
 #~ msgid "Bold"
 #~ msgstr "Fett"
 
-#~ msgid "Strikeout"
-#~ msgstr "Durchgestrichen"
-
-#~ msgid "Anchor"
-#~ msgstr "Verankerung"
-
-#~ msgid "Justification"
-#~ msgstr "Ausrichtung"
-
 #~ msgid "Clip Width"
 #~ msgstr "Clip-Breite"
 
@@ -22841,12 +23507,6 @@ msgstr "Eingabemethoden"
 #~ msgid "Y Offset"
 #~ msgstr "Y-Versatz"
 
-#~ msgid "Text width"
-#~ msgstr "Textbreite"
-
-#~ msgid "Text height"
-#~ msgstr "TexthÃ¶he"
-
 #~ msgid "Use ellipsis"
 #~ msgstr "Ellipse verwenden"
 
@@ -23771,14 +24431,6 @@ msgstr "Eingabemethoden"
 #~ "Bei aktivierter Nachrichtenvorschau diese neben der Nachrichtenliste "
 #~ "anstatt darunter anzeigen."
 
-# FIXME
-#~ msgid ""
-#~ "It disables/enables the repeated prompts to ask if offline sync is "
-#~ "required before going into offline mode."
-#~ msgstr ""
-#~ "Legt fest, ob jedes Mal vorm Setzen des Offline-Statuses gefragt werden "
-#~ "soll, ob fÃ¼r den Offline-Modus abgeglichen werden soll."
-
 #~ msgid "Message Window default height"
 #~ msgstr "VorgabehÃ¶he des Nachrichtenfensters"
 
@@ -23829,9 +24481,6 @@ msgstr "Eingabemethoden"
 #~ msgid "<span weight=\"bold\">Default Behavior</span>"
 #~ msgstr "<b>Vorgabeverhalten</b>"
 
-#~ msgid "<span weight=\"bold\">Delete Mail</span>"
-#~ msgstr "<b>LÃ¶schen von E-Mails</b>"
-
 #~ msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
 #~ msgstr "<b>_Angezeigte E-Mail-Kopfzeilen</b>"
 
@@ -23859,18 +24508,12 @@ msgstr "Eingabemethoden"
 #~ msgid "<span weight=\"bold\">Printed Fonts</span>"
 #~ msgstr "<b>Druckschriften</b>"
 
-#~ msgid "<span weight=\"bold\">Proxy Settings</span>"
-#~ msgstr "<b>Proxy-Einstellungen</b>"
-
 #~ msgid "<span weight=\"bold\">Required Information</span>"
 #~ msgstr "<b>Erforderliche Informationen</b>"
 
 #~ msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 #~ msgstr "<b>Sicheres MIME (S/MIME)</b>"
 
-#~ msgid "<span weight=\"bold\">Security</span>"
-#~ msgstr "<b>Sicherheit</b>"
-
 #~ msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 #~ msgstr "<b>Verschickte Nachrichten und NachrichtenentwÃ¼rfe</b>"
 
@@ -24839,9 +25482,6 @@ msgstr "Eingabemethoden"
 #~ msgstr ""
 #~ "Klicken Sie auf OK, um diese Verbindungen zu schlieÃ?en und offline zu gehen"
 
-#~ msgid "_Import"
-#~ msgstr "_Importieren"
-
 #~ msgid "The GNOME Pilot tools do not appear to be installed on this system."
 #~ msgstr ""
 #~ "Die GNOME-Pilot-Werkzeuge scheinen auf diesem System nicht installiert zu "
@@ -25788,9 +26428,6 @@ msgstr "Eingabemethoden"
 #~ msgid "Full Header"
 #~ msgstr "Alle Kopfzeilen"
 
-#~ msgid "Font Description"
-#~ msgstr "Schriftbeschreibung"
-
 #~ msgid "Toggle Attachment Bar"
 #~ msgstr "Anlagenleiste ein-/ausblenden"
 
@@ -26499,10 +27136,6 @@ msgstr "Eingabemethoden"
 #~ msgstr "_Sortieren â?¦"
 
 #, fuzzy
-#~ msgid "Fonts"
-#~ msgstr "Kontakte"
-
-#, fuzzy
 #~ msgid "Footer:"
 #~ msgstr "Ordner"
 
@@ -26519,10 +27152,6 @@ msgstr "Eingabemethoden"
 #~ msgstr "HÃ¶he"
 
 #, fuzzy
-#~ msgid "Margins"
-#~ msgstr "Max. Zeilen"
-
-#, fuzzy
 #~ msgid "Number of columns:"
 #~ msgstr "Tabellenspalte:"
 
@@ -26531,10 +27160,6 @@ msgstr "Eingabemethoden"
 #~ msgstr "Legitimation"
 
 #, fuzzy
-#~ msgid "Page"
-#~ msgstr "Pager"
-
-#, fuzzy
 #~ msgid "Page Setup:"
 #~ msgstr "Seite einric_hten â?¦"
 
@@ -26765,10 +27390,6 @@ msgstr "Eingabemethoden"
 #~ msgstr "Tage"
 
 #, fuzzy
-#~ msgid "International"
-#~ msgstr "Traditionell"
-
-#, fuzzy
 #~ msgid "Key Customer"
 #~ msgstr "Anpassen"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]