[evolution] [l10n] Updated German translation



commit e8451fbbcb7bbe33694a13f93a0a7e946dad048d
Author: Mario BlÃttermann <mariobl gnome org>
Date:   Thu Aug 4 12:38:33 2011 +0200

    [l10n] Updated German translation

 po/de.po |10153 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 5117 insertions(+), 5036 deletions(-)
---
diff --git a/po/de.po b/po/de.po
index 183553e..57887d7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -17,24 +17,22 @@
 # Frank Arnold <frank scirocco-5v-turbo de>, 2005.
 # Christian Kintner <mail christian-kintner de>, 2006, 2007.
 # Andre Klapper <ak-47 gmx net>, 2007-2009.
-# Mario BlÃttermann <mariobl gnome org>, 2010, 2011.
+# Mario BlÃttermann <mariobl freenet de>, 2010, 2011.
 # Paul Seyfert <pseyfert mathphys fsk uni-heidelberg de>, 2010, 2011.
 # Christian Kirbach <Christian Kirbach googlemail com>, 2009, 2010, 2011.
 #
-#: ../shell/main.c:615
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=evolution&keywords=I18N+L10N\n"
-"POT-Creation-Date: 2011-08-03 12:15+0000\n"
-"PO-Revision-Date: 2011-07-21 19:48+0200\n"
-"Last-Translator: Christian Kirbach <Christian Kirbach googlemail com>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-08-04 12:01+0200\n"
+"PO-Revision-Date: 2011-08-04 12:35+0100\n"
+"Last-Translator: Mario BlÃttermann <mariobl freenet de>\n"
 "Language-Team: Deutsch <gnome-de gnome org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bits\n"
-"Language: \n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: Lokalize 0.3\n"
 "X-Poedit-Language: German\n"
@@ -58,22 +56,34 @@ msgstr ""
 "Karte mit der gleichen Adresse hinzugefÃgt werden?"
 
 #: ../addressbook/addressbook.error.xml.h:4
+msgid ""
+"A contact list named '{0}' is already in this contact list. Would you like to "
+"add it anyway?"
+msgstr ""
+"Eine Kontaktliste namens Â{0}Â existiert bereits in diesem Ordner. Soll sie "
+"dennoch hinzugefÃgt werden?"
+
+#: ../addressbook/addressbook.error.xml.h:5
+msgid "Add with duplicates"
+msgstr "Mit Duplikaten hinzufÃgen"
+
+#: ../addressbook/addressbook.error.xml.h:6
 msgid "Address '{0}' already exists."
 msgstr "Adresse Â{0}Â existiert bereits."
 
-#: ../addressbook/addressbook.error.xml.h:5
+#: ../addressbook/addressbook.error.xml.h:7
 msgid "Cannot add new contact"
 msgstr "Neuer Kontakt kann nicht hinzugefÃgt werden"
 
-#: ../addressbook/addressbook.error.xml.h:6
+#: ../addressbook/addressbook.error.xml.h:8
 msgid "Cannot move contact."
 msgstr "Kontakt konnte nicht verschoben werden."
 
-#: ../addressbook/addressbook.error.xml.h:7
+#: ../addressbook/addressbook.error.xml.h:9
 msgid "Category editor not available."
 msgstr "Der Kategorieeditor ist nicht verfÃgbar."
 
-#: ../addressbook/addressbook.error.xml.h:8
+#: ../addressbook/addressbook.error.xml.h:10
 msgid ""
 "Check to make sure your password is spelled correctly and that you are using "
 "a supported login method. Remember that many passwords are case sensitive; "
@@ -84,15 +94,15 @@ msgstr ""
 "wird zwischen GroÃ-/Kleinschreibung unterschieden; MÃglicherweise ist Ihre "
 "Dauerumschalttaste aktiv."
 
-#: ../addressbook/addressbook.error.xml.h:9
+#: ../addressbook/addressbook.error.xml.h:11
 msgid "Could not get schema information for LDAP server."
 msgstr "Schemainformationen fÃr LDAP-Server konnten nicht abgerufen werden."
 
-#: ../addressbook/addressbook.error.xml.h:10
+#: ../addressbook/addressbook.error.xml.h:12
 msgid "Could not remove address book."
 msgstr "Adressbuch konnte nicht entfernt werden."
 
-#: ../addressbook/addressbook.error.xml.h:11
+#: ../addressbook/addressbook.error.xml.h:13
 msgid ""
 "Currently you can only access the GroupWise System Address Book from "
 "Evolution. Please use some other GroupWise mail client once to get your "
@@ -103,74 +113,85 @@ msgstr ""
 "Anwendung, um Ihre hÃufig verwendeten Kontakte und Ihre persÃnlichen "
 "GroupWise-Kontaktordner zu bekommen."
 
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../addressbook/addressbook.error.xml.h:14
 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:46
+#: ../addressbook/addressbook.error.xml.h:15
+#: ../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
+#: ../addressbook/addressbook.error.xml.h:16
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Fehler beim Speichern von {0} in {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "Failed to authenticate with LDAP server."
 msgstr "Legitimation am LDAP-Server gescheitert."
 
-#. Unknown error
-#: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1277
+#: ../addressbook/addressbook.error.xml.h:18
+#: ../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:17
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "GroupWise Address book creation:"
 msgstr "GroupWise-Adressbucherstellung:"
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "LDAP server did not respond with valid schema information."
 msgstr "Server antwortete nicht mit gÃltigen Schemainformationen."
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:21
+msgid "List '{0}' is already in this contact list."
+msgstr "Liste Â{0}Â existiert bereits in dieser Kontaktliste."
+
+#: ../addressbook/addressbook.error.xml.h:22
+msgid "Skip duplicates"
+msgstr "Duplikate Ãberspringen"
+
+#: ../addressbook/addressbook.error.xml.h:23
+msgid "Some addresses already exist in this contact list."
+msgstr "Einige Adressen existieren bereits in dieser Kontaktliste."
+
+#: ../addressbook/addressbook.error.xml.h:24
 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:20
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "Das Evolution-Adressbuch wurde unerwartet beendet."
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:26
 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?"
+"Das ausgewÃhlte Bild ist groÃ. MÃchten Sie die GrÃÃe des Bildes Ãndern und es "
+"speichern?"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:27
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
 "supported search bases."
 msgstr ""
 "MÃglicherweise verwendet dieser Server eine Ãltere LDAP-Version, die diese "
-"Funktionen nicht unterstÃtzt, oder er ist fehlerhaft konfiguriert. Fragen "
-"Sie Ihren Systemadministrator nach unterstÃtzten Suchbasen."
+"Funktionen nicht unterstÃtzt, oder er ist fehlerhaft konfiguriert. Fragen Sie "
+"Ihren Systemadministrator nach unterstÃtzten Suchbasen."
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This address book could not be opened."
 msgstr "Dieses Adressbuch konnte nicht geÃffnet werden."
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:29
 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:25
+#: ../addressbook/addressbook.error.xml.h:30
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -178,31 +199,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:26
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "This address book will be removed permanently."
 msgstr "Dieses Adressbuch wird unwiderruflich gelÃscht."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Dieser Server unterstÃtzt keine LDAPv3-Schemainformationen."
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:33
 msgid "Unable to open address book"
 msgstr "Adressbuch konnte nicht geÃffnet werden"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "Unable to perform search."
 msgstr "Suche konnte nicht durchgefÃhrt werden."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:35
 msgid "Unable to save {0}."
 msgstr "{0} konnte nicht gespeichert werden."
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:36
 msgid "Would you like to save your changes?"
 msgstr "Wollen Sie die vorgenommenen Ãnderungen speichern?"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:37
 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?"
@@ -211,24 +232,32 @@ msgstr ""
 "dieser nicht aus dem Quelladressbuch entfernt werden. Wollen Sie stattdessen "
 "eine Kopie speichern?"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:38
 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 supported version"
+"problems using Evolution. For best results the server should be upgraded to a "
+"supported version"
 msgstr ""
 "Sie verbinden sich mit einem nicht unterstÃtzten GroupWise-Server und werden "
 "bei der Benutzung von Evolution unter UmstÃnden Probleme feststellen. FÃr "
 "eine bestmÃgliche Zusammenarbeit sollte der Server auf eine unterstÃtzte "
 "Version aktualisiert werden."
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:39
+msgid ""
+"You are trying to add addresses that are part of this list already. Would you "
+"like to add them anyway?"
+msgstr ""
+"Sie versuchen Adressen hinzuzufÃgen, die bereits in dieser Liste enthalten "
+"sind. Sollen sie dennoch hinzugefÃgt werden?"
+
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "You do not have permission to delete contacts in this address book."
 msgstr ""
 "Sie haben keine ausreichenden Rechte um Kontakte in diesem Adressbuch zu "
 "lÃschen."
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:41
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
@@ -237,39 +266,37 @@ msgstr ""
 "speichern?"
 
 #. Translators: {0} is replaced with an address book name which will not be available
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:43
 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:38 ../mail/em-vfolder-rule.c:610
-#: ../plugins/groupwise-features/junk-settings.ui.h:4
-#: ../plugins/groupwise-features/properties.ui.h:9
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/em-vfolder-rule.c:604
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "_HinzufÃgen"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:45
 msgid "_Discard"
 msgstr "_Verwerfen"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:46
 msgid "_Do not save"
 msgstr "_Nicht speichern"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:47
 msgid "_Resize"
 msgstr "_GrÃÃe verÃndern"
 
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:48
 msgid "_Use as it is"
 msgstr "_Wie es ist benutzen"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:574
-#: ../calendar/gui/e-calendar-view.c:2080
+#: ../addressbook/gui/widgets/eab-contact-display.c:706
+#: ../calendar/gui/e-calendar-view.c:2078
 msgid "Anniversary"
 msgstr "Jahrestag"
 
@@ -279,9 +306,9 @@ msgstr "Jahrestag"
 #. * which, so long as it has an icon.  We're just interested in
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
-#: ../addressbook/gui/widgets/eab-contact-display.c:573
-#: ../calendar/gui/e-calendar-view.c:2079 ../capplet/anjal-settings-main.c:116
-#: ../shell/main.c:133
+#: ../addressbook/gui/widgets/eab-contact-display.c:705
+#: ../calendar/gui/e-calendar-view.c:2077 ../capplet/anjal-settings-main.c:79
+#: ../shell/main.c:140
 msgid "Birthday"
 msgstr "Geburtstag"
 
@@ -291,7 +318,7 @@ msgid "Blog:"
 msgstr "Blog:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:4
+#: ../calendar/gui/dialogs/event-page.ui.h:3
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "Ka_tegorien â"
@@ -301,24 +328,24 @@ msgid "Calendar:"
 msgstr "Kalender:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/importers/evolution-vcard-importer.c:950
+#: ../addressbook/importers/evolution-vcard-importer.c:979
 msgid "Contact"
 msgstr "Kontakt"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:623
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:643
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2661
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:646
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:666
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2865
 msgid "Contact Editor"
 msgstr "Kontakteditor"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:295
+#: ../addressbook/gui/merging/eab-contact-merging.c:358
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:494
-#: ../addressbook/gui/widgets/eab-contact-display.c:502
-#: ../addressbook/gui/widgets/eab-contact-display.c:844
-#: ../plugins/groupwise-features/junk-settings.c:409 ../smime/lib/e-cert.c:832
+#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../addressbook/gui/widgets/eab-contact-display.c:634
+#: ../addressbook/gui/widgets/eab-contact-display.c:1000
+#: ../smime/lib/e-cert.c:832
 msgid "Email"
 msgstr "E-Mail"
 
@@ -331,8 +358,10 @@ msgid "Full _Name..."
 msgstr "_Voller Name â"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:198
+#: ../addressbook/gui/widgets/eab-contact-display.c:78
+#: ../addressbook/gui/widgets/eab-contact-display.c:1302
+#: ../widgets/misc/e-contact-map.c:295
 msgid "Home"
 msgstr "Privat"
 
@@ -366,18 +395,15 @@ msgid "Nic_kname:"
 msgstr "_Spitzname:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
-#: ../modules/calendar/e-memo-shell-migrate.c:260
-#: ../plugins/groupwise-features/camel-gw-listener.c:429
-#: ../plugins/groupwise-features/camel-gw-listener.c:454
-#: ../plugins/groupwise-features/camel-gw-listener.c:570
+#: ../modules/calendar/e-memo-shell-migrate.c:265
 msgid "Notes"
 msgstr "Notizen"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:69
-#: ../addressbook/gui/widgets/eab-contact-display.c:359
-#: ../calendar/gui/e-calendar-view.c:1785
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:199
+#: ../addressbook/gui/widgets/eab-contact-display.c:79
+#: ../addressbook/gui/widgets/eab-contact-display.c:403
+#: ../calendar/gui/e-calendar-view.c:1783
 msgid "Other"
 msgstr "Weitere"
 
@@ -402,9 +428,11 @@ msgid "Web addresses"
 msgstr "Web-Adressen"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:67
-#: ../addressbook/gui/widgets/eab-contact-display.c:554
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
+#: ../addressbook/gui/widgets/eab-contact-display.c:77
+#: ../addressbook/gui/widgets/eab-contact-display.c:686
+#: ../addressbook/gui/widgets/eab-contact-display.c:1299
+#: ../widgets/misc/e-contact-map.c:303
 msgid "Work"
 msgstr "GeschÃftlich"
 
@@ -429,8 +457,8 @@ msgid "_Blog:"
 msgstr "_Blog:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-#: ../calendar/gui/dialogs/event-page.c:881
-#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/event-page.c:708
+#: ../calendar/gui/dialogs/event-page.ui.h:10
 #: ../plugins/itip-formatter/itip-view.c:1923
 msgid "_Calendar:"
 msgstr "_Kalender:"
@@ -509,74 +537,74 @@ msgstr "_In:"
 msgid "_Zip/Postal Code:"
 msgstr "Postleit_zahl:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:167
-#: ../addressbook/gui/widgets/eab-contact-display.c:516
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/widgets/eab-contact-display.c:651
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
-#: ../addressbook/gui/widgets/eab-contact-display.c:521
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/widgets/eab-contact-display.c:653
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
-#: ../addressbook/gui/widgets/eab-contact-display.c:522
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/widgets/eab-contact-display.c:654
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-display.c:520
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/widgets/eab-contact-display.c:652
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-display.c:518
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-display.c:517
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/widgets/eab-contact-display.c:649
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:523
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:208
-#: ../addressbook/gui/widgets/eab-gui-util.c:381
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:220
+#: ../addressbook/gui/widgets/eab-gui-util.c:447
 msgid "Error adding contact"
 msgstr "Fehler beim HinzufÃgen eines Kontakts"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:235
 msgid "Error modifying contact"
 msgstr "Fehler beim Ãndern eines Kontakts"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
 msgid "Error removing contact"
 msgstr "Fehler beim Entfernen eines Kontakts"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:638
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2655
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:661
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2859
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontakteditor - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3077
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3301
 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:3078
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3302
 msgid "_No image"
 msgstr "_Kein Bild"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3359
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3615
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -584,43 +612,43 @@ msgstr ""
 "Die Kontaktdaten sind ungÃltig:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3363
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3619
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "Â%s hat ein ungÃltiges Format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3370
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3626
 #, 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:3385
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3396
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3638
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3649
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%sÂ%s ist leer"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3411
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3664
 msgid "Invalid contact."
 msgstr "Kontakt ungÃltig."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:392
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
 msgid "Contact Quick-Add"
 msgstr "Kontakt schnell hinzufÃgen"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:395
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:414
 msgid "_Edit Full"
 msgstr "Voll _bearbeiten"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:443
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:462
 msgid "_Full name"
 msgstr "_Voller Name"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:454
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:473
 msgid "E_mail"
 msgstr "E-_Mail"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:465
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:484
 msgid "_Select Address Book"
 msgstr "Adressbuch aus_wÃhlen"
 
@@ -690,7 +718,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:662
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:729
 msgid "Contact List Editor"
 msgstr "Kontaktlisteneditor"
 
@@ -707,7 +735,7 @@ msgid "_List name:"
 msgstr "_Listenname:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:159
+#: ../mail/mail-config.ui.h:163
 msgid "_Select..."
 msgstr "A_uswÃhlen â"
 
@@ -717,27 +745,26 @@ 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:756
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:852
 msgid "Contact List Members"
 msgstr "Kontaktlistenmitglieder"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:910
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1326
-msgid "_Members"
-msgstr "_Mitglieder"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1163
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1422
 msgid "Error adding list"
 msgstr "Fehler beim HinzufÃgen einer Liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1177
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1437
 msgid "Error modifying list"
 msgstr "Fehler beim Ãndern einer Liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1191
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1452
 msgid "Error removing list"
 msgstr "Fehler beim Entfernen einer Liste"
 
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1583
+msgid "_Members"
+msgstr "_Mitglieder"
+
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "GeÃnderter Kontakt:"
@@ -754,11 +781,11 @@ msgstr "Mehrfach existierender Kontakt entdeckt"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:5
 msgid ""
-"The name or email of this contact already exists in this folder.  Would you "
-"like to add it anyway?"
+"The name or email of this contact already exists in this folder. Would you "
+"like to save the changes anyway?"
 msgstr ""
-"Der Name oder die E-Mail-Adresse dieses Kontakts existiert\n"
-"bereits in diesem Ordner. Soll er dennoch hinzugefÃgt werden?"
+"Der Name oder die E-Mail-Adresse dieses Kontakts existiert bereits in diesem "
+"Ordner. Wollen Sie die Ãnderungen dennoch speichern?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
 msgid "New Contact:"
@@ -777,60 +804,54 @@ 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:241
+#: ../addressbook/gui/merging/eab-contact-merging.c:304
 msgid "_Merge"
 msgstr "_ZusammenfÃhren"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:166
-#: ../calendar/gui/tasktypes.xml.h:7
-#, c-format
-msgid "Cancelled"
-msgstr "Abgebrochen"
-
-#: ../addressbook/gui/merging/eab-contact-merging.c:224
+#: ../addressbook/gui/merging/eab-contact-merging.c:287
 msgid "Merge Contact"
 msgstr "Kontakte zusammenfÃhren"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../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:920
-#: ../modules/calendar/e-cal-shell-view-actions.c:1693
-#: ../modules/calendar/e-memo-shell-view-actions.c:774
-#: ../modules/calendar/e-task-shell-view-actions.c:973
+#: ../modules/addressbook/e-book-shell-view-actions.c:1059
+#: ../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 "Any field contains"
 msgstr "Ein beliebiges Feld enthÃlt"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/addressbook/e-book-shell-view-actions.c:1066
 msgid "Email begins with"
 msgstr "E-Mail-Adresse beginnt mit"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:1073
 msgid "Name contains"
 msgstr "Name enthÃlt"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:145
+#: ../addressbook/gui/widgets/e-addressbook-model.c:155
 msgid "No contacts"
 msgstr "Keine Kontakte"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:149
+#: ../addressbook/gui/widgets/e-addressbook-model.c:159
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d Kontakte"
 msgstr[1] "%d Kontakte"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:341
+#: ../addressbook/gui/widgets/e-addressbook-model.c:340
 msgid "Error getting book view"
 msgstr "Fehler beim Abrufen der Buchansicht"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:755
+#: ../addressbook/gui/widgets/e-addressbook-model.c:751
 msgid "Search Interrupted"
 msgstr "Suche wurde unterbrochen"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:156
 msgid "Error modifying card"
 msgstr "Fehler beim Ãndern einer Karte"
 
@@ -847,7 +868,7 @@ msgid "Paste contacts from the clipboard"
 msgstr "Kontakte aus der Zwischenablage einfÃgen"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:642
-#: ../modules/addressbook/e-book-shell-view-actions.c:745
+#: ../modules/addressbook/e-book-shell-view-actions.c:877
 msgid "Delete selected contacts"
 msgstr "Die gewÃhlten Kontakte lÃschen"
 
@@ -855,34 +876,34 @@ msgstr "Die gewÃhlten Kontakte lÃschen"
 msgid "Select all visible contacts"
 msgstr "Alle sichtbaren Kontakte auswÃhlen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1295
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1317
 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:1299
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1321
 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:1303
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1325
 #, 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:1309
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1331
 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:1313
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1335
 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:1317
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1339
 #, 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)?"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1474
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1488
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -899,16 +920,16 @@ msgstr[1] ""
 "geÃffnet werden.\n"
 "Wollen Sie wirklich alle Kontakte anzeigen?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1482
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1496
 msgid "_Don't Display"
 msgstr "_Nicht anzeigen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1483
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1497
 msgid "Display _All Contacts"
 msgstr "_Alle Kontakte anzeigen"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:545
+#: ../addressbook/gui/widgets/eab-contact-display.c:677
 msgid "Assistant"
 msgstr "Assistent"
 
@@ -937,7 +958,7 @@ msgid "Car Phone"
 msgstr "Autotelefon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 #: ../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
@@ -945,7 +966,7 @@ msgid "Categories"
 msgstr "Kategorien"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
+#: ../addressbook/gui/widgets/eab-contact-display.c:672
 msgid "Company"
 msgstr "Firma"
 
@@ -994,22 +1015,22 @@ msgid "Journal"
 msgstr "Journal"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:544
+#: ../addressbook/gui/widgets/eab-contact-display.c:676
 msgid "Manager"
 msgstr "Vorgesetzter"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:571
+#: ../addressbook/gui/widgets/eab-contact-display.c:703
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:509
+#: ../addressbook/gui/widgets/eab-contact-display.c:641
 msgid "Nickname"
 msgstr "Spitzname"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../addressbook/gui/widgets/eab-contact-display.c:729
 msgid "Note"
 msgstr "Notiz"
 
@@ -1038,13 +1059,13 @@ msgid "Radio"
 msgstr "Funk"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:571
+#: ../calendar/gui/e-meeting-list-view.c:585
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Position"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:575
+#: ../addressbook/gui/widgets/eab-contact-display.c:707
 msgid "Spouse"
 msgstr "Ehepartner"
 
@@ -1075,7 +1096,7 @@ msgstr "Einheit"
 msgid "Web Site"
 msgstr "Website"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:192
 msgid ""
 "\n"
 "\n"
@@ -1085,7 +1106,7 @@ msgstr ""
 "\n"
 "Suche nach Kontakten â"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:186
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
 msgid ""
 "\n"
 "\n"
@@ -1099,7 +1120,7 @@ msgstr ""
 "\n"
 "Klicken Sie hier zwei mal, um einen neuen Kontakt anzulegen."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:189
+#: ../addressbook/gui/widgets/e-minicard-view.c:198
 msgid ""
 "\n"
 "\n"
@@ -1113,7 +1134,7 @@ msgstr ""
 "\n"
 "Klicken Sie hier zwei mal, um einen neuen Kontakt anzulegen."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:202
 msgid ""
 "\n"
 "\n"
@@ -1123,7 +1144,7 @@ msgstr ""
 "\n"
 "Suche nach dem Kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:195
+#: ../addressbook/gui/widgets/e-minicard-view.c:204
 msgid ""
 "\n"
 "\n"
@@ -1133,110 +1154,112 @@ msgstr ""
 "\n"
 "In dieser Ansicht existieren keine anzuzeigenden EintrÃge."
 
-#: ../addressbook/gui/widgets/e-minicard.c:98
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Work Email"
 msgstr "E-Mail, geschÃftlich"
 
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:101
 msgid "Home Email"
 msgstr "E-Mail, privat"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
-#: ../addressbook/gui/widgets/e-minicard.c:805
+#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../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:184
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:97
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:106
+#: ../addressbook/gui/widgets/ea-minicard-view.c:187
 msgid "evolution address book"
 msgstr "Evolution-Adressbuch"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:33
+#: ../addressbook/gui/widgets/ea-minicard-view.c:36
 msgid "New Contact"
 msgstr "Neuer Kontakt"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:34
+#: ../addressbook/gui/widgets/ea-minicard-view.c:37
 msgid "New Contact List"
 msgstr "Neue Kontaktliste"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:167
+#: ../addressbook/gui/widgets/ea-minicard-view.c:170
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
 msgstr[0] "Angezeigter Adressbuchordner %s enthÃlt %d Karte"
 msgstr[1] "Angezeigter Adressbuchordner %s enthÃlt %d Karten"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:31
+#: ../addressbook/gui/widgets/ea-minicard.c:34
 msgid "Open"
 msgstr "Ãffnen"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:153
+#: ../addressbook/gui/widgets/ea-minicard.c:156
 msgid "Contact List: "
 msgstr "Kontaktliste: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:154
+#: ../addressbook/gui/widgets/ea-minicard.c:157
 msgid "Contact: "
 msgstr "Kontakt: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:180
+#: ../addressbook/gui/widgets/ea-minicard.c:183
 msgid "evolution minicard"
 msgstr "Evolution-Minicard"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:182
 msgid "Copy _Email Address"
 msgstr "_E-Mail-Adresse kopieren"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174
-#: ../widgets/misc/e-web-view.c:397
+#: ../addressbook/gui/widgets/eab-contact-display.c:184
+#: ../widgets/misc/e-web-view.c:430
 msgid "Copy the email address to the clipboard"
 msgstr "E-Mail-Adresse in die Zwischenablage kopieren"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:179
-#: ../widgets/misc/e-web-view.c:402
+#: ../addressbook/gui/widgets/eab-contact-display.c:189
+#: ../widgets/misc/e-web-view.c:435
 msgid "_Send New Message To..."
 msgstr "Neue Nachricht _schicken an â"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:404
+#: ../addressbook/gui/widgets/eab-contact-display.c:191
+#: ../widgets/misc/e-web-view.c:437
 msgid "Send a mail message to this address"
 msgstr "Eine Nachricht an diese Adresse senden"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:424
-#: ../addressbook/gui/widgets/eab-contact-display.c:811
-msgid "List Members"
-msgstr "Listenmitglieder"
+#: ../addressbook/gui/widgets/eab-contact-display.c:213
+msgid "Open map"
+msgstr "Karte Ãffnen"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:521
+#: ../addressbook/gui/widgets/eab-contact-display.c:549
+msgid "List Members:"
+msgstr "Listenmitglieder:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:541
+#: ../addressbook/gui/widgets/eab-contact-display.c:673
 msgid "Department"
 msgstr "Abteilung"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:542
+#: ../addressbook/gui/widgets/eab-contact-display.c:674
 msgid "Profession"
 msgstr "Beruf"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:543
+#: ../addressbook/gui/widgets/eab-contact-display.c:675
 msgid "Position"
 msgstr "Position"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:546
+#: ../addressbook/gui/widgets/eab-contact-display.c:678
 msgid "Video Chat"
 msgstr "Video-Chat"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:547
-#: ../calendar/gui/dialogs/calendar-setup.c:376
-#: ../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:497
-#: ../plugins/groupwise-features/camel-gw-listener.c:427
-#: ../plugins/groupwise-features/camel-gw-listener.c:452
-#: ../plugins/groupwise-features/camel-gw-listener.c:568
+#: ../addressbook/gui/widgets/eab-contact-display.c:679
+#: ../calendar/gui/dialogs/calendar-setup.c:396
+#: ../modules/calendar/e-cal-shell-view-actions.c:222
+#: ../modules/calendar/e-cal-shell-view-actions.c:251
+#: ../modules/calendar/e-cal-shell-view.c:507
+#: ../modules/online-accounts/e-online-accounts-google.c:292
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
 #: ../widgets/misc/e-send-options.c:519
 msgid "Calendar"
 msgstr "Kalender"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:548
+#: ../addressbook/gui/widgets/eab-contact-display.c:680
 #: ../calendar/gui/dialogs/event-editor.c:123
 #: ../calendar/gui/dialogs/event-editor.c:350
 #: ../modules/calendar/e-calendar-preferences.ui.h:17
@@ -1244,25 +1267,25 @@ msgstr "Kalender"
 msgid "Free/Busy"
 msgstr "VerfÃgbarkeit"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:549
-#: ../addressbook/gui/widgets/eab-contact-display.c:570
+#: ../addressbook/gui/widgets/eab-contact-display.c:681
+#: ../addressbook/gui/widgets/eab-contact-display.c:702
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:550
+#: ../addressbook/gui/widgets/eab-contact-display.c:682
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:551
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
+#: ../addressbook/gui/widgets/eab-contact-display.c:683
+#: ../addressbook/gui/widgets/eab-contact-display.c:704
 msgid "Address"
 msgstr "Adresse"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:567
+#: ../addressbook/gui/widgets/eab-contact-display.c:699
 msgid "Home Page"
 msgstr "Homepage"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:568
+#: ../addressbook/gui/widgets/eab-contact-display.c:700
 msgid "Web Log"
 msgstr "Weblog"
 
@@ -1270,59 +1293,62 @@ msgstr "Weblog"
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
-#: ../capplet/settings/mail-capplet-shell.c:361
-#: ../modules/addressbook/e-book-shell-backend.c:112
-#: ../modules/addressbook/e-book-shell-migrate.c:143
-#: ../modules/calendar/e-cal-shell-backend.c:128
-#: ../modules/calendar/e-cal-shell-migrate.c:161
-#: ../modules/calendar/e-memo-shell-backend.c:112
-#: ../modules/calendar/e-memo-shell-migrate.c:117
-#: ../modules/calendar/e-task-shell-backend.c:112
-#: ../modules/calendar/e-task-shell-migrate.c:128
+#: ../addressbook/gui/widgets/eab-contact-display.c:709
+#: ../capplet/settings/mail-capplet-shell.c:376
+#: ../modules/addressbook/e-book-shell-backend.c:116
+#: ../modules/addressbook/e-book-shell-migrate.c:144
+#: ../modules/calendar/e-cal-shell-backend.c:134
+#: ../modules/calendar/e-cal-shell-migrate.c:165
+#: ../modules/calendar/e-memo-shell-backend.c:118
+#: ../modules/calendar/e-memo-shell-migrate.c:120
+#: ../modules/calendar/e-task-shell-backend.c:118
+#: ../modules/calendar/e-task-shell-migrate.c:132
 msgid "Personal"
 msgstr "PersÃnlich"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:829
+#: ../addressbook/gui/widgets/eab-contact-display.c:967
+msgid "List Members"
+msgstr "Listenmitglieder"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:985
 msgid "Job Title"
 msgstr "TÃtigkeit"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:866
+#: ../addressbook/gui/widgets/eab-contact-display.c:1022
 msgid "Home page"
 msgstr "Homepage"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:875
+#: ../addressbook/gui/widgets/eab-contact-display.c:1031
 msgid "Blog"
 msgstr "Blog"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1055
-#: ../widgets/misc/e-web-view.c:858
+#: ../addressbook/gui/widgets/eab-contact-display.c:1229
+#: ../widgets/misc/e-web-view.c:954
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klicken Sie hier, um eine E-Mail an %s zu verfassen"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
+#: ../addressbook/gui/widgets/eab-gui-util.c:113
 msgid ""
-"This address book cannot be opened. This either means this book is not "
-"marked for offline usage or not yet downloaded for offline usage. Please "
-"load the address book once in online mode to download its contents."
+"This address book cannot be opened. This either means this book is not marked "
+"for offline usage or not yet downloaded for offline usage. Please load the "
+"address book once in online mode to download its contents."
 msgstr ""
 "Dieses Adressbuch konnte nicht geÃffnet werden. Dies bedeutet entweder, dass "
 "dieses Adressbuch nicht fÃr die Offline-Benutzung markiert wurde oder bis "
-"jetzt noch nicht fÃr die Offline-Benutzung heruntergeladen wurde. Bitte "
-"laden Sie das Adressbuch einmal im Online-Modus, um dessen Inhalte "
-"herunterzuladen."
+"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:104
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
 #, c-format
 msgid ""
-"This address book cannot be opened.  Please check that the path %s exists "
-"and that permissions are set to access it."
+"This address book cannot be opened.  Please check that the path %s exists and "
+"that permissions are set to access it."
 msgstr ""
 "Dieses Adressbuch konnte nicht geÃffnet werden. Bitte ÃberprÃfen Sie, ob der "
 "Pfad %s existiert und Sie darauf zugreifen dÃrfen."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:153
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -1331,7 +1357,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:126
+#: ../addressbook/gui/widgets/eab-gui-util.c:162
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1340,11 +1366,11 @@ msgstr ""
 "Sie eine falsche Adresse eingegeben haben, oder dass der Server nicht "
 "erreichbar ist."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:134
+#: ../addressbook/gui/widgets/eab-gui-util.c:170
 msgid "Detailed error message:"
 msgstr "AusfÃhrliche Fehlernachricht:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:164
+#: ../addressbook/gui/widgets/eab-gui-util.c:200
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1356,7 +1382,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:171
+#: ../addressbook/gui/widgets/eab-gui-util.c:207
 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"
@@ -1369,7 +1395,7 @@ msgstr ""
 "Einstellungen des Verzeichnis-Servers fÃr dieses Adressbuch."
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:179
+#: ../addressbook/gui/widgets/eab-gui-util.c:215
 #, c-format
 msgid "The backend for this address book was unable to parse this query. %s"
 msgstr ""
@@ -1377,7 +1403,7 @@ msgstr ""
 "Abfrage nicht analysieren. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:184
+#: ../addressbook/gui/widgets/eab-gui-util.c:220
 #, c-format
 msgid "The backend for this address book refused to perform this query. %s"
 msgstr ""
@@ -1385,168 +1411,182 @@ msgstr ""
 "ausfÃhren. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:189
+#: ../addressbook/gui/widgets/eab-gui-util.c:226
+#: ../addressbook/gui/widgets/eab-gui-util.c:232
 #, 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:214
+#: ../addressbook/gui/widgets/eab-gui-util.c:254
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:254
+#: ../addressbook/gui/widgets/eab-gui-util.c:294
 msgid "Select Address Book"
 msgstr "Adressbuch auswÃhlen"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:317
+#: ../addressbook/gui/widgets/eab-gui-util.c:357
 msgid "list"
 msgstr "Liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:455
+#: ../addressbook/gui/widgets/eab-gui-util.c:525
 msgid "Move contact to"
 msgstr "Kontakt verschieben nach"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:457
+#: ../addressbook/gui/widgets/eab-gui-util.c:527
 msgid "Copy contact to"
 msgstr "Kontakt kopieren nach"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:460
+#: ../addressbook/gui/widgets/eab-gui-util.c:530
 msgid "Move contacts to"
 msgstr "Kontakt verschieben nach"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:462
+#: ../addressbook/gui/widgets/eab-gui-util.c:532
 msgid "Copy contacts to"
 msgstr "Kontakte kopieren nach"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:39
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:38
 msgid "Card View"
 msgstr "Kartenansicht"
 
-#: ../addressbook/importers/evolution-csv-importer.c:721
-#: ../addressbook/importers/evolution-ldif-importer.c:519
-#: ../addressbook/importers/evolution-vcard-importer.c:278
-#: ../calendar/importers/icalendar-importer.c:325
-#: ../calendar/importers/icalendar-importer.c:764 ../shell/shell.error.xml.h:6
+#: ../addressbook/importers/evolution-csv-importer.c:740
+#: ../addressbook/importers/evolution-ldif-importer.c:539
+#: ../addressbook/importers/evolution-vcard-importer.c:282
+#: ../calendar/importers/icalendar-importer.c:384
+#: ../calendar/importers/icalendar-importer.c:851
+#: ../calendar/importers/icalendar-importer.c:881 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Importieren â"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1016
+#: ../addressbook/importers/evolution-csv-importer.c:1041
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV oder Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1017
+#: ../addressbook/importers/evolution-csv-importer.c:1042
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV- und Tab-Importeur"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1025
+#: ../addressbook/importers/evolution-csv-importer.c:1050
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV oder Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1026
+#: ../addressbook/importers/evolution-csv-importer.c:1051
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV- und Tab-Importeur"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1034
+#: ../addressbook/importers/evolution-csv-importer.c:1059
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV oder Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1035
+#: ../addressbook/importers/evolution-csv-importer.c:1060
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV- und Tab-Importeur"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:753
+#: ../addressbook/importers/evolution-ldif-importer.c:779
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP-Datenaustauschformat (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:754
+#: ../addressbook/importers/evolution-ldif-importer.c:780
 msgid "Evolution LDIF importer"
 msgstr "Evolution-LDIF-Importeur"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:639
+#: ../addressbook/importers/evolution-vcard-importer.c:648
 msgid "vCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:640
+#: ../addressbook/importers/evolution-vcard-importer.c:649
 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:741
+#: ../addressbook/printing/e-contact-print.c:714
 #, 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
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:645
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:680
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:53
 msgid "Can not open file"
 msgstr "Datei konnte nicht geÃffnet werden"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:42
-msgid "Couldn't get list of address books"
-msgstr "Adressbuchliste konnte nicht abgerufen werden"
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
+#, c-format
+msgid "Couldn't get list of address books: %s"
+msgstr "Adressbuchliste konnte nicht abgerufen werden: %s"
+
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
+#: ../calendar/gui/dialogs/event-page.c:2893
+#: ../calendar/gui/dialogs/memo-page.c:926
+#: ../calendar/gui/dialogs/task-page.c:1810 ../em-format/em-format.c:2314
+#: ../mail/em-folder-tree.c:678 ../mail/mail-ops.c:657
+#: ../plugins/caldav/caldav-browse-server.c:209
+#: ../plugins/caldav/caldav-browse-server.c:1406 ../plugins/face/face.c:169
+#: ../smime/gui/certificate-manager.c:313
+msgid "Unknown error"
+msgstr "Unbekannter Fehler"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:70
-msgid "failed to open book"
-msgstr "Adressbuch konnte nicht geÃffnet werden"
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
+#, c-format
+msgid "Failed to open client '%s': %s"
+msgstr "Client Â%s konnte nicht geÃffnet werden: %s"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "Specify the output file instead of standard output"
 msgstr "Die angegebene Ausgabedatei statt der Standardausgabe verwenden"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "OUTPUTFILE"
 msgstr "AUSGABEDATEI"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:64
 msgid "List local address book folders"
 msgstr "Lokale Adressbuchordner auflisten"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:66
+#: ../addressbook/tools/evolution-addressbook-export.c:67
 msgid "Show cards as vcard or csv file"
 msgstr "Karten als vcard- oder csv-Datei anzeigen"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:67
+#: ../addressbook/tools/evolution-addressbook-export.c:68
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:70
+#: ../addressbook/tools/evolution-addressbook-export.c:71
 msgid "Export in asynchronous mode"
 msgstr "Im asynchronen Modus exportieren"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:73
+#: ../addressbook/tools/evolution-addressbook-export.c:74
 msgid ""
-"The number of cards in one output file in asynchronous mode, default size "
-"100."
+"The number of cards in one output file in asynchronous mode, default size 100."
 msgstr ""
 "Die Anzahl der Karten pro Ausgabedatei im asynchronen Modus, Vorgabe: 100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:75
+#: ../addressbook/tools/evolution-addressbook-export.c:76
 msgid "NUMBER"
 msgstr "ANZAHL"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:137
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
+#: ../addressbook/tools/evolution-addressbook-export.c:138
+msgid "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Argumentfehler in Befehlszeile, bitte Ãbergeben Sie den Â--helpÂ-Parameter, "
 "um Hinweise zum Aufruf zu erhalten."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:151
+#: ../addressbook/tools/evolution-addressbook-export.c:152
 msgid "Only support csv or vcard format."
 msgstr "Es werden ausschlieÃlich die Formate Âcsv oder Âvcard unterstÃtzt."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:160
+#: ../addressbook/tools/evolution-addressbook-export.c:161
 msgid "In async mode, output must be file."
 msgstr "Im asynchronen Modus muss die Ausgabe in eine Datei erfolgen."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:168
+#: ../addressbook/tools/evolution-addressbook-export.c:169
 msgid "In normal mode, there is no need for the size option."
 msgstr "Im normalen Modus mÃssen Sie die GrÃÃe nicht angeben."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:199
+#: ../addressbook/tools/evolution-addressbook-export.c:200
 msgid "Unhandled error"
 msgstr "Unbehandelter Fehler"
 
@@ -1570,8 +1610,8 @@ msgstr ""
 
 #: ../calendar/calendar.error.xml.h:5
 msgid ""
-"Adding a meaningful summary to your appointment will give you an idea of "
-"what your appointment is about."
+"Adding a meaningful summary to your appointment will give you an idea of what "
+"your appointment is about."
 msgstr ""
 "Das HinzufÃgen einer aussagekrÃftigen Zusammenfassung zu Ihrem Termin "
 "verschafft Ihnen eine Vorstellung, worum es bei diesem Termin geht."
@@ -1587,8 +1627,8 @@ msgstr ""
 #: ../calendar/calendar.error.xml.h:7
 msgid "All information in these memos will be deleted and can not be restored."
 msgstr ""
-"Die gesamten Informationen zu diesen Notizen werden gelÃscht und kÃnnen "
-"nicht wiederhergestellt werden."
+"Die gesamten Informationen zu diesen Notizen werden gelÃscht und kÃnnen nicht "
+"wiederhergestellt werden."
 
 #: ../calendar/calendar.error.xml.h:8
 msgid "All information in this memo will be deleted and can not be restored."
@@ -1598,8 +1638,7 @@ msgstr ""
 
 #: ../calendar/calendar.error.xml.h:9
 msgid ""
-"All information on these appointments will be deleted and can not be "
-"restored."
+"All information on these appointments will be deleted and can not be restored."
 msgstr ""
 "Die gesamten Informationen zu diesen Terminen werden gelÃscht und kÃnnen "
 "nicht wiederhergestellt werden."
@@ -1618,8 +1657,7 @@ msgstr ""
 "wiederhergestellt werden."
 
 #: ../calendar/calendar.error.xml.h:12
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
+msgid "All information on this meeting will be deleted and can not be restored."
 msgstr ""
 "Die gesamten Informationen zu dieser Besprechung werden gelÃscht und kÃnnen "
 "nicht wiederhergestellt werden."
@@ -1633,8 +1671,8 @@ msgstr ""
 #: ../calendar/calendar.error.xml.h:14
 msgid "All information on this task will be deleted and can not be restored."
 msgstr ""
-"Die gesamten Informationen zu dieser Aufgabe werden gelÃscht und kÃnnen "
-"nicht wiederhergestellt werden."
+"Die gesamten Informationen zu dieser Aufgabe werden gelÃscht und kÃnnen nicht "
+"wiederhergestellt werden."
 
 #: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the '{0}' task?"
@@ -1801,8 +1839,8 @@ msgstr ""
 
 #: ../calendar/calendar.error.xml.h:50
 msgid ""
-"Sending updated information allows other participants to keep their "
-"calendars up to date."
+"Sending updated information allows other participants to keep their calendars "
+"up to date."
 msgstr ""
 "Es werden aktualisierte Informationen an andere Teilnehmer verschickt, um "
 "ihnen so zu ermÃglichen, ihre Kalender auf dem neuesten Stand zu halten."
@@ -1813,13 +1851,12 @@ msgid ""
 "lists up to date."
 msgstr ""
 "Es werden aktualisierte Informationen an andere Teilnehmer verschickt, um "
-"ihnen so zu ermÃglichen, ihre Aufgabenlisten auf dem neuesten Stand zu "
-"halten."
+"ihnen so zu ermÃglichen, ihre Aufgabenlisten auf dem neuesten Stand zu halten."
 
 #: ../calendar/calendar.error.xml.h:52
 msgid ""
-"Some attachments are being downloaded. Saving the appointment would result "
-"in the loss of these attachments."
+"Some attachments are being downloaded. Saving the appointment would result in "
+"the loss of these attachments."
 msgstr ""
 "Einige Anlagen werden zurzeit noch heruntergeladen. Das Speichern dieses "
 "Termins wÃrde den Verlust dieser Anlagen zur Folge haben."
@@ -1974,12 +2011,11 @@ msgstr ""
 "Ihre Aufgaben sind nicht verfÃgbar, solange Evolution nicht neu gestartet "
 "wurde."
 
-#: ../calendar/calendar.error.xml.h:83
-#: ../composer/mail-composer.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:83 ../composer/mail-composer.error.xml.h:29
 msgid "_Discard Changes"
 msgstr "Ãnderungen _verwerfen"
 
-#: ../calendar/calendar.error.xml.h:84 ../composer/e-composer-actions.c:313
+#: ../calendar/calendar.error.xml.h:84 ../composer/e-composer-actions.c:317
 msgid "_Save"
 msgstr "_Speichern"
 
@@ -1987,8 +2023,8 @@ msgstr "_Speichern"
 msgid "_Save Changes"
 msgstr "Ãnderungen _speichern"
 
-#: ../calendar/calendar.error.xml.h:86
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:158
+#: ../calendar/calendar.error.xml.h:86 ../composer/mail-composer.error.xml.h:34
+#: ../mail/mail.error.xml.h:164
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "Ab_schicken"
@@ -1997,46 +2033,33 @@ msgstr "Ab_schicken"
 msgid "_Send Notice"
 msgstr "Nachricht ver_schicken"
 
-#: ../calendar/common/authentication.c:75
-#: ../calendar/gui/e-meeting-store.c:1776
-#: ../plugins/caldav/caldav-browse-server.c:921
-#: ../plugins/google-account-setup/google-source.c:439
-#: ../plugins/publish-calendar/publish-calendar.c:332
-#: ../smime/gui/component.c:49
-msgid "Enter password"
-msgstr "Passwort eingeben"
-
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:105
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "Minute"
 msgstr[1] "Minuten"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:114
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "Stunde"
 msgstr[1] "Stunden"
 
-#. Translators: This is the last part of the sentence:
-#. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:126
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:425
-#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
-#: ../plugins/google-account-setup/google-contacts-source.c:377
-#: ../plugins/publish-calendar/publish-calendar.ui.h:30
-msgid "days"
+#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
+#. (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
+#. the name of a week day (like 'Monday' or 'Friday') always follow.
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:129
+#: ../calendar/gui/dialogs/recurrence-page.c:1125
+msgid "day"
 msgid_plural "days"
 msgstr[0] "Tag"
 msgstr[1] "Tage"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:300
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:303
 msgid "Start time"
 msgstr "Anfangszeit"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:1
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:3
 msgid "Appointments"
 msgstr "Termine"
 
@@ -2046,8 +2069,8 @@ msgstr "_Alle verwerfen"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1632
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1642
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1672
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1682
 #: ../plugins/itip-formatter/itip-view.c:1045
 msgid "Location:"
 msgstr "Ort:"
@@ -2056,7 +2079,7 @@ msgstr "Ort:"
 msgid "Snooze _time:"
 msgstr "Schlummer_zeit:"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:896
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:916
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:5
 msgid "_Dismiss"
 msgstr "_Verwerfen"
@@ -2065,11 +2088,21 @@ msgstr "_Verwerfen"
 msgid "_Snooze"
 msgstr "_Schlummer"
 
+#. Translators: This is the last part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:428
+#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:340
+#: ../plugins/google-account-setup/google-contacts-source.c:379
+#: ../plugins/publish-calendar/publish-calendar.ui.h:30
+msgid "days"
+msgstr "Tage"
+
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:424
+#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:427
 #: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:376
+#: ../plugins/google-account-setup/google-contacts-source.c:378
 msgid "hours"
 msgstr "Stunden"
 
@@ -2080,39 +2113,39 @@ 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:27 ../e-util/e-plugin-util.c:423
+#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:426
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:375
+#: ../plugins/google-account-setup/google-contacts-source.c:377
 msgid "minutes"
 msgstr "Minuten"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1486
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1613
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1526
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1653
 msgid "No summary available."
 msgstr "Keine Zusammenfassung verfÃgbar."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1495
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1497
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1535
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1537
 msgid "No description available."
 msgstr "Keine Beschreibung verfÃgbar."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1505
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1545
 msgid "No location information available."
 msgstr "Keine Ortsinformationen verfÃgbar."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1549
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1589
 #, c-format
-msgid "You have %d alarm"
-msgid_plural "You have %d alarms"
-msgstr[0] "Sie haben %d Alarm"
-msgstr[1] "Sie haben %d Alarme"
+msgid "You have %d reminder"
+msgid_plural "You have %d reminders"
+msgstr[0] "Sie haben %d Erinnerung"
+msgstr[1] "Sie haben %d Erinnerungen"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1741
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1774
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1780
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1813
 msgid "Warning"
 msgstr "Warnung"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1745
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1784
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2125,7 +2158,7 @@ msgstr ""
 "Evolution wird stattdessen ein normales\n"
 "Erinnerungsdialogfenster anzeigen."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1780
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1819
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2142,7 +2175,7 @@ msgstr ""
 "\n"
 "Sind Sie sicher, dass Sie dieses Programm ausfÃhren wollen?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1795
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1834
 msgid "Do not ask me about this program again."
 msgstr "Nicht mehr nach diesem Programm fragen."
 
@@ -2151,7 +2184,7 @@ msgid "invalid time"
 msgstr "ungÃltige Zeit"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:393
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:396
 #: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
@@ -2160,7 +2193,7 @@ msgstr[0] "%d Stunde"
 msgstr[1] "%d Stunden"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:399
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:402
 #: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
@@ -2171,7 +2204,7 @@ msgstr[1] "%d Minuten"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:405
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:408
 #: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
@@ -2179,23 +2212,19 @@ msgid_plural "%d seconds"
 msgstr[0] "%d Sekunde"
 msgstr[1] "%d Sekunden"
 
-#: ../calendar/gui/cal-editor-utils.c:105
-msgid "Invalid object"
-msgstr "UngÃltiges Objekt"
-
-#: ../calendar/gui/calendar-view-factory.c:117
+#: ../calendar/gui/calendar-view-factory.c:116
 msgid "Day View"
 msgstr "Tagesansicht"
 
-#: ../calendar/gui/calendar-view-factory.c:120
+#: ../calendar/gui/calendar-view-factory.c:119
 msgid "Work Week View"
 msgstr "Arbeitswochenansicht"
 
-#: ../calendar/gui/calendar-view-factory.c:123
+#: ../calendar/gui/calendar-view-factory.c:122
 msgid "Week View"
 msgstr "Wochenansicht"
 
-#: ../calendar/gui/calendar-view-factory.c:126
+#: ../calendar/gui/calendar-view-factory.c:125
 msgid "Month View"
 msgstr "Monatsansicht"
 
@@ -2224,16 +2253,16 @@ msgstr "Kategorie"
 msgid "Classification"
 msgstr "Einstufung"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:242
-#: ../calendar/gui/e-cal-model.c:772 ../calendar/gui/e-task-table.c:494
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:240
+#: ../calendar/gui/e-cal-model.c:774 ../calendar/gui/e-task-table.c:492
 #: ../calendar/gui/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 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
-#: ../modules/plugin-manager/evolution-plugin-manager.c:68
-#: ../widgets/misc/e-attachment-tree-view.c:522
+#: ../modules/plugin-manager/evolution-plugin-manager.c:71
+#: ../widgets/misc/e-attachment-tree-view.c:526
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "Beschreibung"
@@ -2253,11 +2282,11 @@ msgstr "Existieren nicht"
 msgid "Exist"
 msgstr "Existieren"
 
-#: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
+#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:835
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:384
 msgid "Location"
 msgstr "Ort"
 
@@ -2266,31 +2295,28 @@ msgstr "Ort"
 msgid "Organizer"
 msgstr "Organisator"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:241
-#: ../calendar/gui/e-cal-model.c:770 ../calendar/gui/e-task-table.c:493
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:239
+#: ../calendar/gui/e-cal-model.c:772 ../calendar/gui/e-task-table.c:491
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Privat"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:240
-#: ../calendar/gui/e-cal-model.c:761 ../calendar/gui/e-cal-model.c:768
-#: ../calendar/gui/e-task-table.c:492 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:238
+#: ../calendar/gui/e-cal-model.c:763 ../calendar/gui/e-cal-model.c:770
+#: ../calendar/gui/e-task-table.c:490 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Ãffentlich"
 
-#: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:317
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/dialogs/event-editor.c:317
 #: ../calendar/gui/dialogs/event-editor.c:338
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "Wiederholung"
 
-#: ../calendar/gui/caltypes.xml.h:17
-#: ../calendar/gui/e-cal-list-view.etspec.h:8
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/e-cal-list-view.etspec.h:8
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../calendar/gui/tasktypes.xml.h:22 ../plugins/save-calendar/csv-format.c:370
 msgid "Summary"
 msgstr "Zusammenfassung"
 
@@ -2320,54 +2346,54 @@ msgid "is not"
 msgstr "ist nicht"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:626
-msgid "Edit Alarm"
-msgstr "Alarm bearbeiten"
+msgid "Edit Reminder"
+msgstr "Erinnerung bearbeiten"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:817
-#: ../calendar/gui/e-alarm-list.c:435
+#: ../calendar/gui/e-alarm-list.c:438
 msgid "Pop up an alert"
 msgstr "Alarmeinblendung anzeigen"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:818
-#: ../calendar/gui/e-alarm-list.c:431
+#: ../calendar/gui/e-alarm-list.c:434
 msgid "Play a sound"
 msgstr "Einen Klang abspielen"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:819
-#: ../calendar/gui/e-alarm-list.c:443
+#: ../calendar/gui/e-alarm-list.c:446
 msgid "Run a program"
 msgstr "Ein Programm ausfÃhren"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:820
-#: ../calendar/gui/e-alarm-list.c:439
+#: ../calendar/gui/e-alarm-list.c:442
 msgid "Send an email"
 msgstr "Eine E-Mail verschicken"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
-msgid "Add Alarm"
-msgstr "Alarm hinzufÃgen"
+msgid "Add Reminder"
+msgstr "Erinnerung hinzufÃgen"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-editor.c:360
-msgid "Alarm"
-msgstr "Alarm"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
 msgid "Custom _message"
 msgstr "_Benutzerdefinierte Nachricht"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-msgid "Custom alarm sound"
-msgstr "Benutzerdefinierter Alarmklang"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
+msgid "Custom reminder sound"
+msgstr "Benutzerdefinierter Erinnerungsklang"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
 msgid "Mes_sage:"
 msgstr "_Nachricht:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:72
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5 ../mail/mail-config.ui.h:75
 msgid "Options"
 msgstr "Optionen"
 
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
+#: ../calendar/gui/dialogs/event-editor.c:360
+msgid "Reminder"
+msgstr "Erinnerung"
+
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
 msgid "Repeat"
 msgstr "Wiederholung"
@@ -2389,8 +2415,8 @@ msgid "_Program:"
 msgstr "_Programm:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-msgid "_Repeat the alarm"
-msgstr "Den Alarm _wiederholen"
+msgid "_Repeat the reminder"
+msgstr "Die Erinnerung _wiederholen"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
 msgid "_Sound:"
@@ -2412,7 +2438,7 @@ msgstr "Tag(e)"
 msgid "end of appointment"
 msgstr "Ende des Termins"
 
-#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "extra times every"
 msgstr "weitere Male alle"
@@ -2429,7 +2455,7 @@ msgstr "Minute(n)"
 msgid "start of appointment"
 msgstr "Beginn des Termins"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:240
 msgid "Action/Trigger"
 msgstr "Aktion/AuslÃser"
 
@@ -2438,87 +2464,86 @@ msgid "A_dd"
 msgstr "_HinzufÃgen"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-page.ui.h:1
-#: ../modules/calendar/e-calendar-preferences.ui.h:9
-msgid "Alarms"
-msgstr "Alarme"
+#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../modules/calendar/e-calendar-preferences.ui.h:24
+msgid "Reminders"
+msgstr "Erinnerungen"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:159
+#: ../calendar/gui/dialogs/calendar-setup.c:164
 msgid "Type:"
 msgstr "Art:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:175
-#: ../modules/addressbook/addressbook-config.c:509
+#: ../calendar/gui/dialogs/calendar-setup.c:180
+#: ../modules/addressbook/addressbook-config.c:516
 msgid "_Type:"
 msgstr "A_rt:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:232 ../mail/mail-config.ui.h:152
+#: ../calendar/gui/dialogs/calendar-setup.c:242 ../mail/mail-config.ui.h:155
 #: ../modules/addressbook/ldap-config.ui.h:26
-#: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
-#: ../widgets/misc/e-signature-script-dialog.c:280
+#: ../widgets/misc/e-signature-script-dialog.c:284
 msgid "_Name:"
 msgstr "_Name:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:291
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "Den Kalenderinhalt lokal zur Arbeit im Offline-Modus _kopieren"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:278
+#: ../calendar/gui/dialogs/calendar-setup.c:293
 msgid "Cop_y task list contents locally for offline operation"
 msgstr ""
 "Den Inhalt der Aufgabenliste lokal zur Arbeit im Offline-Modus _kopieren"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:280
+#: ../calendar/gui/dialogs/calendar-setup.c:295
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "Den Inhalt der Notizliste lokal zur Arbeit im Offline-Modus _kopieren"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:352
+#: ../calendar/gui/dialogs/calendar-setup.c:372
 msgid "Colo_r:"
 msgstr "_Farbe:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:375
-#: ../calendar/gui/dialogs/calendar-setup.c:386
-#: ../calendar/gui/dialogs/calendar-setup.c:397
-#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:51
-#: ../modules/addressbook/addressbook-config.c:1010
+#: ../calendar/gui/dialogs/calendar-setup.c:395
+#: ../calendar/gui/dialogs/calendar-setup.c:406
+#: ../calendar/gui/dialogs/calendar-setup.c:417
+#: ../mail/em-folder-properties.c:233 ../mail/mail-config.ui.h:52
+#: ../modules/addressbook/addressbook-config.c:1052
 #: ../modules/calendar/e-calendar-preferences.ui.h:19
-#: ../plugins/itip-formatter/itip-formatter.c:2828
+#: ../plugins/itip-formatter/itip-formatter.c:2974
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "Allgemein"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:387
-#: ../modules/calendar/e-calendar-preferences.ui.h:40
+#: ../calendar/gui/dialogs/calendar-setup.c:407
+#: ../modules/calendar/e-calendar-preferences.ui.h:41
 msgid "Task List"
 msgstr "Aufgabenliste"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:398
+#: ../calendar/gui/dialogs/calendar-setup.c:418
 msgid "Memo List"
 msgstr "Notizliste"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:483
+#: ../calendar/gui/dialogs/calendar-setup.c:503
 msgid "Calendar Properties"
 msgstr "Kalendereigenschaften"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:483
+#: ../calendar/gui/dialogs/calendar-setup.c:503
 msgid "New Calendar"
 msgstr "Neuer Kalender"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:539
+#: ../calendar/gui/dialogs/calendar-setup.c:559
 msgid "Task List Properties"
 msgstr "Aufgabenlisteneigenschaften"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:539
+#: ../calendar/gui/dialogs/calendar-setup.c:559
 msgid "New Task List"
 msgstr "Neue Aufgabenliste"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/dialogs/calendar-setup.c:615
 msgid "Memo List Properties"
 msgstr "Notizlisteneigenschaften"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/dialogs/calendar-setup.c:615
 msgid "New Memo List"
 msgstr "Neue Notizliste"
 
@@ -2570,259 +2595,262 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Sie haben keine Ãnderungen vorgenommen, den Editor aktualisieren?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:445
+#: ../calendar/gui/dialogs/comp-editor-page.c:458
 #, c-format
 msgid "Validation error: %s"
 msgstr "Validierungsfehler: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:260
+#: ../calendar/gui/dialogs/comp-editor.c:267
 msgid "Could not save attachments"
 msgstr "Die Anlagen konnten nicht gespeichert werden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:535
+#: ../calendar/gui/dialogs/comp-editor.c:589
 msgid "Could not update object"
 msgstr "Objekt konnte nicht aktualisiert werden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:650
+#: ../calendar/gui/dialogs/comp-editor.c:715
 msgid "Edit Appointment"
 msgstr "Termin bearbeiten"
 
-#: ../calendar/gui/dialogs/comp-editor.c:657
+#: ../calendar/gui/dialogs/comp-editor.c:722
 #, c-format
 msgid "Meeting - %s"
 msgstr "Besprechung - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:659
+#: ../calendar/gui/dialogs/comp-editor.c:724
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:665
+#: ../calendar/gui/dialogs/comp-editor.c:730
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Zugewiesene Aufgabe - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:667
+#: ../calendar/gui/dialogs/comp-editor.c:732
 #, c-format
 msgid "Task - %s"
 msgstr "Aufgabe - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:672
+#: ../calendar/gui/dialogs/comp-editor.c:737
 #, c-format
 msgid "Memo - %s"
 msgstr "Notiz - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:688
+#: ../calendar/gui/dialogs/comp-editor.c:753
 msgid "No Summary"
 msgstr "Keine Zusammenfassung"
 
-#: ../calendar/gui/dialogs/comp-editor.c:809
+#: ../calendar/gui/dialogs/comp-editor.c:874
 msgid "Keep original item?"
 msgstr "Originaleintrag behalten?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1005
-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:1071
+msgid "Close the current window"
+msgstr "Das aktuelle Fenster schlieÃen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1012 ../mail/e-mail-browser.c:134
-#: ../shell/e-shell-window-actions.c:1433
-#: ../widgets/misc/e-focus-tracker.c:114 ../widgets/misc/e-focus-tracker.c:552
-#: ../widgets/misc/e-web-view.c:414 ../widgets/misc/e-web-view.c:1068
+#: ../calendar/gui/dialogs/comp-editor.c:1078 ../mail/e-mail-browser.c:141
+#: ../shell/e-shell-window-actions.c:1474 ../widgets/misc/e-focus-tracker.c:117
+#: ../widgets/misc/e-focus-tracker.c:555 ../widgets/misc/e-web-view.c:457
+#: ../widgets/misc/e-web-view.c:1280
 msgid "Copy the selection"
 msgstr "Die Auswahl kopieren"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1019 ../mail/e-mail-browser.c:141
-#: ../shell/e-shell-window-actions.c:1440
-#: ../widgets/misc/e-focus-tracker.c:107 ../widgets/misc/e-focus-tracker.c:547
-#: ../widgets/misc/e-web-view.c:1062
+#: ../calendar/gui/dialogs/comp-editor.c:1085 ../mail/e-mail-browser.c:148
+#: ../shell/e-shell-window-actions.c:1481 ../widgets/misc/e-focus-tracker.c:110
+#: ../widgets/misc/e-focus-tracker.c:550 ../widgets/misc/e-web-view.c:1274
 msgid "Cut the selection"
 msgstr "Die Auswahl ausschneiden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1026
-#: ../shell/e-shell-window-actions.c:1447
-#: ../widgets/misc/e-focus-tracker.c:128 ../widgets/misc/e-focus-tracker.c:562
+#: ../calendar/gui/dialogs/comp-editor.c:1092
+#: ../shell/e-shell-window-actions.c:1488 ../widgets/misc/e-focus-tracker.c:131
+#: ../widgets/misc/e-focus-tracker.c:565
 msgid "Delete the selection"
 msgstr "Die Auswahl lÃschen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1033
-msgid "Click here to view help available"
-msgstr "Klicken Sie hier, um die verfÃgbare Hilfe anzuzeigen"
+#: ../calendar/gui/dialogs/comp-editor.c:1099
+msgid "View help"
+msgstr "Hilfe anzeigen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1040 ../mail/e-mail-browser.c:148
-#: ../shell/e-shell-window-actions.c:1482
-#: ../widgets/misc/e-focus-tracker.c:121 ../widgets/misc/e-focus-tracker.c:557
-#: ../widgets/misc/e-web-view.c:1074
+#: ../calendar/gui/dialogs/comp-editor.c:1106 ../mail/e-mail-browser.c:155
+#: ../shell/e-shell-window-actions.c:1523 ../widgets/misc/e-focus-tracker.c:124
+#: ../widgets/misc/e-focus-tracker.c:560 ../widgets/misc/e-web-view.c:1286
 msgid "Paste the clipboard"
 msgstr "Den Inhalt der Zwischenablage einfÃgen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1061
-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:1127
+msgid "Save current changes"
+msgstr "Aktuelle Ãnderungen speichern"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1068 ../mail/e-mail-browser.c:155
-#: ../shell/e-shell-window-actions.c:1552
-#: ../widgets/misc/e-focus-tracker.c:135 ../widgets/misc/e-focus-tracker.c:567
+#: ../calendar/gui/dialogs/comp-editor.c:1134 ../mail/e-mail-browser.c:162
+#: ../shell/e-shell-window-actions.c:1600 ../widgets/misc/e-focus-tracker.c:138
+#: ../widgets/misc/e-focus-tracker.c:570
 msgid "Select all text"
 msgstr "Den gesamten Text markieren"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1075
+#: ../calendar/gui/dialogs/comp-editor.c:1141
 msgid "_Classification"
 msgstr "E_instufung"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1082
+#: ../calendar/gui/dialogs/comp-editor.c:1148
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:169
+#: ../mail/e-mail-browser.c:176
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1580
+#: ../shell/e-shell-window-actions.c:1628
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1089 ../mail/e-mail-browser.c:162
-#: ../shell/e-shell-window-actions.c:1587
-#: ../widgets/misc/e-signature-editor.c:217
+#: ../calendar/gui/dialogs/comp-editor.c:1155 ../mail/e-mail-browser.c:169
+#: ../shell/e-shell-window-actions.c:1635
+#: ../widgets/misc/e-signature-editor.c:221
 msgid "_File"
 msgstr "_Datei"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1096
-#: ../shell/e-shell-window-actions.c:1594
+#: ../calendar/gui/dialogs/comp-editor.c:1162
+#: ../shell/e-shell-window-actions.c:1642
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1103
+#: ../calendar/gui/dialogs/comp-editor.c:1169
 msgid "_Insert"
 msgstr "Ein_fÃgen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1110
-#: ../composer/e-composer-actions.c:336
+#: ../calendar/gui/dialogs/comp-editor.c:1176
+#: ../composer/e-composer-actions.c:340
 msgid "_Options"
 msgstr "_Optionen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117 ../mail/e-mail-browser.c:176
-#: ../shell/e-shell-window-actions.c:1629 ../smime/gui/smime-ui.ui.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1183 ../mail/e-mail-browser.c:183
+#: ../shell/e-shell-window-actions.c:1677 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "_Ansicht"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1127
-#: ../composer/e-composer-actions.c:285
+#: ../calendar/gui/dialogs/comp-editor.c:1193
+#: ../composer/e-composer-actions.c:289
 msgid "_Attachment..."
 msgstr "_Anlage â"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129
-msgid "Click here to attach a file"
-msgstr "Klicken Sie hier, um eine Datei beizulegen"
+#: ../calendar/gui/dialogs/comp-editor.c:1195
+#: ../composer/e-composer-actions.c:291 ../widgets/misc/e-attachment-view.c:439
+msgid "Attach a file"
+msgstr "Eine Datei beilegen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1137
+#: ../calendar/gui/dialogs/comp-editor.c:1203
 msgid "_Categories"
 msgstr "_Kategorien"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1139
+#: ../calendar/gui/dialogs/comp-editor.c:1205
 msgid "Toggles whether to display categories"
 msgstr "Kategorien anzeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1145
+#: ../calendar/gui/dialogs/comp-editor.c:1211
 msgid "Time _Zone"
 msgstr "Zeit_zone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1147
+#: ../calendar/gui/dialogs/comp-editor.c:1213
 msgid "Toggles whether the time zone is displayed"
 msgstr "Zeitzone anzeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1156
+#: ../calendar/gui/dialogs/comp-editor.c:1222
 msgid "Pu_blic"
 msgstr "Ã_ffentlich"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1158
+#: ../calendar/gui/dialogs/comp-editor.c:1224
 msgid "Classify as public"
 msgstr "Als Ãffentlich einstufen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1163
+#: ../calendar/gui/dialogs/comp-editor.c:1229
 msgid "_Private"
 msgstr "_Privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1165
+#: ../calendar/gui/dialogs/comp-editor.c:1231
 msgid "Classify as private"
 msgstr "Als privat einstufen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1170
+#: ../calendar/gui/dialogs/comp-editor.c:1236
 msgid "_Confidential"
 msgstr "Ver_traulich"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1172
+#: ../calendar/gui/dialogs/comp-editor.c:1238
 msgid "Classify as confidential"
 msgstr "Als vertraulich einstufen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1180
+#: ../calendar/gui/dialogs/comp-editor.c:1246
 msgid "R_ole Field"
 msgstr "_Positions-Feld"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1182
+#: ../calendar/gui/dialogs/comp-editor.c:1248
 msgid "Toggles whether the Role field is displayed"
 msgstr "Feld fÃr die Position angezeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1188
+#: ../calendar/gui/dialogs/comp-editor.c:1254
 msgid "_RSVP"
 msgstr "_UAwg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1190
+#: ../calendar/gui/dialogs/comp-editor.c:1256
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "UAwg-Feld angezeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1196
+#: ../calendar/gui/dialogs/comp-editor.c:1262
 msgid "_Status Field"
 msgstr "_Statusfeld"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1198
+#: ../calendar/gui/dialogs/comp-editor.c:1264
 msgid "Toggles whether the Status field is displayed"
 msgstr "Statusfeld anzeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1204
+#: ../calendar/gui/dialogs/comp-editor.c:1270
 msgid "_Type Field"
 msgstr "A_rt-Feld"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1206
+#: ../calendar/gui/dialogs/comp-editor.c:1272
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Feld fÃr die Teilnehmerart angezeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1230
-#: ../composer/e-composer-private.c:73
+#: ../calendar/gui/dialogs/comp-editor.c:1296
+#: ../composer/e-composer-private.c:77
 msgid "Recent _Documents"
 msgstr "_Zuletzt geÃffnet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1936
-#: ../composer/e-composer-actions.c:504
+#: ../calendar/gui/dialogs/comp-editor.c:2018
+#: ../composer/e-composer-actions.c:508
 msgid "Attach"
 msgstr "Beilegen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2269
-#: ../calendar/gui/dialogs/comp-editor.c:2432
-#: ../calendar/gui/dialogs/comp-editor.c:3407
+#: ../calendar/gui/dialogs/comp-editor.c:2354
+#: ../calendar/gui/dialogs/comp-editor.c:2517
+#: ../calendar/gui/dialogs/comp-editor.c:3495
 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:3371
+#: ../calendar/gui/dialogs/comp-editor.c:3459
 #: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "Anlage"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3439
+#: ../calendar/gui/dialogs/comp-editor.c:3527
 msgid "Unable to use current version!"
 msgstr "Aktuelle Version konnte nicht verwendet werden!"
 
-#: ../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:100
+#: ../calendar/gui/dialogs/copy-source-dialog.c:108
 msgid "Could not open destination"
 msgstr "Ziel konnte nicht geÃffnet werden"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:109
+#: ../calendar/gui/dialogs/copy-source-dialog.c:123
 msgid "Destination is read only"
 msgstr "Ziel ist nur lesbar"
 
+#: ../calendar/gui/dialogs/copy-source-dialog.c:157
+msgid "Cannot create object"
+msgstr "Objekt kann nicht angelegt werden"
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:183
+msgid "Could not open source"
+msgstr "Quelle konnte nicht geÃffnet werden"
+
 #: ../calendar/gui/dialogs/delete-comp.c:210
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr ""
@@ -2918,12 +2946,12 @@ msgid "Enter Delegate"
 msgstr "Vertreter eingeben"
 
 #: ../calendar/gui/dialogs/event-editor.c:212
-msgid "_Alarms"
-msgstr "_Alarme"
+msgid "_Reminders"
+msgstr "E_rinnerungen"
 
 #: ../calendar/gui/dialogs/event-editor.c:214
-msgid "Click here to set or unset alarms for this event"
-msgstr "Klicken Sie hier, um Alarme fÃr dieses Ereignis einzustellen"
+msgid "Set or unset reminders for this event"
+msgstr "Erinnerungen fÃr dieses Ereignis festlegen oder lÃschen"
 
 #: ../calendar/gui/dialogs/event-editor.c:222
 msgid "Show Time as _Busy"
@@ -2942,14 +2970,12 @@ msgid "Make this a recurring event"
 msgstr "Dies zu einem wiederkehrenden Ereignis machen"
 
 #: ../calendar/gui/dialogs/event-editor.c:240
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:212
 #: ../widgets/misc/e-send-options.ui.h:22
 msgid "Send Options"
 msgstr "Versandoptionen"
 
 #: ../calendar/gui/dialogs/event-editor.c:242
-#: ../calendar/gui/dialogs/task-editor.c:124
+#: ../calendar/gui/dialogs/task-editor.c:128
 msgid "Insert advanced send options"
 msgstr "Erweiterte Versandoptionen einfÃgen"
 
@@ -2969,13 +2995,13 @@ msgstr "_VerfÃgbarkeit"
 msgid "Query free / busy information for the attendees"
 msgstr "VerfÃgbarkeitsinformationen der Teilnehmer abfragen"
 
-#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3172
+#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3184
 msgid "Appointment"
 msgstr "Termin"
 
 #: ../calendar/gui/dialogs/event-editor.c:384
-#: ../calendar/gui/dialogs/event-page.ui.h:3
-#: ../calendar/gui/e-meeting-list-view.c:148
+#: ../calendar/gui/dialogs/event-page.ui.h:2
+#: ../calendar/gui/e-meeting-list-view.c:160
 msgid "Attendees"
 msgstr "Teilnehmer"
 
@@ -2983,88 +3009,82 @@ msgstr "Teilnehmer"
 msgid "Print this event"
 msgstr "Dieses Ereignis drucken"
 
-#: ../calendar/gui/dialogs/event-page.c:765
+#: ../calendar/gui/dialogs/event-page.c:556
 msgid "Event's start time is in the past"
 msgstr "Beginn des Ereignisses liegt in der Vergangenheit"
 
-#: ../calendar/gui/dialogs/event-page.c:806
+#: ../calendar/gui/dialogs/event-page.c:633
 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:810
+#: ../calendar/gui/dialogs/event-page.c:637
 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:822
-#: ../calendar/gui/dialogs/event-page.c:2780
-msgid "This event has alarms"
-msgstr "Dieses Ereignis enthÃlt Alarme"
+#: ../calendar/gui/dialogs/event-page.c:649
+#: ../calendar/gui/dialogs/event-page.c:3021
+msgid "This event has reminders"
+msgstr "Dieses Ereignis enthÃlt Erinnerungen"
 
-#: ../calendar/gui/dialogs/event-page.c:889
-#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../calendar/gui/dialogs/event-page.c:716
+#: ../calendar/gui/dialogs/event-page.ui.h:7
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganisator:"
 
-#: ../calendar/gui/dialogs/event-page.c:936
-msgid "_Delegatees"
-msgstr "_Vertreter"
-
-#: ../calendar/gui/dialogs/event-page.c:938
-msgid "Atte_ndees"
-msgstr "Teil_nehmer"
-
-#: ../calendar/gui/dialogs/event-page.c:1155
+#: ../calendar/gui/dialogs/event-page.c:1254
 msgid "Event with no start date"
 msgstr "Ereignis ohne Anfangsdatum"
 
-#: ../calendar/gui/dialogs/event-page.c:1158
+#: ../calendar/gui/dialogs/event-page.c:1257
 msgid "Event with no end date"
 msgstr "Ereignis ohne Enddatum"
 
-#: ../calendar/gui/dialogs/event-page.c:1329
-#: ../calendar/gui/dialogs/memo-page.c:671
-#: ../calendar/gui/dialogs/task-page.c:905
+#: ../calendar/gui/dialogs/event-page.c:1430
+#: ../calendar/gui/dialogs/memo-page.c:695
+#: ../calendar/gui/dialogs/task-page.c:843
 msgid "Start date is wrong"
 msgstr "Das Anfangsdatum ist falsch"
 
-#: ../calendar/gui/dialogs/event-page.c:1339
+#: ../calendar/gui/dialogs/event-page.c:1440
 msgid "End date is wrong"
 msgstr "Das Enddatum ist falsch"
 
-#: ../calendar/gui/dialogs/event-page.c:1362
+#: ../calendar/gui/dialogs/event-page.c:1463
 msgid "Start time is wrong"
 msgstr "Die Anfangszeit ist falsch"
 
-#: ../calendar/gui/dialogs/event-page.c:1369
+#: ../calendar/gui/dialogs/event-page.c:1470
 msgid "End time is wrong"
 msgstr "Die Endzeit ist falsch"
 
-#: ../calendar/gui/dialogs/event-page.c:1533
-#: ../calendar/gui/dialogs/memo-page.c:712
-#: ../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:1539
-#: ../calendar/gui/dialogs/memo-page.c:718
-#: ../calendar/gui/dialogs/task-page.c:973
+#: ../calendar/gui/dialogs/event-page.c:1635
+#: ../calendar/gui/dialogs/memo-page.c:736
+#: ../calendar/gui/dialogs/task-page.c:905
 msgid "An organizer is required."
 msgstr "Es ist ein Organisator erforderlich."
 
-#: ../calendar/gui/dialogs/event-page.c:1564
-#: ../calendar/gui/dialogs/task-page.c:997
+#: ../calendar/gui/dialogs/event-page.c:1669
+#: ../calendar/gui/dialogs/task-page.c:939
 msgid "At least one attendee is required."
 msgstr "Es ist mindestens ein Teilnehmer erforderlich."
 
-#: ../calendar/gui/dialogs/event-page.c:2654
+#: ../calendar/gui/dialogs/event-page.c:1869
+msgid "_Delegatees"
+msgstr "_Vertreter"
+
+#: ../calendar/gui/dialogs/event-page.c:1871
+msgid "Atte_ndees"
+msgstr "Teil_nehmer"
+
+#: ../calendar/gui/dialogs/event-page.c:2891
 #, c-format
-msgid "Unable to open the calendar '%s'."
-msgstr "Der Kalender Â%s konnte nicht geÃffnet werden."
+msgid "Unable to open the calendar '%s': %s"
+msgstr "Der Kalender Â%s konnte nicht geÃffnet werden: %s"
 
 #. Translators: This string is used when we are creating an Event
 #. (meeting or appointment)  on behalf of some other user
@@ -3072,79 +3092,79 @@ 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:2698
-#: ../calendar/gui/dialogs/memo-page.c:931
-#: ../calendar/gui/dialogs/task-page.c:1787
+#: ../calendar/gui/dialogs/event-page.c:2939
+#: ../calendar/gui/dialogs/memo-page.c:967
+#: ../calendar/gui/dialogs/task-page.c:1855
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Sie handeln im Namen von %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3009
+#: ../calendar/gui/dialogs/event-page.c:3250
 #, 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:3015
+#: ../calendar/gui/dialogs/event-page.c:3256
 #, 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:3021
+#: ../calendar/gui/dialogs/event-page.c:3262
 #, 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:3040
+#: ../calendar/gui/dialogs/event-page.c:3281
 msgid "Customize"
 msgstr "Anpassen"
 
-#. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:3046
-msgctxt "cal-alarms"
+#. Translators: "None" for "No reminder set"
+#: ../calendar/gui/dialogs/event-page.c:3287
+msgctxt "cal-reminders"
 msgid "None"
 msgstr "Keine"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:2
+#: ../calendar/gui/dialogs/event-page.ui.h:1
 #: ../calendar/gui/dialogs/task-page.ui.h:1
 #: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "Atte_ndees..."
 msgstr "Teil_nehmer â"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-msgid "Custom Alarm:"
-msgstr "Benutzerdefinierter Alarm:"
+#: ../calendar/gui/dialogs/event-page.ui.h:5
+msgid "Custom Reminder:"
+msgstr "Benutzerdefinierte Erinnerung:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:7
+#: ../calendar/gui/dialogs/event-page.ui.h:6
 msgid "Event Description"
 msgstr "Ereignisbeschreibung"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:9
-#: ../modules/calendar/e-calendar-preferences.ui.h:44
+#: ../modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Time _zone:"
 msgstr "Zeit_zone:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:10
-msgid "_Alarm"
-msgstr "A_larm"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../widgets/misc/e-attachment-dialog.c:343
+#: ../widgets/misc/e-attachment-dialog.c:347
 msgid "_Description:"
 msgstr "_Beschreibung:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:13
-#: ../plugins/calendar-weather/calendar-weather.c:362
+#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../plugins/calendar-weather/calendar-weather.c:366
 msgid "_Location:"
 msgstr "O_rt:"
 
+#: ../calendar/gui/dialogs/event-page.ui.h:13
+msgid "_Reminder"
+msgstr "E_rinnerung"
+
 #: ../calendar/gui/dialogs/event-page.ui.h:14
 msgid "_Summary:"
 msgstr "Zu_sammenfassung:"
@@ -3153,19 +3173,19 @@ msgstr "Zu_sammenfassung:"
 msgid "_Time:"
 msgstr "_Zeit:"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:17
 msgctxt "eventpage"
 msgid "1 day before appointment"
 msgstr "1 Tag vor dem Termin"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:19
 msgctxt "eventpage"
 msgid "1 hour before appointment"
 msgstr "1 Stunde vor dem Termin"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:21
 msgctxt "eventpage"
 msgid "15 minutes before appointment"
@@ -3183,39 +3203,96 @@ msgctxt "eventpage"
 msgid "until"
 msgstr "bis"
 
-#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3176
-msgid "Memo"
-msgstr "Notiz"
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:1
+msgid "April"
+msgstr "April"
 
-#: ../calendar/gui/dialogs/memo-editor.c:156
-msgid "Print this memo"
-msgstr "Diese Notiz drucken"
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:2
+msgid "August"
+msgstr "August"
 
-#: ../calendar/gui/dialogs/memo-page.c:337
-msgid "Memo's start date is in the past"
-msgstr "Beginn der Notiz liegt in der Vergangenheit"
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:3
+msgid "December"
+msgstr "Dezember"
 
-#: ../calendar/gui/dialogs/memo-page.c:375
-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/goto-dialog.ui.h:4
+msgid "February"
+msgstr "Februar"
 
-#: ../calendar/gui/dialogs/memo-page.c:379
-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/goto-dialog.ui.h:5
+msgid "January"
+msgstr "Januar"
 
-#: ../calendar/gui/dialogs/memo-page.c:892
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:6
+msgid "July"
+msgstr "Juli"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:7
+msgid "June"
+msgstr "Juni"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:8
+msgid "March"
+msgstr "MÃrz"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:9
+msgid "May"
+msgstr "Mai"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:10
+msgid "November"
+msgstr "November"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:11
+msgid "October"
+msgstr "Oktober"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:12
+msgid "Select Date"
+msgstr "Datum wÃhlen"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:13
+#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+msgid "Select _Today"
+msgstr "_Heute wÃhlen"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:14
+msgid "September"
+msgstr "September"
+
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3188
+msgid "Memo"
+msgstr "Notiz"
+
+#: ../calendar/gui/dialogs/memo-editor.c:156
+msgid "Print this memo"
+msgstr "Diese Notiz drucken"
+
+#: ../calendar/gui/dialogs/memo-page.c:393
+msgid "Memo's start date is in the past"
+msgstr "Beginn der Notiz liegt in der Vergangenheit"
+
+#: ../calendar/gui/dialogs/memo-page.c:430
+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:434
+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:924
 #, c-format
-msgid "Unable to open memos in '%s'."
-msgstr "Notizen in Â%s konnten nicht geÃffnet werden."
+msgid "Unable to open memos in '%s': %s"
+msgstr "Notizen in Â%s konnten nicht geÃffnet werden: %s"
 
-#: ../calendar/gui/dialogs/memo-page.c:1063 ../em-format/em-format-quote.c:283
-#: ../em-format/em-format.c:1053 ../mail/em-format-html.c:2405
-#: ../mail/em-format-html.c:2470 ../mail/em-format-html.c:2494
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:72
+#: ../calendar/gui/dialogs/memo-page.c:1099 ../em-format/em-format-quote.c:319
+#: ../em-format/em-format.c:1056 ../mail/em-format-html.c:2573
+#: ../mail/em-format-html.c:2638 ../mail/em-format-html.c:2662
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:74
 msgid "To"
 msgstr "An"
 
@@ -3234,10 +3311,10 @@ msgid "T_o:"
 msgstr "A_n:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:422
+#: ../calendar/gui/dialogs/task-page.c:331
 #: ../calendar/gui/dialogs/task-page.ui.h:9
-msgid "_Group:"
-msgstr "_Gruppe:"
+msgid "_List:"
+msgstr "_Liste:"
 
 #: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
@@ -3282,22 +3359,22 @@ msgstr "Diese und zukÃnftige Instanzen"
 msgid "All Instances"
 msgstr "Alle Instanzen"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:563
+#: ../calendar/gui/dialogs/recurrence-page.c:573
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Dieser Termin enthÃlt Wiederholungen, die Evolution nicht bearbeiten kann."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:895
+#: ../calendar/gui/dialogs/recurrence-page.c:904
 msgid "Recurrence date is invalid"
 msgstr "Das Wiederholungsdatum ist ungÃltig"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:935
+#: ../calendar/gui/dialogs/recurrence-page.c:944
 msgid "End time of the recurrence was before event's start"
 msgstr "Die Zeit der letzten Wiederholung lag vor dem Start des Termins"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:965
+#: ../calendar/gui/dialogs/recurrence-page.c:974
 msgid "on"
 msgstr "am"
 
@@ -3305,7 +3382,7 @@ msgstr "am"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1023
+#: ../calendar/gui/dialogs/recurrence-page.c:1032
 msgid "first"
 msgstr "erster"
 
@@ -3314,7 +3391,7 @@ msgstr "erster"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1029
+#: ../calendar/gui/dialogs/recurrence-page.c:1038
 msgid "second"
 msgstr "zweiter"
 
@@ -3322,7 +3399,7 @@ msgstr "zweiter"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1034
+#: ../calendar/gui/dialogs/recurrence-page.c:1043
 msgid "third"
 msgstr "dritter"
 
@@ -3330,7 +3407,7 @@ msgstr "dritter"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1048
 msgid "fourth"
 msgstr "vierter"
 
@@ -3338,7 +3415,7 @@ msgstr "vierter"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "fifth"
 msgstr "fÃnfter"
 
@@ -3346,13 +3423,13 @@ msgstr "fÃnfter"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1049
+#: ../calendar/gui/dialogs/recurrence-page.c:1058
 msgid "last"
 msgstr "letzter"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1073
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 msgid "Other Date"
 msgstr "Anderes Datum"
 
@@ -3360,7 +3437,7 @@ msgstr "Anderes Datum"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1079
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
 msgid "1st to 10th"
 msgstr "1. bis 10."
 
@@ -3368,7 +3445,7 @@ msgstr "1. bis 10."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/dialogs/recurrence-page.c:1094
 msgid "11th to 20th"
 msgstr "11. bis 20."
 
@@ -3376,81 +3453,74 @@ msgstr "11. bis 20."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1091
+#: ../calendar/gui/dialogs/recurrence-page.c:1100
 msgid "21st to 31st"
 msgstr "21. bis 31."
 
-#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
-#. (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
-#. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
-msgid "day"
-msgstr "Tag"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/dialogs/recurrence-page.c:1126
 #: ../modules/calendar/e-calendar-preferences.ui.h:22
 msgid "Monday"
 msgstr "Montag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
+#: ../calendar/gui/dialogs/recurrence-page.c:1127
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
-#: ../modules/calendar/e-calendar-preferences.ui.h:48
+#: ../calendar/gui/dialogs/recurrence-page.c:1128
+#: ../modules/calendar/e-calendar-preferences.ui.h:49
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
-#: ../modules/calendar/e-calendar-preferences.ui.h:42
+#: ../calendar/gui/dialogs/recurrence-page.c:1129
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1121
+#: ../calendar/gui/dialogs/recurrence-page.c:1130
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
 msgid "Friday"
 msgstr "Freitag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1122
-#: ../modules/calendar/e-calendar-preferences.ui.h:26
+#: ../calendar/gui/dialogs/recurrence-page.c:1131
+#: ../modules/calendar/e-calendar-preferences.ui.h:27
 msgid "Saturday"
 msgstr "Samstag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1123
-#: ../modules/calendar/e-calendar-preferences.ui.h:36
+#: ../calendar/gui/dialogs/recurrence-page.c:1132
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
 msgid "Sunday"
 msgstr "Sonntag"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1245
+#: ../calendar/gui/dialogs/recurrence-page.c:1254
 msgid "on the"
 msgstr "am"
 
 # oder im Falle von Terminen: Wiederholungen ??
-#: ../calendar/gui/dialogs/recurrence-page.c:1419
+#: ../calendar/gui/dialogs/recurrence-page.c:1428
 msgid "occurrences"
 msgstr "Wiederholungen"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2123
+#: ../calendar/gui/dialogs/recurrence-page.c:2138
 msgid "Add exception"
 msgstr "Ausnahme hinzufÃgen"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2164
+#: ../calendar/gui/dialogs/recurrence-page.c:2179
 msgid "Could not get a selection to modify."
 msgstr "Keine zu verÃndernde Auswahl vorhanden."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2170
+#: ../calendar/gui/dialogs/recurrence-page.c:2185
 msgid "Modify exception"
 msgstr "Ausnahme verÃndern"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2214
+#: ../calendar/gui/dialogs/recurrence-page.c:2229
 msgid "Could not get a selection to delete."
 msgstr "Keine zu lÃschende Auswahl vorhanden."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2348
+#: ../calendar/gui/dialogs/recurrence-page.c:2363
 msgid "Date/Time"
 msgstr "Datum/Zeit"
 
@@ -3462,7 +3532,7 @@ msgstr "Alle"
 msgid "Exceptions"
 msgstr "Ausnahmen"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:79
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:82
 msgid "Preview"
 msgstr "Vorschau"
 
@@ -3513,29 +3583,29 @@ msgid "year(s)"
 msgstr "Jahr(e)"
 
 #: ../calendar/gui/dialogs/send-comp.c:192
-msgid "Send my alarms with this event"
-msgstr "Meine Alarme zusammen mit diesem Termin verschicken"
+msgid "Send my reminders with this event"
+msgstr "Meine Erinnerungen zusammen mit diesem Termin verschicken"
 
 #: ../calendar/gui/dialogs/send-comp.c:194
 msgid "Notify new attendees _only"
 msgstr "_Nur neue Teilnehmer benachrichtigen"
 
-#: ../calendar/gui/dialogs/task-details-page.c:352
-#: ../calendar/gui/dialogs/task-details-page.c:374
+#: ../calendar/gui/dialogs/task-details-page.c:351
+#: ../calendar/gui/dialogs/task-details-page.c:373
 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:488
 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:294
+#: ../calendar/gui/e-cal-component-preview.c:298
 #: ../calendar/gui/e-cal-model-tasks.c:439
 #: ../calendar/gui/e-cal-model-tasks.c:713 ../calendar/gui/e-task-table.c:210
-#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:596
-#: ../calendar/gui/print.c:3262 ../mail/em-sync-stream.c:152
+#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:594
+#: ../calendar/gui/print.c:3274 ../mail/em-sync-stream.c:152
 #: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
 #, c-format
 msgid "Canceled"
@@ -3543,59 +3613,59 @@ 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:295
 #: ../calendar/gui/e-cal-model-tasks.c:437
 #: ../calendar/gui/e-cal-model-tasks.c:711
-#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
+#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
 #: ../calendar/gui/e-task-table.c:208 ../calendar/gui/e-task-table.c:223
-#: ../calendar/gui/e-task-table.c:595 ../calendar/gui/print.c:3259
-#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:367
+#: ../calendar/gui/e-task-table.c:593 ../calendar/gui/print.c:3271
+#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:374
 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:516 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1228 ../widgets/misc/e-send-options.ui.h:13
+#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../calendar/gui/e-task-table.c:514 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1224 ../widgets/misc/e-send-options.ui.h:13
 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:292
 #: ../calendar/gui/e-cal-model-tasks.c:435
 #: ../calendar/gui/e-cal-model-tasks.c:709
 #: ../calendar/gui/e-cal-model-tasks.c:786 ../calendar/gui/e-task-table.c:206
-#: ../calendar/gui/e-task-table.c:221 ../calendar/gui/e-task-table.c:594
-#: ../calendar/gui/print.c:3256
+#: ../calendar/gui/e-task-table.c:221 ../calendar/gui/e-task-table.c:592
+#: ../calendar/gui/print.c:3268
 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:518 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1226 ../widgets/misc/e-send-options.ui.h:14
+#: ../calendar/gui/e-cal-component-preview.c:321
+#: ../calendar/gui/e-task-table.c:516 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1222 ../widgets/misc/e-send-options.ui.h:14
 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:1521 ../calendar/gui/e-task-table.c:517
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1227
+#: ../calendar/gui/e-cal-component-preview.c:319
+#: ../calendar/gui/e-cal-model.c:1533 ../calendar/gui/e-task-table.c:515
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1223
 #: ../widgets/misc/e-send-options.ui.h:16
 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:302
 #: ../calendar/gui/e-cal-model-tasks.c:433
 #: ../calendar/gui/e-cal-model-tasks.c:707 ../calendar/gui/e-task-table.c:204
-#: ../calendar/gui/e-task-table.c:219 ../calendar/gui/e-task-table.c:593
-#: ../calendar/gui/print.c:3253 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-task-table.c:219 ../calendar/gui/e-task-table.c:591
+#: ../calendar/gui/print.c:3265 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Nicht begonnen"
 
@@ -3611,8 +3681,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:1833
-#: ../calendar/gui/e-meeting-list-view.c:596
+#: ../calendar/gui/e-calendar-view.c:1831
+#: ../calendar/gui/e-meeting-list-view.c:610
 #: ../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
@@ -3621,7 +3691,7 @@ msgstr "Status"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:519 ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-task-table.c:517 ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:27
 msgid "Undefined"
 msgstr "Nicht festgelegt"
@@ -3639,66 +3709,65 @@ msgstr "_PrioritÃt:"
 msgid "_Web Page:"
 msgstr "_Website:"
 
-#: ../calendar/gui/dialogs/task-editor.c:112
+#: ../calendar/gui/dialogs/task-editor.c:116
 msgid "_Status Details"
 msgstr "S_tatusdetails"
 
-#: ../calendar/gui/dialogs/task-editor.c:114
+#: ../calendar/gui/dialogs/task-editor.c:118
 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
-#: ../plugins/groupwise-features/mail-send-options.c:200
+#: ../calendar/gui/dialogs/task-editor.c:126
 msgid "_Send Options"
 msgstr "_Versandoptionen"
 
-#: ../calendar/gui/dialogs/task-editor.c:328 ../calendar/gui/print.c:3174
+#: ../calendar/gui/dialogs/task-editor.c:319 ../calendar/gui/print.c:3186
 #: ../widgets/misc/e-send-options.c:526
 msgid "Task"
 msgstr "Aufgabe"
 
-#: ../calendar/gui/dialogs/task-editor.c:331
+#: ../calendar/gui/dialogs/task-editor.c:322
 msgid "Task Details"
 msgstr "Aufgabendetails"
 
-#: ../calendar/gui/dialogs/task-editor.c:373
+#: ../calendar/gui/dialogs/task-editor.c:364
 msgid "Print this task"
 msgstr "Diese Aufgabe drucken"
 
-#: ../calendar/gui/dialogs/task-page.c:339
+#: ../calendar/gui/dialogs/task-page.c:249
 msgid "Task's start date is in the past"
 msgstr "Beginn der Aufgabe liegt in der Vergangenheit"
 
-#: ../calendar/gui/dialogs/task-page.c:340
+#: ../calendar/gui/dialogs/task-page.c:250
 msgid "Task's due date is in the past"
 msgstr "FÃlligkeit der Aufgabe liegt in der Vergangenheit"
 
-#: ../calendar/gui/dialogs/task-page.c:375
+#: ../calendar/gui/dialogs/task-page.c:284
 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"
+"Die Aufgabe kann nicht bearbeitet werden, weil die gewÃhlte Aufgabenliste nur "
+"gelesen werden darf"
 
-#: ../calendar/gui/dialogs/task-page.c:379
+#: ../calendar/gui/dialogs/task-page.c:288
 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:430
+#: ../calendar/gui/dialogs/task-page.c:339
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "Or_ganisator:"
 
-#: ../calendar/gui/dialogs/task-page.c:878
+#: ../calendar/gui/dialogs/task-page.c:816
 msgid "Due date is wrong"
 msgstr "Das FÃlligkeitsdatum ist falsch"
 
-#: ../calendar/gui/dialogs/task-page.c:1744
+#: ../calendar/gui/dialogs/task-page.c:1808
 #, c-format
-msgid "Unable to open tasks in '%s'."
-msgstr "Aufgaben in Â%s konnten nicht geÃffnet werden."
+msgid "Unable to open tasks in '%s': %s"
+msgstr "Aufgaben in Â%s konnten nicht geÃffnet werden: %s"
 
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
@@ -3713,7 +3782,7 @@ msgid "Time zone:"
 msgstr "Zeitzone:"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:381
+#: ../calendar/gui/e-alarm-list.c:384
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -3721,116 +3790,116 @@ msgstr[0] "%d Tag"
 msgstr[1] "%d Tage"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:387
+#: ../calendar/gui/e-alarm-list.c:390
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d Woche"
 msgstr[1] "%d Wochen"
 
-#: ../calendar/gui/e-alarm-list.c:449
+#: ../calendar/gui/e-alarm-list.c:452
 msgid "Unknown action to be performed"
 msgstr "AuszufÃhrende Aktion unbekannt"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:463
+#: ../calendar/gui/e-alarm-list.c:466
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s vor Terminbeginn"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:468
+#: ../calendar/gui/e-alarm-list.c:471
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s nach Terminbeginn"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:475
+#: ../calendar/gui/e-alarm-list.c:478
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s zum Terminbeginn"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:486
+#: ../calendar/gui/e-alarm-list.c:489
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s vor Terminende"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:491
+#: ../calendar/gui/e-alarm-list.c:494
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s nach Terminende"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:498
+#: ../calendar/gui/e-alarm-list.c:501
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s zum Terminende"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:522
+#: ../calendar/gui/e-alarm-list.c:525
 #, c-format
 msgid "%s at %s"
 msgstr "%s um %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:530
+#: ../calendar/gui/e-alarm-list.c:533
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s fÃr einen unbekannten AuslÃsertyp."
 
-#: ../calendar/gui/e-cal-component-preview.c:188 ../filter/e-filter-rule.c:667
+#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:669
 msgid "Untitled"
 msgstr "Namenlos"
 
-#: ../calendar/gui/e-cal-component-preview.c:194
+#: ../calendar/gui/e-cal-component-preview.c:198
 msgid "Categories:"
 msgstr "Kategorien:"
 
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-component-preview.c:237
 msgid "Summary:"
 msgstr "Zusammenfassung:"
 
-#: ../calendar/gui/e-cal-component-preview.c:243
-#: ../calendar/gui/e-cal-component-preview.c:257
+#: ../calendar/gui/e-cal-component-preview.c:247
+#: ../calendar/gui/e-cal-component-preview.c:261
 msgid "Start Date:"
 msgstr "Anfangsdatum:"
 
-#: ../calendar/gui/e-cal-component-preview.c:271
+#: ../calendar/gui/e-cal-component-preview.c:275
 msgid "Due Date:"
 msgstr "FÃllig am:"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:284
+#: ../calendar/gui/e-cal-component-preview.c:288
 #: ../plugins/itip-formatter/itip-view.c:1076
 msgid "Status:"
 msgstr "Status:"
 
-#: ../calendar/gui/e-cal-component-preview.c:311
+#: ../calendar/gui/e-cal-component-preview.c:315
 msgid "Priority:"
 msgstr "PrioritÃt:"
 
-#: ../calendar/gui/e-cal-component-preview.c:336 ../mail/mail-config.ui.h:36
+#: ../calendar/gui/e-cal-component-preview.c:340 ../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:371
 msgid "Web Page:"
 msgstr "Website:"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 #: ../calendar/gui/e-calendar-table.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Created"
 msgstr "Angelegt"
 
@@ -3850,12 +3919,12 @@ msgid "Start Date"
 msgstr "Anfangsdatum"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:570
+#: ../calendar/gui/e-task-table.c:568
 msgid "Free"
 msgstr "Frei"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:546 ../calendar/gui/e-task-table.c:571
+#: ../calendar/gui/e-meeting-time-sel.c:546 ../calendar/gui/e-task-table.c:569
 msgid "Busy"
 msgstr "BeschÃftigt"
 
@@ -3875,39 +3944,39 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "Keine"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1527
-#: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:187
-#: ../calendar/gui/e-meeting-store.c:1027
+#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1539
+#: ../calendar/gui/e-meeting-list-view.c:201
+#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:188
+#: ../calendar/gui/e-meeting-store.c:1028
 msgid "Yes"
 msgstr "Ja"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1527
-#: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:189
+#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1539
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:190
 msgid "No"
 msgstr "Nein"
 
-#: ../calendar/gui/e-cal-model.c:774 ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:170
-#: ../calendar/gui/e-meeting-store.c:233 ../calendar/gui/print.c:1092
-#: ../calendar/gui/print.c:1109 ../e-util/e-charset.c:52
-#: ../modules/plugin-manager/evolution-plugin-manager.c:98
-#: ../plugins/itip-formatter/itip-formatter.c:457
-#: ../plugins/itip-formatter/itip-formatter.c:2495
+#: ../calendar/gui/e-cal-model.c:776 ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:171
+#: ../calendar/gui/e-meeting-store.c:234 ../calendar/gui/print.c:1098
+#: ../calendar/gui/print.c:1115 ../e-util/e-charset.c:52
+#: ../modules/plugin-manager/evolution-plugin-manager.c:101
+#: ../plugins/itip-formatter/itip-formatter.c:462
+#: ../plugins/itip-formatter/itip-formatter.c:2631
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../calendar/gui/e-cal-model.c:1523
+#: ../calendar/gui/e-cal-model.c:1535
 msgid "Recurring"
 msgstr "Wiederkehrend"
 
-#: ../calendar/gui/e-cal-model.c:1525
+#: ../calendar/gui/e-cal-model.c:1537
 msgid "Assigned"
 msgstr "Zugewiesen"
 
-#: ../calendar/gui/e-cal-model.c:2643
+#: ../calendar/gui/e-cal-model.c:2794
 #, c-format
 msgid "Opening %s"
 msgstr "%s wird geÃffnet â"
@@ -3934,8 +4003,7 @@ msgid "Due date"
 msgstr "FÃllig am"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../calendar/gui/tasktypes.xml.h:20 ../plugins/save-calendar/csv-format.c:381
 msgid "Priority"
 msgstr "PrioritÃt"
 
@@ -3944,95 +4012,97 @@ msgid "Start date"
 msgstr "Anfangsdatum"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:559
+#: ../calendar/gui/e-meeting-list-view.c:573
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:580
+#: ../widgets/misc/e-attachment-tree-view.c:584
 msgid "Type"
 msgstr "Art"
 
-#: ../calendar/gui/e-calendar-view.c:422
+#: ../calendar/gui/e-calendar-view.c:420
 msgid "Cut selected events to the clipboard"
 msgstr "Die gewÃhlten Ereignisse in die Zwischenablage ausschneiden"
 
-#: ../calendar/gui/e-calendar-view.c:428
+#: ../calendar/gui/e-calendar-view.c:426
 msgid "Copy selected events to the clipboard"
 msgstr "Die gewÃhlten Ereignisse in die Zwischenablage kopieren"
 
-#: ../calendar/gui/e-calendar-view.c:434
+#: ../calendar/gui/e-calendar-view.c:432
 msgid "Paste events from the clipboard"
 msgstr "Die in der Zwischenablage befindlichen Ereignisse einfÃgen"
 
-#: ../calendar/gui/e-calendar-view.c:440
+#: ../calendar/gui/e-calendar-view.c:438
 msgid "Delete selected events"
 msgstr "Die gewÃhlten Ereignisse lÃschen"
 
-#: ../calendar/gui/e-calendar-view.c:459 ../calendar/gui/e-memo-table.c:183
-#: ../calendar/gui/e-task-table.c:261
+#: ../calendar/gui/e-calendar-view.c:457 ../calendar/gui/e-memo-table.c:182
+#: ../calendar/gui/e-task-table.c:260
 msgid "Deleting selected objects"
 msgstr "GewÃhlte Objekte werden gelÃscht"
 
-#: ../calendar/gui/e-calendar-view.c:653 ../calendar/gui/e-memo-table.c:855
-#: ../calendar/gui/e-task-table.c:1084
+#: ../calendar/gui/e-calendar-view.c:648 ../calendar/gui/e-memo-table.c:852
+#: ../calendar/gui/e-task-table.c:1082
 msgid "Updating objects"
 msgstr "Objekte werden aktualisiert"
 
-#: ../calendar/gui/e-calendar-view.c:1780
-#: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
-#: ../plugins/itip-formatter/itip-formatter.c:2483
+#: ../calendar/gui/e-calendar-view.c:1778
+#: ../calendar/gui/e-meeting-list-view.c:213
+#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
+#: ../plugins/itip-formatter/itip-formatter.c:2619
 msgid "Accepted"
 msgstr "Angenommen"
 
-#: ../calendar/gui/e-calendar-view.c:1781
-#: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
-#: ../plugins/itip-formatter/itip-formatter.c:2489
+#: ../calendar/gui/e-calendar-view.c:1779
+#: ../calendar/gui/e-meeting-list-view.c:214
+#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
+#: ../plugins/itip-formatter/itip-formatter.c:2625
 msgid "Declined"
 msgstr "Abgelehnt"
 
-#: ../calendar/gui/e-calendar-view.c:1782
-#: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
+#: ../calendar/gui/e-calendar-view.c:1780
+#: ../calendar/gui/e-meeting-list-view.c:215
+#: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
 #: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "Tentative"
 msgstr "VorlÃufig"
 
-#: ../calendar/gui/e-calendar-view.c:1783
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
-#: ../plugins/itip-formatter/itip-formatter.c:2492
+#: ../calendar/gui/e-calendar-view.c:1781
+#: ../calendar/gui/e-meeting-list-view.c:216
+#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
+#: ../plugins/itip-formatter/itip-formatter.c:2628
 msgid "Delegated"
 msgstr "Delegiert"
 
-#: ../calendar/gui/e-calendar-view.c:1784
+#: ../calendar/gui/e-calendar-view.c:1782
 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:1928 ../calendar/gui/e-memo-table.c:538
-#: ../calendar/gui/e-task-table.c:759
+#. To Translators: It will display
+#. * "Organizer: NameOfTheUser <email ofuser com>"
+#: ../calendar/gui/e-calendar-view.c:1926 ../calendar/gui/e-memo-table.c:537
+#: ../calendar/gui/e-task-table.c:758
 #, 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:1932 ../calendar/gui/e-memo-table.c:543
+#. With SunOne accounts, there may be no ':' in
+#. * organizer.value.
+#: ../calendar/gui/e-calendar-view.c:1930 ../calendar/gui/e-memo-table.c:542
 #: ../calendar/gui/e-task-table.c:762
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisator: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1948 ../calendar/gui/print.c:3208
+#: ../calendar/gui/e-calendar-view.c:1946 ../calendar/gui/print.c:3220
 #, c-format
 msgid "Location: %s"
 msgstr "Ort: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1979
+#: ../calendar/gui/e-calendar-view.c:1977
 #, c-format
 msgid "Time: %s %s"
 msgstr "Zeit: %s %s"
@@ -4060,27 +4130,27 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:745
+#: ../calendar/gui/e-day-view-time-item.c:806
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i Minuten-Unterteilungen"
 
-#: ../calendar/gui/e-day-view-time-item.c:766
+#: ../calendar/gui/e-day-view-time-item.c:827
 msgid "Show the second time zone"
 msgstr "Zweite Zeitzone anzeigen"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:783
-#: ../modules/calendar/e-calendar-preferences.ui.h:76
-#: ../modules/calendar/e-calendar-preferences.c:175
-#: ../modules/calendar/e-calendar-preferences.c:224
+#: ../calendar/gui/e-day-view-time-item.c:844
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
+#: ../modules/calendar/e-calendar-preferences.c:179
+#: ../modules/calendar/e-calendar-preferences.c:228
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Keine"
 
-#: ../calendar/gui/e-day-view-time-item.c:810
-#: ../calendar/gui/e-timezone-entry.c:316
-#: ../modules/calendar/e-calendar-preferences.c:251
+#: ../calendar/gui/e-day-view-time-item.c:876
+#: ../calendar/gui/e-timezone-entry.c:319
+#: ../modules/calendar/e-calendar-preferences.c:255
 msgid "Select..."
 msgstr "AuswÃhlen â"
 
@@ -4090,8 +4160,8 @@ msgstr "AuswÃhlen â"
 #. 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:841 ../calendar/gui/e-day-view.c:1793
-#: ../calendar/gui/e-week-view-main-item.c:208 ../calendar/gui/print.c:1866
+#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1793
+#: ../calendar/gui/e-week-view-main-item.c:215 ../calendar/gui/print.c:1875
 msgid "%A %d %B"
 msgstr "%A, %d. %B"
 
@@ -4101,10 +4171,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:845 ../calendar/gui/e-day-view.c:1810
-#: ../calendar/gui/e-week-view-main-item.c:217
-#: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:1005
+#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1810
+#: ../calendar/gui/e-week-view-main-item.c:224
+#: ../calendar/gui/ea-gnome-calendar.c:204
+#: ../modules/calendar/e-cal-shell-view-private.c:1015
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
 
@@ -4113,24 +4183,24 @@ 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:849 ../calendar/gui/e-day-view.c:1826
-#: ../calendar/gui/e-week-view-main-item.c:231
-#: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:1041
+#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1826
+#: ../calendar/gui/e-week-view-main-item.c:238
+#: ../calendar/gui/ea-gnome-calendar.c:234
+#: ../modules/calendar/e-cal-shell-view-private.c:1051
 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:1002 ../calendar/gui/e-week-view.c:757
-#: ../calendar/gui/print.c:920 ../calendar/gui/print.c:939
-#: ../calendar/gui/print.c:2363 ../calendar/gui/print.c:2383
+#: ../calendar/gui/e-day-view.c:1002 ../calendar/gui/e-week-view.c:756
+#: ../calendar/gui/print.c:926 ../calendar/gui/print.c:945
+#: ../calendar/gui/print.c:2372 ../calendar/gui/print.c:2392
 msgid "am"
 msgstr "AM"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1005 ../calendar/gui/e-week-view.c:760
-#: ../calendar/gui/print.c:925 ../calendar/gui/print.c:941
-#: ../calendar/gui/print.c:2368 ../calendar/gui/print.c:2385
+#: ../calendar/gui/e-day-view.c:1005 ../calendar/gui/e-week-view.c:759
+#: ../calendar/gui/print.c:931 ../calendar/gui/print.c:947
+#: ../calendar/gui/print.c:2377 ../calendar/gui/print.c:2394
 msgid "pm"
 msgstr "PM"
 
@@ -4156,87 +4226,95 @@ msgstr "Optionale Teilnehmer"
 msgid "Resources"
 msgstr "Ressourcen"
 
-#: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:127
-#: ../calendar/gui/e-meeting-store.c:1021 ../calendar/gui/print.c:1088
+#: ../calendar/gui/e-meeting-list-view.c:173
+#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
+#: ../calendar/gui/e-meeting-store.c:1022 ../calendar/gui/print.c:1094
 msgid "Individual"
 msgstr "Individuell"
 
-#: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:112 ../calendar/gui/e-meeting-store.c:129
-#: ../calendar/gui/print.c:1089 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/e-meeting-list-view.c:174
+#: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
+#: ../calendar/gui/print.c:1095 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
-#: ../calendar/gui/print.c:1090
+#: ../calendar/gui/e-meeting-list-view.c:175
+#: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
+#: ../calendar/gui/print.c:1096
 msgid "Resource"
 msgstr "Ressource"
 
-#: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
-#: ../calendar/gui/print.c:1091
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:117 ../calendar/gui/e-meeting-store.c:134
+#: ../calendar/gui/print.c:1097
 msgid "Room"
 msgstr "Raum"
 
-#: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:145 ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/print.c:1105
+#: ../calendar/gui/e-meeting-list-view.c:187
+#: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
+#: ../calendar/gui/print.c:1111
 msgid "Chair"
 msgstr "Vorsitzender"
 
-#: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:147 ../calendar/gui/e-meeting-store.c:164
-#: ../calendar/gui/e-meeting-store.c:1024 ../calendar/gui/print.c:1106
+#: ../calendar/gui/e-meeting-list-view.c:188
+#: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
+#: ../calendar/gui/e-meeting-store.c:1025 ../calendar/gui/print.c:1112
 msgid "Required Participant"
 msgstr "BenÃtigter Teilnehmer"
 
-#: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
-#: ../calendar/gui/print.c:1107
+#: ../calendar/gui/e-meeting-list-view.c:189
+#: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
+#: ../calendar/gui/print.c:1113
 msgid "Optional Participant"
 msgstr "Optionaler Teilnehmer"
 
-#: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
-#: ../calendar/gui/print.c:1108
+#: ../calendar/gui/e-meeting-list-view.c:190
+#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:169
+#: ../calendar/gui/print.c:1114
 msgid "Non-Participant"
 msgstr "Nicht-Teilnehmer"
 
-#: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
-#: ../calendar/gui/e-meeting-store.c:1034
+#: ../calendar/gui/e-meeting-list-view.c:212
+#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:1035
 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:539
+#: ../calendar/gui/e-meeting-list-view.c:553
 msgid "Attendee                          "
 msgstr "Teilnehmer"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:584
+#: ../calendar/gui/e-meeting-list-view.c:598
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "UAwg"
 
-#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
+#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/e-meeting-store.c:231
 msgid "In Process"
 msgstr "In Bearbeitung"
 
-#: ../calendar/gui/e-meeting-store.c:1763
+#: ../calendar/gui/e-meeting-store.c:1834
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr ""
 "Geben Sie das Passwort fÃr Benutzer %2$s auf dem Server %1$s ein, um auf "
 "VerfÃgbarkeitsinformationen zuzugreifen"
 
-#: ../calendar/gui/e-meeting-store.c:1772
+#: ../calendar/gui/e-meeting-store.c:1844
 #, c-format
 msgid "Failure reason: %s"
 msgstr "Fehlergrund: %s"
 
+#: ../calendar/gui/e-meeting-store.c:1849
+#: ../plugins/caldav/caldav-browse-server.c:920
+#: ../plugins/google-account-setup/google-source.c:444
+#: ../plugins/publish-calendar/publish-calendar.c:332
+#: ../smime/gui/component.c:49
+msgid "Enter password"
+msgstr "Passwort eingeben"
+
 #. 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:431
@@ -4343,47 +4421,47 @@ msgstr "Sprache"
 msgid "Member"
 msgstr "Mitglied"
 
-#: ../calendar/gui/e-memo-table.c:419
-#: ../modules/calendar/e-cal-shell-content.c:469
-#: ../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
-#: ../plugins/caldav/caldav-browse-server.c:438
+#: ../calendar/gui/e-memo-table.c:418
+#: ../modules/calendar/e-cal-shell-content.c:472
+#: ../modules/calendar/e-memo-shell-view-actions.c:222
+#: ../modules/calendar/e-memo-shell-view-actions.c:237
+#: ../modules/calendar/e-memo-shell-view.c:293
+#: ../plugins/caldav/caldav-browse-server.c:437
 msgid "Memos"
 msgstr "Notizen"
 
-#: ../calendar/gui/e-memo-table.c:500 ../calendar/gui/e-task-table.c:723
+#: ../calendar/gui/e-memo-table.c:499 ../calendar/gui/e-task-table.c:721
 msgid "* No Summary *"
 msgstr "* Keine Zusammenfassung *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:585 ../calendar/gui/e-task-table.c:803
+#: ../calendar/gui/e-memo-table.c:584 ../calendar/gui/e-task-table.c:803
 msgid "Start: "
 msgstr "Anfang:"
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:604 ../calendar/gui/e-task-table.c:821
+#: ../calendar/gui/e-memo-table.c:603 ../calendar/gui/e-task-table.c:821
 msgid "Due: "
 msgstr "FÃlligkeit:"
 
-#: ../calendar/gui/e-memo-table.c:720
+#: ../calendar/gui/e-memo-table.c:717
 msgid "Cut selected memos to the clipboard"
 msgstr "Die gewÃhlten Notizen in die Zwischenablage ausschneiden"
 
-#: ../calendar/gui/e-memo-table.c:726
+#: ../calendar/gui/e-memo-table.c:723
 msgid "Copy selected memos to the clipboard"
 msgstr "Die gewÃhlten Notizen in die Zwischenablage kopieren"
 
-#: ../calendar/gui/e-memo-table.c:732
+#: ../calendar/gui/e-memo-table.c:729
 msgid "Paste memos from the clipboard"
 msgstr "Notiz aus der Zwischenablage einfÃgen"
 
-#: ../calendar/gui/e-memo-table.c:738
-#: ../modules/calendar/e-memo-shell-view-actions.c:572
+#: ../calendar/gui/e-memo-table.c:735
+#: ../modules/calendar/e-memo-shell-view-actions.c:573
 msgid "Delete selected memos"
 msgstr "Die gewÃhlten Notizen lÃschen"
 
-#: ../calendar/gui/e-memo-table.c:744
+#: ../calendar/gui/e-memo-table.c:741
 msgid "Select all visible memos"
 msgstr "Alle sichtbaren Notizen wÃhlen"
 
@@ -4395,112 +4473,109 @@ 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:545
+#: ../calendar/gui/e-task-table.c:543
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:642 ../calendar/gui/print.c:2159
-#: ../calendar/importers/icalendar-importer.c:81
-#: ../calendar/importers/icalendar-importer.c:828
-#: ../modules/calendar/e-cal-shell-content.c:430
-#: ../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:444
-#: ../plugins/caldav/caldav-browse-server.c:436
-#: ../plugins/groupwise-features/camel-gw-listener.c:428
-#: ../plugins/groupwise-features/camel-gw-listener.c:569
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
+#: ../calendar/gui/e-task-table.c:640 ../calendar/gui/print.c:2168
+#: ../calendar/importers/icalendar-importer.c:85
+#: ../calendar/importers/icalendar-importer.c:975
+#: ../modules/calendar/e-cal-shell-content.c:433
+#: ../modules/calendar/e-task-shell-view-actions.c:245
+#: ../modules/calendar/e-task-shell-view-actions.c:260
+#: ../modules/calendar/e-task-shell-view.c:448
+#: ../plugins/caldav/caldav-browse-server.c:435
 msgid "Tasks"
 msgstr "Aufgaben"
 
-#: ../calendar/gui/e-task-table.c:949
+#: ../calendar/gui/e-task-table.c:947
 msgid "Cut selected tasks to the clipboard"
 msgstr "Die gewÃhlten Aufgaben in die Zwischenablage ausschneiden"
 
-#: ../calendar/gui/e-task-table.c:955
+#: ../calendar/gui/e-task-table.c:953
 msgid "Copy selected tasks to the clipboard"
 msgstr "Die gewÃhlten Aufgaben in die Zwischenablage kopieren"
 
-#: ../calendar/gui/e-task-table.c:961
+#: ../calendar/gui/e-task-table.c:959
 msgid "Paste tasks from the clipboard"
 msgstr "Aufgaben aus der Zwischenablage einfÃgen"
 
-#: ../calendar/gui/e-task-table.c:967
-#: ../modules/calendar/e-task-shell-view-actions.c:696
+#: ../calendar/gui/e-task-table.c:965
+#: ../modules/calendar/e-task-shell-view-actions.c:697
 msgid "Delete selected tasks"
 msgstr "Die gewÃhlten Aufgaben lÃschen"
 
-#: ../calendar/gui/e-task-table.c:973
+#: ../calendar/gui/e-task-table.c:971
 msgid "Select all visible tasks"
 msgstr "Alle sichtbaren Aufgaben wÃhlen"
 
-#: ../calendar/gui/e-timezone-entry.c:327
+#: ../calendar/gui/e-timezone-entry.c:330
 msgid "Select Timezone"
 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:225 ../calendar/gui/print.c:1847
+#: ../calendar/gui/e-week-view-main-item.c:232 ../calendar/gui/print.c:1856
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: ../calendar/gui/ea-cal-view-event.c:286
-msgid "It has alarms."
-msgstr "Es enthÃlt Alarme."
+#: ../calendar/gui/ea-cal-view-event.c:290
+msgid "It has reminders."
+msgstr "Es enthÃlt Erinnerungen."
 
-#: ../calendar/gui/ea-cal-view-event.c:289
+#: ../calendar/gui/ea-cal-view-event.c:293
 msgid "It has recurrences."
 msgstr "Es enthÃlt Wiederholungen."
 
-#: ../calendar/gui/ea-cal-view-event.c:292
+#: ../calendar/gui/ea-cal-view-event.c:296
 msgid "It is a meeting."
 msgstr "Es ist eine Besprechung."
 
-#: ../calendar/gui/ea-cal-view-event.c:298
+#: ../calendar/gui/ea-cal-view-event.c:303
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Kalender-Ereignis: Die Zusammenfassung lautet %s."
 
-#: ../calendar/gui/ea-cal-view-event.c:300
+#: ../calendar/gui/ea-cal-view-event.c:306
 msgid "Calendar Event: It has no summary."
 msgstr "Kalender-Ereignis: Keine Zusammenfassung verfÃgbar."
 
-#: ../calendar/gui/ea-cal-view-event.c:322
+#: ../calendar/gui/ea-cal-view-event.c:328
 msgid "calendar view event"
 msgstr "Kalenderansicht Ereignis"
 
-#: ../calendar/gui/ea-cal-view-event.c:551
+#: ../calendar/gui/ea-cal-view-event.c:557
 msgid "Grab Focus"
 msgstr "ErhÃlt Fokus"
 
-#: ../calendar/gui/ea-cal-view.c:300
+#: ../calendar/gui/ea-cal-view.c:303
 msgid "New Appointment"
 msgstr "Neuer Termin"
 
-#: ../calendar/gui/ea-cal-view.c:301
+#: ../calendar/gui/ea-cal-view.c:304
 msgid "New All Day Event"
 msgstr "Neues ganztÃgiges Ereignis"
 
-#: ../calendar/gui/ea-cal-view.c:302
+#: ../calendar/gui/ea-cal-view.c:305
 msgid "New Meeting"
 msgstr "Neue Besprechung"
 
-#: ../calendar/gui/ea-cal-view.c:303
+#: ../calendar/gui/ea-cal-view.c:306
 msgid "Go to Today"
 msgstr "Zum heutigen Tag"
 
-#: ../calendar/gui/ea-cal-view.c:304
+#: ../calendar/gui/ea-cal-view.c:307
 msgid "Go to Date"
 msgstr "Gehe zu Datum"
 
-#: ../calendar/gui/ea-day-view-main-item.c:308
-#: ../calendar/gui/ea-week-view-main-item.c:340
+#: ../calendar/gui/ea-day-view-main-item.c:312
+#: ../calendar/gui/ea-week-view-main-item.c:344
 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:147
+#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:151
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -4509,14 +4584,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:150
+#: ../calendar/gui/ea-day-view.c:156 ../calendar/gui/ea-week-view.c:154
 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:163
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Arbeitswochenansicht: %s. %s"
@@ -4524,163 +4599,106 @@ 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:169
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Tagesansicht: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:200
+#: ../calendar/gui/ea-day-view.c:203
 msgid "calendar view for a work week"
 msgstr "Kalenderansicht fÃr eine Arbeitswoche"
 
-#: ../calendar/gui/ea-day-view.c:202
+#: ../calendar/gui/ea-day-view.c:205
 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:860
+#: ../calendar/gui/ea-gnome-calendar.c:50
+#: ../calendar/gui/ea-gnome-calendar.c:58
+#: ../calendar/importers/icalendar-importer.c:1007
 msgid "Gnome Calendar"
 msgstr "GNOME Calendar"
 
-#: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:1001
+#: ../calendar/gui/ea-gnome-calendar.c:201
+#: ../modules/calendar/e-cal-shell-view-private.c:1011
 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:209
-#: ../modules/calendar/e-cal-shell-view-private.c:1008
-#: ../modules/calendar/e-cal-shell-view-private.c:1014
-#: ../modules/calendar/e-cal-shell-view-private.c:1017
+#: ../calendar/gui/ea-gnome-calendar.c:206
+#: ../calendar/gui/ea-gnome-calendar.c:211
+#: ../calendar/gui/ea-gnome-calendar.c:213
+#: ../modules/calendar/e-cal-shell-view-private.c:1018
+#: ../modules/calendar/e-cal-shell-view-private.c:1024
+#: ../modules/calendar/e-cal-shell-view-private.c:1027
 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:240
-#: ../modules/calendar/e-cal-shell-view-private.c:1034
-#: ../modules/calendar/e-cal-shell-view-private.c:1045
-#: ../modules/calendar/e-cal-shell-view-private.c:1052
+#: ../calendar/gui/ea-gnome-calendar.c:230
+#: ../calendar/gui/ea-gnome-calendar.c:236
+#: ../calendar/gui/ea-gnome-calendar.c:242
+#: ../calendar/gui/ea-gnome-calendar.c:244
+#: ../modules/calendar/e-cal-shell-view-private.c:1044
 #: ../modules/calendar/e-cal-shell-view-private.c:1055
+#: ../modules/calendar/e-cal-shell-view-private.c:1062
+#: ../modules/calendar/e-cal-shell-view-private.c:1065
 msgid "%d %b %Y"
 msgstr "%d. %B %Y"
 
-#: ../calendar/gui/ea-jump-button.c:147
+#: ../calendar/gui/ea-jump-button.c:150
 msgid "Jump button"
 msgstr "Sprungknopf"
 
-#: ../calendar/gui/ea-jump-button.c:156
+#: ../calendar/gui/ea-jump-button.c:159
 msgid "Click here, you can find more events."
 msgstr "Klicken Sie hier, um weitere Ereignisse zu sehen."
 
-#: ../calendar/gui/ea-week-view.c:155
+#: ../calendar/gui/ea-week-view.c:159
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Monatsansicht: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:159
+#: ../calendar/gui/ea-week-view.c:163
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Wochenansicht: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:193
+#: ../calendar/gui/ea-week-view.c:197
 msgid "calendar view for a month"
 msgstr "Kalenderansicht fÃr einen Monat"
 
-#: ../calendar/gui/ea-week-view.c:195
+#: ../calendar/gui/ea-week-view.c:199
 msgid "calendar view for one or more weeks"
 msgstr "Kalenderansicht fÃr eine oder mehrere Wochen"
 
-#: ../calendar/gui/gnome-cal.c:2198
+#: ../calendar/gui/gnome-cal.c:2219
 msgid "Purging"
 msgstr "SÃuberungsvorgang"
 
-#: ../calendar/gui/goto-dialog.ui.h:1
-msgid "April"
-msgstr "April"
-
-#: ../calendar/gui/goto-dialog.ui.h:2
-msgid "August"
-msgstr "August"
-
-#: ../calendar/gui/goto-dialog.ui.h:3
-msgid "December"
-msgstr "Dezember"
-
-#: ../calendar/gui/goto-dialog.ui.h:4
-msgid "February"
-msgstr "Februar"
-
-#: ../calendar/gui/goto-dialog.ui.h:5
-msgid "January"
-msgstr "Januar"
-
-#: ../calendar/gui/goto-dialog.ui.h:6
-msgid "July"
-msgstr "Juli"
-
-#: ../calendar/gui/goto-dialog.ui.h:7
-msgid "June"
-msgstr "Juni"
-
-#: ../calendar/gui/goto-dialog.ui.h:8
-msgid "March"
-msgstr "MÃrz"
-
-#: ../calendar/gui/goto-dialog.ui.h:9
-msgid "May"
-msgstr "Mai"
-
-#: ../calendar/gui/goto-dialog.ui.h:10
-msgid "November"
-msgstr "November"
-
-#: ../calendar/gui/goto-dialog.ui.h:11
-msgid "October"
-msgstr "Oktober"
-
-#: ../calendar/gui/goto-dialog.ui.h:12
-msgid "Select Date"
-msgstr "Datum wÃhlen"
-
-#: ../calendar/gui/goto-dialog.ui.h:13
-#: ../modules/calendar/e-cal-shell-view-actions.c:1318
-msgid "Select _Today"
-msgstr "_Heute wÃhlen"
-
-#: ../calendar/gui/goto-dialog.ui.h:14
-msgid "September"
-msgstr "September"
-
-#: ../calendar/gui/itip-utils.c:422 ../calendar/gui/itip-utils.c:477
-#: ../calendar/gui/itip-utils.c:573
+#: ../calendar/gui/itip-utils.c:503 ../calendar/gui/itip-utils.c:558
+#: ../calendar/gui/itip-utils.c:661
 msgid "An organizer must be set."
 msgstr "Es muss ein Organisator festgelegt werden."
 
-#: ../calendar/gui/itip-utils.c:469
+#: ../calendar/gui/itip-utils.c:550
 msgid "At least one attendee is necessary"
 msgstr "Es ist mindestens ein Teilnehmer erforderlich"
 
-#: ../calendar/gui/itip-utils.c:657 ../calendar/gui/itip-utils.c:811
+#: ../calendar/gui/itip-utils.c:747 ../calendar/gui/itip-utils.c:908
 msgid "Event information"
 msgstr "Ereignisinformationen"
 
-#: ../calendar/gui/itip-utils.c:660 ../calendar/gui/itip-utils.c:814
+#: ../calendar/gui/itip-utils.c:750 ../calendar/gui/itip-utils.c:911
 msgid "Task information"
 msgstr "Aufgabeninformationen"
 
-#: ../calendar/gui/itip-utils.c:663 ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:753 ../calendar/gui/itip-utils.c:914
 msgid "Memo information"
 msgstr "Notiz-Informationen"
 
-#: ../calendar/gui/itip-utils.c:666 ../calendar/gui/itip-utils.c:835
+#: ../calendar/gui/itip-utils.c:756 ../calendar/gui/itip-utils.c:932
 msgid "Free/Busy information"
 msgstr "VerfÃgbarkeitsinformationen"
 
-#: ../calendar/gui/itip-utils.c:669
+#: ../calendar/gui/itip-utils.c:759
 msgid "Calendar information"
 msgstr "Kalenderinformationen"
 
@@ -4688,7 +4706,7 @@ msgstr "Kalenderinformationen"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:706
+#: ../calendar/gui/itip-utils.c:796
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Angenommen"
@@ -4697,7 +4715,7 @@ msgstr "Angenommen"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:713
+#: ../calendar/gui/itip-utils.c:803
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "VorlÃufig angenommen"
@@ -4709,7 +4727,7 @@ msgstr "VorlÃufig angenommen"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:720 ../calendar/gui/itip-utils.c:768
+#: ../calendar/gui/itip-utils.c:810 ../calendar/gui/itip-utils.c:858
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Abgelehnt"
@@ -4718,7 +4736,7 @@ msgstr "Abgelehnt"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:727
+#: ../calendar/gui/itip-utils.c:817
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegiert"
@@ -4726,7 +4744,7 @@ msgstr "Delegiert"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:740
+#: ../calendar/gui/itip-utils.c:830
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Aktualisiert"
@@ -4734,7 +4752,7 @@ msgstr "Aktualisiert"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:837
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Abgesagt"
@@ -4742,7 +4760,7 @@ msgstr "Abgesagt"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:754
+#: ../calendar/gui/itip-utils.c:844
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Aktualisieren"
@@ -4751,254 +4769,254 @@ msgstr "Aktualisieren"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:761
+#: ../calendar/gui/itip-utils.c:851
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Gegenvorschlag"
 
-#: ../calendar/gui/itip-utils.c:832
+#: ../calendar/gui/itip-utils.c:929
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "VerfÃgbarkeitsinformationen (%s bis %s)"
 
-#: ../calendar/gui/itip-utils.c:840
+#: ../calendar/gui/itip-utils.c:937
 msgid "iCalendar information"
 msgstr "iCalendar-Informationen"
 
-#: ../calendar/gui/itip-utils.c:865
+#: ../calendar/gui/itip-utils.c:962
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
-"Eine Ressource kann nicht belegt werden, das neue Ereignis Ãberschneidet "
-"sich mit anderen."
+"Eine Ressource kann nicht belegt werden, das neue Ereignis Ãberschneidet sich "
+"mit anderen."
 
-#: ../calendar/gui/itip-utils.c:869
+#: ../calendar/gui/itip-utils.c:966
 msgid "Unable to book a resource, error: "
 msgstr "Eine Ressource kann nicht belegt werden, Fehler:"
 
-#: ../calendar/gui/itip-utils.c:1032
+#: ../calendar/gui/itip-utils.c:1127
 msgid "You must be an attendee of the event."
 msgstr "Sie mÃssen ein Teilnehmer des Ereignisses sein."
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:548
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:548
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:548
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:548
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:548
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:549
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:549
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:549
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:549
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:549
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:550
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:550
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:550
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:550
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:550
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:551
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:551
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:551
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:551
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:551
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:552
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:552
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:552
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:552
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:552
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:554
+#: ../calendar/gui/print.c:553
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:554
+#: ../calendar/gui/print.c:553
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:554
+#: ../calendar/gui/print.c:553
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:554
+#: ../calendar/gui/print.c:553
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:554
+#: ../calendar/gui/print.c:553
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:555
+#: ../calendar/gui/print.c:554
 msgid "31st"
 msgstr "31."
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:612
+#: ../calendar/gui/print.c:611
 msgid "Su"
 msgstr "So"
 
-#: ../calendar/gui/print.c:612
+#: ../calendar/gui/print.c:611
 msgid "Mo"
 msgstr "Mo"
 
-#: ../calendar/gui/print.c:612
+#: ../calendar/gui/print.c:611
 msgid "Tu"
 msgstr "Di"
 
-#: ../calendar/gui/print.c:612
+#: ../calendar/gui/print.c:611
 msgid "We"
 msgstr "Mi"
 
-#: ../calendar/gui/print.c:613
+#: ../calendar/gui/print.c:612
 msgid "Th"
 msgstr "Do"
 
-#: ../calendar/gui/print.c:613
+#: ../calendar/gui/print.c:612
 msgid "Fr"
 msgstr "Fr"
 
-#: ../calendar/gui/print.c:613
+#: ../calendar/gui/print.c:612
 msgid "Sa"
 msgstr "Sa"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3001
+#: ../calendar/gui/print.c:3013
 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:3011
+#: ../calendar/gui/print.c:3023
 msgid " (Completed "
 msgstr " (Abgeschlossen "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3017
+#: ../calendar/gui/print.c:3029
 msgid "Completed "
 msgstr "Abgeschlossen "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3027
+#: ../calendar/gui/print.c:3039
 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:3034
+#: ../calendar/gui/print.c:3046
 msgid "Due "
 msgstr "FÃllig am "
 
-#: ../calendar/gui/print.c:3199
+#: ../calendar/gui/print.c:3211
 #, c-format
 msgid "Summary: %s"
 msgstr "Zusammenfassung: %s"
 
-#: ../calendar/gui/print.c:3226
+#: ../calendar/gui/print.c:3238
 msgid "Attendees: "
 msgstr "Teilnehmer: "
 
-#: ../calendar/gui/print.c:3269
+#: ../calendar/gui/print.c:3281
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:3284
+#: ../calendar/gui/print.c:3296
 #, c-format
 msgid "Priority: %s"
 msgstr "PrioritÃt: %s"
 
-#: ../calendar/gui/print.c:3302
+#: ../calendar/gui/print.c:3314
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prozent abgeschlossen: %i"
 
-#: ../calendar/gui/print.c:3313
+#: ../calendar/gui/print.c:3325
 #, c-format
 msgid "URL: %s"
 msgstr "Adresse: %s"
 
-#: ../calendar/gui/print.c:3326
+#: ../calendar/gui/print.c:3338
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorien: %s"
 
-#: ../calendar/gui/print.c:3337
+#: ../calendar/gui/print.c:3349
 msgid "Contacts: "
 msgstr "Kontakte: "
 
@@ -5007,6 +5025,10 @@ 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"
@@ -5019,185 +5041,185 @@ msgstr "ist grÃÃer als"
 msgid "is less than"
 msgstr "ist kleiner als"
 
-#: ../calendar/importers/icalendar-importer.c:80
+#: ../calendar/importers/icalendar-importer.c:84
 msgid "Appointments and Meetings"
 msgstr "Termine und Besprechungen"
 
-#: ../calendar/importers/icalendar-importer.c:350
-#: ../calendar/importers/icalendar-importer.c:707
-#: ../plugins/itip-formatter/itip-formatter.c:1968
+#: ../calendar/importers/icalendar-importer.c:411
+#: ../calendar/importers/icalendar-importer.c:821
+#: ../plugins/itip-formatter/itip-formatter.c:2108
 msgid "Opening calendar"
 msgstr "Kalender wird geÃffnet"
 
-#: ../calendar/importers/icalendar-importer.c:493
+#: ../calendar/importers/icalendar-importer.c:551
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar-Dateien (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:494
+#: ../calendar/importers/icalendar-importer.c:552
 msgid "Evolution iCalendar importer"
 msgstr "Evolution-iCalendar-Importeur"
 
-#: ../calendar/importers/icalendar-importer.c:582
+#: ../calendar/importers/icalendar-importer.c:640
 msgid "Reminder!"
 msgstr "Erinnerung!"
 
-#: ../calendar/importers/icalendar-importer.c:662
+#: ../calendar/importers/icalendar-importer.c:720
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar-Dateien (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:663
+#: ../calendar/importers/icalendar-importer.c:721
 msgid "Evolution vCalendar importer"
 msgstr "Evolution-vCalendar-Importeur"
 
-#: ../calendar/importers/icalendar-importer.c:823
+#: ../calendar/importers/icalendar-importer.c:970
 msgid "Calendar Events"
 msgstr "Kalender-Ereignisse"
 
-#: ../calendar/importers/icalendar-importer.c:861
+#: ../calendar/importers/icalendar-importer.c:1008
 msgid "Evolution Calendar intelligent importer"
 msgstr "Intelligenter Evolution-Kalender-Importeur"
 
-#: ../calendar/importers/icalendar-importer.c:926
-#: ../calendar/importers/icalendar-importer.c:1243
+#: ../calendar/importers/icalendar-importer.c:1073
+#: ../calendar/importers/icalendar-importer.c:1390
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Besprechung"
 
-#: ../calendar/importers/icalendar-importer.c:926
-#: ../calendar/importers/icalendar-importer.c:1243
+#: ../calendar/importers/icalendar-importer.c:1073
+#: ../calendar/importers/icalendar-importer.c:1390
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Ereignis"
 
-#: ../calendar/importers/icalendar-importer.c:929
-#: ../calendar/importers/icalendar-importer.c:1244
+#: ../calendar/importers/icalendar-importer.c:1076
+#: ../calendar/importers/icalendar-importer.c:1391
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Aufgabe"
 
-#: ../calendar/importers/icalendar-importer.c:932
-#: ../calendar/importers/icalendar-importer.c:1245
+#: ../calendar/importers/icalendar-importer.c:1079
+#: ../calendar/importers/icalendar-importer.c:1392
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Notiz"
 
-#: ../calendar/importers/icalendar-importer.c:941
+#: ../calendar/importers/icalendar-importer.c:1088
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "enthÃlt Wiederholungen"
 
-#: ../calendar/importers/icalendar-importer.c:946
+#: ../calendar/importers/icalendar-importer.c:1093
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "ist eine Instanz"
 
-#: ../calendar/importers/icalendar-importer.c:951
+#: ../calendar/importers/icalendar-importer.c:1098
 msgctxt "iCalImp"
-msgid "has alarms"
-msgstr "enthÃlt Alarme"
+msgid "has reminders"
+msgstr "enthÃlt Erinnerungen"
 
-#: ../calendar/importers/icalendar-importer.c:956
+#: ../calendar/importers/icalendar-importer.c:1103
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "enthÃlt Anlagen"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:969
+#: ../calendar/importers/icalendar-importer.c:1116
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Ãffentlich"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:972
+#: ../calendar/importers/icalendar-importer.c:1119
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Privat"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:975
+#: ../calendar/importers/icalendar-importer.c:1122
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Vertraulich"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:979
+#: ../calendar/importers/icalendar-importer.c:1126
 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
+#: ../calendar/importers/icalendar-importer.c:1131
+#: ../calendar/importers/icalendar-importer.c:1431
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Zusammenfassung"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:990
+#: ../calendar/importers/icalendar-importer.c:1137
 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
+#: ../calendar/importers/icalendar-importer.c:1145
+#: ../calendar/importers/icalendar-importer.c:1427
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Anfang"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1009
+#: ../calendar/importers/icalendar-importer.c:1156
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "FÃllig"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1021
+#: ../calendar/importers/icalendar-importer.c:1168
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Ende"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1031
+#: ../calendar/importers/icalendar-importer.c:1178
 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
+#: ../calendar/importers/icalendar-importer.c:1202
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Abgeschlossen"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1063
+#: ../calendar/importers/icalendar-importer.c:1210
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "Adresse"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1074
-#: ../calendar/importers/icalendar-importer.c:1077
+#: ../calendar/importers/icalendar-importer.c:1221
+#: ../calendar/importers/icalendar-importer.c:1224
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Organisator"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1097
-#: ../calendar/importers/icalendar-importer.c:1100
+#: ../calendar/importers/icalendar-importer.c:1244
+#: ../calendar/importers/icalendar-importer.c:1247
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Teilnehmer"
 
-#: ../calendar/importers/icalendar-importer.c:1114
+#: ../calendar/importers/icalendar-importer.c:1261
 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
+#: ../calendar/importers/icalendar-importer.c:1423
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Art"
@@ -6751,173 +6773,168 @@ msgstr "Pazifik/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pazifik/Yap"
 
-#: ../composer/e-composer-actions.c:204
+#: ../composer/e-composer-actions.c:208
 msgid "Save as..."
 msgstr "Speichern unter â"
 
-#: ../composer/e-composer-actions.c:287
-#: ../widgets/misc/e-attachment-view.c:377
-msgid "Attach a file"
-msgstr "Eine Datei beilegen"
-
-#: ../composer/e-composer-actions.c:292
-#: ../widgets/misc/e-signature-editor.c:203
+#: ../composer/e-composer-actions.c:296
+#: ../widgets/misc/e-signature-editor.c:207
 msgid "_Close"
 msgstr "S_chlieÃen"
 
-#: ../composer/e-composer-actions.c:294
+#: ../composer/e-composer-actions.c:298
 msgid "Close the current file"
 msgstr "Die momentan geÃffnete Datei schlieÃen"
 
-#: ../composer/e-composer-actions.c:299
+#: ../composer/e-composer-actions.c:303
 msgid "New _Message"
 msgstr "Neue _Nachricht"
 
-#: ../composer/e-composer-actions.c:301
+#: ../composer/e-composer-actions.c:305
 msgid "Open New Message window"
 msgstr "Neues Nachrichtenfenster Ãffnen"
 
-#: ../composer/e-composer-actions.c:308 ../shell/e-shell-window-actions.c:1489
+#: ../composer/e-composer-actions.c:312 ../shell/e-shell-window-actions.c:1537
 msgid "Configure Evolution"
 msgstr "Evolution konfigurieren"
 
-#: ../composer/e-composer-actions.c:315
+#: ../composer/e-composer-actions.c:319
 msgid "Save the current file"
 msgstr "Die momentan geÃffnete Datei speichern"
 
-#: ../composer/e-composer-actions.c:320
+#: ../composer/e-composer-actions.c:324
 msgid "Save _As..."
 msgstr "Speichern _unter â"
 
-#: ../composer/e-composer-actions.c:322
+#: ../composer/e-composer-actions.c:326
 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:329
+#: ../composer/e-composer-actions.c:333
 msgid "Character _Encoding"
 msgstr "Zeichen_kodierung"
 
-#: ../composer/e-composer-actions.c:346
+#: ../composer/e-composer-actions.c:350
 msgid "_Print..."
 msgstr "_Drucken â"
 
-#: ../composer/e-composer-actions.c:353
+#: ../composer/e-composer-actions.c:357
 msgid "Print Pre_view"
 msgstr "Druck_vorschau"
 
-#: ../composer/e-composer-actions.c:360
+#: ../composer/e-composer-actions.c:364
 msgid "Save as _Draft"
 msgstr "Als _Entwurf speichern"
 
-#: ../composer/e-composer-actions.c:362
+#: ../composer/e-composer-actions.c:366
 msgid "Save as draft"
 msgstr "Als Entwurf speichern"
 
-#: ../composer/e-composer-actions.c:367 ../composer/e-composer-private.c:347
+#: ../composer/e-composer-actions.c:371 ../composer/e-composer-private.c:352
 msgid "S_end"
 msgstr "A_bschicken"
 
-#: ../composer/e-composer-actions.c:369
+#: ../composer/e-composer-actions.c:373
 msgid "Send this message"
 msgstr "Diese Nachricht verschicken"
 
-#: ../composer/e-composer-actions.c:377
+#: ../composer/e-composer-actions.c:381
 msgid "PGP _Encrypt"
 msgstr "Mit P_GP verschlÃsseln"
 
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:383
 msgid "Encrypt this message with PGP"
 msgstr "Diese Nachricht mit PGP verschlÃsseln"
 
-#: ../composer/e-composer-actions.c:385
+#: ../composer/e-composer-actions.c:389
 msgid "PGP _Sign"
 msgstr "Mit _PGP signieren"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:391
 msgid "Sign this message with your PGP key"
 msgstr "Diese Nachricht mit PGP signieren"
 
-#: ../composer/e-composer-actions.c:393
+#: ../composer/e-composer-actions.c:397
 msgid "_Picture Gallery"
 msgstr "_Bildersammlung"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:399
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr ""
 "Eine Bildersammlung anzeigen, die in Ihrer Nachricht abgelegt werden kann"
 
-#: ../composer/e-composer-actions.c:401
+#: ../composer/e-composer-actions.c:405
 msgid "_Prioritize Message"
 msgstr "Nachricht _priorisieren"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:407
 msgid "Set the message priority to high"
 msgstr "Die PrioritÃt der Nachricht auf hoch setzen"
 
-#: ../composer/e-composer-actions.c:409
+#: ../composer/e-composer-actions.c:413
 msgid "Re_quest Read Receipt"
 msgstr "_LesebestÃtigung anfordern"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:415
 msgid "Get delivery notification when your message is read"
 msgstr ""
 "Eine ZustellungsbestÃtigung erhalten, sobald Ihre Nachricht gelesen wurde"
 
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:421
 msgid "S/MIME En_crypt"
 msgstr "Mit S/_MIME verschlÃsseln"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:423
 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:425
+#: ../composer/e-composer-actions.c:429
 msgid "S/MIME Sig_n"
 msgstr "Mit _S/MIME signieren"
 
-#: ../composer/e-composer-actions.c:427
+#: ../composer/e-composer-actions.c:431
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Diese Nachricht mit Ihrem S/MIME-Signaturzertifikat signieren"
 
-#: ../composer/e-composer-actions.c:433
+#: ../composer/e-composer-actions.c:437
 msgid "_Bcc Field"
 msgstr "_Blindkopie-Feld"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:439
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Blindkopie-Feld anzeigen/verbergen"
 
-#: ../composer/e-composer-actions.c:441
+#: ../composer/e-composer-actions.c:445
 msgid "_Cc Field"
 msgstr "_Kopie-Feld"
 
-#: ../composer/e-composer-actions.c:443
+#: ../composer/e-composer-actions.c:447
 msgid "Toggles whether the CC field is displayed"
 msgstr "Kopie-Feld anzeigen/verbergen"
 
-#: ../composer/e-composer-actions.c:449
+#: ../composer/e-composer-actions.c:453
 msgid "_Reply-To Field"
 msgstr "An_twort-an-Feld"
 
-#: ../composer/e-composer-actions.c:451
+#: ../composer/e-composer-actions.c:455
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Antwort-an-Feld anzeigen/verbergen"
 
-#: ../composer/e-composer-actions.c:510
+#: ../composer/e-composer-actions.c:514
 msgid "Save Draft"
 msgstr "Entwurf speichern"
 
-#: ../composer/e-composer-header-table.c:36
+#: ../composer/e-composer-header-table.c:40
 msgid "Enter the recipients of the message"
 msgstr "Geben Sie die EmpfÃnger der Nachricht ein"
 
-#: ../composer/e-composer-header-table.c:38
+#: ../composer/e-composer-header-table.c:42
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 "Geben Sie die Adressen ein, die eine Kopie der Nachricht erhalten sollen"
 
-#: ../composer/e-composer-header-table.c:41
+#: ../composer/e-composer-header-table.c:45
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -6925,67 +6942,67 @@ msgstr ""
 "Geben Sie die Adressen ein, die eine Kopie erhalten, jedoch nicht in der "
 "EmpfÃngerliste auftauchen sollen"
 
-#: ../composer/e-composer-header-table.c:1004
+#: ../composer/e-composer-header-table.c:1020
 msgid "Fr_om:"
 msgstr "V_on:"
 
-#: ../composer/e-composer-header-table.c:1013
+#: ../composer/e-composer-header-table.c:1029
 msgid "_Reply-To:"
 msgstr "Antwo_rt an:"
 
-#: ../composer/e-composer-header-table.c:1017
+#: ../composer/e-composer-header-table.c:1033
 msgid "_To:"
 msgstr "A_n:"
 
-#: ../composer/e-composer-header-table.c:1022
+#: ../composer/e-composer-header-table.c:1038
 msgid "_Cc:"
 msgstr "_Kopie an:"
 
-#: ../composer/e-composer-header-table.c:1027
+#: ../composer/e-composer-header-table.c:1043
 msgid "_Bcc:"
 msgstr "Blindko_pie an:"
 
-#: ../composer/e-composer-header-table.c:1032
+#: ../composer/e-composer-header-table.c:1048
 msgid "_Post To:"
 msgstr "_VerÃffentlichen in:"
 
-#: ../composer/e-composer-header-table.c:1036
+#: ../composer/e-composer-header-table.c:1052
 msgid "S_ubject:"
 msgstr "Be_treff:"
 
-#: ../composer/e-composer-header-table.c:1045
+#: ../composer/e-composer-header-table.c:1061
 msgid "Si_gnature:"
 msgstr "Si_gnatur:"
 
-#: ../composer/e-composer-name-header.c:137
+#: ../composer/e-composer-name-header.c:141
 msgid "Click here for the address book"
 msgstr "Klicken Sie hier, um das Adressbuch zu Ãffnen"
 
-#: ../composer/e-composer-post-header.c:127
+#: ../composer/e-composer-post-header.c:131
 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:245
+#: ../composer/e-composer-private.c:249
 msgid "Undo the last action"
 msgstr "Die letzte Aktion rÃckgÃngig machen"
 
-#: ../composer/e-composer-private.c:249
+#: ../composer/e-composer-private.c:253
 msgid "Redo the last undone action"
 msgstr "Die zuletzt rÃckgÃngig gemachte Aktion wiederholen"
 
-#: ../composer/e-composer-private.c:253
+#: ../composer/e-composer-private.c:257
 msgid "Search for text"
 msgstr "Nach Text suchen"
 
-#: ../composer/e-composer-private.c:257
+#: ../composer/e-composer-private.c:261
 msgid "Search for and replace text"
 msgstr "Nach Text suchen und diesen ersetzen"
 
-#: ../composer/e-composer-private.c:367
+#: ../composer/e-composer-private.c:372
 msgid "Save draft"
 msgstr "Entwurf speichern"
 
-#: ../composer/e-msg-composer.c:798
+#: ../composer/e-msg-composer.c:808
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -6993,7 +7010,7 @@ msgstr ""
 "Ausgehende Nachricht konnte nicht signiert werden: Kein Signaturzertifikat "
 "fÃr dieses Konto festgelegt"
 
-#: ../composer/e-msg-composer.c:807
+#: ../composer/e-msg-composer.c:817
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -7002,17 +7019,17 @@ msgstr ""
 "Ausgehende Nachricht konnte nicht verschlÃsselt werden: Kein "
 "VerschlÃsselungszertifikat fÃr dieses Konto festgelegt"
 
-#: ../composer/e-msg-composer.c:1673 ../composer/e-msg-composer.c:2057
+#: ../composer/e-msg-composer.c:1691 ../composer/e-msg-composer.c:2075
 msgid "Compose Message"
 msgstr "Nachricht verfassen"
 
-#: ../composer/e-msg-composer.c:4115
+#: ../composer/e-msg-composer.c:4155
 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:4820
+#: ../composer/e-msg-composer.c:4860
 msgid "Untitled Message"
 msgstr "Namenlose Nachricht"
 
@@ -7022,8 +7039,8 @@ msgid ""
 "the mail to be sent without those pending attachments "
 msgstr ""
 "Einige Anlagen werden zurzeit noch heruntergeladen. Das Speichern dieser "
-"Nachricht wird zur Folge haben, dass die Nachricht ohne die noch "
-"ausstehenden Anlagen gespeichert wird."
+"Nachricht wird zur Folge haben, dass die Nachricht ohne die noch ausstehenden "
+"Anlagen gespeichert wird."
 
 #: ../composer/mail-composer.error.xml.h:2
 msgid "All accounts have been removed."
@@ -7047,8 +7064,7 @@ msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:6
 msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
+"Are you sure you want to discard the message, titled '{0}', you are composing?"
 msgstr ""
 "Sind Sie sicher, dass Sie die soeben verfasste Nachricht namens Â{0}Â "
 "verwerfen wollen?"
@@ -7074,8 +7090,8 @@ msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:10
 msgid ""
-"Closing this composer window will discard the message permanently, unless "
-"you choose to save the message in your Drafts folder. This will allow you to "
+"Closing this composer window will discard the message permanently, unless you "
+"choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
 "Wenn Sie dieses Editorfenster schlieÃen, wird die Nachricht dauerhaft "
@@ -7132,7 +7148,7 @@ msgstr ""
 "Die Datei Â{0}Â ist keine gewÃhnliche Datei und kann daher nicht in einer "
 "Nachricht verschickt werden."
 
-#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:117
+#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:123
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "Die Fehlermeldung war Â{0}Â."
 
@@ -7188,27 +7204,15 @@ msgstr "Im Nachrichtenausgang _speichern"
 msgid "_Try Again"
 msgstr "Erneut _versuchen"
 
-#: ../capplet/anjal-settings-main.c:216
-msgid "Run Anjal in a window"
-msgstr "Anjal in einem Fenster ausfÃhren"
-
-#: ../capplet/anjal-settings-main.c:217
-msgid "Make Anjal the default email client"
-msgstr "Anjal als vorgegebenes E-Mail-Programm festlegen"
-
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:224
+#: ../capplet/anjal-settings-main.c:153
 msgid "ID of the socket to embed in"
 msgstr "Kennung des Sockets zur Einbettung"
 
-#: ../capplet/anjal-settings-main.c:225
+#: ../capplet/anjal-settings-main.c:154
 msgid "socket"
 msgstr "socket"
 
-#: ../capplet/anjal-settings-main.c:238
-msgid "Anjal email client"
-msgstr "Anjal E-Mail-Programm"
-
 #: ../capplet/settings/mail-account-view.c:77
 msgid "Please enter your full name."
 msgstr "Bitte geben Sie Ihre vollstÃndigen Namen ein."
@@ -7226,75 +7230,76 @@ msgid "Please enter your password."
 msgstr "Bitte geben Sie Ihr Passwort ein."
 
 #: ../capplet/settings/mail-account-view.c:259
-#: ../plugins/caldav/caldav-source.c:66
+#: ../plugins/caldav/caldav-source.c:68
 msgid "CalDAV"
 msgstr "CalDAV"
 
 #: ../capplet/settings/mail-account-view.c:361
 #: ../capplet/settings/mail-account-view.c:413
-#: ../plugins/google-account-setup/google-contacts-source.c:53
-#: ../plugins/google-account-setup/google-source.c:81
+#: ../modules/online-accounts/e-online-accounts-google.c:285
+#: ../modules/online-accounts/e-online-accounts-google.c:357
+#: ../plugins/google-account-setup/google-contacts-source.c:55
+#: ../plugins/google-account-setup/google-source.c:83
 msgid "Google"
 msgstr "Google"
 
-#: ../capplet/settings/mail-account-view.c:463
+#: ../capplet/settings/mail-account-view.c:483
 msgid "Personal details:"
 msgstr "PersÃnliche Angaben:"
 
-#: ../capplet/settings/mail-account-view.c:470
+#: ../capplet/settings/mail-account-view.c:490
 msgid "Name:"
 msgstr "Name:"
 
-#: ../capplet/settings/mail-account-view.c:479
+#: ../capplet/settings/mail-account-view.c:499
 msgid "Email address:"
 msgstr "E-Mail-Adresse:"
 
-#: ../capplet/settings/mail-account-view.c:489
+#: ../capplet/settings/mail-account-view.c:509
 msgid "Details:"
 msgstr "Details:"
 
-#: ../capplet/settings/mail-account-view.c:497
+#: ../capplet/settings/mail-account-view.c:517
 msgid "Receiving"
 msgstr "Abrufen lÃuft"
 
-#: ../capplet/settings/mail-account-view.c:504
+#: ../capplet/settings/mail-account-view.c:524
 msgid "Server type:"
 msgstr "Servertyp:"
 
-#: ../capplet/settings/mail-account-view.c:513
+#: ../capplet/settings/mail-account-view.c:533
 msgid "Server address:"
 msgstr "Serveradresse:"
 
-#: ../capplet/settings/mail-account-view.c:522
+#: ../capplet/settings/mail-account-view.c:542
 msgid "Username:"
 msgstr "Benutzername:"
 
-#: ../capplet/settings/mail-account-view.c:531
+#: ../capplet/settings/mail-account-view.c:551
 msgid "Use encryption:"
 msgstr "VerschlÃsselung benutzen:"
 
-#: ../capplet/settings/mail-account-view.c:536
-#: ../capplet/settings/mail-account-view.c:571
+#: ../capplet/settings/mail-account-view.c:556
+#: ../capplet/settings/mail-account-view.c:591
 msgid "never"
 msgstr "Nie"
 
-#: ../capplet/settings/mail-account-view.c:548
+#: ../capplet/settings/mail-account-view.c:568
 msgid "Sending"
 msgstr "Verschicken lÃuft"
 
-#: ../capplet/settings/mail-account-view.c:590
+#: ../capplet/settings/mail-account-view.c:610
 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 we can't do it automatically you'll need your server details as well."
+"address and password in below and we'll try and work out all the settings. If "
+"we can't do it automatically you'll need your server details as well."
 msgstr ""
 "Um die E-Mail-Anwendung nutzen zu kÃnnen, mÃssen Sie ein Konto einrichten. "
 "Geben Sie Ihre E-Mail-Adresse und Ihr Passwort unten ein. Es wird dann "
 "versucht, die entsprechenden Einstellungen automatisch vorzunehmen. Falls "
-"dies nicht mÃglich sein sollte, werden Sie Ihre Servereinstellungen "
-"benÃtigen."
+"dies nicht mÃglich sein sollte, werden Sie Ihre Servereinstellungen benÃtigen."
 
-#: ../capplet/settings/mail-account-view.c:592
+#: ../capplet/settings/mail-account-view.c:612
 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 "
@@ -7305,12 +7310,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:594
+#: ../capplet/settings/mail-account-view.c:614
 msgid "You can specify more options to configure the account."
-msgstr ""
-"Sie dÃrfen bei der Konfiguration Ihres Kontos weitere Optionen angeben."
+msgstr "Sie dÃrfen bei der Konfiguration Ihres Kontos weitere Optionen angeben."
 
-#: ../capplet/settings/mail-account-view.c:596
+#: ../capplet/settings/mail-account-view.c:616
 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."
@@ -7319,11 +7323,11 @@ msgstr ""
 "wird versucht, einige Einstellungen bereits vorauszuwÃhlen, jedoch sollten "
 "Sie diese sicherheitshalber ÃberprÃfen."
 
-#: ../capplet/settings/mail-account-view.c:597
+#: ../capplet/settings/mail-account-view.c:617
 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:598
+#: ../capplet/settings/mail-account-view.c:618
 msgid ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
@@ -7331,100 +7335,99 @@ 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:613
-#: ../mail/em-account-editor.c:2111 ../mail/em-account-editor.c:2232
+#: ../capplet/settings/mail-account-view.c:633 ../mail/em-account-editor.c:2182
+#: ../mail/em-account-editor.c:2315
 msgid "Identity"
 msgstr "IdentitÃt"
 
-#: ../capplet/settings/mail-account-view.c:613
+#: ../capplet/settings/mail-account-view.c:633
 msgid "Next - Receiving mail"
 msgstr "Weiter - Abrufen von E-Mails"
 
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Receiving mail"
 msgstr "Abrufen von E-Mails"
 
-#: ../capplet/settings/mail-account-view.c:614
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:635
 msgid "Next - Sending mail"
 msgstr "Weiter - Verschicken von E-Mails"
 
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Back - Identity"
 msgstr "ZurÃck - IdentitÃt"
 
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Next - Receiving options"
 msgstr "Weiter - Empfangsoptionen"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:635
 msgid "Receiving options"
 msgstr "Empfangsoptionen"
 
-#: ../capplet/settings/mail-account-view.c:615
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:635
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Back - Receiving mail"
 msgstr "ZurÃck - Abrufen von E-Mails"
 
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Sending mail"
 msgstr "Abrufen von E-Mails"
 
-#: ../capplet/settings/mail-account-view.c:617
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:637
+#: ../capplet/settings/mail-account-view.c:638
 msgid "Next - Review account"
 msgstr "Weiter - Konto ÃberprÃfen"
 
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Next - Defaults"
 msgstr "Weiter - Vorgaben"
 
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Back - Receiving options"
 msgstr "ZurÃck - Empfangsoptionen"
 
-#: ../capplet/settings/mail-account-view.c:618
-#: ../mail/em-account-editor.c:3063
+#: ../capplet/settings/mail-account-view.c:638 ../mail/em-account-editor.c:3290
 msgid "Defaults"
 msgstr "Vorgaben"
 
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:638
 msgid "Back - Sending mail"
 msgstr "ZurÃck - Verschicken von E-Mails"
 
-#: ../capplet/settings/mail-account-view.c:620
+#: ../capplet/settings/mail-account-view.c:640
 msgid "Review account"
 msgstr "Konto ÃberprÃfen"
 
-#: ../capplet/settings/mail-account-view.c:620
+#: ../capplet/settings/mail-account-view.c:640
 msgid "Finish"
 msgstr "Beenden"
 
-#: ../capplet/settings/mail-account-view.c:620
+#: ../capplet/settings/mail-account-view.c:640
 msgid "Back - Sending"
 msgstr "ZurÃck - Senden"
 
-#: ../capplet/settings/mail-account-view.c:740
+#: ../capplet/settings/mail-account-view.c:760
 msgid "Setup Google contacts with Evolution"
 msgstr "Google-Kontakte fÃr Evolution einrichten"
 
-#: ../capplet/settings/mail-account-view.c:741
+#: ../capplet/settings/mail-account-view.c:761
 msgid "Setup Google calendar with Evolution"
 msgstr "Google-Kalender fÃr Evolution einrichten"
 
-#: ../capplet/settings/mail-account-view.c:746
+#: ../capplet/settings/mail-account-view.c:766
 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:754
+#: ../capplet/settings/mail-account-view.c:774
 msgid "Google account settings:"
 msgstr "Google-Konteneinstellungen:"
 
-#: ../capplet/settings/mail-account-view.c:780
+#: ../capplet/settings/mail-account-view.c:800
 msgid "Setup Yahoo calendar with Evolution"
 msgstr "Yahoo-Kalender fÃr Evolution einrichten"
 
-#: ../capplet/settings/mail-account-view.c:784
+#: ../capplet/settings/mail-account-view.c:804
 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 "
@@ -7434,46 +7437,45 @@ msgstr ""
 "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:793
+#: ../capplet/settings/mail-account-view.c:813
 msgid "Yahoo account settings:"
 msgstr "Yahoo-Konteneinstellungen:"
 
-#: ../capplet/settings/mail-account-view.c:807
+#: ../capplet/settings/mail-account-view.c:827
 msgid "Yahoo Calendar name:"
 msgstr "Name des Yahoo-Kalenders:"
 
-#: ../capplet/settings/mail-account-view.c:1079
+#: ../capplet/settings/mail-account-view.c:1099
 msgid "Password:"
 msgstr "Passwort:"
 
-#: ../capplet/settings/mail-account-view.c:1130
+#: ../capplet/settings/mail-account-view.c:1150
 #: ../capplet/settings/mail-settings-view.c:248
 msgid "Close Tab"
 msgstr "Reiter schlieÃen"
 
-#: ../capplet/settings/mail-account-view.c:1140
+#: ../capplet/settings/mail-account-view.c:1160
 msgid "Account Wizard"
 msgstr "Kontenassistent"
 
-#: ../capplet/settings/mail-capplet-shell.c:209
+#: ../capplet/settings/mail-capplet-shell.c:212
 msgid "Evolution account assistant"
 msgstr "Evolution-Kontoassistent"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:353 ../mail/e-mail-migrate.c:695
-#: ../mail/e-mail-store.c:229 ../mail/em-folder-tree-model.c:146
+#: ../capplet/settings/mail-capplet-shell.c:368 ../mail/e-mail-migrate.c:744
+#: ../mail/e-mail-store.c:234 ../mail/em-folder-tree-model.c:146
 #: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
 #: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:161
-#: ../mail/em-folder-tree-model.c:163 ../mail/mail-vfolder.c:218
-#: ../mail/message-list.c:1721
-#: ../modules/addressbook/e-book-shell-backend.c:92
-#: ../modules/addressbook/e-book-shell-migrate.c:135
-#: ../modules/calendar/e-cal-shell-backend.c:103
-#: ../modules/calendar/e-cal-shell-migrate.c:150
-#: ../modules/calendar/e-memo-shell-backend.c:92
-#: ../modules/calendar/e-memo-shell-migrate.c:106
-#: ../modules/calendar/e-task-shell-backend.c:92
-#: ../modules/calendar/e-task-shell-migrate.c:117
+#: ../mail/em-folder-tree-model.c:163 ../mail/mail-vfolder.c:235
+#: ../mail/message-list.c:1714 ../modules/addressbook/e-book-shell-backend.c:96
+#: ../modules/addressbook/e-book-shell-migrate.c:136
+#: ../modules/calendar/e-cal-shell-backend.c:109
+#: ../modules/calendar/e-cal-shell-migrate.c:154
+#: ../modules/calendar/e-memo-shell-backend.c:98
+#: ../modules/calendar/e-memo-shell-migrate.c:109
+#: ../modules/calendar/e-task-shell-backend.c:98
+#: ../modules/calendar/e-task-shell-migrate.c:121
 msgid "On This Computer"
 msgstr "Auf diesem Rechner"
 
@@ -7502,9 +7504,9 @@ msgstr "Benachrichtigungen Ãber Kalenderereignisse"
 msgid "Evolution Alarm Notify"
 msgstr "Evolution Alarm-Benachrichtigung"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:961
-#: ../modules/mailto-handler/evolution-mailto-handler.c:212
-#: ../shell/e-shell-window-private.c:253
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:996
+#: ../modules/mailto-handler/evolution-mailto-handler.c:215
+#: ../shell/e-shell-window-private.c:257
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -7512,7 +7514,7 @@ msgstr "Evolution"
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution-E-Mail und -Kalender"
 
-#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:652
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:657
 msgid "Groupware Suite"
 msgstr "Groupware-Suite"
 
@@ -7529,36 +7531,36 @@ msgid "Email Settings"
 msgstr "E-Mail-Einstellungen"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:223
+#: ../e-util/e-activity.c:227
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (abgebrochen)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:226
+#: ../e-util/e-activity.c:230
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (abgeschlossen)"
 
 #. Translators: This is an activity waiting to run.
-#: ../e-util/e-activity.c:229
+#: ../e-util/e-activity.c:233
 #, c-format
 msgid "%s (waiting)"
 msgstr "%s (wartend)"
 
 #. Translators: This is a running activity which
 #. *              the user has requested to cancel.
-#: ../e-util/e-activity.c:233
+#: ../e-util/e-activity.c:237
 #, c-format
 msgid "%s (cancelling)"
 msgstr "%s (wird abgebrochen)"
 
-#: ../e-util/e-activity.c:235
+#: ../e-util/e-activity.c:239
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../e-util/e-activity.c:240
+#: ../e-util/e-activity.c:244
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (zu %d%% abgeschlossen)"
@@ -7642,26 +7644,26 @@ msgid "Visual"
 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:1796
+#: ../e-util/e-datetime-format.c:199
+#: ../modules/calendar/e-cal-shell-view-actions.c:1823
 #: ../plugins/itip-formatter/itip-view.c:191
-#: ../widgets/table/e-cell-date-edit.c:308
+#: ../widgets/table/e-cell-date-edit.c:307
 msgid "Today"
 msgstr "Heute"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:207 ../plugins/itip-formatter/itip-view.c:219
+#: ../e-util/e-datetime-format.c:210 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "Morgen"
 
-#: ../e-util/e-datetime-format.c:209
+#: ../e-util/e-datetime-format.c:212
 msgid "Yesterday"
 msgstr "Gestern"
 
 #. Translators: This is used for abbreviated days in the future.
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:217
+#: ../e-util/e-datetime-format.c:220
 msgctxt "DateFmt"
 msgid "Next Mon"
 msgstr "NÃchster %a"
@@ -7669,7 +7671,7 @@ msgstr "NÃchster %a"
 #. Translators: This is used for abbreviated days in the future.
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:223
+#: ../e-util/e-datetime-format.c:226
 msgctxt "DateFmt"
 msgid "Next Tue"
 msgstr "NÃchster %a"
@@ -7677,7 +7679,7 @@ msgstr "NÃchster %a"
 #. Translators: This is used for abbreviated days in the future.
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:229
+#: ../e-util/e-datetime-format.c:232
 msgctxt "DateFmt"
 msgid "Next Wed"
 msgstr "NÃchster %a"
@@ -7685,7 +7687,7 @@ msgstr "NÃchster %a"
 #. Translators: This is used for abbreviated days in the future.
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:235
+#: ../e-util/e-datetime-format.c:238
 msgctxt "DateFmt"
 msgid "Next Thu"
 msgstr "NÃchster %a"
@@ -7693,7 +7695,7 @@ msgstr "NÃchster %a"
 #. Translators: This is used for abbreviated days in the future.
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:241
+#: ../e-util/e-datetime-format.c:244
 msgctxt "DateFmt"
 msgid "Next Fri"
 msgstr "NÃchster %a"
@@ -7701,7 +7703,7 @@ msgstr "NÃchster %a"
 #. Translators: This is used for abbreviated days in the future.
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:247
+#: ../e-util/e-datetime-format.c:250
 msgctxt "DateFmt"
 msgid "Next Sat"
 msgstr "NÃchster %a"
@@ -7709,53 +7711,53 @@ msgstr "NÃchster %a"
 #. Translators: This is used for abbreviated days in the future.
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:253
+#: ../e-util/e-datetime-format.c:256
 msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr "NÃchster %a"
 
 # Hier hieà es mal: Systemvorgabe benutzen. Deshalb vermute ich, dass es nun um die lokale (Benutzer-) Vorgabe im Gegensatz zur Systemvorgabe geht, nicht explizit um die Spracheinstellung.
-#: ../e-util/e-datetime-format.c:335 ../e-util/e-datetime-format.c:345
-#: ../e-util/e-datetime-format.c:354
+#: ../e-util/e-datetime-format.c:338 ../e-util/e-datetime-format.c:348
+#: ../e-util/e-datetime-format.c:357
 msgid "Use locale default"
 msgstr "Lokale Vorgabe benutzen"
 
-#: ../e-util/e-datetime-format.c:551
+#: ../e-util/e-datetime-format.c:554
 msgid "Format:"
 msgstr "Format:"
 
-#: ../e-util/e-file-utils.c:152
+#: ../e-util/e-file-utils.c:151
 msgid "(Unknown Filename)"
 msgstr "(Unbekannter Dateiname)"
 
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:156
+#: ../e-util/e-file-utils.c:155
 #, c-format
 msgid "Writing \"%s\""
 msgstr "Â%s wird geschrieben"
 
 #. Translators: The first string value is the basename of a
 #. * remote file, the second string value is the hostname.
-#: ../e-util/e-file-utils.c:161
+#: ../e-util/e-file-utils.c:160
 #, c-format
 msgid "Writing \"%s\" to %s"
 msgstr "Â%s wird nach Â%s geschrieben"
 
-#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:378
+#: ../e-util/e-plugin-util.c:429 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:380
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
 msgstr "Wochen"
 
-#: ../e-util/e-print.c:157
+#: ../e-util/e-print.c:161
 msgid "An error occurred while printing"
 msgstr "WÃhrend des Druckens ist ein Fehler aufgetreten"
 
-#: ../e-util/e-print.c:164
+#: ../e-util/e-print.c:168
 msgid "The printing system reported the following details about the error:"
 msgstr "Das Drucksystem hat folgende Details zum Fehler berichtet:"
 
-#: ../e-util/e-print.c:170
+#: ../e-util/e-print.c:174
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr ""
@@ -7786,138 +7788,130 @@ 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:157
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:163
 msgid "_Overwrite"
 msgstr "Ã_berschreiben"
 
-#: ../e-util/e-util.c:146
+#: ../e-util/e-util.c:117
 msgid "Could not open the link."
 msgstr "VerknÃpfung konnte nicht geÃffnet werden."
 
-#: ../e-util/e-util.c:193
+#: ../e-util/e-util.c:164
 msgid "Could not display help for Evolution."
 msgstr "Hilfe fÃr Evolution konnte nicht angezeigt werden."
 
-#: ../e-util/gconf-bridge.c:1281
+#: ../e-util/gconf-bridge.c:1318
 #, c-format
 msgid "GConf error: %s"
 msgstr "GConf-Fehler: %s"
 
-#: ../e-util/gconf-bridge.c:1292
+#: ../e-util/gconf-bridge.c:1329
 msgid "All further errors shown only on terminal."
 msgstr "Weitere Fehler werden nur im Terminal ausgegeben."
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1051
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1054
 #: ../mail/e-mail-tag-editor.c:325 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:70
+#: ../modules/mail/em-mailer-prefs.c:72
 msgid "From"
 msgstr "Von"
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1052
-#: ../modules/mail/em-mailer-prefs.c:71
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1055
+#: ../modules/mail/em-mailer-prefs.c:73
 msgid "Reply-To"
 msgstr "Antwort an"
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1054
-#: ../mail/em-format-html.c:2406 ../mail/em-format-html.c:2474
-#: ../mail/em-format-html.c:2497 ../modules/mail/em-mailer-prefs.c:73
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1057
+#: ../mail/em-format-html.c:2574 ../mail/em-format-html.c:2642
+#: ../mail/em-format-html.c:2665 ../modules/mail/em-mailer-prefs.c:75
 msgid "Cc"
 msgstr "Kopie"
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1055
-#: ../mail/em-format-html.c:2407 ../mail/em-format-html.c:2478
-#: ../mail/em-format-html.c:2500 ../modules/mail/em-mailer-prefs.c:74
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1058
+#: ../mail/em-format-html.c:2575 ../mail/em-format-html.c:2646
+#: ../mail/em-format-html.c:2668 ../modules/mail/em-mailer-prefs.c:76
 msgid "Bcc"
 msgstr "Blindkopie"
 
-#: ../em-format/em-format-quote.c:427 ../em-format/em-format.c:1056
+#: ../em-format/em-format-quote.c:463 ../em-format/em-format.c:1059
 #: ../mail/e-mail-tag-editor.c:330 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:75
-#: ../plugins/groupwise-features/notification.ui.h:2
-#: ../plugins/groupwise-features/properties.ui.h:5 ../smime/lib/e-cert.c:1140
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:77
+#: ../smime/lib/e-cert.c:1142
 msgid "Subject"
 msgstr "Betreff"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:438 ../mail/em-format-html.c:2594
-#: ../modules/mail/em-mailer-prefs.c:1119
+#: ../em-format/em-format-quote.c:474 ../mail/em-format-html.c:2767
+#: ../modules/mail/em-mailer-prefs.c:1008
 msgid "Mailer"
 msgstr "Mailer"
 
-#: ../em-format/em-format-quote.c:519 ../mail/em-composer-utils.c:1179
+#: ../em-format/em-format-quote.c:564 ../mail/em-composer-utils.c:1189
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Weitergeleitete Nachricht --------"
 
-#: ../em-format/em-format.c:1057 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:76 ../widgets/misc/e-dateedit.c:523
+#: ../em-format/em-format.c:1060 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:78 ../widgets/misc/e-dateedit.c:523
 #: ../widgets/misc/e-dateedit.c:545
 msgid "Date"
 msgstr "Datum"
 
-#: ../em-format/em-format.c:1058 ../modules/mail/em-mailer-prefs.c:77
+#: ../em-format/em-format.c:1061 ../modules/mail/em-mailer-prefs.c:79
 msgid "Newsgroups"
 msgstr "Newsgroups"
 
-#: ../em-format/em-format.c:1059 ../modules/mail/em-mailer-prefs.c:78
+#: ../em-format/em-format.c:1062 ../modules/mail/em-mailer-prefs.c:80
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "Gesicht"
 
-#: ../em-format/em-format.c:1456
+#: ../em-format/em-format.c:1466
 #, c-format
 msgid "%s attachment"
 msgstr "%s-Anlage"
 
-#: ../em-format/em-format.c:1567
+#: ../em-format/em-format.c:1577
 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:1753 ../em-format/em-format.c:1976
+#: ../em-format/em-format.c:1769 ../em-format/em-format.c:1995
 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:1763
+#: ../em-format/em-format.c:1780
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Nicht unterstÃtzter VerschlÃsselungstyp fÃr multipart/encrypted"
 
-#: ../em-format/em-format.c:1783
+#: ../em-format/em-format.c:1800
 msgid "Could not parse PGP/MIME message"
 msgstr "Die Syntax der PGP/MIME-Nachricht konnte nicht analysiert werden"
 
-#: ../em-format/em-format.c:1784
+#: ../em-format/em-format.c:1801
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr ""
-"Die Syntax der PGP/MIME-Nachricht konnte nicht analysiert werden: "
-"Unbekannter Fehler"
+"Die Syntax der PGP/MIME-Nachricht konnte nicht analysiert werden: Unbekannter "
+"Fehler"
 
-#: ../em-format/em-format.c:2001
+#: ../em-format/em-format.c:2020
 msgid "Unsupported signature format"
 msgstr "Nicht unterstÃtztes Signaturformat"
 
-#: ../em-format/em-format.c:2014 ../em-format/em-format.c:2193
+#: ../em-format/em-format.c:2033 ../em-format/em-format.c:2215
 msgid "Error verifying signature"
 msgstr "Fehler beim ÃberprÃfen der Signatur"
 
-#: ../em-format/em-format.c:2015 ../em-format/em-format.c:2180
-#: ../em-format/em-format.c:2194
+#: ../em-format/em-format.c:2034 ../em-format/em-format.c:2200
+#: ../em-format/em-format.c:2216
 msgid "Unknown error verifying signature"
 msgstr "Unbekannter Fehler beim ÃberprÃfen der Signatur"
 
-#: ../em-format/em-format.c:2285
+#: ../em-format/em-format.c:2308
 msgid "Could not parse PGP message: "
 msgstr "Die Syntax der PGP-Nachricht konnte nicht analysiert werden:"
 
-#: ../em-format/em-format.c:2291 ../mail/em-folder-tree.c:656
-#: ../mail/mail-ops.c:631 ../plugins/caldav/caldav-browse-server.c:210
-#: ../plugins/caldav/caldav-browse-server.c:1407 ../plugins/face/face.c:169
-#: ../smime/gui/certificate-manager.c:100
-msgid "Unknown error"
-msgstr "Unbekannter Fehler"
-
 #. Don't delete this code, since it is needed so that xgettext can extract the translations.
 #. * Please, keep these strings in sync with the strings in the timespans array
 #: ../filter/e-filter-datespec.c:66
@@ -8036,67 +8030,67 @@ msgstr "%d.%m.%Y"
 msgid "Select a time to compare against"
 msgstr "WÃhlen Sie eine Vergleichszeit"
 
-#: ../filter/e-filter-file.c:188
+#: ../filter/e-filter-file.c:190
 msgid "Choose a File"
 msgstr "Eine Datei wÃhlen"
 
-#: ../filter/e-filter-rule.c:662
+#: ../filter/e-filter-rule.c:664
 msgid "R_ule name:"
 msgstr "Regel_name:"
 
-#: ../filter/e-filter-rule.c:692
+#: ../filter/e-filter-rule.c:694
 msgid "Find items that meet the following conditions"
 msgstr "Objekte suchen, die folgenden Bedingungen entsprechen"
 
-#: ../filter/e-filter-rule.c:717
+#: ../filter/e-filter-rule.c:719
 msgid "If all conditions are met"
 msgstr "Falls alle Bedingungen zutreffen"
 
-#: ../filter/e-filter-rule.c:718
+#: ../filter/e-filter-rule.c:720
 msgid "If any conditions are met"
 msgstr "Falls irgendeine Bedingung zutrifft"
 
-#: ../filter/e-filter-rule.c:721
+#: ../filter/e-filter-rule.c:723
 msgid "_Find items:"
 msgstr "Objekte _suchen:"
 
 #. Translators: "None" for not including threads;
 #. * part of "Include threads: None"
-#: ../filter/e-filter-rule.c:750
+#: ../filter/e-filter-rule.c:752
 msgid "None"
 msgstr "Keine"
 
-#: ../filter/e-filter-rule.c:751
+#: ../filter/e-filter-rule.c:753
 msgid "All related"
 msgstr "Alle mit Bezug"
 
-#: ../filter/e-filter-rule.c:752 ../widgets/misc/e-send-options.ui.h:19
+#: ../filter/e-filter-rule.c:754 ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "Antworten"
 
 # CHECK
-#: ../filter/e-filter-rule.c:753
+#: ../filter/e-filter-rule.c:755
 msgid "Replies and parents"
 msgstr "Antworten und VorgÃnger"
 
-#: ../filter/e-filter-rule.c:754
+#: ../filter/e-filter-rule.c:756
 msgid "No reply or parent"
 msgstr "Ohne Antwort oder VorgÃnger"
 
-#: ../filter/e-filter-rule.c:757
+#: ../filter/e-filter-rule.c:759
 msgid "I_nclude threads"
 msgstr "_Threads einschlieÃen"
 
-#: ../filter/e-filter-rule.c:782
+#: ../filter/e-filter-rule.c:784
 msgid "A_dd Condition"
 msgstr "Bedingung hin_zufÃgen"
 
-#: ../filter/e-filter-rule.c:1130 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:316
+#: ../filter/e-filter-rule.c:1133 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:319
 msgid "Incoming"
 msgstr "Eingang"
 
-#: ../filter/e-filter-rule.c:1130 ../mail/em-utils.c:317
+#: ../filter/e-filter-rule.c:1133 ../mail/em-utils.c:320
 msgid "Outgoing"
 msgstr "Ausgehend"
 
@@ -8128,7 +8122,7 @@ msgstr "Datum fehlt."
 msgid "Missing file name."
 msgstr "Dateiname fehlt."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:83
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:89
 msgid "Missing name."
 msgstr "Name fehlt."
 
@@ -8223,94 +8217,303 @@ msgstr "die von Ihnen angegebene Zeit"
 msgid "years"
 msgstr "Jahren"
 
-#: ../mail/e-mail-attachment-bar.c:86 ../mail/e-mail-attachment-bar.c:91
-#: ../mail/em-format-html-display.c:1122 ../mail/mail-config.ui.h:13
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:124
-#: ../widgets/misc/e-attachment-paned.c:129
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. It will not use an encrypted connection.
+#: ../mail/em-account-editor.c:569 ../mail/mail-config.ui.h:72
+#: ../modules/addressbook/ldap-config.ui.h:9
+msgid "No encryption"
+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:573 ../mail/mail-config.ui.h:130
+#: ../modules/addressbook/ldap-config.ui.h:20
+msgid "TLS encryption"
+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:577 ../mail/mail-config.ui.h:94
+#: ../modules/addressbook/ldap-config.ui.h:12
+msgid "SSL encryption"
+msgstr "SSL-VerschlÃsselung"
+
+#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
+#: ../mail/em-account-editor.c:840 ../widgets/misc/e-signature-combo-box.c:75
+msgctxt "mail-signature"
+msgid "None"
+msgstr "Keine"
+
+#: ../mail/em-account-editor.c:921
+msgid "Never"
+msgstr "Nie"
+
+#: ../mail/em-account-editor.c:922
+msgid "Always"
+msgstr "Immer"
+
+#: ../mail/em-account-editor.c:923
+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:1743 ../widgets/misc/e-account-tree-view.c:131
+msgctxt "mail-receiving"
+msgid "None"
+msgstr "Keine"
+
+#: ../mail/em-account-editor.c:2179
+msgid "Mail Configuration"
+msgstr "E-Mail-Konfiguration"
+
+#: ../mail/em-account-editor.c:2180
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Continue\" to begin."
+msgstr ""
+"Willkommen zum Evolution-E-Mail-Konfigurationsassistenten!\n"
+"\n"
+"Klicken Sie auf ÂVorÂ, um die Konfiguration zu beginnen."
+
+#: ../mail/em-account-editor.c:2183
+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 "
+"email you send."
+msgstr ""
+"Bitte geben Sie unten Ihren Namen und Ihre E-Mail-Adresse an. Die Felder "
+"unter ÂOptional mÃssen nicht\n"
+"ausgefÃllt werden, es sei denn, Sie wollen diese Informationen in von Ihnen "
+"verschickten E-Mails einschlieÃen."
+
+#: ../mail/em-account-editor.c:2185 ../mail/em-account-editor.c:2374
+msgid "Receiving Email"
+msgstr "Abrufen von E-Mails"
+
+#: ../mail/em-account-editor.c:2186
+msgid "Please configure the following account settings."
+msgstr "Bitte konfigurieren Sie die folgenden Konteneinstellungen."
+
+#: ../mail/em-account-editor.c:2188 ../mail/em-account-editor.c:2986
+msgid "Sending Email"
+msgstr "Verschicken von E-Mails"
+
+#: ../mail/em-account-editor.c:2189
+msgid ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
+msgstr ""
+"Bitte geben Sie unten Informationen zur Art und Weise ein, auf die Sie E-"
+"Mails verschicken wollen. Falls Sie sich nicht sicher sind, wenden Sie sich "
+"bitte an Ihren Systemadministrator oder Internet-Provider."
+
+#: ../mail/em-account-editor.c:2191 ../mail/mail-config.ui.h:1
+msgid "Account Information"
+msgstr "Konteninformation"
+
+#: ../mail/em-account-editor.c:2192
+msgid ""
+"Please enter a descriptive name for this account below.\n"
+"This name will be used for display purposes only."
+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:2196
+msgid "Done"
+msgstr "Fertig"
+
+#: ../mail/em-account-editor.c:2197
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+"Herzlichen GlÃckwunsch!\n"
+"Ihre E-Mail-Konfiguration ist abgeschlossen.\n"
+"\n"
+"Sie kÃnnen jetzt mit Evolution E-Mails verschicken und\n"
+"abrufen.\n"
+"\n"
+"Klicken Sie auf ÂAnwendenÂ, um Ihre Einstellungen zu\n"
+"speichern."
+
+#: ../mail/em-account-editor.c:2715
+msgid "Check for _new messages every"
+msgstr "_Automatisch nach neuen E-Mails sehen alle"
+
+#: ../mail/em-account-editor.c:2723
+msgid "minu_tes"
+msgstr "Minu_ten"
+
+#: ../mail/em-account-editor.c:3103
+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:3429 ../mail/mail-config.ui.h:101
+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:3483 ../mail/em-account-editor.c:3566
+msgid "Receiving Options"
+msgstr "Empfangsoptionen"
+
+#: ../mail/em-account-editor.c:3484 ../mail/em-account-editor.c:3567
+msgid "Checking for New Messages"
+msgstr "Nach neuen E-Mails sehen"
+
+#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
+#: ../mail/em-format-html-display.c:1219 ../mail/mail-config.ui.h:14
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:128
+#: ../widgets/misc/e-attachment-paned.c:133
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Anlage"
 msgstr[1] "Anlagen"
 
-#: ../mail/e-mail-attachment-bar.c:604
-#: ../widgets/misc/e-attachment-paned.c:619
+#: ../mail/e-mail-attachment-bar.c:608 ../widgets/misc/e-attachment-paned.c:623
 msgid "Icon View"
 msgstr "Symbolansicht"
 
-#: ../mail/e-mail-attachment-bar.c:606
-#: ../widgets/misc/e-attachment-paned.c:621
+#: ../mail/e-mail-attachment-bar.c:610 ../widgets/misc/e-attachment-paned.c:625
 msgid "List View"
 msgstr "Listenansicht"
 
-#: ../mail/e-mail-browser.c:127 ../shell/e-shell-window-actions.c:1405
-#: ../shell/e-shell-window-actions.c:1412
-#: ../shell/e-shell-window-actions.c:1419
+#: ../mail/e-mail-browser.c:134 ../shell/e-shell-window-actions.c:1446
+#: ../shell/e-shell-window-actions.c:1453
+#: ../shell/e-shell-window-actions.c:1460
 msgid "Close this window"
 msgstr "Dieses Fenster schlieÃen"
 
-#: ../mail/e-mail-browser.c:284
+#: ../mail/e-mail-browser.c:291
 msgid "(No Subject)"
 msgstr "(Kein Betreff)"
 
-#: ../mail/e-mail-display.c:62
+#: ../mail/e-mail-display.c:66
 msgid "_Add to Address Book..."
 msgstr "Zum Adressbuch _hinzufÃgen â"
 
-#: ../mail/e-mail-display.c:69
+#: ../mail/e-mail-display.c:73
 msgid "_To This Address"
 msgstr "_Zu dieser Adresse"
 
-#: ../mail/e-mail-display.c:76
+#: ../mail/e-mail-display.c:80
 msgid "_From This Address"
 msgstr "_Von dieser Adresse"
 
-#: ../mail/e-mail-display.c:85
+#: ../mail/e-mail-display.c:87
+msgid "Send _Reply To..."
+msgstr "Anwo_rt senden an â"
+
+#: ../mail/e-mail-display.c:89
+msgid "Send a reply message to this address"
+msgstr "Eine Antwort an diese Adresse senden"
+
+#: ../mail/e-mail-display.c:96
 msgid "Create Search _Folder"
 msgstr "_Suchordner anlegen"
 
-#: ../mail/e-mail-folder-utils.c:88
+#: ../mail/e-mail-folder-utils.c:111
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "Nachricht wird in Ordner Â%s gespeichert"
 
-#: ../mail/e-mail-label-dialog.c:219
+#: ../mail/e-mail-folder-utils.c:274
+msgid "Forwarded messages"
+msgstr "Weitergeleitete Nachrichten"
+
+#: ../mail/e-mail-folder-utils.c:391
+msgid "Scanning messages for duplicates"
+msgstr "Nachrichten werden auf Duplikate ÃberprÃft"
+
+#: ../mail/e-mail-folder-utils.c:584
+#, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "%d Nachricht wird abgerufen"
+msgstr[1] "%d Nachrichten werden abgerufen"
+
+#: ../mail/e-mail-folder-utils.c:824
+#, c-format
+msgid "Removing folder '%s'"
+msgstr "Ordner Â%s wird entfernt"
+
+#: ../mail/e-mail-folder-utils.c:948
+#, c-format
+msgid "File \"%s\" has been removed."
+msgstr "Die Datei Â%s wurde gelÃscht."
+
+#: ../mail/e-mail-folder-utils.c:952
+msgid "File has been removed."
+msgstr "Datei wurde gelÃscht."
+
+#: ../mail/e-mail-folder-utils.c:1011
+msgid "Removing attachments"
+msgstr "Anlagen werden gelÃscht"
+
+#: ../mail/e-mail-folder-utils.c:1175
+#, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messages"
+msgstr[0] "%d Nachricht wird gespeichert"
+msgstr[1] "%d Nachrichten werden gespeichert"
+
+#: ../mail/e-mail-folder-utils.c:1519 ../mail/em-folder-utils.c:577
+#, c-format
+msgid "Invalid folder URI '%s'"
+msgstr "UngÃltiger Ordneradresse Â%sÂ"
+
+#. Label + combo box has a 12px left margin so it's
+#. * aligned with the junk mail options above it.
+#: ../mail/e-mail-junk-options.c:252
+msgid "Junk filtering software:"
+msgstr ""
+
+#: ../mail/e-mail-label-dialog.c:223
 msgid "_Label name:"
 msgstr "_Beschriftungsname:"
 
-#: ../mail/e-mail-label-list-store.c:37
+#: ../mail/e-mail-label-list-store.c:41
 msgid "I_mportant"
 msgstr "_Wichtig"
 
 #. red
-#: ../mail/e-mail-label-list-store.c:38
+#: ../mail/e-mail-label-list-store.c:42
 msgid "_Work"
 msgstr "_GeschÃftlich"
 
 #. orange
-#: ../mail/e-mail-label-list-store.c:39
+#: ../mail/e-mail-label-list-store.c:43
 msgid "_Personal"
 msgstr "_PersÃnlich"
 
 #. green
-#: ../mail/e-mail-label-list-store.c:40
+#: ../mail/e-mail-label-list-store.c:44
 msgid "_To Do"
 msgstr "Zu er_ledigen"
 
 #. blue
-#: ../mail/e-mail-label-list-store.c:41
+#: ../mail/e-mail-label-list-store.c:45
 msgid "_Later"
 msgstr "S_pÃter"
 
-#: ../mail/e-mail-label-manager.c:161
-#: ../modules/mail/e-mail-shell-view-actions.c:627
+#: ../mail/e-mail-label-manager.c:165
+#: ../modules/mail/e-mail-shell-view-actions.c:676
 msgid "Add Label"
 msgstr "Beschriftung hinzufÃgen"
 
-#: ../mail/e-mail-label-manager.c:212
+#: ../mail/e-mail-label-manager.c:216
 msgid "Edit Label"
 msgstr "Beschriftung bearbeiten"
 
-#: ../mail/e-mail-label-manager.c:346
+#: ../mail/e-mail-label-manager.c:350
 msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
@@ -8318,66 +8521,66 @@ msgstr ""
 "Hinweis: Ein Unterstrich im Beschriftungsnamen\n"
 "wird als Zugriffstaste im Menà genutzt."
 
-#: ../mail/e-mail-label-tree-view.c:84
+#: ../mail/e-mail-label-tree-view.c:88
 msgid "Color"
 msgstr "Farbe"
 
-#: ../mail/e-mail-label-tree-view.c:94
-#: ../modules/plugin-manager/evolution-plugin-manager.c:66
-#: ../plugins/caldav/caldav-browse-server.c:1296
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../widgets/menus/gal-define-views-dialog.c:334
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+#: ../mail/e-mail-label-tree-view.c:98
+#: ../modules/plugin-manager/evolution-plugin-manager.c:69
+#: ../plugins/caldav/caldav-browse-server.c:1295
+#: ../widgets/menus/gal-define-views-dialog.c:336
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:92
 msgid "Name"
 msgstr "Name"
 
-#: ../mail/e-mail-local.c:35 ../mail/em-folder-properties.c:285
-#: ../mail/em-folder-tree-model.c:738 ../mail/em-folder-tree.c:3138
-#: ../modules/mail/e-mail-shell-view-private.c:1118
-#: ../modules/mail/e-mail-shell-view-private.c:1129
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-properties.c:310
+#: ../mail/em-folder-tree-model.c:722
+#: ../modules/mail/e-mail-shell-view-private.c:1066
+#: ../modules/mail/e-mail-shell-view-private.c:1077
 msgid "Inbox"
 msgstr "Eingang"
 
-#: ../mail/e-mail-local.c:36 ../mail/em-folder-tree-model.c:730
-#: ../modules/mail/e-mail-shell-view-private.c:1116
+#: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:715
+#: ../modules/mail/e-mail-shell-view-private.c:1064
 msgid "Drafts"
 msgstr "EntwÃrfe"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-tree-model.c:742
-#: ../modules/mail/e-mail-shell-view-private.c:1120
+#: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:726
+#: ../modules/mail/e-mail-shell-view-private.c:1068
 msgid "Outbox"
 msgstr "Ausgang"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:744
-#: ../modules/mail/e-mail-shell-view-private.c:1122
+#: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:730
+#: ../modules/mail/e-mail-shell-view-private.c:1070
 msgid "Sent"
 msgstr "Verschickt"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:733
-#: ../modules/mail/e-mail-shell-view-private.c:1124
+#: ../mail/e-mail-local.c:45 ../mail/em-folder-tree-model.c:718
+#: ../modules/mail/e-mail-shell-view-private.c:1072
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:581
+#: ../plugins/templates/templates.c:1006 ../plugins/templates/templates.c:1283
+#: ../plugins/templates/templates.c:1293
 msgid "Templates"
 msgstr "Vorlagen"
 
-#: ../mail/e-mail-migrate.c:134
+#: ../mail/e-mail-migrate.c:133
 msgid "Migrating..."
 msgstr "Migrationsvorgang â"
 
-#: ../mail/e-mail-migrate.c:167
+#: ../mail/e-mail-migrate.c:168
 msgid "Migration"
 msgstr "Migration"
 
-#: ../mail/e-mail-migrate.c:207
+#: ../mail/e-mail-migrate.c:209
 #, c-format
 msgid "Migrating '%s':"
 msgstr "Â%s wird migriert:"
 
-#: ../mail/e-mail-migrate.c:675
+#: ../mail/e-mail-migrate.c:722
 msgid "Migrating Folders"
 msgstr "Ordner werden migriert"
 
-#: ../mail/e-mail-migrate.c:676
+#: ../mail/e-mail-migrate.c:723
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -8389,715 +8592,699 @@ msgstr ""
 "\n"
 "Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner â"
 
-#: ../mail/e-mail-migrate.c:1277
+#: ../mail/e-mail-migrate.c:1279
 #, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "Lokale E-Mail-Ordner unter Â%s konnten nicht angelegt werden: %s"
 
-#: ../mail/e-mail-notebook-view.c:562
+#: ../mail/e-mail-notebook-view.c:619
 msgid "Please select a folder"
 msgstr "Bitte wÃhlen Sie einen Ordner"
 
-#. 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:111
-#: ../modules/calendar/e-task-shell-view-actions.c:576
-msgid "Do not ask me again"
-msgstr "Nicht mehr nachfragen."
-
-#: ../mail/e-mail-reader.c:306 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:304 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "In Ordner kopieren"
 
-#: ../mail/e-mail-reader.c:306 ../mail/em-folder-utils.c:428
+#: ../mail/e-mail-reader.c:304 ../mail/em-folder-utils.c:480
 msgid "C_opy"
 msgstr "K_opieren"
 
-#. Translators: %s is replaced with a folder name
-#. %d with count of duplicate messages.
-#: ../mail/e-mail-reader.c:523
-#, c-format
-msgid ""
-"Folder '%s' contains %d duplicate message. Are you sure you want to delete "
-"it?"
-msgid_plural ""
-"Folder '%s' contains %d duplicate messages. Are you sure you want to delete "
-"them?"
-msgstr[0] ""
-"Der Ordner Â%s enthÃlt %d doppelte Nachricht. Soll diese wirklich gelÃscht "
-"werden?"
-msgstr[1] ""
-"Der Ordner Â%s enthÃlt %d doppelte Nachrichten. Sollen diese wirklich "
-"gelÃscht werden?"
-
-#: ../mail/e-mail-reader.c:986 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:806 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "In Ordner verschieben"
 
-#: ../mail/e-mail-reader.c:986 ../mail/em-folder-utils.c:428
+#: ../mail/e-mail-reader.c:806 ../mail/em-folder-utils.c:480
 msgid "_Move"
 msgstr "_Verschieben"
 
-#. Check buttons
-#: ../mail/e-mail-reader.c:1265 ../mail/e-mail-reader.c:1423
-#: ../mail/e-mail-reader.c:1467
+#: ../mail/e-mail-reader.c:1167 ../mail/e-mail-reader.c:1355
+#: ../mail/e-mail-reader.c:1395
 msgid "_Do not ask me again."
 msgstr "_Nicht mehr nachfragen."
 
-#: ../mail/e-mail-reader.c:1472
+#: ../mail/e-mail-reader.c:1401
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "Â_Antwort an bei Mailinglisten immer ignorieren"
 
-#: ../mail/e-mail-reader.c:1581
-msgid "Save Message"
-msgid_plural "Save Messages"
-msgstr[0] "Nachricht speichern"
-msgstr[1] "Nachrichten speichern"
-
-#. Translators: This is a part of a suggested file name
-#. * used when saving a message or multiple messages to an
-#. * mbox format, when the first message doesn't have a
-#. * 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:1602
-#: ../plugins/groupwise-features/notification.ui.h:1
-#: ../plugins/groupwise-features/properties.ui.h:3
-msgid "Message"
-msgid_plural "Messages"
-msgstr[0] "Nachricht"
-msgstr[1] "Nachrichten"
-
-#: ../mail/e-mail-reader.c:1876
+#: ../mail/e-mail-reader.c:1767
 msgid "A_dd Sender to Address Book"
 msgstr "A_bsender zum Adressbuch hinzufÃgen"
 
-#: ../mail/e-mail-reader.c:1878
+#: ../mail/e-mail-reader.c:1769
 msgid "Add sender to address book"
 msgstr "Absender zum Adressbuch hinzufÃgen"
 
-#: ../mail/e-mail-reader.c:1883
+#: ../mail/e-mail-reader.c:1774
 msgid "Check for _Junk"
 msgstr "Ãber_prÃfung auf unerwÃnschte Nachrichten"
 
-#: ../mail/e-mail-reader.c:1885
+#: ../mail/e-mail-reader.c:1776
 msgid "Filter the selected messages for junk status"
 msgstr "Die gewÃhlten Nachrichten auf den Status ÂUnerwÃnscht filtern"
 
-#: ../mail/e-mail-reader.c:1890
+#: ../mail/e-mail-reader.c:1781
 msgid "_Copy to Folder..."
 msgstr "In Ordner _kopieren â"
 
-#: ../mail/e-mail-reader.c:1892
+#: ../mail/e-mail-reader.c:1783
 msgid "Copy selected messages to another folder"
 msgstr "Die gewÃhlten Nachrichten in einen anderen Ordner kopieren"
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:1788
 msgid "_Delete Message"
 msgstr "Nachricht _lÃschen"
 
-#: ../mail/e-mail-reader.c:1899
+#: ../mail/e-mail-reader.c:1790
 msgid "Mark the selected messages for deletion"
 msgstr "Die gewÃhlten Nachrichten zum LÃschen markieren"
 
-#: ../mail/e-mail-reader.c:1904
+#: ../mail/e-mail-reader.c:1795
 msgid "Filter on Mailing _List..."
 msgstr "Filter Ãber Mailing_liste â"
 
-#: ../mail/e-mail-reader.c:1906
+#: ../mail/e-mail-reader.c:1797
 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:1911
+#: ../mail/e-mail-reader.c:1802
 msgid "Filter on _Recipients..."
 msgstr "Filter Ãber _EmpfÃnger â"
 
-#: ../mail/e-mail-reader.c:1913
+#: ../mail/e-mail-reader.c:1804
 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:1918
+#: ../mail/e-mail-reader.c:1809
 msgid "Filter on Se_nder..."
 msgstr "Filter Ãber _Absender â"
 
-#: ../mail/e-mail-reader.c:1920
+#: ../mail/e-mail-reader.c:1811
 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:1925
+#: ../mail/e-mail-reader.c:1816
 msgid "Filter on _Subject..."
 msgstr "Filter Ãber _Betreff â"
 
-#: ../mail/e-mail-reader.c:1927
+#: ../mail/e-mail-reader.c:1818
 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:1932
+#: ../mail/e-mail-reader.c:1823
 msgid "A_pply Filters"
 msgstr "Filter an_wenden"
 
-#: ../mail/e-mail-reader.c:1934
+#: ../mail/e-mail-reader.c:1825
 msgid "Apply filter rules to the selected messages"
 msgstr "Filterregeln auf die gewÃhlten Nachrichten anwenden"
 
-#: ../mail/e-mail-reader.c:1939
+#: ../mail/e-mail-reader.c:1830
 msgid "_Find in Message..."
 msgstr "In Nachricht _suchen â"
 
-#: ../mail/e-mail-reader.c:1941
+#: ../mail/e-mail-reader.c:1832
 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:1946
+#: ../mail/e-mail-reader.c:1837
 msgid "_Clear Flag"
 msgstr "Markierung _lÃschen"
 
-#: ../mail/e-mail-reader.c:1948
+#: ../mail/e-mail-reader.c:1839
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Die Folgemarkierung aus den gewÃhlten Nachrichten entfernen"
 
-#: ../mail/e-mail-reader.c:1953
+#: ../mail/e-mail-reader.c:1844
 msgid "_Flag Completed"
 msgstr "Als abgeschlossen _markieren"
 
-#: ../mail/e-mail-reader.c:1955
+#: ../mail/e-mail-reader.c:1846
 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:1960
+#: ../mail/e-mail-reader.c:1851
 msgid "Follow _Up..."
 msgstr "_Folgenachricht â"
 
-#: ../mail/e-mail-reader.c:1962
+#: ../mail/e-mail-reader.c:1853
 msgid "Flag the selected messages for follow-up"
 msgstr "Die gewÃhlten Nachrichten zur Nachverfolgung markieren"
 
-#: ../mail/e-mail-reader.c:1967
+#: ../mail/e-mail-reader.c:1858
 msgid "_Attached"
 msgstr "_Anhang"
 
-#: ../mail/e-mail-reader.c:1969 ../mail/e-mail-reader.c:1976
+#: ../mail/e-mail-reader.c:1860 ../mail/e-mail-reader.c:1867
 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:1974
+#: ../mail/e-mail-reader.c:1865
 msgid "Forward As _Attached"
 msgstr "Als _Anhang weiterleiten"
 
-#: ../mail/e-mail-reader.c:1981
+#: ../mail/e-mail-reader.c:1872
 msgid "_Inline"
 msgstr "_Eingebettet"
 
-#: ../mail/e-mail-reader.c:1983 ../mail/e-mail-reader.c:1990
+#: ../mail/e-mail-reader.c:1874 ../mail/e-mail-reader.c:1881
 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:1988
+#: ../mail/e-mail-reader.c:1879
 msgid "Forward As _Inline"
 msgstr "_Eingebettet weiterleiten"
 
-#: ../mail/e-mail-reader.c:1995
+#: ../mail/e-mail-reader.c:1886
 msgid "_Quoted"
 msgstr "_Zitiert"
 
-#: ../mail/e-mail-reader.c:1997 ../mail/e-mail-reader.c:2004
+#: ../mail/e-mail-reader.c:1888 ../mail/e-mail-reader.c:1895
 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:2002
+#: ../mail/e-mail-reader.c:1893
 msgid "Forward As _Quoted"
 msgstr "_Zitiert weiterleiten"
 
-#: ../mail/e-mail-reader.c:2009
+#: ../mail/e-mail-reader.c:1900
 msgid "_Load Images"
 msgstr "_Bilder laden"
 
-#: ../mail/e-mail-reader.c:2011
+#: ../mail/e-mail-reader.c:1902
 msgid "Force images in HTML mail to be loaded"
 msgstr "Laden von Bildern in HTML-E-Mail erzwingen"
 
-#: ../mail/e-mail-reader.c:2016
+#: ../mail/e-mail-reader.c:1907
 msgid "_Important"
 msgstr "_Wichtig"
 
-#: ../mail/e-mail-reader.c:2018
+#: ../mail/e-mail-reader.c:1909
 msgid "Mark the selected messages as important"
 msgstr "Die gewÃhlten Nachrichten als wichtig markieren"
 
-#: ../mail/e-mail-reader.c:2023
+#: ../mail/e-mail-reader.c:1914
 msgid "_Junk"
 msgstr "UnerwÃ_nscht"
 
-#: ../mail/e-mail-reader.c:2025
+#: ../mail/e-mail-reader.c:1916
 msgid "Mark the selected messages as junk"
 msgstr "Die gewÃhlten Nachrichten als unerwÃnscht markieren"
 
-#: ../mail/e-mail-reader.c:2030
+#: ../mail/e-mail-reader.c:1921
 msgid "_Not Junk"
 msgstr "E_rwÃnscht"
 
-#: ../mail/e-mail-reader.c:2032
+#: ../mail/e-mail-reader.c:1923
 msgid "Mark the selected messages as not being junk"
 msgstr "Die gewÃhlten Nachrichten als nicht unerwÃnscht markieren"
 
-#: ../mail/e-mail-reader.c:2037
+#: ../mail/e-mail-reader.c:1928
 msgid "_Read"
 msgstr "Ge_lesen"
 
-#: ../mail/e-mail-reader.c:2039
+#: ../mail/e-mail-reader.c:1930
 msgid "Mark the selected messages as having been read"
 msgstr "Die gewÃhlten Nachrichten als gelesen markieren"
 
-#: ../mail/e-mail-reader.c:2044
+#: ../mail/e-mail-reader.c:1935
 msgid "Uni_mportant"
 msgstr "_Unwichtig"
 
-#: ../mail/e-mail-reader.c:2046
+#: ../mail/e-mail-reader.c:1937
 msgid "Mark the selected messages as unimportant"
 msgstr "Die gewÃhlten Nachrichten als unwichtig markieren"
 
-#: ../mail/e-mail-reader.c:2051
+#: ../mail/e-mail-reader.c:1942
 msgid "_Unread"
 msgstr "_Ungelesen"
 
-#: ../mail/e-mail-reader.c:2053
+#: ../mail/e-mail-reader.c:1944
 msgid "Mark the selected messages as not having been read"
 msgstr "Die gewÃhlten Nachrichten als ungelesen markieren"
 
-#: ../mail/e-mail-reader.c:2058
+#: ../mail/e-mail-reader.c:1949
 msgid "_Edit as New Message..."
 msgstr "Als neue _Nachricht bearbeiten â"
 
-#: ../mail/e-mail-reader.c:2060
+#: ../mail/e-mail-reader.c:1951
 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:2065
+#: ../mail/e-mail-reader.c:1956
 msgid "Compose _New Message"
 msgstr "_Nachricht verfassen"
 
-#: ../mail/e-mail-reader.c:2067
+#: ../mail/e-mail-reader.c:1958
 msgid "Open a window for composing a mail message"
 msgstr "Ein Fenster zum Verfassen einer E-Mail-Nachricht Ãffnen"
 
-#: ../mail/e-mail-reader.c:2072
+#: ../mail/e-mail-reader.c:1963
 msgid "_Open in New Window"
 msgstr "In neuem _Fenster Ãffnen"
 
-#: ../mail/e-mail-reader.c:2074
+#: ../mail/e-mail-reader.c:1965
 msgid "Open the selected messages in a new window"
 msgstr "Die gewÃhlten Nachrichten in einem neuen Fenster Ãffnen"
 
-#: ../mail/e-mail-reader.c:2079
+#: ../mail/e-mail-reader.c:1970
 msgid "_Move to Folder..."
 msgstr "In Ordner _verschieben â"
 
-#: ../mail/e-mail-reader.c:2081
+#: ../mail/e-mail-reader.c:1972
 msgid "Move selected messages to another folder"
 msgstr "Die gewÃhlten Nachrichten in einen anderen Ordner verschieben"
 
-#: ../mail/e-mail-reader.c:2086
+#: ../mail/e-mail-reader.c:1977
 msgid "_Switch to Folder"
 msgstr "Zu Ordner _wechseln"
 
-#: ../mail/e-mail-reader.c:2088
+#: ../mail/e-mail-reader.c:1979
 msgid "Display the parent folder"
 msgstr "Den Elternordner anzeigen"
 
-#: ../mail/e-mail-reader.c:2093
+#: ../mail/e-mail-reader.c:1984
 msgid "Switch to _next tab"
 msgstr "Zum _nÃchsten Reiter wechseln"
 
-#: ../mail/e-mail-reader.c:2095
+#: ../mail/e-mail-reader.c:1986
 msgid "Switch to the next tab"
 msgstr "Zum nÃchsten Reiter wechseln"
 
-#: ../mail/e-mail-reader.c:2100
+#: ../mail/e-mail-reader.c:1991
 msgid "Switch to _previous tab"
 msgstr "Zum _vorherigen Reiter wechseln"
 
-#: ../mail/e-mail-reader.c:2102
+#: ../mail/e-mail-reader.c:1993
 msgid "Switch to the previous tab"
 msgstr "Zum vorherigen Reiter wechseln"
 
-#: ../mail/e-mail-reader.c:2107
+#: ../mail/e-mail-reader.c:1998
 msgid "Cl_ose current tab"
 msgstr "Den momentan geÃffneten Reiter _schlieÃen"
 
-#: ../mail/e-mail-reader.c:2109
+#: ../mail/e-mail-reader.c:2000
 msgid "Close current tab"
 msgstr "Den momentan geÃffneten Reiter schlieÃen"
 
-#: ../mail/e-mail-reader.c:2114
+#: ../mail/e-mail-reader.c:2005
 msgid "_Next Message"
 msgstr "_NÃchste Nachricht"
 
-#: ../mail/e-mail-reader.c:2116
+#: ../mail/e-mail-reader.c:2007
 msgid "Display the next message"
 msgstr "Die nÃchste Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:2121
+#: ../mail/e-mail-reader.c:2012
 msgid "Next _Important Message"
 msgstr "NÃchste _wichtige Nachricht"
 
-#: ../mail/e-mail-reader.c:2123
+#: ../mail/e-mail-reader.c:2014
 msgid "Display the next important message"
 msgstr "Die nÃchste wichtige Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:2128
+#: ../mail/e-mail-reader.c:2019
 msgid "Next _Thread"
 msgstr "NÃchster _Thread"
 
-#: ../mail/e-mail-reader.c:2130
+#: ../mail/e-mail-reader.c:2021
 msgid "Display the next thread"
 msgstr "NÃchsten Thread anzeigen"
 
-#: ../mail/e-mail-reader.c:2135
+#: ../mail/e-mail-reader.c:2026
 msgid "Next _Unread Message"
 msgstr "NÃchste _ungelesene Nachricht"
 
-#: ../mail/e-mail-reader.c:2137
+#: ../mail/e-mail-reader.c:2028
 msgid "Display the next unread message"
 msgstr "Die nÃchste ungelesene Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:2142
+#: ../mail/e-mail-reader.c:2033
 msgid "_Previous Message"
 msgstr "_Vorherige Nachricht"
 
-#: ../mail/e-mail-reader.c:2144
+#: ../mail/e-mail-reader.c:2035
 msgid "Display the previous message"
 msgstr "Die vorhergehende Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:2149
+#: ../mail/e-mail-reader.c:2040
 msgid "Pr_evious Important Message"
 msgstr "V_orherige wichtige Nachricht"
 
-#: ../mail/e-mail-reader.c:2151
+#: ../mail/e-mail-reader.c:2042
 msgid "Display the previous important message"
 msgstr "Die vorhergehende wichtige Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:2156
+#: ../mail/e-mail-reader.c:2047
 msgid "Previous T_hread"
 msgstr "Vo_rheriger Thread"
 
-#: ../mail/e-mail-reader.c:2158
+#: ../mail/e-mail-reader.c:2049
 msgid "Display the previous thread"
 msgstr "Den vorhergehenden Thread anzeigen"
 
-#: ../mail/e-mail-reader.c:2163
+#: ../mail/e-mail-reader.c:2054
 msgid "P_revious Unread Message"
 msgstr "_Vorherige ungelesene Nachricht"
 
-#: ../mail/e-mail-reader.c:2165
+#: ../mail/e-mail-reader.c:2056
 msgid "Display the previous unread message"
 msgstr "Die vorhergehende ungelesene Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:2172
+#: ../mail/e-mail-reader.c:2063
 msgid "Print this message"
 msgstr "Diese Nachricht drucken"
 
-#: ../mail/e-mail-reader.c:2179
+#: ../mail/e-mail-reader.c:2070
 msgid "Preview the message to be printed"
 msgstr "Eine Vorschau auf die zu druckende Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:2184
+#: ../mail/e-mail-reader.c:2075
 msgid "Re_direct"
 msgstr "_Umleiten"
 
-#: ../mail/e-mail-reader.c:2186
+#: ../mail/e-mail-reader.c:2077
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Die gewÃhlte Nachricht an jemanden umleiten"
 
-#: ../mail/e-mail-reader.c:2191
+#: ../mail/e-mail-reader.c:2082
 msgid "Remo_ve Attachments"
 msgstr "Anlagen _lÃschen"
 
-#: ../mail/e-mail-reader.c:2193
+#: ../mail/e-mail-reader.c:2084
 msgid "Remove attachments"
 msgstr "Anlagen lÃschen"
 
-#: ../mail/e-mail-reader.c:2198
+#: ../mail/e-mail-reader.c:2089
 msgid "Remove Du_plicate Messages"
 msgstr "Do_ppelte Nachrichten lÃschen"
 
-#: ../mail/e-mail-reader.c:2200
+#: ../mail/e-mail-reader.c:2091
 msgid "Checks selected messages for duplicates"
 msgstr "Die gewÃhlten Nachrichten auf Duplikate ÃberprÃfen"
 
-#: ../mail/e-mail-reader.c:2205 ../mail/mail.error.xml.h:102
-#: ../modules/calendar/e-cal-shell-view-actions.c:1465
-#: ../modules/mail/e-mail-attachment-handler.c:179
+#: ../mail/e-mail-reader.c:2096 ../mail/mail.error.xml.h:108
+#: ../modules/calendar/e-cal-shell-view-actions.c:1477
+#: ../modules/mail/e-mail-attachment-handler.c:177
 msgid "Reply to _All"
 msgstr "Antw_ort an alle"
 
-#: ../mail/e-mail-reader.c:2207
+#: ../mail/e-mail-reader.c:2098
 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:2212 ../mail/mail.error.xml.h:103
+#: ../mail/e-mail-reader.c:2103 ../mail/mail.error.xml.h:109
 msgid "Reply to _List"
 msgstr "Antwort an Lis_te"
 
-#: ../mail/e-mail-reader.c:2214
+#: ../mail/e-mail-reader.c:2105
 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:2219
-#: ../modules/mail/e-mail-attachment-handler.c:186
+#: ../mail/e-mail-reader.c:2110 ../modules/mail/e-mail-attachment-handler.c:184
 msgid "_Reply to Sender"
 msgstr "_Antwort an Absender"
 
-#: ../mail/e-mail-reader.c:2221
+#: ../mail/e-mail-reader.c:2112
 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:2226
+#: ../mail/e-mail-reader.c:2117
 msgid "_Save as mbox..."
 msgstr "_Speichern als mbox â"
 
-#: ../mail/e-mail-reader.c:2228
+#: ../mail/e-mail-reader.c:2119
 msgid "Save selected messages as an mbox file"
 msgstr "Die gewÃhlten Nachrichten als mbox-Datei speichern"
 
-#: ../mail/e-mail-reader.c:2233
-msgid "Search Folder from Mailing _List..."
-msgstr "Suchordner Ãber Mailing_liste â"
-
-#: ../mail/e-mail-reader.c:2235
-msgid "Create a search folder for this mailing list"
-msgstr "Einen Suchordner fÃr diese Mailingliste anlegen"
-
-#: ../mail/e-mail-reader.c:2240
-msgid "Search Folder from Recipien_ts..."
-msgstr "Suchordner Ãber _EmpfÃnger â"
-
-#: ../mail/e-mail-reader.c:2242
-msgid "Create a search folder for these recipients"
-msgstr "Einen Suchordner fÃr diese EmpfÃnger anlegen"
-
-#: ../mail/e-mail-reader.c:2247
-msgid "Search Folder from Sen_der..."
-msgstr "Suchordner Ãber _Absender â"
-
-#: ../mail/e-mail-reader.c:2249
-msgid "Create a search folder for this sender"
-msgstr "Einen Suchordner fÃr diesen Absender anlegen"
-
-#: ../mail/e-mail-reader.c:2254
-msgid "Search Folder from S_ubject..."
-msgstr "Suchordner Ãber _Betreff â"
-
-#: ../mail/e-mail-reader.c:2256
-msgid "Create a search folder for this subject"
-msgstr "Einen Suchordner fÃr diesen Betreff anlegen"
-
-#: ../mail/e-mail-reader.c:2261
+#: ../mail/e-mail-reader.c:2124
 msgid "_Message Source"
 msgstr "Nachrichten-_Quelltext"
 
-#: ../mail/e-mail-reader.c:2263
+#: ../mail/e-mail-reader.c:2126
 msgid "Show the raw email source of the message"
 msgstr "Den zugrunde liegenden E-Mail-Quelltext dieser Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:2275
+#: ../mail/e-mail-reader.c:2138
 msgid "_Undelete Message"
 msgstr "LÃschen der Nachricht _rÃckgÃngig"
 
-#: ../mail/e-mail-reader.c:2277
+#: ../mail/e-mail-reader.c:2140
 msgid "Undelete the selected messages"
 msgstr "LÃschen der gewÃhlten Nachrichten rÃckgÃngig machen"
 
-#: ../mail/e-mail-reader.c:2282
+#: ../mail/e-mail-reader.c:2145
 msgid "_Normal Size"
 msgstr "_Normale GrÃÃe"
 
-#: ../mail/e-mail-reader.c:2284
+#: ../mail/e-mail-reader.c:2147
 msgid "Reset the text to its original size"
 msgstr "Den Text auf seine OriginalgrÃÃe zurÃcksetzen"
 
-#: ../mail/e-mail-reader.c:2289
+#: ../mail/e-mail-reader.c:2152
 msgid "_Zoom In"
 msgstr "Ansicht ver_grÃÃern"
 
-#: ../mail/e-mail-reader.c:2291
+#: ../mail/e-mail-reader.c:2154
 msgid "Increase the text size"
 msgstr "Die TextgrÃÃe heraufsetzen"
 
-#: ../mail/e-mail-reader.c:2296
+#: ../mail/e-mail-reader.c:2159
 msgid "Zoom _Out"
 msgstr "Ansicht ver_kleinern"
 
-#: ../mail/e-mail-reader.c:2298
+#: ../mail/e-mail-reader.c:2161
 msgid "Decrease the text size"
 msgstr "Die TextgrÃÃe heruntersetzen"
 
-#: ../mail/e-mail-reader.c:2305
+#: ../mail/e-mail-reader.c:2168
 msgid "Create R_ule"
 msgstr "_Regel anlegen"
 
-#: ../mail/e-mail-reader.c:2312
+#: ../mail/e-mail-reader.c:2175
 msgid "Ch_aracter Encoding"
 msgstr "Zeichenko_dierung"
 
-#: ../mail/e-mail-reader.c:2319
+#: ../mail/e-mail-reader.c:2182
 msgid "F_orward As"
 msgstr "_Weiterleiten als â"
 
-#: ../mail/e-mail-reader.c:2326
+#: ../mail/e-mail-reader.c:2189
 msgid "_Group Reply"
 msgstr "Antwort an _Gruppe"
 
-#: ../mail/e-mail-reader.c:2333
+#: ../mail/e-mail-reader.c:2196
 msgid "_Go To"
 msgstr "_Gehe zu"
 
-#: ../mail/e-mail-reader.c:2340
+#: ../mail/e-mail-reader.c:2203
 msgid "Mar_k As"
 msgstr "Mar_kieren als"
 
-#: ../mail/e-mail-reader.c:2347
+#: ../mail/e-mail-reader.c:2210
 msgid "_Message"
 msgstr "_Nachricht"
 
-#: ../mail/e-mail-reader.c:2354
+#: ../mail/e-mail-reader.c:2217
 msgid "_Zoom"
 msgstr "Ansicht ver_grÃÃern"
 
-#: ../mail/e-mail-reader.c:2379
+#: ../mail/e-mail-reader.c:2227
+msgid "Search Folder from Mailing _List..."
+msgstr "Suchordner Ãber Mailing_liste â"
+
+#: ../mail/e-mail-reader.c:2229
+msgid "Create a search folder for this mailing list"
+msgstr "Einen Suchordner fÃr diese Mailingliste anlegen"
+
+#: ../mail/e-mail-reader.c:2234
+msgid "Search Folder from Recipien_ts..."
+msgstr "Suchordner Ãber _EmpfÃnger â"
+
+#: ../mail/e-mail-reader.c:2236
+msgid "Create a search folder for these recipients"
+msgstr "Einen Suchordner fÃr diese EmpfÃnger anlegen"
+
+#: ../mail/e-mail-reader.c:2241
+msgid "Search Folder from Sen_der..."
+msgstr "Suchordner Ãber _Absender â"
+
+#: ../mail/e-mail-reader.c:2243
+msgid "Create a search folder for this sender"
+msgstr "Einen Suchordner fÃr diesen Absender anlegen"
+
+#: ../mail/e-mail-reader.c:2248
+msgid "Search Folder from S_ubject..."
+msgstr "Suchordner Ãber _Betreff â"
+
+#: ../mail/e-mail-reader.c:2250
+msgid "Create a search folder for this subject"
+msgstr "Einen Suchordner fÃr diesen Betreff anlegen"
+
+#: ../mail/e-mail-reader.c:2273
 msgid "Mark for Follo_w Up..."
 msgstr "Als _Folgenachricht markieren â"
 
-#: ../mail/e-mail-reader.c:2387
+#: ../mail/e-mail-reader.c:2281
 msgid "Mark as _Important"
 msgstr "Als w_ichtig markieren"
 
-#: ../mail/e-mail-reader.c:2391
+#: ../mail/e-mail-reader.c:2285
 msgid "Mark as _Junk"
 msgstr "Als un_erwÃnscht markieren"
 
-#: ../mail/e-mail-reader.c:2395
+#: ../mail/e-mail-reader.c:2289
 msgid "Mark as _Not Junk"
 msgstr "Als _nicht unerwÃnscht markieren"
 
-#: ../mail/e-mail-reader.c:2399
+#: ../mail/e-mail-reader.c:2293
 msgid "Mar_k as Read"
 msgstr "Als _gelesen markieren"
 
-#: ../mail/e-mail-reader.c:2403
+#: ../mail/e-mail-reader.c:2297
 msgid "Mark as Uni_mportant"
 msgstr "Als un_wichtig markieren"
 
-#: ../mail/e-mail-reader.c:2407
+#: ../mail/e-mail-reader.c:2301
 msgid "Mark as _Unread"
 msgstr "Als _ungelesen markieren"
 
-#: ../mail/e-mail-reader.c:2451
+#: ../mail/e-mail-reader.c:2345
 msgid "_Caret Mode"
 msgstr "Cursor-_Modus"
 
-#: ../mail/e-mail-reader.c:2453
+#: ../mail/e-mail-reader.c:2347
 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:2459
+#: ../mail/e-mail-reader.c:2353
 msgid "All Message _Headers"
 msgstr "Alle Nachrichtenk_Ãpfe"
 
-#: ../mail/e-mail-reader.c:2461
+#: ../mail/e-mail-reader.c:2355
 msgid "Show messages with all email headers"
 msgstr "Nachrichten mit allen E-Mail-Kopfzeilen anzeigen"
 
-#: ../mail/e-mail-reader.c:2699
-msgid "Unable to retrieve message"
-msgstr "Nachricht konnte nicht abgerufen werden"
-
-#: ../mail/e-mail-reader.c:2761 ../mail/mail-ops.c:2075
+#: ../mail/e-mail-reader.c:2651
 #, 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:3385 ../mail/mail-config.ui.h:31
-#: ../plugins/google-account-setup/google-source.c:304
-#: ../plugins/google-account-setup/google-source.c:538
-#: ../plugins/google-account-setup/google-source.c:674
-#: ../widgets/misc/e-account-tree-view.c:249
+#: ../mail/e-mail-reader.c:3229 ../mail/mail-config.ui.h:32
+#: ../plugins/google-account-setup/google-source.c:306
+#: ../plugins/google-account-setup/google-source.c:549
+#: ../plugins/google-account-setup/google-source.c:688
+#: ../widgets/misc/e-account-tree-view.c:253
 msgid "Default"
 msgstr "Vorgabe"
 
-#: ../mail/e-mail-reader.c:3556
-#: ../modules/mail/e-mail-attachment-handler.c:172
+#: ../mail/e-mail-reader.c:3396 ../modules/mail/e-mail-attachment-handler.c:170
 msgid "_Forward"
 msgstr "_Weiterleiten"
 
-#: ../mail/e-mail-reader.c:3557
+#: ../mail/e-mail-reader.c:3397
 msgid "Forward the selected message to someone"
 msgstr "Die gewÃhlte Nachricht an jemanden weiterleiten"
 
-#: ../mail/e-mail-reader.c:3576
+#: ../mail/e-mail-reader.c:3416
 msgid "Group Reply"
 msgstr "Antwort an Gruppe"
 
-#: ../mail/e-mail-reader.c:3577
+#: ../mail/e-mail-reader.c:3417
 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:3622 ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:746
+#: ../mail/e-mail-reader.c:3470 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "LÃschen"
 
-#: ../mail/e-mail-reader.c:3655
-#: ../modules/calendar/e-cal-shell-view-actions.c:1311
-#: ../widgets/misc/e-calendar.c:201
+#: ../mail/e-mail-reader.c:3503
+#: ../modules/calendar/e-cal-shell-view-actions.c:1323
+#: ../widgets/misc/e-calendar.c:202
 msgid "Next"
 msgstr "Weiter"
 
-#: ../mail/e-mail-reader.c:3659
-#: ../modules/calendar/e-cal-shell-view-actions.c:1304
-#: ../widgets/misc/e-calendar.c:177
+#: ../mail/e-mail-reader.c:3507
+#: ../modules/calendar/e-cal-shell-view-actions.c:1316
+#: ../widgets/misc/e-calendar.c:178
 msgid "Previous"
 msgstr "Vorherige"
 
-#: ../mail/e-mail-reader.c:3669 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:3516 ../mail/mail-dialogs.ui.h:17
 msgid "Reply"
 msgstr "Antworten"
 
-#: ../mail/e-mail-reader.c:4304
+#: ../mail/e-mail-reader.c:4186
 #, c-format
 msgid "Folder '%s'"
 msgstr "Ordner Â%sÂ"
 
-#: ../mail/e-mail-session.c:643
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "Passwort fÃr %s eingeben"
-
-#: ../mail/e-mail-session.c:645
-msgid "Enter Passphrase"
-msgstr "Geben Sie das Passwort ein"
+#: ../mail/e-mail-reader-utils.c:139
+msgid "Do not warn me again"
+msgstr "Nicht mehr nachfragen"
 
-#: ../mail/e-mail-session.c:648
+#. Translators: %s is replaced with a folder
+#. * name %u with count of duplicate messages.
+#: ../mail/e-mail-reader-utils.c:663
 #, c-format
-msgid "Enter Password for %s"
-msgstr "Passwort fÃr %s eingeben"
-
-#: ../mail/e-mail-session.c:650
+msgid ""
+"Folder '%s' contains %u duplicate message. Are you sure you want to delete it?"
+msgid_plural ""
+"Folder '%s' contains %u duplicate messages. Are you sure you want to delete "
+"them?"
+msgstr[0] ""
+"Der Ordner Â%s enthÃlt %u doppelte Nachricht. Soll diese wirklich gelÃscht "
+"werden?"
+msgstr[1] ""
+"Der Ordner Â%s enthÃlt %u doppelte Nachrichten. Sollen diese wirklich "
+"gelÃscht werden?"
+
+#: ../mail/e-mail-reader-utils.c:960
+msgid "Save Message"
+msgid_plural "Save Messages"
+msgstr[0] "Nachricht speichern"
+msgstr[1] "Nachrichten speichern"
+
+#. Translators: This is part of a suggested file name
+#. * used when saving a message or multiple messages to
+#. * mbox format, when the first message doesn't have a
+#. * subject.  The extension ".mbox" is appended to the
+#. * string; for example "Message.mbox".
+#: ../mail/e-mail-reader-utils.c:981
+msgid "Message"
+msgid_plural "Messages"
+msgstr[0] "Nachricht"
+msgstr[1] "Nachrichten"
+
+#: ../mail/e-mail-session.c:833
+#, c-format
+msgid "Enter Passphrase for %s"
+msgstr "Passwort fÃr %s eingeben"
+
+#: ../mail/e-mail-session.c:837
+msgid "Enter Passphrase"
+msgstr "Geben Sie das Passwort ein"
+
+#: ../mail/e-mail-session.c:841
+#, c-format
+msgid "Enter Password for %s"
+msgstr "Passwort fÃr %s eingeben"
+
+#: ../mail/e-mail-session.c:845
 msgid "Enter Password"
 msgstr "Geben Sie das Passwort ein"
 
-#: ../mail/e-mail-session.c:703
+#: ../mail/e-mail-session.c:896
 #, c-format
 msgid "User canceled operation."
 msgstr "Benutzer hat Vorgang abgebrochen."
 
-#: ../mail/e-mail-session.c:873
+#: ../mail/e-mail-session.c:1009
 #, c-format
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
@@ -9105,30 +9292,25 @@ msgstr ""
 "Das Weiterleiten der Nachricht wurde abgebrochen, da keine Zieladresse "
 "angegeben wurde."
 
-#: ../mail/e-mail-session.c:882
+#: ../mail/e-mail-session.c:1018
 #, 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/e-mail-session.c:1290 ../mail/mail-ops.c:1227
+#: ../mail/e-mail-session-utils.c:419
 #, c-format
-msgid "Opening folder '%s'"
-msgstr "Ordner Â%s wird geÃffnet"
+msgid "Cannot get transport for account '%s'"
+msgstr "Transport fÃr Konto Â%s konnte nicht erhalten werden"
 
-#: ../mail/e-mail-session.c:1306
-#, c-format
-msgid "Invalid folder: %s"
-msgstr "UngÃltiger Ordner: Â%sÂ"
-
-#: ../mail/e-mail-session-utils.c:490 ../mail/mail-ops.c:612
+#: ../mail/e-mail-session-utils.c:506 ../mail/mail-ops.c:633
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Ausgangsfilter konnten nicht angewandt werden: %s"
 
-#: ../mail/e-mail-session-utils.c:514 ../mail/e-mail-session-utils.c:548
-#: ../mail/mail-ops.c:629 ../mail/mail-ops.c:660
+#: ../mail/e-mail-session-utils.c:530 ../mail/e-mail-session-utils.c:564
+#: ../mail/mail-ops.c:652 ../mail/mail-ops.c:686
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -9137,191 +9319,45 @@ msgstr ""
 "AnhÃngen an %s gescheitert: %s\n"
 "Stattdessen wird versucht, an den lokalen ÂVerschicktÂ-Ordner anzuhÃngen."
 
-#: ../mail/e-mail-session-utils.c:568 ../mail/mail-ops.c:680
+#: ../mail/e-mail-session-utils.c:584 ../mail/mail-ops.c:706
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "AnhÃngen an lokalen ÂVerschicktÂ-Ordner gescheitert: %s"
 
-#: ../mail/e-mail-session-utils.c:779 ../mail/mail-ops.c:781
-#: ../mail/mail-ops.c:873
+#: ../mail/e-mail-session-utils.c:795 ../mail/mail-ops.c:809
+#: ../mail/mail-ops.c:905
 msgid "Sending message"
 msgstr "Nachricht wird verschickt"
 
-#: ../mail/e-mail-session-utils.c:850
+#: ../mail/e-mail-session-utils.c:871
 #, c-format
 msgid "Unsubscribing from folder '%s'"
 msgstr "Ordners Â%s wird abbestellt"
 
-#: ../mail/e-mail-store-utils.c:39
+#: ../mail/e-mail-store-utils.c:167
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "Verbindung mit Â%s wird getrennt"
 
-#: ../mail/e-mail-store-utils.c:130
+#: ../mail/e-mail-store-utils.c:258
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Verbindung mit Â%s wird erneut hergestellt"
 
+#: ../mail/e-mail-store-utils.c:333
+#, c-format
+msgid "Preparing account '%s' for offline"
+msgstr "Konto Â%s wird fÃr Offline-Betrieb vorbereitet"
+
 #: ../mail/e-mail-tag-editor.c:291
 msgid "Flag to Follow Up"
 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:565 ../mail/mail-config.ui.h:69
-#: ../modules/addressbook/ldap-config.ui.h:9
-msgid "No encryption"
-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:569 ../mail/mail-config.ui.h:126
-#: ../modules/addressbook/ldap-config.ui.h:20
-msgid "TLS encryption"
-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:573 ../mail/mail-config.ui.h:91
-#: ../modules/addressbook/ldap-config.ui.h:12
-msgid "SSL encryption"
-msgstr "SSL-VerschlÃsselung"
-
-#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:836 ../widgets/misc/e-signature-combo-box.c:75
-msgctxt "mail-signature"
-msgid "None"
-msgstr "Keine"
-
-#: ../mail/em-account-editor.c:917
-msgid "Never"
-msgstr "Nie"
-
-#: ../mail/em-account-editor.c:918
-msgid "Always"
-msgstr "Immer"
-
-#: ../mail/em-account-editor.c:919
-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:1702 ../widgets/misc/e-account-tree-view.c:127
-msgctxt "mail-receiving"
-msgid "None"
-msgstr "Keine"
-
-#: ../mail/em-account-editor.c:2108
-msgid "Mail Configuration"
-msgstr "E-Mail-Konfiguration"
-
-#: ../mail/em-account-editor.c:2109
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Forward\" to begin."
-msgstr ""
-"Willkommen zum Evolution-E-Mail-Konfigurationsassistenten!\n"
-"\n"
-"Klicken Sie auf ÂVorÂ, um die Konfiguration zu beginnen."
-
-#: ../mail/em-account-editor.c:2112
-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 email you send."
-msgstr ""
-"Bitte geben Sie unten Ihren Namen und Ihre E-Mail-Adresse an. Die Felder "
-"unter ÂOptional mÃssen nicht\n"
-"ausgefÃllt werden, es sei denn, Sie wollen diese Informationen in von Ihnen "
-"verschickten E-Mails einschlieÃen."
-
-#: ../mail/em-account-editor.c:2114 ../mail/em-account-editor.c:2277
-msgid "Receiving Email"
-msgstr "Abrufen von E-Mails"
-
-#: ../mail/em-account-editor.c:2115
-msgid "Please configure the following account settings."
-msgstr "Bitte konfigurieren Sie die folgenden Konteneinstellungen."
-
-#: ../mail/em-account-editor.c:2117 ../mail/em-account-editor.c:2777
-msgid "Sending Email"
-msgstr "Verschicken von E-Mails"
-
-#: ../mail/em-account-editor.c:2118
-msgid ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
-msgstr ""
-"Bitte geben Sie unten Informationen zur Art und Weise ein, auf die Sie E-"
-"Mails verschicken wollen. Falls Sie sich nicht sicher sind, wenden Sie sich "
-"bitte an Ihren Systemadministrator oder Internet-Provider."
-
-#: ../mail/em-account-editor.c:2120 ../mail/mail-config.ui.h:1
-msgid "Account Information"
-msgstr "Konteninformation"
-
-#: ../mail/em-account-editor.c:2121
-msgid ""
-"Please enter a descriptive name for this account below.\n"
-"This name will be used for display purposes only."
-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:2125
-msgid "Done"
-msgstr "Fertig"
-
-#: ../mail/em-account-editor.c:2126
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email using Evolution.\n"
-"\n"
-"Click \"Apply\" to save your settings."
-msgstr ""
-"Herzlichen GlÃckwunsch!\n"
-"Ihre E-Mail-Konfiguration ist abgeschlossen.\n"
-"\n"
-"Sie kÃnnen jetzt mit Evolution E-Mails verschicken und\n"
-"abrufen.\n"
-"\n"
-"Klicken Sie auf ÂAnwendenÂ, um Ihre Einstellungen zu\n"
-"speichern."
-
-#: ../mail/em-account-editor.c:2591
-msgid "Check for _new messages every"
-msgstr "_Automatisch nach neuen E-Mails sehen alle"
-
-#: ../mail/em-account-editor.c:2599
-msgid "minu_tes"
-msgstr "Minu_ten"
-
-#: ../mail/em-account-editor.c:2882
-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:3192 ../mail/mail-config.ui.h:98
-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:3238 ../mail/em-account-editor.c:3306
-msgid "Receiving Options"
-msgstr "Empfangsoptionen"
-
-#: ../mail/em-account-editor.c:3239 ../mail/em-account-editor.c:3307
-msgid "Checking for New Messages"
-msgstr "Nach neuen E-Mails sehen"
-
-#. Note to translators: this is the attribution string used when quoting messages.
-#. * each ${Variable} gets replaced with a value. To see a full list of available
-#. * variables, see mail/em-composer-utils.c:attribvars array
-#: ../mail/em-composer-utils.c:1173
+#. Note to translators: this is the attribution string used
+#. * when quoting messages.  Each ${Variable} gets replaced
+#. * with a value.  To see a full list of available variables,
+#. * see mail/em-composer-utils.c:attribvars array.
+#: ../mail/em-composer-utils.c:1183
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -9329,35 +9365,35 @@ msgstr ""
 "Am ${WeekdayName}, den ${Day}.${Month}.${Year}, ${24Hour}:${Minute} "
 "${TimeZone} schrieb ${Sender}:"
 
-#: ../mail/em-composer-utils.c:1184
+#: ../mail/em-composer-utils.c:1194
 msgid "-----Original Message-----"
 msgstr "-------- Weitergeleitete Nachricht --------"
 
 #. 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:1851
+#: ../mail/em-composer-utils.c:1975
 #, 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."
 
-#: ../mail/em-composer-utils.c:1905
+#: ../mail/em-composer-utils.c:2034
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "ZustellungsbestÃtigung fÃr: Â%sÂ"
 
-#: ../mail/em-composer-utils.c:2356
+#: ../mail/em-composer-utils.c:2536
 msgid "an unknown sender"
 msgstr "ein unbekannter Absender"
 
-#: ../mail/em-composer-utils.c:2787
+#: ../mail/em-composer-utils.c:2937
 msgid "Posting destination"
 msgstr "Zielordner"
 
-#: ../mail/em-composer-utils.c:2788
+#: ../mail/em-composer-utils.c:2938
 msgid "Choose folders to post the message to."
 msgstr "WÃhlen Sie Ordner, in denen die Nachricht abgelegt werden soll."
 
-#: ../mail/em-filter-folder-element.c:339
+#: ../mail/em-filter-folder-element.c:241
 msgid "Select Folder"
 msgstr "Ordner wÃhlen"
 
@@ -9474,7 +9510,7 @@ msgstr "ist nicht gesetzt"
 msgid "is set"
 msgstr "ist gesetzt"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:60
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:63
 msgid "Junk"
 msgstr "UnerwÃnscht"
 
@@ -9523,7 +9559,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:15
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:16
 msgid "Read"
 msgstr "Gelesen"
 
@@ -9604,40 +9640,37 @@ msgid "Unset Status"
 msgstr "Status nicht setzen"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:536
+#: ../mail/em-filter-rule.c:538
 msgid "Then"
 msgstr "Dann"
 
-#: ../mail/em-filter-rule.c:567
+#: ../mail/em-filter-rule.c:569
 msgid "Add Ac_tion"
 msgstr "Aktion hin_zufÃgen"
 
-#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:124
+#: ../mail/em-folder-properties.c:143
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Ungelesene Nachrichten:"
 msgstr[1] "Ungelesene Nachrichten:"
 
-#. TODO: can this be done in a loop?
-#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:128
+#: ../mail/em-folder-properties.c:154
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Nachrichten insgesamt:"
 msgstr[1] "Nachrichten insgesamt:"
 
-#: ../mail/em-folder-properties.c:146
+#: ../mail/em-folder-properties.c:175
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Speicherverbrauch (%s):"
 
-#: ../mail/em-folder-properties.c:148
+#: ../mail/em-folder-properties.c:177
 #, c-format
 msgid "Quota usage"
 msgstr "Speicherverbrauch:"
 
-#: ../mail/em-folder-properties.c:290
+#: ../mail/em-folder-properties.c:315
 msgid "Folder Properties"
 msgstr "Ordnereigenschaften"
 
@@ -9645,119 +9678,197 @@ msgstr "Ordnereigenschaften"
 msgid "<click here to select a folder>"
 msgstr "<Klicken Sie hier, um einen Ordner auszuwÃhlen>"
 
-#: ../mail/em-folder-selector.c:261
+#: ../mail/em-folder-selector.c:385
 msgid "C_reate"
 msgstr "_Anlegen"
 
-#: ../mail/em-folder-selector.c:265
+#: ../mail/em-folder-selector.c:391
 msgid "Folder _name:"
 msgstr "Ordner_name:"
 
-#. load store to mail component
-#: ../mail/em-folder-tree-model.c:147 ../mail/em-folder-tree-model.c:150
-#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:158
-#: ../mail/em-folder-tree-model.c:165 ../mail/em-folder-tree-model.c:167
-#: ../mail/mail-vfolder.c:1164 ../mail/mail-vfolder.c:1239
-msgid "Search Folders"
-msgstr "Suchordner"
-
-# CHECK
-#. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:172 ../mail/em-folder-tree-model.c:174
-msgid "UNMATCHED"
-msgstr "OHNE TREFFER"
-
-#: ../mail/em-folder-tree-model.c:808 ../mail/em-folder-tree-model.c:1085
-msgid "Loading..."
-msgstr "Ladevorgang â"
-
-#: ../mail/em-folder-tree.c:197
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "Ordner in Â%s werden eingelesen"
-
-#: ../mail/em-folder-tree.c:625
+#: ../mail/em-folder-tree.c:647
 msgid "Folder names cannot contain '/'"
 msgstr "Ordnernamen dÃrfen das Slash-Zeichen Â/Â nicht enthalten"
 
-#: ../mail/em-folder-tree.c:1245
+#: ../mail/em-folder-tree.c:1331
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1482
+#: ../mail/em-folder-tree.c:1568
 msgid "Mail Folder Tree"
 msgstr "E-Mail-Ordnerbaum"
 
-#: ../mail/em-folder-tree.c:1938 ../mail/em-folder-utils.c:90
+#: ../mail/em-folder-tree.c:2068 ../mail/em-folder-utils.c:114
 #, c-format
 msgid "Moving folder %s"
 msgstr "Ordner %s wird verschoben"
 
-#: ../mail/em-folder-tree.c:1942 ../mail/em-folder-utils.c:92
+#: ../mail/em-folder-tree.c:2071 ../mail/em-folder-utils.c:116
 #, c-format
 msgid "Copying folder %s"
 msgstr "Ordner %s wird kopiert"
 
-#: ../mail/em-folder-tree.c:1951 ../mail/message-list.c:2229
+#: ../mail/em-folder-tree.c:2078 ../mail/message-list.c:2218
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Nachrichten werden in den Ordner %s verschoben"
 
-#: ../mail/em-folder-tree.c:1955 ../mail/message-list.c:2231
+#: ../mail/em-folder-tree.c:2082 ../mail/message-list.c:2220
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Nachrichten werden in den Ordner %s kopiert"
 
-#: ../mail/em-folder-tree.c:1974
+#: ../mail/em-folder-tree.c:2101
 #, 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:429
+#. load store to mail component
+#: ../mail/em-folder-tree-model.c:147 ../mail/em-folder-tree-model.c:150
+#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:158
+#: ../mail/em-folder-tree-model.c:165 ../mail/em-folder-tree-model.c:167
+#: ../mail/mail-vfolder.c:1165 ../mail/mail-vfolder.c:1240
+msgid "Search Folders"
+msgstr "Suchordner"
+
+# CHECK
+#. UNMATCHED is always last.
+#: ../mail/em-folder-tree-model.c:172 ../mail/em-folder-tree-model.c:174
+msgid "UNMATCHED"
+msgstr "OHNE TREFFER"
+
+#: ../mail/em-folder-tree-model.c:792 ../mail/em-folder-tree-model.c:1061
+msgid "Loading..."
+msgstr "Ladevorgang â"
+
+#: ../mail/em-folder-utils.c:481
 msgid "Move Folder To"
 msgstr "Ordner verschieben nach"
 
-#: ../mail/em-folder-utils.c:429
+#: ../mail/em-folder-utils.c:481
 msgid "Copy Folder To"
 msgstr "Ordner kopieren nach"
 
-#: ../mail/em-folder-utils.c:578
-#: ../plugins/groupwise-features/share-folder-common.c:138
-#, c-format
-msgid "Creating folder '%s'"
-msgstr "Ordner Â%s wird angelegt"
-
-#: ../mail/em-folder-utils.c:748
+#: ../mail/em-folder-utils.c:556
 msgid "Create Folder"
 msgstr "Ordner anlegen"
 
-#: ../mail/em-folder-utils.c:749
-#: ../plugins/groupwise-features/install-shared.c:178
-#: ../plugins/groupwise-features/share-folder-common.c:353
+#: ../mail/em-folder-utils.c:557
 msgid "Specify where to create the folder:"
 msgstr "Angeben, wo der Ordner angelegt werden soll:"
 
-#: ../mail/em-format-html-display.c:84 ../mail/em-format-html.c:1601
-msgid "Unsigned"
-msgstr "Unsigniert"
+#: ../mail/em-format-html.c:166
+msgid "Formatting message"
+msgstr "Nachricht wird formatiert"
+
+#: ../mail/em-format-html.c:378
+msgid "Formatting Message..."
+msgstr "Nachricht wird formatiert  â"
+
+#: ../mail/em-format-html.c:1551 ../mail/em-format-html.c:1561
+#, c-format
+msgid "Retrieving '%s'"
+msgstr "Â%s wird abgerufen"
+
+#: ../mail/em-format-html.c:1707 ../mail/em-format-html-display.c:85
+msgid "Unsigned"
+msgstr "Unsigniert"
+
+#: ../mail/em-format-html.c:1708 ../mail/em-format-html-display.c:86
+msgid "Valid signature"
+msgstr "GÃltige Signatur"
+
+#: ../mail/em-format-html.c:1709 ../mail/em-format-html-display.c:87
+msgid "Invalid signature"
+msgstr "UngÃltige Signatur"
+
+#: ../mail/em-format-html.c:1710 ../mail/em-format-html-display.c:88
+msgid "Valid signature, but cannot verify sender"
+msgstr "GÃltige Signatur, Absender konnte jedoch nicht verifiziert werden"
+
+#: ../mail/em-format-html.c:1711 ../mail/em-format-html-display.c:89
+msgid "Signature exists, but need public key"
+msgstr "Signatur existiert, jedoch wird der Ãffentliche SchlÃssel benÃtigt"
+
+#: ../mail/em-format-html.c:1717 ../mail/em-format-html-display.c:96
+msgid "Unencrypted"
+msgstr "Nicht verschlÃsselt"
+
+#: ../mail/em-format-html.c:1718 ../mail/em-format-html-display.c:97
+msgid "Encrypted, weak"
+msgstr "Schwach verschlÃsselt"
+
+#: ../mail/em-format-html.c:1719 ../mail/em-format-html-display.c:98
+msgid "Encrypted"
+msgstr "VerschlÃsselt"
+
+#: ../mail/em-format-html.c:1720 ../mail/em-format-html-display.c:99
+msgid "Encrypted, strong"
+msgstr "Stark verschlÃsselt"
+
+#: ../mail/em-format-html.c:2120
+msgid "Unknown external-body part."
+msgstr "Unbekannter external-body-Teil."
+
+#: ../mail/em-format-html.c:2130
+msgid "Malformed external-body part."
+msgstr "Fehlerhaft formatierter external-body-Teil."
+
+#: ../mail/em-format-html.c:2161
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Zeiger auf FTP-Site (%s)"
+
+#: ../mail/em-format-html.c:2172
+#, 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:2174
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Zeiger auf lokale Datei (%s)"
+
+#: ../mail/em-format-html.c:2195
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Zeiger auf ferne Daten (%s)"
+
+#: ../mail/em-format-html.c:2210
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Zeiger auf unbekannte externe Daten (Typ Â%sÂ)"
+
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user example com"
+#: ../mail/em-format-html.c:2915
+#: ../plugins/mail-notification/mail-notification.c:405
+#, c-format
+msgid "From: %s"
+msgstr "Von: %s"
+
+#: ../mail/em-format-html.c:2937
+msgid "(no subject)"
+msgstr "(Kein Betreff)"
+
+#: ../mail/em-format-html.c:3013
+#, c-format
+msgid "This message was sent by %s on behalf of %s"
+msgstr "Diese Nachricht wurde von %s im Namen von %s gesendet"
 
-#: ../mail/em-format-html-display.c:84
+#: ../mail/em-format-html-display.c:85
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr ""
-"Diese Nachricht ist nicht signiert. Die AuthentizitÃt des Absenders ist "
-"daher nicht sichergestellt."
-
-#: ../mail/em-format-html-display.c:85 ../mail/em-format-html.c:1602
-msgid "Valid signature"
-msgstr "GÃltige Signatur"
+"Diese Nachricht ist nicht signiert. Die AuthentizitÃt des Absenders ist daher "
+"nicht sichergestellt."
 
 # CHECK
-#: ../mail/em-format-html-display.c:85
+#: ../mail/em-format-html-display.c:86
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -9765,23 +9876,15 @@ 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:86 ../mail/em-format-html.c:1603
-msgid "Invalid signature"
-msgstr "UngÃltige Signatur"
-
-#: ../mail/em-format-html-display.c:86
+#: ../mail/em-format-html-display.c:87
 msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
+"The signature of this message cannot be verified, it may have been altered in "
+"transit."
 msgstr ""
-"Die Signatur dieser Nachricht konnte nicht verifiziert werden. "
-"MÃglicherweise wurde sie bei der Ãbertragung verÃndert."
-
-#: ../mail/em-format-html-display.c:87 ../mail/em-format-html.c:1604
-msgid "Valid signature, but cannot verify sender"
-msgstr "GÃltige Signatur, Absender konnte jedoch nicht verifiziert werden"
+"Die Signatur dieser Nachricht konnte nicht verifiziert werden. MÃglicherweise "
+"wurde sie bei der Ãbertragung verÃndert."
 
-#: ../mail/em-format-html-display.c:87
+#: ../mail/em-format-html-display.c:88
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -9789,23 +9892,15 @@ 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:88 ../mail/em-format-html.c:1605
-msgid "Signature exists, but need public key"
-msgstr "Signatur existiert, jedoch wird der Ãffentliche SchlÃssel benÃtigt"
-
-#: ../mail/em-format-html-display.c:88
+#: ../mail/em-format-html-display.c:89
 msgid ""
-"This message is signed with a signature, but there is no corresponding "
-"public key."
+"This message is signed with a signature, but there is no corresponding public "
+"key."
 msgstr ""
 "Diese Nachricht wurde mit einer gÃltigen Signatur signiert, jedoch ist kein "
 "passender Ãffentlicher SchlÃssel vorhanden."
 
-#: ../mail/em-format-html-display.c:95 ../mail/em-format-html.c:1611
-msgid "Unencrypted"
-msgstr "Nicht verschlÃsselt"
-
-#: ../mail/em-format-html-display.c:95
+#: ../mail/em-format-html-display.c:96
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -9813,55 +9908,43 @@ 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:96 ../mail/em-format-html.c:1612
-msgid "Encrypted, weak"
-msgstr "Schwach verschlÃsselt"
-
-#: ../mail/em-format-html-display.c:96
+#: ../mail/em-format-html-display.c:97
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr ""
-"Diese Nachricht ist verschlÃsselt, der VerschlÃsselungsalgorithmus ist "
-"jedoch 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:97 ../mail/em-format-html.c:1613
-msgid "Encrypted"
-msgstr "VerschlÃsselt"
+"Diese Nachricht ist verschlÃsselt, der VerschlÃsselungsalgorithmus ist jedoch "
+"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:97
+#: ../mail/em-format-html-display.c:98
 msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
+"This message is encrypted.  It would be difficult for an outsider to view the "
+"content of this message."
 msgstr ""
 "Diese Nachricht ist verschlÃsselt. Daher kÃnnen Dritte ihren Inhalt nur "
 "schwerlich ausspÃhen."
 
-#: ../mail/em-format-html-display.c:98 ../mail/em-format-html.c:1614
-msgid "Encrypted, strong"
-msgstr "Stark verschlÃsselt"
-
-#: ../mail/em-format-html-display.c:98
+#: ../mail/em-format-html-display.c:99
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr ""
 "Diese Nachricht ist mit einem starken VerschlÃsselungsalgorithmus "
-"verschlÃsselt. Daher kÃnnen Dritte ihren Inhalt nur sehr schwerlich "
-"innerhalb eines praktikablen Zeitraums ausspÃhen."
+"verschlÃsselt. Daher kÃnnen Dritte ihren Inhalt nur sehr schwerlich innerhalb "
+"eines praktikablen Zeitraums ausspÃhen."
 
-#: ../mail/em-format-html-display.c:236 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:237 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "_Zertifikat anzeigen"
 
-#: ../mail/em-format-html-display.c:249
+#: ../mail/em-format-html-display.c:250
 msgid "This certificate is not viewable"
 msgstr "Dieses Zertifikat kann nicht angezeigt werden"
 
-#: ../mail/em-format-html-display.c:538
+#: ../mail/em-format-html-display.c:552
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -9869,28 +9952,27 @@ 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:804
+#: ../mail/em-format-html-display.c:848
 msgid "Completed on"
 msgstr "Abgeschlossen am"
 
-#: ../mail/em-format-html-display.c:812
+#: ../mail/em-format-html-display.c:860
 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:816
+#: ../mail/em-format-html-display.c:868
 msgid "by"
 msgstr "am"
 
-#: ../mail/em-format-html-display.c:1047 ../mail/em-format-html-display.c:1094
+#: ../mail/em-format-html-display.c:1144 ../mail/em-format-html-display.c:1191
 msgid "View _Unformatted"
 msgstr "_Unformatierte ansehen"
 
-#: ../mail/em-format-html-display.c:1049
+#: ../mail/em-format-html-display.c:1146
 msgid "Hide _Unformatted"
 msgstr "_Unformatierte verstecken"
 
-#: ../mail/em-format-html-display.c:1114
+#: ../mail/em-format-html-display.c:1211
 msgid "O_pen With"
 msgstr "Ã_ffnen mit"
 
@@ -9899,120 +9981,67 @@ msgstr "Ã_ffnen mit"
 msgid "Page %d of %d"
 msgstr "Seite %d von %d"
 
-#: ../mail/em-format-html.c:161
-msgid "Formatting message"
-msgstr "Nachricht wird formatiert"
-
-#: ../mail/em-format-html.c:360
-msgid "Formatting Message..."
-msgstr "Nachricht wird formatiert  â"
-
-#: ../mail/em-format-html.c:1445 ../mail/em-format-html.c:1455
-#, c-format
-msgid "Retrieving '%s'"
-msgstr "Â%s wird abgerufen"
-
-#: ../mail/em-format-html.c:1976
-msgid "Unknown external-body part."
-msgstr "Unbekannter external-body-Teil."
-
-#: ../mail/em-format-html.c:1984
-msgid "Malformed external-body part."
-msgstr "Fehlerhaft formatierter external-body-Teil."
-
-#: ../mail/em-format-html.c:2014
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Zeiger auf FTP-Site (%s)"
-
-#: ../mail/em-format-html.c:2025
-#, 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:2027
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Zeiger auf lokale Datei (%s)"
-
-#: ../mail/em-format-html.c:2048
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Zeiger auf ferne Daten (%s)"
-
-#: ../mail/em-format-html.c:2059
-#, 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:2772
-#, c-format
-msgid "This message was sent by %s on behalf of %s"
-msgstr "Diese Nachricht wurde von %s im Namen von %s gesendet"
-
 #: ../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-subscription-editor.c:1105
+#: ../mail/em-subscription-editor.c:1138
 msgid "Folder Subscriptions"
 msgstr "Ordnerabonnements"
 
-#: ../mail/em-subscription-editor.c:1144
+#: ../mail/em-subscription-editor.c:1177
 msgid "_Account:"
 msgstr "_Konto:"
 
-#: ../mail/em-subscription-editor.c:1159
+#: ../mail/em-subscription-editor.c:1192
 msgid "Clear Search"
 msgstr "Suchfeld leeren"
 
-#: ../mail/em-subscription-editor.c:1177
+#: ../mail/em-subscription-editor.c:1210
 msgid "Sho_w items that contain:"
 msgstr "Nur EintrÃge anzeigen, die Folgendes ent_halten:"
 
-#: ../mail/em-subscription-editor.c:1216
+#: ../mail/em-subscription-editor.c:1249
 msgid "Subscribe to the selected folder"
 msgstr "Den gewÃhlten Ordner abonnieren"
 
-#: ../mail/em-subscription-editor.c:1217
+#: ../mail/em-subscription-editor.c:1250
 msgid "Su_bscribe"
 msgstr "A_bonnieren"
 
-#: ../mail/em-subscription-editor.c:1228
-#: ../modules/mail/e-mail-shell-view-actions.c:1178
+#: ../mail/em-subscription-editor.c:1261
+#: ../modules/mail/e-mail-shell-view-actions.c:1224
 msgid "Unsubscribe from the selected folder"
 msgstr "Den gewÃhlten Ordner abbestellen"
 
-#: ../mail/em-subscription-editor.c:1229
-#: ../modules/mail/e-mail-shell-view-actions.c:1176
+#: ../mail/em-subscription-editor.c:1262
+#: ../modules/mail/e-mail-shell-view-actions.c:1222
 msgid "_Unsubscribe"
 msgstr "Ab_bestellen"
 
-#: ../mail/em-subscription-editor.c:1240
+#: ../mail/em-subscription-editor.c:1273
 msgid "Collapse all folders"
 msgstr "Alle Ordner einklappen"
 
-#: ../mail/em-subscription-editor.c:1241
+#: ../mail/em-subscription-editor.c:1274
 msgid "C_ollapse All"
 msgstr "Alle _einklappen"
 
-#: ../mail/em-subscription-editor.c:1251
+#: ../mail/em-subscription-editor.c:1284
 msgid "Expand all folders"
 msgstr "Alle Ordner aufklappen"
 
-#: ../mail/em-subscription-editor.c:1252
+#: ../mail/em-subscription-editor.c:1285
 msgid "E_xpand All"
 msgstr "Alle _aufklappen"
 
-#: ../mail/em-subscription-editor.c:1262
+#: ../mail/em-subscription-editor.c:1295
 msgid "Refresh the folder list"
 msgstr "Die Ordnerliste auffrischen"
 
-#: ../mail/em-subscription-editor.c:1274
+#: ../mail/em-subscription-editor.c:1307
 msgid "Stop the current operation"
 msgstr "Den momentan ausgefÃhrten Vorgang abbrechen"
 
@@ -10021,40 +10050,32 @@ msgstr "Den momentan ausgefÃhrten Vorgang abbrechen"
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:101
+#: ../mail/em-utils.c:102
 #, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "Sind Sie sicher, dass Sie %d Nachricht auf einmal Ãffnen wollen?"
 msgstr[1] "Sind Sie sicher, dass Sie %d Nachrichten auf einmal Ãffnen wollen?"
 
-#: ../mail/em-utils.c:153
-#: ../modules/mailto-handler/evolution-mailto-handler.c:151
+#: ../mail/em-utils.c:158
+#: ../modules/mailto-handler/evolution-mailto-handler.c:154
 msgid "_Do not show this message again"
 msgstr "Diese _Meldung nicht mehr anzeigen"
 
-#: ../mail/em-utils.c:328
+#: ../mail/em-utils.c:331
 msgid "Message Filters"
 msgstr "Nachrichtenfilter"
 
-#: ../mail/em-utils.c:904
+#: ../mail/em-utils.c:916
 #, c-format
 msgid "Messages from %s"
 msgstr "Nachrichten von %s"
 
-#. Destination folder, was set in our widget
-#: ../mail/em-utils.c:2534 ../plugins/dbx-import/dbx-importer.c:593
-#: ../plugins/pst-import/pst-importer.c:523
-#: ../plugins/pst-import/pst-importer.c:659
-#, c-format
-msgid "Importing '%s'"
-msgstr "Â%s wird importiert"
-
 #: ../mail/em-vfolder-editor.c:108
 msgid "Search _Folders"
 msgstr "Such_ordner"
 
-#: ../mail/em-vfolder-rule.c:610
+#: ../mail/em-vfolder-rule.c:604
 msgid "Add Folder"
 msgstr "Ordner hinzufÃgen"
 
@@ -10111,7 +10132,7 @@ msgid "Always request read receipt"
 msgstr "LesebestÃtigung immer anfordern"
 
 #: ../mail/evolution-mail.schemas.in.h:14
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr ""
 "Anzahl der Sekunden, die eine Fehlermeldung in der Statusleiste angezeigt "
@@ -10119,8 +10140,8 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:15
 msgid ""
-"Asks whether to close the message window when the user forwards or replies "
-"to the message shown in the window"
+"Asks whether to close the message window when the user forwards or replies to "
+"the message shown in the window"
 msgstr ""
 "Nachfragen, ob das Nachrichtenfenster geschlossen werden soll, wenn die "
 "Nachricht im Nachrichtenfenster weitergeleitet oder beantwortet wird."
@@ -10254,19 +10275,24 @@ msgstr "Die voreingestellte Breite des Nachrichtenbrowserfensters."
 
 #: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
+"Describes whether message headers in paned view should be collapsed or "
+"expanded by default. \"0\" = expanded \"1\" = collapsed"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:45
+msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 msgstr ""
 "Legt fest, ob nur in lokalen AdressbÃchern nach der E-Mail-Adresse des "
 "Absenders fÃr das Filtern unerwÃnschter Nachrichten gesucht wird"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Determines whether to lookup in address book for sender email"
 msgstr ""
-"Legt fest, ob im Adressbuch nach der E-Mail-Adresse des Absenders gesucht "
-"wird"
+"Legt fest, ob im Adressbuch nach der E-Mail-Adresse des Absenders gesucht wird"
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -10275,111 +10301,111 @@ msgid ""
 msgstr ""
 "Legt fest, ob im Adressbuch nach der E-Mail-Adresse des Absenders gesucht "
 "wird. Falls die Adresse gefunden wird, so ist die E-Mail nicht unerwÃnscht. "
-"Es wird nur in AdressbÃchern gesucht, die fÃr Auto-VervollstÃndigung "
-"markiert sind. Diese Funktion kann langsam sein falls entfernte AdressbÃcher "
-"(wie LDAP) fÃr die Auto-VervollstÃndigung aktiviert sind."
+"Es wird nur in AdressbÃchern gesucht, die fÃr Auto-VervollstÃndigung markiert "
+"sind. Diese Funktion kann langsam sein falls entfernte AdressbÃcher (wie "
+"LDAP) fÃr die Auto-VervollstÃndigung aktiviert sind."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Legt fest, ob benutzerdefinierte Kopfzeilen fÃr die UnerwÃnscht-PrÃfung "
 "benutzt werden sollen"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid ""
-"Determines whether to use custom headers to check for junk. If this option "
-"is enabled and the headers are mentioned, it will be improve the junk "
-"checking speed."
+"Determines whether to use custom headers to check for junk. If this option is "
+"enabled and the headers are mentioned, it will be improve the junk checking "
+"speed."
 msgstr ""
 "Legt fest, ob benutzerdefinierte Kopfzeilen fÃr die PrÃfung auf "
 "UnerwÃnschtheit benutzt werden sollen. Wenn diese Option aktiviert ist und "
 "eine angegebene Kopfzeile auftritt, so wird hierdurch die PrÃfung auf "
 "UnerwÃnschtheit beschleunigt."
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
 msgstr ""
-"Legt fest, ob die gleichen Schriften fÃr die ÂVonÂ- und die ÂBetreffÂ-Zeile in "
-"der ÂNachrichtenÂ-Spalte der vertikalen Ansicht verwendet werden."
+"Legt fest, ob die gleichen Schriften fÃr die ÂVonÂ- und die ÂBetreffÂ-Zeile "
+"in der ÂNachrichtenÂ-Spalte der vertikalen Ansicht verwendet werden."
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Directory for loading/attaching files to composer."
 msgstr "Vorgabeordner fÃr Anlagen im Nachrichteneditor."
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Directory for saving mail component files."
 msgstr "Ordner zum Speichern der E-Mailkomponenten-Dateien."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "Zu lange Ordnernamen in Seitenleiste abkÃrzen"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Display only message texts not exceeding certain size"
 msgstr ""
 "Nur Nachrichtentexte anzeigen, die eine bestimmte GrÃÃe nicht Ãberschreiten"
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Do not add signature delimiter"
 msgstr "Kein Signaturtrennzeichen hinzufÃgen"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Indikatoren fÃr Rechtschreibfehler bei der Eingabe zeichnen."
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Empty Junk folders on exit"
 msgstr "UnerwÃnscht-Ordner beim Beenden leeren"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Empty Trash folders on exit"
 msgstr "MÃllordner beim Beenden leeren"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Alle UnerwÃnscht-Ordner beim Beenden von Evolution leeren."
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Alle MÃllordner beim Beenden von Evolution leeren."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid ""
-"Enable animated images in HTML mail. Many users find animated images "
-"annoying and prefer to see a static image instead."
+"Enable animated images in HTML mail. Many users find animated images annoying "
+"and prefer to see a static image instead."
 msgstr ""
 "Bewegte Bilder in HTML-Nachrichten einschalten. Viele Benutzer empfinden "
 "animierte Bilder als stÃrend und bevorzugen, ein statisches Bild zu sehen."
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
-"Eingabezeiger aktivieren, so dass beim Lesen von E-Mails ein Cursor "
-"angezeigt wird."
+"Eingabezeiger aktivieren, so dass beim Lesen von E-Mails ein Cursor angezeigt "
+"wird."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid "Enable or disable magic space bar"
 msgstr "Magische Leertaste ein-/ausschalten"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Die Anzeige beim Markieren mehrerer Nachrichten ein-/ausschalten"
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable or disable type ahead search feature"
 msgstr "Schnellsuche an- oder abschalten"
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid "Enable search folders"
 msgstr "Suchordner aktivieren"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Enable search folders on startup."
 msgstr "Aktiviert die Suchordner beim Starten von Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -10387,7 +10413,7 @@ msgstr ""
 "Die Suchfunktion in der Seitenleiste einschalten fÃr die interaktive Suche "
 "nach Ordnernamen."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -10395,7 +10421,7 @@ msgstr ""
 "Legt fest, ob die Leertaste zum BlÃttern in der Nachrichtenvorschau, der "
 "Nachrichtenliste und den Ordnern benutzt werden soll."
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid ""
 "Enable to display only message texts not exceeding size defined in "
 "'message_text_part_limit' key."
@@ -10403,23 +10429,23 @@ msgstr ""
 "Nur Nachrichtentexte anzeigen, welche die im SchlÃssel "
 "Âmessage_text_part_limit angegebene GrÃÃe nicht Ãbersteigen."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 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:71
+#: ../mail/evolution-mail.schemas.in.h:72
 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:72
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Enable/disable caret mode"
 msgstr "Eingabezeiger aktivieren/deaktivieren"
 
-#: ../mail/evolution-mail.schemas.in.h:73 ../mail/mail-config.ui.h:44
+#: ../mail/evolution-mail.schemas.in.h:74 ../mail/mail-config.ui.h:45
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Dateinamen wie Outlook und GMail kodieren"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 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, "
@@ -10431,41 +10457,41 @@ msgstr ""
 "darstellen. Beide ignorieren den Standard RFC 2231 und benutzen den "
 "inkorrekten Standard RFC 2047."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "Flush Outbox after filtering"
 msgstr "Nachrichtenausgang nach dem Filtern leeren"
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "Forward message."
 msgstr "Weitergeleitete Nachricht."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "Group Reply replies to list"
 msgstr "Gruppenantwort wird an Mailingliste geleitet"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "Height of the message-list pane"
 msgstr "HÃhe des Nachrichtenlistenfelds"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Height of the message-list pane."
 msgstr "HÃhe des Nachrichtenlistenfelds."
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Deaktiviert das Vorschaufenster und entfernt die Auswahl"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid ""
-"If a user tries to open 10 or more messages at one time, ask the user if "
-"they really want to do it."
+"If a user tries to open 10 or more messages at one time, ask the user if they "
+"really want to do it."
 msgstr ""
 "Wenn ein Benutzer versucht, 10 oder mehr Nachrichten auf einmal zu Ãffnen, "
 "wird er gefragt, ob er es wirklich tun will."
 
 # CHECK - etwas holprig
 # IMMER NOCH CHECK - aber schon etwas weniger holprig
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:83
 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 "
@@ -10475,19 +10501,19 @@ 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:83
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Ignore list Reply-To:"
 msgstr "ÂAntwort an der Mailingliste ignorieren"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid ""
-"Initial height of the \"Filter Editor\" window. The value updates as the "
-"user resizes the window vertically."
+"Initial height of the \"Filter Editor\" window. The value updates as the user "
+"resizes the window vertically."
 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:85
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid ""
 "Initial height of the \"Folder Subscriptions\" window. The value updates as "
 "the user resizes the window vertically."
@@ -10495,7 +10521,7 @@ msgstr ""
 "Legt fest, wie hoch das Fenster ÂOrdnerabonnements anfÃnglich ist. Der Wert "
 "Ãndert sich, wenn der Benutzer das Fenster vertikal vergrÃÃert."
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid ""
 "Initial height of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window vertically."
@@ -10503,7 +10529,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:87
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -10511,7 +10537,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:88
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid ""
 "Initial maximize state of the \"Filter Editor\" window. The value updates "
 "when the user maximizes or unmaximizes the window. Note, this particular "
@@ -10524,7 +10550,7 @@ msgstr ""
 "nicht maximiert werden kann. Dieser SchlÃssel existiert nur als "
 "Implementierungsdetail."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid ""
 "Initial maximize state of the \"Folder Subscriptions\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -10537,7 +10563,7 @@ msgstr ""
 "verwendet, da das Fenster nicht maximiert werden kann. Dieser SchlÃssel "
 "existiert nur als Implementierungsdetail."
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid ""
 "Initial maximize state of the \"Search Folder Editor\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -10550,13 +10576,12 @@ msgstr ""
 "nicht maximiert werden kann. Dieser SchlÃssel existiert nur als "
 "Implementierungsdetail."
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Send and Receive Mail"
-"\" window cannot be maximized. This key exists only as an implementation "
-"detail."
+"particular value is not used by Evolution since the \"Send and Receive Mail\" "
+"window cannot be maximized. This key exists only as an implementation detail."
 msgstr ""
 "Legt fest, ob das Fenster ÂE-Mails verschicken und abrufen maximiert ist. "
 "Der Wert Ãndert sich, wenn der Benutzer das Fenster maximiert oder "
@@ -10564,7 +10589,7 @@ msgstr ""
 "verwendet, da das Fenster nicht maximiert werden kann. Dieser SchlÃssel "
 "existiert nur als Implementierungsdetail."
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid ""
 "Initial width of the \"Filter Editor\" window. The value updates as the user "
 "resizes the window horizontally."
@@ -10572,7 +10597,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:93
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid ""
 "Initial width of the \"Folder Subscriptions\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -10580,7 +10605,7 @@ msgstr ""
 "Legt fest, wie breit des Fenster ÂOrdnerabonnements anfÃnglich ist. Der Wert "
 "Ãndert sich, wenn der Benutzer das Fenster horizontal vergrÃÃert."
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -10588,7 +10613,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:95
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -10596,7 +10621,7 @@ 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:96
+#: ../mail/evolution-mail.schemas.in.h:97
 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 "
@@ -10607,17 +10632,17 @@ msgstr ""
 "Werkzeugleistenknopf ÂAntwort an Gruppe eine Antwort nur an die Mailingliste "
 "aus, Ãber die Sie die Nachricht erhalten haben, auf die Sie antworten wollen."
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
 "the search results."
 msgstr ""
 "Legt fest, ob der Benutzer gewarnt werden soll, dass das LÃschen einer "
-"Nachricht in einem Suchordner die Nachricht wirklich lÃscht und nicht nur "
-"aus den Suchergebnissen entfernt."
+"Nachricht in einem Suchordner die Nachricht wirklich lÃscht und nicht nur aus "
+"den Suchergebnissen entfernt."
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:99
 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."
@@ -10626,15 +10651,15 @@ msgstr ""
 "private Antwort auf eine Nachricht versendet, die Ãber eine Mailingliste "
 "eingegangen ist."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid ""
-"It disables/enables the repeated prompts to warn that you are sending a "
-"reply to many people."
+"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:100
+#: ../mail/evolution-mail.schemas.in.h:101
 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 "
@@ -10645,7 +10670,7 @@ msgstr ""
 "Nachricht an den privaten Absender antworten wollen, aber die ÂAntwort anÂ-"
 "Kopfzeile die Antwort normalerweise an die Mailingliste leiten wÃrde."
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
@@ -10654,43 +10679,43 @@ msgstr ""
 "Nachricht an EmpfÃnger versendet, deren Adresse nicht als E-Mail-Adresse "
 "angegeben wurde"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Last time Empty Junk was run"
 msgstr "Letzte Leerung des UnerwÃnscht-Ordners"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Last time Empty Trash was run"
 msgstr "Letzte MÃllleerung"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Layout style"
 msgstr "Anordnung"
 
-#: ../mail/evolution-mail.schemas.in.h:105
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:106
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
 msgid "Level beyond which the message should be logged."
 msgstr "Protokolltyp, ab welchem die Nachricht protokolliert werden soll."
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "List of Labels and their associated colors"
 msgstr "Liste mit Beschriftungen und damit assoziierter Farben"
 
 # CHECK
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 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:108
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "List of accepted licenses"
 msgstr "Liste akzeptierter Lizenzen"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "List of accounts"
 msgstr "Kontenliste"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -10699,192 +10724,192 @@ msgstr ""
 "enthÃlt Zeichenketten, die Unterordner relativ zu Â/appsÂ/evolution/mail/"
 "accounts angeben."
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 "Liste der benutzerdefinierten Kopfzeilen und ihres Aktivierungszustands."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 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:113
+#: ../mail/evolution-mail.schemas.in.h:114
 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."
 msgstr ""
-"Liste der Beschriftungen, die Evolutions E-Mail-Komponenete bekannt sind. "
-"Die Liste enthÃlt Zeichenketten der Form Name:Farbe, wobei die Farbe als "
-"HTML-Hextriplet anzugeben ist."
+"Liste der Beschriftungen, die Evolutions E-Mail-Komponenete bekannt sind. Die "
+"Liste enthÃlt Zeichenketten der Form Name:Farbe, wobei die Farbe als HTML-"
+"Hextriplet anzugeben ist."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "List of protocol names whose license has been accepted."
 msgstr "Liste der Protokollnamen, deren Lizenzen akzeptiert wurden."
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Load images for HTML messages over HTTP"
 msgstr "Bilder fÃr HTML-Nachrichten per HTTP laden"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
-"Never load images off the net. \"1\" - Load images in messages from "
-"contacts. \"2\" - Always load images off the net."
+"Never load images off the net. \"1\" - Load images in messages from contacts. "
+"\"2\" - Always load images off the net."
 msgstr ""
 "Bilder von HTML-Nachrichten per HTTP(S) laden. MÃgliche Werte sind: Â0Â - "
 "Niemals Bilder aus dem Netz laden, Â1Â - Bilder laden falls Absender im "
 "Adressbuch, Â2Â - Immer Bilder aus dem Netz laden."
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Log filter actions"
 msgstr "Filteraktionen protokollieren"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Log filter actions to the specified log file."
 msgstr "Filteraktionen in der angegebenen Protokolldatei protokollieren."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Logfile to log filter actions"
 msgstr "Protokolldatei fÃr Filteraktionen"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Logfile to log filter actions."
 msgstr "Protokolldatei fÃr Filteraktionen."
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Mail browser height"
 msgstr "HÃhe des Nachrichtenbrowsers"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Mail browser maximized"
 msgstr "Nachrichtenbrowser ist maximiert"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Mail browser width"
 msgstr "Breite des Nachrichtenbrowsers"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Mark as Seen after specified timeout"
 msgstr "Nach angegebenem Intervall als gelesen markieren"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Mark as Seen after specified timeout."
 msgstr "Nach angegebenem Intervall als gelesen markieren."
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Mark citations in the message \"Preview\""
 msgstr "Zitate in der Nachrichtenvorschau kennzeichnen"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Zitate in der Nachrichtenvorschau kennzeichnen."
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Message text limit for display"
 msgstr "Anzeigebegrenzung des Nachrichtentexts"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:130
 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:130
+#: ../mail/evolution-mail.schemas.in.h:131
 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:131
+#: ../mail/evolution-mail.schemas.in.h:132
 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:132
+#: ../mail/evolution-mail.schemas.in.h:133
 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:133
+#: ../mail/evolution-mail.schemas.in.h:134
 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:134
+#: ../mail/evolution-mail.schemas.in.h:135
 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:135
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Original message."
 msgstr "UrsprÃngliche Nachricht."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Path where picture gallery should search for its content"
 msgstr "Pfad, den die Bildergalerie nach Inhalten durchsuchen soll"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid ""
-"Possible values are: never - to never close browser window always - to "
-"always close browser window ask - (or any other value) will ask user"
+"Possible values are: never - to never close browser window always - to always "
+"close browser window ask - (or any other value) will ask user"
 msgstr ""
 "MÃgliche Werte sind: ÂneverÂ, um das Browserfenster niemals zu schlieÃen, "
 "ÂalwaysÂ, um das Browserfenster immer zu schlieÃen. Ein anderer Wert fÃhrt "
 "dazu, dass der Benutzer jedes Mal um BestÃtigung gebeten wird."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr "Nachfragen, wenn EmpfÃnger nicht als E-Mail-Adresse angegeben wurden"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Prompt on empty subject"
 msgstr "Bei leerem Betreff nachfragen"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:141
 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:141
+#: ../mail/evolution-mail.schemas.in.h:142
 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:142
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Prompt when deleting messages in search folder"
 msgstr "Nachfrage beim LÃschen von Nachrichten in Suchordner"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Prompt when mailing list hijacks private replies"
 msgstr ""
 "Nachfragen, wenn Mailinglisten versuchen private Antworten an die Liste "
 "umzuleiten"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Prompt when replying privately to list messages"
 msgstr "Bei privater Antwort auf Listennachrichten nachfragen"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Prompt when replying to many recipients"
 msgstr "Beim Antworten an viele EmpfÃnger nachfragen"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Prompt when user expunges"
 msgstr "Beim SÃubern nachfragen"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:148
 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:148
+#: ../mail/evolution-mail.schemas.in.h:149
 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:149
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -10892,65 +10917,64 @@ msgstr ""
 "Beim Verschicken von HTML-Nachrichten an Kontakte, die keine wollen, "
 "nachfragen."
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:151
 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:151
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
-"RÃckfragen, falls der Benutzer versucht, nicht erwÃnschtes HTML zu "
-"verschicken"
+"RÃckfragen, falls der Benutzer versucht, nicht erwÃnschtes HTML zu verschicken"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Prompt while marking multiple messages"
 msgstr "Anzeigen wenn mehrere Nachrichten markiert werden"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Put personalized signatures at the top of replies"
 msgstr "Beim Antworten eigene Signaturen an den Anfang stellen"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:155
 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:155
+#: ../mail/evolution-mail.schemas.in.h:156
 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:156
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Recognize links in text and replace them."
 msgstr "Links im Text erkennen und ersetzen."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Run junk test on incoming mail."
 msgstr "UnerwÃnscht-Test auf eingehende E-Mails anwenden."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Save directory"
 msgstr "Ordner speichern"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:160
 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:160
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Send HTML mail by default"
 msgstr "Per Vorgabe HTML-E-Mails verschicken?"
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Send HTML mail by default."
 msgstr "Per Vorgabe HTML-E-Mails verschicken?"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:163
 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:163
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Server synchronization interval"
 msgstr "Intervall fÃr Datenabgleich mit Servern"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
@@ -10958,67 +10982,67 @@ 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:165
+#: ../mail/evolution-mail.schemas.in.h:166
 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:166
+#: ../mail/evolution-mail.schemas.in.h:167
 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:167
+#: ../mail/evolution-mail.schemas.in.h:168
 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:168
+#: ../mail/evolution-mail.schemas.in.h:169
 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:169
+#: ../mail/evolution-mail.schemas.in.h:170
 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:170
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "Show Animations"
 msgstr "Animationen anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Show all message headers"
 msgstr "Alle NachrichtenkÃpfe anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "Show all the headers when viewing a messages."
 msgstr "Beim Anzeigen von Nachrichten alle NachrichtenkÃpfe anzeigen."
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Show animated images as animations."
 msgstr "Animierte Bilder als Animationen anzeigen."
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:175
 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:175
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Show deleted messages in the message-list"
 msgstr "GelÃschte Nachrichten in der Nachrichtenliste anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Show image animations"
 msgstr "Bildanimationen anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Show original \"Date\" header value."
 msgstr "Den originalen Wert der Kopfzeile ÂDatum anzeigen."
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Show photo of the sender"
 msgstr "Foto des Absenders anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11026,7 +11050,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:180
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11034,7 +11058,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:181
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -11042,7 +11066,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:182
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -11051,7 +11075,7 @@ msgstr ""
 "anzeigen. Die Einstellung kann im Menà ÂAnsicht beim Verfassen angepasst "
 "werden."
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -11059,15 +11083,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:184
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid ""
-"Show the email-address of the sender in a separate column in the message "
-"list."
+"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:185
+#: ../mail/evolution-mail.schemas.in.h:186
 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 "
@@ -11078,19 +11101,19 @@ msgstr ""
 "Kopfzeile ÂDatum in einem benutzerdefinierten Format und der lokalen "
 "Zeitzone dargestellt."
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:187
 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:187
+#: ../mail/evolution-mail.schemas.in.h:188
 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."
+"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 ""
 "Einige Mailinglisten legen eine ÂAntwort anÂ-Kopfzeile fest, damit Benutzer "
 "ihre Antworten an die Liste senden, auch wenn Sie Evolution anweisen, eine "
@@ -11101,39 +11124,43 @@ msgstr ""
 "Geregelt wird dieses Verhalten durch Vergleichen der Kopfzeilenfelder "
 "ÂAntwort an und ÂAntwort an ListeÂ, sofern letzteres vorhanden ist."
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Spell check inline"
 msgstr "RechtschreibprÃfung an Ort und Stelle"
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Spell checking color"
 msgstr "Farbe fÃr RechtschreibprÃfung"
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid "Spell checking languages"
 msgstr "Sprachen fÃr RechtschreibprÃfung"
 
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:192
+msgid "State of message headers in paned view"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid "Terminal font"
 msgstr "Terminal-Schrift"
 
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid "The default plugin for Junk hook"
 msgstr "Vorgabe-Plugin fÃr die UnerwÃnscht-Erkennung"
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:195
 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:194
+#: ../mail/evolution-mail.schemas.in.h:196
 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:195
+#: ../mail/evolution-mail.schemas.in.h:197
 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 "
@@ -11145,20 +11172,20 @@ msgstr ""
 "Vorschauleiste unter die Nachrichtenliste. Â1Â (vertikale Ansicht) setzt die "
 "Vorschauleiste neben die Nachrichtenliste. "
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "The terminal font for mail display."
 msgstr "Die zum Anzeigen von E-Mails verwendete Terminal-Schrift."
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid ""
 "The text that is inserted when forwarding a message, saying that the "
 "forwarded message follows."
 msgstr ""
-"Text, der beim Weiterleiten einer E-Mail eingefÃgt wird, der darauf "
-"hinweist, dass die weitergeleitete E-Mail folgt."
+"Text, der beim Weiterleiten einer E-Mail eingefÃgt wird, der darauf hinweist, "
+"dass die weitergeleitete E-Mail folgt."
 
 # Was soll hier top-posting sein?
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid ""
 "The text that is inserted when replying to a message (top posting), saying "
 "that the original message follows."
@@ -11166,19 +11193,19 @@ msgstr ""
 "Text, der beim Antworten auf eine Nachricht eingefÃgt wird, der darauf "
 "hinweist, dass die ursprÃngliche Nachricht folgt."
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid ""
-"The text that is inserted when replying to a message, attributing the "
-"message to the original author."
+"The text that is inserted when replying to a message, attributing the message "
+"to the original author."
 msgstr ""
 "Text, der beim Antworten auf eine Nachricht eingefÃgt wird, der die Nchricht "
 "dem ursprÃnglichen Autor zuordnet."
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:202
 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:201
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -11186,27 +11213,27 @@ 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:202
+#: ../mail/evolution-mail.schemas.in.h:204
 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 used only when 'force_message_limit' key is activated."
+"Evolution, specified in terms of KB. The default is 4096 (4MB). This value is "
+"used only when 'force_message_limit' key is activated."
 msgstr ""
 "Dies bestimmt die maximale GrÃÃe des Textteils, der von Evolution formatiert "
-"wird, angegeben in kB. Die Vorgabe sind 4MB/4096kB. Dieser Wert wird nur "
-"dann verwendet, wenn der SchlÃssel Âforce_message_limit aktiviert ist."
+"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:203
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
-"enabled. If the default listed plugin is disabled, then it won't fall back "
-"to the other available plugins."
+"enabled. If the default listed plugin is disabled, then it won't fall back to "
+"the other available plugins."
 msgstr ""
-"Dies ist das Vorgabe-UnerwÃnscht-Plugin, auch falls mehrere Plugins "
-"aktiviert sind. Falls das als Vorgabe aufgelistete Plugin deaktiviert ist, "
-"so wird nicht auf eines der anderen Plugins zurÃckgegriffen."
+"Dies ist das Vorgabe-UnerwÃnscht-Plugin, auch falls mehrere Plugins aktiviert "
+"sind. Falls das als Vorgabe aufgelistete Plugin deaktiviert ist, so wird "
+"nicht auf eines der anderen Plugins zurÃckgegriffen."
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:206
 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."
@@ -11217,33 +11244,33 @@ msgstr ""
 "Nachrichtenliste gesetzt."
 
 # CHECK
-#: ../mail/evolution-mail.schemas.in.h:205
+#: ../mail/evolution-mail.schemas.in.h:207
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
-"header enabled&gt; - set enabled if the header is to be displayed in the "
-"mail view."
+"header enabled&gt; - set enabled if the header is to be displayed in the mail "
+"view."
 msgstr ""
 "Dieser SchlÃssel enthÃlt eine Liste von XML-Strukturen, die "
 "benutzerdefinierte Kopfzeilen angeben, und ob diese angezeigt werden sollen. "
 "Das XML-Strukturformat ist &lt;Kopfzeile aktiviert&gt; - setzen Sie "
 "aktiviert, falls die Kopfzeile in der E-Mail-Ansicht angezeigt werden soll."
 
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../mail/evolution-mail.schemas.in.h:208
 msgid ""
-"This option is related to the key lookup_addressbook and is used to "
-"determine whether to look up addresses in local address book only to exclude "
-"mail sent by known contacts from junk filtering."
+"This option is related to the key lookup_addressbook and is used to determine "
+"whether to look up addresses in local address book only to exclude mail sent "
+"by known contacts from junk filtering."
 msgstr ""
 "Diese Option bezieht sich auf den SchlÃssel Âlookup_addressbook und legt "
 "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:207
+#: ../mail/evolution-mail.schemas.in.h:209
 msgid "This option would help in improving the speed of fetching."
 msgstr "Beschleunigt das Abrufen."
 
-#: ../mail/evolution-mail.schemas.in.h:208
+#: ../mail/evolution-mail.schemas.in.h:210
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -11251,16 +11278,15 @@ msgstr ""
 "Dies setzt die Anzahl der Adressen, die in der Standardansicht angezeigt "
 "werden, bevor Ââ angezeigt wird."
 
-#: ../mail/evolution-mail.schemas.in.h:209
+#: ../mail/evolution-mail.schemas.in.h:211
 msgid ""
-"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Requires a restart to apply."
+"This setting specifies whether the threads should be in expanded or collapsed "
+"state by default. Requires a restart to apply."
 msgstr ""
 "Legt fest, ob Threads standardmÃÃig ausgeklappt oder eingeklappt dargestellt "
-"werden sollen. Evolution muss zur Umsetzung der Ãnderung neu gestartet "
-"werden."
+"werden sollen. Evolution muss zur Umsetzung der Ãnderung neu gestartet werden."
 
-#: ../mail/evolution-mail.schemas.in.h:210
+#: ../mail/evolution-mail.schemas.in.h:212
 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 "
@@ -11270,44 +11296,36 @@ 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:211
+#: ../mail/evolution-mail.schemas.in.h:213
 msgid ""
 "This value can be an empty string, which means it'll use the system Picture "
-"folder, usually set to ~/Pictures. This folder will be also used when the "
-"set path is not pointing to the existent folder."
+"folder, usually set to ~/Pictures. This folder will be also used when the set "
+"path is not pointing to the existent folder."
 msgstr ""
 "Dieser Wert kann eine leere Zeichenkette sein. In diesem Fall wird der "
 "Systemordner fÃr Bilder (Ãblicherweise ~/Bilder) verwendet. Dieser Ordner "
 "wird ebenfalls verwendet, wenn ein nicht-existierender Ordner angegeben wird."
 
-#: ../mail/evolution-mail.schemas.in.h:212
+#: ../mail/evolution-mail.schemas.in.h:214
 msgid "Thread the message-list based on Subject"
 msgstr "Die Nachrichtenliste themenbasiert nach Threads sortieren"
 
-#: ../mail/evolution-mail.schemas.in.h:213
+#: ../mail/evolution-mail.schemas.in.h:215
 msgid "Timeout for marking message as seen"
 msgstr "Intervall zum Markieren von Nachrichten als gelesen"
 
-#: ../mail/evolution-mail.schemas.in.h:214
+#: ../mail/evolution-mail.schemas.in.h:216
 msgid "Timeout for marking message as seen."
 msgstr "Intervall zum Markieren von Nachrichten als gelesen."
 
-#: ../mail/evolution-mail.schemas.in.h:215
+#: ../mail/evolution-mail.schemas.in.h:217
 msgid "UID string of the default account."
 msgstr "UID-Zeichenkette fÃr das Vorgabekonto."
 
-#: ../mail/evolution-mail.schemas.in.h:216
+#: ../mail/evolution-mail.schemas.in.h:218
 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:217
-msgid "Use SpamAssassin daemon and client"
-msgstr "SpamAssassin-Daemon und -Client verwenden"
-
-#: ../mail/evolution-mail.schemas.in.h:218
-msgid "Use SpamAssassin daemon and client (spamc/spamd)."
-msgstr "SpamAssassin-Daemon und -Client verwenden (spamc/spamd)."
-
 #: ../mail/evolution-mail.schemas.in.h:219
 msgid "Use custom fonts"
 msgstr "Benutzerdefinierte Schriften verwenden"
@@ -11317,14 +11335,6 @@ msgid "Use custom fonts for displaying mail."
 msgstr "Benutzerdefinierte Schriften zum Anzeigen von E-Mails verwenden."
 
 #: ../mail/evolution-mail.schemas.in.h:221
-msgid "Use only local spam tests."
-msgstr "AusschlieÃlich lokale Spam-Tests verwenden."
-
-#: ../mail/evolution-mail.schemas.in.h:222
-msgid "Use only the local spam tests (no DNS)."
-msgstr "AusschlieÃlich lokale Spam-Tests verwenden (kein DNS)."
-
-#: ../mail/evolution-mail.schemas.in.h:223
 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 "
@@ -11334,27 +11344,27 @@ 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:224
+#: ../mail/evolution-mail.schemas.in.h:222
 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 "
 "the message or the bottom."
 msgstr ""
-"Benutzer streiten sich wo die Signatur beim Verfassen einer Antwort "
-"platziert werden soll. Dies legt fest, ob die Signatur zu Beginn oder am "
-"Ende der Nachricht platziert wird."
+"Benutzer streiten sich wo die Signatur beim Verfassen einer Antwort platziert "
+"werden soll. Dies legt fest, ob die Signatur zu Beginn oder am Ende der "
+"Nachricht platziert wird."
 
-#: ../mail/evolution-mail.schemas.in.h:225
+#: ../mail/evolution-mail.schemas.in.h:223
 msgid "Variable width font"
 msgstr "Schrift variabler Breite"
 
-#: ../mail/evolution-mail.schemas.in.h:226
+#: ../mail/evolution-mail.schemas.in.h:224
 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:227
+#: ../mail/evolution-mail.schemas.in.h:225
 msgid ""
 "Whether check for new messages in all active accounts regardless of the "
 "account \"Check for new messages every X minutes\" option when Evolution is "
@@ -11365,7 +11375,7 @@ msgstr ""
 "Mails sehen alle X MinutenÂ-Einstellungen. Diese Option wird nur in "
 "Verbindung mit Âsend_recv_on_start verwendet."
 
-#: ../mail/evolution-mail.schemas.in.h:228
+#: ../mail/evolution-mail.schemas.in.h:226
 msgid ""
 "Whether check for new messages when Evolution is started. This includes also "
 "sending messages from Outbox."
@@ -11374,39 +11384,39 @@ msgstr ""
 "gestartet wird. Dies beinhaltet das Versenden von E-Mails aus dem "
 "Nachrichtenausgang."
 
-#: ../mail/evolution-mail.schemas.in.h:229
+#: ../mail/evolution-mail.schemas.in.h:227
 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:230
+#: ../mail/evolution-mail.schemas.in.h:228
 msgid ""
-"Whether or not to fall back on threading by subjects when the messages do "
-"not contain In-Reply-To or References headers."
+"Whether or not to fall back on threading by subjects when the messages do not "
+"contain In-Reply-To or References headers."
 msgstr ""
 "Auf Betreffbasis auf die Thread-Ordnung zurÃckgreifen, falls die Kopfzeilen "
 "einer Nachricht auf keine Referenznachricht verweisen."
 
-#: ../mail/evolution-mail.schemas.in.h:231
+#: ../mail/evolution-mail.schemas.in.h:229
 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:232
+#: ../mail/evolution-mail.schemas.in.h:230
 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."
+"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:233
+#: ../mail/evolution-mail.schemas.in.h:231
 msgid "Width of the message-list pane"
 msgstr "Breite der Nachrichtenliste"
 
-#: ../mail/evolution-mail.schemas.in.h:234
+#: ../mail/evolution-mail.schemas.in.h:232
 msgid "Width of the message-list pane."
 msgstr "Breite der Nachrichtenliste."
 
@@ -11414,80 +11424,87 @@ msgstr "Breite der Nachrichtenliste."
 msgid "Importing Elm data"
 msgstr "Elm-Daten werden importiert"
 
-#: ../mail/importers/elm-importer.c:339 ../mail/importers/pine-importer.c:415
-#: ../modules/mail/e-mail-shell-view.c:1044
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
+#: ../mail/importers/elm-importer.c:341 ../mail/importers/pine-importer.c:446
+#: ../modules/mail/e-mail-shell-view.c:1036
 #: ../widgets/misc/e-send-options.c:511
 msgid "Mail"
 msgstr "E-Mail"
 
-#: ../mail/importers/elm-importer.c:380
+#: ../mail/importers/elm-importer.c:382
 msgid "Evolution Elm importer"
 msgstr "Evolution-Elm-Importeur"
 
-#: ../mail/importers/elm-importer.c:381
+#: ../mail/importers/elm-importer.c:383
 msgid "Import mail from Elm."
 msgstr "E-Mail von Elm importieren."
 
-#: ../mail/importers/evolution-mbox-importer.c:127
-#: ../plugins/dbx-import/dbx-importer.c:242
+#: ../mail/importers/evolution-mbox-importer.c:135
+#: ../plugins/dbx-import/dbx-importer.c:249
 msgid "_Destination folder:"
 msgstr "Zielor_dner:"
 
-#: ../mail/importers/evolution-mbox-importer.c:133
-#: ../plugins/dbx-import/dbx-importer.c:252
+#: ../mail/importers/evolution-mbox-importer.c:142
+#: ../plugins/dbx-import/dbx-importer.c:259
 #: ../plugins/pst-import/pst-importer.c:361
 msgid "Select folder"
 msgstr "Ordner wÃhlen"
 
-#: ../mail/importers/evolution-mbox-importer.c:134
-#: ../plugins/dbx-import/dbx-importer.c:253
-#: ../plugins/pst-import/pst-importer.c:361
+#: ../mail/importers/evolution-mbox-importer.c:143
+#: ../plugins/dbx-import/dbx-importer.c:260
+#: ../plugins/pst-import/pst-importer.c:362
 msgid "Select folder to import into"
 msgstr "WÃhlen Sie den Ordner, in den importiert werden soll"
 
-#: ../mail/importers/evolution-mbox-importer.c:403
+#: ../mail/importers/evolution-mbox-importer.c:417
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "Betreff"
 
-#: ../mail/importers/evolution-mbox-importer.c:408
+#: ../mail/importers/evolution-mbox-importer.c:422
 msgctxt "mboxImp"
 msgid "From"
 msgstr "Von"
 
-#: ../mail/importers/evolution-mbox-importer.c:452
-#: ../shell/e-shell-utils.c:253
+#: ../mail/importers/evolution-mbox-importer.c:466 ../shell/e-shell-utils.c:221
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:453
+#: ../mail/importers/evolution-mbox-importer.c:467
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importeur fÃr Ordner im Berkeley-Mailbox-Format"
 
-#: ../mail/importers/mail-importer.c:66
+#: ../mail/importers/mail-importer.c:64
 msgid "Importing mailbox"
 msgstr "E-Mail-Postfach wird importiert"
 
-#: ../mail/importers/mail-importer.c:177
+#. Destination folder, was set in our widget
+#: ../mail/importers/mail-importer.c:153
+#: ../plugins/dbx-import/dbx-importer.c:603
+#: ../plugins/pst-import/pst-importer.c:543
+#: ../plugins/pst-import/pst-importer.c:679
+#, c-format
+msgid "Importing '%s'"
+msgstr "Â%s wird importiert"
+
+#: ../mail/importers/mail-importer.c:315
 #, c-format
 msgid "Scanning %s"
 msgstr "%s wird eingelesen"
 
-#: ../mail/importers/pine-importer.c:223
+#: ../mail/importers/pine-importer.c:250
 msgid "Importing Pine data"
 msgstr "Pine-Daten werden importiert"
 
-#: ../mail/importers/pine-importer.c:420
-#: ../modules/addressbook/addressbook-config.c:1011
+#: ../mail/importers/pine-importer.c:451
+#: ../modules/addressbook/addressbook-config.c:1053
 msgid "Address Book"
 msgstr "Adressbuch"
 
-#: ../mail/importers/pine-importer.c:462
+#: ../mail/importers/pine-importer.c:493
 msgid "Evolution Pine importer"
 msgstr "Evolution-Pine-Importeur"
 
-#: ../mail/importers/pine-importer.c:463
+#: ../mail/importers/pine-importer.c:494
 msgid "Import mail from Pine."
 msgstr "E-Mail von Pine importieren."
 
@@ -11496,7 +11513,7 @@ msgstr "E-Mail von Pine importieren."
 msgid "Mail to %s"
 msgstr "E-Mail an %s"
 
-#: ../mail/mail-autofilter.c:238 ../mail/mail-autofilter.c:280
+#: ../mail/mail-autofilter.c:238 ../mail/mail-autofilter.c:281
 #, c-format
 msgid "Mail from %s"
 msgstr "E-Mail von %s"
@@ -11506,12 +11523,12 @@ msgstr "E-Mail von %s"
 msgid "Subject is %s"
 msgstr "Betreff ist %s"
 
-#: ../mail/mail-autofilter.c:303
+#: ../mail/mail-autofilter.c:305
 #, c-format
 msgid "%s mailing list"
 msgstr "Mailingliste %s"
 
-#: ../mail/mail-autofilter.c:404
+#: ../mail/mail-autofilter.c:414
 msgid "Add Filter Rule"
 msgstr "Filterregel hinzufÃgen"
 
@@ -11520,7 +11537,7 @@ msgstr "Filterregel hinzufÃgen"
 #. * folder. For more than one filter rule is each of
 #. * them on a separate line, with four spaces in front
 #. * of its name, without quotes.
-#: ../mail/mail-autofilter.c:502
+#: ../mail/mail-autofilter.c:517
 #, c-format
 msgid ""
 "The filter rule \"%s\" has been modified to account for the deleted folder\n"
@@ -11546,459 +11563,476 @@ msgstr "N_eue Signatur â"
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "Aus diesem Konto ausgehende Nachrichten _immer signieren"
 
+#: ../mail/mail-config.ui.h:4
+msgid ""
+"All new emails with header that matches given content will be automatically "
+"filtered as junk"
+msgstr ""
+
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:6
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr "_Mailinglisten erlauben, private Antworten an die Liste zu leiten"
 
-#: ../mail/mail-config.ui.h:6
+#: ../mail/mail-config.ui.h:7
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr ""
 "Beim Verschicken verschlÃsselter E-Mails auch fÃr sich sel_bst verschlÃsseln"
 
-#: ../mail/mail-config.ui.h:7
+#: ../mail/mail-config.ui.h:8
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Immer _Kopie schicken an:"
 
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.ui.h:9
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Immer _Blindkopie schicken an:"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:10
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "SchlÃssel am SchlÃsselbund beim VerschlÃsseln _immer vertrauen"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:11
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr ""
 "Beim Verschicken verschlÃsselter E-Mails _immer fÃr mich selbst verschlÃsseln"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
 msgstr "_LesebestÃtigung immer anfordern"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
 msgid "Apply the same _view settings to all folders"
 msgstr "Ansichts_einstellungen auf alle Ordner anwenden"
 
-#: ../mail/mail-config.ui.h:14
-#: ../modules/addressbook/addressbook-config.c:1018
+#: ../mail/mail-config.ui.h:15 ../modules/addressbook/addressbook-config.c:1060
 msgid "Authentication"
 msgstr "Legitimation"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:16
 msgid "Automatically insert _emoticon images"
 msgstr "_Emoticon-Bilder automatisch einfÃgen"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:17
 msgid "C_haracter set:"
 msgstr "_Zeichensatz:"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:18
 msgid "Ch_eck for Supported Types"
 msgstr "_PrÃfen, welche Arten unterstÃtzt werden"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:19
 msgid "Check cu_stom headers for junk"
 msgstr "_Benutzerdefinierte Kopfzeilen auf UnerwÃnschtheit prÃfen"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:20
 msgid "Check for new _messages on start"
 msgstr "Beim Start nach neuen _Nachrichten suchen"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:21
 msgid "Check for new messa_ges in all active accounts"
 msgstr "Nach neuen Nachrichten in allen a_ktiven Konten suchen"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:22
 msgid "Check incoming _messages for junk"
 msgstr "_Eingehende E-Mail auf UnerwÃnschtheit prÃfen"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:23
 msgid "Check spelling while I _type"
 msgstr "RechtschreibprÃfung wÃhrend der Ein_gabe durchfÃhren"
 
-#: ../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
-#: ../modules/plugin-manager/evolution-plugin-manager.c:157
+#: ../mail/mail-config.ui.h:28
+#: ../modules/plugin-manager/evolution-plugin-manager.c:160
 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:29
+#: ../mail/mail-config.ui.h:30
 msgid "Confirmations"
 msgstr "BestÃtigungen"
 
-#: ../mail/mail-config.ui.h:30
-#: ../modules/addressbook/autocompletion-config.c:155
+#: ../mail/mail-config.ui.h:31
+#: ../modules/addressbook/autocompletion-config.c:159
 #: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgid "Date/Time Format"
 msgstr "Format von Datum/Zeit"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:33
 msgid "Default Behavior"
 msgstr "Vorgabeverhalten"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:34
 msgid "Default character e_ncoding:"
 msgstr "Voreingestellte _Zeichenkodierung:"
 
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:35
 msgid "Delete Mail"
 msgstr "Nachricht lÃschen"
 
-#: ../mail/mail-config.ui.h:35
+#: ../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:37
+#: ../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:38
+#: ../mail/mail-config.ui.h:39
 msgid "Displayed Message Headers"
 msgstr "Angezeigte NachrichtenkÃpfe"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:40
 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:41
 msgid "Do not quote"
 msgstr "Nicht zitieren"
 
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:42
 msgid "Drafts _Folder:"
 msgstr "_Entwurfsordner:"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:43
 msgid "Email _Address:"
 msgstr "_E-Mail-Adresse:"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:44
 msgid "Empty trash folders on e_xit"
 msgstr "MÃllordner beim Beenden _leeren"
 
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:46
 msgid "Encry_ption certificate:"
 msgstr "_VerschlÃsselungszertifikat:"
 
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:47
 msgid "Encrypt out_going messages (by default)"
 msgstr "Ausgehende Nachrichten _verschlÃsseln (per Vorgabe)"
 
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:48
 msgid "F_all back to threading messages by subject"
 msgstr "ZurÃckfallen auf be_treffsbezogenes Threading der Nachrichten"
 
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:49
 msgid "Fix_ed Width Font:"
 msgstr "_Dicktengleiche Schrift:"
 
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:50
 msgid "Format messages in _HTML"
 msgstr "Nachrichten in _HTML formatieren"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:51
 msgid "Full Nam_e:"
 msgstr "_Voller Name:"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:53
 msgid "Group Reply goes only to mailing list, if possible"
 msgstr "Gruppenantwort nur an Mailingliste, wenn mÃglich"
 
-#: ../mail/mail-config.ui.h:53
+#: ../mail/mail-config.ui.h:54
 msgid "HTML Messages"
 msgstr "HTML-Nachrichten"
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:55
 msgid "H_TTP Proxy:"
 msgstr "H_TTP-Proxy:"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:56
+msgid "Header content"
+msgstr "Inhalt der Kopfzeile"
+
+#: ../mail/mail-config.ui.h:57
+msgid "Header name"
+msgstr "Name der Kopfzeile"
+
+#: ../mail/mail-config.ui.h:58
 msgid "Headers"
 msgstr "Kopfzeilen"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:59
 msgid "Highlight _quotations with"
 msgstr "Zitate _hervorheben mit"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:60
 msgid "Ignore Reply-To: for mailing lists"
 msgstr "ÂAntwort an bei Mailinglisten ignorieren"
 
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:61
 msgid "Inline"
 msgstr "Eingebettet"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:62
 msgid "Inline (Outlook style)"
 msgstr "Eingebettet (Outlook-Stil)"
 
-#: ../mail/mail-config.ui.h:61 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:64 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Beschriftungen"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:65
 msgid "Languages Table"
 msgstr "Sprachtabelle"
 
-#: ../mail/mail-config.ui.h:63
+#: ../mail/mail-config.ui.h:66
 msgid "Loading Images"
 msgstr "Bilder werden geladen"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:67
 msgid "Mail Headers Table"
 msgstr "E-Mail-Kopf-Tabelle"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:68
 msgid "Mailbox location"
 msgstr "Ort des Postfachs"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:69
 msgid "Message Display"
 msgstr "Nachrichtenanzeige"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:70
 msgid "Message Receipts"
 msgstr "LesebestÃtigungen"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:71
 msgid "No _Proxy for:"
 msgstr "Kein _Proxy fÃr:"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:73
 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:71
+#: ../mail/mail-config.ui.h:74
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "ZusÃtzliche Informationen"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:76
 msgid "Or_ganization:"
 msgstr "_Organisation:"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:77
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-_SchlÃsselkennung:"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:78
 msgid "Pass_word:"
 msgstr "_Passwort:"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:79
 #: ../modules/calendar/e-calendar-preferences.ui.h:23
 msgid "Pick a color"
 msgstr "Eine Farbe auswÃhlen"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:80
 msgid "Port:"
 msgstr "Port:"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:81
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:83
 msgid "Proxy Settings"
 msgstr "Proxy-Einstellungen"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:84
 msgid "Quoted"
 msgstr "Zitiert"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:85
 msgid "Re_member password"
 msgstr "Passwort _merken"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:86
 msgid "Re_ply-To:"
 msgstr "_Antwort an:"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:87
 msgid "Remember _password"
 msgstr "_Passwort merken"
 
 # CHECK
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:88
 msgid "Replies and Forwards"
 msgstr "Antworten und Weiterleitungen"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:89
 msgid "Required Information"
 msgstr "BenÃtigte Informationen"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:90
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:91
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:92
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:93
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:95
 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:93
+#: ../mail/mail-config.ui.h:96
 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:94
+#: ../mail/mail-config.ui.h:97
 msgid "S_elect..."
 msgstr "A_uswÃhlen â"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:98
 msgid "S_end message receipts:"
 msgstr "Lese_bestÃtigungen verschicken:"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:99
 msgid "S_tandard Font:"
 msgstr "_Standard-Schrift:"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:100
 msgid "Secure MIME (S/MIME)"
 msgstr "Sicheres MIME (S/MIME)"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:102
 msgid "Select HTML fixed width font"
 msgstr "Dicktengleiche HTML-Schrift wÃhlen"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:103
 msgid "Select HTML variable width font"
 msgstr "HTML-Proportionalschrift wÃhlen"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:104
 msgid "Sender Photograph"
 msgstr "Foto des Absenders"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:106
 msgid "Sending a _private reply to a mailing list message"
 msgstr "_Private Antwort auf eine Listennachricht senden"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:108
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr ""
 "Nachricht mit EmpfÃngern senden, die nicht als E-Mail-Ad_resse angegeben "
 "wurden"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:110
 msgid "Sending a message with an _empty subject line"
 msgstr "Nachrichten mit _leerem Betreff senden"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:112
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "Nachricht mit ausschlieÃlich _Blindkopie-EmpfÃngern senden"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:114
 msgid "Sending a reply to a large _number of recipients"
 msgstr "Antwort an zahlreiche EmpfÃnger se_nden"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:115
 msgid "Sent _Messages Folder:"
 msgstr "Ordner fÃr _verschickte Nachrichten:"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:116
 msgid "Ser_ver requires authentication"
 msgstr "Server erfordert _Legitimation"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:117
 msgid "Server Configuration"
 msgstr "Serverkonfiguration"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:118
 msgid "Server _Type:"
 msgstr "_Server-Art:"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:119
+msgid "Set custom junk header"
+msgstr "Benutzerdefinierte UnerwÃnscht-Kopfzeile hinzufÃgen"
+
+#: ../mail/mail-config.ui.h:120
 msgid "Si_gning algorithm:"
 msgstr "Si_gnaturalgorithmus:"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:121
 msgid "Sig_natures"
 msgstr "Sig_naturen"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:122
 msgid "Sig_ning certificate:"
 msgstr "Signatur_zertifikat:"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:123
 msgid "Signat_ure:"
 msgstr "_Signatur:"
 
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:124
 msgid "Signatures"
 msgstr "Signaturen"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:125
 msgid "Signing _algorithm:"
 msgstr "Signatur_algorithmus:"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:126
 msgid "Special Folders"
 msgstr "Spezielle Ordner"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:127
 msgid "Spell Checking"
 msgstr "RechtschreibprÃfung"
 
-#: ../mail/mail-config.ui.h:124
+#: ../mail/mail-config.ui.h:128
 msgid "Start _typing at the bottom on replying"
 msgstr "Beim Antworten auf Mails _unten mit dem Schreiben beginnen"
 
-#: ../mail/mail-config.ui.h:125
+#: ../mail/mail-config.ui.h:129
 msgid "Start up"
 msgstr "Startvorgang"
 
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:131
 msgid "T_ype:"
 msgstr "T_yp:"
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:132
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
-"Diese Sprachliste enthÃlt ausschlieÃlich die Sprachen, fÃr die ein "
-"WÃrterbuch installiert sind."
+"Diese Sprachliste enthÃlt ausschlieÃlich die Sprachen, fÃr die ein WÃrterbuch "
+"installiert sind."
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:133
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12008,15 +12042,15 @@ msgstr ""
 "verwendet. Der von Ihnen angegebene Name\n"
 "wird lediglich zur Anzeige verwendet."
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:136
 msgid ""
-"To help avoid email accidents and embarrassments, ask for confirmation "
-"before taking the following checkmarked actions:"
+"To help avoid email accidents and embarrassments, ask for confirmation before "
+"taking the following checkmarked actions:"
 msgstr ""
 "Um Ãrgernisse und ungewollte Ergebnisse zu vermeiden, bei folgenden "
 "markierten Aktionen um BestÃtigung nachfragen:"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:137
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12024,143 +12058,143 @@ 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:135
+#: ../mail/mail-config.ui.h:139
 msgid "Us_ername:"
 msgstr "_Benutzername:"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:140
 msgid "Use Authe_ntication"
 msgstr "_Legitimation benutzen"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:141
 msgid "User _Name:"
 msgstr "_Benutzername:"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:142
 msgid "_Add Signature"
 msgstr "Signatur _hinzufÃgen"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:143
 msgid "_Always load images from the Internet"
 msgstr "Bilder _immer aus dem Internet laden"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:144
 msgid "_Authentication Type"
 msgstr "_Legitimationsart"
 
-#: ../mail/mail-config.ui.h:141
-msgid "_Default junk plugin:"
-msgstr "_Vorgabe-UnerwÃnscht-Plugin:"
-
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:145
 msgid "_Direct connection to the Internet"
 msgstr "_Direkte Internetverbindung"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:146
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Besprechungsanfragen nicht signieren (zur KompatibilitÃt mit Outlook)"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:147
 msgid "_Forward style:"
 msgstr "_Weiterleitungsstil:"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:148
 msgid "_Junk Folder:"
 msgstr "_UnerwÃnscht-Ordner:"
 
-#: ../mail/mail-config.ui.h:146
+#: ../mail/mail-config.ui.h:149
 msgid "_Keep signature above the original message on replying"
 msgstr "Signat_ur beim Antworten Ãber der Original-Nachricht behalten"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:150
 msgid "_Languages"
 msgstr "_Sprachen"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:151
 msgid "_Load images only in messages from contacts"
 msgstr "Bilder nur in Nachrichten von Kontakten _laden"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:152
 msgid "_Lookup in local address book only"
 msgstr "Nur in _lokalen AdressbÃchern suchen"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:153
 msgid "_Make this my default account"
 msgstr "Dieses zum Vo_rgabekonto machen"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:154
 msgid "_Manual proxy configuration:"
 msgstr "_Manuelle Proxy-Konfiguration:"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:156
 msgid "_Never load images from the Internet"
 msgstr "Bilder _nie aus dem Internet laden"
 
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:157
 msgid "_Path:"
 msgstr "_Pfad:"
 
-#: ../mail/mail-config.ui.h:155
+#: ../mail/mail-config.ui.h:158 ../modules/addressbook/ldap-config.ui.h:27
+msgid "_Port:"
+msgstr "_Port:"
+
+#: ../mail/mail-config.ui.h:159
 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:156
+#: ../mail/mail-config.ui.h:160
 msgid "_Reply style:"
 msgstr "_Antwortstil:"
 
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:161
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:162
 msgid "_Secure HTTP Proxy:"
 msgstr "_Sicherer HTTP-Proxy:"
 
-#: ../mail/mail-config.ui.h:160 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:164 ../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:162
+#: ../mail/mail-config.ui.h:166
 msgid "_Show animated images"
 msgstr "_Animierte Bilder anzeigen"
 
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:167
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Foto des Absenders in der Nachrichtenvorschau anzeigen"
 
-#: ../mail/mail-config.ui.h:164
+#: ../mail/mail-config.ui.h:168
 msgid "_Trash Folder:"
 msgstr "M_Ãllordner:"
 
-#: ../mail/mail-config.ui.h:165
-msgid "_Use Secure Connection:"
+#: ../mail/mail-config.ui.h:169 ../modules/addressbook/ldap-config.ui.h:31
+msgid "_Use secure connection:"
 msgstr "_Sichere Verbindung verwenden:"
 
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:170
 msgid "_Use system defaults"
 msgstr "_Vorgabe benutzen"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:171
 msgid "_Use the same fonts as other applications"
 msgstr "Dieselben Schriften wie andere Anwendungen _verwenden"
 
-#: ../mail/mail-config.ui.h:168 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:172 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:169 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:173 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:170
+#: ../mail/mail-config.ui.h:174
 msgid "color"
 msgstr "Farbe"
 
-#: ../mail/mail-config.ui.h:171
+#: ../mail/mail-config.ui.h:175
 msgid "description"
 msgstr "Beschreibung"
 
@@ -12180,88 +12214,88 @@ msgstr "Alle lokalen Ordner"
 msgid "Call"
 msgstr "Anrufen"
 
-#: ../mail/mail-dialogs.ui.h:5
+#. Translators: Flag Completed
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Co_mpleted"
 msgstr "Abges_chlossen"
 
-#: ../mail/mail-dialogs.ui.h:6
+#: ../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 "Encryption"
 msgstr "VerschlÃsselung"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Follow-Up"
 msgstr "Folgenachricht"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:11
 msgid "For Your Information"
 msgstr "Zu Ihrer Information"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Forward"
 msgstr "Weiterleiten"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:13
 msgid "License Agreement"
 msgstr "Lizenzvereinbarung"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:14
 msgid "No Response Necessary"
 msgstr "Keine Antwort erforderlich"
 
-#: ../mail/mail-dialogs.ui.h:17
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Reply to All"
 msgstr "Antwort an alle"
 
-#: ../mail/mail-dialogs.ui.h:18
+#: ../mail/mail-dialogs.ui.h:19
 msgid "Review"
 msgstr "ÃberprÃfen"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:20
 msgid "Search Folder Sources"
 msgstr "Ordnerquellen durchsuchen"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Security Information"
 msgstr "Sicherheitsinformationen"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:22
 msgid "Specific folders"
 msgstr "Bestimmte Ordner"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:23
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
 msgstr ""
-"Dies ist eine Liste der von Ihnen als Folgenachricht markierten "
-"Nachrichten.\n"
+"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:24
+#: ../mail/mail-dialogs.ui.h:25
 msgid "_Accept License"
 msgstr "Lizenz _akzeptieren"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:26
 msgid "_Due By:"
 msgstr "_FÃllig am:"
 
-#: ../mail/mail-dialogs.ui.h:26
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Flag:"
 msgstr "_Markierung:"
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:28
 msgid "_Tick this to accept the license agreement"
 msgstr "Ha_ken Sie dies ab, um die Lizenzvereinbarung zu akzeptieren"
 
-#: ../mail/mail-folder-cache.c:789
+#: ../mail/mail-folder-cache.c:767
 #, c-format
 msgid "Pinging %s"
 msgstr "Ping zu %s wird ermittelt"
@@ -12270,208 +12304,140 @@ msgstr "Ping zu %s wird ermittelt"
 msgid "Filtering Selected Messages"
 msgstr "GewÃhlte Nachrichten filtern"
 
-#: ../mail/mail-ops.c:226
+#: ../mail/mail-ops.c:205
 msgid "Fetching Mail"
 msgstr "E-Mail wird abgerufen"
 
-#: ../mail/mail-ops.c:792
+#: ../mail/mail-ops.c:820
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Nachricht %d von %d wird verschickt"
 
-#: ../mail/mail-ops.c:838
+#: ../mail/mail-ops.c:868
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "%d von %d Nachrichten konnten nicht verschickt werden"
 
-#: ../mail/mail-ops.c:840 ../mail/mail-send-recv.c:788
+#: ../mail/mail-ops.c:872 ../mail/mail-send-recv.c:824
 msgid "Canceled."
 msgstr "Abgebrochen."
 
-#: ../mail/mail-ops.c:842 ../mail/mail-send-recv.c:790
+#: ../mail/mail-ops.c:874 ../mail/mail-send-recv.c:826
 msgid "Complete."
 msgstr "Abgeschlossen."
 
-#: ../mail/mail-ops.c:948
+#: ../mail/mail-ops.c:984
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Nachrichten werden nach Â%s verschoben"
 
-#: ../mail/mail-ops.c:948
+#: ../mail/mail-ops.c:985
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Nachrichten werden nach Â%s kopiert"
 
-#: ../mail/mail-ops.c:1069
-#, c-format
-msgid "Scanning folders in '%s'"
-msgstr "Ordner in Â%s werden eingelesen"
-
-#: ../mail/mail-ops.c:1185
-msgid "Forwarded messages"
-msgstr "Weitergeleitete Nachrichten"
-
-#: ../mail/mail-ops.c:1302
-#, c-format
-msgid "Retrieving quota information for folder '%s'"
-msgstr "Informationen Ãber Speicherplatzlimit fÃr Ordner Â%s werden abgerufen"
-
-#: ../mail/mail-ops.c:1377
-#, c-format
-msgid "Opening store '%s'"
-msgstr "Speicher Â%s wird geÃffnet"
-
-#: ../mail/mail-ops.c:1453
-#, c-format
-msgid "Removing folder '%s'"
-msgstr "Ordner Â%s wird entfernt"
-
-#: ../mail/mail-ops.c:1616
+#: ../mail/mail-ops.c:1102
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ordner Â%s wird gespeichert"
 
-#: ../mail/mail-ops.c:1685
+#: ../mail/mail-ops.c:1176
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Konto Â%s wird gesÃubert und gespeichert"
 
-#: ../mail/mail-ops.c:1686
+#: ../mail/mail-ops.c:1177
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Konto Â%s wird gespeichert"
 
-#: ../mail/mail-ops.c:1744
+#: ../mail/mail-ops.c:1239
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Ordner Â%s wird aufgefrischt"
 
-#: ../mail/mail-ops.c:1908
+#: ../mail/mail-ops.c:1417
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Ordner Â%s wird gesÃubert"
 
-#: ../mail/mail-ops.c:1980
+#: ../mail/mail-ops.c:1490
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "MÃll in Â%s wird geleert"
 
-#: ../mail/mail-ops.c:1981
+#: ../mail/mail-ops.c:1491
 msgid "Local Folders"
 msgstr "Lokale Ordner"
 
-#: ../mail/mail-ops.c:2154
-#, 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:2247
-#, 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:2343
-#, c-format
-msgid "Error saving messages to: %s:\n"
-msgstr "Fehler beim Speichern der Nachrichten in: %s:\n"
-
-#: ../mail/mail-ops.c:2418
-#, c-format
-msgid "Preparing account '%s' for offline"
-msgstr "Konto Â%s wird fÃr Offline-Betrieb vorbereitet"
-
-#: ../mail/mail-ops.c:2509
-msgid "Checking Service"
-msgstr "Dienst wird ÃberprÃft"
-
-#: ../mail/mail-ops.c:2589
+#: ../mail/mail-ops.c:1589
 #, c-format
 msgid "Disconnecting %s"
 msgstr "Â%s wird getrennt"
 
-#: ../mail/mail-ops.c:2646
-#, c-format
-msgid "Removing attachments"
-msgstr "Anlagen werden gelÃscht"
-
-#: ../mail/mail-ops.c:2693
-#, c-format
-msgid "File \"%s\" has been removed."
-msgstr "Die Datei Â%s wurde gelÃscht."
-
-#: ../mail/mail-send-recv.c:191
+#: ../mail/mail-send-recv.c:197
 msgid "Canceling..."
 msgstr "Absagevorgang â"
 
-#: ../mail/mail-send-recv.c:436
+#: ../mail/mail-send-recv.c:443
 msgid "Send & Receive Mail"
 msgstr "E-Mails verschicken und abrufen"
 
-#: ../mail/mail-send-recv.c:452
+#: ../mail/mail-send-recv.c:459
 msgid "Cancel _All"
 msgstr "A_lles abbrechen"
 
-#: ../mail/mail-send-recv.c:569 ../mail/mail-send-recv.c:927
+#: ../mail/mail-send-recv.c:585 ../mail/mail-send-recv.c:963
 msgid "Updating..."
 msgstr "Aktualisieren â"
 
-#: ../mail/mail-send-recv.c:569 ../mail/mail-send-recv.c:653
+#: ../mail/mail-send-recv.c:585 ../mail/mail-send-recv.c:680
 msgid "Waiting..."
 msgstr "Warten â"
 
-#: ../mail/mail-send-recv.c:909
+#: ../mail/mail-send-recv.c:943
 #, c-format
 msgid "Checking for new mail"
 msgstr "Nach neuen E-Mails sehen"
 
-#: ../mail/mail-tools.c:69
+#: ../mail/mail-tools.c:72
 #, c-format
 msgid "Could not create spool directory '%s': %s"
 msgstr "Spool-Ordner Â%s konnte nicht angelegt werden: %s"
 
-#: ../mail/mail-tools.c:102
+#: ../mail/mail-tools.c:106
 #, c-format
 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:214
+#: ../mail/mail-tools.c:215
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Weitergeleitete Nachricht - %s"
 
-#: ../mail/mail-tools.c:216
+#: ../mail/mail-tools.c:217
 msgid "Forwarded message"
 msgstr "Weitergeleitete Nachricht"
 
-#: ../mail/mail-vfolder.c:86
+#: ../mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Suchordner wird eingerichtet: %s"
 
-#: ../mail/mail-vfolder.c:235
-#, c-format
-msgid "Updating Search Folders for '%s:%s'"
-msgstr "Suchordner fÃr Â%s:%s werden aktualisiert"
-
-#: ../mail/mail-vfolder.c:242
+#: ../mail/mail-vfolder.c:238
 #, c-format
-msgid "Updating Search Folders for '%s'"
-msgstr "Suchordner fÃr Â%s werden aktualisiert"
+msgid "Updating Search Folders for '%s' : %s"
+msgstr "Suchordner fÃr Â%s werden aktualisiert: %s"
 
 #. Translators: The first %s is name of the affected
 #. * search folder(s), the second %s is the 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:718
+#: ../mail/mail-vfolder.c:681
 #, c-format
 msgid ""
-"The Search Folder \"%s\" has been modified to account for the deleted "
-"folder\n"
+"The Search Folder \"%s\" has been modified to account for the deleted folder\n"
 "\"%s\"."
 msgid_plural ""
 "The following Search Folders\n"
@@ -12486,11 +12452,11 @@ msgstr[1] ""
 "entfernten Ordner verwenden:\n"
 "Â%sÂ."
 
-#: ../mail/mail-vfolder.c:1297
+#: ../mail/mail-vfolder.c:1294
 msgid "Edit Search Folder"
 msgstr "Suchordner bearbeiten"
 
-#: ../mail/mail-vfolder.c:1410
+#: ../mail/mail-vfolder.c:1408
 msgid "New Search Folder"
 msgstr "Neuer Suchordner"
 
@@ -12717,23 +12683,19 @@ msgstr "Nachrichtenfenster schlieÃen."
 msgid "Could not save signature file."
 msgstr "Signaturdatei konnte nicht gespeichert werden."
 
-#: ../mail/mail.error.xml.h:45
-msgid "Delete messages in Search Folder \"{0}\"?"
-msgstr "Nachrichten im Suchordner Â{0}Â lÃschen?"
-
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:46
 msgid "Do _Not Disable"
 msgstr "_Nicht deaktivieren"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:47
 msgid "Do _Not Send"
 msgstr "_Nicht verschicken"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:48
 msgid "Do _Not Synchronize"
 msgstr "_Nicht abgleichen"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:49
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -12741,34 +12703,34 @@ msgstr ""
 "Sollen die fÃr die Benutzung im Offline-Modus markierten Ordner lokal "
 "abgeglichen werden?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../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:52
+#: ../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:53
+#: ../mail/mail.error.xml.h:52
 msgid "Enter password."
 msgstr "Passwort eingeben."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:53
 msgid "Error loading filter definitions."
 msgstr "Fehler beim Laden der Filterdefinitionen."
 
-#: ../mail/mail.error.xml.h:55
+#: ../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:59
+#: ../mail/mail.error.xml.h:58
 msgid "Error while {0}."
 msgstr "Fehler bei Â{0}Â."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:59
 msgid ""
 "Evolution's local mail format has changed from mbox to Maildir. Your local "
 "mail must be migrated to the new format before Evolution can proceed. Do you "
@@ -12787,34 +12749,58 @@ msgstr ""
 "erfolgreich migriert wurden. Stellen Sie bitte sicher, dass genug freier "
 "Speicherplatz zur VerfÃgung steht, wenn Sie die Migration durchfÃhren."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:62
 msgid "Evolution's local mail format has changed."
 msgstr "Das lokale Nachrichtenformat von Evolution wurde geÃndert."
 
+#: ../mail/mail.error.xml.h:63
+msgid "Failed to download messages for offline viewing."
+msgstr "Nachrichten konnten nicht fÃr Offline-Benutzung heruntergeladen werden."
+
 #: ../mail/mail.error.xml.h:64
+msgid "Failed to find duplicate messages."
+msgstr "Doppelte Nachrichten konnten nicht gefunden werden."
+
+#: ../mail/mail.error.xml.h:65
+msgid "Failed to open folder."
+msgstr "Ordner konnte nicht geÃffnet werden."
+
+#: ../mail/mail.error.xml.h:66
+msgid "Failed to remove attachments from messages."
+msgstr "AnhÃnge konnten nicht von Nachrichten entfernt werden."
+
+#: ../mail/mail.error.xml.h:67
+msgid "Failed to retrieve messages."
+msgstr "Nachrichten konnten nicht abgerufen werden."
+
+#: ../mail/mail.error.xml.h:68
+msgid "Failed to save messages to disk."
+msgstr "Nachrichten konnten nicht auf Festplatte gespeichert werden."
+
+#: ../mail/mail.error.xml.h:69
 msgid "Failed to unsubscribe from folder."
 msgstr "Abbestellen des Ordners schlug fehl."
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:70
 msgid "File exists but cannot overwrite it."
 msgstr "Die Datei existiert, das Ãberschreiben ist jedoch nicht mÃglich."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:71
 msgid "File exists but is not a regular file."
 msgstr "Die Datei existiert, ist jedoch keine gewÃhnliche Datei"
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:73
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "Der Ordner Â{0}Â enthÃlt keine doppelten Nachrichten."
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:74
 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:70
+#: ../mail/mail.error.xml.h:75
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
@@ -12822,18 +12808,17 @@ msgstr ""
 "Falls Sie einen Ordner lÃschen, geht sein gesamter Inhalt sowie der Inhalt "
 "seiner Unterordner dauerhaft verloren."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:76
 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:72
+#: ../mail/mail.error.xml.h:77
 msgid "If you proceed, all proxy accounts will be deleted permanently."
-msgstr ""
-"Falls Sie fortfahren, werden alle Vertretungskonten dauerhaft gelÃscht."
+msgstr "Falls Sie fortfahren, werden alle Vertretungskonten dauerhaft gelÃscht."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:78
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -12841,40 +12826,39 @@ msgstr ""
 "Falls Sie fortfahren, werden die Konten- und\n"
 "Vertretungsinformationen dauerhaft gelÃscht."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:80
 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:76
+#: ../mail/mail.error.xml.h:81
 msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+"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:77
+#: ../mail/mail.error.xml.h:82
 msgid "Ignore"
 msgstr "Ignorieren"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:83
 msgid "Invalid authentication"
 msgstr "Legitimation ungÃltig"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:84
 msgid "Mail Deletion Failed"
 msgstr "LÃschen der E-Mail gescheitert"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:85
 msgid "Mail filters automatically updated."
 msgstr "E-Mail-Filter automatisch aktualisiert."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:86
 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 message anyway. To avoid this, you should add at least one To: or CC: "
+"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 "
+"message anyway. To avoid this, you should add at least one To: or CC: "
 "recipient."
 msgstr ""
 "Viele E-Mail-Systeme fÃgen eine ÂApparently-ToÂ-Kopfzeile zu Nachrichten "
@@ -12883,49 +12867,59 @@ msgstr ""
 "Um dies zu umgehen, sollten Sie mindestens einen ÂAn:Â- oder ÂKopie an:-"
 "EmpfÃnger hinzufÃgen.Â"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:87
+msgid ""
+"Messages shown in Search Folders are not copies. Deleting them from a Search "
+"Folder will delete the actual messages from the folder or folders in which "
+"they physically reside. Do you really want to delete these messages?"
+msgstr ""
+"Die in Suchordnern angezeigten Nachrichten sind keine Kopien. Das LÃschen von "
+"Nachrichten in Suchordnern lÃscht diese in den jeweiligen Nachrichtenordnern, "
+"in denen sich diese Nachrichten physikalisch befinden. MÃchten Sie wirklich "
+"lÃschen?"
+
+#: ../mail/mail.error.xml.h:88
 msgid "Missing folder."
 msgstr "Ordner fehlt."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:90
 msgid "N_ever"
 msgstr "Ni_e"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:91
 msgid "No duplicate messages found."
 msgstr "Keine doppelten Nachrichten gefunden."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:92
 msgid "No sources selected."
 msgstr "Keine Quellen gewÃhlt."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:93
 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:88
+#: ../mail/mail.error.xml.h:94
 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:89
+#: ../mail/mail.error.xml.h:95
 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:90
+#: ../mail/mail.error.xml.h:96
 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."
+"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."
 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."
+"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:91
+#: ../mail/mail.error.xml.h:97
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -12936,80 +12930,79 @@ msgstr ""
 "{0}\n"
 "Dennoch abschicken?"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:99
 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:94
+#: ../mail/mail.error.xml.h:100
 msgid "Please wait."
 msgstr "Bitte warten."
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:101
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Probleme beim Migrieren des alten E-Mail-Ordners Â{0}Â."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:102
 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:97
+#: ../mail/mail.error.xml.h:103
 msgid "Read receipt requested."
 msgstr "LesebestÃtigung angefordert."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:104
 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:99
+#: ../mail/mail.error.xml.h:105
 msgid "Really delete folder \"{0}\"?"
 msgstr "Soll der Ordner Â{0}Â wirklich gelÃscht werden?"
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:106
 msgid "Remove duplicate messages?"
 msgstr "Sollen die doppelten Nachrichten entfernt werden?"
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:107
 msgid "Reply _Privately"
 msgstr "_Privat antworten"
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:110
 msgid "Search Folders automatically updated."
 msgstr "Suchordner automatisch aktualisiert."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:111
 msgid "Send private reply?"
 msgstr "Private Antwort senden?"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:112
 msgid "Send reply to all recipients?"
 msgstr "Antwort an alle EmpfÃnger senden?"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:113
 msgid "Signature Already Exists"
 msgstr "Signatur existiert bereits"
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:114
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Ordner lokal fÃr Offline-Benutzung abgleichen?"
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:115
 msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
+"System folders are required for Evolution to function correctly and cannot be "
+"renamed, moved, or deleted."
 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:110
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
-"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 in "
-"your message. To avoid this, you should add at least one To: or CC: "
-"recipient. "
+"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 in your "
+"message. To avoid this, you should add at least one To: or CC: recipient. "
 msgstr ""
 "Die zu verschickende Kontaktliste ist so konfiguriert, dass ListenempfÃnger "
 "verborgen werden.\n"
@@ -13020,7 +13013,7 @@ msgstr ""
 "Um dies zu umgehen, sollten Sie mindestens einen ÂAn:Â- oder ÂKopie an:-"
 "EmpfÃnger hinzufÃgen.Â"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:119
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -13028,7 +13021,7 @@ msgstr ""
 "Der folgende EmpfÃnger wurden als ungÃltige E-Mail-Adresse erkannt:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:121
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -13036,11 +13029,15 @@ msgstr ""
 "Die folgenden EmpfÃnger wurden als ungÃltige E-Mail-Adressen erkannt:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:124
 msgid "The script file must exist and be executable."
 msgstr "Die Skriptdatei muss existieren und ausfÃhrbar sein."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:125
+msgid "These messages are not copies."
+msgstr "Diese Nachrichten sind keine Kopien."
+
+#: ../mail/mail.error.xml.h:126
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -13048,22 +13045,22 @@ 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:121
+#: ../mail/mail.error.xml.h:128
 msgid ""
-"This message cannot be sent because the account you chose to send with is "
-"not enabled"
+"This message cannot be sent because the account you chose to send with is not "
+"enabled"
 msgstr ""
 "Diese Nachricht konnte nicht verschickt werden, da das zum Verschicken "
 "gewÃhlte Konto nicht aktiviert ist"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:129
 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:123
+#: ../mail/mail.error.xml.h:130
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -13071,27 +13068,26 @@ msgstr ""
 "Dieser Server unterstÃtzt diese Art der Legitimation nicht. MÃglicherweise "
 "unterstÃtzt er keinerlei Legitimation."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:131
 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:125
+#: ../mail/mail.error.xml.h:132
 msgid ""
-"This will mark all messages as read in the selected folder and its "
-"subfolders."
+"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:126
+#: ../mail/mail.error.xml.h:133
 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:127
+#: ../mail/mail.error.xml.h:134
 msgid "Unable to connect to the GroupWise server."
 msgstr "Verbindungsaufbau zum GroupWise-Server gescheitert."
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:135
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -13099,44 +13095,37 @@ msgstr ""
 "Der Entwurfsordner fÃr dieses Konto konnte nicht geÃffnet werden. Soll "
 "stattdessen der System-Entwurfsordner verwendet werden?"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:136
 msgid "Unable to read license file."
 msgstr "Die Lizenzdatei konnte nicht gelesen werden."
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:137
+msgid "Unable to retrieve message."
+msgstr "Nachricht konnte nicht abgerufen werden."
+
+#: ../mail/mail.error.xml.h:138
 msgid "Use _Default"
 msgstr "_Vorgabe benutzen"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:139
 msgid "Use default drafts folder?"
 msgstr "Soll der vorgegebene Entwurfsordner benutzt werden?"
 
-#: ../mail/mail.error.xml.h:132
-msgid ""
-"Warning: Deleting messages from a Search Folder will delete the actual "
-"message from one of your local or remote folders.\n"
-"Do you really want to do this?"
-msgstr ""
-"Das LÃschen von E-Mails in Suchordnern lÃscht diese E-Mails in den "
-"jeweiligen Nachrichtenordnern, in denen sich diese E-Mails physikalisch "
-"befinden.\n"
-"MÃchten Sie wirklich lÃschen?"
-
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:140
 msgid "Would you like to close the message window?"
 msgstr "Wollen Sie das Nachrichtenfenster schlieÃen?"
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:141
 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?"
+"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 ""
 "Sie antworten privat auf eine Nachricht, die Sie Ãber eine Mailingliste "
 "erhalten haben. Die Liste versucht jedoch, Ihre Antwort direkt an die Liste "
 "zu leiten. Wollen Sie wirklich fortsetzen?"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:142
 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 "
@@ -13146,42 +13135,41 @@ msgstr ""
 "aber Sie antworten an den privaten Absender, nicht an die Liste. Wollen Sie "
 "wirklich fortsetzen?"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:143
 msgid ""
-"You are replying to a message which was sent to many recipients. Are you "
-"sure you want to reply to ALL of them?"
+"You are replying to a message which was sent to many recipients. Are you sure "
+"you want to reply to ALL of them?"
 msgstr ""
 "Sie antworten auf eine Nachricht, die an viele EmpfÃnger versendet wurde. "
 "Sind Sie sicher, dass Sie an ALLE antworten wollen?"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:144
 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:139
+#: ../mail/mail.error.xml.h:145
 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:140
+#: ../mail/mail.error.xml.h:146
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
-"Es existieren unverschickte Nachrichten. Wollen Sie Evolution dennoch "
-"beenden?"
+"Es existieren unverschickte Nachrichten. Wollen Sie Evolution dennoch beenden?"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:147
 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:142
+#: ../mail/mail.error.xml.h:148
 msgid "You must name this Search Folder."
 msgstr "Sie mÃssen einen Namen fÃr diesen Suchordner vergeben."
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:149
 msgid "You must specify a folder."
 msgstr "Sie mÃssen einen Ordner angeben."
 
 # CHECK
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:150
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -13191,145 +13179,153 @@ 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:146
+#: ../mail/mail.error.xml.h:152
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Anmedlung am Server Â{0}Â als Â{0}Â ist gescheitert."
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:153
 msgid "_Always"
 msgstr "_Immer"
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:154
 msgid "_Append"
 msgstr "An_hÃngen"
 
-#: ../mail/mail.error.xml.h:149
-#: ../plugins/groupwise-features/junk-settings.ui.h:5
+#: ../mail/mail.error.xml.h:155
 #: ../plugins/publish-calendar/publish-calendar.c:600
 msgid "_Disable"
 msgstr "_Deaktivieren"
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:156
 msgid "_Discard changes"
 msgstr "Ãnderungen _verwerfen"
 
-#: ../mail/mail.error.xml.h:151
-#: ../modules/mail/e-mail-shell-view-actions.c:1071
+#: ../mail/mail.error.xml.h:157
+#: ../modules/mail/e-mail-shell-view-actions.c:1124
 msgid "_Empty Trash"
 msgstr "_MÃll leeren"
 
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:158
 msgid "_Exit Evolution"
 msgstr "Evolution b_eenden"
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:159
 msgid "_Expunge"
 msgstr "_SÃubern"
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:160
 msgid "_Migrate Now"
 msgstr "Jetzt _migrieren"
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:161
 msgid "_No"
 msgstr "_Nein"
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:162
 msgid "_Open Messages"
 msgstr "Nachrichten Ã_ffnen"
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:165
 msgid "_Send Receipt"
 msgstr "BestÃtigung _senden"
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:166
 msgid "_Synchronize"
 msgstr "_Abgleichen"
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:167
 msgid "_Yes"
 msgstr "_Ja"
 
-#: ../mail/message-list.c:1215
+#: ../mail/mail.error.xml.h:168
+msgid "{0}"
+msgstr "{0}"
+
+#: ../mail/message-list.c:1211
 msgid "Unseen"
 msgstr "Ungelesen"
 
-#: ../mail/message-list.c:1216
+#: ../mail/message-list.c:1212
 msgid "Seen"
 msgstr "Gelesen"
 
-#: ../mail/message-list.c:1217
+#: ../mail/message-list.c:1213
 msgid "Answered"
 msgstr "Beantwortet"
 
-#: ../mail/message-list.c:1218
+#: ../mail/message-list.c:1214
 msgid "Forwarded"
 msgstr "Weitergeleitet"
 
-#: ../mail/message-list.c:1219
+#: ../mail/message-list.c:1215
 msgid "Multiple Unseen Messages"
 msgstr "Mehrere ungelesene Nachrichten"
 
-#: ../mail/message-list.c:1220
+#: ../mail/message-list.c:1216
 msgid "Multiple Messages"
 msgstr "Mehrere Nachrichten"
 
-#: ../mail/message-list.c:1224
+#: ../mail/message-list.c:1220
 msgid "Lowest"
 msgstr "Am niedrigsten"
 
-#: ../mail/message-list.c:1225
+#: ../mail/message-list.c:1221
 msgid "Lower"
 msgstr "Niedriger"
 
-#: ../mail/message-list.c:1229
+#: ../mail/message-list.c:1225
 msgid "Higher"
 msgstr "HÃher"
 
-#: ../mail/message-list.c:1230
+#: ../mail/message-list.c:1226
 msgid "Highest"
 msgstr "Am hÃchsten"
 
-#: ../mail/message-list.c:1849 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1838 ../widgets/table/e-cell-date.c:48
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1856 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1845 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "Heute %I:%M %p"
 
-#: ../mail/message-list.c:1865
+#: ../mail/message-list.c:1854
 msgid "Yesterday %l:%M %p"
 msgstr "Gestern %l:%M %p"
 
-#: ../mail/message-list.c:1877
+#: ../mail/message-list.c:1866
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: ../mail/message-list.c:1885
+#: ../mail/message-list.c:1874
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b, %k:%M"
 
-#: ../mail/message-list.c:1887
+#: ../mail/message-list.c:1876
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2658
+#: ../mail/message-list.c:2644
 msgid "Select all visible messages"
 msgstr "Alle sichtbaren Nachrichten wÃhlen"
 
-#: ../mail/message-list.c:2816 ../mail/message-list.etspec.h:10
+#: ../mail/message-list.c:2802 ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Nachrichten"
 
+#. default follow-up flag name to use when clicked in the message list column
+#: ../mail/message-list.c:3997
+msgid "Follow-up"
+msgstr "Folgenachricht"
+
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4493 ../mail/message-list.c:4922
+#: ../mail/message-list.c:4501 ../mail/message-list.c:4920
 msgid "Generating message list"
 msgstr "Nachrichtenliste wird erzeugt"
 
-#: ../mail/message-list.c:4736
+#: ../mail/message-list.c:4738
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -13337,7 +13333,7 @@ msgstr ""
 "Auf Ihr Suchkriterium treffen keine Nachrichten zu. Leeren Sie die Suche mit "
 "Suchen->Verwerfen oder Ãndern Sie sie."
 
-#: ../mail/message-list.c:4738
+#: ../mail/message-list.c:4740
 msgid "There are no messages in this folder."
 msgstr "Es existieren keine Nachrichten in diesem Ordner."
 
@@ -13366,7 +13362,7 @@ msgid "Sent Messages"
 msgstr "Nachrichten verschicken"
 
 #: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:568
+#: ../widgets/misc/e-attachment-tree-view.c:572
 msgid "Size"
 msgstr "GrÃÃe"
 
@@ -13374,28 +13370,23 @@ msgstr "GrÃÃe"
 msgid "Subject - Trimmed"
 msgstr "Betreff - GekÃrzt"
 
-#: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1508
+#: ../mail/searchtypes.xml.h:1 ../modules/mail/e-mail-shell-view-actions.c:1564
 msgid "Body contains"
 msgstr "Rumpf enthÃlt"
 
-#: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1515
+#: ../mail/searchtypes.xml.h:2 ../modules/mail/e-mail-shell-view-actions.c:1571
 msgid "Message contains"
 msgstr "Nachricht enthÃlt"
 
-#: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1522
+#: ../mail/searchtypes.xml.h:3 ../modules/mail/e-mail-shell-view-actions.c:1578
 msgid "Recipients contain"
 msgstr "EmpfÃnger enthalten"
 
-#: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1529
+#: ../mail/searchtypes.xml.h:4 ../modules/mail/e-mail-shell-view-actions.c:1585
 msgid "Sender contains"
 msgstr "Absender enthÃlt"
 
-#: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1536
+#: ../mail/searchtypes.xml.h:5 ../modules/mail/e-mail-shell-view-actions.c:1592
 msgid "Subject contains"
 msgstr "Betreff enthÃlt"
 
@@ -13403,7 +13394,7 @@ msgstr "Betreff enthÃlt"
 msgid "Subject or Addresses contains"
 msgstr "Betreff oder Adresse enthÃlt"
 
-#: ../modules/addressbook/addressbook-config.c:205
+#: ../modules/addressbook/addressbook-config.c:207
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -13411,7 +13402,7 @@ msgstr ""
 "Wenn Sie diese Option auswÃhlen, stellt Evolution nur dann eine Verbindung "
 "mit Ihrem LDAP-Server her, falls dieser SSL unterstÃtzt."
 
-#: ../modules/addressbook/addressbook-config.c:207
+#: ../modules/addressbook/addressbook-config.c:209
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -13419,7 +13410,7 @@ msgstr ""
 "Wenn Sie diese Option auswÃhlen, stellt Evolution nur dann eine Verbindung "
 "mit Ihrem LDAP-Server her, falls dieser TLS unterstÃtzt."
 
-#: ../modules/addressbook/addressbook-config.c:209
+#: ../modules/addressbook/addressbook-config.c:211
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
@@ -13429,15 +13420,15 @@ msgstr ""
 "Verbindung zu Ihrem LDAP-Server her. Das bedeutet, dass Ihre Verbindung "
 "unsicher ist und dadurch ein Sicherheitsproblem entsteht."
 
-#: ../modules/addressbook/addressbook-config.c:608
+#: ../modules/addressbook/addressbook-config.c:625
 msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "Im Geburt_s- und Jahrestagskalender verwenden"
 
-#: ../modules/addressbook/addressbook-config.c:644
+#: ../modules/addressbook/addressbook-config.c:666
 msgid "Copy _book content locally for offline operation"
 msgstr "Den Adressbuchinhalt lokal zum Arbeiten im Offline-Modus _kopieren"
 
-#: ../modules/addressbook/addressbook-config.c:751
+#: ../modules/addressbook/addressbook-config.c:778
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
@@ -13447,51 +13438,50 @@ msgstr ""
 "soll. Es wurde bereits eine Liste der Standard-Ports bereitgestellt. Fragen "
 "Sie Ihren Systemadministrator, welchen Port Sie angeben mÃssen."
 
-#: ../modules/addressbook/addressbook-config.c:825
+#: ../modules/addressbook/addressbook-config.c:857
 msgid ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your LDAP "
-"server."
+"This is the method Evolution will use to authenticate you.  Note that setting "
+"this to \"Email Address\" requires anonymous access to your LDAP server."
 msgstr ""
 "Dies ist die von Evolution verwendete Methode, um Sie zu legitimieren. "
-"Beachten Sie, dass ein anonymer Zugriff auf den LDAP-Server erforderlich "
-"ist, wenn Sie dies auf ÂE-Mail-Adresse einstellen."
+"Beachten Sie, dass ein anonymer Zugriff auf den LDAP-Server erforderlich ist, "
+"wenn Sie dies auf ÂE-Mail-Adresse einstellen."
 
-#: ../modules/addressbook/addressbook-config.c:900
+#: ../modules/addressbook/addressbook-config.c:937
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
+"your search base. A search scope of \"one\" will only include the entries one "
+"level beneath your base."
 msgstr ""
-"Der Suchbereich legt fest, wie tief Sie bei der Suche im Ordnerbaum "
-"absteigen wollen. Der Suchbereich Âsub schlieÃt alle EintrÃge unterhalb des "
+"Der Suchbereich legt fest, wie tief Sie bei der Suche im Ordnerbaum absteigen "
+"wollen. Der Suchbereich Âsub schlieÃt alle EintrÃge unterhalb des "
 "Suchbereichs ein. Der Suchbereich Âone hingegen schlieÃt lediglich die Ebene "
 "unterhalb des Ausgangspunktes der Suche ein."
 
-#: ../modules/addressbook/addressbook-config.c:1016
+#: ../modules/addressbook/addressbook-config.c:1058
 msgid "Server Information"
 msgstr "Server-Informationen"
 
-#: ../modules/addressbook/addressbook-config.c:1021
+#: ../modules/addressbook/addressbook-config.c:1063
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "Details"
 
-#: ../modules/addressbook/addressbook-config.c:1022
-#: ../modules/mail/e-mail-shell-view.c:54
+#: ../modules/addressbook/addressbook-config.c:1064
+#: ../modules/mail/e-mail-shell-view.c:58
 msgid "Searching"
 msgstr "Suchen"
 
-#: ../modules/addressbook/addressbook-config.c:1024
+#: ../modules/addressbook/addressbook-config.c:1066
 msgid "Downloading"
 msgstr "Herunterladen"
 
-#: ../modules/addressbook/addressbook-config.c:1230
+#: ../modules/addressbook/addressbook-config.c:1272
 msgid "Address Book Properties"
 msgstr "Adressbucheigenschaften"
 
-#: ../modules/addressbook/addressbook-config.c:1232
+#: ../modules/addressbook/addressbook-config.c:1274
 msgid "New Address Book"
 msgstr "Neues Adressbuch"
 
@@ -13535,14 +13525,17 @@ msgstr "PrimÃres Adressbuch"
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
 msgid "Show autocompleted name with an address"
 msgstr ""
-"Legt fest, ob der automatisch vervollstÃndigte Name mit Adresse angezeigt "
-"wird"
+"Legt fest, ob der automatisch vervollstÃndigte Name mit Adresse angezeigt wird"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+msgid "Show maps"
+msgstr "Karten anzeigen"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
 msgid "Show preview pane"
 msgstr "Vorschaufeld anzeigen"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
 msgid ""
 "The UID of the selected (or \"primary\") address book in the sidebar of the "
 "\"Contacts\" view."
@@ -13550,7 +13543,7 @@ msgstr ""
 "Die UID des gewÃhlten (oder ÂprimÃrenÂ) Adressbuchs in der Seitenleiste der "
 "ÂKontakteÂ-Ansicht."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the contact list. \"0\" (Classic View) places the preview pane below the "
@@ -13562,7 +13555,7 @@ msgstr ""
 "Kontaktliste. Â1Â (vertikale Ansicht) setzt die Vorschauleiste neben die "
 "Kontaktliste. "
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
@@ -13570,15 +13563,15 @@ msgstr ""
 "Die Anzahl der Zeichen, die eingegeben werden mÃssen, bevor Evolution die "
 "Auto-VervollstÃndigung versucht."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
 msgid "URI for the folder last used in the select names dialog"
 msgstr "Adresse des zuletzt im NamenswÃhler verwendeten Ordners"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
 msgid "URI for the folder last used in the select names dialog."
 msgstr "Adresse des zuletzt im NamenswÃhler verwendeten Ordners."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
 msgid ""
 "Whether force showing the mail address with the name of the autocompleted "
 "contact in the entry."
@@ -13586,337 +13579,362 @@ msgstr ""
 "Legt fest, ob die E-Mail-Adresse zusammen mit dem Namen des automatisch "
 "vervollstÃndigten Kontakts im Eintrag angezeigt wird."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
+msgid "Whether to show maps in preview pane."
+msgstr "Sollen Karten im Vorschaufeld angezeigt werden?"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:20
 msgid "Whether to show the preview pane."
 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:161
-#: ../modules/mail/em-mailer-prefs.c:1140
+#: ../modules/addressbook/autocompletion-config.c:165
+#: ../modules/mail/em-mailer-prefs.c:1029
 msgid "_Table column:"
 msgstr "_Tabellenspalte:"
 
-#: ../modules/addressbook/autocompletion-config.c:164
+#: ../modules/addressbook/autocompletion-config.c:168
 msgid "Autocompletion"
 msgstr "Auto-VervollstÃndigung"
 
-#: ../modules/addressbook/autocompletion-config.c:167
+#: ../modules/addressbook/autocompletion-config.c:171
 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:94
-#: ../modules/addressbook/e-book-shell-migrate.c:153
+#: ../modules/addressbook/e-book-shell-backend.c:98
+#: ../modules/addressbook/e-book-shell-migrate.c:154
 msgid "On LDAP Servers"
 msgstr "Auf LDAP-Servern"
 
-#: ../modules/addressbook/e-book-shell-backend.c:276
+#: ../modules/addressbook/e-book-shell-backend.c:284
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ../modules/addressbook/e-book-shell-backend.c:278
-#: ../modules/addressbook/e-book-shell-view-actions.c:773
+#: ../modules/addressbook/e-book-shell-backend.c:286
+#: ../modules/addressbook/e-book-shell-view-actions.c:905
 msgid "Create a new contact"
 msgstr "Einen neuen Kontakt anlegen"
 
-#: ../modules/addressbook/e-book-shell-backend.c:283
+#: ../modules/addressbook/e-book-shell-backend.c:291
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Kontakt_liste"
 
-#: ../modules/addressbook/e-book-shell-backend.c:285
-#: ../modules/addressbook/e-book-shell-view-actions.c:780
+#: ../modules/addressbook/e-book-shell-backend.c:293
+#: ../modules/addressbook/e-book-shell-view-actions.c:912
 msgid "Create a new contact list"
 msgstr "Eine neue Kontaktliste anlegen"
 
-#: ../modules/addressbook/e-book-shell-backend.c:293
+#: ../modules/addressbook/e-book-shell-backend.c:301
 msgctxt "New"
 msgid "Address _Book"
 msgstr "Adressb_uch"
 
-#: ../modules/addressbook/e-book-shell-backend.c:295
-#: ../modules/addressbook/e-book-shell-view-actions.c:703
+#: ../modules/addressbook/e-book-shell-backend.c:303
+#: ../modules/addressbook/e-book-shell-view-actions.c:835
 msgid "Create a new address book"
 msgstr "Ein neues Adressbuch anlegen"
 
 #. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:312
-#: ../modules/addressbook/e-book-shell-view.c:401
-#: ../modules/calendar/e-cal-shell-backend.c:105
-#: ../modules/calendar/e-cal-shell-migrate.c:59
+#: ../modules/addressbook/e-book-shell-backend.c:320
+#: ../modules/addressbook/e-book-shell-view.c:405
+#: ../modules/calendar/e-cal-shell-backend.c:111
+#: ../modules/calendar/e-cal-shell-migrate.c:63
+#: ../modules/online-accounts/e-online-accounts-google.c:364
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: ../modules/addressbook/e-book-shell-backend.c:322
+#: ../modules/addressbook/e-book-shell-backend.c:330
 msgid "Certificates"
 msgstr "Zertifikate"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:263
-#: ../modules/addressbook/e-book-shell-view-actions.c:549
+#: ../modules/addressbook/e-book-shell-view-actions.c:387
+#: ../modules/addressbook/e-book-shell-view-actions.c:683
 msgid "Save as vCard"
 msgstr "Als VCard speichern"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:680
+#: ../modules/addressbook/e-book-shell-view-actions.c:812
 msgid "Co_py All Contacts To..."
 msgstr "Kontakte _kopieren nach â"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:682
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
 msgid "Copy the contacts of the selected address book to another"
 msgstr ""
 "Die Kontakte des gewÃhlten Adressbuchs in ein anderes Adressbuch kopieren"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:687
+#: ../modules/addressbook/e-book-shell-view-actions.c:819
 msgid "D_elete Address Book"
 msgstr "Adressbuch _lÃschen"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:689
+#: ../modules/addressbook/e-book-shell-view-actions.c:821
 msgid "Delete the selected address book"
 msgstr "Das gewÃhlte Adressbuch lÃschen"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:694
+#: ../modules/addressbook/e-book-shell-view-actions.c:826
 msgid "Mo_ve All Contacts To..."
 msgstr "Alle Kontakte _verschieben nach â"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:696
+#: ../modules/addressbook/e-book-shell-view-actions.c:828
 msgid "Move the contacts of the selected address book to another"
 msgstr ""
 "Die Kontakte des gewÃhlten Adressbuchs in ein anderes Adressbuch verschieben"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:701
+#: ../modules/addressbook/e-book-shell-view-actions.c:833
 msgid "_New Address Book"
 msgstr "_Neues Adressbuch"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:708
+#: ../modules/addressbook/e-book-shell-view-actions.c:840
 msgid "Address _Book Properties"
 msgstr "Adress_bucheigenschaften"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:710
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
 msgid "Show properties of the selected address book"
 msgstr "Die Eigenschaften des gewÃhlten Adressbuchs anzeigen"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:715
-#: ../modules/calendar/e-cal-shell-view-actions.c:1360
-#: ../modules/calendar/e-memo-shell-view-actions.c:626
-#: ../modules/calendar/e-task-shell-view-actions.c:750
-#: ../modules/mail/e-mail-shell-view-actions.c:1155
+#: ../modules/addressbook/e-book-shell-view-actions.c:847
+msgid "Address Book _Map"
+msgstr "Adressbuch_karte"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:849
+msgid "Show map with all contacts from selected address book"
+msgstr "Karte mit allen Kontakten des gewÃhlten Adressbuchs anzeigen"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:854
+#: ../modules/calendar/e-cal-shell-view-actions.c:1372
+#: ../modules/calendar/e-memo-shell-view-actions.c:627
+#: ../modules/calendar/e-task-shell-view-actions.c:751
+#: ../modules/mail/e-mail-shell-view-actions.c:1201
 msgid "_Rename..."
 msgstr "_Umbenennen â"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:717
+#: ../modules/addressbook/e-book-shell-view-actions.c:856
 msgid "Rename the selected address book"
 msgstr "Das gewÃhlte Adressbuch umbenennen"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:722
-msgid "S_ave Address Book as vCard"
-msgstr "Adressbuch als v_Card speichern"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:724
-msgid "Save the contacts of the selected address book as a vCard"
-msgstr "Die Kontakte des gewÃhlten Adressbuchs als vCard speichern"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:731
+#: ../modules/addressbook/e-book-shell-view-actions.c:863
 msgid "Stop loading"
 msgstr "Laden stoppen"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:736
+#: ../modules/addressbook/e-book-shell-view-actions.c:868
 msgid "_Copy Contact To..."
 msgstr "Kontakt _kopieren nach â"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:738
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
 msgid "Copy selected contacts to another address book"
 msgstr "GewÃhlte Kontakte in ein anderes Adressbuch kopieren"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:743
+#: ../modules/addressbook/e-book-shell-view-actions.c:875
 msgid "_Delete Contact"
 msgstr "Kontakt _lÃschen"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:750
+#: ../modules/addressbook/e-book-shell-view-actions.c:882
 msgid "_Find in Contact..."
 msgstr "In Kontakten _suchen â"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:752
+#: ../modules/addressbook/e-book-shell-view-actions.c:884
 msgid "Search for text in the displayed contact"
 msgstr "Im angezeigten Kontakt einen Text suchen"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:757
+#: ../modules/addressbook/e-book-shell-view-actions.c:889
 msgid "_Forward Contact..."
 msgstr "Kontakt _weiterleiten â"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:759
+#: ../modules/addressbook/e-book-shell-view-actions.c:891
 msgid "Send selected contacts to another person"
 msgstr "GewÃhlte Kontakte an jemanden verschicken"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:764
+#: ../modules/addressbook/e-book-shell-view-actions.c:896
 msgid "_Move Contact To..."
 msgstr "Kontakt _verschieben nach â"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:766
+#: ../modules/addressbook/e-book-shell-view-actions.c:898
 msgid "Move selected contacts to another address book"
 msgstr "GewÃhlte Kontakte in ein anderes Adressbuch verschieben"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:771
+#: ../modules/addressbook/e-book-shell-view-actions.c:903
 msgid "_New Contact..."
 msgstr "_Neuer Kontakt â"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:778
+#: ../modules/addressbook/e-book-shell-view-actions.c:910
 msgid "New Contact _List..."
 msgstr "Neue Kontakt_liste â"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:785
+#: ../modules/addressbook/e-book-shell-view-actions.c:917
 msgid "_Open Contact"
 msgstr "Kontakt Ã_ffnen"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:787
+#: ../modules/addressbook/e-book-shell-view-actions.c:919
 msgid "View the current contact"
 msgstr "Den aktuellen Kontakt anzeigen"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:792
+#: ../modules/addressbook/e-book-shell-view-actions.c:924
 msgid "_Send Message to Contact..."
 msgstr "_Nachricht an Kontakt schicken â"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:794
+#: ../modules/addressbook/e-book-shell-view-actions.c:926
 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:801
-#: ../modules/calendar/e-cal-shell-view-actions.c:1502
-#: ../modules/calendar/e-task-shell-view-actions.c:808
+#: ../modules/addressbook/e-book-shell-view-actions.c:933
+#: ../modules/calendar/e-cal-shell-view-actions.c:1507
+#: ../modules/calendar/e-task-shell-view-actions.c:809
 msgid "_Actions"
 msgstr "A_ktionen"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:808
-#: ../modules/calendar/e-memo-shell-view-actions.c:663
-#: ../modules/calendar/e-task-shell-view-actions.c:815
-#: ../modules/mail/e-mail-shell-view-actions.c:1320
+#: ../modules/addressbook/e-book-shell-view-actions.c:940
+#: ../modules/calendar/e-memo-shell-view-actions.c:664
+#: ../modules/calendar/e-task-shell-view-actions.c:816
+#: ../modules/mail/e-mail-shell-view-actions.c:1359
 msgid "_Preview"
 msgstr "_Vorschau"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:817
-#: ../modules/calendar/e-cal-shell-view-actions.c:1519
-#: ../modules/calendar/e-memo-shell-view-actions.c:676
-#: ../modules/calendar/e-task-shell-view-actions.c:828
+#: ../modules/addressbook/e-book-shell-view-actions.c:949
+#: ../modules/calendar/e-cal-shell-view-actions.c:1524
+#: ../modules/calendar/e-memo-shell-view-actions.c:677
+#: ../modules/calendar/e-task-shell-view-actions.c:829
 msgid "_Delete"
 msgstr "_LÃschen"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:821
+#: ../modules/addressbook/e-book-shell-view-actions.c:953
 msgid "_Properties"
 msgstr "Ei_genschaften"
 
-#. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:830
-#: ../modules/addressbook/e-book-shell-view-actions.c:976
-msgid "_Save as vCard..."
-msgstr "Als VCard _speichern â"
+#: ../modules/addressbook/e-book-shell-view-actions.c:957
+msgid "Address Book Map"
+msgstr "Adressbuchkarte"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:858
+#: ../modules/addressbook/e-book-shell-view-actions.c:989
 msgid "Contact _Preview"
 msgstr "Kontakt_vorschau"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
+#: ../modules/addressbook/e-book-shell-view-actions.c:991
 msgid "Show contact preview window"
 msgstr "Kontakt-Vorschaufenster anzeigen"
 
+#: ../modules/addressbook/e-book-shell-view-actions.c:997
+msgid "Show _Maps"
+msgstr "_Karten anzeigen"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:999
+msgid "Show maps in contact preview window"
+msgstr "Karten im Kontakt-Vorschaufenster anzeigen"
+
 # CHECK
-#: ../modules/addressbook/e-book-shell-view-actions.c:879
-#: ../modules/calendar/e-memo-shell-view-actions.c:733
-#: ../modules/calendar/e-task-shell-view-actions.c:897
-#: ../modules/mail/e-mail-shell-view-actions.c:1418
+#: ../modules/addressbook/e-book-shell-view-actions.c:1018
+#: ../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:1474
 msgid "_Classic View"
 msgstr "_Klassische Ansicht"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:881
+#: ../modules/addressbook/e-book-shell-view-actions.c:1020
 msgid "Show contact preview below the contact list"
 msgstr "Kontakt-Vorschaufenster unter der Kontaktliste anzeigen"
 
 # CHECK - macht Ãberhaupt keinen Sinn
-#: ../modules/addressbook/e-book-shell-view-actions.c:886
-#: ../modules/calendar/e-memo-shell-view-actions.c:740
-#: ../modules/calendar/e-task-shell-view-actions.c:904
-#: ../modules/mail/e-mail-shell-view-actions.c:1425
+#: ../modules/addressbook/e-book-shell-view-actions.c:1025
+#: ../modules/calendar/e-memo-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:905
+#: ../modules/mail/e-mail-shell-view-actions.c:1481
 msgid "_Vertical View"
 msgstr "_Vertikale Ansicht"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:888
+#: ../modules/addressbook/e-book-shell-view-actions.c:1027
 msgid "Show contact preview alongside the contact list"
 msgstr "Kontakt-Vorschaufenster neben der Kontaktliste anzeigen"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:896
-#: ../modules/calendar/e-cal-shell-view-actions.c:1662
-#: ../modules/calendar/e-memo-shell-view-actions.c:750
-#: ../modules/calendar/e-task-shell-view-actions.c:921
+#: ../modules/addressbook/e-book-shell-view-actions.c:1035
+#: ../modules/calendar/e-cal-shell-view-actions.c:1663
+#: ../modules/calendar/e-memo-shell-view-actions.c:751
+#: ../modules/calendar/e-task-shell-view-actions.c:922
 msgid "Any Category"
 msgstr "Beliebige Kategorie"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:903
-#: ../modules/calendar/e-cal-shell-view-actions.c:1676
-#: ../modules/calendar/e-memo-shell-view-actions.c:757
-#: ../modules/calendar/e-task-shell-view-actions.c:956
+#: ../modules/addressbook/e-book-shell-view-actions.c:1042
+#: ../modules/calendar/e-cal-shell-view-actions.c:1677
+#: ../modules/calendar/e-memo-shell-view-actions.c:758
+#: ../modules/calendar/e-task-shell-view-actions.c:957
 msgid "Unmatched"
 msgstr "Nicht einsortiert"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:913
-#: ../modules/calendar/e-cal-shell-view-actions.c:1686
-#: ../modules/calendar/e-memo-shell-view-actions.c:767
-#: ../modules/calendar/e-task-shell-view-actions.c:966
-#: ../modules/mail/e-mail-shell-view-actions.c:1501
-#: ../shell/e-shell-content.c:635
+#: ../modules/addressbook/e-book-shell-view-actions.c:1052
+#: ../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
+#: ../modules/mail/e-mail-shell-view-actions.c:1557
+#: ../shell/e-shell-content.c:666
 msgid "Advanced Search"
 msgstr "Erweiterte Suche"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:946
+#: ../modules/addressbook/e-book-shell-view-actions.c:1085
 msgid "Print all shown contacts"
 msgstr "Alle angezeigten Kontakte drucken"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:953
+#: ../modules/addressbook/e-book-shell-view-actions.c:1092
 msgid "Preview the contacts to be printed"
 msgstr "Eine Vorschau auf die zu druckenden Kontakte anzeigen"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:960
+#: ../modules/addressbook/e-book-shell-view-actions.c:1099
 msgid "Print selected contacts"
 msgstr "Die gewÃhlten Kontakte drucken"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:978
+#: ../modules/addressbook/e-book-shell-view-actions.c:1114
+msgid "S_ave Address Book as vCard"
+msgstr "Adressbuch als v_Card speichern"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1116
+msgid "Save the contacts of the selected address book as a vCard"
+msgstr "Die Kontakte des gewÃhlten Adressbuchs als vCard speichern"
+
+#. Translators: This is an action label
+#: ../modules/addressbook/e-book-shell-view-actions.c:1122
+#: ../modules/addressbook/e-book-shell-view-actions.c:1132
+msgid "_Save as vCard..."
+msgstr "Als VCard _speichern â"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1124
 msgid "Save selected contacts as a vCard"
 msgstr "GewÃhlte Kontakte als vCard speichern"
 
-#: ../modules/addressbook/e-book-shell-view.c:345
+#: ../modules/addressbook/e-book-shell-view.c:349
 msgid "_Forward Contacts"
 msgstr "Kontakte weiter_leiten"
 
-#: ../modules/addressbook/e-book-shell-view.c:347
+#: ../modules/addressbook/e-book-shell-view.c:351
 msgid "_Forward Contact"
 msgstr "Kontakt weiter_leiten"
 
-#: ../modules/addressbook/e-book-shell-view.c:378
+#: ../modules/addressbook/e-book-shell-view.c:382
 msgid "_Send Message to Contacts"
 msgstr "_Nachricht an Kontakte schicken"
 
-#: ../modules/addressbook/e-book-shell-view.c:380
+#: ../modules/addressbook/e-book-shell-view.c:384
 msgid "_Send Message to List"
 msgstr "_Nachricht an Liste schicken"
 
-#: ../modules/addressbook/e-book-shell-view.c:382
+#: ../modules/addressbook/e-book-shell-view.c:386
 msgid "_Send Message to Contact"
 msgstr "_Nachricht an Kontakt schicken"
 
-#: ../modules/addressbook/eab-composer-util.c:143
+#: ../modules/addressbook/eab-composer-util.c:147
 msgid "Multiple vCards"
 msgstr "Mehrere VCards"
 
-#: ../modules/addressbook/eab-composer-util.c:151
+#: ../modules/addressbook/eab-composer-util.c:155
 #, c-format
 msgid "vCard for %s"
 msgstr "VCard fÃr %s"
 
-#: ../modules/addressbook/eab-composer-util.c:163
-#: ../modules/addressbook/eab-composer-util.c:190
+#: ../modules/addressbook/eab-composer-util.c:167
+#: ../modules/addressbook/eab-composer-util.c:194
 #, c-format
 msgid "Contact information"
 msgstr "Kontaktinformationen"
 
-#: ../modules/addressbook/eab-composer-util.c:192
+#: ../modules/addressbook/eab-composer-util.c:196
 #, c-format
 msgid "Contact information for %s"
 msgstr "Kontaktinformationen fÃr %s"
@@ -13967,8 +13985,8 @@ msgid ""
 "Search filter is the type of object to be searched for. If this is not "
 "modified, the default search will be performed on the type \"person\"."
 msgstr ""
-"Der Suchfilter legt die Art der Objekte fest, nach denen gesucht werden "
-"soll. Wird er nicht verÃndert, so wird die voreingestellte Suche auf den Typ "
+"Der Suchfilter legt die Art der Objekte fest, nach denen gesucht werden soll. "
+"Wird er nicht verÃndert, so wird die voreingestellte Suche auf den Typ "
 "ÂPerson durchgefÃhrt."
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
@@ -14000,10 +14018,6 @@ msgstr "UnterstÃtzte Suchbasen _suchen"
 msgid "_Login method:"
 msgstr "An_meldemethode:"
 
-#: ../modules/addressbook/ldap-config.ui.h:27
-msgid "_Port:"
-msgstr "_Port:"
-
 #: ../modules/addressbook/ldap-config.ui.h:28
 msgid "_Search scope:"
 msgstr "_Suchbereich:"
@@ -14012,14 +14026,48 @@ msgstr "_Suchbereich:"
 msgid "_Timeout:"
 msgstr "_ZeitÃberschreitung:"
 
-#: ../modules/addressbook/ldap-config.ui.h:31
-msgid "_Use secure connection:"
-msgstr "_Sichere Verbindung verwenden:"
-
 #: ../modules/addressbook/ldap-config.ui.h:32
 msgid "cards"
 msgstr "Karten"
 
+#: ../modules/bogofilter/evolution-bogofilter.c:146
+#, c-format
+msgid "Failed to spawn Bogofilter (%s): "
+msgstr "Weiterleitung an Bogofilter gescheitert (%s):"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:164
+msgid "Failed to stream mail message content to Bogofilter: "
+msgstr "Nachrichteninhalt konnte nicht an Bogofilter weitergeleitet werden:"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:213
+msgid "Bogofilter either crashed or failed to process a mail message"
+msgstr ""
+"Bogofilter ist entweder abgestÃrzt oder kann eine Nachricht nicht verarbeiten"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:312
+msgid "Bogofilter Options"
+msgstr "Bogofilter-Optionen"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:321
+msgid "Convert message text to _Unicode"
+msgstr "Nachrichtentext nach _Unicode konvertieren"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:477
+msgid "Bogofilter"
+msgstr "Bogofilter"
+
+#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:1
+msgid "Convert mail messages to Unicode"
+msgstr "E-Mails nach Unicode konvertieren"
+
+#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:2
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
+msgstr ""
+"E-Mail-Text in Unicode/UTF-8 umwandeln, um die unerwÃnschten Elemente aus "
+"verschiedenen Zeichenkodierungen einheitlich zu erkennen."
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:2
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
@@ -14050,6 +14098,10 @@ msgstr "30 Minuten"
 msgid "60 minutes"
 msgstr "60 Minuten"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:9
+msgid "Alarms"
+msgstr "Alarme"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:10
 msgid "Alerts"
 msgstr "Alarme"
@@ -14071,8 +14123,8 @@ msgid "Display"
 msgstr "Anzeigen"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:16
-msgid "Display alarms in _notification area only"
-msgstr "Alarme nur im _Benachrichtigungsfeld anzeigen"
+msgid "Display reminders in _notification area only"
+msgstr "Erinnerungen nur im _Benachrichtigungsfeld anzeigen"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:20
 msgid "Hours"
@@ -14083,367 +14135,361 @@ msgid "Minutes"
 msgstr "Minuten"
 
 #. Sunday
-#: ../modules/calendar/e-calendar-preferences.ui.h:25
+#: ../modules/calendar/e-calendar-preferences.ui.h:26
 msgid "S_un"
 msgstr "_So"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:27
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
 msgid "Sc_roll Month View by a week"
 msgstr "Monatsansicht _wochenweise blÃttern"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:28
+#: ../modules/calendar/e-calendar-preferences.ui.h:29
 msgid "Se_cond zone:"
 msgstr "Z_weite Zone:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:29
-msgid "Select the calendars for alarm notification"
-msgstr "Kalender fÃr Alarmbenachrichtigung auswÃhlen"
+#: ../modules/calendar/e-calendar-preferences.ui.h:30
+msgid "Select the calendars for reminder notification"
+msgstr "Kalender fÃr Erinnerungsmeldungen auswÃhlen"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:31
+#: ../modules/calendar/e-calendar-preferences.ui.h:32
 msgid "Sh_ow a reminder"
 msgstr "Eine _Erinnerung anzeigen"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:33
+#: ../modules/calendar/e-calendar-preferences.ui.h:34
 msgid "Show a _reminder"
 msgstr "Eine _Erinnerung anzeigen"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:34
+#: ../modules/calendar/e-calendar-preferences.ui.h:35
 msgid "Show r_ecurring events in italic in bottom left calendar"
 msgstr "Wi_ederkehrende Ereignisse im Kalender unten links kursiv anzeigen"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:35
+#: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "Show week _numbers"
 msgstr "_Wochennummern anzeigen"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:37
+#: ../modules/calendar/e-calendar-preferences.ui.h:38
 msgid "T_asks due today:"
 msgstr "Heute fÃllige _Aufgaben:"
 
 #. Thursday
-#: ../modules/calendar/e-calendar-preferences.ui.h:39
+#: ../modules/calendar/e-calendar-preferences.ui.h:40
 msgid "T_hu"
 msgstr "D_o"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:41
+#: ../modules/calendar/e-calendar-preferences.ui.h:42
 msgid "Template:"
 msgstr "Vorlage:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:43
+#: ../modules/calendar/e-calendar-preferences.ui.h:44
 #: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "Uhrzeit"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:45
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Time format:"
 msgstr "Zeitformat:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
+#: ../modules/calendar/e-calendar-preferences.ui.h:48
 msgid "Use s_ystem time zone"
 msgstr "Zeitzone des S_ystems verwenden"
 
 #. A weekday like "Monday" follows
-#: ../modules/calendar/e-calendar-preferences.ui.h:50
+#: ../modules/calendar/e-calendar-preferences.ui.h:51
 msgid "Wee_k starts on:"
 msgstr "W_oche beginnt am:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:51
-#: ../modules/calendar/e-cal-shell-view-actions.c:1645
+#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#: ../modules/calendar/e-cal-shell-view-actions.c:1646
 msgid "Work Week"
 msgstr "Arbeitswoche"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#: ../modules/calendar/e-calendar-preferences.ui.h:53
 msgid "Work days:"
 msgstr "Arbeitstage:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:53
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "_12 hour (AM/PM)"
 msgstr "_12 Stunden"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
+#: ../modules/calendar/e-calendar-preferences.ui.h:55
 msgid "_24 hour"
 msgstr "_24 Stunden"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:55
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
 msgid "_Ask for confirmation when deleting items"
 msgstr "Beim _LÃschen von Objekten nachfragen"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
 msgid "_Compress weekends in month view"
 msgstr "Wochenenden in Monatsansicht _komprimieren"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "_Day begins:"
 msgstr "_Tag beginnt:"
 
 #. Friday
-#: ../modules/calendar/e-calendar-preferences.ui.h:59
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
 msgid "_Fri"
 msgstr "_Fr"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:60
+#: ../modules/calendar/e-calendar-preferences.ui.h:61
 msgid "_Hide completed tasks after"
 msgstr "Erledigte Aufgaben _verbergen nach"
 
 #. Monday
-#: ../modules/calendar/e-calendar-preferences.ui.h:62
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
 msgid "_Mon"
 msgstr "_Mo"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:63
+#: ../modules/calendar/e-calendar-preferences.ui.h:64
 msgid "_Overdue tasks:"
 msgstr "_ÃberfÃllige Aufgaben:"
 
 #. Saturday
-#: ../modules/calendar/e-calendar-preferences.ui.h:65
+#: ../modules/calendar/e-calendar-preferences.ui.h:66
 msgid "_Sat"
 msgstr "S_a"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:66
+#: ../modules/calendar/e-calendar-preferences.ui.h:67
 msgid "_Show appointment end times in week and month view"
 msgstr "_Endzeiten von Terminen in Wochen- und Monatsansicht anzeigen"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:67
+#: ../modules/calendar/e-calendar-preferences.ui.h:68
 msgid "_Time divisions:"
 msgstr "Zeit_unterteilungen:"
 
 #. Tuesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:69
+#: ../modules/calendar/e-calendar-preferences.ui.h:70
 msgid "_Tue"
 msgstr "_Di"
 
 #. Wednesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:71
+#: ../modules/calendar/e-calendar-preferences.ui.h:72
 msgid "_Wed"
 msgstr "M_i"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:73
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
 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"
-#: ../modules/calendar/e-calendar-preferences.ui.h:75
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
 msgid "before every appointment"
 msgstr "vor jedem Termin"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
-msgid "Alarm programs"
-msgstr "Alarmprogramme"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
 msgid "Ask for confirmation when deleting items"
 msgstr "Beim LÃschen von Objekten nachfragen"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
 msgstr "Hintergrundfarbe fÃr heute fÃllige Aufgaben im Format Â#rrggbbÂ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr "Hintergrundfarbe fÃr ÃberfÃllige Aufgaben im Format Â#rrggbbÂ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
 msgid "Birthday and anniversary reminder"
 msgstr "Erinnerung an Geburts- und Jahrestage"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
 msgid "Birthday and anniversary reminder units"
 msgstr "Einheiten der Erinnerung an Geburts- und Jahrestage"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
 msgid "Birthday and anniversary reminder value"
 msgstr "Wert der Erinnerung an Geburts- und Jahrestage"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
-msgid "Calendars to run alarms for"
-msgstr "Kalender, fÃr die Alarme ausgefÃhrt werden sollen"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
+msgid "Calendars to run reminders for"
+msgstr "Kalender, fÃr die Erinnerungen ausgefÃhrt werden sollen"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
-msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
+msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr ""
 "Farbe der Marcus-Bains-Linie in der Zeitleiste (Voreinstellung ist leer)."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "Farbe der Marcus-Bains-Linie in der Tagesansicht."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
 msgid "Compress weekends in month view"
 msgstr "Wochenenden in Monatsansicht komprimieren"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
 msgid "Confirm expunge"
 msgstr "Beim SÃubern nachfragen"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr ""
-"Die Tage, bei denen der Anfang und das Ende der Arbeitsstunden "
-"gekennzeichnet werden soll."
+"Die Tage, bei denen der Anfang und das Ende der Arbeitsstunden gekennzeichnet "
+"werden soll."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
 msgid "Default appointment reminder"
 msgstr "Voreingestellte Erinnerung fÃr Termine"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder units"
 msgstr "Einheit der voreingestellten Erinnerung"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder value"
 msgstr "Wert der voreingestellten Erinnerung"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
-msgid "Directory for saving alarm audio files"
-msgstr "Ordner fÃr das Speichern der Alarm-Audiodateien"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+msgid "Directory for saving reminder audio files"
+msgstr "Ordner fÃr das Speichern der Erinnerungs-Klangdateien"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
 msgid "Free/busy server URLs"
 msgstr "VerfÃgbarkeits-Server-Adressen"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
 msgid "Free/busy template URL"
 msgstr "Vorlage-Adresse fÃr VerfÃgbarkeitsdaten"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
 msgid "Hide completed tasks"
 msgstr "Erledigte Aufgaben verbergen"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
 msgid "Hide task units"
 msgstr "Einheit fÃr das Verbergen von Aufgaben"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide task value"
 msgstr "Wert fÃr das Verbergen von Aufgaben"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
 msgid "Horizontal pane position"
 msgstr "Position der horizontalen Schiebeleiste"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr ""
 "Die Stunde im 24-Stunden-Format von 0 bis 23, an der ein Arbeitstag endet."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr ""
 "Die Stunde im 24-Stunden-Format von 0 bis 23, an der ein Arbeitstag beginnt."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
 msgid "If \"true\", show the memo preview pane in the main window."
 msgstr ""
 "Falls auf Âwahr gesetzt, wird die Notizvorschau im Hauptfenster angezeigt."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
 msgid "If \"true\", show the task preview pane in the main window."
 msgstr ""
 "Falls auf Âwahr gesetzt, wird die Aufgabenvorschau im Hauptfenster angezeigt."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
 msgid "Intervals shown in Day and Work Week views, in minutes."
-msgstr ""
-"In der Tages- und Wochentagsansicht anzuzeigende Intervalle in Minuten."
+msgstr "In der Tages- und Wochentagsansicht anzuzeigende Intervalle in Minuten."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
-msgid "Last alarm time"
-msgstr "Letzte Alarmzeit"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+msgid "Last reminder time"
+msgstr "Letzte Erinnerungszeit"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
 msgid "List of recently used second time zones in a Day View."
 msgstr "Liste der zuletzt genutzten zweiten Zeitzonen in der Tagesansicht."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
 msgid "List of server URLs for free/busy publishing."
 msgstr ""
 "Liste der Server-Adressen fÃr die VerÃffentlichung von "
 "VerfÃgbarkeitsinformationen."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
 msgid "Marcus Bains Line"
 msgstr "Marcus-Bains-Linie"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Farbe der Marcus-Bains-Linie - Tagesansicht"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Farbe der Marcus-Bains-Linie - Zeitleiste"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
 msgid ""
-"Maximum number of recently used timezones to remember in a "
-"'day_second_zones' list."
+"Maximum number of recently used timezones to remember in a 'day_second_zones' "
+"list."
 msgstr ""
 "HÃchstzahl der zuletzt genutzten gespeicherten Zeitzonen in der Liste "
 "Âday_second_zonesÂ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
 msgid "Maximum number of recently used timezones to remember."
 msgstr "HÃchstzahl der zuletzt genutzten gespeicherten Zeitzonen."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
 msgid "Memo layout style"
 msgstr "Stil der Notiz"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
 msgid "Memo preview pane position (horizontal)"
 msgstr "Position der horizontalen Notizvorschau"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
 msgid "Memo preview pane position (vertical)"
 msgstr "Position der vertikalen Notizvorschau"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Die Minute von 0 bis 59, zu der der Arbeitstag endet."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Die Minute von 0 bis 59, zu der der Arbeitstag beginnt."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
 msgid "Month view horizontal pane position"
 msgstr "Position der horizontalen Schiebeleiste in der Monatsansicht"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
 msgid "Month view vertical pane position"
 msgstr "Position der vertikalen Schiebeleiste in der Monatsansicht"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
 msgid "Number of units for determining a birthday or anniversary reminder."
 msgstr ""
-"Anzahl der Einheiten zur Festlegung einer Erinnerung an einen Geburtstag "
-"oder Jahrestag."
+"Anzahl der Einheiten zur Festlegung einer Erinnerung an einen Geburtstag oder "
+"Jahrestag."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
 msgid "Number of units for determining a default reminder."
 msgstr "Anzahl der Einheiten zur Festlegung einer voreingestellten Erinnerung."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
 msgid "Number of units for determining when to hide tasks."
 msgstr ""
 "Anzahl der Einheiten zur Festlegung, wann Aufgaben verborgen werden sollen."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
 msgid "Overdue tasks color"
 msgstr "Farbe ÃberfÃlliger Aufgaben"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
 msgstr ""
-"Die Position der horizontalen Schiebeleiste zwischen dem Kalender zur "
-"Auswahl des Datums und der Aufgabenliste in Pixel, wenn keine Monatsansicht "
+"Die Position der horizontalen Schiebeleiste zwischen dem Kalender zur Auswahl "
+"des Datums und der Aufgabenliste in Pixel, wenn keine Monatsansicht "
 "eingestellt ist."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -14452,19 +14498,19 @@ msgstr ""
 "Datumsnavigator-Kalender und der Aufgabenliste in Pixel, wenn die "
 "Monatsansicht eingestellt ist."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
 msgid "Position of the memo preview pane when oriented vertically."
 msgstr "Position des Notiz-Vorschaufeldes in vertikaler Anordnung."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
 msgid "Position of the task preview pane when oriented horizontally."
 msgstr "Position des Aufgaben-Vorschaufeldes in horizontaler Anordnung."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
 msgid "Position of the task preview pane when oriented vertically."
 msgstr "Position des Aufgaben-Vorschaufeldes in vertikaler Anordnung."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
@@ -14472,7 +14518,7 @@ msgstr ""
 "Die Position der vertikalen Leiste zwischen der Kalenderliste und dem "
 "Datumsauswahl-Kalender."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -14481,7 +14527,7 @@ msgstr ""
 "Datumsnavigator-Kalender und der Aufgabenliste in Pixel, wenn die "
 "Monatsansicht eingestellt ist."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -14490,33 +14536,37 @@ msgstr ""
 "Datumsnavigator-Kalender und der Aufgabenliste in Pixel, wenn keine "
 "Monatsansicht eingestellt ist."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
 msgid "Primary calendar"
 msgstr "PrimÃrer Kalender"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
 msgid "Primary memo list"
 msgstr "PrimÃre Notizliste"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
 msgid "Primary task list"
 msgstr "PrimÃre Aufgabenliste"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
-msgid "Programs that are allowed to be run by alarms."
-msgstr "Programme, die als Teil von Alarmen ausgefÃhrt werden kÃnnen."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+msgid "Programs that are allowed to be run by reminders."
+msgstr "Programme, die als Teil von Erinnerungen ausgefÃhrt werden kÃnnen."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
 msgid "Recently used second time zones in a Day View"
 msgstr "Zuletzt genutzte zweite Zeitzonen in der Tagesansicht"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
 msgid "Recurrent Events in Italic"
 msgstr "Wiederkehrende Ereignisse kursiv"
 
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+msgid "Reminder programs"
+msgstr "Erinnerungsprogramme"
+
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
-msgid "Save directory for alarm audio"
-msgstr "Speichern des Ordners fÃr die Alarm-Audiodateien"
+msgid "Save directory for reminder audio"
+msgstr "Speicherordner fÃr die Erinnerungs-Klangdateien"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
 msgid "Scroll Month View by a week"
@@ -14544,8 +14594,8 @@ msgstr ""
 "Tage mit wiederkehrenden Ereignissen im Kalender unten links kursiv anzeigen."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
-msgid "Show display alarms in notification tray"
-msgstr "Alarmausgaben im Benachrichtigungsfeld anzeigen"
+msgid "Show display reminders in notification tray"
+msgstr "Erinnerungen im Benachrichtigungsfeld anzeigen"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
 msgid "Show status field in the event/task/meeting editor"
@@ -14657,10 +14707,10 @@ msgid ""
 "the task list. \"0\" (Classic View) places the preview pane below the task "
 "list. \"1\" (Vertical View) places the preview pane next to the task list."
 msgstr ""
-"Die Anordnung legt fest, wo die Vorschauleiste in Bezug auf die "
-"Aufgabenliste angezeigt wird. Â0Â (klassische Ansicht) setzt die "
-"Vorschauleiste unter die Aufgabenliste. Â1Â (vertikale Ansicht) setzt die "
-"Vorschauleiste neben die Aufgabenliste. "
+"Die Anordnung legt fest, wo die Vorschauleiste in Bezug auf die Aufgabenliste "
+"angezeigt wird. Â0Â (klassische Ansicht) setzt die Vorschauleiste unter die "
+"Aufgabenliste. Â1Â (vertikale Ansicht) setzt die Vorschauleiste neben die "
+"Aufgabenliste. "
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:91
 msgid "The second timezone for a Day View"
@@ -14679,8 +14729,8 @@ msgid "Time divisions"
 msgstr "Zeiteinteilungen"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:94
-msgid "Time the last alarm ran, in time_t."
-msgstr "Zeit der letzten AlarmauslÃsung im Âtime_tÂ-Format."
+msgid "Time the last reminder ran, in time_t."
+msgstr "Zeit der letzten ErinnerungsauslÃsung im Âtime_tÂ-Format."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
 msgid "Timezone"
@@ -14692,8 +14742,8 @@ msgstr "24-Stunden-Zeitformat"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:97
 msgid ""
-"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
-"\"days\"."
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or \"days"
+"\"."
 msgstr ""
 "Einheit fÃr Erinnerungen an Geburtstage oder Jahrestage (ÂminutesÂ, Âhours "
 "oder ÂdaysÂ)."
@@ -14734,8 +14784,8 @@ msgstr ""
 "Wochentag von Sonntag (Â0Â) bis Sonnabend (Â6Â), mit dem die Woche beginnt."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
-msgid "Whether or not to use the notification tray for display alarms."
-msgstr "Soll das Benachrichtigungsfeld fÃr Alarmausgaben verwendet werden?"
+msgid "Whether or not to use the notification tray for display reminders."
+msgstr "Soll das Benachrichtigungsfeld fÃr Erinnerungen verwendet werden?"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to ask for confirmation when deleting an appointment or task."
@@ -14768,8 +14818,7 @@ msgstr ""
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:111
 msgid "Whether to hide completed tasks in the tasks view."
-msgstr ""
-"Sollen abgeschlossene Aufgaben in der Aufgabenansicht verborgen werden?"
+msgstr "Sollen abgeschlossene Aufgaben in der Aufgabenansicht verborgen werden?"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to scroll a Month View by a week, not by a month."
@@ -14787,8 +14836,7 @@ msgstr "Soll eine Erinnerung fÃr Geburtstage und Jahrestage festgelegt werden?"
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:115
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr ""
-"Soll das UAwg-Feld im Ereignis-/Aufgaben-/Besprechungseditor angezeigt "
-"werden?"
+"Soll das UAwg-Feld im Ereignis-/Aufgaben-/Besprechungseditor angezeigt werden?"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:116
 msgid "Whether to show categories field in the event/meeting editor"
@@ -14808,8 +14856,7 @@ msgstr ""
 "werden?"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:119
-msgid ""
-"Whether to show times in twenty four hour format instead of using am/pm."
+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?"
 
@@ -14821,8 +14868,7 @@ msgstr ""
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:121
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr ""
-"Soll das Artenfeld im Ereignis-/Aufgaben-/Besprechungseditor angezeigt "
-"werden?"
+"Soll das Artenfeld im Ereignis-/Aufgaben-/Besprechungseditor angezeigt werden?"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:122
 msgid "Whether to show week numbers in various places in the Calendar."
@@ -14850,118 +14896,129 @@ msgstr "Stunde, zu der der Arbeitstag beginnt"
 msgid "Workday start minute"
 msgstr "Minute, zu der der Arbeitstag beginnt"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:267
+#: ../modules/calendar/e-cal-attachment-handler.c:286
 #: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
 msgstr "I_mportieren"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:348
+#: ../modules/calendar/e-cal-attachment-handler.c:367
 msgid "Select a Calendar"
 msgstr "Einen Kalender auswÃhlen"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:375
+#: ../modules/calendar/e-cal-attachment-handler.c:394
 msgid "Select a Task List"
 msgstr "Eine Aufgabenliste auswÃhlen"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:385
+#: ../modules/calendar/e-cal-attachment-handler.c:404
 msgid "I_mport to Calendar"
 msgstr "In _Kalender importieren"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:392
+#: ../modules/calendar/e-cal-attachment-handler.c:411
 msgid "I_mport to Tasks"
 msgstr "In _Aufgaben importieren"
 
+#: ../modules/calendar/e-calendar-preferences.c:441
+msgid "Selected Calendars for Reminders"
+msgstr "AusgewÃhlte Kalender fÃr die Erinnerungen"
+
+#: ../modules/calendar/e-calendar-preferences.c:840
+msgid "Ti_me and date:"
+msgstr "_Zeit und Datum:"
+
+#: ../modules/calendar/e-calendar-preferences.c:841
+msgid "_Date only:"
+msgstr "Nur das _Datum:"
+
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:107
-#: ../modules/calendar/e-cal-shell-migrate.c:194
-#: ../modules/calendar/e-memo-shell-backend.c:94
-#: ../modules/calendar/e-memo-shell-migrate.c:149
-#: ../modules/calendar/e-task-shell-backend.c:94
-#: ../modules/calendar/e-task-shell-migrate.c:160
+#: ../modules/calendar/e-cal-shell-backend.c:113
+#: ../modules/calendar/e-cal-shell-migrate.c:198
+#: ../modules/calendar/e-memo-shell-backend.c:100
+#: ../modules/calendar/e-memo-shell-migrate.c:152
+#: ../modules/calendar/e-task-shell-backend.c:100
+#: ../modules/calendar/e-task-shell-migrate.c:164
 msgid "On The Web"
 msgstr "Im Web"
 
-#: ../modules/calendar/e-cal-shell-backend.c:109
-#: ../plugins/calendar-weather/calendar-weather.c:121
+#: ../modules/calendar/e-cal-shell-backend.c:115
+#: ../plugins/calendar-weather/calendar-weather.c:125
 msgid "Weather"
 msgstr "Wetter"
 
-#: ../modules/calendar/e-cal-shell-backend.c:196
-#: ../modules/calendar/e-cal-shell-migrate.c:62
+#: ../modules/calendar/e-cal-shell-backend.c:202
+#: ../modules/calendar/e-cal-shell-migrate.c:66
 msgid "Birthdays & Anniversaries"
 msgstr "Geburts- und Jahrestage"
 
-#: ../modules/calendar/e-cal-shell-backend.c:421
+#: ../modules/calendar/e-cal-shell-backend.c:423
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Termin"
 
-#: ../modules/calendar/e-cal-shell-backend.c:423
-#: ../modules/calendar/e-cal-shell-view-actions.c:1439
+#: ../modules/calendar/e-cal-shell-backend.c:425
+#: ../modules/calendar/e-cal-shell-view-actions.c:1451
 msgid "Create a new appointment"
 msgstr "Einen neuen Termin anlegen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:428
+#: ../modules/calendar/e-cal-shell-backend.c:430
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "_Ganztagstermin"
 
-#: ../modules/calendar/e-cal-shell-backend.c:430
+#: ../modules/calendar/e-cal-shell-backend.c:432
 msgid "Create a new all-day appointment"
 msgstr "Einen neuen ganztÃtigen Termin anlegen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:435
+#: ../modules/calendar/e-cal-shell-backend.c:437
 msgctxt "New"
 msgid "M_eeting"
 msgstr "_Besprechung"
 
-#: ../modules/calendar/e-cal-shell-backend.c:437
+#: ../modules/calendar/e-cal-shell-backend.c:439
 msgid "Create a new meeting request"
 msgstr "Eine neue Besprechungsanfrage anlegen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:445
+#: ../modules/calendar/e-cal-shell-backend.c:447
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Kalen_der"
 
-#: ../modules/calendar/e-cal-shell-backend.c:447
-#: ../modules/calendar/e-cal-shell-view-actions.c:1334
+#: ../modules/calendar/e-cal-shell-backend.c:449
+#: ../modules/calendar/e-cal-shell-view-actions.c:1346
 msgid "Create a new calendar"
 msgstr "Einen neuen Kalender anlegen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:750
-#: ../plugins/itip-formatter/itip-formatter.c:2819
+#: ../modules/calendar/e-cal-shell-backend.c:755
+#: ../plugins/itip-formatter/itip-formatter.c:2965
 msgid "Calendar and Tasks"
 msgstr "Kalender und Aufgaben"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:221
+#: ../modules/calendar/e-cal-shell-sidebar.c:180
 msgid "Loading calendars"
 msgstr "Kalender werden geladen"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:636
+#: ../modules/calendar/e-cal-shell-sidebar.c:721
 msgid "_New Calendar..."
 msgstr "_Neuer Kalender â"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:653
+#: ../modules/calendar/e-cal-shell-sidebar.c:738
 msgid "Calendar Selector"
 msgstr "Kalenderquellenauswahl"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:998
+#: ../modules/calendar/e-cal-shell-sidebar.c:1087
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Kalender auf %s wird geÃffnet"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:218
-#: ../modules/calendar/e-cal-shell-view-actions.c:247
+#: ../modules/calendar/e-cal-shell-view-actions.c:222
+#: ../modules/calendar/e-cal-shell-view-actions.c:251
 msgid "Print"
 msgstr "Drucken"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:306
+#: ../modules/calendar/e-cal-shell-view-actions.c:310
 msgid ""
 "This operation will permanently erase all events older than the selected "
-"amount of time. If you continue, you will not be able to recover these "
-"events."
+"amount of time. If you continue, you will not be able to recover these events."
 msgstr ""
 "Dieser Vorgang lÃscht alle Ereignisse, die Ãlter als der angegebene Zeitraum "
 "sind. Falls Sie fortfahren, kÃnnen Sie diese Ereignisse nicht "
@@ -14969,306 +15026,306 @@ msgstr ""
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:323
+#: ../modules/calendar/e-cal-shell-view-actions.c:327
 msgid "Purge events older than"
 msgstr "Ereignisse lÃschen Ãlter als"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:534
+#: ../modules/calendar/e-cal-shell-view-actions.c:541
 msgid "Copying Items"
 msgstr "Objekte werden kopiert"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:804
+#: ../modules/calendar/e-cal-shell-view-actions.c:816
 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:1131
+#: ../modules/calendar/e-cal-shell-view-actions.c:1143
 msgid "event"
 msgstr "Ereignis"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1133
-#: ../modules/calendar/e-cal-shell-view-memopad.c:216
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:283
-#: ../modules/calendar/e-memo-shell-view-actions.c:510
-#: ../modules/calendar/e-task-shell-view-actions.c:627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1145
+#: ../modules/calendar/e-cal-shell-view-memopad.c:220
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:287
+#: ../modules/calendar/e-memo-shell-view-actions.c:511
+#: ../modules/calendar/e-task-shell-view-actions.c:628
 msgid "Save as iCalendar"
 msgstr "Als iCalendar speichern"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1290
-#: ../modules/calendar/e-memo-shell-view-actions.c:591
+#: ../modules/calendar/e-cal-shell-view-actions.c:1302
+#: ../modules/calendar/e-memo-shell-view-actions.c:592
 msgid "_Copy..."
 msgstr "_Kopieren â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1297
+#: ../modules/calendar/e-cal-shell-view-actions.c:1309
 msgid "D_elete Calendar"
 msgstr "Kalender _lÃschen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1299
+#: ../modules/calendar/e-cal-shell-view-actions.c:1311
 msgid "Delete the selected calendar"
 msgstr "Den gewÃhlten Kalender lÃschen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1306
+#: ../modules/calendar/e-cal-shell-view-actions.c:1318
 msgid "Go Back"
 msgstr "ZurÃck gehen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1313
+#: ../modules/calendar/e-cal-shell-view-actions.c:1325
 msgid "Go Forward"
 msgstr "Vor gehen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1320
+#: ../modules/calendar/e-cal-shell-view-actions.c:1332
 msgid "Select today"
 msgstr "Heute wÃhlen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1325
+#: ../modules/calendar/e-cal-shell-view-actions.c:1337
 msgid "Select _Date"
 msgstr "_Datum wÃhlen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1327
+#: ../modules/calendar/e-cal-shell-view-actions.c:1339
 msgid "Select a specific date"
 msgstr "Ein bestimmtes Datum wÃhlen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1332
+#: ../modules/calendar/e-cal-shell-view-actions.c:1344
 msgid "_New Calendar"
 msgstr "_Neuer Kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1346
-#: ../modules/calendar/e-task-shell-view-actions.c:799
+#: ../modules/calendar/e-cal-shell-view-actions.c:1358
+#: ../modules/calendar/e-task-shell-view-actions.c:800
 msgid "Purg_e"
 msgstr "_SÃubern"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1348
+#: ../modules/calendar/e-cal-shell-view-actions.c:1360
 msgid "Purge old appointments and meetings"
 msgstr "Alte Termine und Besprechungen lÃschen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1353
-#: ../modules/calendar/e-memo-shell-view-actions.c:619
-#: ../modules/calendar/e-task-shell-view-actions.c:743
+#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-memo-shell-view-actions.c:620
+#: ../modules/calendar/e-task-shell-view-actions.c:744
 msgid "Re_fresh"
 msgstr "Auf_frischen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1355
+#: ../modules/calendar/e-cal-shell-view-actions.c:1367
 msgid "Refresh the selected calendar"
 msgstr "Den gewÃhlten Kalender aktualisieren"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1362
+#: ../modules/calendar/e-cal-shell-view-actions.c:1374
 msgid "Rename the selected calendar"
 msgstr "Den gewÃhlten Kalender umbenennen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1367
+#: ../modules/calendar/e-cal-shell-view-actions.c:1379
 msgid "Show _Only This Calendar"
 msgstr "Nur diesen _Kalender anzeigen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1374
+#: ../modules/calendar/e-cal-shell-view-actions.c:1386
 msgid "Cop_y to Calendar..."
 msgstr "In Kalender k_opieren â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1381
+#: ../modules/calendar/e-cal-shell-view-actions.c:1393
 msgid "_Delegate Meeting..."
 msgstr "Besprechung dele_gieren â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1388
+#: ../modules/calendar/e-cal-shell-view-actions.c:1400
 msgid "_Delete Appointment"
 msgstr "Den Termin _lÃschen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1390
+#: ../modules/calendar/e-cal-shell-view-actions.c:1402
 msgid "Delete selected appointments"
 msgstr "AusgewÃhlte Termine lÃschen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1395
+#: ../modules/calendar/e-cal-shell-view-actions.c:1407
 msgid "Delete This _Occurrence"
 msgstr "Dieses V_orkommen lÃschen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1397
+#: ../modules/calendar/e-cal-shell-view-actions.c:1409
 msgid "Delete this occurrence"
 msgstr "Diesen Treffer lÃschen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1402
+#: ../modules/calendar/e-cal-shell-view-actions.c:1414
 msgid "Delete All Occ_urrences"
 msgstr "Alle _Vorkommen lÃschen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1404
+#: ../modules/calendar/e-cal-shell-view-actions.c:1416
 msgid "Delete all occurrences"
 msgstr "Alle Vorkommen lÃschen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1409
+#: ../modules/calendar/e-cal-shell-view-actions.c:1421
 msgid "New All Day _Event..."
 msgstr "Neues _ganztÃgiges Ereignis â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1411
+#: ../modules/calendar/e-cal-shell-view-actions.c:1423
 msgid "Create a new all day event"
 msgstr "Ein neues ganztÃgiges Ereignis anlegen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1416
-#: ../modules/calendar/e-cal-shell-view-memopad.c:250
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:323
-#: ../modules/calendar/e-memo-shell-view-actions.c:584
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-memopad.c:254
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:327
+#: ../modules/calendar/e-memo-shell-view-actions.c:585
+#: ../modules/calendar/e-task-shell-view-actions.c:709
 msgid "_Forward as iCalendar..."
 msgstr "Als i_Calendar weiterleiten â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1423
+#: ../modules/calendar/e-cal-shell-view-actions.c:1435
 msgid "New _Meeting..."
 msgstr "Neue Bes_prechung â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1425
+#: ../modules/calendar/e-cal-shell-view-actions.c:1437
 msgid "Create a new meeting"
 msgstr "Eine neue Besprechung anlegen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1430
+#: ../modules/calendar/e-cal-shell-view-actions.c:1442
 msgid "Mo_ve to Calendar..."
 msgstr "In Kalender _verschieben â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1437
+#: ../modules/calendar/e-cal-shell-view-actions.c:1449
 msgid "New _Appointment..."
 msgstr "Neuer _Termin â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1444
+#: ../modules/calendar/e-cal-shell-view-actions.c:1456
 msgid "Make this Occurrence _Movable"
 msgstr "Diese Wiederholung v_erschiebbar machen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1451
+#: ../modules/calendar/e-cal-shell-view-actions.c:1463
 msgid "_Open Appointment"
 msgstr "Termin Ã_ffnen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1453
+#: ../modules/calendar/e-cal-shell-view-actions.c:1465
 msgid "View the current appointment"
 msgstr "Den aktuellen Termin anzeigen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1458
+#: ../modules/calendar/e-cal-shell-view-actions.c:1470
 msgid "_Reply"
 msgstr "_Antworten"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1472
-#: ../modules/calendar/e-cal-shell-view-memopad.c:278
-msgid "Save as iCalendar..."
-msgstr "Als iCalendar speichern â"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1479
+#: ../modules/calendar/e-cal-shell-view-actions.c:1484
 msgid "_Schedule Meeting..."
 msgstr "Besprechung _ansetzen â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1481
+#: ../modules/calendar/e-cal-shell-view-actions.c:1486
 msgid "Converts an appointment to a meeting"
 msgstr "Wandelt einen Termin in eine Besprechung um"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1486
+#: ../modules/calendar/e-cal-shell-view-actions.c:1491
 msgid "Conv_ert to Appointment..."
 msgstr "In T_ermin umwandelnâ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1488
+#: ../modules/calendar/e-cal-shell-view-actions.c:1493
 msgid "Converts a meeting to an appointment"
 msgstr "Wandelt eine Besprechung in einen Termin um"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1493
+#: ../modules/calendar/e-cal-shell-view-actions.c:1498
 msgid "Quit"
 msgstr "Beenden"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1617
+#: ../modules/calendar/e-cal-shell-view-actions.c:1618
 msgid "Day"
 msgstr "Tag"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
+#: ../modules/calendar/e-cal-shell-view-actions.c:1620
 msgid "Show one day"
 msgstr "Tagesansicht"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1624
+#: ../modules/calendar/e-cal-shell-view-actions.c:1625
 msgid "List"
 msgstr "Liste"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
+#: ../modules/calendar/e-cal-shell-view-actions.c:1627
 msgid "Show as list"
 msgstr "Listenansicht"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1631
+#: ../modules/calendar/e-cal-shell-view-actions.c:1632
 msgid "Month"
 msgstr "Monat"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
+#: ../modules/calendar/e-cal-shell-view-actions.c:1634
 msgid "Show one month"
 msgstr "Monatsansicht"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1638
+#: ../modules/calendar/e-cal-shell-view-actions.c:1639
 msgid "Week"
 msgstr "Woche"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
+#: ../modules/calendar/e-cal-shell-view-actions.c:1641
 msgid "Show one week"
 msgstr "Wochenansicht"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1647
+#: ../modules/calendar/e-cal-shell-view-actions.c:1648
 msgid "Show one work week"
 msgstr "Eine Arbeitswoche anzeigen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1655
+#: ../modules/calendar/e-cal-shell-view-actions.c:1656
 msgid "Active Appointments"
 msgstr "Aktuelle Termine"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1669
+#: ../modules/calendar/e-cal-shell-view-actions.c:1670
 msgid "Next 7 Days' Appointments"
 msgstr "Termine der nÃchsten 7 Tage"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1700
-#: ../modules/calendar/e-memo-shell-view-actions.c:781
-#: ../modules/calendar/e-task-shell-view-actions.c:980
+#: ../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 "Description contains"
 msgstr "Beschreibung enthÃlt"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1707
-#: ../modules/calendar/e-memo-shell-view-actions.c:788
-#: ../modules/calendar/e-task-shell-view-actions.c:987
+#: ../modules/calendar/e-cal-shell-view-actions.c:1708
+#: ../modules/calendar/e-memo-shell-view-actions.c:789
+#: ../modules/calendar/e-task-shell-view-actions.c:988
 msgid "Summary contains"
 msgstr "Zusammenfassung enthÃlt"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1719
+#: ../modules/calendar/e-cal-shell-view-actions.c:1720
 msgid "Print this calendar"
 msgstr "Diesen Kalender drucken"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1726
+#: ../modules/calendar/e-cal-shell-view-actions.c:1727
 msgid "Preview the calendar to be printed"
 msgstr "Vorschau auf den zu druckenden Kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1799
+#: ../modules/calendar/e-cal-shell-view-actions.c:1749
+#: ../modules/calendar/e-cal-shell-view-memopad.c:295
+msgid "Save as iCalendar..."
+msgstr "Als iCalendar speichern â"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1826
 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:214
-#: ../modules/calendar/e-memo-shell-view-actions.c:508
+#: ../modules/calendar/e-cal-shell-view-memopad.c:218
+#: ../modules/calendar/e-memo-shell-view-actions.c:509
 msgid "memo"
 msgstr "Notiz"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../modules/calendar/e-memo-shell-view-actions.c:640
+#: ../modules/calendar/e-cal-shell-view-memopad.c:261
+#: ../modules/calendar/e-memo-shell-view-actions.c:641
 msgid "New _Memo"
 msgstr "Neue _Notiz"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:259
-#: ../modules/calendar/e-memo-shell-backend.c:283
-#: ../modules/calendar/e-memo-shell-view-actions.c:642
+#: ../modules/calendar/e-cal-shell-view-memopad.c:263
+#: ../modules/calendar/e-memo-shell-backend.c:287
+#: ../modules/calendar/e-memo-shell-view-actions.c:643
 msgid "Create a new memo"
 msgstr "Eine neue Notiz anlegen"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:264
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
+#: ../modules/calendar/e-cal-shell-view-memopad.c:268
+#: ../modules/calendar/e-memo-shell-view-actions.c:648
 msgid "_Open Memo"
 msgstr "Notiz Ã_ffnen"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:266
-#: ../modules/calendar/e-memo-shell-view-actions.c:649
+#: ../modules/calendar/e-cal-shell-view-memopad.c:270
+#: ../modules/calendar/e-memo-shell-view-actions.c:650
 msgid "View the selected memo"
 msgstr "Die gewÃhlte Notiz anzeigen"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:271
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:358
-#: ../modules/calendar/e-memo-shell-view-actions.c:654
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/calendar/e-cal-shell-view-memopad.c:275
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:362
+#: ../modules/calendar/e-memo-shell-view-actions.c:655
+#: ../modules/calendar/e-task-shell-view-actions.c:793
 msgid "Open _Web Page"
 msgstr "_Website Ãffnen"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:290
-#: ../modules/calendar/e-memo-shell-view-actions.c:814
+#: ../modules/calendar/e-cal-shell-view-memopad.c:287
+#: ../modules/calendar/e-memo-shell-view-actions.c:815
 msgid "Print the selected memo"
 msgstr "Die gewÃhlte Notiz drucken"
 
@@ -15276,247 +15333,235 @@ msgstr "Die gewÃhlte Notiz drucken"
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:281
-#: ../modules/calendar/e-task-shell-view-actions.c:625
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:285
+#: ../modules/calendar/e-task-shell-view-actions.c:626
 msgid "task"
 msgstr "Aufgabe"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:316
-#: ../modules/calendar/e-task-shell-view-actions.c:687
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:320
+#: ../modules/calendar/e-task-shell-view-actions.c:688
 msgid "_Assign Task"
 msgstr "Aufgabe _zuweisen"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
-#: ../modules/calendar/e-task-shell-view-actions.c:764
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:334
+#: ../modules/calendar/e-task-shell-view-actions.c:765
 msgid "_Mark as Complete"
 msgstr "Als abgeschlossen _markieren"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:332
-#: ../modules/calendar/e-task-shell-view-actions.c:766
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:336
+#: ../modules/calendar/e-task-shell-view-actions.c:767
 msgid "Mark selected tasks as complete"
 msgstr "Die gewÃhlten Aufgaben als abgeschlossen markieren"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:341
 msgid "_Mark as Incomplete"
 msgstr "Als _offen markieren"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:339
-#: ../modules/calendar/e-task-shell-view-actions.c:773
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:343
+#: ../modules/calendar/e-task-shell-view-actions.c:774
 msgid "Mark selected tasks as incomplete"
 msgstr "Die gewÃhlten Aufgaben als unvollstÃndig markieren"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
-#: ../modules/calendar/e-task-shell-view-actions.c:778
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:348
+#: ../modules/calendar/e-task-shell-view-actions.c:779
 msgid "New _Task"
 msgstr "_Neue Aufgabe"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
-#: ../modules/calendar/e-task-shell-backend.c:282
-#: ../modules/calendar/e-task-shell-view-actions.c:780
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:350
+#: ../modules/calendar/e-task-shell-backend.c:286
+#: ../modules/calendar/e-task-shell-view-actions.c:781
 msgid "Create a new task"
 msgstr "Eine neue Aufgabe anlegen"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:355
+#: ../modules/calendar/e-task-shell-view-actions.c:786
 msgid "_Open Task"
 msgstr "Aufgabe Ã_ffnen"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:353
-#: ../modules/calendar/e-task-shell-view-actions.c:787
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:357
+#: ../modules/calendar/e-task-shell-view-actions.c:788
 msgid "View the selected task"
 msgstr "Die gewÃhlte Aufgabe anzeigen"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:365
-#: ../modules/calendar/e-memo-shell-view-actions.c:829
-#: ../modules/calendar/e-task-shell-view-actions.c:1028
-msgid "_Save as iCalendar..."
-msgstr "Als i_Calendar speichern â"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:377
-#: ../modules/calendar/e-task-shell-view-actions.c:1013
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:374
+#: ../modules/calendar/e-task-shell-view-actions.c:1014
 msgid "Print the selected task"
 msgstr "Die gewÃhlte Aufgabe drucken"
 
-#: ../modules/calendar/e-calendar-preferences.c:437
-msgid "Selected Calendars for Alarms"
-msgstr "AusgewÃhlte Kalender fÃr die Alarme"
-
-#: ../modules/calendar/e-calendar-preferences.c:836
-msgid "Ti_me and date:"
-msgstr "_Zeit und Datum:"
-
-#: ../modules/calendar/e-calendar-preferences.c:837
-msgid "_Date only:"
-msgstr "Nur das _Datum:"
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:382
+#: ../modules/calendar/e-memo-shell-view-actions.c:830
+#: ../modules/calendar/e-task-shell-view-actions.c:1029
+msgid "_Save as iCalendar..."
+msgstr "Als i_Calendar speichern â"
 
-#: ../modules/calendar/e-memo-shell-backend.c:281
+#: ../modules/calendar/e-memo-shell-backend.c:285
 msgctxt "New"
 msgid "Mem_o"
 msgstr "_Notiz"
 
-#: ../modules/calendar/e-memo-shell-backend.c:288
+#: ../modules/calendar/e-memo-shell-backend.c:292
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "Ge_meinsame Notiz"
 
-#: ../modules/calendar/e-memo-shell-backend.c:290
+#: ../modules/calendar/e-memo-shell-backend.c:294
 msgid "Create a new shared memo"
 msgstr "Eine neue gemeinsame Notiz anlegen"
 
-#: ../modules/calendar/e-memo-shell-backend.c:298
+#: ../modules/calendar/e-memo-shell-backend.c:302
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Notizli_ste"
 
-#: ../modules/calendar/e-memo-shell-backend.c:300
-#: ../modules/calendar/e-memo-shell-view-actions.c:607
+#: ../modules/calendar/e-memo-shell-backend.c:304
+#: ../modules/calendar/e-memo-shell-view-actions.c:608
 msgid "Create a new memo list"
 msgstr "Eine neue Notizliste anlegen"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:216
+#: ../modules/calendar/e-memo-shell-sidebar.c:175
 msgid "Loading memos"
 msgstr "Notizen werden geladen"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:578
+#: ../modules/calendar/e-memo-shell-sidebar.c:662
 msgid "Memo List Selector"
 msgstr "Notizquellenauswahl"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:885
+#: ../modules/calendar/e-memo-shell-sidebar.c:973
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Notizen unter %s werden geÃffnet"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:218
-#: ../modules/calendar/e-memo-shell-view-actions.c:233
+#: ../modules/calendar/e-memo-shell-view-actions.c:222
+#: ../modules/calendar/e-memo-shell-view-actions.c:237
 msgid "Print Memos"
 msgstr "Notizen drucken"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:570
+#: ../modules/calendar/e-memo-shell-view-actions.c:571
 msgid "_Delete Memo"
 msgstr "Notiz _lÃschen"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:577
+#: ../modules/calendar/e-memo-shell-view-actions.c:578
 msgid "_Find in Memo..."
 msgstr "In Notiz _suchen â"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:579
+#: ../modules/calendar/e-memo-shell-view-actions.c:580
 msgid "Search for text in the displayed memo"
 msgstr "In der angezeigten Notiz einen Text suchen"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:598
+#: ../modules/calendar/e-memo-shell-view-actions.c:599
 msgid "D_elete Memo List"
 msgstr "Notizlist_e lÃschen "
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:600
+#: ../modules/calendar/e-memo-shell-view-actions.c:601
 msgid "Delete the selected memo list"
 msgstr "Die gewÃhlte Notizliste lÃschen"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:605
+#: ../modules/calendar/e-memo-shell-view-actions.c:606
 msgid "_New Memo List"
 msgstr "_Neue Notizliste"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:621
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
 msgid "Refresh the selected memo list"
 msgstr "Die ausgewÃhlte Notizliste aktualisieren"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:628
+#: ../modules/calendar/e-memo-shell-view-actions.c:629
 msgid "Rename the selected memo list"
 msgstr "Die ausgewÃhlte Notizliste umbenennen"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:633
+#: ../modules/calendar/e-memo-shell-view-actions.c:634
 msgid "Show _Only This Memo List"
 msgstr "Nur diese N_otizliste anzeigen"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:712
+#: ../modules/calendar/e-memo-shell-view-actions.c:713
 msgid "Memo _Preview"
 msgstr "Notiz_vorschau"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:714
+#: ../modules/calendar/e-memo-shell-view-actions.c:715
 msgid "Show memo preview pane"
 msgstr "Vorschaufeld fÃr Notizen anzeigen"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:735
+#: ../modules/calendar/e-memo-shell-view-actions.c:736
 msgid "Show memo preview below the memo list"
 msgstr "Notizvorschau unter der Notizliste anzeigen"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:742
+#: ../modules/calendar/e-memo-shell-view-actions.c:743
 msgid "Show memo preview alongside the memo list"
 msgstr "Notizvorschau neben der Notizliste anzeigen"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:800
+#: ../modules/calendar/e-memo-shell-view-actions.c:801
 msgid "Print the list of memos"
 msgstr "Die Liste von Notizen drucken"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:807
+#: ../modules/calendar/e-memo-shell-view-actions.c:808
 msgid "Preview the list of memos to be printed"
 msgstr "Vorschau auf die zu druckende Liste von Notizen anzeigen"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:420
+#: ../modules/calendar/e-memo-shell-view.c:227
+msgid "Delete Memos"
+msgstr "Notizen lÃschen"
+
+#: ../modules/calendar/e-memo-shell-view.c:229
+msgid "Delete Memo"
+msgstr "Notiz lÃschen"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:424
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d Notiz"
 msgstr[1] "%d Notizen"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:424
-#: ../modules/calendar/e-task-shell-view-private.c:575
+#: ../modules/calendar/e-memo-shell-view-private.c:428
+#: ../modules/calendar/e-task-shell-view-private.c:573
 #, c-format
 msgid "%d selected"
 msgstr "%d gewÃhlt"
 
-#: ../modules/calendar/e-memo-shell-view.c:223
-msgid "Delete Memos"
-msgstr "Notizen lÃschen"
-
-#: ../modules/calendar/e-memo-shell-view.c:225
-msgid "Delete Memo"
-msgstr "Notiz lÃschen"
-
-#: ../modules/calendar/e-task-shell-backend.c:280
+#: ../modules/calendar/e-task-shell-backend.c:284
 msgctxt "New"
 msgid "_Task"
 msgstr "_Aufgabe"
 
-#: ../modules/calendar/e-task-shell-backend.c:287
+#: ../modules/calendar/e-task-shell-backend.c:291
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Zuge_wiesene Aufgabe"
 
-#: ../modules/calendar/e-task-shell-backend.c:289
+#: ../modules/calendar/e-task-shell-backend.c:293
 msgid "Create a new assigned task"
 msgstr "Eine neue zugewiesene Aufgabe anlegen"
 
-#: ../modules/calendar/e-task-shell-backend.c:297
+#: ../modules/calendar/e-task-shell-backend.c:301
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "_Aufgabenliste"
 
-#: ../modules/calendar/e-task-shell-backend.c:299
-#: ../modules/calendar/e-task-shell-view-actions.c:731
+#: ../modules/calendar/e-task-shell-backend.c:303
+#: ../modules/calendar/e-task-shell-view-actions.c:732
 msgid "Create a new task list"
 msgstr "Eine neue Aufgabenliste anlegen"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:216
+#: ../modules/calendar/e-task-shell-sidebar.c:175
 msgid "Loading tasks"
 msgstr "Aufgaben werden geladen"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:578
+#: ../modules/calendar/e-task-shell-sidebar.c:662
 msgid "Task List Selector"
 msgstr "Aufgabenlistenauswahl"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:885
+#: ../modules/calendar/e-task-shell-sidebar.c:973
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Aufgaben unter %s werden geÃffnet"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:241
-#: ../modules/calendar/e-task-shell-view-actions.c:256
+#: ../modules/calendar/e-task-shell-view-actions.c:245
+#: ../modules/calendar/e-task-shell-view-actions.c:260
 msgid "Print Tasks"
 msgstr "Aufgaben drucken"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:569
+#: ../modules/calendar/e-task-shell-view-actions.c:570
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15529,622 +15574,587 @@ msgstr ""
 "\n"
 "Sollen die Aufgaben wirklich entfernt werden?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:694
+#: ../modules/calendar/e-task-shell-view-actions.c:577
+msgid "Do not ask me again"
+msgstr "Nicht mehr nachfragen."
+
+#: ../modules/calendar/e-task-shell-view-actions.c:695
 msgid "_Delete Task"
 msgstr "Aufgabe _lÃschen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:701
+#: ../modules/calendar/e-task-shell-view-actions.c:702
 msgid "_Find in Task..."
 msgstr "In Aufgabe _suchen â"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:703
+#: ../modules/calendar/e-task-shell-view-actions.c:704
 msgid "Search for text in the displayed task"
 msgstr "In der angezeigten Aufgabe nach Text suchen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:715
+#: ../modules/calendar/e-task-shell-view-actions.c:716
 msgid "Copy..."
 msgstr "Kopieren â"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:722
+#: ../modules/calendar/e-task-shell-view-actions.c:723
 msgid "D_elete Task List"
 msgstr "Aufgabenlist_e lÃschen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:724
+#: ../modules/calendar/e-task-shell-view-actions.c:725
 msgid "Delete the selected task list"
 msgstr "Die gewÃhlte Aufgabenliste lÃschen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:729
+#: ../modules/calendar/e-task-shell-view-actions.c:730
 msgid "_New Task List"
 msgstr "_Neue Aufgabenliste"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:745
+#: ../modules/calendar/e-task-shell-view-actions.c:746
 msgid "Refresh the selected task list"
 msgstr "Die gewÃhlte Aufgabenliste aktualisieren"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:752
+#: ../modules/calendar/e-task-shell-view-actions.c:753
 msgid "Rename the selected task list"
 msgstr "Die gewÃhlte Aufgabenliste umbenennen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:758
 msgid "Show _Only This Task List"
 msgstr "Nur diese Auf_gabenliste anzeigen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:772
 msgid "Mar_k as Incomplete"
 msgstr "Als unvollstÃndig mar_kieren"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:801
+#: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "Delete completed tasks"
 msgstr "Die abgeschlossenen Aufgaben lÃschen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:876
+#: ../modules/calendar/e-task-shell-view-actions.c:877
 msgid "Task _Preview"
 msgstr "Aufgaben_vorschau"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:878
+#: ../modules/calendar/e-task-shell-view-actions.c:879
 msgid "Show task preview pane"
 msgstr "Aufgabenvorschaufeld anzeigen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:899
+#: ../modules/calendar/e-task-shell-view-actions.c:900
 msgid "Show task preview below the task list"
 msgstr "Aufgabenvorschau unter der Aufgabenliste anzeigen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:906
+#: ../modules/calendar/e-task-shell-view-actions.c:907
 msgid "Show task preview alongside the task list"
 msgstr "Aufgabenvorschau neben der Aufgabenliste anzeigen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:914
+#: ../modules/calendar/e-task-shell-view-actions.c:915
 msgid "Active Tasks"
 msgstr "Aktuelle Aufgaben"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:928
+#: ../modules/calendar/e-task-shell-view-actions.c:929
 msgid "Completed Tasks"
 msgstr "Abgeschlossene Aufgaben"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:935
+#: ../modules/calendar/e-task-shell-view-actions.c:936
 msgid "Next 7 Days' Tasks"
 msgstr "Aufgaben der nÃchsten 7 Tage"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:942
+#: ../modules/calendar/e-task-shell-view-actions.c:943
 msgid "Overdue Tasks"
 msgstr "ÃberfÃllige Aufgaben"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:949
+#: ../modules/calendar/e-task-shell-view-actions.c:950
 msgid "Tasks with Attachments"
 msgstr "Aufgaben mit Anlagen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:999
+#: ../modules/calendar/e-task-shell-view-actions.c:1000
 msgid "Print the list of tasks"
 msgstr "Die Aufgabenliste drucken"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1006
+#: ../modules/calendar/e-task-shell-view-actions.c:1007
 msgid "Preview the list of tasks to be printed"
 msgstr "Vorschau auf die zu druckende Aufgabenliste"
 
-#: ../modules/calendar/e-task-shell-view-private.c:468
+#: ../modules/calendar/e-task-shell-view.c:362
+msgid "Delete Tasks"
+msgstr "Aufgaben lÃschen"
+
+#: ../modules/calendar/e-task-shell-view.c:364
+msgid "Delete Task"
+msgstr "Aufgabe lÃschen"
+
+#: ../modules/calendar/e-task-shell-view-private.c:472
 msgid "Expunging"
 msgstr "Wird gesÃubert"
 
-#: ../modules/calendar/e-task-shell-view-private.c:571
+#: ../modules/calendar/e-task-shell-view-private.c:569
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d Aufgabe"
 msgstr[1] "%d Aufgaben"
 
-#: ../modules/calendar/e-task-shell-view.c:358
-msgid "Delete Tasks"
-msgstr "Aufgaben lÃschen"
+#: ../modules/mail/em-account-prefs.c:218
+msgid "Evolution Account Assistant"
+msgstr "Evolution-Kontoassistent"
 
-#: ../modules/calendar/e-task-shell-view.c:360
-msgid "Delete Task"
-msgstr "Aufgabe lÃschen"
+#: ../modules/mail/em-account-prefs.c:267
+msgid "Account Editor"
+msgstr "Konteneditor"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:382
+#: ../modules/mail/e-mail-attachment-handler.c:384
 #, c-format
 msgid "%d attached messages"
 msgstr "%d beigelegte Nachrichten"
 
-#. Translators: "None" for a junk hook name,
-#. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:90
-msgctxt "mail-junk-hook"
-msgid "None"
-msgstr "Kein"
-
-#: ../modules/mail/e-mail-shell-backend.c:183
+#: ../modules/mail/e-mail-shell-backend.c:195
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_E-Mail-Nachricht"
 
-#: ../modules/mail/e-mail-shell-backend.c:185
+#: ../modules/mail/e-mail-shell-backend.c:197
 msgid "Compose a new mail message"
 msgstr "Eine neue E-Mail-Nachricht verfassen"
 
-#: ../modules/mail/e-mail-shell-backend.c:193
+#: ../modules/mail/e-mail-shell-backend.c:205
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "E-Mail-_Ordner"
 
-#: ../modules/mail/e-mail-shell-backend.c:195
+#: ../modules/mail/e-mail-shell-backend.c:207
 msgid "Create a new mail folder"
 msgstr "Einen neuen E-Mail-Ordner anlegen"
 
-#: ../modules/mail/e-mail-shell-backend.c:499
+#: ../modules/mail/e-mail-shell-backend.c:408
 msgid "Mail Accounts"
 msgstr "E-Mail-Konten"
 
-#: ../modules/mail/e-mail-shell-backend.c:507
+#: ../modules/mail/e-mail-shell-backend.c:416
 msgid "Mail Preferences"
 msgstr "E-Mail-Einstellungen"
 
-#: ../modules/mail/e-mail-shell-backend.c:515
+#: ../modules/mail/e-mail-shell-backend.c:424
 msgid "Composer Preferences"
 msgstr "Editoreinstellungen"
 
-#: ../modules/mail/e-mail-shell-backend.c:523
+#: ../modules/mail/e-mail-shell-backend.c:432
 msgid "Network Preferences"
 msgstr "Netzwerkeinstellungen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1064
-#: ../modules/mail/e-mail-shell-view.c:953
+#: ../modules/mail/e-mail-shell-view-actions.c:1117
+#: ../modules/mail/e-mail-shell-view.c:945
 msgid "_Disable Account"
 msgstr "Konto _deaktivieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1066
+#: ../modules/mail/e-mail-shell-view-actions.c:1119
 msgid "Disable this account"
 msgstr "Dieses Konto deaktivieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1073
+#: ../modules/mail/e-mail-shell-view-actions.c:1126
 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:1078
-msgid "C_reate Search Folder From Search..."
-msgstr "Sucho_rdner aus Suche anlegen â"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1085
+#: ../modules/mail/e-mail-shell-view-actions.c:1131
 msgid "_Download Messages for Offline Usage"
 msgstr "_Nachrichten fÃr Offline-Benutzung herunterladen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1087
+#: ../modules/mail/e-mail-shell-view-actions.c:1133
 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:1092
+#: ../modules/mail/e-mail-shell-view-actions.c:1138
 msgid "Fl_ush Outbox"
 msgstr "E-Mails aus A_usgang verschicken"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1099
+#: ../modules/mail/e-mail-shell-view-actions.c:1145
 msgid "_Copy Folder To..."
 msgstr "Ordner _kopieren nach â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1101
+#: ../modules/mail/e-mail-shell-view-actions.c:1147
 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:1108
+#: ../modules/mail/e-mail-shell-view-actions.c:1154
 msgid "Permanently remove this folder"
 msgstr "Diesen Ordner dauerhaft entfernen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1113
+#: ../modules/mail/e-mail-shell-view-actions.c:1159
 msgid "E_xpunge"
 msgstr "_SÃubern"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1115
+#: ../modules/mail/e-mail-shell-view-actions.c:1161
 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:1120
+#: ../modules/mail/e-mail-shell-view-actions.c:1166
 msgid "Mar_k All Messages as Read"
 msgstr "Alle Nachrichten als gelesen _markieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1122
+#: ../modules/mail/e-mail-shell-view-actions.c:1168
 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:1127
+#: ../modules/mail/e-mail-shell-view-actions.c:1173
 msgid "_Move Folder To..."
 msgstr "Ordner verschie_ben nach â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1129
+#: ../modules/mail/e-mail-shell-view-actions.c:1175
 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:1134
+#: ../modules/mail/e-mail-shell-view-actions.c:1180
 msgid "_New..."
 msgstr "_Neu â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1136
+#: ../modules/mail/e-mail-shell-view-actions.c:1182
 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:1143
+#: ../modules/mail/e-mail-shell-view-actions.c:1189
 msgid "Change the properties of this folder"
 msgstr "Die Eigenschaften dieses Ordners Ãndern"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1150
+#: ../modules/mail/e-mail-shell-view-actions.c:1196
 msgid "Refresh the folder"
 msgstr "Den Ordner auffrischen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1157
+#: ../modules/mail/e-mail-shell-view-actions.c:1203
 msgid "Change the name of this folder"
 msgstr "Den Namen dieses Ordners Ãndern"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1162
+#: ../modules/mail/e-mail-shell-view-actions.c:1208
 msgid "Select Message _Thread"
 msgstr "Nachrichten-_Thread auswÃhlen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1164
+#: ../modules/mail/e-mail-shell-view-actions.c:1210
 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:1169
+#: ../modules/mail/e-mail-shell-view-actions.c:1215
 msgid "Select Message S_ubthread"
 msgstr "Nachrichten-_Subthread auswÃhlen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1171
+#: ../modules/mail/e-mail-shell-view-actions.c:1217
 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:1183
+#: ../modules/mail/e-mail-shell-view-actions.c:1229
 msgid "Empty _Trash"
 msgstr "_MÃll leeren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1185
+#: ../modules/mail/e-mail-shell-view-actions.c:1231
 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:1190
+#: ../modules/mail/e-mail-shell-view-actions.c:1236
 msgid "_New Label"
 msgstr "_Neue Beschriftung"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1199
+#: ../modules/mail/e-mail-shell-view-actions.c:1245
 msgid "N_one"
 msgstr "_Keine"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1213
+#: ../modules/mail/e-mail-shell-view-actions.c:1259
 msgid "_Manage Subscriptions"
 msgstr "Abonnements _verwalten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1215
-#: ../modules/mail/e-mail-shell-view-actions.c:1299
+#: ../modules/mail/e-mail-shell-view-actions.c:1261
+#: ../modules/mail/e-mail-shell-view-actions.c:1338
 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:1220
-#: ../modules/mail/e-mail-shell-view-actions.c:1241
+#: ../modules/mail/e-mail-shell-view-actions.c:1266
+#: ../modules/mail/e-mail-shell-view-actions.c:1287
 msgid "Send / _Receive"
 msgstr "Verschicken/Ab_rufen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1222
+#: ../modules/mail/e-mail-shell-view-actions.c:1268
 msgid "Send queued items and retrieve new items"
 msgstr "Objekte in der Warteschlange verschicken und neue Objekte abrufen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1227
+#: ../modules/mail/e-mail-shell-view-actions.c:1273
 msgid "R_eceive All"
 msgstr "Alle _empfangen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1229
+#: ../modules/mail/e-mail-shell-view-actions.c:1275
 msgid "Receive new items from all accounts"
 msgstr "Neue Objekte in von allen Konten empfangen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1234
+#: ../modules/mail/e-mail-shell-view-actions.c:1280
 msgid "_Send All"
 msgstr "Alle _verschicken"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1236
+#: ../modules/mail/e-mail-shell-view-actions.c:1282
 msgid "Send queued items in all accounts"
 msgstr "Objekte in den Warteschlangen aller Konten verschicken"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1262
-#: ../widgets/misc/e-activity-proxy.c:306
+#: ../modules/mail/e-mail-shell-view-actions.c:1308
+#: ../widgets/misc/e-activity-proxy.c:310
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1264
+#: ../modules/mail/e-mail-shell-view-actions.c:1310
 msgid "Cancel the current mail operation"
 msgstr "Den momentan ausgefÃhrten E-Mail-Vorgang abbrechen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1269
+#: ../modules/mail/e-mail-shell-view-actions.c:1315
 msgid "Collapse All _Threads"
 msgstr "Alle _Threads einklappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1271
+#: ../modules/mail/e-mail-shell-view-actions.c:1317
 msgid "Collapse all message threads"
 msgstr "Alle Nachrichten-Threads einklappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1276
+#: ../modules/mail/e-mail-shell-view-actions.c:1322
 msgid "E_xpand All Threads"
 msgstr "Alle Threads a_usklappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1278
+#: ../modules/mail/e-mail-shell-view-actions.c:1324
 msgid "Expand all message threads"
 msgstr "Alle Nachrichten-Threads ausklappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1283
+#: ../modules/mail/e-mail-shell-view-actions.c:1329
 msgid "_Message Filters"
 msgstr "Nachrichtenf_ilter"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1285
+#: ../modules/mail/e-mail-shell-view-actions.c:1331
 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:1290
-msgid "Search F_olders"
-msgstr "S_uchordner"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1292
-msgid "Create or edit search folder definitions"
-msgstr "Suchordner-Definitionen anlegen oder bearbeiten"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1297
+#: ../modules/mail/e-mail-shell-view-actions.c:1336
 msgid "_Subscriptions..."
 msgstr "A_bonnements â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1306
+#: ../modules/mail/e-mail-shell-view-actions.c:1345
 msgid "F_older"
 msgstr "_Ordner"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1313
+#: ../modules/mail/e-mail-shell-view-actions.c:1352
 msgid "_Label"
 msgstr "Bes_chriftung"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1353
+#: ../modules/mail/e-mail-shell-view-actions.c:1369
+msgid "C_reate Search Folder From Search..."
+msgstr "Sucho_rdner aus Suche anlegen â"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1376
+msgid "Search F_olders"
+msgstr "S_uchordner"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1378
+msgid "Create or edit search folder definitions"
+msgstr "Suchordner-Definitionen anlegen oder bearbeiten"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1409
 msgid "_New Folder..."
 msgstr "Ordner a_nlegen â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1381
+#: ../modules/mail/e-mail-shell-view-actions.c:1437
 msgid "Show Message _Preview"
 msgstr "Nachrichten_vorschau anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1383
+#: ../modules/mail/e-mail-shell-view-actions.c:1439
 msgid "Show message preview pane"
 msgstr "Nachrichten-Vorschaufenster anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1389
+#: ../modules/mail/e-mail-shell-view-actions.c:1445
 msgid "Show _Deleted Messages"
 msgstr "Gel_Ãschte Nachrichten anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1391
+#: ../modules/mail/e-mail-shell-view-actions.c:1447
 msgid "Show deleted messages with a line through them"
 msgstr "GelÃschte Nachrichten (durchgestrichen) anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1397
+#: ../modules/mail/e-mail-shell-view-actions.c:1453
 msgid "_Group By Threads"
 msgstr "Nach Threads _gruppieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1399
+#: ../modules/mail/e-mail-shell-view-actions.c:1455
 msgid "Threaded message list"
 msgstr "Nachrichtenliste nach Threads sortieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1420
+#: ../modules/mail/e-mail-shell-view-actions.c:1476
 msgid "Show message preview below the message list"
 msgstr "Nachrichtenvorschau unter der Nachrichtenliste anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1427
+#: ../modules/mail/e-mail-shell-view-actions.c:1483
 msgid "Show message preview alongside the message list"
 msgstr "Nachrichtenvorschau neben der Nachrichtenliste anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1435
+#: ../modules/mail/e-mail-shell-view-actions.c:1491
 msgid "All Messages"
 msgstr "Alle Nachrichten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1442
+#: ../modules/mail/e-mail-shell-view-actions.c:1498
 msgid "Important Messages"
 msgstr "Wichtige Nachrichten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1449
+#: ../modules/mail/e-mail-shell-view-actions.c:1505
 msgid "Last 5 Days' Messages"
 msgstr "Nachrichten der letzten fÃnf Tage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1456
+#: ../modules/mail/e-mail-shell-view-actions.c:1512
 msgid "Messages Not Junk"
 msgstr "Nachrichten sind nicht unerwÃnscht"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1463
+#: ../modules/mail/e-mail-shell-view-actions.c:1519
 msgid "Messages with Attachments"
 msgstr "Nachrichten mit Anlagen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1470
+#: ../modules/mail/e-mail-shell-view-actions.c:1526
 msgid "No Label"
 msgstr "Keine Beschriftung"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1477
+#: ../modules/mail/e-mail-shell-view-actions.c:1533
 msgid "Read Messages"
 msgstr "Gelesene Nachrichten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1484
+#: ../modules/mail/e-mail-shell-view-actions.c:1540
 msgid "Recent Messages"
 msgstr "Letzte Nachrichten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1491
+#: ../modules/mail/e-mail-shell-view-actions.c:1547
 msgid "Unread Messages"
 msgstr "Ungelesene Nachrichten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1543
+#: ../modules/mail/e-mail-shell-view-actions.c:1599
 msgid "Subject or Addresses contain"
 msgstr "Betreff oder Adresse enthÃlt"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1553
+#: ../modules/mail/e-mail-shell-view-actions.c:1609
 msgid "All Accounts"
 msgstr "Alle Konten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1560
+#: ../modules/mail/e-mail-shell-view-actions.c:1616
 msgid "Current Account"
 msgstr "Derzeitiges Konto"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1567
+#: ../modules/mail/e-mail-shell-view-actions.c:1623
 msgid "Current Folder"
 msgstr "Derzeitiger Ordner"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1049
+#: ../modules/mail/e-mail-shell-view.c:559
+msgid "All Account Search"
+msgstr "Alle Konten durchsuchen"
+
+#: ../modules/mail/e-mail-shell-view.c:732
+msgid "Account Search"
+msgstr "Konto durchsuchen"
+
+#: ../modules/mail/e-mail-shell-view.c:943
+msgid "Proxy _Logout"
+msgstr "Vertretungsa_bmeldung"
+
+#: ../modules/mail/e-mail-shell-view-private.c:997
 #, 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:1060
+#: ../modules/mail/e-mail-shell-view-private.c:1008
 #, 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:1066
-#: ../modules/mail/e-mail-shell-view-private.c:1073
+#: ../modules/mail/e-mail-shell-view-private.c:1014
+#: ../modules/mail/e-mail-shell-view-private.c:1021
 #, 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:1079
+#: ../modules/mail/e-mail-shell-view-private.c:1027
 #, 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:1085
+#: ../modules/mail/e-mail-shell-view-private.c:1033
 #, 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:1091
+#: ../modules/mail/e-mail-shell-view-private.c:1039
 #, 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:1103
+#: ../modules/mail/e-mail-shell-view-private.c:1051
 #, 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:1106
+#: ../modules/mail/e-mail-shell-view-private.c:1054
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d insgesamt"
 msgstr[1] "%d insgesamt"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1126
+#: ../modules/mail/e-mail-shell-view-private.c:1074
 msgid "Trash"
 msgstr "MÃll"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1600
+#: ../modules/mail/e-mail-shell-view-private.c:1542
 msgid "Send / Receive"
 msgstr "Verschicken/Abrufen"
 
-#: ../modules/mail/e-mail-shell-view.c:563
-msgid "All Account Search"
-msgstr "Alle Konten durchsuchen"
-
-#: ../modules/mail/e-mail-shell-view.c:746
-msgid "Account Search"
-msgstr "Konto durchsuchen"
-
-#: ../modules/mail/e-mail-shell-view.c:951
-msgid "Proxy _Logout"
-msgstr "Vertretungsa_bmeldung"
-
-#: ../modules/mail/em-account-prefs.c:215
-msgid "Evolution Account Assistant"
-msgstr "Evolution-Kontoassistent"
-
-#: ../modules/mail/em-account-prefs.c:264
-msgid "Account Editor"
-msgstr "Konteneditor"
-
-#: ../modules/mail/em-composer-prefs.c:502
-#: ../modules/plugin-manager/evolution-plugin-manager.c:356
+#: ../modules/mail/em-composer-prefs.c:493
+#: ../modules/plugin-manager/evolution-plugin-manager.c:359
 #: ../plugins/publish-calendar/publish-calendar.c:831
-#: ../widgets/misc/e-account-tree-view.c:220
+#: ../widgets/misc/e-account-tree-view.c:224
 msgid "Enabled"
 msgstr "Aktiv"
 
-#: ../modules/mail/em-composer-prefs.c:506
+#: ../modules/mail/em-composer-prefs.c:497
 msgid "Language(s)"
 msgstr "Sprache(n)"
 
-#: ../modules/mail/em-mailer-prefs.c:89
+#: ../modules/mail/em-mailer-prefs.c:91
 msgid "Every time"
 msgstr "Jedes Mal"
 
-#: ../modules/mail/em-mailer-prefs.c:90
+#: ../modules/mail/em-mailer-prefs.c:92
 msgid "Once per day"
 msgstr "Einmal pro Tag"
 
-#: ../modules/mail/em-mailer-prefs.c:91
+#: ../modules/mail/em-mailer-prefs.c:93
 msgid "Once per week"
 msgstr "Einmal pro Woche"
 
-#: ../modules/mail/em-mailer-prefs.c:92
+#: ../modules/mail/em-mailer-prefs.c:94
 msgid "Once per month"
 msgstr "Einmal pro Monat"
 
-#: ../modules/mail/em-mailer-prefs.c:174
-msgid "Add Custom Junk Header"
-msgstr "Benutzerdefinierte UnerwÃnscht-Kopfzeile hinzufÃgen"
-
-#: ../modules/mail/em-mailer-prefs.c:182
-msgid "Header Name:"
-msgstr "Name der Kopfzeile:"
-
-#: ../modules/mail/em-mailer-prefs.c:183
-msgid "Header Value Contains:"
-msgstr "Wert der Kopfzeile enthÃlt:"
-
-#: ../modules/mail/em-mailer-prefs.c:283
+#: ../modules/mail/em-mailer-prefs.c:289
 msgid "Header"
 msgstr "Kopfzeile"
 
-#: ../modules/mail/em-mailer-prefs.c:287
+#: ../modules/mail/em-mailer-prefs.c:293
 msgid "Contains Value"
 msgstr "EnthÃlt Wert"
 
-#. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:693 ../modules/mail/em-mailer-prefs.c:766
-#, 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:701 ../modules/mail/em-mailer-prefs.c:775
-#, c-format
-msgid ""
-"%s plugin is not available. Please check whether the package is installed."
-msgstr ""
-"%s-Plugin ist nicht verfÃgbar. Bitte prÃfen Sie, ob das zugehÃrige "
-"Programmpaket installiert ist."
-
-#: ../modules/mail/em-mailer-prefs.c:739
-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:1142
+#: ../modules/mail/em-mailer-prefs.c:1031
 msgid "_Date header:"
 msgstr "_Datum in der Kopfzeile:"
 
-#: ../modules/mail/em-mailer-prefs.c:1143
+#: ../modules/mail/em-mailer-prefs.c:1032
 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"
+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 ""
@@ -16153,7 +16163,7 @@ msgstr ""
 "Bei jedem Start ÃberprÃfen, ob Evolution die Vorgabeanwendung zur E-Mail-"
 "Verwaltung ist."
 
-#: ../modules/mailto-handler/evolution-mailto-handler.c:143
+#: ../modules/mailto-handler/evolution-mailto-handler.c:146
 msgid "Do you want to make Evolution your default email client?"
 msgstr "MÃchten Sie Evolution zu Ihrer bevorzugten E-Mail-Anwendung machen?"
 
@@ -16174,41 +16184,64 @@ msgstr "Evolution ist im Offline-Modus"
 
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:4
 msgid ""
-"Evolution will return to online mode once a network connection is "
-"established."
+"Evolution will return to online mode once a network connection is established."
 msgstr ""
 "Evolution wird in den Online-Modus zurÃckkehren, sobald eine "
 "Netzwerkverbindung hergestellt ist."
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:67
+#: ../modules/online-accounts/camel-sasl-xoauth.c:374
+msgid ""
+"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
+"from which to obtain an authentication token."
+msgstr ""
+
+#: ../modules/online-accounts/camel-sasl-xoauth.c:461
+msgid "OAuth"
+msgstr "OAuth"
+
+#: ../modules/online-accounts/camel-sasl-xoauth.c:463
+msgid ""
+"This option will connect to the server by way of the GNOME Online Accounts "
+"service"
+msgstr ""
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:70
 msgid "Author(s)"
 msgstr "Autor(en)"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:251
+#: ../modules/plugin-manager/evolution-plugin-manager.c:254
 msgid "Plugin Manager"
 msgstr "Plugin-Verwaltung"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:266
+#: ../modules/plugin-manager/evolution-plugin-manager.c:269
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Hinweis: Einige Ãnderungen werden erst nach einem Neustart wirksam."
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:295
+#: ../modules/plugin-manager/evolution-plugin-manager.c:298
 msgid "Overview"
 msgstr "Ãberblick"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:364
-#: ../modules/plugin-manager/evolution-plugin-manager.c:447
+#: ../modules/plugin-manager/evolution-plugin-manager.c:367
+#: ../modules/plugin-manager/evolution-plugin-manager.c:450
 msgid "Plugin"
 msgstr "Plugin"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:485
+#: ../modules/plugin-manager/evolution-plugin-manager.c:488
 msgid "_Plugins"
 msgstr "_Plugins"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:486
+#: ../modules/plugin-manager/evolution-plugin-manager.c:489
 msgid "Enable and disable plugins"
 msgstr "Plugins aktivieren und deaktivieren"
 
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "Python-Plugin"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "Python-Plugin-Loader."
+
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "Hello Python"
@@ -16217,59 +16250,111 @@ msgstr "Hello Python"
 msgid "Python Plugin Loader tests"
 msgstr "Python-Plugin-Loader-Tests"
 
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
-msgid "Python Test Plugin"
-msgstr "Python-Plugin"
+#: ../modules/spamassassin/evolution-spamassassin.c:191
+#, c-format
+msgid "Failed to spawn SpamAssassin (%s): "
+msgstr "Weiterleitung an SpamAssassin gescheitert (%s):"
 
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
-msgid "Test Plugin for Python EPlugin loader."
-msgstr "Python-Plugin-Loader."
+#: ../modules/spamassassin/evolution-spamassassin.c:214
+msgid "Failed to stream mail message content to SpamAssassin: "
+msgstr "Nachrichteninhalt konnte nicht an SpamAssassin weitergeleitet werden:"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:233
+#, c-format
+msgid "Failed to write '%s' to SpamAssassin: "
+msgstr "Weiterleitung von Â%s an SpamAssassin gescheitert:"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:261
+msgid "Failed to read output from SpamAssassin: "
+msgstr "Ausgabe von SpamAssassin konnte nicht gelesen werden:"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:316
+msgid "SpamAssassin either crashed or failed to process a mail message"
+msgstr ""
+"SpamAssassin ist entweder abgestÃrzt oder kann eine Nachricht nicht "
+"verarbeiten"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:835
+msgid "SpamAssassin Options"
+msgstr "SpamAssassin-Optionen"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:850
+msgid "I_nclude remote tests"
+msgstr "ZusÃtzliche _Ferntests durchfÃhren"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:864
+msgid "This will make SpamAssassin more reliable, but slower."
+msgstr ""
+"Dies erhÃht die ZuverlÃssigkeit von SpamAssassin, verlangsamt ihn jedoch."
+
+#: ../modules/spamassassin/evolution-spamassassin.c:1073
+msgid "SpamAssassin"
+msgstr "SpamAssassin"
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:1
+msgid "Use SpamAssassin daemon and client"
+msgstr "SpamAssassin-Daemon und -Client verwenden"
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:2
+msgid "Use SpamAssassin daemon and client (spamc/spamd)."
+msgstr "SpamAssassin-Daemon und -Client verwenden (spamc/spamd)."
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:3
+msgid "Use only local spam tests."
+msgstr "AusschlieÃlich lokale Spam-Tests verwenden."
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:4
+msgid "Use only the local spam tests (no DNS)."
+msgstr "AusschlieÃlich lokale Spam-Tests verwenden (kein DNS)."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:277
-#: ../widgets/misc/e-import-assistant.c:392
+#: ../modules/startup-wizard/evolution-startup-wizard.c:281
+#: ../widgets/misc/e-import-assistant.c:396
 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:309
-#: ../widgets/misc/e-import-assistant.c:548
+#: ../modules/startup-wizard/evolution-startup-wizard.c:313
+#: ../widgets/misc/e-import-assistant.c:552
 #, c-format
 msgid "From %s:"
 msgstr "Von %s:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:320
-#: ../modules/startup-wizard/evolution-startup-wizard.c:417
+#: ../modules/startup-wizard/evolution-startup-wizard.c:324
+#: ../modules/startup-wizard/evolution-startup-wizard.c:422
 msgid "Importing Files"
 msgstr "Dateien werden importiert"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:395
+#: ../modules/startup-wizard/evolution-startup-wizard.c:400
 msgid "Import cancelled. Click \"Forward\" to continue."
 msgstr "Import wurde abgebrochen. Klicken Sie auf ÂWeiterÂ, um fortzufahren."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:413
+#: ../modules/startup-wizard/evolution-startup-wizard.c:418
 msgid "Import complete. Click \"Forward\" to continue."
 msgstr "Import ist abgeschlossen. Klicken Sie auf ÂWeiterÂ, um fortzufahren."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:487
+#: ../modules/startup-wizard/evolution-startup-wizard.c:492
 msgid "Evolution Setup Assistant"
 msgstr "Evolution-Einrichtungsassistent"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:493
+#: ../modules/startup-wizard/evolution-startup-wizard.c:498
 msgid "Welcome"
 msgstr "Willkommen"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:498
+#: ../modules/startup-wizard/evolution-startup-wizard.c:503
 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"
+"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"
+"Mail-Konten einzurichten und Dateien aus anderen Anwendungen zu importieren.\n"
 "\n"
 "Klicken Sie auf ÂVorÂ, um fortzufahren. "
 
+#: ../modules/startup-wizard/evolution-startup-wizard.c:608
+msgid "Loading accounts..."
+msgstr "Konten werden geladen â"
+
 #: ../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."
@@ -16280,19 +16365,17 @@ msgstr "Lokale AdressbÃcher"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
 msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body"
+"List of clues for the attachment reminder plugin to look for in a message body"
 msgstr ""
 "Liste der Begriffe, nach denen die Anlagenerinnerung im Text der Nachricht "
 "sucht"
 
-#. Check buttons
-#: ../plugins/attachment-reminder/attachment-reminder.c:117
+#: ../plugins/attachment-reminder/attachment-reminder.c:125
 msgid "_Do not show this message again."
 msgstr "Diese _Meldung nicht mehr anzeigen."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:451
-#: ../plugins/templates/templates.c:411
+#: ../plugins/attachment-reminder/attachment-reminder.c:457
+#: ../plugins/templates/templates.c:450
 msgid "Keywords"
 msgstr "SchlÃsselwÃrter"
 
@@ -16310,7 +16393,7 @@ msgid "Message has no attachments"
 msgstr "Nachricht besitzt keine Anlagen"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
-msgid "_Add attachment..."
+msgid "_Add Attachment..."
 msgstr "Anlage _hinzufÃgen â"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
@@ -16333,23 +16416,23 @@ msgstr "Eingebettete KlÃnge"
 msgid "Play audio attachments directly in mail messages."
 msgstr "Audio-Anlagen direkt in Nachrichten wiedergeben."
 
-#: ../plugins/backup-restore/backup-restore.c:183
+#: ../plugins/backup-restore/backup-restore.c:186
 msgid "Select name of the Evolution backup file"
 msgstr "Name des Evolution-Sicherungsarchivs auswÃhlen"
 
-#: ../plugins/backup-restore/backup-restore.c:216
+#: ../plugins/backup-restore/backup-restore.c:219
 msgid "_Restart Evolution after backup"
 msgstr "Evolution nach Sicherung neu sta_rten"
 
-#: ../plugins/backup-restore/backup-restore.c:242
+#: ../plugins/backup-restore/backup-restore.c:245
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Name des Evolution-Sicherungsarchivs zur Wiederherstellung wÃhlen"
 
-#: ../plugins/backup-restore/backup-restore.c:255
+#: ../plugins/backup-restore/backup-restore.c:258
 msgid "_Restart Evolution after restore"
 msgstr "Evolution nach Wiederherstellung neu sta_rten"
 
-#: ../plugins/backup-restore/backup-restore.c:323
+#: ../plugins/backup-restore/backup-restore.c:326
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
@@ -16359,141 +16442,142 @@ msgstr ""
 "Mails, Kalender, Aufgaben, Notizen und AdressbÃcher sowie alle persÃnlichen "
 "Einstellungen, Filter etc. kÃnnen wiederhergestellt werden."
 
-#: ../plugins/backup-restore/backup-restore.c:330
+#: ../plugins/backup-restore/backup-restore.c:333
 msgid "_Restore Evolution from the backup file"
 msgstr "Evolution aus _Sicherungsdatei wiederherstellen"
 
-#: ../plugins/backup-restore/backup-restore.c:337
+#: ../plugins/backup-restore/backup-restore.c:340
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Evolution-Archiv zur Wiederherstellung wÃhlen:"
 
-#: ../plugins/backup-restore/backup-restore.c:340
+#: ../plugins/backup-restore/backup-restore.c:343
 msgid "Choose a file to restore"
 msgstr "Eine Datei zum Wiederherstellen wÃhlen"
 
-#: ../plugins/backup-restore/backup-restore.c:348
+#: ../plugins/backup-restore/backup-restore.c:351
 msgid "Restore from backup"
 msgstr "Aus Sicherungsdatei wiederherstellen"
 
-#: ../plugins/backup-restore/backup-restore.c:386
+#: ../plugins/backup-restore/backup-restore.c:389
 msgid "_Back up Evolution Data..."
 msgstr "Evolution-Daten _sichernâ"
 
-#: ../plugins/backup-restore/backup-restore.c:388
+#: ../plugins/backup-restore/backup-restore.c:391
 msgid "Back up Evolution data and settings to an archive file"
 msgstr ""
 "Sichern und Wiederherstellen von Evolution-Daten und Einstellungen in einer "
 "Archivdatei"
 
-#: ../plugins/backup-restore/backup-restore.c:393
+#: ../plugins/backup-restore/backup-restore.c:396
 msgid "R_estore Evolution Data..."
 msgstr "Evolution-Daten wi_ederherstellen â"
 
-#: ../plugins/backup-restore/backup-restore.c:395
+#: ../plugins/backup-restore/backup-restore.c:398
 msgid "Restore Evolution data and settings from an archive file"
 msgstr ""
 "Sichern und Wiederherstellen von Evolution-Daten und Einstellungen aus einer "
 "Archivdatei"
 
-#: ../plugins/backup-restore/backup.c:79
+#: ../plugins/backup-restore/backup.c:77
 msgid "Back up Evolution directory"
 msgstr "Evolution-Sicherungsordner"
 
-#: ../plugins/backup-restore/backup.c:81
+#: ../plugins/backup-restore/backup.c:79
 msgid "Restore Evolution directory"
 msgstr "Evolution-Wiederherstellungsordner"
 
-#: ../plugins/backup-restore/backup.c:83
+#: ../plugins/backup-restore/backup.c:81
 msgid "Check Evolution Back up"
 msgstr "Evolution-Datensicherung ÃberprÃfen"
 
-#: ../plugins/backup-restore/backup.c:85
+#: ../plugins/backup-restore/backup.c:83
 msgid "Restart Evolution"
 msgstr "Evolution neu starten"
 
-#: ../plugins/backup-restore/backup.c:87
+#: ../plugins/backup-restore/backup.c:85
 msgid "With Graphical User Interface"
 msgstr "Mit grafischer OberflÃche"
 
-#: ../plugins/backup-restore/backup.c:289
-#: ../plugins/backup-restore/backup.c:399
+#. FIXME Will the versioned setting always work?
+#: ../plugins/backup-restore/backup.c:295
+#: ../plugins/backup-restore/backup.c:412
 msgid "Shutting down Evolution"
 msgstr "Evolution wird heruntergefahren"
 
-#: ../plugins/backup-restore/backup.c:296
+#: ../plugins/backup-restore/backup.c:304
 msgid "Backing Evolution accounts and settings"
 msgstr "Sichern der Evolution-Konten und -Einstellungen"
 
-#: ../plugins/backup-restore/backup.c:304
+#: ../plugins/backup-restore/backup.c:314
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Sichern der Evolution-Daten (E-Mails, Kontakte, Kalender, Aufgaben, Notizen)"
 
-#: ../plugins/backup-restore/backup.c:317
+#: ../plugins/backup-restore/backup.c:327
 msgid "Back up complete"
 msgstr "Sicherung komplett"
 
-#: ../plugins/backup-restore/backup.c:322
-#: ../plugins/backup-restore/backup.c:496
+#: ../plugins/backup-restore/backup.c:334
+#: ../plugins/backup-restore/backup.c:521
 msgid "Restarting Evolution"
 msgstr "Evolution wird neugestartet"
 
-#: ../plugins/backup-restore/backup.c:403
+#: ../plugins/backup-restore/backup.c:418
 msgid "Back up current Evolution data"
 msgstr "Aktuelle Evolution-Daten sichern"
 
-#: ../plugins/backup-restore/backup.c:409
+#: ../plugins/backup-restore/backup.c:426
 msgid "Extracting files from back up"
 msgstr "Dateien werden aus dem Sicherungsarchiv entpackt"
 
-#: ../plugins/backup-restore/backup.c:466
+#: ../plugins/backup-restore/backup.c:485
 msgid "Loading Evolution settings"
 msgstr "Evolution-Einstellungen laden"
 
-#: ../plugins/backup-restore/backup.c:481
+#: ../plugins/backup-restore/backup.c:502
 msgid "Removing temporary back up files"
 msgstr "TemporÃre Sicherungsdateien werden entfernt"
 
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:514
 msgid "Ensuring local sources"
 msgstr "Lokale Quellen sicherstellen"
 
-#: ../plugins/backup-restore/backup.c:678
+#: ../plugins/backup-restore/backup.c:699
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Sichern nach %s"
 
-#: ../plugins/backup-restore/backup.c:683
+#: ../plugins/backup-restore/backup.c:704
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Wiederherstellen von %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:705
+#: ../plugins/backup-restore/backup.c:728
 msgid "Evolution Back up"
 msgstr "Evolution-Datensicherung"
 
-#: ../plugins/backup-restore/backup.c:705
+#: ../plugins/backup-restore/backup.c:728
 msgid "Evolution Restore"
 msgstr "Evolution-Wiederherstellung"
 
-#: ../plugins/backup-restore/backup.c:743
+#: ../plugins/backup-restore/backup.c:766
 msgid "Backing up Evolution Data"
 msgstr "Sichern der Evolution-Daten"
 
-#: ../plugins/backup-restore/backup.c:744
+#: ../plugins/backup-restore/backup.c:767
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Bitte warten Sie, wÃhrend Evolution Ihre Daten sichert."
 
-#: ../plugins/backup-restore/backup.c:746
+#: ../plugins/backup-restore/backup.c:769
 msgid "Restoring Evolution Data"
 msgstr "Wiederherstellen der Evolution-Daten"
 
-#: ../plugins/backup-restore/backup.c:747
+#: ../plugins/backup-restore/backup.c:770
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Bitte warten Sie, wÃhrend Evolution Ihre Daten wiederherstellt."
 
-#: ../plugins/backup-restore/backup.c:765
+#: ../plugins/backup-restore/backup.c:788
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "Dies kann abhÃngig von den Daten in Ihrem Konto einige Zeit dauern."
 
@@ -16514,8 +16598,8 @@ msgstr "Sind Sie sicher, dass Sie Evolution beenden wollen?"
 msgid ""
 "Are you sure you want to restore Evolution from the selected back up file?"
 msgstr ""
-"Sind Sie sicher, dass Evolution aus dem ausgewÃhlten Archiv "
-"wiederhergestellt werden soll?"
+"Sind Sie sicher, dass Evolution aus dem ausgewÃhlten Archiv wiederhergestellt "
+"werden soll?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
 msgid "Close and Back up Evolution"
@@ -16558,43 +16642,43 @@ msgid ""
 "up."
 msgstr ""
 "Um Ihre Daten und Einstellungen wiederherzustellen, mÃssen Sie zuerst "
-"Evolution beenden. Stellen Sie bitte sicher, dass Sie ungesicherte "
-"Ãnderungen speichern, bevor Sie fortfahren. Es werden alle derzeitigen "
-"Evolution-Daten und -Einstellungen unwiderruflich gelÃscht und aus der "
-"Sicherungskopie wiederhergestellt."
+"Evolution beenden. Stellen Sie bitte sicher, dass Sie ungesicherte Ãnderungen "
+"speichern, bevor Sie fortfahren. Es werden alle derzeitigen Evolution-Daten "
+"und -Einstellungen unwiderruflich gelÃscht und aus der Sicherungskopie "
+"wiederhergestellt."
 
-#: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
+#: ../plugins/bbdb/bbdb.c:675 ../plugins/bbdb/bbdb.c:684
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatische Kontakte"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:709
+#: ../plugins/bbdb/bbdb.c:699
 msgid "Create _address book entries when sending mails"
 msgstr ""
 "_Automatische Erstellung von AdressbucheintrÃgen bei Versendung von E-Mails"
 
-#: ../plugins/bbdb/bbdb.c:715
+#: ../plugins/bbdb/bbdb.c:705
 msgid "Select Address book for Automatic Contacts"
 msgstr "Adressbuch fÃr automatische Kontakte auswÃhlen"
 
-#: ../plugins/bbdb/bbdb.c:730
+#: ../plugins/bbdb/bbdb.c:720
 msgid "Instant Messaging Contacts"
 msgstr "Instant-Messaging-Kontakte"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:745
+#: ../plugins/bbdb/bbdb.c:735
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 "Kontaktinformationen und -bilder regelmÃÃig mit der Pidgin-Kontaktliste "
 "_abgleichen"
 
-#: ../plugins/bbdb/bbdb.c:751
+#: ../plugins/bbdb/bbdb.c:741
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Adressbuch fÃr die Pidgin-Kontaktliste auswÃhlen"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:762
+#: ../plugins/bbdb/bbdb.c:752
 msgid "Synchronize with _buddy list now"
 msgstr "Jetzt mit der _Buddy-Liste abgleichen"
 
@@ -16604,82 +16688,28 @@ msgstr "BBDB"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid ""
-"Takes the gruntwork out of managing your address book.\n"
-"\n"
-"Automatically fills your address book with names and email addresses as you "
-"reply to messages.  Also fills in IM contact information from your buddy "
-"lists."
-msgstr ""
-"Die Routinearbeit der Adressbuchverwaltung wird abgenommen.\n"
-"\n"
-"FÃllt das Adressbuch automatisch mit Namen und E-Mail-Adressen, sobald auf "
-"Nachrichten geantwortet wird und fÃgt auch Instant-Messaging-"
-"Kontaktinformationen aus Ihren Buddy-Listen hinzu."
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:163
-#, 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:167
-#, 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:196
-#, 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:198
-#, 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:221
-#, 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:406
-msgid "Convert message text to _Unicode"
-msgstr "Nachrichtentext nach _Unicode konvertieren"
-
-#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
-msgid "Convert mail messages to Unicode"
-msgstr "E-Mails nach Unicode konvertieren"
-
-#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
-msgid ""
-"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
-"different character sets."
-msgstr ""
-"E-Mail-Text in Unicode/UTF-8 umwandeln, um die unerwÃnschten Elemente aus "
-"verschiedenen Zeichenkodierungen einheitlich zu erkennen."
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
-msgid "Bogofilter Junk Filter"
-msgstr "Bogofilter Filter fÃr UnerwÃnschtes"
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
-msgid "Bogofilter Options"
-msgstr "Bogofilter-Optionen"
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
-msgid "Filter junk messages using Bogofilter."
-msgstr "Filtert unerwÃnschte Nachrichten mit Bogofilter."
+"Takes the gruntwork out of managing your address book.\n"
+"\n"
+"Automatically fills your address book with names and email addresses as you "
+"reply to messages.  Also fills in IM contact information from your buddy "
+"lists."
+msgstr ""
+"Die Routinearbeit der Adressbuchverwaltung wird abgenommen.\n"
+"\n"
+"FÃllt das Adressbuch automatisch mit Namen und E-Mail-Adressen, sobald auf "
+"Nachrichten geantwortet wird und fÃgt auch Instant-Messaging-"
+"Kontaktinformationen aus Ihren Buddy-Listen hinzu."
 
-#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:203
 msgid "Authentication failed. Server requires correct login."
 msgstr ""
 "Legitimierung ist fehlgeschlagen. Der Server erfordert korrekte Anmeldung."
 
-#: ../plugins/caldav/caldav-browse-server.c:206
+#: ../plugins/caldav/caldav-browse-server.c:205
 msgid "Given URL cannot be found."
 msgstr "Angegebene Adresse konnte nicht gefunden werden."
 
-#: ../plugins/caldav/caldav-browse-server.c:210
+#: ../plugins/caldav/caldav-browse-server.c:209
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
@@ -16688,118 +16718,119 @@ msgstr ""
 "Server gab unerwartete Daten zurÃck.\n"
 "%d - %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:340
-#: ../plugins/caldav/caldav-browse-server.c:664
+#: ../plugins/caldav/caldav-browse-server.c:339
+#: ../plugins/caldav/caldav-browse-server.c:663
 msgid "Failed to parse server response."
 msgstr "Verarbeitung der Serverantwort ist gescheitert."
 
-#: ../plugins/caldav/caldav-browse-server.c:434
+#: ../plugins/caldav/caldav-browse-server.c:433
 msgid "Events"
 msgstr "Ereignisse"
 
-#: ../plugins/caldav/caldav-browse-server.c:456
+#: ../plugins/caldav/caldav-browse-server.c:455
 msgid "User's calendars"
 msgstr "Benutzerkalender"
 
-#: ../plugins/caldav/caldav-browse-server.c:565
-#: ../plugins/caldav/caldav-browse-server.c:733
+#: ../plugins/caldav/caldav-browse-server.c:564
+#: ../plugins/caldav/caldav-browse-server.c:732
 msgid "Failed to get server URL."
 msgstr "Serveradresse konnte nicht erhalten werden"
 
-#: ../plugins/caldav/caldav-browse-server.c:731
-#: ../plugins/caldav/caldav-browse-server.c:772
-#: ../plugins/caldav/caldav-browse-server.c:1431
+#: ../plugins/caldav/caldav-browse-server.c:730
+#: ../plugins/caldav/caldav-browse-server.c:771
+#: ../plugins/caldav/caldav-browse-server.c:1430
 msgid "Searching for user's calendars..."
 msgstr "Nach Benutzerkalendern wird gesucht â"
 
-#: ../plugins/caldav/caldav-browse-server.c:770
+#: ../plugins/caldav/caldav-browse-server.c:769
 msgid "Could not find any user calendar."
 msgstr "Es wurde kein Benutzerkalender gefunden."
 
-#: ../plugins/caldav/caldav-browse-server.c:902
+#: ../plugins/caldav/caldav-browse-server.c:901
 #, c-format
 msgid "Previous attempt failed: %s"
 msgstr "Vorheriger Versuch scheiterte: %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:904
+#: ../plugins/caldav/caldav-browse-server.c:903
 #, c-format
 msgid "Previous attempt failed with code %d"
 msgstr "Vorheriger Versuch scheiterte mit Code %d"
 
-#: ../plugins/caldav/caldav-browse-server.c:909
+#: ../plugins/caldav/caldav-browse-server.c:908
 #, c-format
 msgid "Enter password for user %s on server %s"
 msgstr "Geben Sie das Passwort fÃr Benutzer %s auf dem Server %s ein"
 
-#: ../plugins/caldav/caldav-browse-server.c:968
+#: ../plugins/caldav/caldav-browse-server.c:967
 #, c-format
 msgid "Cannot create soup message for URL '%s'"
 msgstr "Soup-Nachricht fÃr Adresse Â%s konnte nicht erstellt werden"
 
 #. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1214
+#: ../plugins/caldav/caldav-browse-server.c:1213
 msgid "Searching folder content..."
 msgstr "Ordnerinhalt wird durchsucht â"
 
-#: ../plugins/caldav/caldav-browse-server.c:1263
-#: ../plugins/caldav/caldav-source.c:256
+#: ../plugins/caldav/caldav-browse-server.c:1262
+#: ../plugins/caldav/caldav-source.c:258
 msgid "Server _handles meeting invitations"
 msgstr "Server unterstÃtzt Einladungen zu Besprec_hungen"
 
-#: ../plugins/caldav/caldav-browse-server.c:1270
+#: ../plugins/caldav/caldav-browse-server.c:1269
 msgid "List of available calendars:"
 msgstr "Liste der verfÃgbaren Kalender:"
 
-#: ../plugins/caldav/caldav-browse-server.c:1308
+#: ../plugins/caldav/caldav-browse-server.c:1307
 msgid "Supports"
 msgstr "UnterstÃtzt"
 
-#: ../plugins/caldav/caldav-browse-server.c:1335
-#: ../plugins/caldav/caldav-source.c:254
-msgid "User e-_mail:"
+#: ../plugins/caldav/caldav-browse-server.c:1334
+#: ../plugins/caldav/caldav-source.c:256
+msgid "User e_mail:"
 msgstr "_E-Mail-Adresse des Benutzers:"
 
-#: ../plugins/caldav/caldav-browse-server.c:1407
+#: ../plugins/caldav/caldav-browse-server.c:1406
 #, c-format
 msgid "Failed to create thread: %s"
 msgstr "Thema konnte nicht angelegt werden: %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:1516
+#: ../plugins/caldav/caldav-browse-server.c:1515
 #, c-format
 msgid "Server URL '%s' is not a valid URL"
 msgstr "Serveradresse Â%s ist keine gÃltige Adresse"
 
-#: ../plugins/caldav/caldav-browse-server.c:1522
+#: ../plugins/caldav/caldav-browse-server.c:1521
 msgid "Browse for a CalDAV calendar"
 msgstr "Nach einem CalDAV-Kalender suchen"
 
-#: ../plugins/caldav/caldav-source.c:235
-#: ../plugins/calendar-http/calendar-http.c:100
+#: ../plugins/caldav/caldav-source.c:237
+#: ../plugins/calendar-http/calendar-http.c:104
 msgid "_URL:"
 msgstr "_Adresse:"
 
-#: ../plugins/caldav/caldav-source.c:242
-#: ../plugins/google-account-setup/google-contacts-source.c:349
-msgid "Use _SSL"
-msgstr "_SSL verwenden"
-
 #: ../plugins/caldav/caldav-source.c:244
-#: ../plugins/google-account-setup/google-contacts-source.c:327
-#: ../plugins/google-account-setup/google-source.c:638
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:268
+#: ../plugins/calendar-http/calendar-http.c:138
+#: ../plugins/google-account-setup/google-contacts-source.c:351
+msgid "Use _secure connection"
+msgstr "_Sichere Verbindung verwenden"
+
+#: ../plugins/caldav/caldav-source.c:246
+#: ../plugins/google-account-setup/google-contacts-source.c:329
+#: ../plugins/google-account-setup/google-source.c:652
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:267
 msgid "User_name:"
 msgstr "_Benutzername:"
 
-#: ../plugins/caldav/caldav-source.c:259
+#: ../plugins/caldav/caldav-source.c:261
 msgid "Brows_e server for a calendar"
 msgstr "Server nach einem Kal_ender durchsuchen"
 
-#: ../plugins/caldav/caldav-source.c:277
-#: ../plugins/calendar-file/calendar-file.c:191
-#: ../plugins/calendar-http/calendar-http.c:119
-#: ../plugins/calendar-weather/calendar-weather.c:399
-#: ../plugins/google-account-setup/google-contacts-source.c:367
-#: ../plugins/google-account-setup/google-source.c:645
+#: ../plugins/caldav/caldav-source.c:279
+#: ../plugins/calendar-file/calendar-file.c:195
+#: ../plugins/calendar-http/calendar-http.c:123
+#: ../plugins/calendar-weather/calendar-weather.c:403
+#: ../plugins/google-account-setup/google-contacts-source.c:369
+#: ../plugins/google-account-setup/google-source.c:659
 msgid "Re_fresh:"
 msgstr "Auf_frischen:"
 
@@ -16811,31 +16842,31 @@ msgstr "CalDAV-UnterstÃtzung zu Evolution hinzufÃgen."
 msgid "CalDAV Support"
 msgstr "CalDAV-UnterstÃtzung"
 
-#: ../plugins/calendar-file/calendar-file.c:125
+#: ../plugins/calendar-file/calendar-file.c:129
 msgid "_Customize options"
 msgstr "Optionen _anpassen"
 
-#: ../plugins/calendar-file/calendar-file.c:144
+#: ../plugins/calendar-file/calendar-file.c:148
 msgid "File _name:"
 msgstr "Datei_name:"
 
-#: ../plugins/calendar-file/calendar-file.c:148
+#: ../plugins/calendar-file/calendar-file.c:152
 msgid "Choose calendar file"
 msgstr "WÃhlen Sie eine Kalenderdatei"
 
-#: ../plugins/calendar-file/calendar-file.c:196
+#: ../plugins/calendar-file/calendar-file.c:200
 msgid "On open"
 msgstr "Beim Ãffnen"
 
-#: ../plugins/calendar-file/calendar-file.c:197
+#: ../plugins/calendar-file/calendar-file.c:201
 msgid "On file change"
 msgstr "Bei DateiÃnderungen"
 
-#: ../plugins/calendar-file/calendar-file.c:198
+#: ../plugins/calendar-file/calendar-file.c:202
 msgid "Periodically"
 msgstr "RegelmÃÃig"
 
-#: ../plugins/calendar-file/calendar-file.c:213
+#: ../plugins/calendar-file/calendar-file.c:217
 msgid "Force read _only"
 msgstr "_Nur lesen erzwingen"
 
@@ -16847,11 +16878,7 @@ msgstr "Lokale Kalender zu Evolution hinzufÃgen."
 msgid "Local Calendars"
 msgstr "Lokale Kalender"
 
-#: ../plugins/calendar-http/calendar-http.c:134
-msgid "_Secure connection"
-msgstr "_Sichere Verbindung"
-
-#: ../plugins/calendar-http/calendar-http.c:194
+#: ../plugins/calendar-http/calendar-http.c:198
 msgid "Userna_me:"
 msgstr "_Benutzername:"
 
@@ -16863,62 +16890,62 @@ msgstr "Einen Web-Kalender zu Evolution hinzufÃgen."
 msgid "Web Calendars"
 msgstr "Web-Kalender"
 
-#: ../plugins/calendar-weather/calendar-weather.c:60
+#: ../plugins/calendar-weather/calendar-weather.c:64
 msgid "Weather: Fog"
 msgstr "Wetter: Nebel"
 
-#: ../plugins/calendar-weather/calendar-weather.c:61
+#: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Cloudy"
 msgstr "Wetter: Wolkig"
 
-#: ../plugins/calendar-weather/calendar-weather.c:62
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Cloudy Night"
 msgstr "Wetter: Wolkige Nacht"
 
-#: ../plugins/calendar-weather/calendar-weather.c:63
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Overcast"
 msgstr "Wetter: Bedeckt"
 
-#: ../plugins/calendar-weather/calendar-weather.c:64
+#: ../plugins/calendar-weather/calendar-weather.c:68
 msgid "Weather: Showers"
 msgstr "Wetter: Schauer"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:69
 msgid "Weather: Snow"
 msgstr "Wetter: Schnee"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:70
 msgid "Weather: Sunny"
 msgstr "Wetter: Sonnig"
 
-#: ../plugins/calendar-weather/calendar-weather.c:67
+#: ../plugins/calendar-weather/calendar-weather.c:71
 msgid "Weather: Clear Night"
 msgstr "Wetter: Klare Nacht"
 
-#: ../plugins/calendar-weather/calendar-weather.c:68
+#: ../plugins/calendar-weather/calendar-weather.c:72
 msgid "Weather: Thunderstorms"
 msgstr "Wetter: Gewitter"
 
-#: ../plugins/calendar-weather/calendar-weather.c:226
+#: ../plugins/calendar-weather/calendar-weather.c:230
 msgid "Select a location"
 msgstr "Einen Ort wÃhlen"
 
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:332
-#: ../plugins/calendar-weather/calendar-weather.c:377
+#: ../plugins/calendar-weather/calendar-weather.c:336
+#: ../plugins/calendar-weather/calendar-weather.c:381
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "Keine"
 
-#: ../plugins/calendar-weather/calendar-weather.c:452
+#: ../plugins/calendar-weather/calendar-weather.c:456
 msgid "_Units:"
 msgstr "Ein_heiten:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:461
+#: ../plugins/calendar-weather/calendar-weather.c:465
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Metrisch (Celsius, cm, usw.)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:464
+#: ../plugins/calendar-weather/calendar-weather.c:468
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Englisch (Fahrenheit, Inch, usw.)"
 
@@ -16930,25 +16957,7 @@ msgstr "Wetterkalender zu Evolution hinzufÃgen."
 msgid "Weather Calendars"
 msgstr "Wetterkalender"
 
-#: ../plugins/contacts-map/contacts-map.c:55
-#: ../plugins/contacts-map/contacts-map.c:201
-msgid "Contacts map"
-msgstr "Kontaktkarte"
-
-#: ../plugins/contacts-map/contacts-map.c:56
-msgid "Show a map of all the contacts"
-msgstr "Eine Karte aller Kontakte anzeigen"
-
-#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:1
-msgid "Add a map showing the location of contacts when possible."
-msgstr ""
-"Wenn mÃglich, eine Karte hinzufÃgen, die den Ort von Kontakten anzeigt."
-
-#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:2
-msgid "Map for contacts"
-msgstr "Karte fÃr Kontakte"
-
-#: ../plugins/dbx-import/dbx-importer.c:273
+#: ../plugins/dbx-import/dbx-importer.c:282
 msgid "Importing Outlook Express data"
 msgstr "Daten aus Outlook Express werden importiert"
 
@@ -16964,23 +16973,23 @@ msgstr "Outlook DBX-Importeur"
 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
+#: ../plugins/default-source/default-source.c:87
 msgid "Mark as _default address book"
 msgstr "Als _Vorgabeadressbuch markieren"
 
-#: ../plugins/default-source/default-source.c:96
+#: ../plugins/default-source/default-source.c:100
 msgid "A_utocomplete with this address book"
 msgstr "Aus diesem Adressbuch a_utomatisch vervollstÃndigen"
 
-#: ../plugins/default-source/default-source.c:105
+#: ../plugins/default-source/default-source.c:109
 msgid "Mark as _default calendar"
 msgstr "Als _Vorgabekalender markieren"
 
-#: ../plugins/default-source/default-source.c:106
+#: ../plugins/default-source/default-source.c:110
 msgid "Mark as _default task list"
 msgstr "Als _Vorgabeaufgabenliste markieren"
 
-#: ../plugins/default-source/default-source.c:107
+#: ../plugins/default-source/default-source.c:111
 msgid "Mark as _default memo list"
 msgstr "Als _Vorgabenotizliste markieren"
 
@@ -17067,7 +17076,7 @@ msgid "Key"
 msgstr "SchlÃssel"
 
 #: ../plugins/email-custom-header/email-custom-header.c:903
-#: ../plugins/templates/templates.c:417
+#: ../plugins/templates/templates.c:456
 msgid "Values"
 msgstr "Werte"
 
@@ -17090,7 +17099,7 @@ msgstr ""
 "Automatisch den Editor bei Tastendruck beim Verfassen einer Nachricht starten"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:125
+#: ../plugins/external-editor/external-editor.c:131
 msgid "Automatically launch when a new mail is edited"
 msgstr "Automatisch beim Bearbeiten einer neuen E-Mail starten"
 
@@ -17103,11 +17112,11 @@ msgstr "Vorgabe fÃr externen Editor"
 msgid "The default command that must be used as the editor."
 msgstr "Der Befehl, der als Editor verwendet werden muss."
 
-#: ../plugins/external-editor/external-editor.c:114
+#: ../plugins/external-editor/external-editor.c:120
 msgid "Command to be executed to launch the editor: "
 msgstr "AuszufÃhrender Befehl, um den Editor zu starten:"
 
-#: ../plugins/external-editor/external-editor.c:115
+#: ../plugins/external-editor/external-editor.c:121
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -17115,8 +17124,8 @@ msgstr ""
 "Verwenden Sie Âxemacs fÃr Emacs\n"
 "Verwenden Sie Âgvim -f fÃr VI"
 
-#: ../plugins/external-editor/external-editor.c:381
-#: ../plugins/external-editor/external-editor.c:383
+#: ../plugins/external-editor/external-editor.c:399
+#: ../plugins/external-editor/external-editor.c:401
 msgid "Compose in External Editor"
 msgstr "Im externen Editor verfassen"
 
@@ -17126,8 +17135,7 @@ msgstr "Externer Editor"
 
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
 msgid "Use an external editor to compose plain-text mail messages."
-msgstr ""
-"Einen externen Editor zum Verfassen von Nur-Text-Nachrichten verwenden."
+msgstr "Einen externen Editor zum Verfassen von Nur-Text-Nachrichten verwenden."
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
 msgid "Cannot create Temporary File"
@@ -17139,8 +17147,7 @@ msgstr "Editor kann nicht gestartet werden"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
 msgid ""
-"Evolution is unable to create a temporary file to save your mail. Retry "
-"later."
+"Evolution is unable to create a temporary file to save your mail. Retry later."
 msgstr ""
 "Es konnte keine temporÃre Datei zum Speichern der E-Mails angelegt werden. "
 "Bitte versuchen Sie es spÃter erneut."
@@ -17162,8 +17169,8 @@ msgid ""
 "The external editor set in your plugin preferences cannot be launched. Try "
 "setting a different editor."
 msgstr ""
-"Der in den Pluin-Einstellungen gesetzte externe Editor konnte nicht "
-"gestartet werden. Bitte benutzen Sie einen anderen Editor."
+"Der in den Pluin-Einstellungen gesetzte externe Editor konnte nicht gestartet "
+"werden. Bitte benutzen Sie einen anderen Editor."
 
 #: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
 msgid "Insert Face picture by default"
@@ -17228,19 +17235,19 @@ 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:315
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:244
+#: ../plugins/google-account-setup/google-contacts-source.c:317
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:243
 msgid "Server"
 msgstr "Server"
 
-#: ../plugins/google-account-setup/google-source.c:438
+#: ../plugins/google-account-setup/google-source.c:443
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr ""
 "Geben Sie das Passwort fÃr den Benutzer %s ein, um auf die Liste der "
 "abonnierten Kalender zuzugreifen."
 
-#: ../plugins/google-account-setup/google-source.c:549
+#: ../plugins/google-account-setup/google-source.c:560
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17249,17 +17256,17 @@ msgstr ""
 "Daten konnten nicht vom Google-Server empfangen werden.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:549
-#: ../plugins/mail-to-task/mail-to-task.c:737
-#: ../plugins/mail-to-task/mail-to-task.c:956
+#: ../plugins/google-account-setup/google-source.c:560
+#: ../plugins/mail-to-task/mail-to-task.c:796
+#: ../plugins/mail-to-task/mail-to-task.c:1045
 msgid "Unknown error."
 msgstr "Unbekannter Fehler."
 
-#: ../plugins/google-account-setup/google-source.c:649
+#: ../plugins/google-account-setup/google-source.c:663
 msgid "Cal_endar:"
 msgstr "_Kalender:"
 
-#: ../plugins/google-account-setup/google-source.c:684
+#: ../plugins/google-account-setup/google-source.c:698
 msgid "Retrieve _List"
 msgstr "_Liste abrufen"
 
@@ -17271,459 +17278,6 @@ msgstr "Google-Kalender zu Evolution hinzufÃgen."
 msgid "Google Calendars"
 msgstr "Google-Kalender"
 
-#: ../plugins/groupwise-features/camel-gw-listener.c:453
-msgid "Checklist"
-msgstr "Checkliste"
-
-#. Translators: First %s is the server name, second %s is user name
-#: ../plugins/groupwise-features/camel-gw-listener.c:513
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "Geben Sie das Passwort fÃr %s ein (Benutzer %s)"
-
-#: ../plugins/groupwise-features/camel-gw-listener.c:533
-msgid "Failed to authenticate.\n"
-msgstr "Legitimation gescheitert.\n"
-
-#: ../plugins/groupwise-features/gw-ui.c:112
-msgid "New _Shared Folder..."
-msgstr "Neue Ordner_freigabe â"
-
-#: ../plugins/groupwise-features/gw-ui.c:119
-msgid "_Proxy Login..."
-msgstr "_Vertretungsanmeldung â"
-
-#: ../plugins/groupwise-features/gw-ui.c:170
-msgid "Junk Mail Settings..."
-msgstr "Einstellungen zu unerwÃnschten Nachrichten â"
-
-#: ../plugins/groupwise-features/gw-ui.c:177
-msgid "Track Message Status..."
-msgstr "Nachrichtenstatus verfolgen â"
-
-#: ../plugins/groupwise-features/gw-ui.c:183
-msgid "Retract Mail"
-msgstr "E-Mail zurÃckziehen"
-
-#: ../plugins/groupwise-features/gw-ui.c:331
-msgid "Accept"
-msgstr "Annehmen"
-
-#: ../plugins/groupwise-features/gw-ui.c:338
-msgid "Accept Tentatively"
-msgstr "VorlÃufig annehmen"
-
-#: ../plugins/groupwise-features/gw-ui.c:345
-msgid "Decline"
-msgstr "Ablehnen"
-
-#: ../plugins/groupwise-features/gw-ui.c:352
-msgid "Rese_nd Meeting..."
-msgstr "Besprechung er_neut versenden â"
-
-#: ../plugins/groupwise-features/install-shared.c:178
-#: ../plugins/groupwise-features/share-folder-common.c:353
-msgid "Create folder"
-msgstr "Ordner anlegen"
-
-#: ../plugins/groupwise-features/install-shared.c:230
-#, c-format
-msgid ""
-"The user '%s' has shared a folder with you\n"
-"\n"
-"Message from '%s'\n"
-"\n"
-"\n"
-"%s\n"
-"\n"
-"\n"
-"Click 'Apply' to install the shared folder\n"
-"\n"
-msgstr ""
-"Der Benutzer Â%s teilt einen Ordner mit Ihnen \n"
-"\n"
-"Nachricht von Â%sÂ\n"
-"\n"
-"\n"
-"%s\n"
-"\n"
-"\n"
-"Klicken Sie auf ÂAnwendenÂ, um den gemeinsamen Ordner einzurichten\n"
-"\n"
-
-#: ../plugins/groupwise-features/install-shared.c:242
-msgid "Install the shared folder"
-msgstr "Gemeinsamen Ordner einrichten"
-
-#: ../plugins/groupwise-features/install-shared.c:246
-msgid "Shared Folder Installation"
-msgstr "Einrichten von Gemeinsamen Ordnern"
-
-#: ../plugins/groupwise-features/junk-mail-settings.c:82
-msgid "Junk Settings"
-msgstr "Einstellungen zu unerwÃnschten Nachrichten"
-
-#: ../plugins/groupwise-features/junk-mail-settings.c:96
-#: ../plugins/groupwise-features/junk-settings.ui.h:3
-msgid "Junk Mail Settings"
-msgstr "Einstellungen zu unerwÃnschten Nachrichten"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:1
-msgid "Email:"
-msgstr "E-Mail:"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:2
-msgid "Junk List:"
-msgstr "UnerwÃnscht-Liste:"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:6
-msgid "_Enable"
-msgstr "A_ktivieren"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:7
-msgid "_Junk List"
-msgstr "_UnerwÃnscht-Liste"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:8
-#: ../plugins/groupwise-features/properties.ui.h:12
-#: ../widgets/table/e-table-config.ui.h:21
-msgid "_Remove"
-msgstr "_Entfernen"
-
-#: ../plugins/groupwise-features/mail-retract.c:81
-msgid "Message Retract"
-msgstr "Nachricht zurÃckziehen"
-
-#: ../plugins/groupwise-features/mail-retract.c:90
-msgid ""
-"Retracting a message may remove it from the recipient's mailbox. Are you "
-"sure you want to do this?"
-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?"
-
-#: ../plugins/groupwise-features/mail-retract.c:111
-msgid "Message retracted successfully"
-msgstr ""
-"Aktivieren der Seitenleisten-Suchfunktion, damit Sie interaktiv suchen "
-"kÃnnen, indem Sie lediglich zu tippen beginnen. Benutzen Sie dies, damit Sie "
-"Ordner finden, indem Sie nur dessen Name tippen, die Auswahl springt dann "
-"sofort zu diesem Ordner."
-
-#: ../plugins/groupwise-features/mail-send-options.c:202
-msgid "Insert Send options"
-msgstr "Versandoptionen einfÃgen"
-
-#: ../plugins/groupwise-features/notification.ui.h:3
-#: ../plugins/groupwise-features/properties.ui.h:6
-msgid "The participants will receive the following notification.\n"
-msgstr "Die berechtigten Nutzer werden folgende Benachrichtigung erhalten.\n"
-
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
-msgid "Add Send Options to GroupWise messages"
-msgstr "Versandoptionen zu GroupWise-Nachrichten hinzufÃgen"
-
-#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "Fine-tune your GroupWise accounts."
-msgstr "GroupWise-Konten genau abstimmen."
-
-#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
-msgid "GroupWise Features"
-msgstr "GroupWise-Funktionen"
-
-#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:1
-msgid "Message retract failed"
-msgstr "ZurÃckziehen gescheitert"
-
-#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:2
-msgid "The server did not allow the selected message to be retracted."
-msgstr "Der Server gestattete nicht, die gewÃhlte Nachricht zurÃckzuziehen."
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
-msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
-msgstr ""
-"Es existiert bereits ein Konto namens Â{0}Â. Bitte ÃberprÃfen Sie Ihre Ordner-"
-"Hierarchie."
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
-msgid "Account Already Exists"
-msgstr "Konto existiert bereits"
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:3
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:1
-#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:1
-msgid "Invalid user"
-msgstr "UngÃltiger Benutzer"
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
-msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
-"address and try again."
-msgstr ""
-"Anmeldung als Â{0}Â am Proxy war nicht mÃglich. Bitte ÃberpÃfen Sie Ihre E-"
-"Mail-Adresse und versuchen es erneut."
-
-#. 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/org-gnome-proxy.error.xml.h:3
-msgid "Proxy access cannot be given to user &quot;{0}&quot;"
-msgstr "Dem Benutzer Â{0}Â konnte kein Zugriff auf den Proxy gewÃhrt werden"
-
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:4
-#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:2
-msgid "Specify User"
-msgstr "Benutzer auswÃhlen"
-
-#. 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/org-gnome-proxy.error.xml.h:6
-msgid "You have already given proxy permissions to this user."
-msgstr "Sie haben diesem Benutzer bereits Zugriff auf den Proxy gewÃhrt."
-
-#. 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/org-gnome-proxy.error.xml.h:8
-msgid "You have to specify a valid user name to give proxy rights."
-msgstr ""
-"Sie mÃssen einen gÃltigen Benutzernamen eingeben, um Zugriff auf den Proxy "
-"zu gewÃhren."
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3
-msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
-msgstr ""
-"Sie kÃnnen diesen Ordner nicht mit dem angegebenen Benutzer Â{0}Â teilen"
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:4
-msgid "You have to specify a user name which you want to add to the list"
-msgstr ""
-"Sie mÃssen einen Benutzernamen festlegen, der zur Liste hinzugefÃgt werden "
-"soll"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
-msgid "Do you want to resend the meeting?"
-msgstr "Wollen Sie diese Besprechung erneut verschicken?"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
-msgid "Do you want to resend the recurring meeting?"
-msgstr "Wollen Sie diese wiederkehrende Besprechung erneut verschicken?"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
-msgid "Do you want to retract the original item?"
-msgstr "Wollen Sie das ursprÃngliche Objekt zurÃckziehen?"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
-msgid "The original will be removed from the recipient's mailbox."
-msgstr "Das Original wird aus dem Postfach des EmpfÃngers gelÃscht."
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:5
-msgid "This is a recurring meeting"
-msgstr "Dies ist eine wiederkehrende Besprechung"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:6
-msgid "This will create a new meeting using the existing meeting details."
-msgstr ""
-"Dies wird eine neue Besprechung mit den vorhandenen Besprechungsdetails "
-"erstellen."
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:7
-msgid ""
-"This will create a new meeting with the existing meeting details. The "
-"recurrence rule needs to be re-entered."
-msgstr ""
-"Dies wird eine neue Besprechung mit den vorhandenen Besprechungsdetails "
-"erstellen. Details zur Wiederkehr mÃssen erneut eingegeben werden."
-
-#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:9
-msgid "Would you like to accept it?"
-msgstr "Wollen Sie dies akzeptieren?"
-
-#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:11
-msgid "Would you like to decline it?"
-msgstr "Wollen Sie dies ablehnen?"
-
-#: ../plugins/groupwise-features/properties.ui.h:1
-msgid "C_ustomize notification message"
-msgstr "Benachrichtigung an_passen"
-
-#: ../plugins/groupwise-features/properties.ui.h:2
-msgid "Con_tacts..."
-msgstr "Kon_takte â"
-
-#: ../plugins/groupwise-features/properties.ui.h:4
-msgid "Shared Folder Notification"
-msgstr "Benachrichtigung zur Ordnerfreigabe"
-
-#: ../plugins/groupwise-features/properties.ui.h:8
-msgid "Users:"
-msgstr "Benutzer:"
-
-#: ../plugins/groupwise-features/properties.ui.h:11
-msgid "_Not Shared"
-msgstr "_Nicht freigeben"
-
-#: ../plugins/groupwise-features/properties.ui.h:13
-msgid "_Shared With..."
-msgstr "_Freigegeben fÃr â"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:1
-msgid "Access Rights"
-msgstr "Zugriffsrechte"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:2
-msgid "Add/Edit"
-msgstr "HinzufÃgen/Bearbeiten"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:4
-msgid "Con_tacts"
-msgstr "Kon_takte"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:6
-msgid "Modify _folders/options/rules/"
-msgstr "O_rdner/Optionen/Regeln Ãndern"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:8
-msgid "Read items marked _private"
-msgstr "Gelesene Objekte als _privat kennzeichnen"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:9
-msgid "Reminder Notes"
-msgstr "Erinnerungsmitteilungen"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:10
-msgid "Subscribe to my _alarms"
-msgstr "Eigene A_larme weitergeben"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:11
-msgid "Subscribe to my _notifications"
-msgstr "Eigene Hin_weise weitergeben"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:13
-msgid "_Write"
-msgstr "S_chreiben"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:14
-msgid "permission to read|_Read"
-msgstr "_Lesen"
-
-#: ../plugins/groupwise-features/proxy-listing.ui.h:1
-msgid "Proxy"
-msgstr "Vertretung"
-
-#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
-#: ../widgets/misc/e-account-tree-view.c:239
-msgid "Account Name"
-msgstr "Kontoname"
-
-#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
-msgid "Proxy Login"
-msgstr "Vertretungsanmeldung"
-
-#: ../plugins/groupwise-features/proxy-login.c:208
-#: ../plugins/groupwise-features/proxy-login.c:251
-#: ../plugins/groupwise-features/proxy.c:494
-#: ../plugins/groupwise-features/send-options.c:84
-#, c-format
-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:698
-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:704
-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:709
-msgctxt "GW"
-msgid "Proxy"
-msgstr "Proxy"
-
-#: ../plugins/groupwise-features/proxy.c:935
-#: ../plugins/groupwise-features/share-folder.c:694
-msgid "Add User"
-msgstr "Benutzer hinzufÃgen"
-
-#: ../plugins/groupwise-features/send-options.c:214
-msgid "Advanced send options"
-msgstr "Erweiterte Versandoptionen"
-
-#: ../plugins/groupwise-features/share-folder-common.c:316
-#: ../plugins/groupwise-features/share-folder.c:729
-msgid "Users"
-msgstr "Benutzer"
-
-#: ../plugins/groupwise-features/share-folder-common.c:317
-msgid "Enter the users and set permissions"
-msgstr "Eingabe der Benutzer und Festlegen der Rechte"
-
-#: ../plugins/groupwise-features/share-folder-common.c:418
-msgid "Sharing"
-msgstr "Freigeben"
-
-#: ../plugins/groupwise-features/share-folder.c:532
-msgid "Custom Notification"
-msgstr "Eigene Benachrichtigung"
-
-#: ../plugins/groupwise-features/share-folder.c:734
-msgid "Add   "
-msgstr "HinzufÃgen   "
-
-#: ../plugins/groupwise-features/share-folder.c:740
-msgid "Modify"
-msgstr "Ãndern"
-
-#: ../plugins/groupwise-features/status-track.c:125
-msgid "Message Status"
-msgstr "Nachrichtenstatus"
-
-#. Subject
-#: ../plugins/groupwise-features/status-track.c:139
-msgid "Subject:"
-msgstr "Betreff:"
-
-#: ../plugins/groupwise-features/status-track.c:153
-msgid "From:"
-msgstr "Von:"
-
-#: ../plugins/groupwise-features/status-track.c:168
-msgid "Creation date:"
-msgstr "Erstellungsdatum:"
-
-#: ../plugins/groupwise-features/status-track.c:208
-msgid "Recipient: "
-msgstr "EmpfÃnger: "
-
-#: ../plugins/groupwise-features/status-track.c:215
-msgid "Delivered: "
-msgstr "Zugestellt: "
-
-#: ../plugins/groupwise-features/status-track.c:221
-msgid "Opened: "
-msgstr "GeÃffnet: "
-
-#: ../plugins/groupwise-features/status-track.c:226
-msgid "Accepted: "
-msgstr "Angenommen: "
-
-#: ../plugins/groupwise-features/status-track.c:231
-msgid "Deleted: "
-msgstr "GelÃscht: "
-
-#: ../plugins/groupwise-features/status-track.c:236
-msgid "Declined: "
-msgstr "Abgelehnt: "
-
-#: ../plugins/groupwise-features/status-track.c:241
-msgid "Completed: "
-msgstr "Abgeschlossen: "
-
-#: ../plugins/groupwise-features/status-track.c:246
-msgid "Undelivered: "
-msgstr "Nicht zugestellt: "
-
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 msgid "Inline Image"
 msgstr "Eingebettetes Bild"
@@ -17732,12 +17286,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:329
+#: ../plugins/imap-features/imap-headers.c:333
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "Benutzerdefinierte Kopfzeilen"
 
-#: ../plugins/imap-features/imap-headers.c:342
+#: ../plugins/imap-features/imap-headers.c:346
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "IMAP-Kopfzeilen"
@@ -17766,7 +17320,7 @@ msgstr ""
 
 #: ../plugins/imap-features/imap-headers.ui.h:8
 msgid ""
-"_Basic Headers - (Fastest) \n"
+"_Basic Headers (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
 msgstr ""
 "_Grundlegende Kopfzeilen - (Am schnellsten) \n"
@@ -17786,153 +17340,153 @@ msgstr "IMAP-Funktionen"
 
 #. Translators: The first '%s' is replaced with a calendar name,
 #. the second '%s' with an error message
-#: ../plugins/itip-formatter/itip-formatter.c:485
+#: ../plugins/itip-formatter/itip-formatter.c:490
 #, c-format
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "Der Kalender Â%s konnte nicht geladen werden (%s)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:677
+#: ../plugins/itip-formatter/itip-formatter.c:631
 #, 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:713
+#: ../plugins/itip-formatter/itip-formatter.c:655
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Der Termin wurde im Kalender Â%s gefunden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:799
+#: ../plugins/itip-formatter/itip-formatter.c:761
 msgid "Unable to find any calendars"
 msgstr "Es wurden keine Kalender gefunden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:806
+#: ../plugins/itip-formatter/itip-formatter.c:768
 msgid "Unable to find this meeting in any calendar"
 msgstr "Diese Besprechung wurde in keinem Kalender gefunden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:810
+#: ../plugins/itip-formatter/itip-formatter.c:772
 msgid "Unable to find this task in any task list"
 msgstr "Diese Aufgabe wurde in keiner Aufgabenliste gefunden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:814
+#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Unable to find this memo in any memo list"
 msgstr "Diese Notiz wurde in keiner Notizliste gefunden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:890
-msgid "Opening the calendar. Please wait.."
+#: ../plugins/itip-formatter/itip-formatter.c:1040
+msgid "Opening the calendar. Please wait..."
 msgstr "Kalender wird geÃffnet. Bitte warten â"
 
-#: ../plugins/itip-formatter/itip-formatter.c:893
+#: ../plugins/itip-formatter/itip-formatter.c:1043
 msgid "Searching for an existing version of this appointment"
 msgstr "Eine bestehende Version dieses Termins wird gesucht"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1176
+#: ../plugins/itip-formatter/itip-formatter.c:1316
 msgid "Unable to parse item"
 msgstr "Element kann nicht analysiert werden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1265
+#: ../plugins/itip-formatter/itip-formatter.c:1405
 #, 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:1277
+#: ../plugins/itip-formatter/itip-formatter.c:1417
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "In Kalender Â%s als ÂAngenommen eingetragen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1281
+#: ../plugins/itip-formatter/itip-formatter.c:1421
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "In Kalender Â%s als ÂVorlÃufig angenommen eingetragen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1286
+#: ../plugins/itip-formatter/itip-formatter.c:1426
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "In Kalender Â%s als ÂAbgelehnt eingetragen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1291
+#: ../plugins/itip-formatter/itip-formatter.c:1431
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "In Kalender Â%s als ÂAbgesagt eingetragen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1385
+#: ../plugins/itip-formatter/itip-formatter.c:1525
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Der Organisator hat den Vertreter %s entfernt "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1392
+#: ../plugins/itip-formatter/itip-formatter.c:1532
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Dem Vertreter wurde eine Absagenachricht zugestellt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1394
+#: ../plugins/itip-formatter/itip-formatter.c:1534
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Die Absagenachricht konnte dem Vertreter nicht zugestellt werden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1505
+#: ../plugins/itip-formatter/itip-formatter.c:1645
 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:1534
+#: ../plugins/itip-formatter/itip-formatter.c:1674
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Teilnehmer konnte nicht aktualisiert werden. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1538
+#: ../plugins/itip-formatter/itip-formatter.c:1678
 msgid "Attendee status updated"
 msgstr "Teilnehmerstatus aktualisiert"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1542
+#: ../plugins/itip-formatter/itip-formatter.c:1682
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Teilnahmestatus konnte nicht aktualisiert werden, da der Eintrag nicht mehr "
 "existiert"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1564
+#: ../plugins/itip-formatter/itip-formatter.c:1704
 msgid "Meeting information sent"
 msgstr "Besprechungsinformationen wurden verschickt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1567
+#: ../plugins/itip-formatter/itip-formatter.c:1707
 msgid "Task information sent"
 msgstr "Aufgabeninformationen wurden verschickt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1570
+#: ../plugins/itip-formatter/itip-formatter.c:1710
 msgid "Memo information sent"
 msgstr "Notizinformationen wurden verschickt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1579
+#: ../plugins/itip-formatter/itip-formatter.c:1719
 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:1582
+#: ../plugins/itip-formatter/itip-formatter.c:1722
 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:1585
+#: ../plugins/itip-formatter/itip-formatter.c:1725
 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:1650
+#: ../plugins/itip-formatter/itip-formatter.c:1790
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1655
+#: ../plugins/itip-formatter/itip-formatter.c:1795
 msgid "Save Calendar"
 msgstr "Kalender speichern"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1713
-#: ../plugins/itip-formatter/itip-formatter.c:1724
+#: ../plugins/itip-formatter/itip-formatter.c:1853
+#: ../plugins/itip-formatter/itip-formatter.c:1864
 msgid "The calendar attached is not valid"
 msgstr "Der beigelegte Kalender ist ungÃltig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1714
-#: ../plugins/itip-formatter/itip-formatter.c:1725
+#: ../plugins/itip-formatter/itip-formatter.c:1854
+#: ../plugins/itip-formatter/itip-formatter.c:1865
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17940,15 +17494,15 @@ msgstr ""
 "Die Nachricht gibt an, einen Kalender zu enthalten. Dieser Kalender ist "
 "jedoch kein gÃltiger iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1765
-#: ../plugins/itip-formatter/itip-formatter.c:1793
-#: ../plugins/itip-formatter/itip-formatter.c:1902
+#: ../plugins/itip-formatter/itip-formatter.c:1905
+#: ../plugins/itip-formatter/itip-formatter.c:1933
+#: ../plugins/itip-formatter/itip-formatter.c:2042
 msgid "The item in the calendar is not valid"
 msgstr "Das Element im Kalender ist ungÃltig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1766
-#: ../plugins/itip-formatter/itip-formatter.c:1794
-#: ../plugins/itip-formatter/itip-formatter.c:1903
+#: ../plugins/itip-formatter/itip-formatter.c:1906
+#: ../plugins/itip-formatter/itip-formatter.c:1934
+#: ../plugins/itip-formatter/itip-formatter.c:2043
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17956,11 +17510,11 @@ msgstr ""
 "Die Nachricht enthÃlt einen Kalender. Dieser beinhaltet allerdings keine "
 "Ereignisse, Aufgaben oder VerfÃgbarkeitsinformationen."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1807
+#: ../plugins/itip-formatter/itip-formatter.c:1947
 msgid "The calendar attached contains multiple items"
 msgstr "Der beigelegte Kalender enthÃlt mehrere Elemente."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1808
+#: ../plugins/itip-formatter/itip-formatter.c:1948
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17968,40 +17522,40 @@ msgstr ""
 "Um alle diese Elemente weiterzuverarbeiten, sollte die Datei gespeichert und "
 "der Kalender importiert werden."
 
-#: ../plugins/itip-formatter/itip-formatter.c:2470
+#: ../plugins/itip-formatter/itip-formatter.c:2606
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Keine"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2486
+#: ../plugins/itip-formatter/itip-formatter.c:2622
 msgid "Tentatively Accepted"
 msgstr "VorlÃufig angenommen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2604
+#: ../plugins/itip-formatter/itip-formatter.c:2740
 msgid "This meeting recurs"
 msgstr "Diese Besprechung wird wiederholt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2607
+#: ../plugins/itip-formatter/itip-formatter.c:2743
 msgid "This task recurs"
 msgstr "Diese Aufgabe wird wiederholt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2610
+#: ../plugins/itip-formatter/itip-formatter.c:2746
 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:2844
+#: ../plugins/itip-formatter/itip-formatter.c:2990
 msgid "_Delete message after acting"
 msgstr "_LÃschen der Nachricht nach Abarbeitung"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2854
-#: ../plugins/itip-formatter/itip-formatter.c:2887
+#: ../plugins/itip-formatter/itip-formatter.c:3000
+#: ../plugins/itip-formatter/itip-formatter.c:3033
 msgid "Conflict Search"
 msgstr "Konfliktsuche"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2869
+#: ../plugins/itip-formatter/itip-formatter.c:3015
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Kalender zur Suche nach Besprechungskonflikten auswÃhlen"
 
@@ -18520,81 +18074,62 @@ msgid "Beep or play sound file."
 msgstr "Signalton ausgeben oder Klangdatei abspielen."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
-msgid "Enable D-Bus messages."
-msgstr "Aktiviert D-Bus-Nachrichten."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Enable icon in notification area."
 msgstr "Symbol im Benachrichtigungsfeld aktivieren."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
-msgid "Generates a D-Bus message when new mail messages arrive."
-msgstr "Erzeugung einer D-Bus-Nachricht, wenn eine neue E-Mail eintrifft."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid ""
 "If \"true\", then beep, otherwise will play sound file when new messages "
 "arrive."
 msgstr ""
-"Legt fest, ob beim Eintreffen neuer Nachrichten ein Signalton ausgegeben "
-"wird (ÂTRUEÂ) oder eine Klangdatei abgespielt wird (ÂFALSEÂ)."
+"Legt fest, ob beim Eintreffen neuer Nachrichten ein Signalton ausgegeben wird "
+"(ÂTRUEÂ) oder eine Klangdatei abgespielt wird (ÂFALSEÂ)."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
 msgid "Notify new messages for Inbox only."
 msgstr "Nur Ãber neue Nachrichten im Eingangsordner benachrichtigen."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
 msgid "Play sound when new messages arrive."
 msgstr "Beim Eintreffen neuer E-Mails Klang abspielen"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
 msgid "Play themed sound when new messages arrive, if not in beep mode."
 msgstr ""
 "Das beim Eintreffen neuer Nachrichten zum Abspielen verwendete Klangthema, "
 "falls nicht im Signalton-Modus."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
-msgid "Popup message together with the icon."
-msgstr "Popup-Fenster zusammen mit dem Symbol anzeigen."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Show new mail icon in notification area when new messages arrive."
-msgstr ""
-"Symbol im Benachrichtigungsfeld beim Eintreffen neuer E-Mails anzeigen."
+msgstr "Symbol im Benachrichtigungsfeld beim Eintreffen neuer E-Mails anzeigen."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
 msgid "Sound file name to be played."
 msgstr "Name der abzuspielenden Klangdatei."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
 msgstr ""
 "Die beim Eintreffen neuer Nachrichten abzuspielende Klangdatei, falls nicht "
 "im Signalton-Modus."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Use sound theme"
 msgstr "Klangthema verwenden"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Whether play sound or beep when new messages arrive."
 msgstr ""
 "Legt fest, ob eine Klangdatei abgespielt oder ein Signalton ausgegeben wird, "
 "wenn neue Nachrichten eintreffen."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
-msgid "Whether show message over the icon when new messages arrive."
-msgstr ""
-"Legt fest, ob eine Popup-Nachricht zusammen mit dem Symbol angezeigt werden "
-"soll, wenn neue Nachrichten eintreffen."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr ""
 "Legt fest, ob nur Ãber Nachrichten im Eingangsordner benachrichtigt werden "
 "soll."
 
-#: ../plugins/mail-notification/mail-notification.c:398
+#: ../plugins/mail-notification/mail-notification.c:394
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18609,68 +18144,60 @@ msgstr[1] ""
 "Sie haben %d neue Nachrichten\n"
 "im %s."
 
-#. Translators: "From:" is preceding a new mail
-#. * sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:410
-#, c-format
-msgid "From: %s"
-msgstr "Von: %s"
-
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:423
+#: ../plugins/mail-notification/mail-notification.c:419
 #, c-format
 msgid "Subject: %s"
 msgstr "Betreff: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:433
+#: ../plugins/mail-notification/mail-notification.c:430
 #, 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:446
-#: ../plugins/mail-notification/mail-notification.c:454
-#: ../plugins/mail-notification/mail-notification.c:457
+#: ../plugins/mail-notification/mail-notification.c:439
+#: ../plugins/mail-notification/mail-notification.c:447
+#: ../plugins/mail-notification/mail-notification.c:450
 msgid "New email"
 msgstr "Neue E-Mail"
 
-#: ../plugins/mail-notification/mail-notification.c:506
-msgid "Show icon in _notification area"
-msgstr "Symbol im _Benachrichtigungsfeld anzeigen"
-
-#: ../plugins/mail-notification/mail-notification.c:536
-msgid "Popup _message together with the icon"
-msgstr "Popup-_Nachricht zusammen mit Symbol anzeigen"
+#. Translators: The '%s' is a mail
+#. * folder name.  (e.g. "Show Inbox")
+#: ../plugins/mail-notification/mail-notification.c:471
+#, c-format
+msgid "Show %s"
+msgstr "%s anzeigen"
 
-#: ../plugins/mail-notification/mail-notification.c:723
-msgid "_Play sound when new messages arrive"
+#: ../plugins/mail-notification/mail-notification.c:673
+msgid "_Play sound when a new message arrives"
 msgstr "Beim Eintreffen neuer E-Mails _Klang abspielen"
 
-#: ../plugins/mail-notification/mail-notification.c:753
+#: ../plugins/mail-notification/mail-notification.c:703
 msgid "_Beep"
 msgstr "_Signalton ausgeben"
 
-#: ../plugins/mail-notification/mail-notification.c:766
+#: ../plugins/mail-notification/mail-notification.c:716
 msgid "Use sound _theme"
 msgstr "Klang_thema verwenden"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:735
 msgid "Play _file:"
 msgstr "Klang_datei abspielen:"
 
-#: ../plugins/mail-notification/mail-notification.c:796
+#: ../plugins/mail-notification/mail-notification.c:744
 msgid "Select sound file"
 msgstr "Klangdatei auswÃhlen"
 
-#: ../plugins/mail-notification/mail-notification.c:854
+#: ../plugins/mail-notification/mail-notification.c:801
 msgid "Notify new messages for _Inbox only"
 msgstr "Nur Ãber neue Nachrichten im _Eingangsordner benachrichtigen."
 
-#: ../plugins/mail-notification/mail-notification.c:863
-msgid "Generate a _D-Bus message"
-msgstr "Eine _D-Bus-Nachricht erzeugen"
+#: ../plugins/mail-notification/mail-notification.c:811
+msgid "Show _notification when a new message arrives"
+msgstr "Symbol im Be_nachrichtigungsfeld beim Eintreffen neuer E-Mails anzeigen"
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid "Mail Notification"
@@ -18681,141 +18208,88 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Beim Eintreffen neuer E-Mails benachrichtigen"
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john doe myco example>"
-#: ../plugins/mail-to-task/mail-to-task.c:157
+#: ../plugins/mail-to-task/mail-to-task.c:235
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Erstellt aus einer Nachricht an %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:490
+#: ../plugins/mail-to-task/mail-to-task.c:586
 #, c-format
 msgid ""
-"Selected calendar contains event '%s' already. Would you like to edit the "
-"old event?"
+"Selected calendar contains event '%s' already. Would you like to edit the old "
+"event?"
 msgstr ""
 "Der ausgewÃhlte Kalender enthÃlt bereits das Ereignis Â%sÂ. MÃchten Sie das "
 "alte Ereignis bearbeiten?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:493
+#: ../plugins/mail-to-task/mail-to-task.c:589
 #, c-format
 msgid ""
-"Selected task list contains task '%s' already. Would you like to edit the "
-"old task?"
+"Selected task list contains task '%s' already. Would you like to edit the old "
+"task?"
 msgstr ""
 "Die ausgewÃhlte Aufgabenliste enthÃlt bereits die Aufgabe Â%sÂ. MÃchten Sie "
 "die alte Aufgabe bearbeiten?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:496
+#: ../plugins/mail-to-task/mail-to-task.c:592
 #, c-format
 msgid ""
-"Selected memo list contains memo '%s' already. Would you like to edit the "
-"old memo?"
+"Selected memo list contains memo '%s' already. Would you like to edit the old "
+"memo?"
 msgstr ""
 "Die ausgewÃhlte Notizliste enthÃlt bereits die Notiz Â%sÂ. MÃchten Sie die "
 "alte Notiz bearbeiten?"
 
-#. 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:516
+#: ../plugins/mail-to-task/mail-to-task.c:609
+#, c-format
 msgid ""
-"Selected calendar contains some events for the given mails already. Would "
-"you like to create new events anyway?"
+"You have selected %d mails to be converted to events. Do you really want to "
+"add them all?"
 msgstr ""
-"Der ausgewÃhlte Kalender enthÃlt bereits einige Ereignisse fÃr die "
-"vorliegenden E-Mails. MÃchten Sie dennoch neue Ereignisse erstellen?"
+"Sie haben %d Nachrichten ausgewÃhlt, die in Ereignisse umgewandelt werden "
+"sollen. Wollen Sie diese wirklich alle hinzufÃgen?"
 
-#. 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:522
+#: ../plugins/mail-to-task/mail-to-task.c:612
+#, c-format
 msgid ""
-"Selected task list contains some tasks for the given mails already. Would "
-"you like to create new tasks anyway?"
+"You have selected %d mails to be converted to tasks. Do you really want to "
+"add them all?"
 msgstr ""
-"Die ausgewÃhlte Aufgabenliste enthÃlt bereits einige Aufgaben fÃr die "
-"vorliegenden E-Mails. MÃchten Sie dennoch neue Aufgaben erstellen?"
+"Sie haben %d Nachrichten ausgewÃhlt, die in Aufgaben umgewandelt werden "
+"sollen. Wollen Sie diese wirklich alle hinzufÃgen?"
 
-#. 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:528
+#: ../plugins/mail-to-task/mail-to-task.c:615
+#, c-format
 msgid ""
-"Selected memo list contains some memos for the given mails already. Would "
-"you like to create new memos anyway?"
+"You have selected %d mails to be converted to memos. Do you really want to "
+"add them all?"
 msgstr ""
-"Die ausgewÃhlte Notizliste enthÃlt bereits einige Notizen fÃr die "
-"vorliegenden E-Mails. MÃchten Sie dennoch neue Notizen erstellen?"
-
-#. 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:549
-msgid ""
-"Selected calendar contains an event for the given mail already. Would you "
-"like to create new event anyway?"
-msgid_plural ""
-"Selected calendar contains events for the given mails already. Would you "
-"like to create new events anyway?"
-msgstr[0] ""
-"Der ausgewÃhlte Kalender enthÃlt bereits ein Ereignis fÃr die vorliegende E-"
-"Mail. MÃchten Sie dennoch ein neues Ereignis erstellen?"
-msgstr[1] ""
-"Der ausgewÃhlte Kalender enthÃlt bereits Ereignisse fÃr die vorliegenden E-"
-"Mails. MÃchten Sie dennoch neue Ereignisse erstellen?"
-
-#. 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:558
-msgid ""
-"Selected task list contains a task for the given mail already. Would you "
-"like to create new task anyway?"
-msgid_plural ""
-"Selected task list contains tasks for the given mails already. Would you "
-"like to create new tasks anyway?"
-msgstr[0] ""
-"Die ausgewÃhlte Aufgabenliste enthÃlt bereits eine Aufgabe fÃr die "
-"vorliegende E-Mail. MÃchten Sie dennoch eine neue Aufgabe erstellen?"
-msgstr[1] ""
-"Die ausgewÃhlte Aufgabenliste enthÃlt bereits einige Aufgaben fÃr die "
-"vorliegenden E-Mails. MÃchten Sie dennoch neue Aufgaben erstellen?"
+"Sie haben %d Nachrichten ausgewÃhlt, die in Notizen umgewandelt werden "
+"sollen. Wollen Sie diese wirklich alle hinzufÃgen?"
 
-#. 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:567
-msgid ""
-"Selected memo list contains a memo for the given mail already. Would you "
-"like to create new memo anyway?"
-msgid_plural ""
-"Selected memo list contains memos for the given mails already. Would you "
-"like to create new memos anyway?"
-msgstr[0] ""
-"Die ausgewÃhlte Notizliste enthÃlt bereits eine Notiz fÃr die vorliegende E-"
-"Mail. MÃchten Sie dennoch eine neue Notiz erstellen?"
-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:634
+msgid "Do you wish to continue converting remaining mails?"
+msgstr "Soll die Umwandlung der verbleibenden Nachrichten fortgesetzt werden?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:626
+#: ../plugins/mail-to-task/mail-to-task.c:709
 msgid "[No Summary]"
 msgstr "[Keine Zusammenfassung]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:637
+#: ../plugins/mail-to-task/mail-to-task.c:721
 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:708
+#: ../plugins/mail-to-task/mail-to-task.c:771
 #, 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:737
+#: ../plugins/mail-to-task/mail-to-task.c:796
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Kalender konnte nicht geÃffnet werden. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:744
+#: ../plugins/mail-to-task/mail-to-task.c:803
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -18823,7 +18297,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:747
+#: ../plugins/mail-to-task/mail-to-task.c:806
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18831,7 +18305,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:750
+#: ../plugins/mail-to-task/mail-to-task.c:809
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -18839,40 +18313,44 @@ 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:956
+#: ../plugins/mail-to-task/mail-to-task.c:1045
 #, 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:1075
+#: ../plugins/mail-to-task/mail-to-task.c:1104
+msgid "No writable calendar is available."
+msgstr "Keine schreibbarer Kalender verfÃgbar."
+
+#: ../plugins/mail-to-task/mail-to-task.c:1196
 msgid "Create an _Event"
 msgstr "Ein _Ereignis anlegen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1077
+#: ../plugins/mail-to-task/mail-to-task.c:1198
 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:1082
+#: ../plugins/mail-to-task/mail-to-task.c:1203
 msgid "Create a Mem_o"
 msgstr "Eine _Notiz anlegen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1084
+#: ../plugins/mail-to-task/mail-to-task.c:1205
 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:1089
+#: ../plugins/mail-to-task/mail-to-task.c:1210
 msgid "Create a _Task"
 msgstr "Eine _Aufgabe anlegen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1091
+#: ../plugins/mail-to-task/mail-to-task.c:1212
 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:1099
+#: ../plugins/mail-to-task/mail-to-task.c:1220
 msgid "Create a _Meeting"
 msgstr "Eine _Besprechung anlegen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1101
+#: ../plugins/mail-to-task/mail-to-task.c:1222
 msgid "Create a new meeting from the selected message"
 msgstr "Eine neue Besprechung mit Hilfe der gewÃhlten Nachricht anlegen"
 
@@ -18880,56 +18358,56 @@ msgstr "Eine neue Besprechung mit Hilfe der gewÃhlten Nachricht anlegen"
 msgid "Convert a mail message to a task."
 msgstr "Eine Nachricht in eine neue Aufgabe umwandeln."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:294
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:345
 msgid "Get List _Archive"
 msgstr "Listen_archiv abrufen"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:296
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:347
 msgid "Get an archive of the list this message belongs to"
 msgstr "Ein Archiv der Mailingliste dieser Nachricht abrufen"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:301
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:352
 msgid "Get List _Usage Information"
 msgstr "Ben_utzungsinformationen der Liste abrufen"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:303
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:354
 msgid "Get information about the usage of the list this message belongs to"
 msgstr ""
 "Informationen Ãber die Nutzung der Mailingliste dieser Nachricht abrufen"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:308
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:359
 msgid "Contact List _Owner"
 msgstr "Kontaktlisten_besitzer"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:310
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:361
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "Kontakt zum Eigner der Mailingliste dieser Nachricht aufnehmen"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:315
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:366
 msgid "_Post Message to List"
 msgstr "_Nachricht an Liste schicken"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:317
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:368
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "Eine Nachricht an die Mailingliste der gewÃhlten Nachricht verfassen"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:322
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:373
 msgid "_Subscribe to List"
 msgstr "Liste _abonnieren"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:324
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:375
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "Die Mailingliste der gewÃhlten Nachricht abonnieren"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:329
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:380
 msgid "_Unsubscribe from List"
 msgstr "Liste _abbestellen"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:331
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:382
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "Die Mailingliste der gewÃhlten Nachricht abbestellen"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:338
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:389
 msgid "Mailing _List"
 msgstr "Mailing_liste"
 
@@ -18977,9 +18455,9 @@ msgid ""
 "Posting to this mailing list is not allowed. Possibly, this is a read-only "
 "mailing list. Contact the list owner for details."
 msgstr ""
-"VerÃffentlichungen auf dieser Mailingliste sind nicht erlaubt. "
-"MÃglicherweise ist diese Liste nur zum Lesen gedacht. Um Einzelheiten "
-"darÃber zu erfahren, nehmen Sie bitte Kontakt zum Eigner dieser Liste auf."
+"VerÃffentlichungen auf dieser Mailingliste sind nicht erlaubt. MÃglicherweise "
+"ist diese Liste nur zum Lesen gedacht. Um Einzelheiten darÃber zu erfahren, "
+"nehmen Sie bitte Kontakt zum Eigner dieser Liste auf."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 msgid "Send e-mail message to mailing list?"
@@ -18987,8 +18465,8 @@ msgstr "Die Nachricht an die Mailingliste schicken?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
-"The action could not be performed. The header for this action did not "
-"contain any action that could be processed.\n"
+"The action could not be performed. The header for this action did not contain "
+"any action that could be processed.\n"
 "\n"
 "Header: {0}"
 msgstr ""
@@ -19010,8 +18488,7 @@ msgstr ""
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
 msgid ""
-"This message does not contain the header information required for this "
-"action."
+"This message does not contain the header information required for this action."
 msgstr ""
 "Diese Nachricht enthÃlt nicht die benÃtigten Kopfdaten, die zur AusfÃhrung "
 "dieser Aktion notwendig sind."
@@ -19036,15 +18513,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:193
+#: ../plugins/mark-all-read/mark-all-read.c:213
 msgid "In Current Folder and _Subfolders"
 msgstr "Im derzeitigen Ordner und in _Unterordnern"
 
-#: ../plugins/mark-all-read/mark-all-read.c:207
+#: ../plugins/mark-all-read/mark-all-read.c:227
 msgid "In Current _Folder Only"
 msgstr "Nur im _derzeitigen Ordner"
 
-#: ../plugins/mark-all-read/mark-all-read.c:444
+#: ../plugins/mark-all-read/mark-all-read.c:565
 msgid "Mark Me_ssages as Read"
 msgstr "Nachrichten als gelesen _markieren"
 
@@ -19109,15 +18586,6 @@ msgstr "_UnterdrÃckte HTML-Teile als AnhÃnge anzeigen"
 msgid "HTML _Mode"
 msgstr "HTML-_Modus"
 
-#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
-msgid "Evolution Profiler"
-msgstr "Evolution-Profiler"
-
-#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
-msgid "Profile data events in Evolution (for developers only)."
-msgstr ""
-"Effizienzanalyse von Datenereignissen in Evolution (nur fÃr Entwickler)."
-
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Import Outlook messages from PST file"
 msgstr "Outlook-Nachrichten aus einer PST-Datei importieren"
@@ -19130,35 +18598,35 @@ msgstr "Outlook PST-Importeur"
 msgid "Outlook personal folders (.pst)"
 msgstr "PersÃnliche Outlook-Ordner (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:352
+#: ../plugins/pst-import/pst-importer.c:351
 msgid "_Mail"
 msgstr "_E-Mail"
 
-#: ../plugins/pst-import/pst-importer.c:368
+#: ../plugins/pst-import/pst-importer.c:369
 msgid "Destination folder:"
 msgstr "Zielordner:"
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:374
+#: ../plugins/pst-import/pst-importer.c:375
 msgid "_Address Book"
 msgstr "_Adressbuch"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:381
+#: ../plugins/pst-import/pst-importer.c:382
 msgid "A_ppointments"
 msgstr "_Termine"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:387 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:388 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Aufgaben"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:393
+#: ../plugins/pst-import/pst-importer.c:394
 msgid "_Journal entries"
 msgstr "_Journal-EintrÃge"
 
-#: ../plugins/pst-import/pst-importer.c:408
+#: ../plugins/pst-import/pst-importer.c:409
 msgid "Importing Outlook data"
 msgstr "Outlook-Daten werden importiert"
 
@@ -19311,161 +18779,104 @@ msgstr "_Benutzername:"
 msgid "iCal"
 msgstr "iCal"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:69
-#: ../plugins/publish-calendar/publish-format-ical.c:82
+#: ../plugins/publish-calendar/publish-format-fb.c:88
+#: ../plugins/publish-calendar/publish-format-ical.c:86
 #, c-format
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr ""
 "Kalender konnte nicht verÃffentlicht werden: Das Backend ist nicht mehr "
 "vorhanden"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:484
+#: ../plugins/publish-calendar/url-editor-dialog.c:487
 msgid "New Location"
 msgstr "Neuer Ort"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:486
+#: ../plugins/publish-calendar/url-editor-dialog.c:489
 msgid "Edit Location"
 msgstr "Ort bearbeiten"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
-#, c-format
-msgid "SpamAssassin not found, code: %d"
-msgstr "SpamAssassin nicht gefunden, Fehler-Code: %d"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:144
-#, c-format
-msgid "Failed to create pipe: %s"
-msgstr "Weiterleitung konnte nicht angelegt werden: %s"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:183
-#, c-format
-msgid "Error after fork: %s"
-msgstr "Fehler nach Fork: %s"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:241
-#, 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:243
-#, 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:252
-#, 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:519
-#, 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:936
-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:944
-msgid "I_nclude remote tests"
-msgstr "ZusÃtzliche _Ferntests durchfÃhren"
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid "Filter junk messages using SpamAssassin."
-msgstr "UnerwÃnschte Nachrichten mit SpamAssassin filtern."
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin Junk Filter"
-msgstr "SpamAssassin-UnerwÃnscht-Filter"
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "SpamAssassin Options"
-msgstr "SpamAssassin-Optionen"
-
-#.
-#. * Translator: the %F %T is the thirth argument for a strftime function.
-#. * It lets you define the formatting of the date in the csv-file.
-#. *
-#: ../plugins/save-calendar/csv-format.c:161
+#. Translators: the %F %T is the third argument for a
+#. * strftime function.  It lets you define the formatting
+#. * of the date in the csv-file.
+#: ../plugins/save-calendar/csv-format.c:160
 msgid "%F %T"
 msgstr "%d.%m.%Y %T"
 
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "Description List"
 msgstr "Beschreibungsliste"
 
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Categories List"
 msgstr "Kategorienliste"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "Comment List"
 msgstr "Kommentarliste"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Contact List"
 msgstr "Kontaktliste"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Start"
 msgstr "Anfang"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:378
 msgid "End"
 msgstr "Ende"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:379
 msgid "Due"
 msgstr "FÃllig"
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:380
 msgid "percent Done"
 msgstr "Prozent abgeschlossen"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:382
 msgid "URL"
 msgstr "Adresse"
 
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../plugins/save-calendar/csv-format.c:383
 msgid "Attendees List"
 msgstr "Teilnehmerliste"
 
-#: ../plugins/save-calendar/csv-format.c:378
+#: ../plugins/save-calendar/csv-format.c:385
 msgid "Modified"
 msgstr "GeÃndert"
 
-#: ../plugins/save-calendar/csv-format.c:530
+#: ../plugins/save-calendar/csv-format.c:560
 msgid "A_dvanced options for the CSV format"
 msgstr "Er_weiterte Einstellungen fÃr das CSV-Format"
 
-#: ../plugins/save-calendar/csv-format.c:537
+#: ../plugins/save-calendar/csv-format.c:568
 msgid "Prepend a _header"
 msgstr "Einen _Kopf voranstellen"
 
-#: ../plugins/save-calendar/csv-format.c:546
+#: ../plugins/save-calendar/csv-format.c:577
 msgid "_Value delimiter:"
 msgstr "_Variablentrennzeichen:"
 
-#: ../plugins/save-calendar/csv-format.c:553
+#: ../plugins/save-calendar/csv-format.c:588
 msgid "_Record delimiter:"
 msgstr "_Eintragstrennzeichen:"
 
-#: ../plugins/save-calendar/csv-format.c:560
+#: ../plugins/save-calendar/csv-format.c:599
 msgid "_Encapsulate values with:"
 msgstr "Variablen _einschlieÃen in:"
 
-#: ../plugins/save-calendar/csv-format.c:582
-msgid "Comma separated value format (.csv)"
-msgstr "Mit Kommata getrennte Variablen (.csv)"
+#: ../plugins/save-calendar/csv-format.c:625
+msgid "Comma separated values (.csv)"
+msgstr "Mit Kommata getrennte Werte (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:162
-msgid "iCalendar format (.ics)"
-msgstr "iCalendar-Format (.ics)"
+#: ../plugins/save-calendar/ical-format.c:166 ../shell/e-shell-utils.c:225
+msgid "iCalendar (.ics)"
+msgstr "iCalendar (.ics)"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
@@ -19473,8 +18884,7 @@ msgstr "Auswahl speichern"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
 msgid "Save a calendar or task list to disk."
-msgstr ""
-"Einen Kalender oder eine Aufgabenliste auf einem DatentrÃger speichern."
+msgstr "Einen Kalender oder eine Aufgabenliste auf einem DatentrÃger speichern."
 
 #.
 #. * Translator: the %FT%T is the thirth argument for a strftime function.
@@ -19485,27 +18895,27 @@ msgstr ""
 msgid "%FT%T"
 msgstr "%d.%m.%YT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:369
-msgid "RDF format (.rdf)"
+#: ../plugins/save-calendar/rdf-format.c:375
+msgid "RDF (.rdf)"
 msgstr "RDF-Format (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:120
+#: ../plugins/save-calendar/save-calendar.c:122
 msgid "_Format:"
 msgstr "_Format:"
 
-#: ../plugins/save-calendar/save-calendar.c:181
+#: ../plugins/save-calendar/save-calendar.c:183
 msgid "Select destination file"
 msgstr "Zieldatei wÃhlen"
 
-#: ../plugins/save-calendar/save-calendar.c:334
+#: ../plugins/save-calendar/save-calendar.c:336
 msgid "Save the selected calendar to disk"
 msgstr "Den gewÃhlten Kalender auf einem DatentrÃger speichern"
 
-#: ../plugins/save-calendar/save-calendar.c:365
+#: ../plugins/save-calendar/save-calendar.c:367
 msgid "Save the selected memo list to disk"
 msgstr "Die gewÃhlte Notizliste auf einem DatentrÃger speichern"
 
-#: ../plugins/save-calendar/save-calendar.c:396
+#: ../plugins/save-calendar/save-calendar.c:398
 msgid "Save the selected task list to disk"
 msgstr "Die gewÃhlte Aufgabenliste auf einem DatentrÃger speichern."
 
@@ -19518,18 +18928,25 @@ msgstr ""
 "Nachrichtentext ersetzen soll."
 
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-msgid "Drafts based template plugin"
-msgstr "Vorlagen-Plugin basierend auf EntwÃrfen"
+msgid ""
+"Drafts based template plugin. You can use variables like $ORIG[subject], $ORIG"
+"[from], $ORIG[to] or $ORIG[body], which will be replaced by values from an "
+"email you are replying to."
+msgstr ""
+"Auf EntwÃrfen basierendes Vorlagen-Plugin. Sie kÃnnen Variablen wie $ORIG"
+"[subject], $ORIG[from], $ORIG[to] oder $ORIG[body] verwenden. Diese werden "
+"durch die entsprechenden Werte aus einer Nachricht ersetzt, auf die Sie "
+"antworten."
 
-#: ../plugins/templates/templates.c:635
+#: ../plugins/templates/templates.c:1066
 msgid "No Title"
 msgstr "Kein Titel"
 
-#: ../plugins/templates/templates.c:746
+#: ../plugins/templates/templates.c:1167
 msgid "Save as _Template"
 msgstr "Als V_orlage speichern"
 
-#: ../plugins/templates/templates.c:748
+#: ../plugins/templates/templates.c:1169
 msgid "Save as Template"
 msgstr "Als Vorlage speichern"
 
@@ -19549,27 +18966,27 @@ msgstr "Eingebettete vCards"
 msgid "Show vCards directly in mail messages."
 msgstr "vCards innerhalb von Nachrichten anzeigen."
 
-#: ../plugins/vcard-inline/vcard-inline.c:198
-#: ../plugins/vcard-inline/vcard-inline.c:283
+#: ../plugins/vcard-inline/vcard-inline.c:200
+#: ../plugins/vcard-inline/vcard-inline.c:285
 msgid "Show Full vCard"
 msgstr "Gesamte VCard anzeigen"
 
-#: ../plugins/vcard-inline/vcard-inline.c:201
+#: ../plugins/vcard-inline/vcard-inline.c:203
 msgid "Show Compact vCard"
 msgstr "Kompakt-VCard anzeigen"
 
-#: ../plugins/vcard-inline/vcard-inline.c:262
+#: ../plugins/vcard-inline/vcard-inline.c:264
 msgid "There is one other contact."
 msgstr "Es gibt einen weiteren Kontakt."
 
-#: ../plugins/vcard-inline/vcard-inline.c:271
+#: ../plugins/vcard-inline/vcard-inline.c:273
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "Es gibt %d weiteren Kontakt."
 msgstr[1] "Es gibt %d weitere Kontakte."
 
-#: ../plugins/vcard-inline/vcard-inline.c:292
+#: ../plugins/vcard-inline/vcard-inline.c:294
 msgid "Save in Address Book"
 msgstr "In Adressbuch speichern"
 
@@ -19581,15 +18998,15 @@ msgstr "WebDAV-Kontakte zu Evolution hinzufÃgen."
 msgid "WebDAV contacts"
 msgstr "WebDAV-Kontakte"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:68
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:67
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:256
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:255
 msgid "URL:"
 msgstr "Adresse:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:282
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:281
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "IfMatch _vermeiden (benÃtigt von Apache < 2.2.8)"
 
@@ -19756,7 +19173,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:371
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:314
 msgid "Start in offline mode"
 msgstr "Im Offline-Modus starten"
 
@@ -19769,8 +19186,8 @@ msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
 msgstr ""
-"Die Konfigurationsversion von Evolution mit Haupt-, Unter- und "
-"Konfigurations-Stufe (z.B. Â2.6.0Â)."
+"Die Konfigurationsversion von Evolution mit Haupt-, Unter- und Konfigurations-"
+"Stufe (z.B. Â2.6.0Â)."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The default X coordinate for the main window."
@@ -19818,8 +19235,8 @@ msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
 msgstr ""
-"Der Port des in Â/apps/evolution/shell/network_config/http_host "
-"festgelegten Proxys."
+"Der Port des in Â/apps/evolution/shell/network_config/http_host festgelegten "
+"Proxys."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid ""
@@ -19840,12 +19257,12 @@ msgstr ""
 #: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
-"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
-"by the GNOME toolbar setting."
+"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined by "
+"the GNOME toolbar setting."
 msgstr ""
-"Der Stil der FensterknÃpfe. MÃgliche Einstellungen sind ÂtextÂ, ÂiconsÂ, Âboth "
-"und ÂtoolbarÂ. Wenn Âtoolbar gesetzt wurde, wird der Stil anhand der GNOME-"
-"Einstellungen festgelegt."
+"Der Stil der FensterknÃpfe. MÃgliche Einstellungen sind ÂtextÂ, ÂiconsÂ, "
+"Âboth und ÂtoolbarÂ. Wenn Âtoolbar gesetzt wurde, wird der Stil anhand der "
+"GNOME-Einstellungen festgelegt."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid ""
@@ -19873,8 +19290,8 @@ msgid "Use HTTP proxy"
 msgstr "HTTP-Proxy verwenden"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "User name to pass as authentication when doing HTTP proxying."
-msgstr "Benutzername fÃr Legitimation an HTTP-Proxy"
+msgid "Username to pass as authentication when doing HTTP proxying."
+msgstr "Benutzername fÃr Legitimation an HTTP-Proxy."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether Evolution will start up in offline mode instead of online mode."
@@ -19914,11 +19331,11 @@ msgstr "Fensterknopfstil"
 msgid "Window buttons are visible"
 msgstr "FensterknÃpfe sind sichtbar"
 
-#: ../shell/e-shell-content.c:698 ../shell/e-shell-content.c:699
+#: ../shell/e-shell-content.c:729 ../shell/e-shell-content.c:730
 msgid "Searches"
 msgstr "Suchen"
 
-#: ../shell/e-shell-content.c:742
+#: ../shell/e-shell-content.c:773
 msgid "Save Search"
 msgstr "Suche speichern"
 
@@ -19926,42 +19343,38 @@ 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:935
+#: ../shell/e-shell-searchbar.c:938
 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:968
+#: ../shell/e-shell-searchbar.c:971
 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:1031
+#: ../shell/e-shell-searchbar.c:1034
 msgid "i_n"
 msgstr " _in "
 
-#: ../shell/e-shell-utils.c:255
+#: ../shell/e-shell-utils.c:223
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:257
-msgid "iCalendar (.ics)"
-msgstr "iCalendar (.ics)"
-
-#: ../shell/e-shell-utils.c:278
+#: ../shell/e-shell-utils.c:246
 msgid "All Files (*)"
 msgstr "Alle Dateien (*)"
 
-#: ../shell/e-shell-view.c:291
+#: ../shell/e-shell-view.c:295
 msgid "Saving user interface state"
 msgstr "Zustand der Benutzerschnittstelle wird gespeichert"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:643
+#: ../shell/e-shell-window-actions.c:648
 msgid "translator-credits"
 msgstr ""
 "Kai Lahmann <kl linuxfaqs de>\n"
@@ -19973,269 +19386,281 @@ msgstr ""
 "Christian Kintner <mail christian-kintner de>\n"
 "Andre Klapper <ak-47 gmx net>\n"
 "Christian Kirbach <christian kirbach googlemail com>\n"
-"Mario BlÃttermann <mariobl gnome org>\n"
+"Mario BlÃttermann <mariobl freenet de>\n"
 "Paul Seyfert <pseyfert mathphys fsk uni-heidelberg de>"
 
-#: ../shell/e-shell-window-actions.c:654
+#: ../shell/e-shell-window-actions.c:659
 msgid "Evolution Website"
 msgstr "Evolution-Webseite"
 
-#: ../shell/e-shell-window-actions.c:1215
+#: ../shell/e-shell-window-actions.c:921
+msgid "Categories Editor"
+msgstr "Kategorien-Editor"
+
+#: ../shell/e-shell-window-actions.c:1256
 msgid "Bug Buddy is not installed."
 msgstr "Bug-Buddy ist nicht installiert."
 
-#: ../shell/e-shell-window-actions.c:1217
+#: ../shell/e-shell-window-actions.c:1258
 msgid "Bug Buddy could not be run."
 msgstr "Bug-Buddy konnte nicht gestartet werden."
 
-#: ../shell/e-shell-window-actions.c:1398
+#: ../shell/e-shell-window-actions.c:1439
 msgid "Show information about Evolution"
 msgstr "Informationen zu Evolution anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1403
-#: ../shell/e-shell-window-actions.c:1417
+#: ../shell/e-shell-window-actions.c:1444
+#: ../shell/e-shell-window-actions.c:1458
 msgid "_Close Window"
 msgstr "Fenster s_chlieÃen"
 
-#: ../shell/e-shell-window-actions.c:1424
+#: ../shell/e-shell-window-actions.c:1465
 msgid "_Contents"
 msgstr "_Inhalte"
 
-#: ../shell/e-shell-window-actions.c:1426
+#: ../shell/e-shell-window-actions.c:1467
 msgid "Open the Evolution User Guide"
 msgstr "Das Benutzerhandbuch von Evolution Ãffnen"
 
-#: ../shell/e-shell-window-actions.c:1452
+#: ../shell/e-shell-window-actions.c:1493
 msgid "Evolution _FAQ"
 msgstr "HÃufig gestellte _Fragen"
 
-#: ../shell/e-shell-window-actions.c:1454
+#: ../shell/e-shell-window-actions.c:1495
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "Ãffnet die Webseite mit den am hÃufigsten gestellten Fragen"
 
-#: ../shell/e-shell-window-actions.c:1459
+#: ../shell/e-shell-window-actions.c:1500
 msgid "_Forget Passwords"
 msgstr "PasswÃrter ver_werfen"
 
-#: ../shell/e-shell-window-actions.c:1461
+#: ../shell/e-shell-window-actions.c:1502
 msgid "Forget all remembered passwords"
 msgstr "Alle gemerkten PasswÃrter verwerfen"
 
-#: ../shell/e-shell-window-actions.c:1466
+#: ../shell/e-shell-window-actions.c:1507
 msgid "I_mport..."
 msgstr "Impor_tieren â"
 
-#: ../shell/e-shell-window-actions.c:1468
+#: ../shell/e-shell-window-actions.c:1509
 msgid "Import data from other programs"
 msgstr "Daten aus anderen Programmen importieren"
 
-#: ../shell/e-shell-window-actions.c:1473
+#: ../shell/e-shell-window-actions.c:1514
 msgid "New _Window"
 msgstr "Neues F_enster"
 
-#: ../shell/e-shell-window-actions.c:1475
+#: ../shell/e-shell-window-actions.c:1516
 msgid "Create a new window displaying this view"
 msgstr "Ein neues Fenster Ãffnen, das diese Ansicht anzeigt"
 
-#: ../shell/e-shell-window-actions.c:1494
+#: ../shell/e-shell-window-actions.c:1528
+msgid "Available Cate_gories"
+msgstr "VerfÃgbare Kate_gorien"
+
+#: ../shell/e-shell-window-actions.c:1530
+msgid "Manage available categories"
+msgstr "VerfÃgbare Kategorien verwalten"
+
+#: ../shell/e-shell-window-actions.c:1542
 msgid "_Quick Reference"
 msgstr "_Kurzreferenz"
 
-#: ../shell/e-shell-window-actions.c:1496
+#: ../shell/e-shell-window-actions.c:1544
 msgid "Show Evolution's shortcut keys"
 msgstr "Die TastenkÃrzel von Evolution anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1503
+#: ../shell/e-shell-window-actions.c:1551
 msgid "Exit the program"
 msgstr "Das Programm beenden"
 
-#: ../shell/e-shell-window-actions.c:1508
+#: ../shell/e-shell-window-actions.c:1556
 msgid "_Advanced Search..."
 msgstr "Er_weiterte Suche â"
 
-#: ../shell/e-shell-window-actions.c:1510
+#: ../shell/e-shell-window-actions.c:1558
 msgid "Construct a more advanced search"
 msgstr "Erweiterte Suche ausfÃhren"
 
-#: ../shell/e-shell-window-actions.c:1517
+#: ../shell/e-shell-window-actions.c:1565
 msgid "Clear the current search parameters"
 msgstr "Die aktuellen Suchparameter leeren"
 
-#: ../shell/e-shell-window-actions.c:1522
+#: ../shell/e-shell-window-actions.c:1570
 msgid "_Edit Saved Searches..."
 msgstr "Gespeicherte Suchen _bearbeiten â"
 
-#: ../shell/e-shell-window-actions.c:1524
+#: ../shell/e-shell-window-actions.c:1572
 msgid "Manage your saved searches"
 msgstr "Ihre gespeicherten SuchvorgÃnge verwalten"
 
-#: ../shell/e-shell-window-actions.c:1531
+#: ../shell/e-shell-window-actions.c:1579
 msgid "Click here to change the search type"
 msgstr "Klicken Sie hier, um den Suchtypen zu Ãndern"
 
-#: ../shell/e-shell-window-actions.c:1536
+#: ../shell/e-shell-window-actions.c:1584
 msgid "_Find Now"
 msgstr "_Jetzt suchen"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1538
+#: ../shell/e-shell-window-actions.c:1586
 msgid "Execute the current search parameters"
 msgstr "Die aktuellen Suchparameter anwenden"
 
-#: ../shell/e-shell-window-actions.c:1543
+#: ../shell/e-shell-window-actions.c:1591
 msgid "_Save Search..."
 msgstr "Suche _speichern â"
 
-#: ../shell/e-shell-window-actions.c:1545
+#: ../shell/e-shell-window-actions.c:1593
 msgid "Save the current search parameters"
 msgstr "Die aktuellen Suchparameter speichern"
 
-#: ../shell/e-shell-window-actions.c:1557
+#: ../shell/e-shell-window-actions.c:1605
 msgid "Submit _Bug Report..."
 msgstr "Fehler_bericht einschicken â"
 
-#: ../shell/e-shell-window-actions.c:1559
+#: ../shell/e-shell-window-actions.c:1607
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Einen Fehlerbericht mit Bug Buddy einschicken"
 
-#: ../shell/e-shell-window-actions.c:1564
+#: ../shell/e-shell-window-actions.c:1612
 msgid "_Work Offline"
 msgstr "_Offline arbeiten"
 
-#: ../shell/e-shell-window-actions.c:1566
+#: ../shell/e-shell-window-actions.c:1614
 msgid "Put Evolution into offline mode"
 msgstr "Evolution in den Offline-Modus versetzen"
 
-#: ../shell/e-shell-window-actions.c:1571
+#: ../shell/e-shell-window-actions.c:1619
 msgid "_Work Online"
 msgstr "_Online arbeiten"
 
-#: ../shell/e-shell-window-actions.c:1573
+#: ../shell/e-shell-window-actions.c:1621
 msgid "Put Evolution into online mode"
 msgstr "Evolution in den Online-Modus versetzen"
 
-#: ../shell/e-shell-window-actions.c:1601
+#: ../shell/e-shell-window-actions.c:1649
 msgid "Lay_out"
 msgstr "_Anordnung"
 
-#: ../shell/e-shell-window-actions.c:1608
+#: ../shell/e-shell-window-actions.c:1656
 msgid "_New"
 msgstr "_Neu"
 
-#: ../shell/e-shell-window-actions.c:1615
+#: ../shell/e-shell-window-actions.c:1663
 msgid "_Search"
 msgstr "_Suchen"
 
-#: ../shell/e-shell-window-actions.c:1622
+#: ../shell/e-shell-window-actions.c:1670
 msgid "_Switcher Appearance"
 msgstr "Erscheinungsbild der KnÃ_pfe"
 
-#: ../shell/e-shell-window-actions.c:1636
+#: ../shell/e-shell-window-actions.c:1684
 msgid "_Window"
 msgstr "_Fenster"
 
-#: ../shell/e-shell-window-actions.c:1665
+#: ../shell/e-shell-window-actions.c:1713
 msgid "Show Side _Bar"
 msgstr "Sei_tenleiste anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1667
+#: ../shell/e-shell-window-actions.c:1715
 msgid "Show the side bar"
 msgstr "Seitenleiste anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1673
+#: ../shell/e-shell-window-actions.c:1721
 msgid "Show _Buttons"
 msgstr "_KnÃpfe anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1675
+#: ../shell/e-shell-window-actions.c:1723
 msgid "Show the switcher buttons"
 msgstr "UmschaltknÃpfe anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1681
+#: ../shell/e-shell-window-actions.c:1729
 msgid "Show _Status Bar"
 msgstr "Stat_usleiste anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1683
+#: ../shell/e-shell-window-actions.c:1731
 msgid "Show the status bar"
 msgstr "Die Statusleiste anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1689
+#: ../shell/e-shell-window-actions.c:1737
 msgid "Show _Tool Bar"
 msgstr "_Werkzeugleiste anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1691
+#: ../shell/e-shell-window-actions.c:1739
 msgid "Show the tool bar"
 msgstr "Die Werkzeugleiste anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1713
+#: ../shell/e-shell-window-actions.c:1761
 msgid "_Icons Only"
 msgstr "Nur S_ymbole"
 
-#: ../shell/e-shell-window-actions.c:1715
+#: ../shell/e-shell-window-actions.c:1763
 msgid "Display window buttons with icons only"
 msgstr "FensterknÃpfe nur als Symbole anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1720
+#: ../shell/e-shell-window-actions.c:1768
 msgid "_Text Only"
 msgstr "Nur _Text"
 
-#: ../shell/e-shell-window-actions.c:1722
+#: ../shell/e-shell-window-actions.c:1770
 msgid "Display window buttons with text only"
 msgstr "FensterknÃpfe nur als Text anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1727
+#: ../shell/e-shell-window-actions.c:1775
 msgid "Icons _and Text"
 msgstr "Symbole _und Text"
 
-#: ../shell/e-shell-window-actions.c:1729
+#: ../shell/e-shell-window-actions.c:1777
 msgid "Display window buttons with icons and text"
 msgstr "FensterknÃpfe mit Symbolen und Text anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1734
+#: ../shell/e-shell-window-actions.c:1782
 msgid "Tool_bar Style"
 msgstr "_Werkzeugleistenstil"
 
-#: ../shell/e-shell-window-actions.c:1736
+#: ../shell/e-shell-window-actions.c:1784
 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:1744
+#: ../shell/e-shell-window-actions.c:1792
 msgid "Define Views..."
 msgstr "Ansichten definieren â"
 
-#: ../shell/e-shell-window-actions.c:1746
+#: ../shell/e-shell-window-actions.c:1794
 msgid "Create or edit views"
 msgstr "Ansicht er_stellen oder bearbeiten"
 
-#: ../shell/e-shell-window-actions.c:1751
+#: ../shell/e-shell-window-actions.c:1799
 msgid "Save Custom View..."
 msgstr "Benutzerdefinierte Ansicht speichern â"
 
-#: ../shell/e-shell-window-actions.c:1753
+#: ../shell/e-shell-window-actions.c:1801
 msgid "Save current custom view"
 msgstr "Aktuelle benutzerdefinierte Ansicht speichern"
 
-#: ../shell/e-shell-window-actions.c:1760
+#: ../shell/e-shell-window-actions.c:1808
 msgid "C_urrent View"
 msgstr "A_ktuelle Ansicht"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1818
 msgid "Custom View"
 msgstr "Benutzerdefinierte Ansicht"
 
-#: ../shell/e-shell-window-actions.c:1772
+#: ../shell/e-shell-window-actions.c:1820
 msgid "Current view is a customized view"
 msgstr "Aktuelle Ansicht ist eine benutzerdefinierte Ansicht"
 
-#: ../shell/e-shell-window-actions.c:1782
+#: ../shell/e-shell-window-actions.c:1830
 msgid "Change the page settings for your current printer"
 msgstr "Die Seiteneinstellungen fÃr Ihren aktuellen Drucker Ãndern"
 
-#: ../shell/e-shell-window-actions.c:2167
+#: ../shell/e-shell-window-actions.c:2215
 #, c-format
 msgid "Switch to %s"
 msgstr "Zu %s wechseln"
 
-#: ../shell/e-shell-window-actions.c:2382
+#: ../shell/e-shell-window-actions.c:2430
 msgid "Execute these search parameters"
 msgstr "Diese Suchparameter ausfÃhren"
 
@@ -20245,24 +19670,24 @@ msgstr "Diese Suchparameter ausfÃhren"
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:438
+#: ../shell/e-shell-window.c:442
 msgid "New"
 msgstr "Neu"
 
-#: ../shell/e-shell.c:257
+#: ../shell/e-shell.c:361
 msgid "Preparing to go offline..."
 msgstr "Offline-Betrieb wird vorbereitet â"
 
-#: ../shell/e-shell.c:310
+#: ../shell/e-shell.c:414
 msgid "Preparing to go online..."
 msgstr "Online-Betrieb wird vorbereitet â"
 
-#: ../shell/e-shell.c:372
+#: ../shell/e-shell.c:476
 msgid "Preparing to quit..."
 msgstr "Beenden wird vorbereitet â"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:188
+#: ../shell/main.c:195
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20301,7 +19726,7 @@ msgstr ""
 "Wir hoffen, dass Ihnen das Ergebnis unserer harten Arbeit\n"
 "gefÃllt und freuen uns auf Ihren Beitrag zu diesem Projekt!\n"
 
-#: ../shell/main.c:212
+#: ../shell/main.c:219
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20309,13 +19734,13 @@ msgstr ""
 "Vielen Dank\n"
 "Das Evolution-Team\n"
 
-#: ../shell/main.c:219
+#: ../shell/main.c:226
 msgid "Do not tell me again"
 msgstr "Nicht mehr anzeigen"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:365
+#: ../shell/main.c:308
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -20323,51 +19748,51 @@ msgstr ""
 "Evolution mit einer bestimmten Komponente starten. MÃgliche Optionen sind "
 "ÂmailÂ, ÂcalendarÂ, Âcontacts und ÂmemosÂ"
 
-#: ../shell/main.c:369
+#: ../shell/main.c:312
 msgid "Apply the given geometry to the main window"
 msgstr "Die angegebene Geometrie auf das Hauptfenster anwenden"
 
-#: ../shell/main.c:373
+#: ../shell/main.c:316
 msgid "Start in online mode"
 msgstr "Im Online-Modus starten"
 
-#: ../shell/main.c:375
+#: ../shell/main.c:318
 msgid "Ignore network availability"
 msgstr "VerfÃgbarkeit des Netzwerks ignorieren"
 
-#: ../shell/main.c:377
+#: ../shell/main.c:320
 msgid "Start in \"express\" mode"
 msgstr "Im Express-Modus starten"
 
-#: ../shell/main.c:380
+#: ../shell/main.c:323
 msgid "Forcibly shut down Evolution"
 msgstr "Evolution zum Herunterfahren zwingen"
 
-#: ../shell/main.c:383
+#: ../shell/main.c:326
 msgid "Send the debugging output of all components to a file."
 msgstr "Die Diagnoseausgabe aller Komponenten in eine Datei umleiten."
 
-#: ../shell/main.c:385
+#: ../shell/main.c:328
 msgid "Disable loading of any plugins."
 msgstr "Das Laden von allen Plugins deaktivieren."
 
-#: ../shell/main.c:387
+#: ../shell/main.c:330
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Die Vorschau von E-Mails, Kontakten und Aufgaben deaktivieren."
 
-#: ../shell/main.c:391
+#: ../shell/main.c:334
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "Die Adressen oder Dateinamen in den restlichen Argumenten importieren."
 
-#: ../shell/main.c:393
+#: ../shell/main.c:336
 msgid "Request a running Evolution process to quit"
 msgstr "Einen laufenden Evolution-Prozess zum Beenden auffordern"
 
-#: ../shell/main.c:557 ../shell/main.c:565
+#: ../shell/main.c:511 ../shell/main.c:519
 msgid "- The Evolution PIM and Email Client"
 msgstr "â Die Evolution PIM- und E-Mail-Anwendung"
 
-#: ../shell/main.c:627
+#: ../shell/main.c:582
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20376,13 +19801,14 @@ msgstr ""
 "%s: Â--online und Â--offline kÃnnen nicht gemeinsam verwendet werden.\n"
 "  Rufen Sie Â%s --help auf, um weitere Informationen zu erhalten.\n"
 
-#: ../shell/main.c:633
+#: ../shell/main.c:588
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
 "  Run '%s --help' for more information.\n"
 msgstr ""
-"%s: Â--force-online und Â--offline kÃnnen nicht gemeinsam verwendet werden.\n"
+"%s: Â--force-online und Â--offline kÃnnen nicht gemeinsam verwendet "
+"werden.\n"
 "  Rufen Sie Â%s --help auf, um weitere Informationen zu erhalten.\n"
 
 #: ../shell/shell.error.xml.h:1
@@ -20401,8 +19827,8 @@ msgstr "Trotzdem fortsetzen"
 #: ../shell/shell.error.xml.h:4
 msgid ""
 "Evolution no longer supports upgrading directly from version {0}. However as "
-"a workaround you might try first upgrading to Evolution 2, and then "
-"upgrading to Evolution 3."
+"a workaround you might try first upgrading to Evolution 2, and then upgrading "
+"to Evolution 3."
 msgstr ""
 "Evolution unterstÃtzt die Aktualisierung direkt von Version {0} nicht mehr. "
 "Es ist allerdings mÃglich, zunÃchst auf Version 2 und dann auf Version 3 zu "
@@ -20433,8 +19859,7 @@ msgstr "Verw_erfen"
 msgid ""
 "{0}\n"
 "\n"
-"If you choose to continue, you may not have access to some of your old "
-"data.\n"
+"If you choose to continue, you may not have access to some of your old data.\n"
 msgstr ""
 "{0}\n"
 "\n"
@@ -20496,31 +19921,31 @@ msgstr ""
 msgid "Not a launchable item"
 msgstr "Kein startbarer Eintrag"
 
-#: ../smclient/eggsmclient.c:224
+#: ../smclient/eggsmclient.c:226
 msgid "Disable connection to session manager"
 msgstr "Verbindung zur Sitzungsverwaltung deaktivieren"
 
-#: ../smclient/eggsmclient.c:227
+#: ../smclient/eggsmclient.c:229
 msgid "Specify file containing saved configuration"
 msgstr "Datei mit der gespeicherten Konfiguration angeben"
 
-#: ../smclient/eggsmclient.c:227
+#: ../smclient/eggsmclient.c:229
 msgid "FILE"
 msgstr "DATEI"
 
-#: ../smclient/eggsmclient.c:230
+#: ../smclient/eggsmclient.c:232
 msgid "Specify session management ID"
 msgstr "Kennung der Sitzungsverwaltung angeben"
 
-#: ../smclient/eggsmclient.c:230
+#: ../smclient/eggsmclient.c:232
 msgid "ID"
 msgstr "Kennung"
 
-#: ../smclient/eggsmclient.c:251
+#: ../smclient/eggsmclient.c:253
 msgid "Session management options:"
 msgstr "Optionen der Sitzungsverwaltung:"
 
-#: ../smclient/eggsmclient.c:252
+#: ../smclient/eggsmclient.c:254
 msgid "Show session management options"
 msgstr "Optionen der Sitzungsverwaltung anzeigen"
 
@@ -20555,67 +19980,97 @@ msgstr ""
 "ausgestellt hat. Daher vertrauen Sie der AuthentizitÃt dieses Zertifikats "
 "nicht, falls Sie es hier nicht anders angeben."
 
-#: ../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:157
-msgid "All PKCS12 files"
-msgstr "Alle PKCS12-Dateien"
-
-#: ../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: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
+#: ../smime/gui/certificate-manager.c:73 ../smime/gui/certificate-manager.c:92
+#: ../smime/gui/certificate-manager.c:112
 msgid "Certificate Name"
 msgstr "Zertifikatname"
 
-#: ../smime/gui/certificate-manager.c:361
-#: ../smime/gui/certificate-manager.c:592
-msgid "Purposes"
-msgstr "Verwendungszwecke"
+#: ../smime/gui/certificate-manager.c:74 ../smime/gui/certificate-manager.c:94
+#, fuzzy
+msgid "Issued To Organization"
+msgstr "_Organisation"
+
+#: ../smime/gui/certificate-manager.c:75 ../smime/gui/certificate-manager.c:95
+#, fuzzy
+msgid "Issued To Organizational Unit"
+msgstr "Organisationseinheit (OU)"
 
-#: ../smime/gui/certificate-manager.c:370 ../smime/gui/smime-ui.ui.h:32
+#: ../smime/gui/certificate-manager.c:76 ../smime/gui/certificate-manager.c:96
+#: ../smime/gui/certificate-manager.c:114 ../smime/gui/smime-ui.ui.h:32
 #: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "Seriennummer"
 
-#: ../smime/gui/certificate-manager.c:378
+#: ../smime/gui/certificate-manager.c:77 ../smime/gui/certificate-manager.c:97
+#: ../smime/gui/certificate-manager.c:115
+msgid "Purposes"
+msgstr "Verwendungszwecke"
+
+#: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
+#: ../smime/gui/certificate-manager.c:116 ../smime/gui/smime-ui.ui.h:23
+msgid "Issued By"
+msgstr "Ausgestellt von"
+
+#: ../smime/gui/certificate-manager.c:79 ../smime/gui/certificate-manager.c:99
+#: ../smime/gui/certificate-manager.c:117
+#, fuzzy
+msgid "Issued By Organization"
+msgstr "_Organisation:"
+
+#: ../smime/gui/certificate-manager.c:80 ../smime/gui/certificate-manager.c:100
+#: ../smime/gui/certificate-manager.c:118
+#, fuzzy
+msgid "Issued By Organizational Unit"
+msgstr "Organisationseinheit (OU)"
+
+#: ../smime/gui/certificate-manager.c:81 ../smime/gui/certificate-manager.c:101
+#: ../smime/gui/certificate-manager.c:119
+msgid "Issued"
+msgstr "Aussteller"
+
+#: ../smime/gui/certificate-manager.c:82 ../smime/gui/certificate-manager.c:102
+#: ../smime/gui/certificate-manager.c:120
 msgid "Expires"
 msgstr "LÃuft aus"
 
-#: ../smime/gui/certificate-manager.c:469
-msgid "All email certificate files"
-msgstr "Alle E-Mail-Zertifikatdateien"
+#: ../smime/gui/certificate-manager.c:83 ../smime/gui/certificate-manager.c:103
+#: ../smime/gui/certificate-manager.c:121 ../smime/gui/smime-ui.ui.h:29
+msgid "SHA1 Fingerprint"
+msgstr "SHA1-Fingerabdruck"
 
-#: ../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:84 ../smime/gui/certificate-manager.c:104
+#: ../smime/gui/certificate-manager.c:122 ../smime/gui/smime-ui.ui.h:26
+msgid "MD5 Fingerprint"
+msgstr "MD5-Fingerabdruck"
 
-#: ../smime/gui/certificate-manager.c:583
-msgid "E-Mail Address"
+#: ../smime/gui/certificate-manager.c:93 ../smime/gui/certificate-manager.c:113
+msgid "Email Address"
 msgstr "E-Mail-Adresse"
 
-#: ../smime/gui/certificate-manager.c:706
+#: ../smime/gui/certificate-manager.c:574
+msgid "Select a certificate to import..."
+msgstr "WÃhlen Sie ein zu importierendes Zertifikat â"
+
+#: ../smime/gui/certificate-manager.c:587
+msgid "All files"
+msgstr "Alle Dateien"
+
+#: ../smime/gui/certificate-manager.c:622
+msgid "Failed to import certificate"
+msgstr "Zertifikat konnte nicht importiert werden"
+
+#: ../smime/gui/certificate-manager.c:990
+msgid "All PKCS12 files"
+msgstr "Alle PKCS12-Dateien"
+
+#: ../smime/gui/certificate-manager.c:1008
+msgid "All email certificate files"
+msgstr "Alle E-Mail-Zertifikatdateien"
+
+#: ../smime/gui/certificate-manager.c:1026
 msgid "All CA certificate files"
 msgstr "Alle CA-Zertifikatdateien"
 
-#: ../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-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
@@ -20676,11 +20131,11 @@ msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
 msgstr ""
-"Bevor Sie dieser Zertifizierungsstelle uneingeschrÃnkt vertrauen, sollten "
-"Sie sein Zertifikat und seine Verfahrensweisen unter die Lupe nehmen (falls "
+"Bevor Sie dieser Zertifizierungsstelle uneingeschrÃnkt vertrauen, sollten Sie "
+"sein Zertifikat und seine Verfahrensweisen unter die Lupe nehmen (falls "
 "mÃglich)."
 
-#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1086
+#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1088
 msgid "Certificate"
 msgstr "Zertifikat"
 
@@ -20740,10 +20195,6 @@ msgstr "Feldname"
 msgid "Fingerprints"
 msgstr "FingerabdrÃcke"
 
-#: ../smime/gui/smime-ui.ui.h:23
-msgid "Issued By"
-msgstr "Ausgestellt von"
-
 #: ../smime/gui/smime-ui.ui.h:24
 msgid "Issued On"
 msgstr "Ausgestellt am"
@@ -20752,10 +20203,6 @@ msgstr "Ausgestellt am"
 msgid "Issued To"
 msgstr "Ausgestellt fÃr"
 
-#: ../smime/gui/smime-ui.ui.h:26
-msgid "MD5 Fingerprint"
-msgstr "MD5-Fingerabdruck"
-
 #: ../smime/gui/smime-ui.ui.h:27
 msgid "Organization (O)"
 msgstr "Organisation (O)"
@@ -20764,10 +20211,6 @@ msgstr "Organisation (O)"
 msgid "Organizational Unit (OU)"
 msgstr "Organisationseinheit (OU)"
 
-#: ../smime/gui/smime-ui.ui.h:29
-msgid "SHA1 Fingerprint"
-msgstr "SHA1-Fingerabdruck"
-
 #: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:824
 msgid "SSL Client Certificate"
 msgstr "SSL-Client-Zertifikat"
@@ -20802,8 +20245,7 @@ msgstr "GÃltigkeit"
 
 #: ../smime/gui/smime-ui.ui.h:39
 msgid "You have certificates from these organizations that identify you:"
-msgstr ""
-"Sie haben Zertifikate folgender Organisationen, die Sie identifizieren:"
+msgstr "Sie haben Zertifikate folgender Organisationen, die Sie identifizieren:"
 
 #: ../smime/gui/smime-ui.ui.h:40
 msgid ""
@@ -20984,46 +20426,48 @@ msgstr "Nicht-kritisch"
 msgid "Extensions"
 msgstr "Erweiterungen"
 
-#. Translators: This string is used in Certificate details for fields like Issuer
-#. or Subject, which shows the field name on the left and its respective value
-#. on the right, both as stored in the certificate itself. You probably do not
-#. 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:1045
+#. Translators: This string is used in Certificate
+#. * details for fields like Issuer or Subject, which
+#. * shows the field name on the left and its respective
+#. * value on the right, both as stored in the
+#. * certificate itself.  You probably do not 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:1047
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1100 ../smime/lib/e-cert.c:1223
+#: ../smime/lib/e-cert.c:1102 ../smime/lib/e-cert.c:1225
 msgid "Certificate Signature Algorithm"
 msgstr "Algorithmus der Zertifikatsignatur"
 
-#: ../smime/lib/e-cert.c:1109
+#: ../smime/lib/e-cert.c:1111
 msgid "Issuer"
 msgstr "Aussteller"
 
-#: ../smime/lib/e-cert.c:1164
+#: ../smime/lib/e-cert.c:1166
 msgid "Issuer Unique ID"
 msgstr "Eindeutige Ausstellerkennung"
 
-#: ../smime/lib/e-cert.c:1183
+#: ../smime/lib/e-cert.c:1185
 msgid "Subject Unique ID"
 msgstr "Eindeutige EmpfÃngerkennung"
 
-#: ../smime/lib/e-cert.c:1229
+#: ../smime/lib/e-cert.c:1231
 msgid "Certificate Signature Value"
 msgstr "Wert der Zertifikatsignatur"
 
-#: ../smime/lib/e-pkcs12.c:250
+#: ../smime/lib/e-pkcs12.c:249
 msgid "PKCS12 File Password"
 msgstr "PKCS12-Dateipasswort"
 
-#: ../smime/lib/e-pkcs12.c:251
+#: ../smime/lib/e-pkcs12.c:250
 msgid "Enter password for PKCS12 file:"
 msgstr "Geben Sie das Passwort fÃr die PKCS12-Datei ein:"
 
-#: ../smime/lib/e-pkcs12.c:353
+#: ../smime/lib/e-pkcs12.c:352
 msgid "Imported Certificate"
 msgstr "Importierte Zertifikate"
 
@@ -21105,7 +20549,7 @@ msgstr "Mit _Status"
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:439
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:441
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:779
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:780
 msgid "UTC"
 msgstr "UTC"
 
@@ -21127,22 +20571,22 @@ msgid ""
 "zone.\n"
 "Use the right mouse button to zoom out."
 msgstr ""
-"Benutzen Sie die linke Maustaste, um einen Kartenausschnitt zu vergrÃÃern "
-"und wÃhlen Sie eine Zeitzone.\n"
+"Benutzen Sie die linke Maustaste, um einen Kartenausschnitt zu vergrÃÃern und "
+"wÃhlen Sie eine Zeitzone.\n"
 "Mit der rechten Maustaste kÃnnen Sie die Ansicht verkleinern."
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:7
 msgid "_Selection"
 msgstr "Au_swahl"
 
-#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-define-views-dialog.c:348
 #: ../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:354
 #: ../widgets/menus/gal-define-views-dialog.c:356
+#: ../widgets/menus/gal-define-views-dialog.c:358
 msgid "Define Views"
 msgstr "Ansichten definieren"
 
@@ -21151,11 +20595,11 @@ msgstr "Ansichten definieren"
 msgid "Define Views for \"%s\""
 msgstr "Ansichten fÃr Â%s definieren"
 
-#: ../widgets/menus/gal-view-factory-etable.c:109
+#: ../widgets/menus/gal-view-factory-etable.c:111
 msgid "Table"
 msgstr "Tabelle"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:273
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:275
 msgid "Save Current View"
 msgstr "Aktuelle Ansicht speichern"
 
@@ -21167,7 +20611,7 @@ msgstr "Neue Ansicht er_stellen"
 msgid "_Replace existing view"
 msgstr "Vorhandene Ansicht erset_zen"
 
-#: ../widgets/menus/gal-view-new-dialog.c:106
+#: ../widgets/menus/gal-view-new-dialog.c:108
 msgid "Define New View"
 msgstr "Neue Ansicht definieren"
 
@@ -21183,122 +20627,130 @@ msgstr "Art der Ansicht"
 msgid "Type of view:"
 msgstr "Art der Ansicht:"
 
-#: ../widgets/misc/e-account-manager.c:349
+#: ../widgets/misc/e-account-manager.c:353
 msgid "De_fault"
 msgstr "_Vorgabe"
 
-#: ../widgets/misc/e-account-tree-view.c:270
+#: ../widgets/misc/e-account-tree-view.c:243
+msgid "Account Name"
+msgstr "Kontoname"
+
+#: ../widgets/misc/e-account-tree-view.c:274
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../widgets/misc/e-attachment-dialog.c:304
+#: ../widgets/misc/e-attachment-dialog.c:308
 msgid "Attachment Properties"
 msgstr "Eigenschaften der Anlage"
 
-#: ../widgets/misc/e-attachment-dialog.c:326
+#: ../widgets/misc/e-attachment-dialog.c:330
 msgid "_Filename:"
 msgstr "Datei_name:"
 
-#: ../widgets/misc/e-attachment-dialog.c:361
+#: ../widgets/misc/e-attachment-dialog.c:365
 msgid "MIME Type:"
 msgstr "MIME-Typ:"
 
-#: ../widgets/misc/e-attachment-dialog.c:369
-#: ../widgets/misc/e-attachment-store.c:556
+#: ../widgets/misc/e-attachment-dialog.c:373
+#: ../widgets/misc/e-attachment-store.c:559
 msgid "_Suggest automatic display of attachment"
 msgstr "Automatische Anzeige der Anlage _vorschlagen"
 
-#: ../widgets/misc/e-attachment-handler-image.c:96
+#: ../widgets/misc/e-attachment-handler-image.c:95
 msgid "Could not set as background"
 msgstr "Konnte nicht als Hintergrund gesetzt werden"
 
-#: ../widgets/misc/e-attachment-handler-image.c:148
+#: ../widgets/misc/e-attachment-handler-image.c:145
 msgid "Set as _Background"
 msgstr "Zum _Hintergrund machen"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:90
+#: ../widgets/misc/e-attachment-handler-sendto.c:93
 msgid "Could not send attachment"
 msgid_plural "Could not send attachments"
 msgstr[0] "Anlage konnte nicht verschickt werden"
 msgstr[1] "Anlagen konnten nicht verschickt werden"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:132
+#: ../widgets/misc/e-attachment-handler-sendto.c:135
 msgid "_Send To..."
 msgstr "_Senden an â"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:134
+#: ../widgets/misc/e-attachment-handler-sendto.c:137
 msgid "Send the selected attachments somewhere"
 msgstr "Die ausgewÃhlten Anlagen versenden"
 
-#: ../widgets/misc/e-attachment-icon-view.c:158
-#: ../widgets/misc/e-attachment-tree-view.c:543
+#: ../widgets/misc/e-attachment-icon-view.c:162
+#: ../widgets/misc/e-attachment-tree-view.c:547
 msgid "Loading"
 msgstr "Wird geladen"
 
-#: ../widgets/misc/e-attachment-icon-view.c:170
-#: ../widgets/misc/e-attachment-tree-view.c:555
+#: ../widgets/misc/e-attachment-icon-view.c:174
+#: ../widgets/misc/e-attachment-tree-view.c:559
 msgid "Saving"
 msgstr "Wird gespeichert"
 
-#: ../widgets/misc/e-attachment-paned.c:93
+#: ../widgets/misc/e-attachment-paned.c:97
 msgid "Hide Attachment _Bar"
 msgstr "Anla_genleiste verbergen"
 
-#: ../widgets/misc/e-attachment-paned.c:95
-#: ../widgets/misc/e-attachment-paned.c:635
+#: ../widgets/misc/e-attachment-paned.c:99
+#: ../widgets/misc/e-attachment-paned.c:639
 msgid "Show Attachment _Bar"
 msgstr "Anla_genleiste anzeigen"
 
-#: ../widgets/misc/e-attachment-store.c:544
+#: ../widgets/misc/e-attachment-store.c:547
 msgid "Add Attachment"
 msgstr "Anlage hinzufÃgen"
 
-#: ../widgets/misc/e-attachment-store.c:547
+#: ../widgets/misc/e-attachment-store.c:550
 msgid "A_ttach"
 msgstr "Bei_legen"
 
-#: ../widgets/misc/e-attachment-store.c:610
+#: ../widgets/misc/e-attachment-store.c:613
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Anlage speichern"
 msgstr[1] "Anlagen speichern"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:639
-#: ../widgets/misc/e-attachment.c:1806 ../widgets/misc/e-attachment.c:2348
+#: ../widgets/misc/e-attachment-store.c:642 ../widgets/misc/e-attachment.c:1809
+#: ../widgets/misc/e-attachment.c:2351
 msgid "attachment.dat"
 msgstr "Anlage.dat"
 
-#: ../widgets/misc/e-attachment-view.c:349
+#: ../widgets/misc/e-attachment-view.c:404
+msgid "Open With Other Application..."
+msgstr "Mit anderer Anwendung Ãffnen â"
+
+#: ../widgets/misc/e-attachment-view.c:411
 msgid "S_ave All"
 msgstr "_Alle speichern"
 
-#: ../widgets/misc/e-attachment-view.c:375
+#: ../widgets/misc/e-attachment-view.c:437
 msgid "A_dd Attachment..."
 msgstr "Anlage _hinzufÃgen â"
 
-#: ../widgets/misc/e-attachment-view.c:399
+#: ../widgets/misc/e-attachment-view.c:461
 msgid "_Hide"
 msgstr "_Verbergen"
 
-#: ../widgets/misc/e-attachment-view.c:406
+#: ../widgets/misc/e-attachment-view.c:468
 msgid "Hid_e All"
 msgstr "_Alle verbergen"
 
-#: ../widgets/misc/e-attachment-view.c:413
+#: ../widgets/misc/e-attachment-view.c:475
 msgid "_View Inline"
 msgstr "_Eingebettet anzeigen"
 
-#: ../widgets/misc/e-attachment-view.c:420
+#: ../widgets/misc/e-attachment-view.c:482
 msgid "Vie_w All Inline"
 msgstr "_Alle eingebetteten anzeigen"
 
-#: ../widgets/misc/e-attachment-view.c:738
+#: ../widgets/misc/e-attachment-view.c:803
 #, c-format
-msgid "Open with \"%s\""
+msgid "Open With \"%s\""
 msgstr "Mit Â%s Ãffnen"
 
-#: ../widgets/misc/e-attachment-view.c:741
+#: ../widgets/misc/e-attachment-view.c:806
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Diese Anlage mit Â%s Ãffnen"
@@ -21307,78 +20759,82 @@ 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:997
 msgid "Attached message"
 msgstr "Beigelegte Nachricht"
 
-#: ../widgets/misc/e-attachment.c:1849 ../widgets/misc/e-attachment.c:2650
+#: ../widgets/misc/e-attachment.c:1852 ../widgets/misc/e-attachment.c:2653
 msgid "A load operation is already in progress"
 msgstr "Ein Ladevorgang lÃuft bereits"
 
-#: ../widgets/misc/e-attachment.c:1857 ../widgets/misc/e-attachment.c:2658
+#: ../widgets/misc/e-attachment.c:1860 ../widgets/misc/e-attachment.c:2661
 msgid "A save operation is already in progress"
 msgstr "Ein Speichervorgang lÃuft bereits"
 
-#: ../widgets/misc/e-attachment.c:1949
+#: ../widgets/misc/e-attachment.c:1952
 #, c-format
 msgid "Could not load '%s'"
 msgstr "Â%s konnte nicht geladen werden"
 
-#: ../widgets/misc/e-attachment.c:1952
+#: ../widgets/misc/e-attachment.c:1955
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Die Anlage konnte nicht geladen werden"
 
-#: ../widgets/misc/e-attachment.c:2228
+#: ../widgets/misc/e-attachment.c:2231
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Â%s konnte nicht geÃffnet werden"
 
-#: ../widgets/misc/e-attachment.c:2231
+#: ../widgets/misc/e-attachment.c:2234
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Die Anlage konnte nicht geÃffnet werden"
 
-#: ../widgets/misc/e-attachment.c:2666
+#: ../widgets/misc/e-attachment.c:2669
 msgid "Attachment contents not loaded"
 msgstr "Anlagen wurden nicht geladen"
 
-#: ../widgets/misc/e-attachment.c:2742
+#: ../widgets/misc/e-attachment.c:2745
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Â%s konnte nicht gespeichert werden"
 
-#: ../widgets/misc/e-attachment.c:2745
+#: ../widgets/misc/e-attachment.c:2748
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Die Anlage konnte nicht gespeichert werden"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../widgets/misc/e-buffer-tagger.c:359
+#: ../widgets/misc/e-buffer-tagger.c:363
 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:1229
+#: ../widgets/misc/e-calendar-item.c:1247
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:225
+#: ../widgets/misc/e-calendar.c:226
 msgid "Month Calendar"
 msgstr "Monatskalender"
 
-#: ../widgets/misc/e-charset-combo-box.c:92
+#: ../widgets/misc/e-charset-combo-box.c:96
 msgid "Character Encoding"
 msgstr "Zeichenkodierung"
 
-#: ../widgets/misc/e-charset-combo-box.c:115
+#: ../widgets/misc/e-charset-combo-box.c:119
 msgid "Enter the character set to use"
 msgstr "Geben Sie den zu verwendenden Zeichensatz ein"
 
-#: ../widgets/misc/e-charset-combo-box.c:335
+#: ../widgets/misc/e-charset-combo-box.c:339
 msgid "Other..."
 msgstr "Weitere â"
 
+#: ../widgets/misc/e-contact-map-window.c:347
+msgid "Contacts Map"
+msgstr "Kontaktkarte"
+
 #: ../widgets/misc/e-dateedit.c:501
 msgid "Date and Time"
 msgstr "Datum und Uhrzeit"
@@ -21424,7 +20880,7 @@ msgstr "UngÃltiges Datum"
 msgid "Invalid Time Value"
 msgstr "UngÃltige Zeitangabe"
 
-#: ../widgets/misc/e-import-assistant.c:245
+#: ../widgets/misc/e-import-assistant.c:249
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
@@ -21432,37 +20888,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:262
+#: ../widgets/misc/e-import-assistant.c:266
 msgid "F_ilename:"
 msgstr "Datei_name:"
 
-#: ../widgets/misc/e-import-assistant.c:272
+#: ../widgets/misc/e-import-assistant.c:276
 msgid "Select a file"
 msgstr "Eine Datei wÃhlen"
 
-#: ../widgets/misc/e-import-assistant.c:286
-#: ../widgets/misc/e-import-assistant.c:461
+#: ../widgets/misc/e-import-assistant.c:290
+#: ../widgets/misc/e-import-assistant.c:465
 msgid "File _type:"
 msgstr "Datei_typ:"
 
-#: ../widgets/misc/e-import-assistant.c:329
-#: ../widgets/misc/e-import-assistant.c:905
+#: ../widgets/misc/e-import-assistant.c:333
+#: ../widgets/misc/e-import-assistant.c:910
 msgid "Choose the destination for this import"
 msgstr "WÃhlen Sie das Ziel dieses Imports"
 
-#: ../widgets/misc/e-import-assistant.c:354
+#: ../widgets/misc/e-import-assistant.c:358
 msgid "Choose the type of importer to run:"
 msgstr "WÃhlen Sie den auszufÃhrenden Importeur:"
 
-#: ../widgets/misc/e-import-assistant.c:362
+#: ../widgets/misc/e-import-assistant.c:366
 msgid "Import data and settings from _older programs"
 msgstr "Daten und Einstellungen aus Ã_lteren Programmen importieren"
 
-#: ../widgets/misc/e-import-assistant.c:370
+#: ../widgets/misc/e-import-assistant.c:374
 msgid "Import a _single file"
 msgstr "Eine _einzelne Datei importieren"
 
-#: ../widgets/misc/e-import-assistant.c:522
+#: ../widgets/misc/e-import-assistant.c:526
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
@@ -21474,37 +20930,37 @@ msgstr ""
 "es noch einmal versuchen wollen."
 
 #. Install a custom "Cancel Import" button.
-#: ../widgets/misc/e-import-assistant.c:762
+#: ../widgets/misc/e-import-assistant.c:767
 msgid "_Cancel Import"
 msgstr "Import abbre_chen"
 
-#: ../widgets/misc/e-import-assistant.c:904
+#: ../widgets/misc/e-import-assistant.c:909
 msgid "Preview data to be imported"
 msgstr "Vorschau der zu importierenden Daten"
 
-#: ../widgets/misc/e-import-assistant.c:910
-#: ../widgets/misc/e-import-assistant.c:923
-#: ../widgets/misc/e-import-assistant.c:1270
-#: ../widgets/misc/e-import-assistant.c:1336
-#: ../widgets/misc/e-import-assistant.c:1345
+#: ../widgets/misc/e-import-assistant.c:915
+#: ../widgets/misc/e-import-assistant.c:928
+#: ../widgets/misc/e-import-assistant.c:1273
+#: ../widgets/misc/e-import-assistant.c:1349
+#: ../widgets/misc/e-import-assistant.c:1358
 msgid "Import Data"
 msgstr "Daten importieren"
 
-#: ../widgets/misc/e-import-assistant.c:918
+#: ../widgets/misc/e-import-assistant.c:923
 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:1260
-#: ../widgets/misc/e-import-assistant.c:1294
+#: ../widgets/misc/e-import-assistant.c:1263
+#: ../widgets/misc/e-import-assistant.c:1298
 msgid "Evolution Import Assistant"
 msgstr "Evolution-Importassistent"
 
-#: ../widgets/misc/e-import-assistant.c:1277
-#: ../widgets/misc/e-import-assistant.c:1324
+#: ../widgets/misc/e-import-assistant.c:1280
+#: ../widgets/misc/e-import-assistant.c:1336
 msgid "Import Location"
 msgstr "Ort importieren"
 
-#: ../widgets/misc/e-import-assistant.c:1288
+#: ../widgets/misc/e-import-assistant.c:1291
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -21514,28 +20970,28 @@ msgstr ""
 "Dieser Assistent fÃhrt Sie durch das Importieren externer Dateien in "
 "Evolution."
 
-#: ../widgets/misc/e-import-assistant.c:1302
+#: ../widgets/misc/e-import-assistant.c:1308
 msgid "Importer Type"
 msgstr "Importeurtyp"
 
-#: ../widgets/misc/e-import-assistant.c:1310
+#: ../widgets/misc/e-import-assistant.c:1318
 msgid "Select Information to Import"
 msgstr "Zu importierende Informationen auswÃhlen"
 
-#: ../widgets/misc/e-import-assistant.c:1317
+#: ../widgets/misc/e-import-assistant.c:1327
 msgid "Select a File"
 msgstr "WÃhlen Sie eine Datei"
 
-#: ../widgets/misc/e-import-assistant.c:1331
+#: ../widgets/misc/e-import-assistant.c:1344
 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-map.c:866
+#: ../widgets/misc/e-map.c:869
 msgid "World Map"
 msgstr "Weltkarte"
 
-#: ../widgets/misc/e-map.c:869
+#: ../widgets/misc/e-map.c:872
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -21544,70 +21000,70 @@ msgstr ""
 "Tastaturbenutzer sollten die Zeitzone stattdessen mit der Auswahlliste im "
 "unteren Bereich festlegen."
 
-#: ../widgets/misc/e-online-button.c:23
+#: ../widgets/misc/e-online-button.c:27
 msgid "Evolution is currently online.  Click this button to work offline."
 msgstr ""
 "Evolution ist im Augenblick online. Klicken Sie auf diesen Knopf, um offline "
 "zu arbeiten."
 
-#: ../widgets/misc/e-online-button.c:26
+#: ../widgets/misc/e-online-button.c:30
 msgid "Evolution is currently offline.  Click this button to work online."
 msgstr ""
 "Evolution ist im Augenblick offline. Klicken Sie auf diesen Knopf, um online "
 "zu arbeiten."
 
-#: ../widgets/misc/e-online-button.c:29
+#: ../widgets/misc/e-online-button.c:33
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr ""
 "Evolution ist im Augenblick im Offline-Modus, weil das Netzwerk nicht "
 "verfÃgbar ist."
 
-#: ../widgets/misc/e-preferences-window.c:275
+#: ../widgets/misc/e-preferences-window.c:279
 msgid "Evolution Preferences"
 msgstr "Evolution-Einstellungen"
 
-#: ../widgets/misc/e-search-bar.c:75
+#: ../widgets/misc/e-search-bar.c:79
 #, c-format
 msgid "Matches: %d"
 msgstr "Passt auf: %d"
 
-#: ../widgets/misc/e-search-bar.c:557
+#: ../widgets/misc/e-search-bar.c:561
 msgid "Close the find bar"
 msgstr "Die Suchleiste schlieÃen"
 
-#: ../widgets/misc/e-search-bar.c:565
+#: ../widgets/misc/e-search-bar.c:569
 msgid "Fin_d:"
 msgstr "_Suchen:"
 
-#: ../widgets/misc/e-search-bar.c:577
+#: ../widgets/misc/e-search-bar.c:581
 msgid "Clear the search"
 msgstr "Das Suchfeld leeren"
 
-#: ../widgets/misc/e-search-bar.c:601
+#: ../widgets/misc/e-search-bar.c:605
 msgid "_Previous"
 msgstr "_RÃckwÃrts suchen"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:611
 msgid "Find the previous occurrence of the phrase"
 msgstr "Den letzten Suchtreffer finden"
 
-#: ../widgets/misc/e-search-bar.c:620
+#: ../widgets/misc/e-search-bar.c:624
 msgid "_Next"
 msgstr "_Weitersuchen"
 
-#: ../widgets/misc/e-search-bar.c:626
+#: ../widgets/misc/e-search-bar.c:630
 msgid "Find the next occurrence of the phrase"
 msgstr "Den nÃchsten Suchtreffer finden"
 
-#: ../widgets/misc/e-search-bar.c:639
+#: ../widgets/misc/e-search-bar.c:643
 msgid "Mat_ch case"
 msgstr "_GroÃ-/Kleinschreibung berÃcksichtigen"
 
-#: ../widgets/misc/e-search-bar.c:667
+#: ../widgets/misc/e-search-bar.c:671
 msgid "Reached bottom of page, continued from top"
 msgstr "Seitenende erreicht, ab Anfang wird fortgesetzt"
 
-#: ../widgets/misc/e-search-bar.c:689
+#: ../widgets/misc/e-search-bar.c:693
 msgid "Reached top of page, continued from bottom"
 msgstr "Seitenanfang erreicht, ab Ende wird fortgesetzt"
 
@@ -21746,38 +21202,38 @@ msgctxt "send-options"
 msgid "None"
 msgstr "Keine"
 
-#: ../widgets/misc/e-signature-editor.c:134
-#: ../widgets/misc/e-signature-editor.c:560
-#: ../widgets/misc/e-signature-manager.c:348
-#: ../widgets/misc/e-signature-script-dialog.c:215
+#: ../widgets/misc/e-signature-editor.c:138
+#: ../widgets/misc/e-signature-editor.c:564
+#: ../widgets/misc/e-signature-manager.c:372
+#: ../widgets/misc/e-signature-script-dialog.c:219
 msgid "Unnamed"
 msgstr "Namenlose"
 
-#: ../widgets/misc/e-signature-editor.c:210
+#: ../widgets/misc/e-signature-editor.c:214
 msgid "_Save and Close"
 msgstr "_Speichern und schlieÃen"
 
-#: ../widgets/misc/e-signature-editor.c:427
+#: ../widgets/misc/e-signature-editor.c:431
 msgid "Edit Signature"
 msgstr "Signatur bearbeiten"
 
-#: ../widgets/misc/e-signature-editor.c:442
+#: ../widgets/misc/e-signature-editor.c:446
 msgid "_Signature Name:"
 msgstr "_Signaturname:"
 
-#: ../widgets/misc/e-signature-manager.c:293
+#: ../widgets/misc/e-signature-manager.c:317
 msgid "Add Signature Script"
 msgstr "Signaturskript hinzufÃgen"
 
-#: ../widgets/misc/e-signature-manager.c:358
+#: ../widgets/misc/e-signature-manager.c:382
 msgid "Edit Signature Script"
 msgstr "Signatur bearbeiten"
 
-#: ../widgets/misc/e-signature-manager.c:577
+#: ../widgets/misc/e-signature-manager.c:602
 msgid "Add _Script"
 msgstr "_Skript hinzufÃgen"
 
-#: ../widgets/misc/e-signature-script-dialog.c:264
+#: ../widgets/misc/e-signature-script-dialog.c:268
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -21787,11 +21243,11 @@ msgstr ""
 "verwendet. Der von Ihnen angegebene Name\n"
 "wird lediglich zur Anzeige verwendet."
 
-#: ../widgets/misc/e-signature-script-dialog.c:309
+#: ../widgets/misc/e-signature-script-dialog.c:313
 msgid "S_cript:"
 msgstr "_Skript:"
 
-#: ../widgets/misc/e-signature-script-dialog.c:340
+#: ../widgets/misc/e-signature-script-dialog.c:344
 msgid "Script file must be executable."
 msgstr "Die Skriptdatei muss ausfÃhrbar sein."
 
@@ -21799,78 +21255,86 @@ 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:375
+#: ../widgets/misc/e-web-view.c:408
 msgid "_Copy Link Location"
 msgstr "Link-Ziel _kopieren"
 
-#: ../widgets/misc/e-web-view.c:377
+#: ../widgets/misc/e-web-view.c:410
 msgid "Copy the link to the clipboard"
 msgstr "Den Verweis in die Zwischenablage kopieren"
 
-#: ../widgets/misc/e-web-view.c:385
+#: ../widgets/misc/e-web-view.c:418
 msgid "_Open Link in Browser"
 msgstr "Link im Browser Ã_ffnen"
 
-#: ../widgets/misc/e-web-view.c:387
+#: ../widgets/misc/e-web-view.c:420
 msgid "Open the link in a web browser"
 msgstr "Verweis im Browser Ã_ffnen"
 
-#: ../widgets/misc/e-web-view.c:395
+#: ../widgets/misc/e-web-view.c:428
 msgid "_Copy Email Address"
 msgstr "_E-Mail-Adresse kopieren"
 
-#: ../widgets/misc/e-web-view.c:424 ../widgets/misc/e-web-view.c:1080
+#: ../widgets/misc/e-web-view.c:445
+msgid "_Copy Image"
+msgstr "Bild _kopieren"
+
+#: ../widgets/misc/e-web-view.c:447
+msgid "Copy the image to the clipboard"
+msgstr "Das Bild in die Zwischenablage kopieren"
+
+#: ../widgets/misc/e-web-view.c:467 ../widgets/misc/e-web-view.c:1292
 msgid "Select all text and images"
 msgstr "Den gesamten Text und Bilder in einer Nachricht markieren"
 
-#: ../widgets/misc/e-web-view.c:860 ../widgets/misc/e-web-view.c:862
-#: ../widgets/misc/e-web-view.c:864
+#: ../widgets/misc/e-web-view.c:956 ../widgets/misc/e-web-view.c:958
+#: ../widgets/misc/e-web-view.c:960
 #, c-format
 msgid "Click to call %s"
 msgstr "Klicken Sie hier, um %s anzurufen"
 
-#: ../widgets/misc/e-web-view.c:866
+#: ../widgets/misc/e-web-view.c:962
 msgid "Click to hide/unhide addresses"
 msgstr "Adressen anzeigen/verbergen"
 
-#: ../widgets/misc/e-web-view.c:868
+#: ../widgets/misc/e-web-view.c:964
 #, c-format
 msgid "Click to open %s"
 msgstr "Klicken Sie hier, um %s zu Ãffnen"
 
-#: ../widgets/misc/ea-calendar-item.c:299
-#: ../widgets/misc/ea-calendar-item.c:308
+#: ../widgets/misc/ea-calendar-item.c:302
+#: ../widgets/misc/ea-calendar-item.c:311
 msgid "%d %B %Y"
 msgstr " %d. %B %Y"
 
-#: ../widgets/misc/ea-calendar-item.c:311
+#: ../widgets/misc/ea-calendar-item.c:314
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "Kalender: von %s bis %s"
 
-#: ../widgets/misc/ea-calendar-item.c:347
+#: ../widgets/misc/ea-calendar-item.c:350
 msgid "evolution calendar item"
 msgstr "Evolution Kalenderelement"
 
-#: ../widgets/table/e-cell-combo.c:174
+#: ../widgets/table/e-cell-combo.c:187
 msgid "popup list"
 msgstr "Popup-Liste"
 
-#: ../widgets/table/e-cell-date-edit.c:300
+#: ../widgets/table/e-cell-date-edit.c:299
 msgid "Now"
 msgstr "Jetzt"
 
 #. Translators: "None" as a label of a button to unset date in a date table cell
-#: ../widgets/table/e-cell-date-edit.c:317
+#: ../widgets/table/e-cell-date-edit.c:316
 msgctxt "table-date"
 msgid "None"
 msgstr "Keine"
 
-#: ../widgets/table/e-cell-date-edit.c:325
+#: ../widgets/table/e-cell-date-edit.c:324
 msgid "OK"
 msgstr "OK"
 
-#: ../widgets/table/e-cell-date-edit.c:869
+#: ../widgets/table/e-cell-date-edit.c:868
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Die Zeit muss folgendes Format haben: %s"
@@ -21879,34 +21343,34 @@ msgstr "Die Zeit muss folgendes Format haben: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Der Prozentwert muss zwischen 0 und 100 (einschlieÃlich) sein"
 
-#: ../widgets/table/e-table-click-to-add.c:592
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
+#: ../widgets/table/e-table-click-to-add.c:594
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:62
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:141
 msgid "click to add"
 msgstr "Klicken zum HinzufÃgen"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:387 ../widgets/table/e-table-config.c:429
 msgid "(Ascending)"
 msgstr "(Aufsteigend)"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:387 ../widgets/table/e-table-config.c:429
 msgid "(Descending)"
 msgstr "(Absteigend)"
 
-#: ../widgets/table/e-table-config.c:392
+#: ../widgets/table/e-table-config.c:394
 msgid "Not sorted"
 msgstr "Nicht sortiert"
 
-#: ../widgets/table/e-table-config.c:433
+#: ../widgets/table/e-table-config.c:435
 msgid "No grouping"
 msgstr "Nicht gruppieren"
 
-#: ../widgets/table/e-table-config.c:654
+#: ../widgets/table/e-table-config.c:659
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "Felder anzeigen"
 
-#: ../widgets/table/e-table-config.c:674
+#: ../widgets/table/e-table-config.c:679
 msgid "Available Fields"
 msgstr "VerfÃgbare Felder"
 
@@ -21915,7 +21379,7 @@ msgid "A_vailable Fields:"
 msgstr "_VerfÃgbare Felder:"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1660
+#: ../widgets/table/e-table-header-item.c:1679
 msgid "Ascending"
 msgstr "Aufsteigend"
 
@@ -21928,7 +21392,7 @@ msgid "Clear _All"
 msgstr "Alles _entfernen"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1660
+#: ../widgets/table/e-table-header-item.c:1679
 msgid "Descending"
 msgstr "Absteigend"
 
@@ -21976,6 +21440,10 @@ msgstr "An_gezeigte Felder â"
 msgid "_Group By..."
 msgstr "_Gruppieren nach â"
 
+#: ../widgets/table/e-table-config.ui.h:21
+msgid "_Remove"
+msgstr "_Entfernen"
+
 #: ../widgets/table/e-table-config.ui.h:22
 msgid "_Show field in View"
 msgstr "Fel_d in Ansicht anzeigen"
@@ -21988,11 +21456,11 @@ msgstr "Diese Felder der Reihe nach an_zeigen:"
 msgid "_Sort..."
 msgstr "_Sortieren â"
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:117
+#: ../widgets/table/e-table-field-chooser-dialog.c:119
 msgid "Add a Column"
 msgstr "Spalte hinzufÃgen"
 
-#: ../widgets/table/e-table-field-chooser.c:151
+#: ../widgets/table/e-table-field-chooser.c:153
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
@@ -22007,7 +21475,7 @@ msgstr ""
 #. Finally the %d is replaced with count of items in this group.
 #. Example: "Family name: Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:353
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
@@ -22020,106 +21488,719 @@ msgstr[1] "%s: %s (%d Objekte)"
 #. The %d is replaced with count of items in this group.
 #. Example: "Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:363
+#: ../widgets/table/e-table-group-container.c:365
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d Objekt)"
 msgstr[1] "%s (%d Objekte)"
 
-#: ../widgets/table/e-table-header-item.c:1504
+#: ../widgets/table/e-table-header-item.c:1523
 msgid "Customize Current View"
 msgstr "Aktuelle Ansicht anpassen"
 
-#: ../widgets/table/e-table-header-item.c:1525
+#: ../widgets/table/e-table-header-item.c:1544
 msgid "Sort _Ascending"
 msgstr "A_ufsteigend sortieren"
 
-#: ../widgets/table/e-table-header-item.c:1528
+#: ../widgets/table/e-table-header-item.c:1547
 msgid "Sort _Descending"
 msgstr "A_bsteigend sortieren"
 
-#: ../widgets/table/e-table-header-item.c:1531
+#: ../widgets/table/e-table-header-item.c:1550
 msgid "_Unsort"
 msgstr "_Nicht sortieren"
 
-#: ../widgets/table/e-table-header-item.c:1534
+#: ../widgets/table/e-table-header-item.c:1553
 msgid "Group By This _Field"
 msgstr "Nach diesem _Feld gruppieren"
 
-#: ../widgets/table/e-table-header-item.c:1537
+#: ../widgets/table/e-table-header-item.c:1556
 msgid "Group By _Box"
 msgstr "Nach FÃc_hern gruppieren"
 
-#: ../widgets/table/e-table-header-item.c:1541
+#: ../widgets/table/e-table-header-item.c:1560
 msgid "Remove This _Column"
 msgstr "_Diese Spalte entfernen"
 
-#: ../widgets/table/e-table-header-item.c:1544
+#: ../widgets/table/e-table-header-item.c:1563
 msgid "Add a C_olumn..."
 msgstr "Spalte hin_zufÃgen â"
 
-#: ../widgets/table/e-table-header-item.c:1548
+#: ../widgets/table/e-table-header-item.c:1567
 msgid "A_lignment"
 msgstr "Aus_richtung"
 
-#: ../widgets/table/e-table-header-item.c:1551
+#: ../widgets/table/e-table-header-item.c:1570
 msgid "B_est Fit"
 msgstr "_Optimal"
 
-#: ../widgets/table/e-table-header-item.c:1554
+#: ../widgets/table/e-table-header-item.c:1573
 msgid "Format Column_s..."
 msgstr "Spalten for_matieren â"
 
-#: ../widgets/table/e-table-header-item.c:1558
+#: ../widgets/table/e-table-header-item.c:1577
 msgid "Custo_mize Current View..."
 msgstr "A_ktuelle Ansicht anpassen â"
 
-#: ../widgets/table/e-table-header-item.c:1617
+#: ../widgets/table/e-table-header-item.c:1636
 msgid "_Sort By"
 msgstr "_Sortieren nach"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1635
+#: ../widgets/table/e-table-header-item.c:1654
 msgid "_Custom"
 msgstr "_Benutzerdefiniert"
 
 #. Translators: description of a "popup" action
-#: ../widgets/table/gal-a11y-e-cell-popup.c:123
+#: ../widgets/table/gal-a11y-e-cell-popup.c:125
 msgid "popup a child"
 msgstr "Kind aufklappen"
 
 #. Translators: description of a "toggle" action
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:174
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:178
 msgid "toggle the cell"
 msgstr "Zelle umschalten"
 
 #. Translators: description of an "expand" action
-#: ../widgets/table/gal-a11y-e-cell-tree.c:212
+#: ../widgets/table/gal-a11y-e-cell-tree.c:214
 msgid "expands the row in the ETree containing this cell"
 msgstr "Die Zeile des ETrees ausklappen, die diese Zelle enthÃlt"
 
 #. Translators: description of a "collapse" action
-#: ../widgets/table/gal-a11y-e-cell-tree.c:219
+#: ../widgets/table/gal-a11y-e-cell-tree.c:221
 msgid "collapses the row in the ETree containing this cell"
 msgstr "Die Zeile des ETrees einrollen, die diese Zelle enthÃlt"
 
-#: ../widgets/table/gal-a11y-e-cell.c:119
+#: ../widgets/table/gal-a11y-e-cell.c:121
 msgid "Table Cell"
 msgstr "Zelle"
 
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:67
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:71
 msgid "click"
 msgstr "Klicken"
 
-#: ../widgets/table/gal-a11y-e-table-column-header.c:154
+#: ../widgets/table/gal-a11y-e-table-column-header.c:157
 msgid "sort"
 msgstr "Sortieren"
 
-#: ../widgets/text/e-text.c:2274
+#: ../widgets/text/e-text.c:2306
 msgid "Select All"
 msgstr "Alle auswÃhlen"
 
-#: ../widgets/text/e-text.c:2286
+#: ../widgets/text/e-text.c:2318
 msgid "Input Methods"
 msgstr "Eingabemethoden"
+
+#~ msgid "Invalid object"
+#~ msgstr "UngÃltiges Objekt"
+
+#~ msgid "Edit Alarm"
+#~ msgstr "Alarm bearbeiten"
+
+#~ msgid "Add Alarm"
+#~ msgstr "Alarm hinzufÃgen"
+
+#~ msgid "Alarm"
+#~ msgstr "Alarm"
+
+#~ msgid "Click here to close the current window"
+#~ msgstr "Klicken Sie hier, um das momentan geÃffnete Fenster zu schlieÃen"
+
+#~ msgid "Click here to view help available"
+#~ msgstr "Klicken Sie hier, um die verfÃgbare Hilfe anzuzeigen"
+
+#~ msgid "Click here to save the current window"
+#~ msgstr "Klicken Sie hier, um das momentan geÃffnete Fenster zu speichern"
+
+#~ msgid "Click here to attach a file"
+#~ msgstr "Klicken Sie hier, um eine Datei beizulegen"
+
+#~ msgid "_Alarms"
+#~ msgstr "_Alarme"
+
+#~ msgid "The organizer selected no longer has an account."
+#~ msgstr "Dem gewÃhlten Organisator ist kein Konto mehr zugeordnet."
+
+#~ msgctxt "cal-alarms"
+#~ msgid "None"
+#~ msgstr "Keine"
+
+#~ msgid "Custom Alarm:"
+#~ msgstr "Benutzerdefinierter Alarm:"
+
+#~ msgid "_Alarm"
+#~ msgstr "A_larm"
+
+#~ msgid "_Group:"
+#~ msgstr "_Gruppe:"
+
+#~ msgid "It has alarms."
+#~ msgstr "Es enthÃlt Alarme."
+
+#~ msgctxt "iCalImp"
+#~ msgid "has alarms"
+#~ msgstr "enthÃlt Alarme"
+
+#~ msgid "Run Anjal in a window"
+#~ msgstr "Anjal in einem Fenster ausfÃhren"
+
+#~ msgid "Make Anjal the default email client"
+#~ msgstr "Anjal als vorgegebenes E-Mail-Programm festlegen"
+
+#~ msgid "Anjal email client"
+#~ msgstr "Anjal E-Mail-Programm"
+
+#~ msgid "Opening folder '%s'"
+#~ msgstr "Ordner Â%s wird geÃffnet"
+
+#~ msgid "Scanning folders in \"%s\""
+#~ msgstr "Ordner in Â%s werden eingelesen"
+
+#~ msgid "Creating folder '%s'"
+#~ msgstr "Ordner Â%s wird angelegt"
+
+#~ msgid "_Default junk plugin:"
+#~ msgstr "_Vorgabe-UnerwÃnscht-Plugin:"
+
+#~ msgid "_Use Secure Connection:"
+#~ msgstr "_Sichere Verbindung verwenden:"
+
+#~ msgid "Scanning folders in '%s'"
+#~ msgstr "Ordner in Â%s werden eingelesen"
+
+#~ msgid "Retrieving quota information for folder '%s'"
+#~ msgstr ""
+#~ "Informationen Ãber Speicherplatzlimit fÃr Ordner Â%s werden abgerufen"
+
+#~ msgid "Opening store '%s'"
+#~ msgstr "Speicher Â%s wird geÃffnet"
+
+#~ msgid "Error saving messages to: %s:\n"
+#~ msgstr "Fehler beim Speichern der Nachrichten in: %s:\n"
+
+#~ msgid "Checking Service"
+#~ msgstr "Dienst wird ÃberprÃft"
+
+#~ msgid "Updating Search Folders for '%s'"
+#~ msgstr "Suchordner fÃr Â%s werden aktualisiert"
+
+#~ msgid "Delete messages in Search Folder \"{0}\"?"
+#~ msgstr "Nachrichten im Suchordner Â{0}Â lÃschen?"
+
+#~ msgid "Alarm programs"
+#~ msgstr "Alarmprogramme"
+
+#~ msgctxt "mail-junk-hook"
+#~ msgid "None"
+#~ msgstr "Kein"
+
+#~ msgid "Header Value Contains:"
+#~ msgstr "Wert der Kopfzeile enthÃlt:"
+
+#~ msgid "%s plugin is available and the binary is installed."
+#~ msgstr "%s-Plugin ist verfÃgbar und das zugehÃrige Programm ist installiert."
+
+#~ msgid ""
+#~ "%s plugin is not available. Please check whether the package is installed."
+#~ msgstr ""
+#~ "%s-Plugin ist nicht verfÃgbar. Bitte prÃfen Sie, ob das zugehÃrige "
+#~ "Programmpaket installiert ist."
+
+#~ msgid "No junk plugin available"
+#~ msgstr "Kein UnerwÃnscht-Plugin verfÃgbar"
+
+#~ msgid "_Add attachment..."
+#~ msgstr "Anlage _hinzufÃgen â"
+
+#~ msgid "Bogofilter is not available. Please install it first."
+#~ msgstr "Bogofilter ist nicht verfÃgbar. Bitte installieren Sie es zunÃchst."
+
+#~ msgid "Error occurred while spawning %s: %s."
+#~ msgstr "Beim Aufrufen von %s ist ein Fehler aufgetreten: %s"
+
+#~ msgid "Bogofilter child process does not respond, killing..."
+#~ msgstr "Bogofilter-Kindprozess antwortet nicht. Wird abgewÃrgt â"
+
+#~ msgid "Wait for Bogofilter child process interrupted, terminating..."
+#~ msgstr "Warten auf Bogofilter-Kindprozess abgebrochen. Wird beendet â"
+
+#~ msgid "Pipe to Bogofilter failed, error code: %d."
+#~ msgstr "Weiterleitung an Bogofilter gescheitert, Fehler-Code: %d"
+
+#~ msgid "Bogofilter Junk Filter"
+#~ msgstr "Bogofilter Filter fÃr UnerwÃnschtes"
+
+#~ msgid "Filter junk messages using Bogofilter."
+#~ msgstr "Filtert unerwÃnschte Nachrichten mit Bogofilter."
+
+#~ msgid "Use _SSL"
+#~ msgstr "_SSL verwenden"
+
+#~ msgid "_Secure connection"
+#~ msgstr "_Sichere Verbindung"
+
+#~ msgid "Show a map of all the contacts"
+#~ msgstr "Eine Karte aller Kontakte anzeigen"
+
+#~ msgid "Add a map showing the location of contacts when possible."
+#~ msgstr ""
+#~ "Wenn mÃglich, eine Karte hinzufÃgen, die den Ort von Kontakten anzeigt."
+
+#~ msgid "Map for contacts"
+#~ msgstr "Karte fÃr Kontakte"
+
+#~ msgid "Checklist"
+#~ msgstr "Checkliste"
+
+#~ msgid "Enter password for %s (user %s)"
+#~ msgstr "Geben Sie das Passwort fÃr %s ein (Benutzer %s)"
+
+#~ msgid "Failed to authenticate.\n"
+#~ msgstr "Legitimation gescheitert.\n"
+
+#~ msgid "New _Shared Folder..."
+#~ msgstr "Neue Ordner_freigabe â"
+
+#~ msgid "_Proxy Login..."
+#~ msgstr "_Vertretungsanmeldung â"
+
+#~ msgid "Junk Mail Settings..."
+#~ msgstr "Einstellungen zu unerwÃnschten Nachrichten â"
+
+#~ msgid "Track Message Status..."
+#~ msgstr "Nachrichtenstatus verfolgen â"
+
+#~ msgid "Retract Mail"
+#~ msgstr "E-Mail zurÃckziehen"
+
+#~ msgid "Accept"
+#~ msgstr "Annehmen"
+
+#~ msgid "Accept Tentatively"
+#~ msgstr "VorlÃufig annehmen"
+
+#~ msgid "Decline"
+#~ msgstr "Ablehnen"
+
+#~ msgid "Rese_nd Meeting..."
+#~ msgstr "Besprechung er_neut versenden â"
+
+#~ msgid "Create folder"
+#~ msgstr "Ordner anlegen"
+
+#~ msgid ""
+#~ "The user '%s' has shared a folder with you\n"
+#~ "\n"
+#~ "Message from '%s'\n"
+#~ "\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "\n"
+#~ "Click 'Apply' to install the shared folder\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Der Benutzer Â%s teilt einen Ordner mit Ihnen \n"
+#~ "\n"
+#~ "Nachricht von Â%sÂ\n"
+#~ "\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "\n"
+#~ "Klicken Sie auf ÂAnwendenÂ, um den gemeinsamen Ordner einzurichten\n"
+#~ "\n"
+
+#~ msgid "Install the shared folder"
+#~ msgstr "Gemeinsamen Ordner einrichten"
+
+#~ msgid "Shared Folder Installation"
+#~ msgstr "Einrichten von Gemeinsamen Ordnern"
+
+#~ msgid "Junk Settings"
+#~ msgstr "Einstellungen zu unerwÃnschten Nachrichten"
+
+#~ msgid "Junk Mail Settings"
+#~ msgstr "Einstellungen zu unerwÃnschten Nachrichten"
+
+#~ msgid "Email:"
+#~ msgstr "E-Mail:"
+
+#~ msgid "Junk List:"
+#~ msgstr "UnerwÃnscht-Liste:"
+
+#~ msgid "_Enable"
+#~ msgstr "A_ktivieren"
+
+#~ msgid "_Junk List"
+#~ msgstr "_UnerwÃnscht-Liste"
+
+#~ msgid "Message Retract"
+#~ msgstr "Nachricht zurÃckziehen"
+
+#~ msgid ""
+#~ "Retracting a message may remove it from the recipient's mailbox. Are you "
+#~ "sure you want to do this?"
+#~ 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?"
+
+#~ msgid "Message retracted successfully"
+#~ msgstr ""
+#~ "Aktivieren der Seitenleisten-Suchfunktion, damit Sie interaktiv suchen "
+#~ "kÃnnen, indem Sie lediglich zu tippen beginnen. Benutzen Sie dies, damit "
+#~ "Sie Ordner finden, indem Sie nur dessen Name tippen, die Auswahl springt "
+#~ "dann sofort zu diesem Ordner."
+
+#~ msgid "Insert Send options"
+#~ msgstr "Versandoptionen einfÃgen"
+
+#~ msgid "The participants will receive the following notification.\n"
+#~ msgstr "Die berechtigten Nutzer werden folgende Benachrichtigung erhalten.\n"
+
+#~ msgid "Add Send Options to GroupWise messages"
+#~ msgstr "Versandoptionen zu GroupWise-Nachrichten hinzufÃgen"
+
+#~ msgid "Fine-tune your GroupWise accounts."
+#~ msgstr "GroupWise-Konten genau abstimmen."
+
+#~ msgid "GroupWise Features"
+#~ msgstr "GroupWise-Funktionen"
+
+#~ msgid "Message retract failed"
+#~ msgstr "ZurÃckziehen gescheitert"
+
+#~ msgid "The server did not allow the selected message to be retracted."
+#~ msgstr "Der Server gestattete nicht, die gewÃhlte Nachricht zurÃckzuziehen."
+
+#~ msgid ""
+#~ "Account &quot;{0}&quot; already exists. Please check your folder tree."
+#~ msgstr ""
+#~ "Es existiert bereits ein Konto namens Â{0}Â. Bitte ÃberprÃfen Sie Ihre "
+#~ "Ordner-Hierarchie."
+
+#~ msgid "Account Already Exists"
+#~ msgstr "Konto existiert bereits"
+
+#~ msgid "Invalid user"
+#~ msgstr "UngÃltiger Benutzer"
+
+#~ msgid ""
+#~ "Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+#~ "address and try again."
+#~ msgstr ""
+#~ "Anmeldung als Â{0}Â am Proxy war nicht mÃglich. Bitte ÃberpÃfen Sie Ihre E-"
+#~ "Mail-Adresse und versuchen es erneut."
+
+#~ msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+#~ msgstr "Dem Benutzer Â{0}Â konnte kein Zugriff auf den Proxy gewÃhrt werden"
+
+#~ msgid "Specify User"
+#~ msgstr "Benutzer auswÃhlen"
+
+#~ msgid "You have already given proxy permissions to this user."
+#~ msgstr "Sie haben diesem Benutzer bereits Zugriff auf den Proxy gewÃhrt."
+
+#~ msgid "You have to specify a valid user name to give proxy rights."
+#~ msgstr ""
+#~ "Sie mÃssen einen gÃltigen Benutzernamen eingeben, um Zugriff auf den Proxy "
+#~ "zu gewÃhren."
+
+#~ msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
+#~ msgstr ""
+#~ "Sie kÃnnen diesen Ordner nicht mit dem angegebenen Benutzer Â{0}Â teilen"
+
+#~ msgid "You have to specify a user name which you want to add to the list"
+#~ msgstr ""
+#~ "Sie mÃssen einen Benutzernamen festlegen, der zur Liste hinzugefÃgt werden "
+#~ "soll"
+
+#~ msgid "Do you want to resend the meeting?"
+#~ msgstr "Wollen Sie diese Besprechung erneut verschicken?"
+
+#~ msgid "Do you want to resend the recurring meeting?"
+#~ msgstr "Wollen Sie diese wiederkehrende Besprechung erneut verschicken?"
+
+#~ msgid "Do you want to retract the original item?"
+#~ msgstr "Wollen Sie das ursprÃngliche Objekt zurÃckziehen?"
+
+#~ msgid "The original will be removed from the recipient's mailbox."
+#~ msgstr "Das Original wird aus dem Postfach des EmpfÃngers gelÃscht."
+
+#~ msgid "This is a recurring meeting"
+#~ msgstr "Dies ist eine wiederkehrende Besprechung"
+
+#~ msgid "This will create a new meeting using the existing meeting details."
+#~ msgstr ""
+#~ "Dies wird eine neue Besprechung mit den vorhandenen Besprechungsdetails "
+#~ "erstellen."
+
+#~ msgid ""
+#~ "This will create a new meeting with the existing meeting details. The "
+#~ "recurrence rule needs to be re-entered."
+#~ msgstr ""
+#~ "Dies wird eine neue Besprechung mit den vorhandenen Besprechungsdetails "
+#~ "erstellen. Details zur Wiederkehr mÃssen erneut eingegeben werden."
+
+#~ msgid "Would you like to accept it?"
+#~ msgstr "Wollen Sie dies akzeptieren?"
+
+#~ msgid "Would you like to decline it?"
+#~ msgstr "Wollen Sie dies ablehnen?"
+
+#~ msgid "C_ustomize notification message"
+#~ msgstr "Benachrichtigung an_passen"
+
+#~ msgid "Con_tacts..."
+#~ msgstr "Kon_takte â"
+
+#~ msgid "Shared Folder Notification"
+#~ msgstr "Benachrichtigung zur Ordnerfreigabe"
+
+#~ msgid "Users:"
+#~ msgstr "Benutzer:"
+
+#~ msgid "_Not Shared"
+#~ msgstr "_Nicht freigeben"
+
+#~ msgid "_Shared With..."
+#~ msgstr "_Freigegeben fÃr â"
+
+#~ msgid "Access Rights"
+#~ msgstr "Zugriffsrechte"
+
+#~ msgid "Add/Edit"
+#~ msgstr "HinzufÃgen/Bearbeiten"
+
+#~ msgid "Con_tacts"
+#~ msgstr "Kon_takte"
+
+#~ msgid "Modify _folders/options/rules/"
+#~ msgstr "O_rdner/Optionen/Regeln Ãndern"
+
+#~ msgid "Read items marked _private"
+#~ msgstr "Gelesene Objekte als _privat kennzeichnen"
+
+#~ msgid "Subscribe to my _alarms"
+#~ msgstr "Eigene A_larme weitergeben"
+
+#~ msgid "Subscribe to my _notifications"
+#~ msgstr "Eigene Hin_weise weitergeben"
+
+#~ msgid "_Write"
+#~ msgstr "S_chreiben"
+
+#~ msgid "permission to read|_Read"
+#~ msgstr "_Lesen"
+
+#~ msgid "Proxy"
+#~ msgstr "Vertretung"
+
+#~ msgid "Proxy Login"
+#~ msgstr "Vertretungsanmeldung"
+
+#~ msgid "%sEnter password for %s (user %s)"
+#~ msgstr "%sPasswort fÃr %s (Benutzer %s) eingeben"
+
+#~ 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."
+
+#~ 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."
+
+#~ msgctxt "GW"
+#~ msgid "Proxy"
+#~ msgstr "Proxy"
+
+#~ msgid "Add User"
+#~ msgstr "Benutzer hinzufÃgen"
+
+#~ msgid "Advanced send options"
+#~ msgstr "Erweiterte Versandoptionen"
+
+#~ msgid "Users"
+#~ msgstr "Benutzer"
+
+#~ msgid "Enter the users and set permissions"
+#~ msgstr "Eingabe der Benutzer und Festlegen der Rechte"
+
+#~ msgid "Sharing"
+#~ msgstr "Freigeben"
+
+#~ msgid "Custom Notification"
+#~ msgstr "Eigene Benachrichtigung"
+
+#~ msgid "Add   "
+#~ msgstr "HinzufÃgen   "
+
+#~ msgid "Modify"
+#~ msgstr "Ãndern"
+
+#~ msgid "Message Status"
+#~ msgstr "Nachrichtenstatus"
+
+#~ msgid "Subject:"
+#~ msgstr "Betreff:"
+
+#~ msgid "From:"
+#~ msgstr "Von:"
+
+#~ msgid "Creation date:"
+#~ msgstr "Erstellungsdatum:"
+
+#~ msgid "Recipient: "
+#~ msgstr "EmpfÃnger: "
+
+#~ msgid "Delivered: "
+#~ msgstr "Zugestellt: "
+
+#~ msgid "Opened: "
+#~ msgstr "GeÃffnet: "
+
+#~ msgid "Accepted: "
+#~ msgstr "Angenommen: "
+
+#~ msgid "Deleted: "
+#~ msgstr "GelÃscht: "
+
+#~ msgid "Declined: "
+#~ msgstr "Abgelehnt: "
+
+#~ msgid "Completed: "
+#~ msgstr "Abgeschlossen: "
+
+#~ msgid "Undelivered: "
+#~ msgstr "Nicht zugestellt: "
+
+#~ msgid "Enable D-Bus messages."
+#~ msgstr "Aktiviert D-Bus-Nachrichten."
+
+#~ msgid "Generates a D-Bus message when new mail messages arrive."
+#~ msgstr "Erzeugung einer D-Bus-Nachricht, wenn eine neue E-Mail eintrifft."
+
+#~ msgid "Popup message together with the icon."
+#~ msgstr "Popup-Fenster zusammen mit dem Symbol anzeigen."
+
+#~ msgid "Whether show message over the icon when new messages arrive."
+#~ msgstr ""
+#~ "Legt fest, ob eine Popup-Nachricht zusammen mit dem Symbol angezeigt "
+#~ "werden soll, wenn neue Nachrichten eintreffen."
+
+#~ msgid "Show icon in _notification area"
+#~ msgstr "Symbol im _Benachrichtigungsfeld anzeigen"
+
+#~ msgid "Popup _message together with the icon"
+#~ msgstr "Popup-_Nachricht zusammen mit Symbol anzeigen"
+
+#~ msgid "Generate a _D-Bus message"
+#~ msgstr "Eine _D-Bus-Nachricht erzeugen"
+
+#~ msgid ""
+#~ "Selected calendar contains some events for the given mails already. Would "
+#~ "you like to create new events anyway?"
+#~ msgstr ""
+#~ "Der ausgewÃhlte Kalender enthÃlt bereits einige Ereignisse fÃr die "
+#~ "vorliegenden E-Mails. MÃchten Sie dennoch neue Ereignisse erstellen?"
+
+#~ msgid ""
+#~ "Selected task list contains some tasks for the given mails already. Would "
+#~ "you like to create new tasks anyway?"
+#~ msgstr ""
+#~ "Die ausgewÃhlte Aufgabenliste enthÃlt bereits einige Aufgaben fÃr die "
+#~ "vorliegenden E-Mails. MÃchten Sie dennoch neue Aufgaben erstellen?"
+
+#~ msgid ""
+#~ "Selected memo list contains some memos for the given mails already. Would "
+#~ "you like to create new memos anyway?"
+#~ msgstr ""
+#~ "Die ausgewÃhlte Notizliste enthÃlt bereits einige Notizen fÃr die "
+#~ "vorliegenden E-Mails. MÃchten Sie dennoch neue Notizen erstellen?"
+
+#~ msgid ""
+#~ "Selected calendar contains an event for the given mail already. Would you "
+#~ "like to create new event anyway?"
+#~ msgid_plural ""
+#~ "Selected calendar contains events for the given mails already. Would you "
+#~ "like to create new events anyway?"
+#~ msgstr[0] ""
+#~ "Der ausgewÃhlte Kalender enthÃlt bereits ein Ereignis fÃr die vorliegende "
+#~ "E-Mail. MÃchten Sie dennoch ein neues Ereignis erstellen?"
+#~ msgstr[1] ""
+#~ "Der ausgewÃhlte Kalender enthÃlt bereits Ereignisse fÃr die vorliegenden E-"
+#~ "Mails. MÃchten Sie dennoch neue Ereignisse erstellen?"
+
+#~ msgid ""
+#~ "Selected task list contains a task for the given mail already. Would you "
+#~ "like to create new task anyway?"
+#~ msgid_plural ""
+#~ "Selected task list contains tasks for the given mails already. Would you "
+#~ "like to create new tasks anyway?"
+#~ msgstr[0] ""
+#~ "Die ausgewÃhlte Aufgabenliste enthÃlt bereits eine Aufgabe fÃr die "
+#~ "vorliegende E-Mail. MÃchten Sie dennoch eine neue Aufgabe erstellen?"
+#~ msgstr[1] ""
+#~ "Die ausgewÃhlte Aufgabenliste enthÃlt bereits einige Aufgaben fÃr die "
+#~ "vorliegenden E-Mails. MÃchten Sie dennoch neue Aufgaben erstellen?"
+
+#~ msgid ""
+#~ "Selected memo list contains a memo for the given mail already. Would you "
+#~ "like to create new memo anyway?"
+#~ msgid_plural ""
+#~ "Selected memo list contains memos for the given mails already. Would you "
+#~ "like to create new memos anyway?"
+#~ msgstr[0] ""
+#~ "Die ausgewÃhlte Notizliste enthÃlt bereits eine Notiz fÃr die vorliegende "
+#~ "E-Mail. MÃchten Sie dennoch eine neue Notiz erstellen?"
+#~ msgstr[1] ""
+#~ "Die ausgewÃhlte Notizliste enthÃlt bereits einige Notizen fÃr die "
+#~ "vorliegenden E-Mails. MÃchten Sie dennoch neue Notizen erstellen?"
+
+#~ msgid "Evolution Profiler"
+#~ msgstr "Evolution-Profiler"
+
+#~ msgid "Profile data events in Evolution (for developers only)."
+#~ msgstr ""
+#~ "Effizienzanalyse von Datenereignissen in Evolution (nur fÃr Entwickler)."
+
+#~ msgid "SpamAssassin not found, code: %d"
+#~ msgstr "SpamAssassin nicht gefunden, Fehler-Code: %d"
+
+#~ msgid "Failed to create pipe: %s"
+#~ msgstr "Weiterleitung konnte nicht angelegt werden: %s"
+
+#~ msgid "Error after fork: %s"
+#~ msgstr "Fehler nach Fork: %s"
+
+#~ msgid "SpamAssassin child process does not respond, killing..."
+#~ msgstr "SpamAssassin-Kindprozess antwortet nicht. Wird abgewÃrgt â"
+
+#~ msgid "Wait for SpamAssassin child process interrupted, terminating..."
+#~ msgstr "Warten auf SpamAssassin-Kindprozess abgebrochen. Wird beendet â"
+
+#~ msgid "Pipe to SpamAssassin failed, error code: %d"
+#~ msgstr "Weiterleitung an SpamAssassin gescheitert, Fehler-Code: %d"
+
+#~ msgid "SpamAssassin is not available. Please install it first."
+#~ msgstr ""
+#~ "SpamAssassin ist nicht verfÃgbar. Bitte installieren Sie es zunÃchst."
+
+#~ msgid "SpamAssassin Junk Filter"
+#~ msgstr "SpamAssassin-UnerwÃnscht-Filter"
+
+#~ msgid "iCalendar format (.ics)"
+#~ msgstr "iCalendar-Format (.ics)"
+
+#~ msgid "Drafts based template plugin"
+#~ msgstr "Vorlagen-Plugin basierend auf EntwÃrfen"
+
+#~ msgid "Failed to import contact's certificate"
+#~ msgstr "Zertifikat des Kontakts konnte nicht importiert werden"
+
+#~ msgid "E-Mail Address"
+#~ msgstr "E-Mail-Adresse"
+
+#~ msgid "Failed to import certificate authority's certificate"
+#~ msgstr ""
+#~ "Das Zertifikat der Zertifizierungsstelle konnte nicht importiert werden"



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