[evolution] [i18n] Updated German translation

From: Mario Blättermann <mariobl src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution] [i18n] Updated German translation
Date: Fri, 8 Oct 2010 18:53:38 +0000 (UTC)
commit fa77498dfb702bbe8dbff28e43f424751daa8cb4
Author: Mario BlÃ¤ttermann <mariobl gnome org>
Date:   Fri Oct 8 20:52:44 2010 +0200

    [i18n] Updated German translation

 po/de.po | 4937 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 2480 insertions(+), 2457 deletions(-)
---
diff --git a/po/de.po b/po/de.po
index 2c12008..cb7e5a1 100644
--- a/po/de.po
+++ b/po/de.po
@@ -20,14 +20,13 @@
 # Mario BlÃ¤ttermann <mariobl gnome org>, 2010.
 # Christian Kirbach <Christian Kirbach googlemail com>, 2009, 2010.
 #
-#: ../shell/main.c:559
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution\n"
-"POT-Creation-Date: 2010-09-15 18:37+0000\n"
-"PO-Revision-Date: 2010-09-16 15:45+0100\n"
+"POT-Creation-Date: 2010-10-08 12:54+0000\n"
+"PO-Revision-Date: 2010-10-08 20:20+0100\n"
 "Last-Translator: Mario BlÃ¤ttermann <mariobl gnome org>\n"
 "Language-Team: Deutsch <gnome-de gnome org>\n"
 "MIME-Version: 1.0\n"
@@ -106,7 +105,7 @@ msgid "Delete address book '{0}'?"
 msgstr "Adressbuch Â»{0}Â« lÃ¶schen?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:46
 msgid "Do _Not Delete"
 msgstr "_Nicht lÃ¶schen"
 
@@ -120,7 +119,7 @@ msgstr "Legitimation am LDAP-Server gescheitert."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1277
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1278
 msgid "Failed to delete contact"
 msgstr "Kontakt konnte nicht gelÃ¶scht werden"
 
@@ -146,8 +145,8 @@ msgstr "Das Evolution-Adressbuch wurde unerwartet beendet."
 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
 msgid ""
@@ -156,8 +155,8 @@ msgid ""
 "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
 msgid "This address book could not be opened."
@@ -212,8 +211,8 @@ msgstr ""
 #: ../addressbook/addressbook.error.xml.h:33
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
-"problems using Evolution. For best results the server should be upgraded to "
-"a 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 "
@@ -243,7 +242,7 @@ msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:37 ../mail/em-vfolder-rule.c:525
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
-#: ../plugins/groupwise-features/properties.ui.h:10
+#: ../plugins/groupwise-features/properties.ui.h:9
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "_HinzufÃ¼gen"
@@ -266,7 +265,7 @@ msgstr "_Wie es ist benutzen"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:2020
+#: ../calendar/gui/e-calendar-view.c:2027
 msgid "Anniversary"
 msgstr "Jahrestag"
 
@@ -277,7 +276,7 @@ msgstr "Jahrestag"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:2019 ../capplet/anjal-settings-main.c:123
+#: ../calendar/gui/e-calendar-view.c:2026 ../capplet/anjal-settings-main.c:123
 #: ../shell/main.c:128
 msgid "Birthday"
 msgstr "Geburtstag"
@@ -315,7 +314,7 @@ msgstr "Kontakteditor"
 #: ../addressbook/gui/widgets/eab-contact-display.c:517
 #: ../addressbook/gui/widgets/eab-contact-display.c:525
 #: ../addressbook/gui/widgets/eab-contact-display.c:811
-#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:832
+#: ../plugins/groupwise-features/junk-settings.c:409 ../smime/lib/e-cert.c:832
 msgid "Email"
 msgstr "E-Mail"
 
@@ -374,7 +373,7 @@ msgstr "Notizen"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1725
+#: ../calendar/gui/e-calendar-view.c:1732
 msgid "Other"
 msgstr "Weitere"
 
@@ -426,9 +425,9 @@ msgid "_Blog:"
 msgstr "_Blog:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-#: ../calendar/gui/dialogs/event-page.c:882
+#: ../calendar/gui/dialogs/event-page.c:885
 #: ../calendar/gui/dialogs/event-page.ui.h:11
-#: ../plugins/itip-formatter/itip-view.c:1921
+#: ../plugins/itip-formatter/itip-view.c:1922
 msgid "_Calendar:"
 msgstr "_Kalender:"
 
@@ -547,7 +546,7 @@ msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:208
-#: ../addressbook/gui/widgets/eab-gui-util.c:352
+#: ../addressbook/gui/widgets/eab-gui-util.c:371
 msgid "Error adding contact"
 msgstr "Fehler beim HinzufÃ¼gen eines Kontakts"
 
@@ -687,7 +686,7 @@ msgid "_Suffix:"
 msgstr "_Suffix:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:657
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:659
 msgid "Contact List Editor"
 msgstr "Kontaktlisteneditor"
 
@@ -704,7 +703,7 @@ msgid "_List name:"
 msgstr "_Listenname:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:173
+#: ../mail/mail-config.ui.h:154
 msgid "_Select..."
 msgstr "A_uswÃ¤hlen â?¦"
 
@@ -714,24 +713,24 @@ msgstr ""
 "_Geben Sie eine E-Mail-Adresse ein oder ziehen Sie einen Kontakt auf die "
 "unten stehende Liste:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:751
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:753
 msgid "Contact List Members"
 msgstr "Kontaktlistenmitglieder"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:905
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1320
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:907
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1322
 msgid "_Members"
 msgstr "_Mitglieder"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1160
 msgid "Error adding list"
 msgstr "Fehler beim HinzufÃ¼gen einer Liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1172
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1174
 msgid "Error modifying list"
 msgstr "Fehler beim Ã?ndern einer Liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1186
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1188
 msgid "Error removing list"
 msgstr "Fehler beim Entfernen einer Liste"
 
@@ -851,33 +850,33 @@ 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:1296
 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:1300
 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:1304
 #, 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:1310
 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:1314
 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:1318
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Sind Sie sicher, dass Sie diesen Kontakt lÃ¶schen wollen (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1472
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1473
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -886,11 +885,11 @@ msgstr ""
 "Das Ã?ffnen von %d Kontakten wÃ¼rde dazu fÃ¼hren, dass %d zusÃ¤tzliche Fenster "
 "geÃ¶ffnet werden. Wollen Sie wirklich diese Kontakte anzeigen?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1477
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1478
 msgid "_Don't Display"
 msgstr "_Nicht anzeigen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1478
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1479
 msgid "Display _All Contacts"
 msgstr "_Alle Kontakte anzeigen"
 
@@ -1062,7 +1061,7 @@ msgstr "Einheit"
 msgid "Web Site"
 msgstr "Website"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -1072,7 +1071,7 @@ msgstr ""
 "\n"
 "Suche nach Kontakten â?¦"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:186
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -1086,7 +1085,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:192
 msgid ""
 "\n"
 "\n"
@@ -1100,7 +1099,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:196
 msgid ""
 "\n"
 "\n"
@@ -1110,7 +1109,7 @@ msgstr ""
 "\n"
 "Suche nach dem Kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:195
+#: ../addressbook/gui/widgets/e-minicard-view.c:198
 msgid ""
 "\n"
 "\n"
@@ -1120,16 +1119,16 @@ msgstr ""
 "\n"
 "In dieser Ansicht existieren keine anzuzeigenden EintrÃ¤ge."
 
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:102
 msgid "Work Email"
 msgstr "E-Mail, geschÃ¤ftlich"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:103
 msgid "Home Email"
 msgstr "E-Mail, privat"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:807
+#: ../addressbook/gui/widgets/e-minicard.c:104
+#: ../addressbook/gui/widgets/e-minicard.c:810
 msgid "Other Email"
 msgstr "Weitere E-Mail-Adresse"
 
@@ -1224,7 +1223,7 @@ msgstr "Video-Chat"
 #: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../modules/calendar/e-cal-shell-view-actions.c:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:488
+#: ../modules/calendar/e-cal-shell-view.c:497
 #: ../plugins/groupwise-features/camel-gw-listener.c:421
 #: ../plugins/groupwise-features/camel-gw-listener.c:446
 #: ../plugins/groupwise-features/camel-gw-listener.c:561
@@ -1268,7 +1267,7 @@ msgstr "Weblog"
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:350
+#: ../capplet/settings/mail-capplet-shell.c:353
 #: ../modules/addressbook/e-book-shell-backend.c:116
 #: ../modules/addressbook/e-book-shell-migrate.c:138
 #: ../modules/calendar/e-cal-shell-backend.c:127
@@ -1301,26 +1300,25 @@ msgstr "Klicken Sie hier, um eine E-Mail an %s zu verfassen"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:71
 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:80
+#: ../addressbook/gui/widgets/eab-gui-util.c:98
 #, 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:92
+#: ../addressbook/gui/widgets/eab-gui-util.c:111
 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."
@@ -1329,7 +1327,7 @@ msgstr ""
 "Falls Sie LDAP in Evolution verwenden wollen, mÃ¼ssen Sie eine LDAP-mÃ¤chtige "
 "Evolution-Version installieren."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:101
+#: ../addressbook/gui/widgets/eab-gui-util.c:120
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1338,11 +1336,11 @@ msgstr ""
 "Sie eine falsche Adresse eingegeben haben, oder dass der Server nicht "
 "erreichbar ist."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:109
+#: ../addressbook/gui/widgets/eab-gui-util.c:128
 msgid "Detailed error message:"
 msgstr "AusfÃ¼hrliche Fehlernachricht:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:133
+#: ../addressbook/gui/widgets/eab-gui-util.c:152
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1354,7 +1352,7 @@ msgstr ""
 "oder erhÃ¶hen Sie das Zeitlimit in den Einstellungen des\n"
 "Verzeichnis-Servers fÃ¼r dieses Adressbuch."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#: ../addressbook/gui/widgets/eab-gui-util.c:159
 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"
@@ -1367,7 +1365,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:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:167
 #, c-format
 msgid "The backend for this address book was unable to parse this query. %s"
 msgstr ""
@@ -1375,7 +1373,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:153
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 #, c-format
 msgid "The backend for this address book refused to perform this query. %s"
 msgstr ""
@@ -1383,37 +1381,37 @@ 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:158
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
 #, 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:183
+#: ../addressbook/gui/widgets/eab-gui-util.c:202
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:223
+#: ../addressbook/gui/widgets/eab-gui-util.c:242
 msgid "Select Address Book"
 msgstr "Adressbuch auswÃ¤hlen"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:286
+#: ../addressbook/gui/widgets/eab-gui-util.c:305
 msgid "list"
 msgstr "Liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:425
+#: ../addressbook/gui/widgets/eab-gui-util.c:444
 msgid "Move contact to"
 msgstr "Kontakt verschieben nach"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:427
+#: ../addressbook/gui/widgets/eab-gui-util.c:446
 msgid "Copy contact to"
 msgstr "Kontakt kopieren nach"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:430
+#: ../addressbook/gui/widgets/eab-gui-util.c:449
 msgid "Move contacts to"
 msgstr "Kontakt verschieben nach"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:432
+#: ../addressbook/gui/widgets/eab-gui-util.c:451
 msgid "Copy contacts to"
 msgstr "Kontakte kopieren nach"
 
@@ -1422,7 +1420,7 @@ msgid "Card View"
 msgstr "Kartenansicht"
 
 #: ../addressbook/importers/evolution-csv-importer.c:720
-#: ../addressbook/importers/evolution-ldif-importer.c:516
+#: ../addressbook/importers/evolution-ldif-importer.c:518
 #: ../addressbook/importers/evolution-vcard-importer.c:264
 #: ../calendar/importers/icalendar-importer.c:325
 #: ../calendar/importers/icalendar-importer.c:764 ../shell/shell.error.xml.h:6
@@ -1453,11 +1451,11 @@ msgstr "Evolution CSV oder Tab (.csv, .tab)"
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV- und Tab-Importeur"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:742
+#: ../addressbook/importers/evolution-ldif-importer.c:744
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP-Datenaustauschformat (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:743
+#: ../addressbook/importers/evolution-ldif-importer.c:745
 msgid "Evolution LDIF importer"
 msgstr "Evolution-LDIF-Importeur"
 
@@ -1516,8 +1514,7 @@ msgstr "Im asynchronen Modus exportieren"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:73
 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."
 
@@ -1526,8 +1523,7 @@ msgid "NUMBER"
 msgstr "ANZAHL"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:137
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
+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."
@@ -1563,8 +1559,7 @@ msgstr "Legitimation gescheitert.\n"
 msgid "Enter password for %s (user %s)"
 msgstr "Geben Sie das Passwort fÃ¼r %s ein (Benutzer %s)"
 
-#: ../addressbook/util/addressbook.c:230
-#: ../calendar/common/authentication.c:53
+#: ../addressbook/util/addressbook.c:230 ../calendar/common/authentication.c:53
 #: ../plugins/caldav/caldav-browse-server.c:813
 #: ../plugins/google-account-setup/google-source.c:438
 #: ../plugins/publish-calendar/publish-calendar.c:328
@@ -1592,8 +1587,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."
@@ -1609,8 +1604,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."
@@ -1620,8 +1615,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."
@@ -1640,8 +1634,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."
@@ -1655,8 +1648,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?"
@@ -1817,8 +1810,8 @@ msgstr ""
 
 #: ../calendar/calendar.error.xml.h:47
 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."
@@ -1829,13 +1822,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:49
 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."
@@ -1990,8 +1982,7 @@ msgstr ""
 "Ihre Aufgaben sind nicht verfÃ¼gbar, solange Evolution nicht neu gestartet "
 "wurde."
 
-#: ../calendar/calendar.error.xml.h:80
-#: ../composer/mail-composer.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:80 ../composer/mail-composer.error.xml.h:24
 msgid "_Discard Changes"
 msgstr "Ã?nderungen _verwerfen"
 
@@ -2003,8 +1994,8 @@ msgstr "_Speichern"
 msgid "_Save Changes"
 msgstr "Ã?nderungen _speichern"
 
-#: ../calendar/calendar.error.xml.h:83
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:141
+#: ../calendar/calendar.error.xml.h:83 ../composer/mail-composer.error.xml.h:28
+#: ../mail/mail.error.xml.h:146
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "Ab_schicken"
@@ -2013,19 +2004,19 @@ msgstr "Ab_schicken"
 msgid "_Send Notice"
 msgstr "Nachricht ver_schicken"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:101
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "Minute"
 msgstr[1] "Minuten"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "Stunde"
 msgstr[1] "Stunden"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:288
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:286
 msgid "Start time"
 msgstr "Anfangszeit"
 
@@ -2042,8 +2033,8 @@ msgstr "_Alle verwerfen"
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1598
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1604
-#: ../calendar/gui/e-itip-control.c:1175
-#: ../plugins/itip-formatter/itip-view.c:1043
+#: ../calendar/gui/e-itip-control.c:1176
+#: ../plugins/itip-formatter/itip-view.c:1044
 msgid "Location:"
 msgstr "Ort:"
 
@@ -2177,7 +2168,7 @@ msgid "Alarm programs"
 msgstr "Alarmprogramme"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:14
 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 "
@@ -2200,8 +2191,7 @@ msgid "Calendars to run alarms for"
 msgstr "Kalender, fÃ¼r die Alarme ausgefÃ¼hrt werden sollen"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
-msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+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)."
 
@@ -2226,8 +2216,8 @@ msgstr ""
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 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."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default appointment reminder"
@@ -2307,15 +2297,14 @@ msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 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."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Last alarm time"
 msgstr "Letzte Alarmzeit"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Level beyond which the message should be logged."
 msgstr "Protokolltyp, ab welchem die Nachricht protokolliert werden soll."
 
@@ -2343,8 +2332,8 @@ msgstr "Farbe der Marcus-Bains-Linie - Zeitleiste"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 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Â«."
@@ -2399,8 +2388,8 @@ 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."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
@@ -2584,10 +2573,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. "
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "The second timezone for a Day View"
@@ -2615,8 +2604,8 @@ msgstr "Zeitzone"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid ""
-"Transparency of the events in calendar views, a value between 0 "
-"(transparent) and 1 (opaque)."
+"Transparency of the events in calendar views, a value between 0 (transparent) "
+"and 1 (opaque)."
 msgstr ""
 "Transparenz der Ereignisse in der Kalenderansicht; ein Wert zwischen 0 "
 "(transparent) und 1 (deckend)."
@@ -2707,8 +2696,7 @@ msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid "Whether to hide completed tasks in the tasks view."
-msgstr ""
-"Sollen abgeschlossene Aufgaben in der Aufgabenansicht verborgen werden?"
+msgstr "Sollen abgeschlossene Aufgaben in der Aufgabenansicht verborgen werden?"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 msgid "Whether to scroll a Month View by a week, not by a month."
@@ -2722,8 +2710,7 @@ msgstr "Soll eine voreingestellte Erinnerung fÃ¼r Termine festgelegt werden?"
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr ""
-"Soll das UAwg-Feld im Ereignis-/Aufgaben-/Besprechungseditor angezeigt "
-"werden?"
+"Soll das UAwg-Feld im Ereignis-/Aufgaben-/Besprechungseditor angezeigt werden?"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Whether to show categories field in the event/meeting editor"
@@ -2743,8 +2730,7 @@ msgstr ""
 "werden?"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
-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?"
 
@@ -2756,8 +2742,7 @@ msgstr ""
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr ""
-"Soll das Artenfeld im Ereignis-/Aufgaben-/Besprechungseditor angezeigt "
-"werden?"
+"Soll das Artenfeld im Ereignis-/Aufgaben-/Besprechungseditor angezeigt werden?"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
 msgid "Whether to show week numbers in various places in the Calendar."
@@ -2831,7 +2816,7 @@ msgid "Classification"
 msgstr "Einstufung"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:525 ../calendar/gui/e-task-table.c:490
+#: ../calendar/gui/e-cal-model.c:534 ../calendar/gui/e-task-table.c:490
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:323
 #: ../widgets/misc/e-send-options.ui.h:2
@@ -2840,7 +2825,7 @@ msgstr "Vertraulich"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
-#: ../plugins/plugin-manager/plugin-manager.c:60
+#: ../modules/plugin-manager/evolution-plugin-manager.c:68
 #: ../widgets/misc/e-attachment-tree-view.c:524
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
@@ -2861,8 +2846,8 @@ 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:831
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
 #: ../plugins/save-calendar/csv-format.c:377
@@ -2875,30 +2860,27 @@ msgid "Organizer"
 msgstr "Organisator"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:523 ../calendar/gui/e-task-table.c:489
+#: ../calendar/gui/e-cal-model.c:532 ../calendar/gui/e-task-table.c:489
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Privat"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:514 ../calendar/gui/e-cal-model.c:521
+#: ../calendar/gui/e-cal-model.c:523 ../calendar/gui/e-cal-model.c:530
 #: ../calendar/gui/e-task-table.c:488 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Ã?ffentlich"
 
-#: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:322
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/dialogs/event-editor.c:322
 #: ../calendar/gui/dialogs/event-editor.c:343
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "Wiederholung"
 
-#: ../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:363
 msgid "Summary"
 msgstr "Zusammenfassung"
 
@@ -2956,7 +2938,7 @@ msgid "Add Alarm"
 msgstr "Alarm hinzufÃ¼gen"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-editor.c:360
+#: ../calendar/gui/dialogs/event-editor.c:362
 msgid "Alarm"
 msgstr "Alarm"
 
@@ -2972,7 +2954,7 @@ msgstr "Benutzerdefinierter Alarmklang"
 msgid "Mes_sage:"
 msgstr "_Nachricht:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:81
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:70
 msgid "Options"
 msgstr "Optionen"
 
@@ -3117,12 +3099,11 @@ msgstr "30 Minuten"
 msgid "60 minutes"
 msgstr "60 Minuten"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:7
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10
 msgid "Alerts"
 msgstr "Alarme"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
-#: ../mail/mail-config.ui.h:30
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11 ../mail/mail-config.ui.h:28
 #: ../modules/addressbook/autocompletion-config.c:156
 msgid "Date/Time Format"
 msgstr "Format von Datum/Zeit"
@@ -3149,7 +3130,7 @@ msgstr "Alarme nur im _Benachrichtigungsfeld anzeigen"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
 #: ../calendar/gui/dialogs/recurrence-page.c:1116
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Friday"
 msgstr "Freitag"
 
@@ -3157,9 +3138,9 @@ msgstr "Freitag"
 #: ../calendar/gui/dialogs/calendar-setup.c:369
 #: ../calendar/gui/dialogs/calendar-setup.c:380
 #: ../calendar/gui/dialogs/calendar-setup.c:391
-#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:56
+#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:49
 #: ../modules/addressbook/addressbook-config.c:1005
-#: ../plugins/itip-formatter/itip-formatter.c:2678
+#: ../plugins/itip-formatter/itip-formatter.c:2787
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
@@ -3175,12 +3156,11 @@ msgstr "Minuten"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
 #: ../calendar/gui/dialogs/recurrence-page.c:1112
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Monday"
 msgstr "Montag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
-#: ../mail/mail-config.ui.h:85
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23 ../mail/mail-config.ui.h:74
 msgid "Pick a color"
 msgstr "Eine Farbe auswÃ¤hlen"
 
@@ -3191,7 +3171,7 @@ msgstr "_So"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
 #: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/e-itip-control.c:740
 msgid "Saturday"
 msgstr "Samstag"
 
@@ -3223,7 +3203,7 @@ msgstr "_Wochennummern anzeigen"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
 #: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Sunday"
 msgstr "Sonntag"
 
@@ -3247,13 +3227,13 @@ msgstr "Vorlage:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
 #: ../calendar/gui/dialogs/recurrence-page.c:1115
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Thursday"
 msgstr "Donnerstag"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 #: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:595
+#: ../widgets/misc/e-dateedit.c:598
 msgid "Time"
 msgstr "Uhrzeit"
 
@@ -3268,7 +3248,7 @@ msgstr "Zeitformat:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
 #: ../calendar/gui/dialogs/recurrence-page.c:1113
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Tuesday"
 msgstr "Dienstag"
 
@@ -3278,7 +3258,7 @@ msgstr "Zeitzone des S_ystems verwenden"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
 #: ../calendar/gui/dialogs/recurrence-page.c:1114
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Wednesday"
 msgstr "Mittwoch"
 
@@ -3376,9 +3356,9 @@ msgstr "Art:"
 msgid "_Type:"
 msgstr "A_rt:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:165
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:147
 #: ../modules/addressbook/ldap-config.ui.h:26
-#: ../plugins/groupwise-features/properties.ui.h:11
+#: ../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:286
 msgid "_Name:"
@@ -3482,239 +3462,237 @@ msgstr "%s  Sie haben keine Ã?nderungen vorgenommen, den Editor aktualisieren?"
 msgid "Validation error: %s"
 msgstr "Validierungsfehler: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:246
+#: ../calendar/gui/dialogs/comp-editor.c:252
 msgid "Could not save attachments"
 msgstr "Die Anlagen konnten nicht gespeichert werden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:522
+#: ../calendar/gui/dialogs/comp-editor.c:528
 msgid "Could not update object"
 msgstr "Objekt konnte nicht aktualisiert werden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:637
+#: ../calendar/gui/dialogs/comp-editor.c:643
 msgid "Edit Appointment"
 msgstr "Termin bearbeiten"
 
-#: ../calendar/gui/dialogs/comp-editor.c:644
+#: ../calendar/gui/dialogs/comp-editor.c:650
 #, c-format
 msgid "Meeting - %s"
 msgstr "Besprechung - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:646
+#: ../calendar/gui/dialogs/comp-editor.c:652
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:652
+#: ../calendar/gui/dialogs/comp-editor.c:658
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Zugewiesene Aufgabe - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:654
+#: ../calendar/gui/dialogs/comp-editor.c:660
 #, c-format
 msgid "Task - %s"
 msgstr "Aufgabe - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:659
+#: ../calendar/gui/dialogs/comp-editor.c:665
 #, c-format
 msgid "Memo - %s"
 msgstr "Notiz - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:675
+#: ../calendar/gui/dialogs/comp-editor.c:681
 msgid "No Summary"
 msgstr "Keine Zusammenfassung"
 
-#: ../calendar/gui/dialogs/comp-editor.c:786
+#: ../calendar/gui/dialogs/comp-editor.c:792
 msgid "Keep original item?"
 msgstr "Originaleintrag behalten?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:983
+#: ../calendar/gui/dialogs/comp-editor.c:988
 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:990 ../mail/e-mail-browser.c:117
-#: ../shell/e-shell-window-actions.c:1454
-#: ../widgets/misc/e-focus-tracker.c:118 ../widgets/misc/e-focus-tracker.c:552
-#: ../widgets/misc/e-web-view.c:413 ../widgets/misc/e-web-view.c:1066
+#: ../calendar/gui/dialogs/comp-editor.c:995 ../mail/e-mail-browser.c:120
+#: ../shell/e-shell-window-actions.c:1454 ../widgets/misc/e-focus-tracker.c:118
+#: ../widgets/misc/e-focus-tracker.c:552 ../widgets/misc/e-web-view.c:413
+#: ../widgets/misc/e-web-view.c:1066
 msgid "Copy the selection"
 msgstr "Die Auswahl kopieren"
 
-#: ../calendar/gui/dialogs/comp-editor.c:997 ../mail/e-mail-browser.c:124
-#: ../shell/e-shell-window-actions.c:1461
-#: ../widgets/misc/e-focus-tracker.c:111 ../widgets/misc/e-focus-tracker.c:547
-#: ../widgets/misc/e-web-view.c:1060
+#: ../calendar/gui/dialogs/comp-editor.c:1002 ../mail/e-mail-browser.c:127
+#: ../shell/e-shell-window-actions.c:1461 ../widgets/misc/e-focus-tracker.c:111
+#: ../widgets/misc/e-focus-tracker.c:547 ../widgets/misc/e-web-view.c:1060
 msgid "Cut the selection"
 msgstr "Die Auswahl ausschneiden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1004
-#: ../shell/e-shell-window-actions.c:1468
-#: ../widgets/misc/e-focus-tracker.c:132 ../widgets/misc/e-focus-tracker.c:562
+#: ../calendar/gui/dialogs/comp-editor.c:1009
+#: ../shell/e-shell-window-actions.c:1468 ../widgets/misc/e-focus-tracker.c:132
+#: ../widgets/misc/e-focus-tracker.c:562
 msgid "Delete the selection"
 msgstr "Die Auswahl lÃ¶schen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1011
+#: ../calendar/gui/dialogs/comp-editor.c:1016
 msgid "Click here to view help available"
 msgstr "Klicken Sie hier, um die verfÃ¼gbare Hilfe anzuzeigen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1018 ../mail/e-mail-browser.c:131
-#: ../shell/e-shell-window-actions.c:1503
-#: ../widgets/misc/e-focus-tracker.c:125 ../widgets/misc/e-focus-tracker.c:557
-#: ../widgets/misc/e-web-view.c:1072
+#: ../calendar/gui/dialogs/comp-editor.c:1023 ../mail/e-mail-browser.c:134
+#: ../shell/e-shell-window-actions.c:1503 ../widgets/misc/e-focus-tracker.c:125
+#: ../widgets/misc/e-focus-tracker.c:557 ../widgets/misc/e-web-view.c:1072
 msgid "Paste the clipboard"
 msgstr "Den Inhalt der Zwischenablage einfÃ¼gen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1039
+#: ../calendar/gui/dialogs/comp-editor.c:1044
 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:1046 ../mail/e-mail-browser.c:138
-#: ../shell/e-shell-window-actions.c:1573
-#: ../widgets/misc/e-focus-tracker.c:139 ../widgets/misc/e-focus-tracker.c:567
+#: ../calendar/gui/dialogs/comp-editor.c:1051 ../mail/e-mail-browser.c:141
+#: ../shell/e-shell-window-actions.c:1573 ../widgets/misc/e-focus-tracker.c:139
+#: ../widgets/misc/e-focus-tracker.c:567
 msgid "Select all text"
 msgstr "Den gesamten Text markieren"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1053
+#: ../calendar/gui/dialogs/comp-editor.c:1058
 msgid "_Classification"
 msgstr "E_instufung"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1060
+#: ../calendar/gui/dialogs/comp-editor.c:1065
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:152
+#: ../mail/e-mail-browser.c:155
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
 #: ../shell/e-shell-window-actions.c:1608
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1067 ../mail/e-mail-browser.c:145
+#: ../calendar/gui/dialogs/comp-editor.c:1072 ../mail/e-mail-browser.c:148
 #: ../shell/e-shell-window-actions.c:1615
-#: ../widgets/misc/e-signature-editor.c:220
+#: ../widgets/misc/e-signature-editor.c:222
 msgid "_File"
 msgstr "_Datei"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1074
+#: ../calendar/gui/dialogs/comp-editor.c:1079
 #: ../shell/e-shell-window-actions.c:1622
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1081
+#: ../calendar/gui/dialogs/comp-editor.c:1086
 msgid "_Insert"
 msgstr "Ein_fÃ¼gen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/dialogs/comp-editor.c:1093
 #: ../composer/e-composer-actions.c:315
 msgid "_Options"
 msgstr "_Optionen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1095 ../mail/e-mail-browser.c:159
+#: ../calendar/gui/dialogs/comp-editor.c:1100 ../mail/e-mail-browser.c:162
 #: ../shell/e-shell-window-actions.c:1657 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "_Ansicht"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1105
+#: ../calendar/gui/dialogs/comp-editor.c:1110
 #: ../composer/e-composer-actions.c:243
 msgid "_Attachment..."
 msgstr "_Anlage â?¦"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1107
+#: ../calendar/gui/dialogs/comp-editor.c:1112
 msgid "Click here to attach a file"
 msgstr "Klicken Sie hier, um eine Datei beizulegen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1115
+#: ../calendar/gui/dialogs/comp-editor.c:1120
 msgid "_Categories"
 msgstr "_Kategorien"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117
+#: ../calendar/gui/dialogs/comp-editor.c:1122
 msgid "Toggles whether to display categories"
 msgstr "Kategorien anzeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1123
+#: ../calendar/gui/dialogs/comp-editor.c:1128
 msgid "Time _Zone"
 msgstr "Zeit_zone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1125
+#: ../calendar/gui/dialogs/comp-editor.c:1130
 msgid "Toggles whether the time zone is displayed"
 msgstr "Zeitzone anzeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1134
+#: ../calendar/gui/dialogs/comp-editor.c:1139
 msgid "Pu_blic"
 msgstr "Ã?_ffentlich"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1136
+#: ../calendar/gui/dialogs/comp-editor.c:1141
 msgid "Classify as public"
 msgstr "Als Ã¶ffentlich einstufen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1141
+#: ../calendar/gui/dialogs/comp-editor.c:1146
 msgid "_Private"
 msgstr "_Privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1143
+#: ../calendar/gui/dialogs/comp-editor.c:1148
 msgid "Classify as private"
 msgstr "Als privat einstufen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1148
+#: ../calendar/gui/dialogs/comp-editor.c:1153
 msgid "_Confidential"
 msgstr "Ver_traulich"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1150
+#: ../calendar/gui/dialogs/comp-editor.c:1155
 msgid "Classify as confidential"
 msgstr "Als vertraulich einstufen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1158
+#: ../calendar/gui/dialogs/comp-editor.c:1163
 msgid "R_ole Field"
 msgstr "_Positions-Feld"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1160
+#: ../calendar/gui/dialogs/comp-editor.c:1165
 msgid "Toggles whether the Role field is displayed"
 msgstr "Feld fÃ¼r die Position angezeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1166
+#: ../calendar/gui/dialogs/comp-editor.c:1171
 msgid "_RSVP"
 msgstr "_UAwg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1168
+#: ../calendar/gui/dialogs/comp-editor.c:1173
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "UAwg-Feld angezeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1174
+#: ../calendar/gui/dialogs/comp-editor.c:1179
 msgid "_Status Field"
 msgstr "_Statusfeld"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1176
+#: ../calendar/gui/dialogs/comp-editor.c:1181
 msgid "Toggles whether the Status field is displayed"
 msgstr "Statusfeld anzeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1182
+#: ../calendar/gui/dialogs/comp-editor.c:1187
 msgid "_Type Field"
 msgstr "A_rt-Feld"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1184
+#: ../calendar/gui/dialogs/comp-editor.c:1189
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Feld fÃ¼r die Teilnehmerart angezeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1208
+#: ../calendar/gui/dialogs/comp-editor.c:1213
 #: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "_Zuletzt geÃ¶ffnet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1743
+#: ../calendar/gui/dialogs/comp-editor.c:1748
 #: ../composer/e-composer-actions.c:431
 msgid "Attach"
 msgstr "Beilegen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2072
-#: ../calendar/gui/dialogs/comp-editor.c:2121
-#: ../calendar/gui/dialogs/comp-editor.c:3086
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2125
+#: ../calendar/gui/dialogs/comp-editor.c:3092
 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:3050
+#: ../calendar/gui/dialogs/comp-editor.c:3056
 #: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "Anlage"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3118
+#: ../calendar/gui/dialogs/comp-editor.c:3124
 msgid "Unable to use current version!"
 msgstr "Aktuelle Version konnte nicht verwendet werden!"
 
@@ -3876,99 +3854,99 @@ msgstr "_VerfÃ¼gbarkeit"
 msgid "Query free / busy information for the attendees"
 msgstr "VerfÃ¼gbarkeitsinformationen der Teilnehmer abfragen"
 
-#: ../calendar/gui/dialogs/event-editor.c:319 ../calendar/gui/print.c:2610
+#: ../calendar/gui/dialogs/event-editor.c:319 ../calendar/gui/print.c:2674
 msgid "Appointment"
 msgstr "Termin"
 
-#: ../calendar/gui/dialogs/event-editor.c:385
+#: ../calendar/gui/dialogs/event-editor.c:386
 #: ../calendar/gui/dialogs/event-page.ui.h:3
 #: ../calendar/gui/e-meeting-list-view.c:148
 msgid "Attendees"
 msgstr "Teilnehmer"
 
-#: ../calendar/gui/dialogs/event-editor.c:578
+#: ../calendar/gui/dialogs/event-editor.c:579
 msgid "Print this event"
 msgstr "Dieses Ereignis drucken"
 
-#: ../calendar/gui/dialogs/event-page.c:766
+#: ../calendar/gui/dialogs/event-page.c:769
 msgid "Event's start time is in the past"
 msgstr "Beginn des Ereignisses liegt in der Vergangenheit"
 
-#: ../calendar/gui/dialogs/event-page.c:807
+#: ../calendar/gui/dialogs/event-page.c:810
 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:811
+#: ../calendar/gui/dialogs/event-page.c:814
 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:823
-#: ../calendar/gui/dialogs/event-page.c:2775
+#: ../calendar/gui/dialogs/event-page.c:826
+#: ../calendar/gui/dialogs/event-page.c:2778
 msgid "This event has alarms"
 msgstr "Dieses Ereignis enthÃ¤lt Alarme"
 
-#: ../calendar/gui/dialogs/event-page.c:890
+#: ../calendar/gui/dialogs/event-page.c:893
 #: ../calendar/gui/dialogs/event-page.ui.h:8
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganisator:"
 
-#: ../calendar/gui/dialogs/event-page.c:937
+#: ../calendar/gui/dialogs/event-page.c:940
 msgid "_Delegatees"
 msgstr "_Vertreter"
 
-#: ../calendar/gui/dialogs/event-page.c:939
+#: ../calendar/gui/dialogs/event-page.c:942
 msgid "Atte_ndees"
 msgstr "Teil_nehmer"
 
-#: ../calendar/gui/dialogs/event-page.c:1154
+#: ../calendar/gui/dialogs/event-page.c:1157
 msgid "Event with no start date"
 msgstr "Ereignis ohne Anfangsdatum"
 
-#: ../calendar/gui/dialogs/event-page.c:1157
+#: ../calendar/gui/dialogs/event-page.c:1160
 msgid "Event with no end date"
 msgstr "Ereignis ohne Enddatum"
 
-#: ../calendar/gui/dialogs/event-page.c:1328
+#: ../calendar/gui/dialogs/event-page.c:1331
 #: ../calendar/gui/dialogs/memo-page.c:686
-#: ../calendar/gui/dialogs/task-page.c:907
+#: ../calendar/gui/dialogs/task-page.c:910
 msgid "Start date is wrong"
 msgstr "Das Anfangsdatum ist falsch"
 
-#: ../calendar/gui/dialogs/event-page.c:1338
+#: ../calendar/gui/dialogs/event-page.c:1341
 msgid "End date is wrong"
 msgstr "Das Enddatum ist falsch"
 
-#: ../calendar/gui/dialogs/event-page.c:1361
+#: ../calendar/gui/dialogs/event-page.c:1364
 msgid "Start time is wrong"
 msgstr "Die Anfangszeit ist falsch"
 
-#: ../calendar/gui/dialogs/event-page.c:1368
+#: ../calendar/gui/dialogs/event-page.c:1371
 msgid "End time is wrong"
 msgstr "Die Endzeit ist falsch"
 
-#: ../calendar/gui/dialogs/event-page.c:1530
+#: ../calendar/gui/dialogs/event-page.c:1533
 #: ../calendar/gui/dialogs/memo-page.c:727
-#: ../calendar/gui/dialogs/task-page.c:967
+#: ../calendar/gui/dialogs/task-page.c:970
 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:1536
+#: ../calendar/gui/dialogs/event-page.c:1539
 #: ../calendar/gui/dialogs/memo-page.c:733
-#: ../calendar/gui/dialogs/task-page.c:973
+#: ../calendar/gui/dialogs/task-page.c:976
 msgid "An organizer is required."
 msgstr "Es ist ein Organisator erforderlich."
 
-#: ../calendar/gui/dialogs/event-page.c:1561
-#: ../calendar/gui/dialogs/task-page.c:997
+#: ../calendar/gui/dialogs/event-page.c:1564
+#: ../calendar/gui/dialogs/task-page.c:1000
 msgid "At least one attendee is required."
 msgstr "Es ist mindestens ein Teilnehmer erforderlich."
 
-#: ../calendar/gui/dialogs/event-page.c:2649
+#: ../calendar/gui/dialogs/event-page.c:2652
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Der Kalender Â»%sÂ« konnte nicht geÃ¶ffnet werden."
@@ -3979,47 +3957,47 @@ 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:2693
+#: ../calendar/gui/dialogs/event-page.c:2696
 #: ../calendar/gui/dialogs/memo-page.c:946
-#: ../calendar/gui/dialogs/task-page.c:1787
+#: ../calendar/gui/dialogs/task-page.c:1790
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Sie handeln im Namen von %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2994
+#: ../calendar/gui/dialogs/event-page.c:2997
 #, 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:3000
+#: ../calendar/gui/dialogs/event-page.c:3003
 #, 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:3006
+#: ../calendar/gui/dialogs/event-page.c:3009
 #, 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:3019
+#: ../calendar/gui/dialogs/event-page.c:3022
 msgid "Customize"
 msgstr "Anpassen"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:3021
+#: ../calendar/gui/dialogs/event-page.c:3024
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "Keine"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:2
 #: ../calendar/gui/dialogs/task-page.ui.h:1
-#: ../calendar/gui/e-meeting-time-sel.c:578
+#: ../calendar/gui/e-meeting-time-sel.c:575
 msgid "Atte_ndees..."
 msgstr "Teil_nehmer â?¦"
 
@@ -4085,7 +4063,7 @@ msgctxt "eventpage"
 msgid "until"
 msgstr "bis"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2614
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2678
 msgid "Memo"
 msgstr "Notiz"
 
@@ -4114,9 +4092,9 @@ msgstr ""
 msgid "Unable to open memos in '%s'."
 msgstr "Notizen in Â»%sÂ« konnten nicht geÃ¶ffnet werden."
 
-#: ../calendar/gui/dialogs/memo-page.c:1078 ../em-format/em-format-quote.c:270
-#: ../em-format/em-format.c:1040 ../mail/em-format-html.c:2289
-#: ../mail/em-format-html.c:2348 ../mail/em-format-html.c:2372
+#: ../calendar/gui/dialogs/memo-page.c:1078 ../em-format/em-format-quote.c:282
+#: ../em-format/em-format.c:1052 ../mail/em-format-html.c:2390
+#: ../mail/em-format-html.c:2449 ../mail/em-format-html.c:2473
 #: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:74
 msgid "To"
 msgstr "An"
@@ -4136,7 +4114,7 @@ msgid "T_o:"
 msgstr "A_n:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:426
+#: ../calendar/gui/dialogs/task-page.c:429
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "_Gruppe:"
@@ -4329,7 +4307,7 @@ msgstr "Alle"
 msgid "Exceptions"
 msgstr "Ausnahmen"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:89
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:77
 msgid "Preview"
 msgstr "Vorschau"
 
@@ -4402,8 +4380,8 @@ msgstr "Website"
 #: ../calendar/gui/e-cal-model-tasks.c:443
 #: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
 #: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:588
-#: ../calendar/gui/print.c:2697 ../mail/em-sync-stream.c:151
-#: ../mail/em-sync-stream.c:178 ../mail/em-sync-stream.c:199
+#: ../calendar/gui/print.c:2761 ../mail/em-sync-stream.c:152
+#: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
 #, c-format
 msgid "Canceled"
 msgstr "Abgebrochen"
@@ -4412,12 +4390,11 @@ msgstr "Abgebrochen"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
 #: ../calendar/gui/e-cal-component-preview.c:292
 #: ../calendar/gui/e-cal-model-tasks.c:441
-#: ../calendar/gui/e-cal-model-tasks.c:715
-#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:197
-#: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:587
-#: ../calendar/gui/print.c:2694 ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../calendar/gui/e-cal-model-tasks.c:715 ../calendar/gui/e-itip-control.c:932
+#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
+#: ../calendar/gui/e-task-table.c:213 ../calendar/gui/e-task-table.c:228
+#: ../calendar/gui/e-task-table.c:587 ../calendar/gui/print.c:2758
+#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
 msgstr "Abgeschlossen"
 
@@ -4425,7 +4402,7 @@ msgstr "Abgeschlossen"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
 #: ../calendar/gui/e-cal-component-preview.c:314
 #: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1183 ../widgets/misc/e-send-options.ui.h:13
+#: ../mail/message-list.c:1188 ../widgets/misc/e-send-options.ui.h:13
 msgid "High"
 msgstr "Hoch"
 
@@ -4436,7 +4413,7 @@ msgstr "Hoch"
 #: ../calendar/gui/e-cal-model-tasks.c:713
 #: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
 #: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:586
-#: ../calendar/gui/print.c:2691
+#: ../calendar/gui/print.c:2755
 msgid "In Progress"
 msgstr "In Bearbeitung"
 
@@ -4444,15 +4421,15 @@ msgstr "In Bearbeitung"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
 #: ../calendar/gui/e-cal-component-preview.c:318
 #: ../calendar/gui/e-task-table.c:513 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1181 ../widgets/misc/e-send-options.ui.h:14
+#: ../mail/message-list.c:1186 ../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:316
-#: ../calendar/gui/e-cal-model.c:1269 ../calendar/gui/e-task-table.c:512
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1182
+#: ../calendar/gui/e-cal-model.c:1278 ../calendar/gui/e-task-table.c:512
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1187
 #: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
 msgstr "Normal"
@@ -4463,7 +4440,7 @@ msgstr "Normal"
 #: ../calendar/gui/e-cal-model-tasks.c:437
 #: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
 #: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:585
-#: ../calendar/gui/print.c:2688 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/print.c:2752 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Nicht begonnen"
 
@@ -4479,7 +4456,7 @@ 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:1773
+#: ../calendar/gui/e-calendar-view.c:1780
 #: ../calendar/gui/e-meeting-list-view.c:594
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
@@ -4521,7 +4498,7 @@ msgstr ""
 msgid "_Send Options"
 msgstr "_Versandoptionen"
 
-#: ../calendar/gui/dialogs/task-editor.c:328 ../calendar/gui/print.c:2612
+#: ../calendar/gui/dialogs/task-editor.c:328 ../calendar/gui/print.c:2676
 #: ../widgets/misc/e-send-options.c:503
 msgid "Task"
 msgstr "Aufgabe"
@@ -4534,36 +4511,36 @@ msgstr "Aufgabendetails"
 msgid "Print this task"
 msgstr "Diese Aufgabe drucken"
 
-#: ../calendar/gui/dialogs/task-page.c:343
+#: ../calendar/gui/dialogs/task-page.c:346
 msgid "Task's start date is in the past"
 msgstr "Beginn der Aufgabe liegt in der Vergangenheit"
 
-#: ../calendar/gui/dialogs/task-page.c:344
+#: ../calendar/gui/dialogs/task-page.c:347
 msgid "Task's due date is in the past"
 msgstr "FÃ¤lligkeit der Aufgabe liegt in der Vergangenheit"
 
-#: ../calendar/gui/dialogs/task-page.c:379
+#: ../calendar/gui/dialogs/task-page.c:382
 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:383
+#: ../calendar/gui/dialogs/task-page.c:386
 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:434
+#: ../calendar/gui/dialogs/task-page.c:437
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "Or_ganisator:"
 
-#: ../calendar/gui/dialogs/task-page.c:880
+#: ../calendar/gui/dialogs/task-page.c:883
 msgid "Due date is wrong"
 msgstr "Das FÃ¤lligkeitsdatum ist falsch"
 
-#: ../calendar/gui/dialogs/task-page.c:1744
+#: ../calendar/gui/dialogs/task-page.c:1747
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Aufgaben in Â»%sÂ« konnten nicht geÃ¶ffnet werden."
@@ -4665,7 +4642,7 @@ msgid "Categories:"
 msgstr "Kategorien:"
 
 #: ../calendar/gui/e-cal-component-preview.c:237
-#: ../calendar/gui/e-itip-control.c:1164 ../calendar/gui/e-itip-control.ui.h:9
+#: ../calendar/gui/e-itip-control.c:1165 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "Zusammenfassung:"
 
@@ -4680,8 +4657,8 @@ msgstr "FÃ¤llig am:"
 
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1189
-#: ../plugins/itip-formatter/itip-view.c:1074
+#: ../calendar/gui/e-itip-control.c:1190
+#: ../plugins/itip-formatter/itip-view.c:1075
 msgid "Status:"
 msgstr "Status:"
 
@@ -4690,8 +4667,8 @@ msgid "Priority:"
 msgstr "PrioritÃ¤t:"
 
 #: ../calendar/gui/e-cal-component-preview.c:337
-#: ../calendar/gui/e-itip-control.c:1227 ../calendar/gui/e-itip-control.ui.h:4
-#: ../mail/mail-config.ui.h:37
+#: ../calendar/gui/e-itip-control.c:1228 ../calendar/gui/e-itip-control.ui.h:4
+#: ../mail/mail-config.ui.h:34
 msgid "Description:"
 msgstr "Beschreibung:"
 
@@ -4727,7 +4704,7 @@ msgid "Free"
 msgstr "Frei"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:561 ../calendar/gui/e-task-table.c:564
+#: ../calendar/gui/e-meeting-time-sel.c:558 ../calendar/gui/e-task-table.c:564
 msgid "Busy"
 msgstr "BeschÃ¤ftigt"
 
@@ -4747,42 +4724,41 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "Keine"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1284
 #: ../calendar/gui/e-meeting-list-view.c:187
 #: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
 #: ../calendar/gui/e-meeting-store.c:856
 msgid "Yes"
 msgstr "Ja"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1284
 #: ../calendar/gui/e-meeting-list-view.c:188
 #: ../calendar/gui/e-meeting-store.c:181
 msgid "No"
 msgstr "Nein"
 
-#. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:527 ../calendar/gui/e-itip-control.c:1210
-#: ../calendar/gui/e-itip-control.c:1349
+#: ../calendar/gui/e-cal-model.c:536 ../calendar/gui/e-itip-control.c:1211
+#: ../calendar/gui/e-itip-control.c:1350
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:967
-#: ../plugins/itip-formatter/itip-formatter.c:457
-#: ../plugins/itip-formatter/itip-formatter.c:2345
-#: ../plugins/plugin-manager/plugin-manager.c:89
+#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:1013
+#: ../calendar/gui/print.c:1030 ../e-util/e-charset.c:52
+#: ../modules/plugin-manager/evolution-plugin-manager.c:98
+#: ../plugins/itip-formatter/itip-formatter.c:458
+#: ../plugins/itip-formatter/itip-formatter.c:2454
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../calendar/gui/e-cal-model.c:1271
+#: ../calendar/gui/e-cal-model.c:1280
 msgid "Recurring"
 msgstr "Wiederkehrend"
 
-#: ../calendar/gui/e-cal-model.c:1273
+#: ../calendar/gui/e-cal-model.c:1282
 msgid "Assigned"
 msgstr "Zugewiesen"
 
-#: ../calendar/gui/e-cal-model.c:2175
+#: ../calendar/gui/e-cal-model.c:2184
 #, c-format
 msgid "Opening %s"
 msgstr "%s wird geÃ¶ffnet â?¦"
@@ -4809,8 +4785,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:374
 msgid "Priority"
 msgstr "PrioritÃ¤t"
 
@@ -4826,69 +4801,67 @@ msgstr "Anfangsdatum"
 msgid "Type"
 msgstr "Art"
 
-#: ../calendar/gui/e-calendar-view.c:407
+#: ../calendar/gui/e-calendar-view.c:414
 msgid "Cut selected events to the clipboard"
 msgstr "Die gewÃ¤hlten Ereignisse in die Zwischenablage ausschneiden"
 
-#: ../calendar/gui/e-calendar-view.c:413
+#: ../calendar/gui/e-calendar-view.c:420
 msgid "Copy selected events to the clipboard"
 msgstr "Die gewÃ¤hlten Ereignisse in die Zwischenablage kopieren"
 
-#: ../calendar/gui/e-calendar-view.c:419
+#: ../calendar/gui/e-calendar-view.c:426
 msgid "Paste events from the clipboard"
 msgstr "Die in der Zwischenablage befindlichen Ereignisse einfÃ¼gen"
 
-#: ../calendar/gui/e-calendar-view.c:425
+#: ../calendar/gui/e-calendar-view.c:432
 msgid "Delete selected events"
 msgstr "Die gewÃ¤hlten Ereignisse lÃ¶schen"
 
-#: ../calendar/gui/e-calendar-view.c:444 ../calendar/gui/e-memo-table.c:188
+#: ../calendar/gui/e-calendar-view.c:451 ../calendar/gui/e-memo-table.c:188
 #: ../calendar/gui/e-task-table.c:266
 msgid "Deleting selected objects"
 msgstr "GewÃ¤hlte Objekte werden gelÃ¶scht"
 
-#: ../calendar/gui/e-calendar-view.c:638 ../calendar/gui/e-memo-table.c:847
+#: ../calendar/gui/e-calendar-view.c:645 ../calendar/gui/e-memo-table.c:847
 #: ../calendar/gui/e-task-table.c:1070
 msgid "Updating objects"
 msgstr "Objekte werden aktualisiert"
 
-#: ../calendar/gui/e-calendar-view.c:1720
-#: ../calendar/gui/e-itip-control.c:1195
+#: ../calendar/gui/e-calendar-view.c:1727 ../calendar/gui/e-itip-control.c:1196
 #: ../calendar/gui/e-meeting-list-view.c:199
 #: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
-#: ../plugins/itip-formatter/itip-formatter.c:2333
+#: ../plugins/itip-formatter/itip-formatter.c:2442
 msgid "Accepted"
 msgstr "Angenommen"
 
-#: ../calendar/gui/e-calendar-view.c:1721
-#: ../calendar/gui/e-itip-control.c:1205
+#: ../calendar/gui/e-calendar-view.c:1728 ../calendar/gui/e-itip-control.c:1206
 #: ../calendar/gui/e-meeting-list-view.c:200
 #: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
-#: ../plugins/itip-formatter/itip-formatter.c:2339
+#: ../plugins/itip-formatter/itip-formatter.c:2448
 msgid "Declined"
 msgstr "Abgelehnt"
 
-#: ../calendar/gui/e-calendar-view.c:1722
+#: ../calendar/gui/e-calendar-view.c:1729
 #: ../calendar/gui/e-meeting-list-view.c:201
 #: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
-#: ../calendar/gui/e-meeting-time-sel.c:560
+#: ../calendar/gui/e-meeting-time-sel.c:557
 msgid "Tentative"
 msgstr "VorlÃ¤ufig"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1730
 #: ../calendar/gui/e-meeting-list-view.c:202
 #: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
-#: ../plugins/itip-formatter/itip-formatter.c:2342
+#: ../plugins/itip-formatter/itip-formatter.c:2451
 msgid "Delegated"
 msgstr "Delegiert"
 
-#: ../calendar/gui/e-calendar-view.c:1724
+#: ../calendar/gui/e-calendar-view.c:1731
 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:1868 ../calendar/gui/e-memo-table.c:530
+#: ../calendar/gui/e-calendar-view.c:1875 ../calendar/gui/e-memo-table.c:530
 #: ../calendar/gui/e-task-table.c:745
 #, c-format
 msgid "Organizer: %s <%s>"
@@ -4896,20 +4869,20 @@ 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:1872 ../calendar/gui/e-memo-table.c:535
+#: ../calendar/gui/e-calendar-view.c:1879 ../calendar/gui/e-memo-table.c:535
 #: ../calendar/gui/e-task-table.c:748
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisator: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1888 ../calendar/gui/print.c:2646
+#: ../calendar/gui/e-calendar-view.c:1895 ../calendar/gui/print.c:2710
 #, c-format
 msgid "Location: %s"
 msgstr "Ort: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1919
+#: ../calendar/gui/e-calendar-view.c:1926
 #, c-format
 msgid "Time: %s %s"
 msgstr "Zeit: %s %s"
@@ -4952,8 +4925,8 @@ msgstr "Zweite Zeitzone anzeigen"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:897 ../calendar/gui/e-day-view.c:1878
-#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1744
+#: ../calendar/gui/e-day-view-top-item.c:897 ../calendar/gui/e-day-view.c:1893
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1785
 msgid "%A %d %B"
 msgstr "%A, %d. %B"
 
@@ -4963,10 +4936,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:901 ../calendar/gui/e-day-view.c:1895
+#: ../calendar/gui/e-day-view-top-item.c:901 ../calendar/gui/e-day-view.c:1910
 #: ../calendar/gui/e-week-view-main-item.c:227
-#: ../calendar/gui/ea-gnome-calendar.c:202
-#: ../modules/calendar/e-cal-shell-view-private.c:1014
+#: ../calendar/gui/ea-gnome-calendar.c:203
+#: ../modules/calendar/e-cal-shell-view-private.c:1015
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
 
@@ -4975,54 +4948,54 @@ 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:905 ../calendar/gui/e-day-view.c:1911
+#: ../calendar/gui/e-day-view-top-item.c:905 ../calendar/gui/e-day-view.c:1926
 #: ../calendar/gui/e-week-view-main-item.c:241
-#: ../calendar/gui/ea-gnome-calendar.c:232
-#: ../modules/calendar/e-cal-shell-view-private.c:1050
+#: ../calendar/gui/ea-gnome-calendar.c:233
+#: ../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:1077 ../calendar/gui/e-week-view.c:749
-#: ../calendar/gui/print.c:819
+#: ../calendar/gui/e-day-view.c:1089 ../calendar/gui/e-week-view.c:767
+#: ../calendar/gui/print.c:860
 msgid "am"
 msgstr "AM"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1080 ../calendar/gui/e-week-view.c:752
-#: ../calendar/gui/print.c:821
+#: ../calendar/gui/e-day-view.c:1092 ../calendar/gui/e-week-view.c:770
+#: ../calendar/gui/print.c:862
 msgid "pm"
 msgstr "PM"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2646
+#: ../calendar/gui/e-day-view.c:2677
 #, c-format
 msgid "Week %d"
 msgstr "Woche %d"
 
-#: ../calendar/gui/e-itip-control.c:761
+#: ../calendar/gui/e-itip-control.c:762
 msgid "Recurring:"
 msgstr "Wiederkehrend:"
 
-#: ../calendar/gui/e-itip-control.c:765
+#: ../calendar/gui/e-itip-control.c:766
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ja (Komplexe Wiederholung)."
 
-#: ../calendar/gui/e-itip-control.c:782
+#: ../calendar/gui/e-itip-control.c:783
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "TÃ¤glich"
 msgstr[1] "Alle %d Tage"
 
-#: ../calendar/gui/e-itip-control.c:795
+#: ../calendar/gui/e-itip-control.c:796
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "WÃ¶chentlich"
 msgstr[1] "Alle %d Wochen"
 
-#: ../calendar/gui/e-itip-control.c:802
+#: ../calendar/gui/e-itip-control.c:803
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -5030,36 +5003,36 @@ msgstr[0] "WÃ¶chentlich am "
 msgstr[1] "Alle %d Wochen am "
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:813
+#: ../calendar/gui/e-itip-control.c:814
 msgid " and "
 msgstr " und "
 
 # CHECK - muss mit erste(r), zweite(r) usw. Ã¼bereinstimmen
-#: ../calendar/gui/e-itip-control.c:822
+#: ../calendar/gui/e-itip-control.c:823
 #, c-format
 msgid "The %s day of "
 msgstr "%s Tag des "
 
-#: ../calendar/gui/e-itip-control.c:838
+#: ../calendar/gui/e-itip-control.c:839
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s des "
 
-#: ../calendar/gui/e-itip-control.c:849
+#: ../calendar/gui/e-itip-control.c:850
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "monatlich"
 msgstr[1] "alle %d Monate"
 
-#: ../calendar/gui/e-itip-control.c:861
+#: ../calendar/gui/e-itip-control.c:862
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "JÃ¤hrlich"
 msgstr[1] "Alle %d Jahre"
 
-#: ../calendar/gui/e-itip-control.c:874
+#: ../calendar/gui/e-itip-control.c:875
 #, c-format
 msgid "a total of %d time"
 msgid_plural "a total of %d times"
@@ -5068,36 +5041,36 @@ msgstr[1] "insgesamt %d Mal"
 
 # CHECK
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:885
+#: ../calendar/gui/e-itip-control.c:886
 msgid ", ending on "
 msgstr ", endet am "
 
 #. For Translators : 'Starts' is part of "Starts: date", showing when the event starts
-#: ../calendar/gui/e-itip-control.c:906
+#: ../calendar/gui/e-itip-control.c:907
 msgid "Starts"
 msgstr "Anfang"
 
 #. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
-#: ../calendar/gui/e-itip-control.c:916
+#: ../calendar/gui/e-itip-control.c:917
 msgid "Ends"
 msgstr "Ende"
 
-#: ../calendar/gui/e-itip-control.c:943
+#: ../calendar/gui/e-itip-control.c:944
 #: ../plugins/save-calendar/csv-format.c:372
 msgid "Due"
 msgstr "FÃ¤llig"
 
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1059
+#: ../calendar/gui/e-itip-control.c:987 ../calendar/gui/e-itip-control.c:1060
 msgid "iCalendar Information"
 msgstr "iCalendar-Informationen"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1008
+#: ../calendar/gui/e-itip-control.c:1009
 msgid "iCalendar Error"
 msgstr "iCalendar-Fehler"
 
-#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
-#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
+#: ../calendar/gui/e-itip-control.c:1093 ../calendar/gui/e-itip-control.c:1109
+#: ../calendar/gui/e-itip-control.c:1120 ../calendar/gui/e-itip-control.c:1137
 #: ../plugins/itip-formatter/itip-view.c:362
 #: ../plugins/itip-formatter/itip-view.c:363
 #: ../plugins/itip-formatter/itip-view.c:450
@@ -5106,7 +5079,7 @@ msgstr "iCalendar-Fehler"
 msgid "An unknown person"
 msgstr "Eine unbekannte Person"
 
-#: ../calendar/gui/e-itip-control.c:1145
+#: ../calendar/gui/e-itip-control.c:1146
 msgid ""
 "Please review the following information, and then select an action from the "
 "menu below."
@@ -5115,296 +5088,295 @@ msgstr ""
 "Sie dann eine Aktion aus untenstehendem MenÃ¼."
 
 #. Translators: "None" used as a default value for events without Summary received by mail
-#: ../calendar/gui/e-itip-control.c:1160
-#: ../plugins/itip-formatter/itip-formatter.c:2320
+#: ../calendar/gui/e-itip-control.c:1161
+#: ../plugins/itip-formatter/itip-formatter.c:2429
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Keine"
 
-#: ../calendar/gui/e-itip-control.c:1200
-#: ../plugins/itip-formatter/itip-formatter.c:2336
+#: ../calendar/gui/e-itip-control.c:1201
+#: ../plugins/itip-formatter/itip-formatter.c:2445
 msgid "Tentatively Accepted"
 msgstr "VorlÃ¤ufig angenommen"
 
-#: ../calendar/gui/e-itip-control.c:1290
+#: ../calendar/gui/e-itip-control.c:1291
 msgid ""
-"The meeting has been canceled, however it could not be found in your "
-"calendars"
+"The meeting has been canceled, however it could not be found in your calendars"
 msgstr ""
 "Die Besprechung wurde abgesagt, konnte jedoch nicht in Ihren Kalendern "
 "gefunden werden"
 
-#: ../calendar/gui/e-itip-control.c:1292
+#: ../calendar/gui/e-itip-control.c:1293
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 "Die Aufgabe wurde abgesagt, konnte jedoch nicht in Ihren Aufgabenlisten "
 "gefunden werden"
 
-#: ../calendar/gui/e-itip-control.c:1369
+#: ../calendar/gui/e-itip-control.c:1370
 #, c-format
 msgid "%s has published meeting information."
 msgstr "%s hat Besprechungsinformationen verÃ¶ffentlicht."
 
-#: ../calendar/gui/e-itip-control.c:1370
+#: ../calendar/gui/e-itip-control.c:1371
 msgid "Meeting Information"
 msgstr "Besprechungsinformationen"
 
-#: ../calendar/gui/e-itip-control.c:1376
+#: ../calendar/gui/e-itip-control.c:1377
 #, c-format
 msgid "%s requests the presence of %s at a meeting."
 msgstr "%s wÃ¼nscht die Teilnahme von %s an einer Besprechung."
 
-#: ../calendar/gui/e-itip-control.c:1378
+#: ../calendar/gui/e-itip-control.c:1379
 #, c-format
 msgid "%s requests your presence at a meeting."
 msgstr "%s wÃ¼nscht Ihre Teilnahme an einer Besprechung."
 
-#: ../calendar/gui/e-itip-control.c:1379
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Proposal"
 msgstr "Besprechungsvorschlag"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1386
 #, c-format
 msgid "%s wishes to be added to an existing meeting."
 msgstr "%s wÃ¼nscht zu einer existierenden Besprechung hinzugefÃ¼gt zu werden."
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1387
 msgid "Meeting Update"
 msgstr "Besprechungsaktualisierung"
 
-#: ../calendar/gui/e-itip-control.c:1390
+#: ../calendar/gui/e-itip-control.c:1391
 #, c-format
 msgid "%s wishes to receive the latest meeting information."
 msgstr "%s wÃ¼nscht aktuelle Besprechungsinformationen zu erhalten."
 
-#: ../calendar/gui/e-itip-control.c:1391
+#: ../calendar/gui/e-itip-control.c:1392
 msgid "Meeting Update Request"
 msgstr "Besprechungs-Aktualisierungsanfrage"
 
-#: ../calendar/gui/e-itip-control.c:1398
+#: ../calendar/gui/e-itip-control.c:1399
 #, c-format
 msgid "%s has replied to a meeting request."
 msgstr "%s hat auf eine Besprechungsanfrage geantwortet."
 
-#: ../calendar/gui/e-itip-control.c:1399
+#: ../calendar/gui/e-itip-control.c:1400
 msgid "Meeting Reply"
 msgstr "Besprechungsantwort"
 
-#: ../calendar/gui/e-itip-control.c:1406
+#: ../calendar/gui/e-itip-control.c:1407
 #, c-format
 msgid "%s has canceled a meeting."
 msgstr "%s hat eine Besprechung abgesagt."
 
-#: ../calendar/gui/e-itip-control.c:1407
+#: ../calendar/gui/e-itip-control.c:1408
 msgid "Meeting Cancelation"
 msgstr "Besprechungsabsage"
 
-#: ../calendar/gui/e-itip-control.c:1417 ../calendar/gui/e-itip-control.c:1494
-#: ../calendar/gui/e-itip-control.c:1534
+#: ../calendar/gui/e-itip-control.c:1418 ../calendar/gui/e-itip-control.c:1495
+#: ../calendar/gui/e-itip-control.c:1535
 #, c-format
 msgid "%s has sent an unintelligible message."
 msgstr "%s hat eine unverstÃ¤ndliche Nachricht verschickt."
 
-#: ../calendar/gui/e-itip-control.c:1418
+#: ../calendar/gui/e-itip-control.c:1419
 msgid "Bad Meeting Message"
 msgstr "Fehlerhafte Besprechungsmitteilung"
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1446
 #, c-format
 msgid "%s has published task information."
 msgstr "%s hat Aufgabeninformationen verÃ¶ffentlicht."
 
-#: ../calendar/gui/e-itip-control.c:1446
+#: ../calendar/gui/e-itip-control.c:1447
 msgid "Task Information"
 msgstr "Aufgabeninformationen"
 
-#: ../calendar/gui/e-itip-control.c:1453
+#: ../calendar/gui/e-itip-control.c:1454
 #, c-format
 msgid "%s requests %s to perform a task."
 msgstr "%s wÃ¼nscht, dass %s eine Aufgabe ausfÃ¼hrt."
 
-#: ../calendar/gui/e-itip-control.c:1455
+#: ../calendar/gui/e-itip-control.c:1456
 #, c-format
 msgid "%s requests you perform a task."
 msgstr "%s wÃ¼nscht, dass Sie eine Aufgabe ausfÃ¼hren."
 
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Proposal"
 msgstr "Aufgabenvorschlag"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1463
 #, c-format
 msgid "%s wishes to be added to an existing task."
 msgstr "%s wÃ¼nscht zu einer bestehenden Aufgabe hinzugefÃ¼gt zu werden."
 
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1464
 msgid "Task Update"
 msgstr "Aufgabenaktualisierung"
 
-#: ../calendar/gui/e-itip-control.c:1467
+#: ../calendar/gui/e-itip-control.c:1468
 #, c-format
 msgid "%s wishes to receive the latest task information."
 msgstr "%s wÃ¼nscht aktuelle Aufgabeninformationen zu erhalten."
 
-#: ../calendar/gui/e-itip-control.c:1468
+#: ../calendar/gui/e-itip-control.c:1469
 msgid "Task Update Request"
 msgstr "Aufgaben-Aktualisierungsanfrage"
 
-#: ../calendar/gui/e-itip-control.c:1475
+#: ../calendar/gui/e-itip-control.c:1476
 #, c-format
 msgid "%s has replied to a task assignment."
 msgstr "%s hat auf eine Aufgabenzuweisung geantwortet."
 
-#: ../calendar/gui/e-itip-control.c:1476
+#: ../calendar/gui/e-itip-control.c:1477
 msgid "Task Reply"
 msgstr "Aufgaben-Antwort"
 
-#: ../calendar/gui/e-itip-control.c:1483
+#: ../calendar/gui/e-itip-control.c:1484
 #, c-format
 msgid "%s has canceled a task."
 msgstr "%s hat eine Aufgabe abgesagt."
 
-#: ../calendar/gui/e-itip-control.c:1484
+#: ../calendar/gui/e-itip-control.c:1485
 msgid "Task Cancelation"
 msgstr "Aufgabenabsage"
 
-#: ../calendar/gui/e-itip-control.c:1495
+#: ../calendar/gui/e-itip-control.c:1496
 msgid "Bad Task Message"
 msgstr "Fehlerhafte Aufgabenmitteilung"
 
-#: ../calendar/gui/e-itip-control.c:1519
+#: ../calendar/gui/e-itip-control.c:1520
 #, c-format
 msgid "%s has published free/busy information."
 msgstr "%s hat VerfÃ¼gbarkeitsinformationen verÃ¶ffentlicht."
 
-#: ../calendar/gui/e-itip-control.c:1520
+#: ../calendar/gui/e-itip-control.c:1521
 msgid "Free/Busy Information"
 msgstr "VerfÃ¼gbarkeitsinformationen"
 
-#: ../calendar/gui/e-itip-control.c:1524
+#: ../calendar/gui/e-itip-control.c:1525
 #, c-format
 msgid "%s requests your free/busy information."
 msgstr "%s fordert Ihre VerfÃ¼gbarkeitsinformationen an."
 
-#: ../calendar/gui/e-itip-control.c:1525
+#: ../calendar/gui/e-itip-control.c:1526
 msgid "Free/Busy Request"
 msgstr "VerfÃ¼gbarkeitsanfrage"
 
-#: ../calendar/gui/e-itip-control.c:1529
+#: ../calendar/gui/e-itip-control.c:1530
 #, c-format
 msgid "%s has replied to a free/busy request."
 msgstr "%s hat auf eine Verfugbarkeitsanfrage geantwortet."
 
-#: ../calendar/gui/e-itip-control.c:1530
+#: ../calendar/gui/e-itip-control.c:1531
 msgid "Free/Busy Reply"
 msgstr "VerfÃ¼gbarkeitsantwort"
 
-#: ../calendar/gui/e-itip-control.c:1535
+#: ../calendar/gui/e-itip-control.c:1536
 msgid "Bad Free/Busy Message"
 msgstr "Fehlerhafte VerfÃ¼gbarkeitsmitteilung"
 
-#: ../calendar/gui/e-itip-control.c:1611
+#: ../calendar/gui/e-itip-control.c:1612
 msgid "The message does not appear to be properly formed"
 msgstr "Diese Nachricht scheint falsch formatiert zu sein"
 
-#: ../calendar/gui/e-itip-control.c:1670
+#: ../calendar/gui/e-itip-control.c:1671
 msgid "The message contains only unsupported requests."
 msgstr "Diese Nachricht enthÃ¤lt ausschlieÃ?lich nicht unterstÃ¼tzte Anfragen."
 
-#: ../calendar/gui/e-itip-control.c:1703
+#: ../calendar/gui/e-itip-control.c:1704
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Die Anlage enthÃ¤lt keine gÃ¼ltige Kalendernachricht"
 
-#: ../calendar/gui/e-itip-control.c:1741
+#: ../calendar/gui/e-itip-control.c:1742
 msgid "The attachment has no viewable calendar items"
 msgstr "Die Anlage hat keine anzeigbaren KalendereintrÃ¤ge"
 
-#: ../calendar/gui/e-itip-control.c:1983
+#: ../calendar/gui/e-itip-control.c:1984
 msgid "Update complete\n"
 msgstr "Aktualisierung abgeschlossen\n"
 
-#: ../calendar/gui/e-itip-control.c:2017
+#: ../calendar/gui/e-itip-control.c:2018
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objekt ist ungÃ¼ltig und konnte nicht aktualisiert werden\n"
 
-#: ../calendar/gui/e-itip-control.c:2035
+#: ../calendar/gui/e-itip-control.c:2036
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
-"Diese Antwort stammt von keinem voraussichtlichen Teilnehmer.  Als "
-"Teilnehmer hinzufÃ¼gen?"
+"Diese Antwort stammt von keinem voraussichtlichen Teilnehmer.  Als Teilnehmer "
+"hinzufÃ¼gen?"
 
-#: ../calendar/gui/e-itip-control.c:2053
+#: ../calendar/gui/e-itip-control.c:2054
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Teilnahmestatus konnte auf Grund eines ungÃ¼ltigen Status nicht aktualisiert "
 "werden!\n"
 
-#: ../calendar/gui/e-itip-control.c:2077
+#: ../calendar/gui/e-itip-control.c:2078
 msgid "Attendee status updated\n"
 msgstr "Teilnahmestatus aktualisiert\n"
 
-#: ../calendar/gui/e-itip-control.c:2084
-#: ../plugins/itip-formatter/itip-formatter.c:1421
+#: ../calendar/gui/e-itip-control.c:2085
+#: ../plugins/itip-formatter/itip-formatter.c:1528
 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"
 
-#: ../calendar/gui/e-itip-control.c:2115 ../calendar/gui/e-itip-control.c:2172
+#: ../calendar/gui/e-itip-control.c:2116 ../calendar/gui/e-itip-control.c:2173
 msgid "Item sent!\n"
 msgstr "Eintrag verschickt!\n"
 
-#: ../calendar/gui/e-itip-control.c:2121 ../calendar/gui/e-itip-control.c:2180
+#: ../calendar/gui/e-itip-control.c:2122 ../calendar/gui/e-itip-control.c:2181
 msgid "The item could not be sent!\n"
 msgstr "Der Eintrag konnte nicht verschickt werden!\n"
 
-#: ../calendar/gui/e-itip-control.c:2273
+#: ../calendar/gui/e-itip-control.c:2274
 msgid "Choose an action:"
 msgstr "Eine Aktion wÃ¤hlen:"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2302
+#: ../calendar/gui/e-itip-control.c:2303
 #: ../calendar/gui/e-meeting-list-view.c:582
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "UAwg"
 
-#: ../calendar/gui/e-itip-control.c:2342
+#: ../calendar/gui/e-itip-control.c:2343
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: ../calendar/gui/e-itip-control.c:2366
+#: ../calendar/gui/e-itip-control.c:2367
 #: ../plugins/groupwise-features/gw-ui.c:331
 msgid "Accept"
 msgstr "Annehmen"
 
-#: ../calendar/gui/e-itip-control.c:2367
+#: ../calendar/gui/e-itip-control.c:2368
 msgid "Tentatively accept"
 msgstr "VorlÃ¤ufig annehmen"
 
-#: ../calendar/gui/e-itip-control.c:2368
+#: ../calendar/gui/e-itip-control.c:2369
 #: ../plugins/groupwise-features/gw-ui.c:345
 msgid "Decline"
 msgstr "Ablehnen"
 
-#: ../calendar/gui/e-itip-control.c:2393
+#: ../calendar/gui/e-itip-control.c:2394
 msgid "Send Free/Busy Information"
 msgstr "VerfÃ¼gbarkeitsinformationen Ã¼bermitteln"
 
-#: ../calendar/gui/e-itip-control.c:2417
+#: ../calendar/gui/e-itip-control.c:2418
 msgid "Update respondent status"
 msgstr "Status des Antwortenden aktualisieren"
 
-#: ../calendar/gui/e-itip-control.c:2441
+#: ../calendar/gui/e-itip-control.c:2442
 msgid "Send Latest Information"
 msgstr "Neueste Informationen Ã¼bermitteln"
 
-#: ../calendar/gui/e-itip-control.c:2465
-#: ../modules/mail/e-mail-shell-view-actions.c:1036
-#: ../widgets/misc/e-activity-proxy.c:300
+#: ../calendar/gui/e-itip-control.c:2466
+#: ../modules/mail/e-mail-shell-view-actions.c:1062
+#: ../widgets/misc/e-activity-proxy.c:315
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -5454,49 +5426,49 @@ msgstr "Ressourcen"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
 #: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
-#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
+#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:1009
 msgid "Individual"
 msgstr "Individuell"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
 #: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
-#: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/print.c:1010 ../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:106 ../calendar/gui/e-meeting-store.c:123
-#: ../calendar/gui/print.c:970
+#: ../calendar/gui/print.c:1011
 msgid "Resource"
 msgstr "Ressource"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
 #: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
-#: ../calendar/gui/print.c:971
+#: ../calendar/gui/print.c:1012
 msgid "Room"
 msgstr "Raum"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
 #: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
-#: ../calendar/gui/print.c:985
+#: ../calendar/gui/print.c:1026
 msgid "Chair"
 msgstr "Vorsitzender"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
 #: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
-#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
+#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:1027
 msgid "Required Participant"
 msgstr "BenÃ¶tigter Teilnehmer"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
 #: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
-#: ../calendar/gui/print.c:987
+#: ../calendar/gui/print.c:1028
 msgid "Optional Participant"
 msgstr "Optionaler Teilnehmer"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
 #: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
-#: ../calendar/gui/print.c:988
+#: ../calendar/gui/print.c:1029
 msgid "Non-Participant"
 msgstr "Nicht-Teilnehmer"
 
@@ -5518,7 +5490,7 @@ msgstr "In Bearbeitung"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:458
-#: ../calendar/gui/e-meeting-time-sel.c:2376
+#: ../calendar/gui/e-meeting-time-sel.c:2373
 msgid "%A, %B %d, %Y"
 msgstr "%a, %d. %B %Y"
 
@@ -5527,7 +5499,7 @@ msgstr "%a, %d. %B %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:462
-#: ../calendar/gui/e-meeting-time-sel.c:2407
+#: ../calendar/gui/e-meeting-time-sel.c:2404
 msgid "%a %m/%d/%Y"
 msgstr "%a, %d.%m.%Y"
 
@@ -5537,63 +5509,63 @@ msgstr "%a, %d.%m.%Y"
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:562
+#: ../calendar/gui/e-meeting-time-sel.c:559
 msgid "Out of Office"
 msgstr "Nicht im BÃ¼ro"
 
-#: ../calendar/gui/e-meeting-time-sel.c:563
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "No Information"
 msgstr "Keine Informationen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:599
+#: ../calendar/gui/e-meeting-time-sel.c:596
 msgid "O_ptions"
 msgstr "_Einstellungen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:617
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "Show _only working hours"
 msgstr "Nur _Arbeitszeit anzeigen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:628
+#: ../calendar/gui/e-meeting-time-sel.c:625
 msgid "Show _zoomed out"
 msgstr "Ver_kleinert anzeigen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:644
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_Update free/busy"
 msgstr "VerfÃ¼gbarkeit _aktualisieren"
 
-#: ../calendar/gui/e-meeting-time-sel.c:659
+#: ../calendar/gui/e-meeting-time-sel.c:656
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:677
+#: ../calendar/gui/e-meeting-time-sel.c:674
 msgid "_Autopick"
 msgstr "_Auto-AuswÃ¤hlen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:692
+#: ../calendar/gui/e-meeting-time-sel.c:689
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:710
+#: ../calendar/gui/e-meeting-time-sel.c:707
 msgid "_All people and resources"
 msgstr "_Alle Personen und Ressourcen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:720
+#: ../calendar/gui/e-meeting-time-sel.c:717
 msgid "All _people and one resource"
 msgstr "Alle _Personen und eine Ressource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:730
+#: ../calendar/gui/e-meeting-time-sel.c:727
 msgid "_Required people"
 msgstr "_BenÃ¶tigte Personen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:739
+#: ../calendar/gui/e-meeting-time-sel.c:736
 msgid "Required people and _one resource"
 msgstr "BenÃ¶tigte Personen und _eine Ressource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:785
+#: ../calendar/gui/e-meeting-time-sel.c:782
 msgid "_Start time:"
 msgstr "_Anfangszeit:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:822
+#: ../calendar/gui/e-meeting-time-sel.c:819
 msgid "_End time:"
 msgstr "_Endzeit:"
 
@@ -5678,13 +5650,13 @@ msgstr "Klicken Sie hier, um eine Notiz hinzuzufÃ¼gen"
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:631 ../calendar/gui/print.c:2072
+#: ../calendar/gui/e-task-table.c:631 ../calendar/gui/print.c:2113
 #: ../calendar/importers/icalendar-importer.c:81
 #: ../calendar/importers/icalendar-importer.c:828
 #: ../modules/calendar/e-cal-shell-content.c:434
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
-#: ../modules/calendar/e-task-shell-view.c:437
+#: ../modules/calendar/e-task-shell-view.c:444
 #: ../plugins/caldav/caldav-browse-server.c:429
 #: ../plugins/groupwise-features/camel-gw-listener.c:422
 #: ../plugins/groupwise-features/camel-gw-listener.c:562
@@ -5720,7 +5692,7 @@ msgstr "Zeitzone auswÃ¤hlen"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1725
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1766
 msgid "%d %B"
 msgstr "%d. %B"
 
@@ -5753,23 +5725,23 @@ msgstr "Kalenderansicht Ereignis"
 msgid "Grab Focus"
 msgstr "ErhÃ¤lt Fokus"
 
-#: ../calendar/gui/ea-cal-view.c:304
+#: ../calendar/gui/ea-cal-view.c:305
 msgid "New Appointment"
 msgstr "Neuer Termin"
 
-#: ../calendar/gui/ea-cal-view.c:305
+#: ../calendar/gui/ea-cal-view.c:306
 msgid "New All Day Event"
 msgstr "Neues ganztÃ¤giges Ereignis"
 
-#: ../calendar/gui/ea-cal-view.c:306
+#: ../calendar/gui/ea-cal-view.c:307
 msgid "New Meeting"
 msgstr "Neue Besprechung"
 
-#: ../calendar/gui/ea-cal-view.c:307
+#: ../calendar/gui/ea-cal-view.c:308
 msgid "Go to Today"
 msgstr "Zum heutigen Tag"
 
-#: ../calendar/gui/ea-cal-view.c:308
+#: ../calendar/gui/ea-cal-view.c:309
 msgid "Go to Date"
 msgstr "Gehe zu Datum"
 
@@ -5778,7 +5750,7 @@ msgstr "Gehe zu Datum"
 msgid "a table to view and select the current time range"
 msgstr "Eine Tabelle zur Ansicht und Auswahl der momentanen Zeitspanne"
 
-#: ../calendar/gui/ea-day-view.c:150 ../calendar/gui/ea-week-view.c:149
+#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -5787,14 +5759,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:155 ../calendar/gui/ea-week-view.c:152
+#: ../calendar/gui/ea-day-view.c:156 ../calendar/gui/ea-week-view.c:153
 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:162
+#: ../calendar/gui/ea-day-view.c:163
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Arbeitswochenansicht: %s. %s"
@@ -5802,47 +5774,47 @@ msgstr "Arbeitswochenansicht: %s. %s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:168
+#: ../calendar/gui/ea-day-view.c:169
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Tagesansicht: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:202
+#: ../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:204
+#: ../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:48
-#: ../calendar/gui/ea-gnome-calendar.c:56
+#: ../calendar/gui/ea-gnome-calendar.c:49
+#: ../calendar/gui/ea-gnome-calendar.c:57
 #: ../calendar/importers/icalendar-importer.c:860
 msgid "Gnome Calendar"
 msgstr "GNOME Calendar"
 
-#: ../calendar/gui/ea-gnome-calendar.c:199
-#: ../modules/calendar/e-cal-shell-view-private.c:1010
+#: ../calendar/gui/ea-gnome-calendar.c:200
+#: ../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:204
-#: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../calendar/gui/ea-gnome-calendar.c:211
-#: ../modules/calendar/e-cal-shell-view-private.c:1017
-#: ../modules/calendar/e-cal-shell-view-private.c:1023
-#: ../modules/calendar/e-cal-shell-view-private.c:1026
+#: ../calendar/gui/ea-gnome-calendar.c:205
+#: ../calendar/gui/ea-gnome-calendar.c:210
+#: ../calendar/gui/ea-gnome-calendar.c:212
+#: ../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:228
-#: ../calendar/gui/ea-gnome-calendar.c:234
-#: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../calendar/gui/ea-gnome-calendar.c:242
-#: ../modules/calendar/e-cal-shell-view-private.c:1043
-#: ../modules/calendar/e-cal-shell-view-private.c:1054
-#: ../modules/calendar/e-cal-shell-view-private.c:1061
-#: ../modules/calendar/e-cal-shell-view-private.c:1064
+#: ../calendar/gui/ea-gnome-calendar.c:229
+#: ../calendar/gui/ea-gnome-calendar.c:235
+#: ../calendar/gui/ea-gnome-calendar.c:241
+#: ../calendar/gui/ea-gnome-calendar.c:243
+#: ../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"
 
@@ -5854,25 +5826,25 @@ msgstr "Sprungknopf"
 msgid "Click here, you can find more events."
 msgstr "Klicken Sie hier, um weitere Ereignisse zu sehen."
 
-#: ../calendar/gui/ea-week-view.c:157
+#: ../calendar/gui/ea-week-view.c:158
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Monatsansicht: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:161
+#: ../calendar/gui/ea-week-view.c:162
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Wochenansicht: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:195
+#: ../calendar/gui/ea-week-view.c:196
 msgid "calendar view for a month"
 msgstr "Kalenderansicht fÃ¼r einen Monat"
 
-#: ../calendar/gui/ea-week-view.c:197
+#: ../calendar/gui/ea-week-view.c:198
 msgid "calendar view for one or more weeks"
 msgstr "Kalenderansicht fÃ¼r eine oder mehrere Wochen"
 
-#: ../calendar/gui/gnome-cal.c:2311
+#: ../calendar/gui/gnome-cal.c:2313
 msgid "Purging"
 msgstr "SÃ¤uberungsvorgang"
 
@@ -6046,8 +6018,8 @@ msgstr "iCalendar-Informationen"
 #: ../calendar/gui/itip-utils.c:831
 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:833
 msgid "Unable to book a resource, error: "
@@ -6057,225 +6029,225 @@ msgstr "Eine Ressource kann nicht belegt werden, Fehler:"
 msgid "You must be an attendee of the event."
 msgstr "Sie mÃ¼ssen ein Teilnehmer des Ereignisses sein."
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:516
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:516
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:516
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:516
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:516
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:517
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:517
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:517
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:517
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:517
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:518
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:518
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:518
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:518
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:518
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:519
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:519
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:519
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:519
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:519
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:520
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:520
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:520
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:520
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:520
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:521
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:521
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:521
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:521
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:521
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:522
 msgid "31st"
 msgstr "31."
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:602
 msgid "Su"
 msgstr "So"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:602
 msgid "Mo"
 msgstr "Mo"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:602
 msgid "Tu"
 msgstr "Di"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:602
 msgid "We"
 msgstr "Mi"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:603
 msgid "Th"
 msgstr "Do"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:603
 msgid "Fr"
 msgstr "Fr"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:603
 msgid "Sa"
 msgstr "Sa"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:2449
+#: ../calendar/gui/print.c:2513
 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:2457
+#: ../calendar/gui/print.c:2521
 msgid " (Completed "
 msgstr " (Abgeschlossen "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:2461
+#: ../calendar/gui/print.c:2525
 msgid "Completed "
 msgstr "Abgeschlossen "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:2469
+#: ../calendar/gui/print.c:2533
 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:2474
+#: ../calendar/gui/print.c:2538
 msgid "Due "
 msgstr "FÃ¤llig am "
 
-#: ../calendar/gui/print.c:2637
+#: ../calendar/gui/print.c:2701
 #, c-format
 msgid "Summary: %s"
 msgstr "Zusammenfassung: %s"
 
-#: ../calendar/gui/print.c:2661
+#: ../calendar/gui/print.c:2725
 msgid "Attendees: "
 msgstr "Teilnehmer: "
 
-#: ../calendar/gui/print.c:2704
+#: ../calendar/gui/print.c:2768
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:2719
+#: ../calendar/gui/print.c:2783
 #, c-format
 msgid "Priority: %s"
 msgstr "PrioritÃ¤t: %s"
 
-#: ../calendar/gui/print.c:2737
+#: ../calendar/gui/print.c:2801
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prozent abgeschlossen: %i"
 
-#: ../calendar/gui/print.c:2748
+#: ../calendar/gui/print.c:2812
 #, c-format
 msgid "URL: %s"
 msgstr "Adresse: %s"
 
-#: ../calendar/gui/print.c:2761
+#: ../calendar/gui/print.c:2825
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorien: %s"
 
-#: ../calendar/gui/print.c:2772
+#: ../calendar/gui/print.c:2836
 msgid "Contacts: "
 msgstr "Kontakte: "
 
@@ -6302,7 +6274,7 @@ msgstr "Termine und Besprechungen"
 
 #: ../calendar/importers/icalendar-importer.c:350
 #: ../calendar/importers/icalendar-importer.c:707
-#: ../plugins/itip-formatter/itip-formatter.c:1835
+#: ../plugins/itip-formatter/itip-formatter.c:1942
 msgid "Opening calendar"
 msgstr "Kalender wird geÃ¶ffnet"
 
@@ -8032,13 +8004,12 @@ msgstr "Pazifik/Yap"
 msgid "Save as..."
 msgstr "Speichern unter â?¦"
 
-#: ../composer/e-composer-actions.c:245
-#: ../widgets/misc/e-attachment-view.c:379
+#: ../composer/e-composer-actions.c:245 ../widgets/misc/e-attachment-view.c:381
 msgid "Attach a file"
 msgstr "Eine Datei beilegen"
 
 #: ../composer/e-composer-actions.c:250
-#: ../widgets/misc/e-signature-editor.c:206
+#: ../widgets/misc/e-signature-editor.c:208
 msgid "_Close"
 msgstr "S_chlieÃ?en"
 
@@ -8074,7 +8045,7 @@ msgstr "Als _Entwurf speichern"
 msgid "Save as draft"
 msgstr "Als Entwurf speichern"
 
-#: ../composer/e-composer-actions.c:292 ../composer/e-composer-private.c:297
+#: ../composer/e-composer-actions.c:292 ../composer/e-composer-private.c:298
 msgid "S_end"
 msgstr "A_bschicken"
 
@@ -8229,33 +8200,33 @@ msgstr "Klicken Sie hier, um das Adressbuch zu Ã¶ffnen"
 msgid "Click here to select folders to post to"
 msgstr "Klicken Sie hier, um die VerÃ¶ffentlichungsordner zu wÃ¤hlen"
 
-#: ../composer/e-composer-private.c:215
+#: ../composer/e-composer-private.c:216
 msgid "Undo the last action"
 msgstr "Die letzte Aktion rÃ¼ckgÃ¤ngig machen"
 
-#: ../composer/e-composer-private.c:219
+#: ../composer/e-composer-private.c:220
 msgid "Redo the last undone action"
 msgstr "Die zuletzt rÃ¼ckgÃ¤ngig gemachte Aktion wiederholen"
 
-#: ../composer/e-composer-private.c:223
+#: ../composer/e-composer-private.c:224
 msgid "Search for text"
 msgstr "Nach Text suchen"
 
-#: ../composer/e-composer-private.c:227
+#: ../composer/e-composer-private.c:228
 msgid "Search for and replace text"
 msgstr "Nach Text suchen und diesen ersetzen"
 
-#: ../composer/e-composer-private.c:317
+#: ../composer/e-composer-private.c:318
 msgid "Save draft"
 msgstr "Entwurf speichern"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:197
+#: ../composer/e-msg-composer.c:210
 #: ../plugins/attachment-reminder/attachment-reminder.c:117
 msgid "_Do not show this message again."
 msgstr "Diese _Meldung nicht mehr anzeigen."
 
-#: ../composer/e-msg-composer.c:1030
+#: ../composer/e-msg-composer.c:1051
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -8263,7 +8234,7 @@ msgstr ""
 "Ausgehende Nachricht konnte nicht signiert werden: Kein Signaturzertifikat "
 "fÃ¼r dieses Konto festgelegt"
 
-#: ../composer/e-msg-composer.c:1042
+#: ../composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -8272,17 +8243,17 @@ msgstr ""
 "Ausgehende Nachricht konnte nicht verschlÃ¼sselt werden: Kein "
 "VerschlÃ¼sselungszertifikat fÃ¼r dieses Konto festgelegt"
 
-#: ../composer/e-msg-composer.c:1466 ../composer/e-msg-composer.c:1811
+#: ../composer/e-msg-composer.c:1491 ../composer/e-msg-composer.c:1825
 msgid "Compose Message"
 msgstr "Nachricht verfassen"
 
-#: ../composer/e-msg-composer.c:3477
+#: ../composer/e-msg-composer.c:3515
 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:4085
+#: ../composer/e-msg-composer.c:4130
 msgid "Untitled Message"
 msgstr "Namenlose Nachricht"
 
@@ -8292,8 +8263,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."
@@ -8301,8 +8272,7 @@ msgstr "Es wurden alle Konten entfernt."
 
 #: ../composer/mail-composer.error.xml.h:3
 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?"
@@ -8318,8 +8288,8 @@ msgstr "Grund: Â»{1}Â«."
 
 #: ../composer/mail-composer.error.xml.h:6
 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 "
@@ -8512,14 +8482,13 @@ msgstr "Verschicken lÃ¤uft"
 #: ../capplet/settings/mail-account-view.c:591
 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:593
 msgid ""
@@ -8534,8 +8503,7 @@ msgstr ""
 
 #: ../capplet/settings/mail-account-view.c:595
 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:597
 msgid ""
@@ -8558,9 +8526,8 @@ 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:614
-#: ../mail/em-account-editor.c:2101 ../mail/em-account-editor.c:2222
-#: ../mail/mail-config.ui.h:62
+#: ../capplet/settings/mail-account-view.c:614 ../mail/em-account-editor.c:2146
+#: ../mail/em-account-editor.c:2267
 msgid "Identity"
 msgstr "IdentitÃ¤t"
 
@@ -8611,8 +8578,7 @@ msgstr "Weiter - Vorgaben"
 msgid "Back - Receiving options"
 msgstr "ZurÃ¼ck - Empfangsoptionen"
 
-#: ../capplet/settings/mail-account-view.c:619
-#: ../mail/em-account-editor.c:2988 ../mail/mail-config.ui.h:34
+#: ../capplet/settings/mail-account-view.c:619 ../mail/em-account-editor.c:3055
 msgid "Defaults"
 msgstr "Vorgaben"
 
@@ -8683,18 +8649,17 @@ msgstr "Reiter schlieÃ?en"
 msgid "Account Wizard"
 msgstr "Kontenassistent"
 
-#: ../capplet/settings/mail-capplet-shell.c:208
+#: ../capplet/settings/mail-capplet-shell.c:211
 msgid "Evolution account assistant"
 msgstr "Evolution-Kontoassistent"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:342 ../mail/e-mail-migrate.c:664
-#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:148
+#: ../capplet/settings/mail-capplet-shell.c:345 ../mail/e-mail-migrate.c:672
+#: ../mail/e-mail-store.c:218 ../mail/em-folder-tree-model.c:148
 #: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
 #: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:163
-#: ../mail/em-folder-tree-model.c:165 ../mail/mail-vfolder.c:207
-#: ../mail/message-list.c:1666
-#: ../modules/addressbook/e-book-shell-backend.c:96
+#: ../mail/em-folder-tree-model.c:165 ../mail/mail-vfolder.c:208
+#: ../mail/message-list.c:1671 ../modules/addressbook/e-book-shell-backend.c:96
 #: ../modules/addressbook/e-book-shell-migrate.c:130
 #: ../modules/calendar/e-cal-shell-backend.c:102
 #: ../modules/calendar/e-cal-shell-migrate.c:146
@@ -8730,7 +8695,7 @@ msgstr "Benachrichtigungen Ã¼ber Kalenderereignisse"
 msgid "Evolution Alarm Notify"
 msgstr "Evolution Alarm-Benachrichtigung"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:845
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:848
 #: ../shell/e-shell-window-private.c:253
 msgid "Evolution"
 msgstr "Evolution"
@@ -8756,42 +8721,27 @@ msgid "Email Settings"
 msgstr "E-Mail-Einstellungen"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:228
+#: ../e-util/e-activity.c:265
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (abgebrochen)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:231
+#: ../e-util/e-activity.c:268
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (abgeschlossen)"
 
-#. Translators: This is an activity whose percent
-#. * complete is unknown.
-#: ../e-util/e-activity.c:235
+#: ../e-util/e-activity.c:270
 #, c-format
-msgid "%s..."
-msgstr "%s â?¦"
+msgid "%s"
+msgstr "%s"
 
-#: ../e-util/e-activity.c:240
+#: ../e-util/e-activity.c:275
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (zu %d%% abgeschlossen)"
 
-#: ../e-util/e-alert.c:73 ../e-util/e-alert.c:76
-msgid "Evolution Error"
-msgstr "Evolution-Fehler"
-
-#: ../e-util/e-alert.c:79 ../e-util/e-alert.c:82
-msgid "Evolution Warning"
-msgstr "Evolution-Warnung"
-
-#: ../e-util/e-alert.c:659
-#, c-format
-msgid "Internal error, unknown error '%s' requested"
-msgstr "Interner Fehler, unbekannter Fehler Â»%sÂ« angefordert"
-
 #: ../e-util/e-charset.c:53
 msgid "Arabic"
 msgstr "Arabisch"
@@ -8874,7 +8824,7 @@ msgstr "Visuell"
 #: ../e-util/e-datetime-format.c:196
 #: ../modules/calendar/e-cal-shell-view-actions.c:1790
 #: ../plugins/itip-formatter/itip-view.c:191
-#: ../widgets/table/e-cell-date-edit.c:308
+#: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
 msgstr "Heute"
 
@@ -8952,12 +8902,12 @@ msgstr "Protokollmeldungen:"
 msgid "Log Level"
 msgstr "Protokolltyp"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2757
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2745
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Nachrichten"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:113
 #: ../shell/e-shell-window-actions.c:1426
 #: ../shell/e-shell-window-actions.c:1433
 #: ../shell/e-shell-window-actions.c:1440
@@ -9029,7 +8979,7 @@ 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:140
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:145
 msgid "_Overwrite"
 msgstr "Ã?_berschreiben"
 
@@ -9050,110 +9000,112 @@ msgstr "GConf-Fehler: %s"
 msgid "All further errors shown only on terminal."
 msgstr "Weitere Fehler werden nur im Terminal ausgegeben."
 
-#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1038
+#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1050
 #: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:72
 msgid "From"
 msgstr "Von"
 
-#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1039
+#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1051
 #: ../modules/mail/em-mailer-prefs.c:73
 msgid "Reply-To"
 msgstr "Antwort an"
 
-#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1041
-#: ../mail/em-format-html.c:2290 ../mail/em-format-html.c:2352
-#: ../mail/em-format-html.c:2375 ../modules/mail/em-mailer-prefs.c:75
+#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1053
+#: ../mail/em-format-html.c:2391 ../mail/em-format-html.c:2453
+#: ../mail/em-format-html.c:2476 ../modules/mail/em-mailer-prefs.c:75
 msgid "Cc"
 msgstr "Kopie"
 
-#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1042
-#: ../mail/em-format-html.c:2291 ../mail/em-format-html.c:2356
-#: ../mail/em-format-html.c:2378 ../modules/mail/em-mailer-prefs.c:76
+#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1054
+#: ../mail/em-format-html.c:2392 ../mail/em-format-html.c:2457
+#: ../mail/em-format-html.c:2479 ../modules/mail/em-mailer-prefs.c:76
 msgid "Bcc"
 msgstr "Blindkopie"
 
-#: ../em-format/em-format-quote.c:410 ../em-format/em-format.c:1043
+#: ../em-format/em-format-quote.c:422 ../em-format/em-format.c:1055
 #: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
 #: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:77
-#: ../plugins/groupwise-features/properties.ui.h:6 ../smime/lib/e-cert.c:1140
+#: ../plugins/groupwise-features/notification.ui.h:2
+#: ../plugins/groupwise-features/properties.ui.h:5 ../smime/lib/e-cert.c:1140
 msgid "Subject"
 msgstr "Betreff"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:421 ../mail/em-format-html.c:2472
-#: ../modules/mail/em-mailer-prefs.c:1120
+#: ../em-format/em-format-quote.c:433 ../mail/em-format-html.c:2573
+#: ../modules/mail/em-mailer-prefs.c:1040
 msgid "Mailer"
 msgstr "Mailer"
 
-#: ../em-format/em-format-quote.c:500 ../mail/em-composer-utils.c:1296
+#: ../em-format/em-format-quote.c:514 ../mail/em-composer-utils.c:1311
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Weitergeleitete Nachricht --------"
 
-#: ../em-format/em-format.c:1044 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:78 ../widgets/misc/e-dateedit.c:527
-#: ../widgets/misc/e-dateedit.c:549
+#: ../em-format/em-format.c:1056 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:78 ../widgets/misc/e-dateedit.c:530
+#: ../widgets/misc/e-dateedit.c:552
 msgid "Date"
 msgstr "Datum"
 
-#: ../em-format/em-format.c:1045 ../modules/mail/em-mailer-prefs.c:79
+#: ../em-format/em-format.c:1057 ../modules/mail/em-mailer-prefs.c:79
 msgid "Newsgroups"
 msgstr "Newsgroups"
 
-#: ../em-format/em-format.c:1046 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format.c:1058 ../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:1431
+#: ../em-format/em-format.c:1453
 #, c-format
 msgid "%s attachment"
 msgstr "%s-Anlage"
 
-#: ../em-format/em-format.c:1503
+#: ../em-format/em-format.c:1528
 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:1662 ../em-format/em-format.c:1846
+#: ../em-format/em-format.c:1710 ../em-format/em-format.c:1906
 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:1672
+#: ../em-format/em-format.c:1720
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Nicht unterstÃ¼tzter VerschlÃ¼sselungstyp fÃ¼r multipart/encrypted"
 
-#: ../em-format/em-format.c:1688
+#: ../em-format/em-format.c:1739
 msgid "Could not parse PGP/MIME message"
 msgstr "Die Syntax der PGP/MIME-Nachricht konnte nicht analysiert werden"
 
-#: ../em-format/em-format.c:1689
+#: ../em-format/em-format.c:1740
 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:1871
+#: ../em-format/em-format.c:1931
 msgid "Unsupported signature format"
 msgstr "Nicht unterstÃ¼tztes Signaturformat"
 
-#: ../em-format/em-format.c:1881 ../em-format/em-format.c:2041
+#: ../em-format/em-format.c:1944 ../em-format/em-format.c:2117
 msgid "Error verifying signature"
 msgstr "Fehler beim Ã?berprÃ¼fen der Signatur"
 
-#: ../em-format/em-format.c:1882 ../em-format/em-format.c:2029
-#: ../em-format/em-format.c:2042
+#: ../em-format/em-format.c:1945 ../em-format/em-format.c:2104
+#: ../em-format/em-format.c:2118
 msgid "Unknown error verifying signature"
 msgstr "Unbekannter Fehler beim Ã?berprÃ¼fen der Signatur"
 
-#: ../em-format/em-format.c:2129
+#: ../em-format/em-format.c:2209
 msgid "Could not parse PGP message: "
 msgstr "Die Syntax der PGP-Nachricht konnte nicht analysiert werden:"
 
-#: ../em-format/em-format.c:2135 ../plugins/caldav/caldav-browse-server.c:203
+#: ../em-format/em-format.c:2215 ../mail/mail-ops.c:604
+#: ../plugins/caldav/caldav-browse-server.c:203
 #: ../plugins/caldav/caldav-browse-server.c:1254 ../plugins/face/face.c:169
 #: ../smime/gui/certificate-manager.c:100
 msgid "Unknown error"
@@ -9330,12 +9282,12 @@ msgstr "_Threads einschlieÃ?en"
 msgid "A_dd Condition"
 msgstr "Bedingung hin_zufÃ¼gen"
 
-#: ../filter/e-filter-rule.c:1128 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:304
+#: ../filter/e-filter-rule.c:1126 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:302
 msgid "Incoming"
 msgstr "Eingang"
 
-#: ../filter/e-filter-rule.c:1128 ../mail/em-utils.c:305
+#: ../filter/e-filter-rule.c:1126 ../mail/em-utils.c:303
 msgid "Outgoing"
 msgstr "Ausgehend"
 
@@ -9367,7 +9319,7 @@ msgstr "Datum fehlt."
 msgid "Missing file name."
 msgstr "Dateiname fehlt."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:76
 msgid "Missing name."
 msgstr "Name fehlt."
 
@@ -9446,7 +9398,7 @@ msgstr "in der Zukunft"
 msgid "months"
 msgstr "Monaten"
 
-#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:190
+#: ../filter/filter.ui.h:19
 msgid "seconds"
 msgstr "Sekunden"
 
@@ -9463,7 +9415,7 @@ msgid "years"
 msgstr "Jahren"
 
 #: ../mail/e-mail-attachment-bar.c:91 ../mail/e-mail-attachment-bar.c:96
-#: ../mail/em-format-html-display.c:1024 ../mail/mail-config.ui.h:15
+#: ../mail/em-format-html-display.c:1055 ../mail/mail-config.ui.h:13
 #: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:129
 #: ../widgets/misc/e-attachment-paned.c:134
 msgid "Attachment"
@@ -9471,17 +9423,15 @@ msgid_plural "Attachments"
 msgstr[0] "Anlage"
 msgstr[1] "Anlagen"
 
-#: ../mail/e-mail-attachment-bar.c:611
-#: ../widgets/misc/e-attachment-paned.c:599
+#: ../mail/e-mail-attachment-bar.c:611 ../widgets/misc/e-attachment-paned.c:600
 msgid "Icon View"
 msgstr "Symbolansicht"
 
-#: ../mail/e-mail-attachment-bar.c:612
-#: ../widgets/misc/e-attachment-paned.c:600
+#: ../mail/e-mail-attachment-bar.c:612 ../widgets/misc/e-attachment-paned.c:601
 msgid "List View"
 msgstr "Listenansicht"
 
-#: ../mail/e-mail-browser.c:265
+#: ../mail/e-mail-browser.c:268
 msgid "(No Subject)"
 msgstr "(Kein Betreff)"
 
@@ -9551,9 +9501,9 @@ msgid "Color"
 msgstr "Farbe"
 
 #: ../mail/e-mail-label-tree-view.c:96
+#: ../modules/plugin-manager/evolution-plugin-manager.c:66
 #: ../plugins/caldav/caldav-browse-server.c:1163
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../plugins/plugin-manager/plugin-manager.c:58
 #: ../widgets/menus/gal-define-views-dialog.c:334
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
 msgid "Name"
@@ -9579,7 +9529,7 @@ msgstr "Verschickt"
 
 #: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:691
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:578
+#: ../plugins/templates/templates.c:580
 msgid "Templates"
 msgstr "Vorlagen"
 
@@ -9596,11 +9546,11 @@ msgstr "Migration"
 msgid "Migrating '%s':"
 msgstr "Â»%sÂ« wird migriert:"
 
-#: ../mail/e-mail-migrate.c:649
+#: ../mail/e-mail-migrate.c:652
 msgid "Migrating Folders"
 msgstr "Ordner werden migriert"
 
-#: ../mail/e-mail-migrate.c:650
+#: ../mail/e-mail-migrate.c:653
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -9612,7 +9562,7 @@ msgstr ""
 "\n"
 "Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner â?¦"
 
-#: ../mail/e-mail-migrate.c:796
+#: ../mail/e-mail-migrate.c:809
 #, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "Lokale E-Mail-Ordner unter Â»%sÂ« konnten nicht angelegt werden: %s"
@@ -9629,33 +9579,33 @@ msgstr "Bitte wÃ¤hlen Sie einen Ordner"
 msgid "Do not ask me again"
 msgstr "Nicht mehr nachfragen."
 
-#: ../mail/e-mail-reader.c:276 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:272 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "In Ordner kopieren"
 
-#: ../mail/e-mail-reader.c:276 ../mail/em-folder-utils.c:402
+#: ../mail/e-mail-reader.c:272 ../mail/em-folder-utils.c:412
 msgid "C_opy"
 msgstr "K_opieren"
 
-#: ../mail/e-mail-reader.c:689 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:742 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "In Ordner verschieben"
 
-#: ../mail/e-mail-reader.c:689 ../mail/em-folder-utils.c:402
+#: ../mail/e-mail-reader.c:742 ../mail/em-folder-utils.c:412
 msgid "_Move"
 msgstr "_Verschieben"
 
 #. Check buttons
-#: ../mail/e-mail-reader.c:954 ../mail/e-mail-reader.c:1070
-#: ../mail/e-mail-reader.c:1111
+#: ../mail/e-mail-reader.c:1008 ../mail/e-mail-reader.c:1128
+#: ../mail/e-mail-reader.c:1169
 msgid "_Do not ask me again."
 msgstr "_Nicht mehr nachfragen."
 
-#: ../mail/e-mail-reader.c:1116
+#: ../mail/e-mail-reader.c:1174
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "Â»_Antwort anÂ« bei Mailinglisten immer ignorieren"
 
-#: ../mail/e-mail-reader.c:1206
+#: ../mail/e-mail-reader.c:1266
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Nachricht speichern"
@@ -9667,542 +9617,542 @@ msgstr[1] "Nachrichten speichern"
 #. * Subject. The extension ".mbox" is appended to this
 #. * string, thus it will be something like "Message.mbox"
 #. * at the end.
-#: ../mail/e-mail-reader.c:1227
-#: ../plugins/groupwise-features/properties.ui.h:4
+#: ../mail/e-mail-reader.c:1287
+#: ../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:1492
+#: ../mail/e-mail-reader.c:1553
 msgid "A_dd Sender to Address Book"
 msgstr "A_bsender zum Adressbuch hinzufÃ¼gen"
 
-#: ../mail/e-mail-reader.c:1494
+#: ../mail/e-mail-reader.c:1555
 msgid "Add sender to address book"
 msgstr "Absender zum Adressbuch hinzufÃ¼gen"
 
-#: ../mail/e-mail-reader.c:1499
+#: ../mail/e-mail-reader.c:1560
 msgid "Check for _Junk"
 msgstr "Ã?ber_prÃ¼fung auf unerwÃ¼nschte Nachrichten"
 
-#: ../mail/e-mail-reader.c:1501
+#: ../mail/e-mail-reader.c:1562
 msgid "Filter the selected messages for junk status"
 msgstr "Die gewÃ¤hlten Nachrichten auf den Status Â»UnerwÃ¼nschtÂ« filtern"
 
-#: ../mail/e-mail-reader.c:1506
+#: ../mail/e-mail-reader.c:1567
 msgid "_Copy to Folder..."
 msgstr "In Ordner _kopieren â?¦"
 
-#: ../mail/e-mail-reader.c:1508
+#: ../mail/e-mail-reader.c:1569
 msgid "Copy selected messages to another folder"
 msgstr "Die gewÃ¤hlten Nachrichten in einen anderen Ordner kopieren"
 
-#: ../mail/e-mail-reader.c:1513
+#: ../mail/e-mail-reader.c:1574
 msgid "_Delete Message"
 msgstr "Nachricht _lÃ¶schen"
 
-#: ../mail/e-mail-reader.c:1515
+#: ../mail/e-mail-reader.c:1576
 msgid "Mark the selected messages for deletion"
 msgstr "Die gewÃ¤hlten Nachrichten zum LÃ¶schen markieren"
 
-#: ../mail/e-mail-reader.c:1520
+#: ../mail/e-mail-reader.c:1581
 msgid "Filter on Mailing _List..."
 msgstr "Filter Ã¼ber Mailing_liste â?¦"
 
-#: ../mail/e-mail-reader.c:1522
+#: ../mail/e-mail-reader.c:1583
 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:1527
+#: ../mail/e-mail-reader.c:1588
 msgid "Filter on _Recipients..."
 msgstr "Filter Ã¼ber _EmpfÃ¤nger â?¦"
 
-#: ../mail/e-mail-reader.c:1529
+#: ../mail/e-mail-reader.c:1590
 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:1534
+#: ../mail/e-mail-reader.c:1595
 msgid "Filter on Se_nder..."
 msgstr "Filter Ã¼ber _Absender â?¦"
 
-#: ../mail/e-mail-reader.c:1536
+#: ../mail/e-mail-reader.c:1597
 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:1541
+#: ../mail/e-mail-reader.c:1602
 msgid "Filter on _Subject..."
 msgstr "Filter Ã¼ber _Betreff â?¦"
 
-#: ../mail/e-mail-reader.c:1543
+#: ../mail/e-mail-reader.c:1604
 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:1548
+#: ../mail/e-mail-reader.c:1609
 msgid "A_pply Filters"
 msgstr "Filter an_wenden"
 
-#: ../mail/e-mail-reader.c:1550
+#: ../mail/e-mail-reader.c:1611
 msgid "Apply filter rules to the selected messages"
 msgstr "Filterregeln auf die gewÃ¤hlten Nachrichten anwenden"
 
-#: ../mail/e-mail-reader.c:1555
+#: ../mail/e-mail-reader.c:1616
 msgid "_Find in Message..."
 msgstr "In Nachricht _suchen â?¦"
 
-#: ../mail/e-mail-reader.c:1557
+#: ../mail/e-mail-reader.c:1618
 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:1562
+#: ../mail/e-mail-reader.c:1623
 msgid "_Clear Flag"
 msgstr "Markierung _lÃ¶schen"
 
-#: ../mail/e-mail-reader.c:1564
+#: ../mail/e-mail-reader.c:1625
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Die Folgemarkierung aus den gewÃ¤hlten Nachrichten entfernen"
 
-#: ../mail/e-mail-reader.c:1569
+#: ../mail/e-mail-reader.c:1630
 msgid "_Flag Completed"
 msgstr "Als abgeschlossen _markieren"
 
-#: ../mail/e-mail-reader.c:1571
+#: ../mail/e-mail-reader.c:1632
 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:1576
+#: ../mail/e-mail-reader.c:1637
 msgid "Follow _Up..."
 msgstr "_Folgenachricht â?¦"
 
-#: ../mail/e-mail-reader.c:1578
+#: ../mail/e-mail-reader.c:1639
 msgid "Flag the selected messages for follow-up"
 msgstr "Die gewÃ¤hlten Nachrichten zur Nachverfolgung markieren"
 
-#: ../mail/e-mail-reader.c:1583
+#: ../mail/e-mail-reader.c:1644
 msgid "_Attached"
 msgstr "_Anhang"
 
-#: ../mail/e-mail-reader.c:1585 ../mail/e-mail-reader.c:1592
+#: ../mail/e-mail-reader.c:1646 ../mail/e-mail-reader.c:1653
 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:1590
+#: ../mail/e-mail-reader.c:1651
 msgid "Forward As _Attached"
 msgstr "Als _Anhang weiterleiten"
 
-#: ../mail/e-mail-reader.c:1597
+#: ../mail/e-mail-reader.c:1658
 msgid "_Inline"
 msgstr "_Eingebettet"
 
-#: ../mail/e-mail-reader.c:1599 ../mail/e-mail-reader.c:1606
+#: ../mail/e-mail-reader.c:1660 ../mail/e-mail-reader.c:1667
 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:1604
+#: ../mail/e-mail-reader.c:1665
 msgid "Forward As _Inline"
 msgstr "_Eingebettet weiterleiten"
 
-#: ../mail/e-mail-reader.c:1611
+#: ../mail/e-mail-reader.c:1672
 msgid "_Quoted"
 msgstr "_Zitiert"
 
-#: ../mail/e-mail-reader.c:1613 ../mail/e-mail-reader.c:1620
+#: ../mail/e-mail-reader.c:1674 ../mail/e-mail-reader.c:1681
 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:1618
+#: ../mail/e-mail-reader.c:1679
 msgid "Forward As _Quoted"
 msgstr "_Zitiert weiterleiten"
 
-#: ../mail/e-mail-reader.c:1625
+#: ../mail/e-mail-reader.c:1686
 msgid "_Load Images"
 msgstr "_Bilder laden"
 
-#: ../mail/e-mail-reader.c:1627
+#: ../mail/e-mail-reader.c:1688
 msgid "Force images in HTML mail to be loaded"
 msgstr "Laden von Bildern in HTML-E-Mail erzwingen"
 
-#: ../mail/e-mail-reader.c:1632
+#: ../mail/e-mail-reader.c:1693
 msgid "_Important"
 msgstr "_Wichtig"
 
-#: ../mail/e-mail-reader.c:1634
+#: ../mail/e-mail-reader.c:1695
 msgid "Mark the selected messages as important"
 msgstr "Die gewÃ¤hlten Nachrichten als wichtig markieren"
 
-#: ../mail/e-mail-reader.c:1639
+#: ../mail/e-mail-reader.c:1700
 msgid "_Junk"
 msgstr "UnerwÃ¼_nscht"
 
-#: ../mail/e-mail-reader.c:1641
+#: ../mail/e-mail-reader.c:1702
 msgid "Mark the selected messages as junk"
 msgstr "Die gewÃ¤hlten Nachrichten als unerwÃ¼nscht markieren"
 
-#: ../mail/e-mail-reader.c:1646
+#: ../mail/e-mail-reader.c:1707
 msgid "_Not Junk"
 msgstr "E_rwÃ¼nscht"
 
-#: ../mail/e-mail-reader.c:1648
+#: ../mail/e-mail-reader.c:1709
 msgid "Mark the selected messages as not being junk"
 msgstr "Die gewÃ¤hlten Nachrichten als nicht unerwÃ¼nscht markieren"
 
-#: ../mail/e-mail-reader.c:1653
+#: ../mail/e-mail-reader.c:1714
 msgid "_Read"
 msgstr "Ge_lesen"
 
-#: ../mail/e-mail-reader.c:1655
+#: ../mail/e-mail-reader.c:1716
 msgid "Mark the selected messages as having been read"
 msgstr "Die gewÃ¤hlten Nachrichten als gelesen markieren"
 
-#: ../mail/e-mail-reader.c:1660
+#: ../mail/e-mail-reader.c:1721
 msgid "Uni_mportant"
 msgstr "_Unwichtig"
 
-#: ../mail/e-mail-reader.c:1662
+#: ../mail/e-mail-reader.c:1723
 msgid "Mark the selected messages as unimportant"
 msgstr "Die gewÃ¤hlten Nachrichten als unwichtig markieren"
 
-#: ../mail/e-mail-reader.c:1667
+#: ../mail/e-mail-reader.c:1728
 msgid "_Unread"
 msgstr "_Ungelesen"
 
-#: ../mail/e-mail-reader.c:1669
+#: ../mail/e-mail-reader.c:1730
 msgid "Mark the selected messages as not having been read"
 msgstr "Die gewÃ¤hlten Nachrichten als ungelesen markieren"
 
-#: ../mail/e-mail-reader.c:1674
+#: ../mail/e-mail-reader.c:1735
 msgid "_Edit as New Message..."
 msgstr "Als neue _Nachricht bearbeiten â?¦"
 
-#: ../mail/e-mail-reader.c:1676
+#: ../mail/e-mail-reader.c:1737
 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:1681
+#: ../mail/e-mail-reader.c:1742
 msgid "Compose _New Message"
 msgstr "_Nachricht verfassen"
 
-#: ../mail/e-mail-reader.c:1683
+#: ../mail/e-mail-reader.c:1744
 msgid "Open a window for composing a mail message"
 msgstr "Ein Fenster zum Verfassen einer E-Mail-Nachricht Ã¶ffnen"
 
-#: ../mail/e-mail-reader.c:1688
+#: ../mail/e-mail-reader.c:1749
 msgid "_Open in New Window"
 msgstr "In neuem _Fenster Ã¶ffnen"
 
-#: ../mail/e-mail-reader.c:1690
+#: ../mail/e-mail-reader.c:1751
 msgid "Open the selected messages in a new window"
 msgstr "Die gewÃ¤hlten Nachrichten in einem neuen Fenster Ã¶ffnen"
 
-#: ../mail/e-mail-reader.c:1695
+#: ../mail/e-mail-reader.c:1756
 msgid "_Move to Folder..."
 msgstr "In Ordner _verschieben â?¦"
 
-#: ../mail/e-mail-reader.c:1697
+#: ../mail/e-mail-reader.c:1758
 msgid "Move selected messages to another folder"
 msgstr "Die gewÃ¤hlten Nachrichten in einen anderen Ordner verschieben"
 
-#: ../mail/e-mail-reader.c:1702
+#: ../mail/e-mail-reader.c:1763
 msgid "_Switch to Folder"
 msgstr "Zu Ordner _wechseln"
 
-#: ../mail/e-mail-reader.c:1704
+#: ../mail/e-mail-reader.c:1765
 msgid "Display the parent folder"
 msgstr "Den Elternordner anzeigen"
 
-#: ../mail/e-mail-reader.c:1709
+#: ../mail/e-mail-reader.c:1770
 msgid "Switch to _next tab"
 msgstr "Zum _naÌ?chsten Reiter wechseln"
 
-#: ../mail/e-mail-reader.c:1711
+#: ../mail/e-mail-reader.c:1772
 msgid "Switch to the next tab"
 msgstr "Zum naÌ?chsten Reiter wechseln"
 
-#: ../mail/e-mail-reader.c:1716
+#: ../mail/e-mail-reader.c:1777
 msgid "Switch to _previous tab"
 msgstr "Zum _vorherigen Reiter wechseln"
 
-#: ../mail/e-mail-reader.c:1718
+#: ../mail/e-mail-reader.c:1779
 msgid "Switch to the previous tab"
 msgstr "Zum vorherigen Reiter wechseln"
 
-#: ../mail/e-mail-reader.c:1723
+#: ../mail/e-mail-reader.c:1784
 msgid "Cl_ose current tab"
 msgstr "Den momentan geÃ¶ffneten Reiter _schlieÃ?en"
 
-#: ../mail/e-mail-reader.c:1725
+#: ../mail/e-mail-reader.c:1786
 msgid "Close current tab"
 msgstr "Den momentan geÃ¶ffneten Reiter schlieÃ?en"
 
-#: ../mail/e-mail-reader.c:1730
+#: ../mail/e-mail-reader.c:1791
 msgid "_Next Message"
 msgstr "_NÃ¤chste Nachricht"
 
-#: ../mail/e-mail-reader.c:1732
+#: ../mail/e-mail-reader.c:1793
 msgid "Display the next message"
 msgstr "Die nÃ¤chste Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:1737
+#: ../mail/e-mail-reader.c:1798
 msgid "Next _Important Message"
 msgstr "NÃ¤chste _wichtige Nachricht"
 
-#: ../mail/e-mail-reader.c:1739
+#: ../mail/e-mail-reader.c:1800
 msgid "Display the next important message"
 msgstr "Die nÃ¤chste wichtige Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:1744
+#: ../mail/e-mail-reader.c:1805
 msgid "Next _Thread"
 msgstr "NÃ¤chster _Thread"
 
-#: ../mail/e-mail-reader.c:1746
+#: ../mail/e-mail-reader.c:1807
 msgid "Display the next thread"
 msgstr "NÃ¤chsten Thread anzeigen"
 
-#: ../mail/e-mail-reader.c:1751
+#: ../mail/e-mail-reader.c:1812
 msgid "Next _Unread Message"
 msgstr "NÃ¤chste _ungelesene Nachricht"
 
-#: ../mail/e-mail-reader.c:1753
+#: ../mail/e-mail-reader.c:1814
 msgid "Display the next unread message"
 msgstr "Die nÃ¤chste ungelesene Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:1758
+#: ../mail/e-mail-reader.c:1819
 msgid "_Previous Message"
 msgstr "_Vorherige Nachricht"
 
-#: ../mail/e-mail-reader.c:1760
+#: ../mail/e-mail-reader.c:1821
 msgid "Display the previous message"
 msgstr "Die vorhergehende Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:1765
+#: ../mail/e-mail-reader.c:1826
 msgid "Pr_evious Important Message"
 msgstr "V_orherige wichtige Nachricht"
 
-#: ../mail/e-mail-reader.c:1767
+#: ../mail/e-mail-reader.c:1828
 msgid "Display the previous important message"
 msgstr "Die vorhergehende wichtige Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:1772
+#: ../mail/e-mail-reader.c:1833
 msgid "P_revious Unread Message"
 msgstr "_Vorherige ungelesene Nachricht"
 
-#: ../mail/e-mail-reader.c:1774
+#: ../mail/e-mail-reader.c:1835
 msgid "Display the previous unread message"
 msgstr "Die vorhergehende ungelesene Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:1781
+#: ../mail/e-mail-reader.c:1842
 msgid "Print this message"
 msgstr "Diese Nachricht drucken"
 
-#: ../mail/e-mail-reader.c:1788
+#: ../mail/e-mail-reader.c:1849
 msgid "Preview the message to be printed"
 msgstr "Eine Vorschau auf die zu druckende Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:1793
+#: ../mail/e-mail-reader.c:1854
 msgid "Re_direct"
 msgstr "_Umleiten"
 
-#: ../mail/e-mail-reader.c:1795
+#: ../mail/e-mail-reader.c:1856
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Die gewÃ¤hlte Nachricht an jemanden umleiten"
 
-#: ../mail/e-mail-reader.c:1800 ../mail/mail.error.xml.h:91
+#: ../mail/e-mail-reader.c:1861 ../mail/mail.error.xml.h:93
 #: ../modules/calendar/e-cal-shell-view-actions.c:1459
 #: ../modules/mail/e-mail-attachment-handler.c:151
 msgid "Reply to _All"
 msgstr "Antw_ort an alle"
 
-#: ../mail/e-mail-reader.c:1802
+#: ../mail/e-mail-reader.c:1863
 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:1807 ../mail/mail.error.xml.h:92
+#: ../mail/e-mail-reader.c:1868 ../mail/mail.error.xml.h:94
 msgid "Reply to _List"
 msgstr "Antwort an Lis_te"
 
-#: ../mail/e-mail-reader.c:1809
+#: ../mail/e-mail-reader.c:1870
 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:1814
-#: ../modules/mail/e-mail-attachment-handler.c:158
+#: ../mail/e-mail-reader.c:1875 ../modules/mail/e-mail-attachment-handler.c:158
 msgid "_Reply to Sender"
 msgstr "_Antwort an Absender"
 
-#: ../mail/e-mail-reader.c:1816
+#: ../mail/e-mail-reader.c:1877
 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:1821
+#: ../mail/e-mail-reader.c:1882
 msgid "_Save as mbox..."
 msgstr "_Speichern als mbox â?¦"
 
-#: ../mail/e-mail-reader.c:1823
+#: ../mail/e-mail-reader.c:1884
 msgid "Save selected messages as an mbox file"
 msgstr "Die gewÃ¤hlten Nachrichten als mbox-Datei speichern"
 
-#: ../mail/e-mail-reader.c:1828
+#: ../mail/e-mail-reader.c:1889
 msgid "Search Folder from Mailing _List..."
 msgstr "Suchordner Ã¼ber Mailing_liste â?¦"
 
-#: ../mail/e-mail-reader.c:1830
+#: ../mail/e-mail-reader.c:1891
 msgid "Create a search folder for this mailing list"
 msgstr "Einen Suchordner fÃ¼r diese Mailingliste anlegen"
 
-#: ../mail/e-mail-reader.c:1835
+#: ../mail/e-mail-reader.c:1896
 msgid "Search Folder from Recipien_ts..."
 msgstr "Suchordner Ã¼ber _EmpfÃ¤nger â?¦"
 
-#: ../mail/e-mail-reader.c:1837
+#: ../mail/e-mail-reader.c:1898
 msgid "Create a search folder for these recipients"
 msgstr "Einen Suchordner fÃ¼r diese EmpfÃ¤nger anlegen"
 
-#: ../mail/e-mail-reader.c:1842
+#: ../mail/e-mail-reader.c:1903
 msgid "Search Folder from Sen_der..."
 msgstr "Suchordner Ã¼ber _Absender â?¦"
 
-#: ../mail/e-mail-reader.c:1844
+#: ../mail/e-mail-reader.c:1905
 msgid "Create a search folder for this sender"
 msgstr "Einen Suchordner fÃ¼r diesen Absender anlegen"
 
-#: ../mail/e-mail-reader.c:1849
+#: ../mail/e-mail-reader.c:1910
 msgid "Search Folder from S_ubject..."
 msgstr "Suchordner Ã¼ber _Betreff â?¦"
 
-#: ../mail/e-mail-reader.c:1851
+#: ../mail/e-mail-reader.c:1912
 msgid "Create a search folder for this subject"
 msgstr "Einen Suchordner fÃ¼r diesen Betreff anlegen"
 
-#: ../mail/e-mail-reader.c:1856
+#: ../mail/e-mail-reader.c:1917
 msgid "_Message Source"
 msgstr "Nachrichten-_Quelltext"
 
-#: ../mail/e-mail-reader.c:1858
+#: ../mail/e-mail-reader.c:1919
 msgid "Show the raw email source of the message"
 msgstr "Den zugrunde liegenden E-Mail-Quelltext dieser Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:1870
+#: ../mail/e-mail-reader.c:1931
 msgid "_Undelete Message"
 msgstr "LÃ¶schen der Nachricht _rÃ¼ckgÃ¤ngig"
 
-#: ../mail/e-mail-reader.c:1872
+#: ../mail/e-mail-reader.c:1933
 msgid "Undelete the selected messages"
 msgstr "LÃ¶schen der gewÃ¤hlten Nachrichten rÃ¼ckgÃ¤ngig machen"
 
-#: ../mail/e-mail-reader.c:1877
+#: ../mail/e-mail-reader.c:1938
 msgid "_Normal Size"
 msgstr "_Normale GrÃ¶Ã?e"
 
-#: ../mail/e-mail-reader.c:1879
+#: ../mail/e-mail-reader.c:1940
 msgid "Reset the text to its original size"
 msgstr "Den Text auf seine OriginalgrÃ¶Ã?e zurÃ¼cksetzen"
 
-#: ../mail/e-mail-reader.c:1884
+#: ../mail/e-mail-reader.c:1945
 msgid "_Zoom In"
 msgstr "Ansicht ver_grÃ¶Ã?ern"
 
-#: ../mail/e-mail-reader.c:1886
+#: ../mail/e-mail-reader.c:1947
 msgid "Increase the text size"
 msgstr "Die TextgrÃ¶Ã?e heraufsetzen"
 
-#: ../mail/e-mail-reader.c:1891
+#: ../mail/e-mail-reader.c:1952
 msgid "Zoom _Out"
 msgstr "Ansicht ver_kleinern"
 
-#: ../mail/e-mail-reader.c:1893
+#: ../mail/e-mail-reader.c:1954
 msgid "Decrease the text size"
 msgstr "Die TextgrÃ¶Ã?e heruntersetzen"
 
-#: ../mail/e-mail-reader.c:1900
+#: ../mail/e-mail-reader.c:1961
 msgid "Create R_ule"
 msgstr "_Regel anlegen"
 
-#: ../mail/e-mail-reader.c:1907
+#: ../mail/e-mail-reader.c:1968
 msgid "Ch_aracter Encoding"
 msgstr "Zeichenko_dierung"
 
-#: ../mail/e-mail-reader.c:1914
+#: ../mail/e-mail-reader.c:1975
 msgid "F_orward As"
 msgstr "_Weiterleiten als â?¦"
 
-#: ../mail/e-mail-reader.c:1921
+#: ../mail/e-mail-reader.c:1982
 msgid "_Group Reply"
 msgstr "Antwort an _Gruppe"
 
-#: ../mail/e-mail-reader.c:1928
+#: ../mail/e-mail-reader.c:1989
 msgid "_Go To"
 msgstr "_Gehe zu"
 
-#: ../mail/e-mail-reader.c:1935
+#: ../mail/e-mail-reader.c:1996
 msgid "Mar_k As"
 msgstr "Mar_kieren als"
 
-#: ../mail/e-mail-reader.c:1942
+#: ../mail/e-mail-reader.c:2003
 msgid "_Message"
 msgstr "_Nachricht"
 
-#: ../mail/e-mail-reader.c:1949
+#: ../mail/e-mail-reader.c:2010
 msgid "_Zoom"
 msgstr "Ansicht ver_grÃ¶Ã?ern"
 
-#: ../mail/e-mail-reader.c:1974
+#: ../mail/e-mail-reader.c:2035
 msgid "Mark for Follo_w Up..."
 msgstr "Als _Folgenachricht markieren â?¦"
 
-#: ../mail/e-mail-reader.c:1982
+#: ../mail/e-mail-reader.c:2043
 msgid "Mark as _Important"
 msgstr "Als w_ichtig markieren"
 
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:2047
 msgid "Mark as _Junk"
 msgstr "Als un_erwÃ¼nscht markieren"
 
-#: ../mail/e-mail-reader.c:1990
+#: ../mail/e-mail-reader.c:2051
 msgid "Mark as _Not Junk"
 msgstr "Als _nicht unerwÃ¼nscht markieren"
 
-#: ../mail/e-mail-reader.c:1994
+#: ../mail/e-mail-reader.c:2055
 msgid "Mar_k as Read"
 msgstr "Als _gelesen markieren"
 
-#: ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:2059
 msgid "Mark as Uni_mportant"
 msgstr "Als un_wichtig markieren"
 
-#: ../mail/e-mail-reader.c:2002
+#: ../mail/e-mail-reader.c:2063
 msgid "Mark as _Unread"
 msgstr "Als _ungelesen markieren"
 
-#: ../mail/e-mail-reader.c:2038
+#: ../mail/e-mail-reader.c:2099
 msgid "_Caret Mode"
 msgstr "Cursor-_Modus"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:2101
 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:2046
+#: ../mail/e-mail-reader.c:2107
 msgid "All Message _Headers"
 msgstr "Alle Nachrichtenk_Ã¶pfe"
 
-#: ../mail/e-mail-reader.c:2048
+#: ../mail/e-mail-reader.c:2109
 msgid "Show messages with all email headers"
 msgstr "Nachrichten mit allen E-Mail-Kopfzeilen anzeigen"
 
-#: ../mail/e-mail-reader.c:2269
+#: ../mail/e-mail-reader.c:2332
 msgid "Unable to retrieve message"
 msgstr "Nachricht konnte nicht abgerufen werden"
 
-#: ../mail/e-mail-reader.c:2329 ../mail/mail-ops.c:1891
+#: ../mail/e-mail-reader.c:2392 ../mail/mail-ops.c:1927
 #, 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:2893 ../mail/mail-config.ui.h:31
+#: ../mail/e-mail-reader.c:2959 ../mail/mail-config.ui.h:29
 #: ../plugins/google-account-setup/google-source.c:303
 #: ../plugins/google-account-setup/google-source.c:537
 #: ../plugins/google-account-setup/google-source.c:659
@@ -10210,47 +10160,46 @@ msgstr "Nachricht Â»%sÂ« wird abgerufen"
 msgid "Default"
 msgstr "Vorgabe"
 
-#: ../mail/e-mail-reader.c:3041
-#: ../modules/mail/e-mail-attachment-handler.c:144
+#: ../mail/e-mail-reader.c:3107 ../modules/mail/e-mail-attachment-handler.c:144
 msgid "_Forward"
 msgstr "_Weiterleiten"
 
-#: ../mail/e-mail-reader.c:3042
+#: ../mail/e-mail-reader.c:3108
 msgid "Forward the selected message to someone"
 msgstr "Die gewÃ¤hlte Nachricht an jemanden weiterleiten"
 
-#: ../mail/e-mail-reader.c:3061
+#: ../mail/e-mail-reader.c:3127
 msgid "Group Reply"
 msgstr "Antwort an Gruppe"
 
-#: ../mail/e-mail-reader.c:3062
+#: ../mail/e-mail-reader.c:3128
 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:3107 ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:743
+#: ../mail/e-mail-reader.c:3173 ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:744
 msgid "Delete"
 msgstr "LÃ¶schen"
 
-#: ../mail/e-mail-reader.c:3140
+#: ../mail/e-mail-reader.c:3206
 #: ../modules/calendar/e-cal-shell-view-actions.c:1305
 #: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "Weiter"
 
-#: ../mail/e-mail-reader.c:3144
+#: ../mail/e-mail-reader.c:3210
 #: ../modules/calendar/e-cal-shell-view-actions.c:1298
 #: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "Vorherige"
 
-#: ../mail/e-mail-reader.c:3154 ../mail/mail-dialogs.ui.h:19
+#: ../mail/e-mail-reader.c:3220 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "Antworten"
 
-#: ../mail/e-mail-reader.c:3722
+#: ../mail/e-mail-reader.c:3784
 #, c-format
 msgid "Folder '%s'"
 msgstr "Ordner Â»%sÂ«"
@@ -10261,7 +10210,7 @@ msgstr "Als Folgenachricht markieren"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:512 ../mail/mail-config.ui.h:77
+#: ../mail/em-account-editor.c:510 ../mail/mail-config.ui.h:67
 #: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "Keine VerschlÃ¼sselung"
@@ -10269,7 +10218,7 @@ msgstr "Keine VerschlÃ¼sselung"
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:516 ../mail/mail-config.ui.h:136
+#: ../mail/em-account-editor.c:514 ../mail/mail-config.ui.h:121
 #: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "TLS-VerschlÃ¼sselung"
@@ -10277,18 +10226,18 @@ msgstr "TLS-VerschlÃ¼sselung"
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:520 ../mail/mail-config.ui.h:105
+#: ../mail/em-account-editor.c:518 ../mail/mail-config.ui.h:89
 #: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "SSL-VerschlÃ¼sselung"
 
 # CHECK gibt's ne Ã?bersetzung fÃ¼r diese Methode?
-#: ../mail/em-account-editor.c:607
+#: ../mail/em-account-editor.c:605
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s-Lizenzvereinbarung"
 
-#: ../mail/em-account-editor.c:614
+#: ../mail/em-account-editor.c:612
 #, c-format
 msgid ""
 "\n"
@@ -10302,34 +10251,34 @@ msgstr ""
 "Haken Sie das KontrollkÃ¤stchen ab, um sie zu akzeptieren.\n"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:901 ../widgets/misc/e-signature-combo-box.c:79
+#: ../mail/em-account-editor.c:899 ../widgets/misc/e-signature-combo-box.c:79
 msgctxt "mail-signature"
 msgid "None"
 msgstr "Keine"
 
-#: ../mail/em-account-editor.c:985
+#: ../mail/em-account-editor.c:983
 msgid "Never"
 msgstr "Nie"
 
-#: ../mail/em-account-editor.c:986
+#: ../mail/em-account-editor.c:984
 msgid "Always"
 msgstr "Immer"
 
-#: ../mail/em-account-editor.c:987
+#: ../mail/em-account-editor.c:985
 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:1723 ../widgets/misc/e-account-tree-view.c:128
+#: ../mail/em-account-editor.c:1768 ../widgets/misc/e-account-tree-view.c:128
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "Keine"
 
-#: ../mail/em-account-editor.c:2098
+#: ../mail/em-account-editor.c:2143
 msgid "Mail Configuration"
 msgstr "E-Mail-Konfiguration"
 
-#: ../mail/em-account-editor.c:2099
+#: ../mail/em-account-editor.c:2144
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10339,31 +10288,30 @@ msgstr ""
 "\n"
 "Klicken Sie auf Â»VorÂ«, um die Konfiguration zu beginnen."
 
-#: ../mail/em-account-editor.c:2102
+#: ../mail/em-account-editor.c:2147
 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."
+"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:2104 ../mail/em-account-editor.c:2261
-#: ../mail/mail-config.ui.h:98
+#: ../mail/em-account-editor.c:2149 ../mail/em-account-editor.c:2311
 msgid "Receiving Email"
 msgstr "Abrufen von E-Mails"
 
-#: ../mail/em-account-editor.c:2105
+#: ../mail/em-account-editor.c:2150
 msgid "Please configure the following account settings."
 msgstr "Bitte konfigurieren Sie die folgenden Konteneinstellungen."
 
-#: ../mail/em-account-editor.c:2107 ../mail/em-account-editor.c:2743
+#: ../mail/em-account-editor.c:2152 ../mail/em-account-editor.c:2799
 msgid "Sending Email"
 msgstr "Verschicken von E-Mails"
 
-#: ../mail/em-account-editor.c:2108
+#: ../mail/em-account-editor.c:2153
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -10372,11 +10320,11 @@ msgstr ""
 "Mails verschicken wollen. Falls Sie sich nicht sicher sind, wenden Sie sich "
 "bitte an Ihren Systemadministrator oder Internet-Provider."
 
-#: ../mail/em-account-editor.c:2110
+#: ../mail/em-account-editor.c:2155
 msgid "Account Management"
 msgstr "Kontenverwaltung"
 
-#: ../mail/em-account-editor.c:2111
+#: ../mail/em-account-editor.c:2156
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -10384,11 +10332,11 @@ msgstr ""
 "Bitte geben Sie unten einen bezeichnenden Namen fÃ¼r dieses Konto ein.\n"
 "Dieser Name wird nur zum Anzeigen verwendet."
 
-#: ../mail/em-account-editor.c:2115
+#: ../mail/em-account-editor.c:2160
 msgid "Done"
 msgstr "Fertig"
 
-#: ../mail/em-account-editor.c:2116
+#: ../mail/em-account-editor.c:2161
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10405,52 +10353,52 @@ msgstr ""
 "Klicken Sie auf Â»AnwendenÂ«, um Ihre Einstellungen zu\n"
 "speichern."
 
-#: ../mail/em-account-editor.c:2557
+#: ../mail/em-account-editor.c:2613
 msgid "Check for _new messages every"
 msgstr "_Automatisch nach neuen E-Mails sehen alle"
 
-#: ../mail/em-account-editor.c:2565
+#: ../mail/em-account-editor.c:2621
 msgid "minu_tes"
 msgstr "Minu_ten"
 
-#: ../mail/em-account-editor.c:2841
+#: ../mail/em-account-editor.c:2903
 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:3111 ../mail/mail-config.ui.h:112
+#: ../mail/em-account-editor.c:3183 ../mail/mail-config.ui.h:96
 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:3156 ../mail/em-account-editor.c:3224
+#: ../mail/em-account-editor.c:3228 ../mail/em-account-editor.c:3296
 msgid "Receiving Options"
 msgstr "Empfangsoptionen"
 
-#: ../mail/em-account-editor.c:3157 ../mail/em-account-editor.c:3225
+#: ../mail/em-account-editor.c:3229 ../mail/em-account-editor.c:3297
 msgid "Checking for New Messages"
 msgstr "Nach neuen E-Mails sehen"
 
 #. 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:1729
+#: ../mail/em-composer-utils.c:1744
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "Ihre Nachricht an %s mit dem Betreff Â»%sÂ« am %s wurde gelesen."
 
 #. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1777
+#: ../mail/em-composer-utils.c:1794
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "ZustellungsbestÃ¤tigung fÃ¼r: Â»%sÂ«"
 
-#: ../mail/em-composer-utils.c:2186
+#: ../mail/em-composer-utils.c:2204
 msgid "an unknown sender"
 msgstr "ein unbekannter Absender"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2233
+#: ../mail/em-composer-utils.c:2251
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10458,15 +10406,15 @@ msgstr ""
 "Am ${WeekdayName}, den ${Day}.${Month}.${Year}, ${24Hour}:${Minute} "
 "${TimeZone} schrieb ${Sender}:"
 
-#: ../mail/em-composer-utils.c:2377
+#: ../mail/em-composer-utils.c:2395
 msgid "-----Original Message-----"
 msgstr "-------- Weitergeleitete Nachricht --------"
 
-#: ../mail/em-composer-utils.c:2589
+#: ../mail/em-composer-utils.c:2607
 msgid "Posting destination"
 msgstr "Zielordner"
 
-#: ../mail/em-composer-utils.c:2590
+#: ../mail/em-composer-utils.c:2608
 msgid "Choose folders to post the message to."
 msgstr "WÃ¤hlen Sie Ordner, in denen die Nachricht abgelegt werden soll."
 
@@ -10587,7 +10535,7 @@ msgstr "ist nicht gesetzt"
 msgid "is set"
 msgstr "ist gesetzt"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:66
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:58
 msgid "Junk"
 msgstr "UnerwÃ¼nscht"
 
@@ -10636,7 +10584,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:18
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:15
 msgid "Read"
 msgstr "Gelesen"
 
@@ -10751,7 +10699,6 @@ msgid "Quota usage"
 msgstr "Speicherverbrauch:"
 
 #: ../mail/em-folder-properties.c:288
-#: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Folder Properties"
 msgstr "Ordnereigenschaften"
 
@@ -10759,11 +10706,11 @@ msgstr "Ordnereigenschaften"
 msgid "<click here to select a folder>"
 msgstr "<Klicken Sie hier, um einen Ordner auszuwÃ¤hlen>"
 
-#: ../mail/em-folder-selector.c:264
+#: ../mail/em-folder-selector.c:262
 msgid "C_reate"
 msgstr "_Anlegen"
 
-#: ../mail/em-folder-selector.c:268
+#: ../mail/em-folder-selector.c:266
 msgid "Folder _name:"
 msgstr "Ordner_name:"
 
@@ -10771,7 +10718,7 @@ msgstr "Ordner_name:"
 #: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
 #: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:160
 #: ../mail/em-folder-tree-model.c:167 ../mail/em-folder-tree-model.c:169
-#: ../mail/mail-vfolder.c:1067 ../mail/mail-vfolder.c:1132
+#: ../mail/mail-vfolder.c:1080 ../mail/mail-vfolder.c:1145
 msgid "Search Folders"
 msgstr "Suchordner"
 
@@ -10781,85 +10728,85 @@ msgstr "Suchordner"
 msgid "UNMATCHED"
 msgstr "OHNE TREFFER"
 
-#: ../mail/em-folder-tree-model.c:766 ../mail/em-folder-tree-model.c:1113
+#: ../mail/em-folder-tree-model.c:766 ../mail/em-folder-tree-model.c:1043
 msgid "Loading..."
 msgstr "Ladevorgang â?¦"
 
-#: ../mail/em-folder-tree.c:191
+#: ../mail/em-folder-tree.c:193
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Ordner in Â»%sÂ« werden eingelesen"
 
-#: ../mail/em-folder-tree.c:611
+#: ../mail/em-folder-tree.c:614
 msgid "Folder names cannot contain '/'"
 msgstr "Ordnernamen dÃ¼rfen das Slash-Zeichen Â»/Â« nicht enthalten"
 
-#: ../mail/em-folder-tree.c:1100
+#: ../mail/em-folder-tree.c:1089
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1339
+#: ../mail/em-folder-tree.c:1328
 msgid "Mail Folder Tree"
 msgstr "E-Mail-Ordnerbaum"
 
-#: ../mail/em-folder-tree.c:1656 ../mail/em-folder-utils.c:92
+#: ../mail/em-folder-tree.c:1650 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Moving folder %s"
 msgstr "Ordner %s wird verschoben"
 
-#: ../mail/em-folder-tree.c:1660 ../mail/em-folder-utils.c:94
+#: ../mail/em-folder-tree.c:1654 ../mail/em-folder-utils.c:94
 #, c-format
 msgid "Copying folder %s"
 msgstr "Ordner %s wird kopiert"
 
-#: ../mail/em-folder-tree.c:1669 ../mail/message-list.c:2164
+#: ../mail/em-folder-tree.c:1663 ../mail/message-list.c:2170
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Nachrichten werden in den Ordner %s verschoben"
 
-#: ../mail/em-folder-tree.c:1673 ../mail/message-list.c:2166
+#: ../mail/em-folder-tree.c:1667 ../mail/message-list.c:2172
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Nachrichten werden in den Ordner %s kopiert"
 
-#: ../mail/em-folder-tree.c:1690
+#: ../mail/em-folder-tree.c:1684
 #, 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:403
+#: ../mail/em-folder-utils.c:413
 msgid "Move Folder To"
 msgstr "Ordner verschieben nach"
 
-#: ../mail/em-folder-utils.c:403
+#: ../mail/em-folder-utils.c:413
 msgid "Copy Folder To"
 msgstr "Ordner kopieren nach"
 
-#: ../mail/em-folder-utils.c:533
+#: ../mail/em-folder-utils.c:543
 #: ../plugins/groupwise-features/share-folder-common.c:137
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "Ordner Â»%sÂ« wird angelegt"
 
-#: ../mail/em-folder-utils.c:693
+#: ../mail/em-folder-utils.c:708
 msgid "Create Folder"
 msgstr "Ordner anlegen"
 
-#: ../mail/em-folder-utils.c:694
-#: ../plugins/groupwise-features/install-shared.c:165
-#: ../plugins/groupwise-features/share-folder-common.c:342
+#: ../mail/em-folder-utils.c:709
+#: ../plugins/groupwise-features/install-shared.c:170
+#: ../plugins/groupwise-features/share-folder-common.c:347
 msgid "Specify where to create the folder:"
 msgstr "Angeben, wo der Ordner angelegt werden soll:"
 
-#: ../mail/em-folder-utils.c:714
+#: ../mail/em-folder-utils.c:729
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Abbestellen des Ordners Â»%sÂ«"
 
-#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1576
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1603
 msgid "Unsigned"
 msgstr "Unsigniert"
 
@@ -10868,10 +10815,10 @@ 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."
+"Diese Nachricht ist nicht signiert. Die AuthentizitÃ¤t des Absenders ist daher "
+"nicht sichergestellt."
 
-#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1577
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1604
 msgid "Valid signature"
 msgstr "GÃ¼ltige Signatur"
 
@@ -10884,19 +10831,19 @@ msgstr ""
 "Diese Nachricht ist signiert und gÃ¼ltig. Es ist daher sehr wahrscheinlich, "
 "dass der Absender der ist, der er vorgibt zu sein."
 
-#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1578
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1605
 msgid "Invalid signature"
 msgstr "UngÃ¼ltige Signatur"
 
 #: ../mail/em-format-html-display.c:92
 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."
+"Die Signatur dieser Nachricht konnte nicht verifiziert werden. MÃ¶glicherweise "
+"wurde sie bei der Ã?bertragung verÃ¤ndert."
 
-#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1579
+#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1606
 msgid "Valid signature, but cannot verify sender"
 msgstr "GÃ¼ltige Signatur, Absender konnte jedoch nicht verifiziert werden"
 
@@ -10908,19 +10855,19 @@ msgstr ""
 "Diese Nachricht wurde mit einer gÃ¼ltigen Signatur signiert, der Absender der "
 "Nachricht konnte jedoch nicht verifiziert werden."
 
-#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1580
+#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1607
 msgid "Signature exists, but need public key"
 msgstr "Signatur existiert, jedoch wird der Ã¶ffentliche SchlÃ¼ssel benÃ¶tigt"
 
 #: ../mail/em-format-html-display.c:94
 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:101 ../mail/em-format-html.c:1586
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1613
 msgid "Unencrypted"
 msgstr "Nicht verschlÃ¼sselt"
 
@@ -10932,7 +10879,7 @@ msgstr ""
 "Diese Nachricht ist nicht verschlÃ¼sselt. Daher kann ihr Inhalt bei der "
 "Ã?bertragung Ã¼ber das Internet mÃ¶glicherweise ausgespÃ¤ht werden."
 
-#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1587
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1614
 msgid "Encrypted, weak"
 msgstr "Schwach verschlÃ¼sselt"
 
@@ -10942,23 +10889,23 @@ msgid ""
 "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."
+"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:103 ../mail/em-format-html.c:1588
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1615
 msgid "Encrypted"
 msgstr "VerschlÃ¼sselt"
 
 #: ../mail/em-format-html-display.c:103
 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:104 ../mail/em-format-html.c:1589
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1616
 msgid "Encrypted, strong"
 msgstr "Stark verschlÃ¼sselt"
 
@@ -10969,18 +10916,18 @@ msgid ""
 "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:235 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:240 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "_Zertifikat anzeigen"
 
-#: ../mail/em-format-html-display.c:248
+#: ../mail/em-format-html-display.c:253
 msgid "This certificate is not viewable"
 msgstr "Dieses Zertifikat kann nicht angezeigt werden"
 
-#: ../mail/em-format-html-display.c:497
+#: ../mail/em-format-html-display.c:508
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -10988,28 +10935,28 @@ 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:725
+#: ../mail/em-format-html-display.c:751
 msgid "Completed on"
 msgstr "Abgeschlossen am"
 
-#: ../mail/em-format-html-display.c:733
+#: ../mail/em-format-html-display.c:759
 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:737
+#: ../mail/em-format-html-display.c:763
 msgid "by"
 msgstr "am"
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html-display.c:996
+#: ../mail/em-format-html-display.c:980 ../mail/em-format-html-display.c:1027
 msgid "View _Unformatted"
 msgstr "_Unformatierte ansehen"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:982
 msgid "Hide _Unformatted"
 msgstr "_Unformatierte verstecken"
 
-#: ../mail/em-format-html-display.c:1016
+#: ../mail/em-format-html-display.c:1047
 msgid "O_pen With"
 msgstr "Ã?_ffnen mit"
 
@@ -11018,55 +10965,55 @@ msgstr "Ã?_ffnen mit"
 msgid "Page %d of %d"
 msgstr "Seite %d von %d"
 
-#: ../mail/em-format-html.c:153
+#: ../mail/em-format-html.c:165
 msgid "Formatting message"
 msgstr "Nachricht wird formatiert"
 
-#: ../mail/em-format-html.c:352
+#: ../mail/em-format-html.c:362
 msgid "Formatting Message..."
 msgstr "Nachricht wird formatiert  â?¦"
 
-#: ../mail/em-format-html.c:1421 ../mail/em-format-html.c:1430
+#: ../mail/em-format-html.c:1447 ../mail/em-format-html.c:1457
 #, c-format
 msgid "Retrieving '%s'"
 msgstr "Â»%sÂ« wird abgerufen"
 
-#: ../mail/em-format-html.c:1901
+#: ../mail/em-format-html.c:1968
 msgid "Unknown external-body part."
 msgstr "Unbekannter external-body-Teil."
 
-#: ../mail/em-format-html.c:1909
+#: ../mail/em-format-html.c:1976
 msgid "Malformed external-body part."
 msgstr "Fehlerhaft formatierter external-body-Teil."
 
-#: ../mail/em-format-html.c:1939
+#: ../mail/em-format-html.c:2006
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Zeiger auf FTP-Site (%s)"
 
-#: ../mail/em-format-html.c:1950
+#: ../mail/em-format-html.c:2017
 #, 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:1952
+#: ../mail/em-format-html.c:2019
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Zeiger auf lokale Datei (%s)"
 
-#: ../mail/em-format-html.c:1973
+#: ../mail/em-format-html.c:2040
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Zeiger auf ferne Daten (%s)"
 
-#: ../mail/em-format-html.c:1984
+#: ../mail/em-format-html.c:2051
 #, 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:2647
+#: ../mail/em-format-html.c:2751
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "Diese Nachricht wurde von %s im Namen von %s gesendet"
@@ -11077,50 +11024,86 @@ msgstr "Diese Nachricht wurde von %s im Namen von %s gesendet"
 msgid "No HTML stream available"
 msgstr "Kein HTML-Datenstrom verfÃ¼gbar"
 
-#: ../mail/em-subscribe-editor.c:677
-msgid "This store does not support subscriptions, or they are not enabled."
-msgstr ""
-"Dieser Speicher unterstÃ¼tzt keine Abonnements oder sie sind nicht aktiviert."
+#: ../mail/em-subscription-editor.c:1129
+msgid "Folder Subscriptions"
+msgstr "Ordnerabonnements"
+
+#: ../mail/em-subscription-editor.c:1168
+msgid "_Account:"
+msgstr "_Konto:"
+
+#: ../mail/em-subscription-editor.c:1183
+msgid "Clear Search"
+msgstr "Suchfeld leeren"
+
+#: ../mail/em-subscription-editor.c:1201
+msgid "Sho_w items that contain:"
+msgstr "Nur EintrÃ¤ge anzeigen, die Folgendes ent_halten:"
+
+#: ../mail/em-subscription-editor.c:1238
+msgid "Subscribe to the selected folder"
+msgstr "Den gewÃ¤hlten Ordner abonnieren"
+
+#: ../mail/em-subscription-editor.c:1239
+msgid "Su_bscribe"
+msgstr "A_bonnieren"
+
+#: ../mail/em-subscription-editor.c:1250
+#: ../modules/mail/e-mail-shell-view-actions.c:1006
+msgid "Unsubscribe from the selected folder"
+msgstr "Den gewÃ¤hlten Ordner abbestellen"
+
+#: ../mail/em-subscription-editor.c:1251
+#: ../modules/mail/e-mail-shell-view-actions.c:1004
+msgid "_Unsubscribe"
+msgstr "Ab_bestellen"
 
-#: ../mail/em-subscribe-editor.c:728
-msgid "Subscribed"
-msgstr "Abonniert"
+#: ../mail/em-subscription-editor.c:1262
+msgid "Collapse all folders"
+msgstr "Alle Ordner einklappen"
 
-#: ../mail/em-subscribe-editor.c:732
-msgid "Folder"
-msgstr "Ordner"
+#: ../mail/em-subscription-editor.c:1263
+msgid "C_ollapse All"
+msgstr "Alle _einklappen"
+
+#: ../mail/em-subscription-editor.c:1273
+msgid "Expand all folders"
+msgstr "Alle Ordner aufklappen"
+
+#: ../mail/em-subscription-editor.c:1274
+msgid "E_xpand All"
+msgstr "Alle _aufklappen"
 
-#. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:1120
-msgid "Please select a server."
-msgstr "Bitte wÃ¤hlen Sie einen Server."
+#: ../mail/em-subscription-editor.c:1284
+msgid "Refresh the folder list"
+msgstr "Die Ordnerliste auffrischen"
 
-#: ../mail/em-subscribe-editor.c:1166
-msgid "No server has been selected"
-msgstr "Es wurde kein Server gewÃ¤hlt"
+#: ../mail/em-subscription-editor.c:1296
+msgid "Stop the current operation"
+msgstr "Den momentan ausgefÃ¼hrten Vorgang abbrechen"
 
 # Eigentlich BlÃ¶dsinn, diese Frage. Aber was solls...
 #. Translators: This message is shown only for ten or more
 #. * 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:106
+#: ../mail/em-utils.c:104
 #, 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:152
+#: ../mail/em-utils.c:150
 #: ../modules/mailto-handler/evolution-mailto-handler.c:148
 msgid "_Do not show this message again"
 msgstr "Diese _Meldung nicht mehr anzeigen"
 
-#: ../mail/em-utils.c:314
+#: ../mail/em-utils.c:312
 msgid "Message Filters"
 msgstr "Nachrichtenfilter"
 
-#: ../mail/em-utils.c:848
+#: ../mail/em-utils.c:860
 #, c-format
 msgid "Messages from %s"
 msgstr "Nachrichten von %s"
@@ -11146,71 +11129,83 @@ msgid "\"Filter Editor\" window width"
 msgstr "Breite des Fensters Â»FiltereditorÂ«"
 
 #: ../mail/evolution-mail.schemas.in.h:4
+msgid "\"Folder Subscriptions\" window height"
+msgstr "HÃ¶he des Fensters Â»OrdnerabonnementsÂ«"
+
+#: ../mail/evolution-mail.schemas.in.h:5
+msgid "\"Folder Subscriptions\" window maximize state"
+msgstr "Maximierungs-Status des Fensters Â»OrdnerabonnementsÂ«"
+
+#: ../mail/evolution-mail.schemas.in.h:6
+msgid "\"Folder Subscriptions\" window width"
+msgstr "Breite des Fensters Â»OrdnerabonnementsÂ«"
+
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "\"Search Folder Editor\" window height"
 msgstr "HÃ¶he des Fensters Â»Editor fÃ¼r SuchordnerÂ«"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "\"Search Folder Editor\" window maximize state"
 msgstr "Maximierungs-Status des Fensters Â»Editor fÃ¼r SuchordnerÂ«"
 
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "\"Search Folder Editor\" window width"
 msgstr "Breite des Fensters Â»Editor fÃ¼r SuchordnerÂ«"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "\"Send and Receive Mail\" window height"
 msgstr "HÃ¶he des Fensters Â»E-Mails verschicken und abrufenÂ«"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "\"Send and Receive Mail\" window maximize state"
 msgstr "Maximierungs-Status des Fensters Â»E-Mails verschicken und abrufenÂ«"
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "\"Send and Receive Mail\" window width"
 msgstr "Weite des Fensters Â»E-Mails verschicken und abrufenÂ«"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Always request read receipt"
 msgstr "LesebestÃ¤tigung immer anfordern"
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Automatic emoticon recognition"
 msgstr "Automatische Emoticon-Erkennung"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Automatic link recognition"
 msgstr "Automatische Link-Erkennung"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Check incoming mail being junk"
 msgstr "Eingehende E-Mails daraufhin Ã¼berprÃ¼fen, ob sie unerwÃ¼nscht sind"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Citation highlight color"
 msgstr "Hervorhebungsfarbe fÃ¼r Zitate"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Citation highlight color."
 msgstr "Hervorhebungsfarbe fÃ¼r Zitate."
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Composer Window default height"
 msgstr "Voreingestellte HÃ¶he des Editorfensters"
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Composer Window default width"
 msgstr "Voreingestellte Breite des Editorfensters"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Composer load/attach directory"
 msgstr "Vorgabeordner fÃ¼r Anlagen im Nachrichteneditor"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "KÃ¼rzen der Adressanzeige in den EmpfÃ¤ngerfeldern (An/Kopie/Blindkopie)"
 
 # CHECK
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -11218,7 +11213,7 @@ msgstr ""
 "Die Anzeige der Adressen in den EmpfÃ¤ngerfeldern (An/Kopie/Blindkopie) auf "
 "die im SchlÃ¼ssel Â»address_countÂ« angegebene Anzahl reduzieren."
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -11226,13 +11221,13 @@ msgstr ""
 "Legt fest, wie oft lokale Ã?nderungen mit dem entfernen Mail-Server "
 "abgeglichen werden. Der Intervall muss mindestens 30 Sekunden betragen."
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Custom headers to use while checking for junk."
 msgstr ""
 "Benutzerdefinierte Kopfzeilen, die fÃ¼r die PrÃ¼fung auf UnerwÃ¼nschtheit "
 "genutzt werden."
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -11240,63 +11235,55 @@ msgstr ""
 "Benutzerdefinierte Kopfzeilen, die fÃ¼r die PrÃ¼fung auf UnerwÃ¼nschtheit "
 "genutzt werden.Das Format ist Â»Kopfzeilenname=WertÂ« im GConf-SchlÃ¼ssel."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default charset in which to compose messages"
 msgstr "Vorgabe-Zeichensatz beim Verfassen von Nachrichten"
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default charset in which to compose messages."
 msgstr "Vorgabe-Zeichensatz beim Verfassen von Nachrichten."
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default charset in which to display messages"
 msgstr "Vorgabe-Zeichensatz beim Anzeigen von Nachrichten"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default charset in which to display messages."
 msgstr "Vorgabe-Zeichensatz beim Anzeigen von Nachrichten."
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default forward style"
 msgstr "Vorgabe-Weiterleitungsstil"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default height of the Composer Window."
 msgstr "Die voreingestellte HÃ¶he des Editorfensters."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default height of the mail browser window."
 msgstr "Die voreingestellte HÃ¶he des Nachrichtenbrowserfensters."
 
-#: ../mail/evolution-mail.schemas.in.h:32
-msgid "Default height of the subscribe dialog."
-msgstr "Die voreingestellte HÃ¶he des Abonnementdialogs."
-
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default maximized state of the mail browser window."
 msgstr "Der vorgegebene Maximierungsstatus des Nachrichtenbrowserfensters."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default reply style"
 msgstr "Vorgabe-Antwortstil"
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default value for thread expand state"
 msgstr "Vorgabewert, ob Threads ausgeklappt angezeigt werden sollen"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Default width of the Composer Window."
 msgstr "Die voreingestellte Breite des Editorfensters."
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Default width of the mail browser window."
 msgstr "Die voreingestellte Breite des Nachrichtenbrowserfensters."
 
-#: ../mail/evolution-mail.schemas.in.h:38
-msgid "Default width of the subscribe dialog."
-msgstr "Die voreingestellte Breite des Abonnementdialogs."
-
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -11304,13 +11291,12 @@ 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:40
+#: ../mail/evolution-mail.schemas.in.h:41
 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:41
+#: ../mail/evolution-mail.schemas.in.h:42
 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 "
@@ -11319,111 +11305,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:42
+#: ../mail/evolution-mail.schemas.in.h:43
 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:43
+#: ../mail/evolution-mail.schemas.in.h:44
 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:44
+#: ../mail/evolution-mail.schemas.in.h:45
 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:45
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for loading/attaching files to composer."
 msgstr "Vorgabeordner fÃ¼r Anlagen im Nachrichteneditor."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Directory for saving mail component files."
 msgstr "Ordner zum Speichern der E-Mailkomponenten-Dateien."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:48
 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:48
+#: ../mail/evolution-mail.schemas.in.h:49
 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:49
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Do not add signature delimiter"
 msgstr "Kein Signaturtrennzeichen hinzufÃ¼gen"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
 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:51
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Empty Junk folders on exit"
 msgstr "UnerwÃ¼nscht-Ordner beim Beenden leeren"
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Empty Trash folders on exit"
 msgstr "MÃ¼llordner beim Beenden leeren"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Alle UnerwÃ¼nscht-Ordner beim Beenden von Evolution leeren."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Alle MÃ¼llordner beim Beenden von Evolution leeren."
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 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:56
+#: ../mail/evolution-mail.schemas.in.h:57
 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:57
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Enable or disable magic space bar"
 msgstr "Magische Leertaste ein-/ausschalten"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:59
 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:59
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Enable or disable type ahead search feature"
 msgstr "Schnellsuche an- oder abschalten"
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Enable search folders"
 msgstr "Suchordner aktivieren"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Enable search folders on startup."
 msgstr "Aktiviert die Suchordner beim Starten von Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -11431,7 +11417,7 @@ msgstr ""
 "Die Suchfunktion in der Seitenleiste einschalten fÃ¼r die interaktive Suche "
 "nach Ordnernamen."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -11439,7 +11425,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:64
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid ""
 "Enable to display only message texts not exceeding size defined in "
 "'message_text_part_limit' key."
@@ -11447,23 +11433,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:65
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr "Ã?hnliche Ansichten der Nachrichtenliste fÃ¼r alle Ordner aktivieren"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr "Ã?hnliche Ansichten der Nachrichtenliste fÃ¼r alle Ordner aktivieren."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Enable/disable caret mode"
 msgstr "Eingabezeiger aktivieren/deaktivieren"
 
-#: ../mail/evolution-mail.schemas.in.h:68 ../mail/mail-config.ui.h:48
+#: ../mail/evolution-mail.schemas.in.h:69 ../mail/mail-config.ui.h:42
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Dateinamen wie Outlook und GMail kodieren"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 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, "
@@ -11475,37 +11461,37 @@ msgstr ""
 "darstellen. Beide ignorieren den Standard RFC 2231 und benutzen den "
 "inkorrekten Standard RFC 2047."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Flush Outbox after filtering"
 msgstr "Nachrichtenausgang nach dem Filtern leeren"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Group Reply replies to list"
 msgstr "Gruppenantwort wird an Mailingliste geleitet"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Height of the message-list pane"
 msgstr "HÃ¶he des Nachrichtenlistenfelds"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "Height of the message-list pane."
 msgstr "HÃ¶he des Nachrichtenlistenfelds."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Deaktiviert das Vorschaufenster und entfernt die Auswahl"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 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:76
+#: ../mail/evolution-mail.schemas.in.h:77
 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 "
@@ -11515,19 +11501,27 @@ 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:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "Ignore list Reply-To:"
 msgstr "Â»Antwort anÂ« der Mailingliste ignorieren"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 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:79
+#: ../mail/evolution-mail.schemas.in.h:80
+msgid ""
+"Initial height of the \"Folder Subscriptions\" window. The value updates as "
+"the user resizes the window vertically."
+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:81
 msgid ""
 "Initial height of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window vertically."
@@ -11535,7 +11529,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:80
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -11543,7 +11537,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:81
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid ""
 "Initial maximize state of the \"Filter Editor\" window. The value updates "
 "when the user maximizes or unmaximizes the window. Note, this particular "
@@ -11556,7 +11550,20 @@ msgstr ""
 "nicht maximiert werden kann. Dieser SchlÃ¼ssel existiert nur als "
 "Implementierungsdetail."
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:84
+msgid ""
+"Initial maximize state of the \"Folder Subscriptions\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Folder Subscriptions\" "
+"window cannot be maximized. This key exists only as an implementation detail."
+msgstr ""
+"Legt fest, ob das Fenster Â»OrdnerabonnementsÂ« anfÃ¤nglich maximiert ist. Der "
+"Wert Ã¤ndert sich, wenn der Benutzer das Fenster maximiert oder "
+"wiederherstellt. Hinweis: dieser SchlÃ¼ssel wird von Evolution nicht "
+"verwendet, da das Fenster nicht maximiert werden kann. Dieser SchlÃ¼ssel "
+"existiert nur als Implementierungsdetail."
+
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid ""
 "Initial maximize state of the \"Search Folder Editor\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11569,13 +11576,12 @@ msgstr ""
 "nicht maximiert werden kann. Dieser SchlÃ¼ssel existiert nur als "
 "Implementierungsdetail."
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:86
 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 "
@@ -11583,7 +11589,7 @@ msgstr ""
 "verwendet, da das Fenster nicht maximiert werden kann. Dieser SchlÃ¼ssel "
 "existiert nur als Implementierungsdetail."
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid ""
 "Initial width of the \"Filter Editor\" window. The value updates as the user "
 "resizes the window horizontally."
@@ -11591,7 +11597,15 @@ 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:85
+#: ../mail/evolution-mail.schemas.in.h:88
+msgid ""
+"Initial width of the \"Folder Subscriptions\" window. The value updates as "
+"the user resizes the window horizontally."
+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:89
 msgid ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -11599,7 +11613,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:86
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -11607,7 +11621,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:87
+#: ../mail/evolution-mail.schemas.in.h:91
 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 "
@@ -11618,17 +11632,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:88
+#: ../mail/evolution-mail.schemas.in.h:92
 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:89
+#: ../mail/evolution-mail.schemas.in.h:93
 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."
@@ -11637,15 +11651,15 @@ msgstr ""
 "private Antwort auf eine Nachricht versendet, die Ã¼ber eine Mailingliste "
 "eingegangen ist."
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:94
 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:91
+#: ../mail/evolution-mail.schemas.in.h:95
 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 "
@@ -11656,38 +11670,38 @@ 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:92
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Last time Empty Junk was run"
 msgstr "Letzte Leerung des UnerwÃ¼nscht-Ordners"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Last time Empty Trash was run"
 msgstr "Letzte MÃ¼llleerung"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Layout style"
 msgstr "Anordnung"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "List of Labels and their associated colors"
 msgstr "Liste mit Beschriftungen und damit assoziierter Farben"
 
 # CHECK
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:101
 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:98
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "List of accepted licenses"
 msgstr "Liste akzeptierter Lizenzen"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "List of accounts"
 msgstr "Kontenliste"
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -11696,171 +11710,186 @@ msgstr ""
 "enthÃ¤lt Zeichenketten, die Unterordner relativ zu Â»/appsÂ«/evolution/mail/"
 "accountsÂ« angeben."
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 "Liste der benutzerdefinierten Kopfzeilen und ihres Aktivierungszustands."
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:106
 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:103
+#: ../mail/evolution-mail.schemas.in.h:107
 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:104
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "List of protocol names whose license has been accepted."
 msgstr "Liste der Protokollnamen, deren Lizenzen akzeptiert wurden."
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Load images for HTML messages over HTTP"
 msgstr "Bilder fÃ¼r HTML-Nachrichten per HTTP laden"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:110
 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:107
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Log filter actions"
 msgstr "Filteraktionen protokollieren"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Log filter actions to the specified log file."
 msgstr "Filteraktionen in der angegebenen Protokolldatei protokollieren."
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Logfile to log filter actions"
 msgstr "Protokolldatei fÃ¼r Filteraktionen"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Logfile to log filter actions."
 msgstr "Protokolldatei fÃ¼r Filteraktionen."
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Mail browser height"
 msgstr "HÃ¶he des Nachrichtenbrowsers"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Mail browser maximized"
 msgstr "Nachrichtenbrowser ist maximiert"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Mail browser width"
 msgstr "Breite des Nachrichtenbrowsers"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Mark as Seen after specified timeout"
 msgstr "Nach angegebenem Intervall als gelesen markieren"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Mark as Seen after specified timeout."
 msgstr "Nach angegebenem Intervall als gelesen markieren."
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Mark citations in the message \"Preview\""
 msgstr "Zitate in der Nachrichtenvorschau kennzeichnen"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Zitate in der Nachrichtenvorschau kennzeichnen."
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Message text limit for display"
 msgstr "Anzeigebegrenzung des Nachrichtentexts"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:123
 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:120
+#: ../mail/evolution-mail.schemas.in.h:124
 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:121
+#: ../mail/evolution-mail.schemas.in.h:125
 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:122
+#: ../mail/evolution-mail.schemas.in.h:126
 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:123
+#: ../mail/evolution-mail.schemas.in.h:127
 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:124
+#: ../mail/evolution-mail.schemas.in.h:128
 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:125
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid ""
+"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:130
 msgid "Prompt on empty subject"
 msgstr "Bei leerem Betreff nachfragen"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:131
 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:127
+#: ../mail/evolution-mail.schemas.in.h:132
 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:128
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Prompt when deleting messages in search folder"
 msgstr "Nachfrage beim LÃ¶schen von Nachrichten in Suchordner"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:134
 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:130
+#: ../mail/evolution-mail.schemas.in.h:135
+msgid "Prompt when replying or forwarding from a mail browser whether close it"
+msgstr ""
+"Nachfragen, wenn aus einem Nachrichtenbrowser heraus geantwortet oder "
+"weitergeleitet wird, ob dieser geschlossen werden soll"
+
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Prompt when replying privately to list messages"
 msgstr "Bei privater Antwort auf Listennachrichten nachfragen"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Prompt when replying to many recipients"
 msgstr "Beim Antworten an viele EmpfÃ¤nger nachfragen"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "Prompt when user expunges"
 msgstr "Beim SÃ¤ubern nachfragen"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:139
 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:134
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Vor gleichzeitigem Ã?ffnen von 10 oder mehr Nachrichten einen Hinweis anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -11868,65 +11897,64 @@ msgstr ""
 "Beim Verschicken von HTML-Nachrichten an Kontakte, die keine wollen, "
 "nachfragen."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:142
 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:137
+#: ../mail/evolution-mail.schemas.in.h:143
 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:138
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Prompt while marking multiple messages"
 msgstr "Anzeigen wenn mehrere Nachrichten markiert werden"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Put personalized signatures at the top of replies"
 msgstr "Beim Antworten eigene Signaturen an den Anfang stellen"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:146
 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:141
+#: ../mail/evolution-mail.schemas.in.h:147
 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:142
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Recognize links in text and replace them."
 msgstr "Links im Text erkennen und ersetzen."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Run junk test on incoming mail."
 msgstr "UnerwÃ¼nscht-Test auf eingehende E-Mails anwenden."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Save directory"
 msgstr "Ordner speichern"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:151
 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:146
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Send HTML mail by default"
 msgstr "Per Vorgabe HTML-E-Mails verschicken?"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Send HTML mail by default."
 msgstr "Per Vorgabe HTML-E-Mails verschicken?"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:154
 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:149
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Server synchronization interval"
 msgstr "Intervall fÃ¼r Datenabgleich mit Servern"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
@@ -11934,67 +11962,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:151
+#: ../mail/evolution-mail.schemas.in.h:157
 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:152
+#: ../mail/evolution-mail.schemas.in.h:158
 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:153
+#: ../mail/evolution-mail.schemas.in.h:159
 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:154
+#: ../mail/evolution-mail.schemas.in.h:160
 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:155
+#: ../mail/evolution-mail.schemas.in.h:161
 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:156
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Show Animations"
 msgstr "Animationen anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Show all message headers"
 msgstr "Alle NachrichtenkÃ¶pfe anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Show all the headers when viewing a messages."
 msgstr "Beim Anzeigen von Nachrichten alle NachrichtenkÃ¶pfe anzeigen."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Show animated images as animations."
 msgstr "Animierte Bilder als Animationen anzeigen."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:166
 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:161
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Show deleted messages in the message-list"
 msgstr "GelÃ¶schte Nachrichten in der Nachrichtenliste anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Show image animations"
 msgstr "Bildanimationen anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Show original \"Date\" header value."
 msgstr "Den originalen Wert der Kopfzeile Â»DatumÂ« anzeigen."
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Show photo of the sender"
 msgstr "Foto des Absenders anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -12002,7 +12030,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:166
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -12010,7 +12038,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:167
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -12018,7 +12046,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:168
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -12027,7 +12055,7 @@ msgstr ""
 "anzeigen. Die Einstellung kann im MenÃ¼ Â»AnsichtÂ« beim Verfassen angepasst "
 "werden."
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -12035,15 +12063,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:170
+#: ../mail/evolution-mail.schemas.in.h:176
 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:171
+#: ../mail/evolution-mail.schemas.in.h:177
 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 "
@@ -12054,19 +12081,19 @@ msgstr ""
 "Kopfzeile Â»DatumÂ« in einem benutzerdefinierten Format und der lokalen "
 "Zeitzone dargestellt."
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:178
 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:173
+#: ../mail/evolution-mail.schemas.in.h:179
 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 "
@@ -12077,47 +12104,39 @@ 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:174
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Spell check inline"
 msgstr "RechtschreibprÃ¼fung an Ort und Stelle"
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid "Spell checking color"
 msgstr "Farbe fÃ¼r RechtschreibprÃ¼fung"
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid "Spell checking languages"
 msgstr "Sprachen fÃ¼r RechtschreibprÃ¼fung"
 
-#: ../mail/evolution-mail.schemas.in.h:177
-msgid "Subscribe dialog default height"
-msgstr "Voreingestellte HÃ¶he des Abonnementdialogs"
-
-#: ../mail/evolution-mail.schemas.in.h:178
-msgid "Subscribe dialog default width"
-msgstr "Voreingestellte Breite des Abonnementdialogs"
-
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid "Terminal font"
 msgstr "Terminal-Schrift"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid "The default plugin for Junk hook"
 msgstr "Vorgabe-Plugin fÃ¼r die UnerwÃ¼nscht-Erkennung"
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:185
 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:182
+#: ../mail/evolution-mail.schemas.in.h:186
 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:183
+#: ../mail/evolution-mail.schemas.in.h:187
 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 "
@@ -12129,15 +12148,15 @@ msgstr ""
 "Vorschauleiste unter die Nachrichtenliste. Â»1Â« (vertikale Ansicht) setzt die "
 "Vorschauleiste neben die Nachrichtenliste. "
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "The terminal font for mail display."
 msgstr "Die zum Anzeigen von E-Mails verwendete Terminal-Schrift."
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:189
 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:186
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -12145,27 +12164,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:187
+#: ../mail/evolution-mail.schemas.in.h:191
 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:188
+#: ../mail/evolution-mail.schemas.in.h:192
 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:189
+#: ../mail/evolution-mail.schemas.in.h:193
 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."
@@ -12176,33 +12195,33 @@ msgstr ""
 "Nachrichtenliste gesetzt."
 
 # CHECK
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:194
 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:191
+#: ../mail/evolution-mail.schemas.in.h:195
 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:192
+#: ../mail/evolution-mail.schemas.in.h:196
 msgid "This option would help in improving the speed of fetching."
 msgstr "Beschleunigt das Abrufen."
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -12210,16 +12229,16 @@ msgstr ""
 "Dies setzt die Anzahl der Adressen, die in der Standardansicht angezeigt "
 "werden, bevor Â»â?¦Â« angezeigt wird."
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid ""
-"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Evolution requires a restart."
+"This setting specifies whether the threads should be in expanded or collapsed "
+"state by default. Evolution requires a restart."
 msgstr ""
 "Legt fest, ob Threads standardmÃ¤Ã?ig ausgeklappt oder eingeklappt dargestellt "
-"werden sollen. Evolution muss nach Ã?ndern dieses Wertes hierfÃ¼r neu "
-"gestartet werden."
+"werden sollen. Evolution muss nach Ã?ndern dieses Wertes hierfÃ¼r neu gestartet "
+"werden."
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:199
 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 "
@@ -12229,51 +12248,51 @@ msgstr ""
 "werden sollen anstatt nach dem Datum der Nachricht. Evolution muss nach "
 "Ã?ndern dieses Wertes hierfÃ¼r neu gestartet werden."
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid "Thread the message-list based on Subject"
 msgstr "Die Nachrichtenliste themenbasiert nach Threads sortieren"
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid "Timeout for marking message as seen"
 msgstr "Intervall zum Markieren von Nachrichten als gelesen"
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "Timeout for marking message as seen."
 msgstr "Intervall zum Markieren von Nachrichten als gelesen."
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid "UID string of the default account."
 msgstr "UID-Zeichenkette fÃ¼r das Vorgabekonto."
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:204
 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:201
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid "Use SpamAssassin daemon and client"
 msgstr "SpamAssassin-Daemon und -Client verwenden"
 
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "SpamAssassin-Daemon und -Client verwenden (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:207
 msgid "Use custom fonts"
 msgstr "Benutzerdefinierte Schriften verwenden"
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:208
 msgid "Use custom fonts for displaying mail."
 msgstr "Benutzerdefinierte Schriften zum Anzeigen von E-Mails verwenden."
 
-#: ../mail/evolution-mail.schemas.in.h:205
+#: ../mail/evolution-mail.schemas.in.h:209
 msgid "Use only local spam tests."
 msgstr "AusschlieÃ?lich lokale Spam-Tests verwenden."
 
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../mail/evolution-mail.schemas.in.h:210
 msgid "Use only the local spam tests (no DNS)."
 msgstr "AusschlieÃ?lich lokale Spam-Tests verwenden (kein DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:207
+#: ../mail/evolution-mail.schemas.in.h:211
 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 "
@@ -12283,59 +12302,59 @@ 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:208
+#: ../mail/evolution-mail.schemas.in.h:212
 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:209
+#: ../mail/evolution-mail.schemas.in.h:213
 msgid "Variable width font"
 msgstr "Schrift variabler Breite"
 
-#: ../mail/evolution-mail.schemas.in.h:210
+#: ../mail/evolution-mail.schemas.in.h:214
 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:211
+#: ../mail/evolution-mail.schemas.in.h:215
 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:212
+#: ../mail/evolution-mail.schemas.in.h:216
 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:213
+#: ../mail/evolution-mail.schemas.in.h:217
 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:214
+#: ../mail/evolution-mail.schemas.in.h:218
 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:215
+#: ../mail/evolution-mail.schemas.in.h:219
 msgid "Width of the message-list pane"
 msgstr "Breite der Nachrichtenliste"
 
-#: ../mail/evolution-mail.schemas.in.h:216
+#: ../mail/evolution-mail.schemas.in.h:220
 msgid "Width of the message-list pane."
 msgstr "Breite der Nachrichtenliste."
 
@@ -12344,7 +12363,7 @@ msgid "Importing Elm data"
 msgstr "Elm-Daten werden importiert"
 
 #: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:400
-#: ../modules/mail/e-mail-shell-view.c:964
+#: ../modules/mail/e-mail-shell-view.c:1027
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
 #: ../widgets/misc/e-send-options.c:500
 msgid "Mail"
@@ -12365,31 +12384,30 @@ msgstr "Zielor_dner:"
 
 #: ../mail/importers/evolution-mbox-importer.c:122
 #: ../plugins/dbx-import/dbx-importer.c:232
-#: ../plugins/pst-import/pst-importer.c:300
+#: ../plugins/pst-import/pst-importer.c:302
 msgid "Select folder"
 msgstr "Ordner wÃ¤hlen"
 
 #: ../mail/importers/evolution-mbox-importer.c:122
-#: ../plugins/pst-import/pst-importer.c:300
+#: ../plugins/pst-import/pst-importer.c:302
 msgid "Select folder to import into"
 msgstr "WÃ¤hlen Sie den Ordner, in den importiert werden soll"
 
-#: ../mail/importers/evolution-mbox-importer.c:382
+#: ../mail/importers/evolution-mbox-importer.c:381
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "Betreff"
 
-#: ../mail/importers/evolution-mbox-importer.c:387
+#: ../mail/importers/evolution-mbox-importer.c:386
 msgctxt "mboxImp"
 msgid "From"
 msgstr "Von"
 
-#: ../mail/importers/evolution-mbox-importer.c:431
-#: ../shell/e-shell-utils.c:251
+#: ../mail/importers/evolution-mbox-importer.c:430 ../shell/e-shell-utils.c:251
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:432
+#: ../mail/importers/evolution-mbox-importer.c:431
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importeur fÃ¼r Ordner im Berkeley-Mailbox-Format"
 
@@ -12398,15 +12416,15 @@ msgid "Importing mailbox"
 msgstr "E-Mail-Postfach wird importiert"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:150
+#: ../mail/importers/mail-importer.c:146
 #: ../plugins/dbx-import/dbx-importer.c:554
-#: ../plugins/pst-import/pst-importer.c:452
+#: ../plugins/pst-import/pst-importer.c:449
 #: ../plugins/pst-import/pst-importer.c:558
 #, c-format
 msgid "Importing '%s'"
 msgstr "Â»%sÂ« wird importiert"
 
-#: ../mail/importers/mail-importer.c:295
+#: ../mail/importers/mail-importer.c:289
 #, c-format
 msgid "Scanning %s"
 msgstr "%s wird eingelesen"
@@ -12475,503 +12493,440 @@ msgstr[1] ""
 "gerade entfernten Ordner verwenden:\n"
 "Â»%sÂ«."
 
-#. Translators: This is part of the line with 'Top Posting Option' text. See Edit|Preferences|Composer Preferences for the usage
-#: ../mail/mail-config.ui.h:2
-msgid "(Not Recommended)"
-msgstr "(Nicht empfohlen)"
-
-#: ../mail/mail-config.ui.h:3
-msgid "(Note: Requires restart of the application)"
-msgstr "(Hinweis: Erfordert einen Neustart der Anwendung)"
-
-#: ../mail/mail-config.ui.h:4
+#: ../mail/mail-config.ui.h:1
 msgid "Account Information"
 msgstr "Konteninformation"
 
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:2
 msgid "Add Ne_w Signature..."
 msgstr "N_eue Signatur â?¦"
 
-#: ../mail/mail-config.ui.h:6
+#: ../mail/mail-config.ui.h:3
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "Aus diesem Konto ausgehende Nachrichten _immer signieren"
 
-#: ../mail/mail-config.ui.h:8
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:5
+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
 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:9
+#: ../mail/mail-config.ui.h:7
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Immer _Kopie schicken an:"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:8
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Immer _Blindkopie schicken an:"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:9
 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:12
+#: ../mail/mail-config.ui.h:10
 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:13
+#: ../mail/mail-config.ui.h:11
 msgid "Always request rea_d receipt"
 msgstr "_LesebestÃ¤tigung immer anfordern"
 
-#: ../mail/mail-config.ui.h:14
+#: ../mail/mail-config.ui.h:12
 msgid "Apply the same _view settings to all folders"
 msgstr "Ansichts_einstellungen auf alle Ordner anwenden"
 
-#: ../mail/mail-config.ui.h:16
-#: ../modules/addressbook/addressbook-config.c:1013
+#: ../mail/mail-config.ui.h:14 ../modules/addressbook/addressbook-config.c:1013
 msgid "Authentication"
 msgstr "Legitimation"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:15
 msgid "Automatically insert _emoticon images"
 msgstr "_Emoticon-Bilder automatisch einfÃ¼gen"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:16
 msgid "C_haracter set:"
 msgstr "_Zeichensatz:"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:17
 msgid "Ch_eck for Supported Types"
 msgstr "_PrÃ¼fen, welche Arten unterstÃ¼tzt werden"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:18
 msgid "Check cu_stom headers for junk"
 msgstr "_Benutzerdefinierte Kopfzeilen auf UnerwÃ¼nschtheit prÃ¼fen"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:19
 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:20
 msgid "Check spelling while I _type"
 msgstr "RechtschreibprÃ¼fung wÃ¤hrend der Ein_gabe durchfÃ¼hren"
 
-#: ../mail/mail-config.ui.h:23
-msgid "Checks incoming mail messages to be Junk"
-msgstr "Ã?berprÃ¼ft, ob eingehende Nachrichten unerwÃ¼nscht sind"
-
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:21
 msgid "Cle_ar"
 msgstr "En_tfernen"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:22
 msgid "Clea_r"
 msgstr "Ent_fernen"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:23
 msgid "Color for _misspelled words:"
 msgstr "_Farbe fÃ¼r falsch geschriebene WÃ¶rter:"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:24
 msgid "Composing Messages"
 msgstr "Verfassen von Nachrichten"
 
-#: ../mail/mail-config.ui.h:28 ../plugins/plugin-manager/plugin-manager.c:146
+#: ../mail/mail-config.ui.h:25
+#: ../modules/plugin-manager/evolution-plugin-manager.c:157
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:26
 msgid "Confirm _when expunging a folder"
 msgstr "Beim _SÃ¤ubern eines Ordners nachfragen"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:27
+msgid "Confirmations"
+msgstr "BestÃ¤tigungen"
+
+#: ../mail/mail-config.ui.h:30
 msgid "Default Behavior"
 msgstr "Vorgabeverhalten"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:31
 msgid "Default character e_ncoding:"
 msgstr "Voreingestellte _Zeichenkodierung:"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:32
 msgid "Delete Mail"
 msgstr "Nachricht lÃ¶schen"
 
-#: ../mail/mail-config.ui.h:36
+#: ../mail/mail-config.ui.h:33
 msgid "Delete junk messages on e_xit"
 msgstr "UnerwÃ¼nscht-Ordner beim Beenden lee_ren"
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:35
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Ausgehende Nachrichten (per Vorgabe) digital _signieren"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:36
 msgid "Displayed Message Headers"
 msgstr "Angezeigte NachrichtenkÃ¶pfe"
 
-#: ../mail/mail-config.ui.h:40
-msgid "Do not display messages when text si_ze exceeds"
-msgstr "Nachrichten nicht anzeigen, wenn Text _grÃ¶Ã?er als"
-
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:37
 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:42
+#: ../mail/mail-config.ui.h:38
 msgid "Do not quote"
 msgstr "Nicht zitieren"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:39
 msgid "Drafts _Folder:"
 msgstr "_Entwurfsordner:"
 
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:40
 msgid "Email _Address:"
 msgstr "_E-Mail-Adresse:"
 
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:41
 msgid "Empty trash folders on e_xit"
 msgstr "MÃ¼llordner beim Beenden _leeren"
 
-#: ../mail/mail-config.ui.h:46
-msgid "Enable Magic S_pacebar"
-msgstr "Magische _Leertaste einschalten"
-
-#: ../mail/mail-config.ui.h:47
-msgid "Enable Sea_rch Folders"
-msgstr "Such_ordner aktivieren"
-
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:43
 msgid "Encry_ption certificate:"
 msgstr "_VerschlÃ¼sselungszertifikat:"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:44
 msgid "Encrypt out_going messages (by default)"
 msgstr "Ausgehende Nachrichten _verschlÃ¼sseln (per Vorgabe)"
 
-#: ../mail/mail-config.ui.h:51
-msgid "Fi_xed-width:"
-msgstr "_Dicktengleich:"
+#: ../mail/mail-config.ui.h:45
+msgid "F_all back to threading messages by subject"
+msgstr "ZurÃ¼ckfallen auf be_treffsbezogenes Threading der Nachrichten"
 
-#: ../mail/mail-config.ui.h:52
-msgid "Fix_ed width Font:"
+#: ../mail/mail-config.ui.h:46
+msgid "Fix_ed Width Font:"
 msgstr "_Dicktengleiche Schrift:"
 
-#: ../mail/mail-config.ui.h:53
-msgid "Font Properties"
-msgstr "Schrifteigenschaften"
-
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:47
 msgid "Format messages in _HTML"
 msgstr "Nachrichten in _HTML formatieren"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:48
 msgid "Full Nam_e:"
 msgstr "_Voller Name:"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:50
 msgid "Group Reply goes only to mailing list, if possible"
 msgstr "Gruppenantwort nur an Mailingliste, wenn mÃ¶glich"
 
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:51
 msgid "HTML Messages"
 msgstr "HTML-Nachrichten"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:52
 msgid "H_TTP Proxy:"
 msgstr "H_TTP-Proxy:"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:53
 msgid "Headers"
 msgstr "Kopfzeilen"
 
-#: ../mail/mail-config.ui.h:61
+#: ../mail/mail-config.ui.h:54
 msgid "Highlight _quotations with"
 msgstr "Zitate _hervorheben mit"
 
-#: ../mail/mail-config.ui.h:63
+#: ../mail/mail-config.ui.h:55
 msgid "Ignore Reply-To: for mailing lists"
 msgstr "Â»Antwort anÂ« bei Mailinglisten ignorieren"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:56
 msgid "Inline"
 msgstr "Eingebettet"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:57
 msgid "Inline (Outlook style)"
 msgstr "Eingebettet (Outlook-Stil)"
 
-#: ../mail/mail-config.ui.h:67
-msgid "KB"
-msgstr "KB"
-
-#: ../mail/mail-config.ui.h:68 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:59 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Beschriftungen"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:60
 msgid "Languages Table"
 msgstr "Sprachtabelle"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:61
 msgid "Loading Images"
 msgstr "Bilder werden geladen"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:62
 msgid "Mail Headers Table"
 msgstr "E-Mail-Kopf-Tabelle"
 
-#: ../mail/mail-config.ui.h:72
+#: ../mail/mail-config.ui.h:63
 msgid "Mailbox location"
 msgstr "Ort des Postfachs"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:64
 msgid "Message Display"
 msgstr "Nachrichtenanzeige"
 
-#: ../mail/mail-config.ui.h:74
-msgid "Message Fonts"
-msgstr "Nachrichtenschriften"
-
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:65
 msgid "Message Receipts"
 msgstr "LesebestÃ¤tigungen"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:66
 msgid "No _Proxy for:"
 msgstr "Kein _Proxy fÃ¼r:"
 
-#: ../mail/mail-config.ui.h:78
-msgid ""
-"Note: you will not be prompted for a password until you connect for the "
-"first time"
-msgstr ""
-"Hinweis: Sie werden erst nach dem Passwort gefragt, wenn Sie das erste Mal "
-"eine Verbindung mit dem Server aufbauen"
-
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:68
 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:80
+#: ../mail/mail-config.ui.h:69
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "ZusÃ¤tzliche Informationen"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:71
 msgid "Or_ganization:"
 msgstr "_Organisation:"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:72
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-_SchlÃ¼sselkennung:"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:73
 msgid "Pass_word:"
 msgstr "_Passwort:"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:75
 msgid "Port:"
 msgstr "Port:"
 
-#: ../mail/mail-config.ui.h:87
-msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr ""
-"Beim Abschicken von Nachrichten mit ausschlieÃ?lich _Blindkopie-EmpfÃ¤ngern "
-"nachfragen"
-
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:76
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: ../mail/mail-config.ui.h:90
-msgid "Printed Fonts"
-msgstr "Gedruckte Schriften"
-
-#: ../mail/mail-config.ui.h:91
-msgid "Prompt when mailing list redirects private reply back to list"
-msgstr ""
-"Um BestÃ¤tigung fragen, wenn Mailinglisten private Antworten an die Liste "
-"leiten"
-
-#: ../mail/mail-config.ui.h:92
-msgid "Prompt when sending private replies to mailing _list messages"
-msgstr "Beim Verschicken privater Antworten auf Listennachrichten nachfragen"
-
-#: ../mail/mail-config.ui.h:93
-msgid "Prompt when sending replies to _many recipients"
-msgstr "Beim Antworten an _viele EmpfÃ¤ngern nachfragen"
-
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:78
 msgid "Proxy Settings"
 msgstr "Proxy-Einstellungen"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:79
 msgid "Quoted"
 msgstr "Zitiert"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:80
 msgid "Re_member password"
 msgstr "An Passwort _erinnern"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:81
 msgid "Re_ply-To:"
 msgstr "_Antwort an:"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:82
 msgid "Remember _password"
 msgstr "An _Passwort erinnern"
 
-#: ../mail/mail-config.ui.h:100
+# CHECK
+#: ../mail/mail-config.ui.h:83
+msgid "Replies and Forwards"
+msgstr "Antworten und Weiterleitungen"
+
+#: ../mail/mail-config.ui.h:84
 msgid "Required Information"
 msgstr "BenÃ¶tigte Informationen"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:85
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:86
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:87
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:88
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:90
 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:107
+#: ../mail/mail-config.ui.h:91
 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:108
+#: ../mail/mail-config.ui.h:92
 msgid "S_elect..."
 msgstr "A_uswÃ¤hlen â?¦"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:93
 msgid "S_end message receipts:"
 msgstr "Lese_bestÃ¤tigungen verschicken:"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:94
 msgid "S_tandard Font:"
 msgstr "_Standard-Schrift:"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:95
 msgid "Secure MIME (S/MIME)"
 msgstr "Sicheres MIME (S/MIME)"
 
-#: ../mail/mail-config.ui.h:113
-msgid "Select Drafts Folder"
-msgstr "Ordner fÃ¼r EntwÃ¼rfe wÃ¤hlen"
-
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:97
 msgid "Select HTML fixed width font"
 msgstr "Dicktengleiche HTML-Schrift wÃ¤hlen"
 
-#: ../mail/mail-config.ui.h:115
-msgid "Select HTML fixed width font for printing"
-msgstr "Dicktengleiche HTML-Druckschrift wÃ¤hlen"
-
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:98
 msgid "Select HTML variable width font"
 msgstr "HTML-Proportionalschrift wÃ¤hlen"
 
-#: ../mail/mail-config.ui.h:117
-msgid "Select HTML variable width font for printing"
-msgstr "HTML-Proportionaldruckschrift wÃ¤hlen"
-
-#: ../mail/mail-config.ui.h:118
-msgid "Select Junk Folder"
-msgstr "UnerwÃ¼nscht-Ordner wÃ¤hlen"
+#: ../mail/mail-config.ui.h:99
+msgid "Sender Photograph"
+msgstr "Foto des Absenders"
 
-#: ../mail/mail-config.ui.h:119
-msgid "Select Sent Folder"
-msgstr "Gesendet-Ordner wÃ¤hlen"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:101
+msgid "Sending a _private reply to a mailing list message"
+msgstr "_Private Antwort auf eine Listennachricht senden"
 
-#: ../mail/mail-config.ui.h:120
-msgid "Select Trash Folder"
-msgstr "Ordner fÃ¼r MÃ¼ll wÃ¤hlen"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:103
+msgid "Sending a message with an _empty subject line"
+msgstr "Nachrichten mit _leerem Betreff senden"
 
-#: ../mail/mail-config.ui.h:121
-msgid "Sender Photograph"
-msgstr "Foto des Absenders"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:105
+msgid "Sending a message with only _Bcc recipients defined"
+msgstr "Nachricht mit ausschlieÃ?lich _Blindkopie-EmpfÃ¤ngern senden"
 
-#: ../mail/mail-config.ui.h:122
-msgid "Sending Mail"
-msgstr "Verschicken von E-Mails"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:107
+msgid "Sending a reply to a large _number of recipients"
+msgstr "Antwort an zahlreiche EmpfÃ¤nger se_nden"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:108
 msgid "Sent _Messages Folder:"
 msgstr "Ordner fÃ¼r _verschickte Nachrichten:"
 
-#: ../mail/mail-config.ui.h:124
-msgid "Sent and Draft Messages"
-msgstr "Verschickte und entworfene Nachrichten"
-
-#: ../mail/mail-config.ui.h:125
+#: ../mail/mail-config.ui.h:109
 msgid "Ser_ver requires authentication"
 msgstr "Server erfordert _Legitimation"
 
-#: ../mail/mail-config.ui.h:126
+#: ../mail/mail-config.ui.h:110
 msgid "Server Configuration"
 msgstr "Serverkonfiguration"
 
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:111
 msgid "Server _Type:"
 msgstr "_Server-Art:"
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:112
 msgid "Si_gning algorithm:"
 msgstr "Si_gnaturalgorithmus:"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:113
 msgid "Sig_natures"
 msgstr "Sig_naturen"
 
-#: ../mail/mail-config.ui.h:130
+#: ../mail/mail-config.ui.h:114
 msgid "Sig_ning certificate:"
 msgstr "Signatur_zertifikat:"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:115
 msgid "Signat_ure:"
 msgstr "_Signatur:"
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:116
 msgid "Signatures"
 msgstr "Signaturen"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:117
 msgid "Signing _algorithm:"
 msgstr "Signatur_algorithmus:"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:118
+msgid "Special Folders"
+msgstr "Spezielle Ordner"
+
+#: ../mail/mail-config.ui.h:119
 msgid "Spell Checking"
 msgstr "RechtschreibprÃ¼fung"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:120
 msgid "Start _typing at the bottom on replying"
 msgstr "Beim Antworten auf Mails _unten mit dem Schreiben beginnen"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:122
 msgid "T_ype:"
 msgstr "T_yp:"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:123
 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:139
+#: ../mail/mail-config.ui.h:124
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12981,12 +12936,15 @@ msgstr ""
 "verwendet. Der von Ihnen angegebene Name\n"
 "wird lediglich zur Anzeige verwendet."
 
-#. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
-#: ../mail/mail-config.ui.h:143
-msgid "Top Posting Option"
-msgstr "Top-Posting-Option"
+#: ../mail/mail-config.ui.h:127
+msgid ""
+"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:144
+#: ../mail/mail-config.ui.h:128
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12994,168 +12952,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:146
+#: ../mail/mail-config.ui.h:130
 msgid "Us_ername:"
 msgstr "_Benutzername:"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:131
 msgid "Use Authe_ntication"
 msgstr "_Legitimation benutzen"
 
-#: ../mail/mail-config.ui.h:148 ../plugins/caldav/caldav-source.c:225
-#: ../plugins/google-account-setup/google-contacts-source.c:286
-#: ../plugins/google-account-setup/google-source.c:623
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
-msgid "User_name:"
+#: ../mail/mail-config.ui.h:132
+msgid "User _Name:"
 msgstr "_Benutzername:"
 
-#: ../mail/mail-config.ui.h:149
-msgid "V_ariable-width:"
-msgstr "_Proportional:"
-
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:133
 msgid "_Add Signature"
 msgstr "Signatur _hinzufÃ¼gen"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:134
 msgid "_Always load images from the Internet"
 msgstr "Bilder _immer aus dem Internet laden"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:135
 msgid "_Authentication Type"
 msgstr "_Legitimationsart"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:136
 msgid "_Default junk plugin:"
 msgstr "_Vorgabe-UnerwÃ¼nscht-Plugin:"
 
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:137
 msgid "_Direct connection to the Internet"
 msgstr "_Direkte Internetverbindung"
 
-#: ../mail/mail-config.ui.h:155
+#: ../mail/mail-config.ui.h:138
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Besprechungsanfragen nicht signieren (zur KompatibilitÃ¤t mit Outlook)"
 
-#: ../mail/mail-config.ui.h:156
+#: ../mail/mail-config.ui.h:139
 msgid "_Forward style:"
 msgstr "_Weiterleitungsstil:"
 
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:140
 msgid "_Junk Folder:"
 msgstr "_UnerwÃ¼nscht-Ordner:"
 
-#: ../mail/mail-config.ui.h:158
-msgid "_Keep Signature above the original message on replying"
+#: ../mail/mail-config.ui.h:141
+msgid "_Keep signature above the original message on replying"
 msgstr "Signat_ur beim Antworten Ã¼ber der Original-Nachricht behalten"
 
-#: ../mail/mail-config.ui.h:159
+#: ../mail/mail-config.ui.h:142
 msgid "_Languages"
 msgstr "_Sprachen"
 
-#: ../mail/mail-config.ui.h:160
-msgid "_Load images in messages from contacts"
-msgstr "Bilder in Nachrichten von Kontakten _laden"
+#: ../mail/mail-config.ui.h:143
+msgid "_Load images only in messages from contacts"
+msgstr "Bilder nur in Nachrichten von Kontakten _laden"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:144
 msgid "_Lookup in local address book only"
 msgstr "Nur in _lokalen AdressbÃ¼chern suchen"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:145
 msgid "_Make this my default account"
 msgstr "Dieses zum Vo_rgabekonto machen"
 
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:146
 msgid "_Manual proxy configuration:"
 msgstr "_Manuelle Proxy-Konfiguration:"
 
-#: ../mail/mail-config.ui.h:164
-msgid "_Mark messages as read after"
-msgstr "_Nachrichten als gelesen markieren nach"
-
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:148
 msgid "_Never load images from the Internet"
 msgstr "Bilder _nie aus dem Internet laden"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:149
 msgid "_Path:"
 msgstr "_Pfad:"
 
-#: ../mail/mail-config.ui.h:168
+#: ../mail/mail-config.ui.h:150
 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:169
-msgid "_Prompt when sending messages with an empty subject line"
-msgstr "Nachfrage beim Abschicken von Nachrichten mit _leerem Betreff"
-
-#: ../mail/mail-config.ui.h:170
+#: ../mail/mail-config.ui.h:151
 msgid "_Reply style:"
 msgstr "_Antwortstil:"
 
-#: ../mail/mail-config.ui.h:171
+#: ../mail/mail-config.ui.h:152
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: ../mail/mail-config.ui.h:172
+#: ../mail/mail-config.ui.h:153
 msgid "_Secure HTTP Proxy:"
 msgstr "_Sicherer HTTP-Proxy:"
 
-#: ../mail/mail-config.ui.h:174 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:155 ../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:176
-msgid "_Show image animations"
-msgstr "Bildanimationen an_zeigen"
+#: ../mail/mail-config.ui.h:157
+msgid "_Show animated images"
+msgstr "_Animierte Bilder anzeigen"
 
-#: ../mail/mail-config.ui.h:177
+#: ../mail/mail-config.ui.h:158
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Foto des Absenders in der Nachrichtenvorschau anzeigen"
 
-#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
-#: ../mail/mail-config.ui.h:179
-msgid "_Shrink To / Cc / Bcc headers to "
-msgstr "EmpfÃ¤ngerkopfzeilen (An/Kopie/Blindkopie) _verkleinern zu "
-
-#: ../mail/mail-config.ui.h:180
+#: ../mail/mail-config.ui.h:159
 msgid "_Trash Folder:"
 msgstr "M_Ã¼llordner:"
 
-#: ../mail/mail-config.ui.h:181
+#: ../mail/mail-config.ui.h:160
 msgid "_Use Secure Connection:"
 msgstr "_Sichere Verbindung verwenden:"
 
-#: ../mail/mail-config.ui.h:182
+#: ../mail/mail-config.ui.h:161
 msgid "_Use system defaults"
 msgstr "_Vorgabe benutzen"
 
-#: ../mail/mail-config.ui.h:183
+#: ../mail/mail-config.ui.h:162
 msgid "_Use the same fonts as other applications"
 msgstr "Dieselben Schriften wie andere Anwendungen _verwenden"
 
-#: ../mail/mail-config.ui.h:184 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
-#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
-#: ../mail/mail-config.ui.h:186
-msgid "addresses"
-msgstr "Adressen"
-
-#: ../mail/mail-config.ui.h:187 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:164 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:188
+#: ../mail/mail-config.ui.h:165
 msgid "color"
 msgstr "Farbe"
 
-#: ../mail/mail-config.ui.h:189
+#: ../mail/mail-config.ui.h:166
 msgid "description"
 msgstr "Beschreibung"
 
@@ -13180,103 +13113,82 @@ msgid "Co_mpleted"
 msgstr "Abges_chlossen"
 
 #: ../mail/mail-dialogs.ui.h:6
-msgid "Collapse _all"
-msgstr "Alle _einklappen"
-
-#: ../mail/mail-dialogs.ui.h:7
 msgid "Digital Signature"
 msgstr "Digitale Signatur"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Do Not Forward"
 msgstr "Nicht weiterleiten"
 
-#: ../mail/mail-dialogs.ui.h:9
-msgid "E_xpand all"
-msgstr "Alle _aufklappen"
-
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Encryption"
 msgstr "VerschlÃ¼sselung"
 
-#: ../mail/mail-dialogs.ui.h:11
-msgid "Folder Subscriptions"
-msgstr "Ordnerabonnements"
-
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Follow-Up"
 msgstr "Folgenachricht"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:10
 msgid "For Your Information"
 msgstr "Zu Ihrer Information"
 
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:11
 msgid "Forward"
 msgstr "Weiterleiten"
 
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:12
 msgid "License Agreement"
 msgstr "Lizenzvereinbarung"
 
-#: ../mail/mail-dialogs.ui.h:16
+#: ../mail/mail-dialogs.ui.h:13
 msgid "No Response Necessary"
 msgstr "Keine Antwort erforderlich"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:17
 msgid "Reply to All"
 msgstr "Antwort an alle"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Review"
 msgstr "Ã?berprÃ¼fen"
 
-#: ../mail/mail-dialogs.ui.h:22
-msgid "S_erver:"
-msgstr "_Server:"
-
-#: ../mail/mail-dialogs.ui.h:23
-msgid "S_how only items containing:"
-msgstr "Nur EintrÃ¤ge anzeigen, die Folgendes ent_halten:"
-
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:19
 msgid "Search Folder Sources"
 msgstr "Ordnerquellen durchsuchen"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:20
 msgid "Security Information"
 msgstr "Sicherheitsinformationen"
 
-#: ../mail/mail-dialogs.ui.h:26
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Specific folders"
 msgstr "Bestimmte Ordner"
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:22
 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:29
+#: ../mail/mail-dialogs.ui.h:24
 msgid "_Accept License"
 msgstr "Lizenz _akzeptieren"
 
-#: ../mail/mail-dialogs.ui.h:30
+#: ../mail/mail-dialogs.ui.h:25
 msgid "_Due By:"
 msgstr "_FÃ¤llig am:"
 
-#: ../mail/mail-dialogs.ui.h:31
+#: ../mail/mail-dialogs.ui.h:26
 msgid "_Flag:"
 msgstr "_Markierung:"
 
-#: ../mail/mail-dialogs.ui.h:32
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Tick this to accept the license agreement"
 msgstr "Ha_ken Sie dies ab, um die Lizenzvereinbarung zu akzeptieren"
 
-#: ../mail/mail-folder-cache.c:783
+#: ../mail/mail-folder-cache.c:791
 #, c-format
 msgid "Pinging %s"
 msgstr "Ping zu %s wird ermittelt"
@@ -13285,16 +13197,16 @@ msgstr "Ping zu %s wird ermittelt"
 msgid "Filtering Selected Messages"
 msgstr "GewÃ¤hlte Nachrichten filtern"
 
-#: ../mail/mail-ops.c:245
+#: ../mail/mail-ops.c:229
 msgid "Fetching Mail"
 msgstr "E-Mail wird abgerufen"
 
-#: ../mail/mail-ops.c:592
+#: ../mail/mail-ops.c:586
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Ausgangsfilter konnten nicht angewandt werden: %s"
 
-#: ../mail/mail-ops.c:608 ../mail/mail-ops.c:635
+#: ../mail/mail-ops.c:602 ../mail/mail-ops.c:633
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13303,163 +13215,146 @@ msgstr ""
 "AnhÃ¤ngen an %s gescheitert: %s\n"
 "Stattdessen wird versucht, an den lokalen Â»VerschickenÂ«-Ordner anzuhÃ¤ngen."
 
-#: ../mail/mail-ops.c:654
+#: ../mail/mail-ops.c:653
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "AnhÃ¤ngen an lokalen Â»VerschicktÂ«-Ordner gescheitert: %s"
 
-#: ../mail/mail-ops.c:774 ../mail/mail-ops.c:866
+#: ../mail/mail-ops.c:769 ../mail/mail-ops.c:862
 msgid "Sending message"
 msgstr "Nachricht wird verschickt"
 
-#: ../mail/mail-ops.c:782
+#: ../mail/mail-ops.c:780
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Nachricht %d von %d wird verschickt"
 
-#: ../mail/mail-ops.c:826
+#: ../mail/mail-ops.c:827
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "%d von %d Nachrichten konnten nicht verschickt werden"
 
-#: ../mail/mail-ops.c:828 ../mail/mail-send-recv.c:783
+#: ../mail/mail-ops.c:829 ../mail/mail-send-recv.c:782
 msgid "Canceled."
 msgstr "Abgebrochen."
 
-#: ../mail/mail-ops.c:830 ../mail/mail-send-recv.c:785
+#: ../mail/mail-ops.c:831 ../mail/mail-send-recv.c:784
 msgid "Complete."
 msgstr "Abgeschlossen."
 
-#: ../mail/mail-ops.c:938
+#: ../mail/mail-ops.c:936
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "Nachricht wird in Ordner Â»%sÂ« gespeichert"
 
-#: ../mail/mail-ops.c:1018
+#: ../mail/mail-ops.c:1021
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Nachrichten werden nach Â»%sÂ« verschoben"
 
-#: ../mail/mail-ops.c:1018
+#: ../mail/mail-ops.c:1021
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Nachrichten werden nach Â»%sÂ« kopiert"
 
-#: ../mail/mail-ops.c:1127
+#: ../mail/mail-ops.c:1137
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "Ordner in Â»%sÂ« werden eingelesen"
 
-#: ../mail/mail-ops.c:1235
+#: ../mail/mail-ops.c:1249
 msgid "Forwarded messages"
 msgstr "Weitergeleitete Nachrichten"
 
-#: ../mail/mail-ops.c:1276
+#: ../mail/mail-ops.c:1290
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "Ordner Â»%sÂ« wird geÃ¶ffnet"
 
-#: ../mail/mail-ops.c:1342
+#: ../mail/mail-ops.c:1357
 #, c-format
 msgid "Retrieving quota information for folder '%s'"
 msgstr "Informationen Ã¼ber Speicherplatzlimit fÃ¼r Ordner Â»%sÂ« werden abgerufen"
 
-#: ../mail/mail-ops.c:1414
+#: ../mail/mail-ops.c:1429
 #, c-format
 msgid "Opening store '%s'"
 msgstr "Speicher Â»%sÂ« wird geÃ¶ffnet"
 
-#: ../mail/mail-ops.c:1485
+#: ../mail/mail-ops.c:1502
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Ordner Â»%sÂ« wird entfernt"
 
-#: ../mail/mail-ops.c:1609
+#: ../mail/mail-ops.c:1639
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ordner Â»%sÂ« wird gespeichert"
 
-#: ../mail/mail-ops.c:1672
+#: ../mail/mail-ops.c:1703
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Konto Â»%sÂ« wird gesÃ¤ubert und gespeichert"
 
-#: ../mail/mail-ops.c:1673
+#: ../mail/mail-ops.c:1704
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Konto Â»%sÂ« wird gespeichert"
 
-#: ../mail/mail-ops.c:1727
+#: ../mail/mail-ops.c:1760
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Ordner Â»%sÂ« wird aufgefrischt"
 
-#: ../mail/mail-ops.c:1767
+#: ../mail/mail-ops.c:1798
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Ordner Â»%sÂ« wird gesÃ¤ubert"
 
-#: ../mail/mail-ops.c:1812
+#: ../mail/mail-ops.c:1844
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "MÃ¼ll in Â»%sÂ« wird geleert"
 
-#: ../mail/mail-ops.c:1813
+#: ../mail/mail-ops.c:1845
 msgid "Local Folders"
 msgstr "Lokale Ordner"
 
-#: ../mail/mail-ops.c:2016
+#: ../mail/mail-ops.c:2060
 #, 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:2105
+#: ../mail/mail-ops.c:2152
 #, 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:2192
+#: ../mail/mail-ops.c:2248
 #, c-format
 msgid "Error saving messages to: %s:\n"
 msgstr "Fehler beim Speichern der Nachrichten in: %s:\n"
 
-#: ../mail/mail-ops.c:2265
-msgid "Saving attachment"
-msgstr "Anlage wird gespeichert"
-
-#: ../mail/mail-ops.c:2285 ../mail/mail-ops.c:2295
-#, c-format
-msgid ""
-"Cannot create output file: %s:\n"
-" %s"
-msgstr ""
-"Ausgabedatei konnte nicht angelegt werden: %s:\n"
-" %s"
-
-#: ../mail/mail-ops.c:2310
-msgid "Could not write data: "
-msgstr "Daten konnten nicht geschrieben werden:"
-
-#: ../mail/mail-ops.c:2454
+#: ../mail/mail-ops.c:2400
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "Verbindung mit Â»%sÂ« wird getrennt"
 
-#: ../mail/mail-ops.c:2454
+#: ../mail/mail-ops.c:2400
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Verbindung mit Â»%sÂ« wird erneut hergestellt"
 
-#: ../mail/mail-ops.c:2550
+#: ../mail/mail-ops.c:2494
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Konto Â»%sÂ« wird fÃ¼r Offline-Betrieb vorbereitet"
 
-#: ../mail/mail-ops.c:2636
+#: ../mail/mail-ops.c:2582
 msgid "Checking Service"
 msgstr "Dienst wird Ã¼berprÃ¼ft"
 
@@ -13467,19 +13362,19 @@ msgstr "Dienst wird Ã¼berprÃ¼ft"
 msgid "Canceling..."
 msgstr "Absagevorgang â?¦"
 
-#: ../mail/mail-send-recv.c:440
+#: ../mail/mail-send-recv.c:431
 msgid "Send & Receive Mail"
 msgstr "E-Mails verschicken und abrufen"
 
-#: ../mail/mail-send-recv.c:457
+#: ../mail/mail-send-recv.c:448
 msgid "Cancel _All"
 msgstr "A_lles abbrechen"
 
-#: ../mail/mail-send-recv.c:569
+#: ../mail/mail-send-recv.c:564
 msgid "Updating..."
 msgstr "Aktualisieren â?¦"
 
-#: ../mail/mail-send-recv.c:569 ../mail/mail-send-recv.c:649
+#: ../mail/mail-send-recv.c:564 ../mail/mail-send-recv.c:648
 msgid "Waiting..."
 msgstr "Warten â?¦"
 
@@ -13488,30 +13383,30 @@ msgstr "Warten â?¦"
 msgid "Checking for new mail"
 msgstr "Nach neuen E-Mails sehen"
 
-#: ../mail/mail-session.c:225
+#: ../mail/mail-session.c:218
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Passwort fÃ¼r %s eingeben"
 
-#: ../mail/mail-session.c:227
+#: ../mail/mail-session.c:220
 msgid "Enter Passphrase"
 msgstr "Geben Sie das Passwort ein"
 
-#: ../mail/mail-session.c:230
+#: ../mail/mail-session.c:223
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Passwort fÃ¼r %s eingeben"
 
-#: ../mail/mail-session.c:232
+#: ../mail/mail-session.c:225
 msgid "Enter Password"
 msgstr "Geben Sie das Passwort ein"
 
-#: ../mail/mail-session.c:277
+#: ../mail/mail-session.c:270
 #, c-format
 msgid "User canceled operation."
 msgstr "Benutzer hat Vorgang abgebrochen."
 
-#: ../mail/mail-session.c:722
+#: ../mail/mail-session.c:704
 #, c-format
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
@@ -13519,33 +13414,33 @@ msgstr ""
 "Das Weiterleiten der Nachricht wurde abgebrochen, da keine Zieladresse "
 "angegeben wurde."
 
-#: ../mail/mail-session.c:731
+#: ../mail/mail-session.c:713
 #, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr ""
 "Das Weiterleiten der Nachricht wurde abgebrochen, da kein nutzbares Konto "
 "gefunden wurde."
 
-#: ../mail/mail-tools.c:128
+#: ../mail/mail-tools.c:132
 #, c-format
 msgid "Could not create spool directory '%s': %s"
 msgstr "Spool-Ordner Â»%sÂ« konnte nicht angelegt werden: %s"
 
-#: ../mail/mail-tools.c:161
+#: ../mail/mail-tools.c:165
 #, 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:273
+#: ../mail/mail-tools.c:277
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Weitergeleitete Nachricht - %s"
 
-#: ../mail/mail-tools.c:275
+#: ../mail/mail-tools.c:279
 msgid "Forwarded message"
 msgstr "Weitergeleitete Nachricht"
 
-#: ../mail/mail-tools.c:318
+#: ../mail/mail-tools.c:325
 #, c-format
 msgid "Invalid folder: '%s'"
 msgstr "UngÃ¼ltiger Ordner: Â»%sÂ«"
@@ -13555,12 +13450,12 @@ msgstr "UngÃ¼ltiger Ordner: Â»%sÂ«"
 msgid "Setting up Search Folder: %s"
 msgstr "Suchordner wird eingerichtet: %s"
 
-#: ../mail/mail-vfolder.c:224
+#: ../mail/mail-vfolder.c:225
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Suchordner fÃ¼r Â»%s:%sÂ« werden aktualisiert"
 
-#: ../mail/mail-vfolder.c:231
+#: ../mail/mail-vfolder.c:232
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Suchordner fÃ¼r Â»%sÂ« werden aktualisiert"
@@ -13570,11 +13465,10 @@ msgstr "Suchordner fÃ¼r Â»%sÂ« werden aktualisiert"
 #. * 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:675
+#: ../mail/mail-vfolder.c:678
 #, 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"
@@ -13589,11 +13483,11 @@ msgstr[1] ""
 "entfernten Ordner verwenden:\n"
 "Â»%sÂ«."
 
-#: ../mail/mail-vfolder.c:1185
+#: ../mail/mail-vfolder.c:1198
 msgid "Edit Search Folder"
 msgstr "Suchordner bearbeiten"
 
-#: ../mail/mail-vfolder.c:1290
+#: ../mail/mail-vfolder.c:1303
 msgid "New Search Folder"
 msgstr "Neuer Suchordner"
 
@@ -13813,26 +13707,30 @@ msgstr ""
 "unterschieden. MÃ¶glicherweise ist Ihre Dauerumschalttaste aktiv."
 
 #: ../mail/mail.error.xml.h:43
+msgid "Close message window."
+msgstr "Nachrichtenfenster schlieÃ?en."
+
+#: ../mail/mail.error.xml.h:44
 msgid "Could not save signature file."
 msgstr "Signaturdatei konnte nicht gespeichert werden."
 
-#: ../mail/mail.error.xml.h:44
+#: ../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:46
+#: ../mail/mail.error.xml.h:47
 msgid "Do _Not Disable"
 msgstr "_Nicht deaktivieren"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:48
 msgid "Do _Not Send"
 msgstr "_Nicht verschicken"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:49
 msgid "Do _Not Synchronize"
 msgstr "_Nicht abgleichen"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -13840,48 +13738,48 @@ msgstr ""
 "Sollen die fÃ¼r die Benutzung im Offline-Modus markierten Ordner lokal "
 "abgeglichen werden?"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
 msgid "Do you want to mark all messages as read?"
 msgstr "Sollen alle Nachrichten als gelesen markiert werden?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:52
 msgid "Do you wish to save your changes?"
 msgstr "Sollen die vorgenommenen Ã?nderungen gespeichert werden?"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:53
 msgid "Enter password."
 msgstr "Passwort eingeben."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:54
 msgid "Error loading filter definitions."
 msgstr "Fehler beim Laden der Filterdefinitionen."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:55
 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:58
+#: ../mail/mail.error.xml.h:59
 msgid "Error while {0}."
 msgstr "Fehler bei Â»{0}Â«."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:60
 msgid "File exists but cannot overwrite it."
 msgstr "Die Datei existiert, das Ã?berschreiben ist jedoch nicht mÃ¶glich."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:61
 msgid "File exists but is not a regular file."
 msgstr "Die Datei existiert, ist jedoch keine gewÃ¶hnliche Datei"
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:62
 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:62
+#: ../mail/mail.error.xml.h:63
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
@@ -13889,18 +13787,17 @@ msgstr ""
 "Falls Sie einen Ordner lÃ¶schen, geht sein gesamter Inhalt sowie der Inhalt "
 "seiner Unterordner dauerhaft verloren."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:64
 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:64
+#: ../mail/mail.error.xml.h:65
 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:65
+#: ../mail/mail.error.xml.h:66
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13908,40 +13805,39 @@ msgstr ""
 "Falls Sie fortfahren, werden die Konten- und\n"
 "Vertretungsinformationen dauerhaft gelÃ¶scht."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:68
 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:68
+#: ../mail/mail.error.xml.h:69
 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:69
+#: ../mail/mail.error.xml.h:70
 msgid "Ignore"
 msgstr "Ignorieren"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:71
 msgid "Invalid authentication"
 msgstr "Legitimation ungÃ¼ltig"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:72
 msgid "Mail Deletion Failed"
 msgstr "LÃ¶schen der E-Mail gescheitert"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:73
 msgid "Mail filters automatically updated."
 msgstr "E-Mail-Filter automatisch aktualisiert."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:74
 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 "
@@ -13950,41 +13846,44 @@ msgstr ""
 "Um dies zu umgehen, sollten Sie mindestens einen Â»An:Â«- oder Â»Kopie an:-"
 "EmpfÃ¤nger hinzufÃ¼gen.Â«"
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:75
 msgid "Missing folder."
 msgstr "Ordner fehlt."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:77
+msgid "N_ever"
+msgstr "Ni_e"
+
+#: ../mail/mail.error.xml.h:78
 msgid "No sources selected."
 msgstr "Keine Quellen gewÃ¤hlt."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:79
 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:78
+#: ../mail/mail.error.xml.h:80
 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:79
+#: ../mail/mail.error.xml.h:81
 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:80
+#: ../mail/mail.error.xml.h:82
 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:81
+#: ../mail/mail.error.xml.h:83
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13995,76 +13894,75 @@ msgstr ""
 "{0}\n"
 "Dennoch abschicken?"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:85
 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:84
+#: ../mail/mail.error.xml.h:86
 msgid "Please wait."
 msgstr "Bitte warten."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:87
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Probleme beim Migrieren des alten E-Mail-Ordners Â»{0}Â«."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:88
 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:87
+#: ../mail/mail.error.xml.h:89
 msgid "Read receipt requested."
 msgstr "LesebestÃ¤tigung angefordert."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:90
 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:89
+#: ../mail/mail.error.xml.h:91
 msgid "Really delete folder \"{0}\"?"
 msgstr "Soll der Ordner Â»{0}Â« wirklich gelÃ¶scht werden?"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:92
 msgid "Reply _Privately"
 msgstr "_Privat antworten"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:95
 msgid "Search Folders automatically updated."
 msgstr "Suchordner automatisch aktualisiert."
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:96
 msgid "Send private reply?"
 msgstr "Private Antwort senden?"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:97
 msgid "Send reply to all recipients?"
 msgstr "Antwort an alle EmpfÃ¤nger senden?"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:98
 msgid "Signature Already Exists"
 msgstr "Signatur existiert bereits"
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:99
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Ordner lokal fÃ¼r Offline-Benutzung abgleichen?"
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:100
 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:99
+#: ../mail/mail.error.xml.h:101
 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"
@@ -14075,7 +13973,7 @@ msgstr ""
 "Um dies zu umgehen, sollten Sie mindestens einen Â»An:Â«- oder Â»Kopie an:-"
 "EmpfÃ¤nger hinzufÃ¼gen.Â«"
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -14083,7 +13981,7 @@ msgstr ""
 "Der folgende EmpfÃ¤nger wurden als ungÃ¼ltige E-Mail-Adresse erkannt:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -14091,11 +13989,11 @@ msgstr ""
 "Die folgenden EmpfÃ¤nger wurden als ungÃ¼ltige E-Mail-Adressen erkannt:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:108
 msgid "The script file must exist and be executable."
 msgstr "Die Skriptdatei muss existieren und ausfÃ¼hrbar sein."
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14103,22 +14001,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:109
+#: ../mail/mail.error.xml.h:111
 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:110
+#: ../mail/mail.error.xml.h:112
 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:111
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14126,27 +14024,26 @@ msgstr ""
 "Dieser Server unterstÃ¼tzt diese Art der Legitimation nicht. MÃ¶glicherweise "
 "unterstÃ¼tzt er keinerlei Legitimation."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:114
 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:113
+#: ../mail/mail.error.xml.h:115
 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:114
+#: ../mail/mail.error.xml.h:116
 msgid "This will mark all messages as read in the selected folder."
 msgstr "Dies wird alle Nachrichten im gewÃ¤hlten Ordner als gelesen markieren."
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:117
 msgid "Unable to connect to the GroupWise server."
 msgstr "Verbindungsaufbau zum GroupWise-Server gescheitert."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:118
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -14154,40 +14051,43 @@ msgstr ""
 "Der Entwurfsordner fÃ¼r dieses Konto konnte nicht geÃ¶ffnet werden. Soll "
 "stattdessen der System-Entwurfsordner verwendet werden?"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:119
 msgid "Unable to read license file."
 msgstr "Die Lizenzdatei konnte nicht gelesen werden."
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:120
 msgid "Use _Default"
 msgstr "_Vorgabe benutzen"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:121
 msgid "Use default drafts folder?"
 msgstr "Soll der vorgegebene Entwurfsordner benutzt werden?"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:122
 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"
+"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:122
+#: ../mail/mail.error.xml.h:124
+msgid "Would you like to close the message window?"
+msgstr "Wollen Sie das Nachrichtenfenster schlieÃ?en?"
+
+#: ../mail/mail.error.xml.h:125
 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:123
+#: ../mail/mail.error.xml.h:126
 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 "
@@ -14197,42 +14097,41 @@ msgstr ""
 "aber Sie antworten an den privaten Absender, nicht an die Liste. Wollen Sie "
 "wirklich fortsetzen?"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:127
 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:125
+#: ../mail/mail.error.xml.h:128
 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:126
+#: ../mail/mail.error.xml.h:129
 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:127
+#: ../mail/mail.error.xml.h:130
 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:128
+#: ../mail/mail.error.xml.h:131
 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:129
+#: ../mail/mail.error.xml.h:132
 msgid "You must name this Search Folder."
 msgstr "Sie mÃ¼ssen einen Namen fÃ¼r diesen Suchordner vergeben."
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:133
 msgid "You must specify a folder."
 msgstr "Sie mÃ¼ssen einen Ordner angeben."
 
 # CHECK
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:134
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14242,121 +14141,132 @@ 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:133
+#: ../mail/mail.error.xml.h:136
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Anmedlung am Server Â»{0}Â« als Â»{0}Â« ist gescheitert."
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:137
+msgid "_Always"
+msgstr "_Immer"
+
+#: ../mail/mail.error.xml.h:138
 msgid "_Append"
 msgstr "An_hÃ¤ngen"
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:139
 #: ../plugins/groupwise-features/junk-settings.ui.h:5
 #: ../plugins/publish-calendar/publish-calendar.c:596
 msgid "_Disable"
 msgstr "_Deaktivieren"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:140
 msgid "_Discard changes"
 msgstr "Ã?nderungen _verwerfen"
 
-#: ../mail/mail.error.xml.h:137
-#: ../modules/mail/e-mail-shell-view-actions.c:887
+#: ../mail/mail.error.xml.h:141 ../modules/mail/e-mail-shell-view-actions.c:899
 msgid "_Empty Trash"
 msgstr "_MÃ¼ll leeren"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:142
 msgid "_Expunge"
 msgstr "_SÃ¤ubern"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:143
+msgid "_No"
+msgstr "_Nein"
+
+#: ../mail/mail.error.xml.h:144
 msgid "_Open Messages"
 msgstr "Nachrichten Ã¶_ffnen"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:147
 msgid "_Send Receipt"
 msgstr "BestÃ¤tigung _senden"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:148
 msgid "_Synchronize"
 msgstr "_Abgleichen"
 
-#: ../mail/message-list.c:1170
+#: ../mail/mail.error.xml.h:149
+msgid "_Yes"
+msgstr "_Ja"
+
+#: ../mail/message-list.c:1175
 msgid "Unseen"
 msgstr "Ungelesen"
 
-#: ../mail/message-list.c:1171
+#: ../mail/message-list.c:1176
 msgid "Seen"
 msgstr "Gelesen"
 
-#: ../mail/message-list.c:1172
+#: ../mail/message-list.c:1177
 msgid "Answered"
 msgstr "Beantwortet"
 
-#: ../mail/message-list.c:1173
+#: ../mail/message-list.c:1178
 msgid "Forwarded"
 msgstr "Weitergeleitet"
 
-#: ../mail/message-list.c:1174
+#: ../mail/message-list.c:1179
 msgid "Multiple Unseen Messages"
 msgstr "Mehrere ungelesene Nachrichten"
 
-#: ../mail/message-list.c:1175
+#: ../mail/message-list.c:1180
 msgid "Multiple Messages"
 msgstr "Mehrere Nachrichten"
 
-#: ../mail/message-list.c:1179
+#: ../mail/message-list.c:1184
 msgid "Lowest"
 msgstr "Am niedrigsten"
 
-#: ../mail/message-list.c:1180
+#: ../mail/message-list.c:1185
 msgid "Lower"
 msgstr "Niedriger"
 
-#: ../mail/message-list.c:1184
+#: ../mail/message-list.c:1189
 msgid "Higher"
 msgstr "HÃ¶her"
 
-#: ../mail/message-list.c:1185
+#: ../mail/message-list.c:1190
 msgid "Highest"
 msgstr "Am hÃ¶chsten"
 
-#: ../mail/message-list.c:1795 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1800 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1802 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1807 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "Heute %I:%M %p"
 
-#: ../mail/message-list.c:1811
+#: ../mail/message-list.c:1816
 msgid "Yesterday %l:%M %p"
 msgstr "Gestern %l:%M %p"
 
-#: ../mail/message-list.c:1823
+#: ../mail/message-list.c:1828
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: ../mail/message-list.c:1831
+#: ../mail/message-list.c:1836
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b, %k:%M"
 
-#: ../mail/message-list.c:1833
+#: ../mail/message-list.c:1838
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2598
+#: ../mail/message-list.c:2590
 msgid "Select all visible messages"
 msgstr "Alle sichtbaren Nachrichten wÃ¤hlen"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4412 ../mail/message-list.c:4820
+#: ../mail/message-list.c:4397 ../mail/message-list.c:4806
 msgid "Generating message list"
 msgstr "Nachrichtenliste wird erzeugt"
 
-#: ../mail/message-list.c:4643
+#: ../mail/message-list.c:4628
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -14364,7 +14274,7 @@ msgstr ""
 "Auf Ihr Suchkriterium treffen keine Nachrichten zu. Leeren Sie die Suche mit "
 "Suchen->Verwerfen oder Ã¤ndern Sie sie."
 
-#: ../mail/message-list.c:4645
+#: ../mail/message-list.c:4630
 msgid "There are no messages in this folder."
 msgstr "Es existieren keine Nachrichten in diesem Ordner."
 
@@ -14401,28 +14311,23 @@ msgstr "GrÃ¶Ã?e"
 msgid "Subject - Trimmed"
 msgstr "Betreff - GekÃ¼rzt"
 
-#: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1278
+#: ../mail/searchtypes.xml.h:1 ../modules/mail/e-mail-shell-view-actions.c:1308
 msgid "Body contains"
 msgstr "Rumpf enthÃ¤lt"
 
-#: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1285
+#: ../mail/searchtypes.xml.h:2 ../modules/mail/e-mail-shell-view-actions.c:1315
 msgid "Message contains"
 msgstr "Nachricht enthÃ¤lt"
 
-#: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1292
+#: ../mail/searchtypes.xml.h:3 ../modules/mail/e-mail-shell-view-actions.c:1322
 msgid "Recipients contain"
 msgstr "EmpfÃ¤nger enthalten"
 
-#: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1299
+#: ../mail/searchtypes.xml.h:4 ../modules/mail/e-mail-shell-view-actions.c:1329
 msgid "Sender contains"
 msgstr "Absender enthÃ¤lt"
 
-#: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1306
+#: ../mail/searchtypes.xml.h:5 ../modules/mail/e-mail-shell-view-actions.c:1336
 msgid "Subject contains"
 msgstr "Betreff enthÃ¤lt"
 
@@ -14476,23 +14381,22 @@ msgstr ""
 
 #: ../modules/addressbook/addressbook-config.c:820
 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:895
 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."
 
@@ -14558,8 +14462,7 @@ msgstr "Position des Vorschaufeldes der Kontaktliste bei vertikaler Anordnung."
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
 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:10
 msgid "Show preview pane"
@@ -14607,7 +14510,7 @@ msgstr "Soll das Vorschaufeld angezeigt werden?"
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
 #: ../modules/addressbook/autocompletion-config.c:162
-#: ../modules/mail/em-mailer-prefs.c:1141
+#: ../modules/mail/em-mailer-prefs.c:1061
 msgid "_Table column:"
 msgstr "_Tabellenspalte:"
 
@@ -14715,7 +14618,7 @@ msgstr "Die Eigenschaften des gewÃ¤hlten Adressbuchs anzeigen"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1354
 #: ../modules/calendar/e-memo-shell-view-actions.c:620
 #: ../modules/calendar/e-task-shell-view-actions.c:744
-#: ../modules/mail/e-mail-shell-view-actions.c:971
+#: ../modules/mail/e-mail-shell-view-actions.c:983
 msgid "_Rename..."
 msgstr "_Umbenennen â?¦"
 
@@ -14804,7 +14707,7 @@ msgstr "A_ktionen"
 #: ../modules/addressbook/e-book-shell-view-actions.c:808
 #: ../modules/calendar/e-memo-shell-view-actions.c:657
 #: ../modules/calendar/e-task-shell-view-actions.c:809
-#: ../modules/mail/e-mail-shell-view-actions.c:1094
+#: ../modules/mail/e-mail-shell-view-actions.c:1120
 msgid "_Preview"
 msgstr "_Vorschau"
 
@@ -14837,7 +14740,7 @@ msgstr "Kontakt-Vorschaufenster anzeigen"
 #: ../modules/addressbook/e-book-shell-view-actions.c:879
 #: ../modules/calendar/e-memo-shell-view-actions.c:727
 #: ../modules/calendar/e-task-shell-view-actions.c:891
-#: ../modules/mail/e-mail-shell-view-actions.c:1188
+#: ../modules/mail/e-mail-shell-view-actions.c:1218
 msgid "_Classic View"
 msgstr "_Klassische Ansicht"
 
@@ -14849,7 +14752,7 @@ msgstr "Kontakt-Vorschaufenster unter der Kontaktliste anzeigen"
 #: ../modules/addressbook/e-book-shell-view-actions.c:886
 #: ../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:1195
+#: ../modules/mail/e-mail-shell-view-actions.c:1225
 msgid "_Vertical View"
 msgstr "_Vertikale Ansicht"
 
@@ -14875,7 +14778,7 @@ msgstr "Nicht einsortiert"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1680
 #: ../modules/calendar/e-memo-shell-view-actions.c:761
 #: ../modules/calendar/e-task-shell-view-actions.c:960
-#: ../modules/mail/e-mail-shell-view-actions.c:1271
+#: ../modules/mail/e-mail-shell-view-actions.c:1301
 #: ../shell/e-shell-content.c:467
 msgid "Advanced Search"
 msgstr "Erweiterte Suche"
@@ -14982,8 +14885,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.
@@ -15115,35 +15018,33 @@ msgid "Create a new calendar"
 msgstr "Einen neuen Kalender anlegen"
 
 #: ../modules/calendar/e-cal-shell-backend.c:717
-#: ../plugins/itip-formatter/itip-formatter.c:2669
+#: ../plugins/itip-formatter/itip-formatter.c:2778
 msgid "Calendar and Tasks"
 msgstr "Kalender und Aufgaben"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:171
-#: ../modules/calendar/e-memo-shell-sidebar.c:165
-#: ../modules/calendar/e-task-shell-sidebar.c:165
+#: ../modules/calendar/e-cal-shell-sidebar.c:172
 #, c-format
 msgid ""
-"Error on %s\n"
+"Error on %s: %s\n"
 "%s"
 msgstr ""
-"Fehler bei %s\n"
+"Fehler bei %s: %s\n"
 " %s"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:239
+#: ../modules/calendar/e-cal-shell-sidebar.c:240
 msgid "Loading calendars"
 msgstr "Kalender werden geladen"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:674
+#: ../modules/calendar/e-cal-shell-sidebar.c:675
 msgid "_New Calendar..."
 msgstr "_Neuer Kalender â?¦"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:691
+#: ../modules/calendar/e-cal-shell-sidebar.c:692
 msgid "Calendar Selector"
 msgstr "Kalenderquellenauswahl"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:1032
+#: ../modules/calendar/e-cal-shell-sidebar.c:1033
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Kalender auf %s wird geÃ¶ffnet"
@@ -15156,8 +15057,7 @@ msgstr "Drucken"
 #: ../modules/calendar/e-cal-shell-view-actions.c:306
 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 "
@@ -15557,6 +15457,16 @@ msgstr "Notizli_ste"
 msgid "Create a new memo list"
 msgstr "Eine neue Notizliste anlegen"
 
+#: ../modules/calendar/e-memo-shell-sidebar.c:165
+#: ../modules/calendar/e-task-shell-sidebar.c:165
+#, c-format
+msgid ""
+"Error on %s\n"
+"%s"
+msgstr ""
+"Fehler bei %s\n"
+" %s"
+
 #: ../modules/calendar/e-memo-shell-sidebar.c:233
 msgid "Loading memos"
 msgstr "Notizen werden geladen"
@@ -15636,15 +15546,15 @@ msgstr "Die Liste von Notizen drucken"
 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:416
+#: ../modules/calendar/e-memo-shell-view-private.c:417
 #, 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:420
-#: ../modules/calendar/e-task-shell-view-private.c:569
+#: ../modules/calendar/e-memo-shell-view-private.c:421
+#: ../modules/calendar/e-task-shell-view-private.c:570
 #, c-format
 msgid "%d selected"
 msgstr "%d gewÃ¤hlt"
@@ -15809,23 +15719,23 @@ msgstr "Vorschau auf die zu druckende Aufgabenliste"
 msgid "Expunging"
 msgstr "Wird gesÃ¤ubert"
 
-#: ../modules/calendar/e-task-shell-view-private.c:565
+#: ../modules/calendar/e-task-shell-view-private.c:566
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d Aufgabe"
 msgstr[1] "%d Aufgaben"
 
-#: ../modules/calendar/e-task-shell-view.c:351
+#: ../modules/calendar/e-task-shell-view.c:358
 msgid "Delete Tasks"
 msgstr "Aufgaben lÃ¶schen"
 
-#: ../modules/calendar/e-task-shell-view.c:353
+#: ../modules/calendar/e-task-shell-view.c:360
 msgid "Delete Task"
 msgstr "Aufgabe lÃ¶schen"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:345
+#: ../modules/mail/e-mail-attachment-handler.c:349
 #, c-format
 msgid "%d attached messages"
 msgstr "%d beigelegte Nachrichten"
@@ -15871,270 +15781,267 @@ msgstr "Editoreinstellungen"
 msgid "Network Preferences"
 msgstr "Netzwerkeinstellungen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:880
-#: ../modules/mail/e-mail-shell-view.c:883
+#: ../modules/mail/e-mail-shell-view-actions.c:892
+#: ../modules/mail/e-mail-shell-view.c:940
 msgid "_Disable Account"
 msgstr "Konto _deaktivieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:882
+#: ../modules/mail/e-mail-shell-view-actions.c:894
 msgid "Disable this account"
 msgstr "Dieses Konto deaktivieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:889
+#: ../modules/mail/e-mail-shell-view-actions.c:901
 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:894
+#: ../modules/mail/e-mail-shell-view-actions.c:906
 msgid "C_reate Search Folder From Search..."
 msgstr "Sucho_rdner aus Suche anlegen â?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:901
+#: ../modules/mail/e-mail-shell-view-actions.c:913
 msgid "_Download Messages for Offline Usage"
 msgstr "_Nachrichten fÃ¼r Offline-Benutzung herunterladen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:903
+#: ../modules/mail/e-mail-shell-view-actions.c:915
 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:908
+#: ../modules/mail/e-mail-shell-view-actions.c:920
 msgid "Fl_ush Outbox"
 msgstr "E-Mails aus A_usgang verschicken"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:915
+#: ../modules/mail/e-mail-shell-view-actions.c:927
 msgid "_Copy Folder To..."
 msgstr "Ordner _kopieren nach â?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:917
+#: ../modules/mail/e-mail-shell-view-actions.c:929
 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:924
+#: ../modules/mail/e-mail-shell-view-actions.c:936
 msgid "Permanently remove this folder"
 msgstr "Diesen Ordner dauerhaft entfernen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:929
+#: ../modules/mail/e-mail-shell-view-actions.c:941
 msgid "E_xpunge"
 msgstr "_SÃ¤ubern"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:931
+#: ../modules/mail/e-mail-shell-view-actions.c:943
 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:936
+#: ../modules/mail/e-mail-shell-view-actions.c:948
 msgid "Mar_k All Messages as Read"
 msgstr "Alle Nachrichten als gelesen _markieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:938
+#: ../modules/mail/e-mail-shell-view-actions.c:950
 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:943
+#: ../modules/mail/e-mail-shell-view-actions.c:955
 msgid "_Move Folder To..."
 msgstr "Ordner verschie_ben nach â?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:945
+#: ../modules/mail/e-mail-shell-view-actions.c:957
 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:950
+#: ../modules/mail/e-mail-shell-view-actions.c:962
 msgid "_New..."
 msgstr "_Neu â?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:952
+#: ../modules/mail/e-mail-shell-view-actions.c:964
 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:959
+#: ../modules/mail/e-mail-shell-view-actions.c:971
 msgid "Change the properties of this folder"
 msgstr "Die Eigenschaften dieses Ordners Ã¤ndern"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:966
+#: ../modules/mail/e-mail-shell-view-actions.c:978
 msgid "Refresh the folder"
 msgstr "Den Ordner auffrischen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:973
+#: ../modules/mail/e-mail-shell-view-actions.c:985
 msgid "Change the name of this folder"
 msgstr "Den Namen dieses Ordners Ã¤ndern"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:978
+#: ../modules/mail/e-mail-shell-view-actions.c:990
 msgid "Select Message _Thread"
 msgstr "Nachrichten-_Thread auswÃ¤hlen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:980
+#: ../modules/mail/e-mail-shell-view-actions.c:992
 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:985
+#: ../modules/mail/e-mail-shell-view-actions.c:997
 msgid "Select Message S_ubthread"
 msgstr "Nachrichten-_Subthread auswÃ¤hlen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:987
+#: ../modules/mail/e-mail-shell-view-actions.c:999
 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:992
-msgid "_Unsubscribe"
-msgstr "Ab_bestellen"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:994
-msgid "Unsubscribe from the selected folder"
-msgstr "Den gewÃ¤hlten Ordner abbestellen"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:999
+#: ../modules/mail/e-mail-shell-view-actions.c:1011
 msgid "Empty _Trash"
 msgstr "_MÃ¼ll leeren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1001
+#: ../modules/mail/e-mail-shell-view-actions.c:1013
 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:1006
+#: ../modules/mail/e-mail-shell-view-actions.c:1018
 msgid "_New Label"
 msgstr "_Neue Beschriftung"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1015
+#: ../modules/mail/e-mail-shell-view-actions.c:1027
 msgid "N_one"
 msgstr "_Keine"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1038
+#: ../modules/mail/e-mail-shell-view-actions.c:1041
+msgid "_Manage Subscriptions"
+msgstr "Abonnements _verwalten"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1043
+#: ../modules/mail/e-mail-shell-view-actions.c:1099
+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:1064
 msgid "Cancel the current mail operation"
 msgstr "Den momentan ausgefÃ¼hrten E-Mail-Vorgang abbrechen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1043
+#: ../modules/mail/e-mail-shell-view-actions.c:1069
 msgid "Collapse All _Threads"
 msgstr "Alle _Threads einklappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1045
+#: ../modules/mail/e-mail-shell-view-actions.c:1071
 msgid "Collapse all message threads"
 msgstr "Alle Nachrichten-Threads einklappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1050
+#: ../modules/mail/e-mail-shell-view-actions.c:1076
 msgid "E_xpand All Threads"
 msgstr "Alle Threads a_usklappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1052
+#: ../modules/mail/e-mail-shell-view-actions.c:1078
 msgid "Expand all message threads"
 msgstr "Alle Nachrichten-Threads ausklappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1057
+#: ../modules/mail/e-mail-shell-view-actions.c:1083
 msgid "_Message Filters"
 msgstr "Nachrichtenf_ilter"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1059
+#: ../modules/mail/e-mail-shell-view-actions.c:1085
 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:1064
+#: ../modules/mail/e-mail-shell-view-actions.c:1090
 msgid "Search F_olders"
 msgstr "S_uchordner"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1066
+#: ../modules/mail/e-mail-shell-view-actions.c:1092
 msgid "Create or edit search folder definitions"
 msgstr "Suchordner-Definitionen anlegen oder bearbeiten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1071
+#: ../modules/mail/e-mail-shell-view-actions.c:1097
 msgid "_Subscriptions..."
 msgstr "A_bonnements â?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1073
-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:1080
+#: ../modules/mail/e-mail-shell-view-actions.c:1106
 msgid "F_older"
 msgstr "_Ordner"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1087
+#: ../modules/mail/e-mail-shell-view-actions.c:1113
 msgid "_Label"
 msgstr "Bes_chriftung"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1127
+#: ../modules/mail/e-mail-shell-view-actions.c:1153
 msgid "_New Folder..."
 msgstr "Ordner a_nlegen â?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1151
+#: ../modules/mail/e-mail-shell-view-actions.c:1181
 msgid "Show Message _Preview"
 msgstr "Nachrichten_vorschau anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1153
+#: ../modules/mail/e-mail-shell-view-actions.c:1183
 msgid "Show message preview pane"
 msgstr "Nachrichten-Vorschaufenster anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1159
+#: ../modules/mail/e-mail-shell-view-actions.c:1189
 msgid "Show _Deleted Messages"
 msgstr "Gel_Ã¶schte Nachrichten anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1161
+#: ../modules/mail/e-mail-shell-view-actions.c:1191
 msgid "Show deleted messages with a line through them"
 msgstr "GelÃ¶schte Nachrichten (durchgestrichen) anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1167
+#: ../modules/mail/e-mail-shell-view-actions.c:1197
 msgid "_Group By Threads"
 msgstr "Nach Threads _gruppieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1169
+#: ../modules/mail/e-mail-shell-view-actions.c:1199
 msgid "Threaded message list"
 msgstr "Nachrichtenliste nach Threads sortieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1190
+#: ../modules/mail/e-mail-shell-view-actions.c:1220
 msgid "Show message preview below the message list"
 msgstr "Nachrichtenvorschau unter der Nachrichtenliste anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1197
+#: ../modules/mail/e-mail-shell-view-actions.c:1227
 msgid "Show message preview alongside the message list"
 msgstr "Nachrichtenvorschau neben der Nachrichtenliste anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1205
+#: ../modules/mail/e-mail-shell-view-actions.c:1235
 msgid "All Messages"
 msgstr "Alle Nachrichten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1212
+#: ../modules/mail/e-mail-shell-view-actions.c:1242
 msgid "Important Messages"
 msgstr "Wichtige Nachrichten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1219
+#: ../modules/mail/e-mail-shell-view-actions.c:1249
 msgid "Last 5 Days' Messages"
 msgstr "Nachrichten der letzten fÃ¼nf Tage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1226
+#: ../modules/mail/e-mail-shell-view-actions.c:1256
 msgid "Messages Not Junk"
 msgstr "Nachrichten sind nicht unerwÃ¼nscht"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1233
+#: ../modules/mail/e-mail-shell-view-actions.c:1263
 msgid "Messages with Attachments"
 msgstr "Nachrichten mit Anlagen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1240
+#: ../modules/mail/e-mail-shell-view-actions.c:1270
 msgid "No Label"
 msgstr "Keine Beschriftung"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1247
+#: ../modules/mail/e-mail-shell-view-actions.c:1277
 msgid "Read Messages"
 msgstr "Gelesene Nachrichten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1254
+#: ../modules/mail/e-mail-shell-view-actions.c:1284
 msgid "Recent Messages"
 msgstr "Letzte Nachrichten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1261
+#: ../modules/mail/e-mail-shell-view-actions.c:1291
 msgid "Unread Messages"
 msgstr "Ungelesene Nachrichten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1313
+#: ../modules/mail/e-mail-shell-view-actions.c:1343
 msgid "Subject or Addresses contain"
 msgstr "Betreff oder Adresse enthÃ¤lt"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1323
+#: ../modules/mail/e-mail-shell-view-actions.c:1353
 msgid "All Accounts"
 msgstr "Alle Konten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1330
+#: ../modules/mail/e-mail-shell-view-actions.c:1360
 msgid "Current Account"
 msgstr "Derzeitiges Konto"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1337
+#: ../modules/mail/e-mail-shell-view-actions.c:1367
 msgid "Current Folder"
 msgstr "Derzeitiger Ordner"
 
@@ -16195,15 +16102,15 @@ msgid_plural "%d total"
 msgstr[0] "%d insgesamt"
 msgstr[1] "%d insgesamt"
 
-#: ../modules/mail/e-mail-shell-view.c:559
+#: ../modules/mail/e-mail-shell-view.c:557
 msgid "All Account Search"
 msgstr "Alle Konten durchsuchen"
 
-#: ../modules/mail/e-mail-shell-view.c:686
+#: ../modules/mail/e-mail-shell-view.c:740
 msgid "Account Search"
 msgstr "Konto durchsuchen"
 
-#: ../modules/mail/e-mail-shell-view.c:881
+#: ../modules/mail/e-mail-shell-view.c:938
 msgid "Proxy _Logout"
 msgstr "Vertretungsa_bmeldung"
 
@@ -16215,14 +16122,14 @@ msgstr "Evolution-Kontoassistent"
 msgid "Account Editor"
 msgstr "Konteneditor"
 
-#: ../modules/mail/em-composer-prefs.c:505
-#: ../plugins/plugin-manager/plugin-manager.c:349
+#: ../modules/mail/em-composer-prefs.c:500
+#: ../modules/plugin-manager/evolution-plugin-manager.c:357
 #: ../plugins/publish-calendar/publish-calendar.c:827
 #: ../widgets/misc/e-account-tree-view.c:211
 msgid "Enabled"
 msgstr "Aktiv"
 
-#: ../modules/mail/em-composer-prefs.c:509
+#: ../modules/mail/em-composer-prefs.c:504
 msgid "Language(s)"
 msgstr "Sprache(n)"
 
@@ -16242,34 +16149,34 @@ msgstr "Einmal pro Woche"
 msgid "Once per month"
 msgstr "Einmal pro Monat"
 
-#: ../modules/mail/em-mailer-prefs.c:201
+#: ../modules/mail/em-mailer-prefs.c:173
 msgid "Add Custom Junk Header"
 msgstr "Benutzerdefinierte UnerwÃ¼nscht-Kopfzeile hinzufÃ¼gen"
 
-#: ../modules/mail/em-mailer-prefs.c:209
+#: ../modules/mail/em-mailer-prefs.c:181
 msgid "Header Name:"
 msgstr "Name der Kopfzeile:"
 
-#: ../modules/mail/em-mailer-prefs.c:210
+#: ../modules/mail/em-mailer-prefs.c:182
 msgid "Header Value Contains:"
 msgstr "Wert der Kopfzeile enthÃ¤lt:"
 
-#: ../modules/mail/em-mailer-prefs.c:310
+#: ../modules/mail/em-mailer-prefs.c:282
 msgid "Header"
 msgstr "Kopfzeile"
 
-#: ../modules/mail/em-mailer-prefs.c:314
+#: ../modules/mail/em-mailer-prefs.c:286
 msgid "Contains Value"
 msgstr "EnthÃ¤lt Wert"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:707 ../modules/mail/em-mailer-prefs.c:778
+#: ../modules/mail/em-mailer-prefs.c:677 ../modules/mail/em-mailer-prefs.c:748
 #, 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:715 ../modules/mail/em-mailer-prefs.c:787
+#: ../modules/mail/em-mailer-prefs.c:685 ../modules/mail/em-mailer-prefs.c:757
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
@@ -16277,23 +16184,22 @@ msgstr ""
 "%s-Plugin ist nicht verfÃ¼gbar. Bitte prÃ¼fen Sie, ob das zugehÃ¶rige "
 "Programmpaket installiert ist."
 
-#: ../modules/mail/em-mailer-prefs.c:751
+#: ../modules/mail/em-mailer-prefs.c:721
 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:1143
+#: ../modules/mail/em-mailer-prefs.c:1063
 msgid "_Date header:"
 msgstr "_Datum in der Kopfzeile:"
 
-#: ../modules/mail/em-mailer-prefs.c:1144
+#: ../modules/mail/em-mailer-prefs.c:1064
 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 ""
@@ -16306,6 +16212,35 @@ msgstr ""
 msgid "Do you want to make Evolution your default email client?"
 msgstr "MÃ¶chten Sie Evolution zu Ihrer bevorzugten E-Mail-Anwendung machen?"
 
+#: ../modules/plugin-manager/evolution-plugin-manager.c:67
+msgid "Author(s)"
+msgstr "Autor(en)"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:251
+msgid "Plugin Manager"
+msgstr "Plugin-Verwaltung"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:267
+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:296
+msgid "Overview"
+msgstr "Ã?berblick"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:365
+#: ../modules/plugin-manager/evolution-plugin-manager.c:448
+msgid "Plugin"
+msgstr "Plugin"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:486
+msgid "_Plugins"
+msgstr "_Plugins"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:487
+msgid "Enable and disable plugins"
+msgstr "Plugins aktivieren und deaktivieren"
+
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "Hello Python"
@@ -16323,12 +16258,12 @@ msgid "Test Plugin for Python EPlugin loader."
 msgstr "Python-Plugin-Loader."
 
 #: ../modules/startup-wizard/evolution-startup-wizard.c:275
-#: ../widgets/misc/e-import-assistant.c:396
+#: ../widgets/misc/e-import-assistant.c:399
 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:307
-#: ../widgets/misc/e-import-assistant.c:552
+#: ../widgets/misc/e-import-assistant.c:555
 #, c-format
 msgid "From %s:"
 msgstr "Von %s:"
@@ -16356,14 +16291,13 @@ msgstr "Willkommen"
 
 #: ../modules/startup-wizard/evolution-startup-wizard.c:482
 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. "
 
@@ -16377,8 +16311,7 @@ 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"
@@ -16426,16 +16359,16 @@ msgid "Play audio attachments directly in mail messages."
 msgstr "Audio-Anlagen direkt in Nachrichten wiedergeben."
 
 #: ../plugins/backup-restore/backup-restore.c:160
-msgid "Select name of the Evolution backup file"
+msgid "Select name of the Evolution back up file"
 msgstr "Name des Evolution-Sicherungsarchivs auswÃ¤hlen"
 
 #: ../plugins/backup-restore/backup-restore.c:191
-msgid "_Restart Evolution after backup"
+msgid "_Restart Evolution after back up"
 msgstr "Evolution nach Sicherung neu sta_rten"
 
 #: ../plugins/backup-restore/backup-restore.c:217
-msgid "Select name of the Evolution backup file to restore"
-msgstr "Evolution-Sicherungsarchiv zur Wiederherstellung wÃ¤hlen"
+msgid "Select name of the Evolution back up file to restore"
+msgstr "Name des Evolution-Sicherungsarchivs zur Wiederherstellung wÃ¤hlen"
 
 #: ../plugins/backup-restore/backup-restore.c:230
 msgid "_Restart Evolution after restore"
@@ -16443,7 +16376,7 @@ msgstr "Evolution nach Wiederherstellung neu sta_rten"
 
 #: ../plugins/backup-restore/backup-restore.c:298
 msgid ""
-"You can restore Evolution from your backup. It can restore all the Mails, "
+"You can restore Evolution from your back up. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
 "settings, mail filters etc."
 msgstr ""
@@ -16452,7 +16385,7 @@ msgstr ""
 "Einstellungen, Filter etc. kÃ¶nnen wiederhergestellt werden."
 
 #: ../plugins/backup-restore/backup-restore.c:305
-msgid "_Restore Evolution from the backup file"
+msgid "_Restore Evolution from the back up file"
 msgstr "Evolution aus _Sicherungsdatei wiederherstellen"
 
 #: ../plugins/backup-restore/backup-restore.c:312
@@ -16464,22 +16397,22 @@ msgid "Choose a file to restore"
 msgstr "Eine Datei zum Wiederherstellen wÃ¤hlen"
 
 #: ../plugins/backup-restore/backup-restore.c:323
-msgid "Restore from backup"
+msgid "Restore from back up"
 msgstr "Aus Sicherungsdatei wiederherstellen"
 
 #: ../plugins/backup-restore/backup-restore.c:361
-msgid "_Backup Evolution Settings..."
-msgstr "Evolution-Einstellungen sic_hern â?¦"
+msgid "_Back up Evolution Data..."
+msgstr "Evolution-Daten _sichernâ?¦"
 
 #: ../plugins/backup-restore/backup-restore.c:363
-msgid "Backup Evolution data and settings to an archive file"
+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:368
-msgid "R_estore Evolution Settings..."
-msgstr "Evolution-Einstellungen wiederherstell_en â?¦"
+msgid "R_estore Evolution Data..."
+msgstr "Evolution-Daten wi_ederherstellen â?¦"
 
 #: ../plugins/backup-restore/backup-restore.c:370
 msgid "Restore Evolution data and settings from an archive file"
@@ -16487,116 +16420,115 @@ msgstr ""
 "Sichern und Wiederherstellen von Evolution-Daten und Einstellungen aus einer "
 "Archivdatei"
 
-#: ../plugins/backup-restore/backup.c:77
-msgid "Backup Evolution directory"
+#: ../plugins/backup-restore/backup.c:80
+msgid "Back up Evolution directory"
 msgstr "Evolution-Sicherungsordner"
 
-#: ../plugins/backup-restore/backup.c:79
+#: ../plugins/backup-restore/backup.c:82
 msgid "Restore Evolution directory"
 msgstr "Evolution-Wiederherstellungsordner"
 
-#: ../plugins/backup-restore/backup.c:81
-msgid "Check Evolution Backup"
-msgstr "Evolution-Datensicherung"
+#: ../plugins/backup-restore/backup.c:84
+msgid "Check Evolution Back up"
+msgstr "Evolution-Datensicherung Ã¼berprÃ¼fen"
 
-#: ../plugins/backup-restore/backup.c:83
+#: ../plugins/backup-restore/backup.c:86
 msgid "Restart Evolution"
 msgstr "Evolution neu starten"
 
-#: ../plugins/backup-restore/backup.c:85
+#: ../plugins/backup-restore/backup.c:88
 msgid "With Graphical User Interface"
 msgstr "Mit grafischer OberflÃ¤che"
 
-#: ../plugins/backup-restore/backup.c:203
-#: ../plugins/backup-restore/backup.c:265
+#: ../plugins/backup-restore/backup.c:290
+#: ../plugins/backup-restore/backup.c:400
 msgid "Shutting down Evolution"
 msgstr "Evolution wird heruntergefahren"
 
-#: ../plugins/backup-restore/backup.c:210
+#: ../plugins/backup-restore/backup.c:297
 msgid "Backing Evolution accounts and settings"
 msgstr "Sichern der Evolution-Konten und -Einstellungen"
 
-#: ../plugins/backup-restore/backup.c:216
+#: ../plugins/backup-restore/backup.c:305
 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:227
-msgid "Backup complete"
+#: ../plugins/backup-restore/backup.c:318
+msgid "Back up complete"
 msgstr "Sicherung komplett"
 
-#: ../plugins/backup-restore/backup.c:232
-#: ../plugins/backup-restore/backup.c:253
-#: ../plugins/backup-restore/backup.c:299
+#: ../plugins/backup-restore/backup.c:323
+#: ../plugins/backup-restore/backup.c:497
 msgid "Restarting Evolution"
 msgstr "Evolution wird neugestartet"
 
-#: ../plugins/backup-restore/backup.c:269
+#: ../plugins/backup-restore/backup.c:404
 msgid "Back up current Evolution data"
 msgstr "Aktuelle Evolution-Daten sichern"
 
-#: ../plugins/backup-restore/backup.c:274
-msgid "Extracting files from backup"
-msgstr "Dateien aus dem Sicherungsarchiv extrahieren"
+#: ../plugins/backup-restore/backup.c:410
+msgid "Extracting files from back up"
+msgstr "Dateien werden aus dem Sicherungsarchiv entpackt"
 
-#: ../plugins/backup-restore/backup.c:281
+#: ../plugins/backup-restore/backup.c:467
 msgid "Loading Evolution settings"
 msgstr "Evolution-Einstellungen laden"
 
-#: ../plugins/backup-restore/backup.c:288
-msgid "Removing temporary backup files"
-msgstr "Entfernen der temporÃ¤ren Sicherungsdateien"
+#: ../plugins/backup-restore/backup.c:482
+msgid "Removing temporary back up files"
+msgstr "TemporÃ¤re Sicherungsdateien werden entfernt"
 
-#: ../plugins/backup-restore/backup.c:295
+#: ../plugins/backup-restore/backup.c:492
 msgid "Ensuring local sources"
 msgstr "Lokale Quellen sicherstellen"
 
-#: ../plugins/backup-restore/backup.c:464
+#: ../plugins/backup-restore/backup.c:679
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Sichern nach %s"
 
-#: ../plugins/backup-restore/backup.c:469
+#: ../plugins/backup-restore/backup.c:684
 #, 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:491
-msgid "Evolution Backup"
+#: ../plugins/backup-restore/backup.c:706
+msgid "Evolution Back up"
 msgstr "Evolution-Datensicherung"
 
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:706
 msgid "Evolution Restore"
 msgstr "Evolution-Wiederherstellung"
 
-#: ../plugins/backup-restore/backup.c:532
+#: ../plugins/backup-restore/backup.c:747
 msgid "Backing up Evolution Data"
 msgstr "Sichern der Evolution-Daten"
 
-#: ../plugins/backup-restore/backup.c:533
+#: ../plugins/backup-restore/backup.c:748
 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:535
+#: ../plugins/backup-restore/backup.c:750
 msgid "Restoring Evolution Data"
 msgstr "Wiederherstellen der Evolution-Daten"
 
-#: ../plugins/backup-restore/backup.c:536
+#: ../plugins/backup-restore/backup.c:751
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Bitte warten Sie, wÃ¤hrend Evolution Ihre Daten wiederherstellt."
 
-#: ../plugins/backup-restore/backup.c:554
+#: ../plugins/backup-restore/backup.c:769
 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."
 
 #. the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
-msgid "Backup and Restore"
+msgid "Back up and Restore"
 msgstr "Sichern und Wiederherstellen"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-msgid "Backup and restore your Evolution data and settings."
+msgid "Back up and restore your Evolution data and settings."
 msgstr "Sichern und Wiederherstellen von Evolution-Daten und Einstellungen."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
@@ -16605,13 +16537,13 @@ msgstr "Sind Sie sicher, dass Sie Evolution beenden wollen?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
 msgid ""
-"Are you sure you want to restore Evolution from the selected backup file?"
+"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 Backup Evolution"
+msgid "Close and Back up Evolution"
 msgstr "SchlieÃ?en und Evolution-Daten sichern"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
@@ -16623,11 +16555,11 @@ msgid "Insufficient Permissions"
 msgstr "Unzureichende Berechtigungen"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
-msgid "Invalid Evolution backup file"
-msgstr "UngÃ¼ltiges Evolution-Archiv"
+msgid "Invalid Evolution back up file"
+msgstr "UngÃ¼ltiges Evolution-Sicherungsarchiv"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
-msgid "Please select a valid backup file to restore."
+msgid "Please select a valid back up file to restore."
 msgstr "Bitte wÃ¤hlen Sie ein gÃ¼ltiges Evolution-Archiv zur Wiederherstellung."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
@@ -16636,7 +16568,7 @@ msgstr "Der gewÃ¤hlte Ordner ist schreibgeschÃ¼tzt."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
 msgid ""
-"To backup your data and settings, you must first close Evolution. Please "
+"To back up your data and settings, you must first close Evolution. Please "
 "make sure that you save any unsaved data before proceeding."
 msgstr ""
 "Um Ihre Daten und Einstellungen zu sichern, mÃ¼ssen Sie zuerst Evolution "
@@ -16647,14 +16579,14 @@ msgstr ""
 msgid ""
 "To restore your data and settings, you must first close Evolution. Please "
 "make sure that you save any unsaved data before proceeding. This will delete "
-"all your current Evolution data and settings and restore them from your "
-"backup."
+"all your current Evolution data and settings and restore them from your back "
+"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/org-gnome-evolution-bbdb.eplug.xml.h:1
@@ -16709,33 +16641,33 @@ msgstr ""
 "Nachrichten geantwortet wird und fÃ¼gt auch Instant-Messaging-"
 "Kontaktinformationen aus Ihren Buddy-Listen hinzu."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:154
+#: ../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:158
+#: ../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:187
+#: ../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:189
+#: ../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:212
+#: ../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:397
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:406
 msgid "Convert message text to _Unicode"
 msgstr "Nachrichtentext nach _Unicode konvertieren"
 
@@ -16866,6 +16798,13 @@ msgstr "_Adresse:"
 msgid "Use _SSL"
 msgstr "_SSL verwenden"
 
+#: ../plugins/caldav/caldav-source.c:225
+#: ../plugins/google-account-setup/google-contacts-source.c:286
+#: ../plugins/google-account-setup/google-source.c:623
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
+msgid "User_name:"
+msgstr "_Benutzername:"
+
 #: ../plugins/caldav/caldav-source.c:235
 msgid "Brows_e server for a calendar"
 msgstr "Server nach einem Kal_ender durchsuchen"
@@ -17017,8 +16956,7 @@ 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."
+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"
@@ -17160,7 +17098,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:126
+#: ../plugins/external-editor/external-editor.c:129
 msgid "Automatically launch when a new mail is edited"
 msgstr "Automatisch beim Bearbeiten einer neuen E-Mail starten"
 
@@ -17173,11 +17111,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:115
+#: ../plugins/external-editor/external-editor.c:118
 msgid "Command to be executed to launch the editor: "
 msgstr "AuszufÃ¼hrender Befehl, um den Editor zu starten:"
 
-#: ../plugins/external-editor/external-editor.c:116
+#: ../plugins/external-editor/external-editor.c:119
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -17185,8 +17123,8 @@ msgstr ""
 "Verwenden Sie Â»xemacsÂ« fÃ¼r Emacs\n"
 "Verwenden Sie Â»gvim -fÂ« fÃ¼r VI"
 
-#: ../plugins/external-editor/external-editor.c:382
-#: ../plugins/external-editor/external-editor.c:384
+#: ../plugins/external-editor/external-editor.c:385
+#: ../plugins/external-editor/external-editor.c:387
 msgid "Compose in External Editor"
 msgstr "Im externen Editor verfassen"
 
@@ -17196,8 +17134,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"
@@ -17209,8 +17146,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."
@@ -17232,8 +17168,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"
@@ -17321,7 +17257,7 @@ msgstr ""
 
 #: ../plugins/google-account-setup/google-source.c:548
 #: ../plugins/mail-to-task/mail-to-task.c:737
-#: ../plugins/mail-to-task/mail-to-task.c:953
+#: ../plugins/mail-to-task/mail-to-task.c:956
 msgid "Unknown error."
 msgstr "Unbekannter Fehler."
 
@@ -17373,12 +17309,12 @@ msgstr "VorlÃ¤ufig annehmen"
 msgid "Rese_nd Meeting..."
 msgstr "Besprechung er_neut versenden â?¦"
 
-#: ../plugins/groupwise-features/install-shared.c:165
-#: ../plugins/groupwise-features/share-folder-common.c:342
+#: ../plugins/groupwise-features/install-shared.c:170
+#: ../plugins/groupwise-features/share-folder-common.c:347
 msgid "Create folder"
 msgstr "Ordner anlegen"
 
-#: ../plugins/groupwise-features/install-shared.c:217
+#: ../plugins/groupwise-features/install-shared.c:222
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17403,11 +17339,11 @@ msgstr ""
 "Klicken Sie auf Â»AnwendenÂ«, um den gemeinsamen Ordner einzurichten\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:229
+#: ../plugins/groupwise-features/install-shared.c:234
 msgid "Install the shared folder"
 msgstr "Gemeinsamen Ordner einrichten"
 
-#: ../plugins/groupwise-features/install-shared.c:233
+#: ../plugins/groupwise-features/install-shared.c:238
 msgid "Shared Folder Installation"
 msgstr "Einrichten von Gemeinsamen Ordnern"
 
@@ -17437,7 +17373,7 @@ msgid "_Junk List"
 msgstr "_UnerwÃ¼nscht-Liste"
 
 #: ../plugins/groupwise-features/junk-settings.ui.h:8
-#: ../plugins/groupwise-features/properties.ui.h:13
+#: ../plugins/groupwise-features/properties.ui.h:12
 #: ../widgets/table/e-table-config.ui.h:21
 msgid "_Remove"
 msgstr "_Entfernen"
@@ -17448,8 +17384,8 @@ 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?"
+"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?"
@@ -17466,6 +17402,11 @@ msgstr ""
 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"
@@ -17529,8 +17470,8 @@ msgstr "Sie haben diesem Benutzer bereits Zugriff auf den Proxy gewÃ¤hrt."
 #: ../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."
+"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;"
@@ -17595,30 +17536,22 @@ msgstr "Benachrichtigung an_passen"
 msgid "Con_tacts..."
 msgstr "Kon_takte â?¦"
 
-#: ../plugins/groupwise-features/properties.ui.h:5
+#: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Shared Folder Notification"
 msgstr "Benachrichtigung zur Ordnerfreigabe"
 
-#: ../plugins/groupwise-features/properties.ui.h:7
-msgid "The participants will receive the following notification.\n"
-msgstr "Die berechtigten Nutzer werden folgende Benachrichtigung erhalten.\n"
-
-#: ../plugins/groupwise-features/properties.ui.h:9
+#: ../plugins/groupwise-features/properties.ui.h:8
 msgid "Users:"
 msgstr "Benutzer:"
 
-#: ../plugins/groupwise-features/properties.ui.h:12
+#: ../plugins/groupwise-features/properties.ui.h:11
 msgid "_Not Shared"
 msgstr "_Nicht freigeben"
 
-#: ../plugins/groupwise-features/properties.ui.h:14
+#: ../plugins/groupwise-features/properties.ui.h:13
 msgid "_Shared With..."
 msgstr "_Freigegeben fÃ¼r â?¦"
 
-#: ../plugins/groupwise-features/properties.ui.h:15
-msgid "_Sharing"
-msgstr "_Freigeben"
-
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:1
 msgid "Access Rights"
 msgstr "Zugriffsrechte"
@@ -17697,7 +17630,7 @@ msgid "Proxy"
 msgstr "Proxy"
 
 #: ../plugins/groupwise-features/proxy.c:926
-#: ../plugins/groupwise-features/share-folder.c:691
+#: ../plugins/groupwise-features/share-folder.c:692
 msgid "Add User"
 msgstr "Benutzer hinzufÃ¼gen"
 
@@ -17705,77 +17638,77 @@ msgstr "Benutzer hinzufÃ¼gen"
 msgid "Advanced send options"
 msgstr "Erweiterte Versandoptionen"
 
-#: ../plugins/groupwise-features/share-folder-common.c:310
-#: ../plugins/groupwise-features/share-folder.c:726
+#: ../plugins/groupwise-features/share-folder-common.c:315
+#: ../plugins/groupwise-features/share-folder.c:727
 msgid "Users"
 msgstr "Benutzer"
 
-#: ../plugins/groupwise-features/share-folder-common.c:311
+#: ../plugins/groupwise-features/share-folder-common.c:316
 msgid "Enter the users and set permissions"
 msgstr "Eingabe der Benutzer und Festlegen der Rechte"
 
-#: ../plugins/groupwise-features/share-folder-common.c:407
+#: ../plugins/groupwise-features/share-folder-common.c:412
 msgid "Sharing"
 msgstr "Freigeben"
 
-#: ../plugins/groupwise-features/share-folder.c:529
+#: ../plugins/groupwise-features/share-folder.c:530
 msgid "Custom Notification"
 msgstr "Eigene Benachrichtigung"
 
-#: ../plugins/groupwise-features/share-folder.c:731
+#: ../plugins/groupwise-features/share-folder.c:732
 msgid "Add   "
 msgstr "HinzufÃ¼gen   "
 
-#: ../plugins/groupwise-features/share-folder.c:737
+#: ../plugins/groupwise-features/share-folder.c:738
 msgid "Modify"
 msgstr "Ã?ndern"
 
-#: ../plugins/groupwise-features/status-track.c:123
+#: ../plugins/groupwise-features/status-track.c:125
 msgid "Message Status"
 msgstr "Nachrichtenstatus"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:137
+#: ../plugins/groupwise-features/status-track.c:139
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: ../plugins/groupwise-features/status-track.c:151
+#: ../plugins/groupwise-features/status-track.c:153
 msgid "From:"
 msgstr "Von:"
 
-#: ../plugins/groupwise-features/status-track.c:166
+#: ../plugins/groupwise-features/status-track.c:168
 msgid "Creation date:"
 msgstr "Erstellungsdatum:"
 
-#: ../plugins/groupwise-features/status-track.c:206
+#: ../plugins/groupwise-features/status-track.c:208
 msgid "Recipient: "
 msgstr "EmpfÃ¤nger: "
 
-#: ../plugins/groupwise-features/status-track.c:213
+#: ../plugins/groupwise-features/status-track.c:215
 msgid "Delivered: "
 msgstr "Zugestellt: "
 
-#: ../plugins/groupwise-features/status-track.c:219
+#: ../plugins/groupwise-features/status-track.c:221
 msgid "Opened: "
 msgstr "GeÃ¶ffnet: "
 
-#: ../plugins/groupwise-features/status-track.c:224
+#: ../plugins/groupwise-features/status-track.c:226
 msgid "Accepted: "
 msgstr "Angenommen: "
 
-#: ../plugins/groupwise-features/status-track.c:229
+#: ../plugins/groupwise-features/status-track.c:231
 msgid "Deleted: "
 msgstr "GelÃ¶scht: "
 
-#: ../plugins/groupwise-features/status-track.c:234
+#: ../plugins/groupwise-features/status-track.c:236
 msgid "Declined: "
 msgstr "Abgelehnt: "
 
-#: ../plugins/groupwise-features/status-track.c:239
+#: ../plugins/groupwise-features/status-track.c:241
 msgid "Completed: "
 msgstr "Abgeschlossen: "
 
-#: ../plugins/groupwise-features/status-track.c:244
+#: ../plugins/groupwise-features/status-track.c:246
 msgid "Undelivered: "
 msgstr "Nicht zugestellt: "
 
@@ -17841,147 +17774,147 @@ 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:486
 #, 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:649
+#: ../plugins/itip-formatter/itip-formatter.c:650
 #, 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:685
+#: ../plugins/itip-formatter/itip-formatter.c:686
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Der Termin wurde im Kalender Â»%sÂ« gefunden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:784
+#: ../plugins/itip-formatter/itip-formatter.c:785
 msgid "Unable to find any calendars"
 msgstr "Es wurden keine Kalender gefunden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:791
+#: ../plugins/itip-formatter/itip-formatter.c:792
 msgid "Unable to find this meeting in any calendar"
 msgstr "Diese Besprechung wurde in keinem Kalender gefunden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:795
+#: ../plugins/itip-formatter/itip-formatter.c:796
 msgid "Unable to find this task in any task list"
 msgstr "Diese Aufgabe wurde in keiner Aufgabenliste gefunden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:799
+#: ../plugins/itip-formatter/itip-formatter.c:800
 msgid "Unable to find this memo in any memo list"
 msgstr "Diese Notiz wurde in keiner Notizliste gefunden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:873
+#: ../plugins/itip-formatter/itip-formatter.c:876
 msgid "Opening the calendar. Please wait.."
 msgstr "Kalender wird geÃ¶ffnet. Bitte warten â?¦"
 
-#: ../plugins/itip-formatter/itip-formatter.c:876
+#: ../plugins/itip-formatter/itip-formatter.c:879
 msgid "Searching for an existing version of this appointment"
 msgstr "Eine bestehende Version dieses Termins wird gesucht"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1057
+#: ../plugins/itip-formatter/itip-formatter.c:1162
 msgid "Unable to parse item"
 msgstr "Element kann nicht analysiert werden"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1144
+#: ../plugins/itip-formatter/itip-formatter.c:1251
 #, 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:1156
+#: ../plugins/itip-formatter/itip-formatter.c:1263
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "In Kalender Â»%sÂ« als Â»AngenommenÂ« eingetragen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:1267
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "In Kalender Â»%sÂ« als Â»VorlÃ¤ufig angenommenÂ« eingetragen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1165
+#: ../plugins/itip-formatter/itip-formatter.c:1272
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "In Kalender Â»%sÂ« als Â»AbgelehntÂ« eingetragen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1170
+#: ../plugins/itip-formatter/itip-formatter.c:1277
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "In Kalender Â»%sÂ« als Â»AbgesagtÂ« eingetragen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1264
+#: ../plugins/itip-formatter/itip-formatter.c:1371
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Der Organisator hat den Vertreter %s entfernt "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1271
+#: ../plugins/itip-formatter/itip-formatter.c:1378
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Dem Vertreter wurde eine Absagenachricht zugestellt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1380
 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:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1491
 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:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1520
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Teilnehmer konnte nicht aktualisiert werden. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1524
 msgid "Attendee status updated"
 msgstr "Teilnehmerstatus aktualisiert"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1443
+#: ../plugins/itip-formatter/itip-formatter.c:1550
 msgid "Meeting information sent"
 msgstr "Besprechungsinformationen wurden verschickt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1446
+#: ../plugins/itip-formatter/itip-formatter.c:1553
 msgid "Task information sent"
 msgstr "Aufgabeninformationen wurden verschickt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1556
 msgid "Memo information sent"
 msgstr "Notizinformationen wurden verschickt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1458
+#: ../plugins/itip-formatter/itip-formatter.c:1565
 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:1461
+#: ../plugins/itip-formatter/itip-formatter.c:1568
 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:1464
+#: ../plugins/itip-formatter/itip-formatter.c:1571
 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:1529
+#: ../plugins/itip-formatter/itip-formatter.c:1636
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1534
+#: ../plugins/itip-formatter/itip-formatter.c:1641
 msgid "Save Calendar"
 msgstr "Kalender speichern"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1586
-#: ../plugins/itip-formatter/itip-formatter.c:1597
+#: ../plugins/itip-formatter/itip-formatter.c:1693
+#: ../plugins/itip-formatter/itip-formatter.c:1704
 msgid "The calendar attached is not valid"
 msgstr "Der beigelegte Kalender ist ungÃ¼ltig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1587
-#: ../plugins/itip-formatter/itip-formatter.c:1598
+#: ../plugins/itip-formatter/itip-formatter.c:1694
+#: ../plugins/itip-formatter/itip-formatter.c:1705
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17989,15 +17922,15 @@ msgstr ""
 "Die Nachricht gibt an, einen Kalender zu enthalten. Dieser Kalender ist "
 "jedoch kein gÃ¼ltiger iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1638
-#: ../plugins/itip-formatter/itip-formatter.c:1666
-#: ../plugins/itip-formatter/itip-formatter.c:1775
+#: ../plugins/itip-formatter/itip-formatter.c:1745
+#: ../plugins/itip-formatter/itip-formatter.c:1773
+#: ../plugins/itip-formatter/itip-formatter.c:1882
 msgid "The item in the calendar is not valid"
 msgstr "Das Element im Kalender ist ungÃ¼ltig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1639
-#: ../plugins/itip-formatter/itip-formatter.c:1667
-#: ../plugins/itip-formatter/itip-formatter.c:1776
+#: ../plugins/itip-formatter/itip-formatter.c:1746
+#: ../plugins/itip-formatter/itip-formatter.c:1774
+#: ../plugins/itip-formatter/itip-formatter.c:1883
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18005,11 +17938,11 @@ msgstr ""
 "Die Nachricht enthÃ¤lt einen Kalender. Dieser beinhaltet allerdings keine "
 "Ereignisse, Aufgaben oder VerfÃ¼gbarkeitsinformationen."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1680
+#: ../plugins/itip-formatter/itip-formatter.c:1787
 msgid "The calendar attached contains multiple items"
 msgstr "Der beigelegte Kalender enthÃ¤lt mehrere Elemente."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1681
+#: ../plugins/itip-formatter/itip-formatter.c:1788
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18017,31 +17950,31 @@ msgstr ""
 "Um alle diese Elemente weiterzuverarbeiten, sollte die Datei gespeichert und "
 "der Kalender importiert werden."
 
-#: ../plugins/itip-formatter/itip-formatter.c:2454
+#: ../plugins/itip-formatter/itip-formatter.c:2563
 msgid "This meeting recurs"
 msgstr "Diese Besprechung wird wiederholt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2457
+#: ../plugins/itip-formatter/itip-formatter.c:2566
 msgid "This task recurs"
 msgstr "Diese Aufgabe wird wiederholt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2460
+#: ../plugins/itip-formatter/itip-formatter.c:2569
 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:2694
+#: ../plugins/itip-formatter/itip-formatter.c:2803
 msgid "_Delete message after acting"
 msgstr "_LÃ¶schen der Nachricht nach Abarbeitung"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2704
-#: ../plugins/itip-formatter/itip-formatter.c:2737
+#: ../plugins/itip-formatter/itip-formatter.c:2813
+#: ../plugins/itip-formatter/itip-formatter.c:2846
 msgid "Conflict Search"
 msgstr "Konfliktsuche"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2719
+#: ../plugins/itip-formatter/itip-formatter.c:2828
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Kalender zur Suche nach Besprechungskonflikten auswÃ¤hlen"
 
@@ -18415,7 +18348,7 @@ msgstr "Anfangsdatum:"
 
 #. Start time
 #: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1053
+#: ../plugins/itip-formatter/itip-view.c:1054
 msgid "Start time:"
 msgstr "Anfangszeit:"
 
@@ -18425,7 +18358,7 @@ msgstr "Enddatum:"
 
 #. End time
 #: ../plugins/itip-formatter/itip-view.c:710
-#: ../plugins/itip-formatter/itip-view.c:1064
+#: ../plugins/itip-formatter/itip-view.c:1065
 msgid "End time:"
 msgstr "Endzeit:"
 
@@ -18484,41 +18417,41 @@ msgid "_Update"
 msgstr "A_ktualisieren"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1084
-#: ../plugins/itip-formatter/itip-view.c:1138
+#: ../plugins/itip-formatter/itip-view.c:1085
+#: ../plugins/itip-formatter/itip-view.c:1139
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: ../plugins/itip-formatter/itip-view.c:1123
+#: ../plugins/itip-formatter/itip-view.c:1124
 msgid "Send _reply to sender"
 msgstr "_Antwort an Absender"
 
-#: ../plugins/itip-formatter/itip-view.c:1153
+#: ../plugins/itip-formatter/itip-view.c:1154
 msgid "Send _updates to attendees"
 msgstr "Akt_ualisierungen an die Teilnehmer verschicken"
 
-#: ../plugins/itip-formatter/itip-view.c:1162
+#: ../plugins/itip-formatter/itip-view.c:1163
 msgid "_Apply to all instances"
 msgstr "Auf alle _Instanzen anwenden"
 
-#: ../plugins/itip-formatter/itip-view.c:1171
+#: ../plugins/itip-formatter/itip-view.c:1172
 msgid "Show time as _free"
 msgstr "Zeit als _frei anzeigen"
 
-#: ../plugins/itip-formatter/itip-view.c:1174
+#: ../plugins/itip-formatter/itip-view.c:1175
 msgid "_Preserve my reminder"
 msgstr "_Erinnerung aufbewahren"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1180
+#: ../plugins/itip-formatter/itip-view.c:1181
 msgid "_Inherit reminder"
 msgstr "Erinnerung Ã¼bernehmen"
 
-#: ../plugins/itip-formatter/itip-view.c:1923
+#: ../plugins/itip-formatter/itip-view.c:1924
 msgid "_Tasks:"
 msgstr "Auf_gaben:"
 
-#: ../plugins/itip-formatter/itip-view.c:1925
+#: ../plugins/itip-formatter/itip-view.c:1926
 msgid "_Memos:"
 msgstr "_Notizen:"
 
@@ -18568,8 +18501,8 @@ 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
 msgid "Notify new messages for Inbox only."
@@ -18591,8 +18524,7 @@ msgstr "Popup-Fenster zusammen mit dem Symbol anzeigen."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 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
 msgid "Sound file name to be played."
@@ -18728,8 +18660,8 @@ msgstr "Erstellt aus einer Nachricht an %s"
 #: ../plugins/mail-to-task/mail-to-task.c:490
 #, 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?"
@@ -18737,8 +18669,8 @@ msgstr ""
 #: ../plugins/mail-to-task/mail-to-task.c:493
 #, 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?"
@@ -18746,8 +18678,8 @@ msgstr ""
 #: ../plugins/mail-to-task/mail-to-task.c:496
 #, 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?"
@@ -18757,8 +18689,8 @@ msgstr ""
 #. feel is most appropriate for your language.
 #: ../plugins/mail-to-task/mail-to-task.c:516
 msgid ""
-"Selected calendar contains some events for the given mails already. Would "
-"you like to create new events anyway?"
+"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?"
@@ -18768,8 +18700,8 @@ msgstr ""
 #. feel is most appropriate for your language.
 #: ../plugins/mail-to-task/mail-to-task.c:522
 msgid ""
-"Selected task list contains some tasks for the given mails already. Would "
-"you like to create new tasks anyway?"
+"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?"
@@ -18779,8 +18711,8 @@ msgstr ""
 #. feel is most appropriate for your language.
 #: ../plugins/mail-to-task/mail-to-task.c:528
 msgid ""
-"Selected memo list contains some memos for the given mails already. Would "
-"you like to create new memos anyway?"
+"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?"
@@ -18793,8 +18725,8 @@ 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?"
+"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?"
@@ -18807,11 +18739,11 @@ msgstr[1] ""
 #. 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?"
+"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?"
+"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?"
@@ -18824,11 +18756,11 @@ msgstr[1] ""
 #. 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?"
+"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?"
+"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?"
@@ -18878,40 +18810,40 @@ msgstr ""
 "Die gewÃ¤hlte Quelle ist schreibgeschÃ¼tzt, daher kann keine neue Notiz "
 "erstellt werden. Bitte wÃ¤hlen Sie eine andere Quelle aus."
 
-#: ../plugins/mail-to-task/mail-to-task.c:953
+#: ../plugins/mail-to-task/mail-to-task.c:956
 #, 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:1072
+#: ../plugins/mail-to-task/mail-to-task.c:1075
 msgid "Create an _Event"
 msgstr "Ein _Ereignis anlegen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1074
+#: ../plugins/mail-to-task/mail-to-task.c:1077
 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:1079
+#: ../plugins/mail-to-task/mail-to-task.c:1082
 msgid "Create a Mem_o"
 msgstr "Eine _Notiz anlegen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1081
+#: ../plugins/mail-to-task/mail-to-task.c:1084
 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:1086
+#: ../plugins/mail-to-task/mail-to-task.c:1089
 msgid "Create a _Task"
 msgstr "Eine _Aufgabe anlegen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1088
+#: ../plugins/mail-to-task/mail-to-task.c:1091
 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:1096
+#: ../plugins/mail-to-task/mail-to-task.c:1099
 msgid "Create a _Meeting"
 msgstr "Eine _Besprechung anlegen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1098
+#: ../plugins/mail-to-task/mail-to-task.c:1101
 msgid "Create a new meeting from the selected message"
 msgstr "Eine neue Besprechung mit Hilfe der gewÃ¤hlten Nachricht anlegen"
 
@@ -19016,9 +18948,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?"
@@ -19026,8 +18958,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 ""
@@ -19049,8 +18981,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."
@@ -19083,7 +19014,7 @@ msgstr "Im derzeitigen Ordner und in _Unterordnern"
 msgid "In Current _Folder Only"
 msgstr "Nur im _derzeitigen Ordner"
 
-#: ../plugins/mark-all-read/mark-all-read.c:439
+#: ../plugins/mark-all-read/mark-all-read.c:443
 msgid "Mark Me_ssages as Read"
 msgstr "Nachrichten als gelesen _markieren"
 
@@ -19095,40 +19026,6 @@ msgstr "Alles als gelesen markieren"
 msgid "Mark all messages in a folder as read."
 msgstr "Alle Nachrichten in einem Ordner als gelesen markieren"
 
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
-msgid "Manage your Evolution plugins."
-msgstr "Die Plugins fÃ¼r Evolution verwalten."
-
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:244
-msgid "Plugin Manager"
-msgstr "Plugin-Verwaltung"
-
-#: ../plugins/plugin-manager/plugin-manager.c:59
-msgid "Author(s)"
-msgstr "Autor(en)"
-
-#: ../plugins/plugin-manager/plugin-manager.c:259
-msgid "Note: Some changes will not take effect until restart"
-msgstr "Hinweis: Einige Ã?nderungen werden erst nach einem Neustart wirksam."
-
-#: ../plugins/plugin-manager/plugin-manager.c:285
-msgid "Overview"
-msgstr "Ã?berblick"
-
-#: ../plugins/plugin-manager/plugin-manager.c:356
-#: ../plugins/plugin-manager/plugin-manager.c:418
-msgid "Plugin"
-msgstr "Plugin"
-
-#: ../plugins/plugin-manager/plugin-manager.c:430
-msgid "_Plugins"
-msgstr "_Plugins"
-
-#: ../plugins/plugin-manager/plugin-manager.c:432
-msgid "Enable and disable plugins"
-msgstr "Plugins aktivieren und deaktivieren"
-
 #. but then we also need to create our own section frame
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
 msgid "Plain Text Mode"
@@ -19142,19 +19039,19 @@ msgstr "Einfachen Text bevorzugen"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "Nachrichten als einfachen Text anzeigen, auch wenn sie HTML sind"
 
-#: ../plugins/prefer-plain/prefer-plain.c:198
+#: ../plugins/prefer-plain/prefer-plain.c:214
 msgid "Show HTML if present"
 msgstr "HTML anzeigen, wenn vorhanden"
 
-#: ../plugins/prefer-plain/prefer-plain.c:198
+#: ../plugins/prefer-plain/prefer-plain.c:214
 msgid "Let Evolution choose the best part to show."
 msgstr "Evolution den besten Teil zur Anzeige auswÃ¤hlen lassen."
 
-#: ../plugins/prefer-plain/prefer-plain.c:199
+#: ../plugins/prefer-plain/prefer-plain.c:215
 msgid "Show plain text if present"
 msgstr "Klartext anzeigen, wenn vorhanden"
 
-#: ../plugins/prefer-plain/prefer-plain.c:199
+#: ../plugins/prefer-plain/prefer-plain.c:215
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
@@ -19162,11 +19059,11 @@ msgstr ""
 "Klartext-Teil anzeigen, wenn verfÃ¼gbar, ansonsten Evolution den besten Teil "
 "zur Anzeige auswÃ¤hlen lassen."
 
-#: ../plugins/prefer-plain/prefer-plain.c:200
+#: ../plugins/prefer-plain/prefer-plain.c:216
 msgid "Only ever show plain text"
 msgstr "Immer als einfachen Text anzeigen"
 
-#: ../plugins/prefer-plain/prefer-plain.c:200
+#: ../plugins/prefer-plain/prefer-plain.c:216
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
@@ -19174,11 +19071,11 @@ msgstr ""
 "Immer den Klartext-Teil anzeigen und aus anderen Teilen AnhÃ¤nge erstellen, "
 "wenn erforderlich."
 
-#: ../plugins/prefer-plain/prefer-plain.c:247
+#: ../plugins/prefer-plain/prefer-plain.c:263
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "_UnterdrÃ¼ckte HTML-Teile als AnhÃ¤nge anzeigen"
 
-#: ../plugins/prefer-plain/prefer-plain.c:267
+#: ../plugins/prefer-plain/prefer-plain.c:283
 msgid "HTML _Mode"
 msgstr "HTML-_Modus"
 
@@ -19203,35 +19100,35 @@ msgstr "Outlook PST-Importeur"
 msgid "Outlook personal folders (.pst)"
 msgstr "PersÃ¶nliche Outlook-Ordner (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:295
+#: ../plugins/pst-import/pst-importer.c:297
 msgid "_Mail"
 msgstr "_E-Mail"
 
-#: ../plugins/pst-import/pst-importer.c:307
+#: ../plugins/pst-import/pst-importer.c:309
 msgid "Destination folder:"
 msgstr "Zielordner:"
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:313
+#: ../plugins/pst-import/pst-importer.c:315
 msgid "_Address Book"
 msgstr "_Adressbuch"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:320
+#: ../plugins/pst-import/pst-importer.c:322
 msgid "A_ppointments"
 msgstr "_Termine"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:326 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:328 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Aufgaben"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:332
+#: ../plugins/pst-import/pst-importer.c:334
 msgid "_Journal entries"
 msgstr "_Journal-EintrÃ¤ge"
 
-#: ../plugins/pst-import/pst-importer.c:347
+#: ../plugins/pst-import/pst-importer.c:349
 msgid "Importing Outlook data"
 msgstr "Outlook-Daten werden importiert"
 
@@ -19399,47 +19296,47 @@ msgstr "Neuer Ort"
 msgid "Edit Location"
 msgstr "Ort bearbeiten"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:121
+#: ../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:129
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:137
+#: ../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:176
+#: ../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:232
+#: ../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:234
+#: ../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:243
+#: ../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:506
+#: ../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:927
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:940
 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:935
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:948
 msgid "I_nclude remote tests"
 msgstr "ZusÃ¤tzliche _Ferntests durchfÃ¼hren"
 
@@ -19541,8 +19438,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.
@@ -19577,23 +19473,6 @@ msgstr "Die gewÃ¤hlte Notizliste auf einem DatentrÃ¤ger speichern"
 msgid "Save the selected task list to disk"
 msgstr "Die gewÃ¤hlte Aufgabenliste auf einem DatentrÃ¤ger speichern."
 
-#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
-msgid "Sort mail message threads by subject."
-msgstr "Nachrichtenthreads nach ihrem Betreff sortieren."
-
-#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
-msgid "Subject Threading"
-msgstr "Betreffsbezogenes Threading"
-
-#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
-msgid "Thread messages by subject"
-msgstr "Betreffsbezogenes Threading der Nachrichten"
-
-#. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:63
-msgid "F_all back to threading messages by subject"
-msgstr "ZurÃ¼ckfallen auf be_treffsbezogenes Threading der Nachrichten"
-
 #: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
 msgid ""
 "List of keyword/value pairs for the Templates plugin to substitute in a "
@@ -19606,15 +19485,15 @@ msgstr ""
 msgid "Drafts based template plugin"
 msgstr "Vorlagen-Plugin basierend auf EntwÃ¼rfen"
 
-#: ../plugins/templates/templates.c:621
+#: ../plugins/templates/templates.c:625
 msgid "No Title"
 msgstr "Kein Titel"
 
-#: ../plugins/templates/templates.c:715
+#: ../plugins/templates/templates.c:719
 msgid "Save as _Template"
 msgstr "Als V_orlage speichern"
 
-#: ../plugins/templates/templates.c:717
+#: ../plugins/templates/templates.c:721
 msgid "Save as Template"
 msgstr "Als Vorlage speichern"
 
@@ -19634,27 +19513,27 @@ msgstr "Eingebettete vCards"
 msgid "Show vCards directly in mail messages."
 msgstr "vCards innerhalb von Nachrichten anzeigen."
 
-#: ../plugins/vcard-inline/vcard-inline.c:181
-#: ../plugins/vcard-inline/vcard-inline.c:266
+#: ../plugins/vcard-inline/vcard-inline.c:182
+#: ../plugins/vcard-inline/vcard-inline.c:267
 msgid "Show Full vCard"
 msgstr "Gesamte VCard anzeigen"
 
-#: ../plugins/vcard-inline/vcard-inline.c:184
+#: ../plugins/vcard-inline/vcard-inline.c:185
 msgid "Show Compact vCard"
 msgstr "Kompakt-VCard anzeigen"
 
-#: ../plugins/vcard-inline/vcard-inline.c:245
+#: ../plugins/vcard-inline/vcard-inline.c:246
 msgid "There is one other contact."
 msgstr "Es gibt einen weiteren Kontakt."
 
-#: ../plugins/vcard-inline/vcard-inline.c:254
+#: ../plugins/vcard-inline/vcard-inline.c:255
 #, 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:275
+#: ../plugins/vcard-inline/vcard-inline.c:276
 msgid "Save in Address Book"
 msgstr "In Adressbuch speichern"
 
@@ -19854,8 +19733,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."
@@ -19903,8 +19782,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 ""
@@ -19925,12 +19804,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 ""
@@ -20011,19 +19890,19 @@ msgstr "Suche speichern"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:929
+#: ../shell/e-shell-searchbar.c:932
 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:960
+#: ../shell/e-shell-searchbar.c:963
 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:1021
+#: ../shell/e-shell-searchbar.c:1024
 msgid "i_n"
 msgstr " _in "
 
@@ -20341,15 +20220,15 @@ msgstr "%s - Evolution"
 msgid "New"
 msgstr "Neu"
 
-#: ../shell/e-shell.c:244
+#: ../shell/e-shell.c:247
 msgid "Preparing to go offline..."
 msgstr "Offline-Betrieb wird vorbereitet â?¦"
 
-#: ../shell/e-shell.c:294
+#: ../shell/e-shell.c:300
 msgid "Preparing to go online..."
 msgstr "Online-Betrieb wird vorbereitet â?¦"
 
-#: ../shell/e-shell.c:353
+#: ../shell/e-shell.c:362
 msgid "Preparing to quit..."
 msgstr "Beenden wird vorbereitet â?¦"
 
@@ -20445,11 +20324,11 @@ msgstr "Die Adressen oder Dateinamen in den restlichen Argumenten importieren."
 msgid "Request a running Evolution process to quit"
 msgstr "Einen laufenden Evolution-Prozess zum Beenden auffordern"
 
-#: ../shell/main.c:501 ../shell/main.c:509
+#: ../shell/main.c:507 ../shell/main.c:515
 msgid "- The Evolution PIM and Email Client"
 msgstr "â?? Die Evolution PIM- und E-Mail-Anwendung"
 
-#: ../shell/main.c:571
+#: ../shell/main.c:577
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20474,8 +20353,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 "
@@ -20506,8 +20385,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"
@@ -20542,29 +20420,29 @@ msgstr "Datei ist keine gÃ¼ltige *.desktop-Datei"
 msgid "Unrecognized desktop file Version '%s'"
 msgstr "Unbekannte Version der *.desktop-Datei Â»%sÂ«"
 
-#: ../smclient/eggdesktopfile.c:958
+#: ../smclient/eggdesktopfile.c:957
 #, c-format
 msgid "Starting %s"
 msgstr "%s wird gestartet"
 
-#: ../smclient/eggdesktopfile.c:1100
+#: ../smclient/eggdesktopfile.c:1098
 #, c-format
 msgid "Application does not accept documents on command line"
 msgstr "Anwendung akzeptiert keine Dokumente auf der Befehlszeile"
 
-#: ../smclient/eggdesktopfile.c:1168
+#: ../smclient/eggdesktopfile.c:1166
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr "Unbekannte Startoption: %d"
 
-#: ../smclient/eggdesktopfile.c:1373
+#: ../smclient/eggdesktopfile.c:1365
 #, c-format
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
 msgstr ""
 "Dokumentadressen kÃ¶nnen nicht an einen Desktop-Eintrag Â»Type=LinkÂ« Ã¼bergeben "
 "werden"
 
-#: ../smclient/eggdesktopfile.c:1394
+#: ../smclient/eggdesktopfile.c:1386
 #, c-format
 msgid "Not a launchable item"
 msgstr "Kein startbarer Eintrag"
@@ -20686,8 +20564,7 @@ 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"
+msgstr "Das Zertifikat der Zertifizierungsstelle konnte nicht importiert werden"
 
 #: ../smime/gui/certificate-viewer.c:338
 #, c-format
@@ -20749,8 +20626,8 @@ 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
@@ -20875,8 +20752,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 ""
@@ -21200,8 +21076,8 @@ 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
@@ -21256,7 +21132,7 @@ msgstr "Art der Ansicht"
 msgid "Type of view:"
 msgstr "Art der Ansicht:"
 
-#: ../widgets/misc/e-account-manager.c:351
+#: ../widgets/misc/e-account-manager.c:354
 msgid "De_fault"
 msgstr "_Vorgabe"
 
@@ -21318,7 +21194,7 @@ msgid "Hide Attachment _Bar"
 msgstr "Anla_genleiste verbergen"
 
 #: ../widgets/misc/e-attachment-paned.c:100
-#: ../widgets/misc/e-attachment-paned.c:631
+#: ../widgets/misc/e-attachment-paned.c:615
 msgid "Show Attachment _Bar"
 msgstr "Anla_genleiste anzeigen"
 
@@ -21337,41 +21213,41 @@ msgstr[0] "Anlage speichern"
 msgstr[1] "Anlagen speichern"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:608
-#: ../widgets/misc/e-attachment.c:1785 ../widgets/misc/e-attachment.c:2327
+#: ../widgets/misc/e-attachment-store.c:608 ../widgets/misc/e-attachment.c:1786
+#: ../widgets/misc/e-attachment.c:2328
 msgid "attachment.dat"
 msgstr "Anlage.dat"
 
-#: ../widgets/misc/e-attachment-view.c:351
+#: ../widgets/misc/e-attachment-view.c:353
 msgid "S_ave All"
 msgstr "_Alle speichern"
 
-#: ../widgets/misc/e-attachment-view.c:377
+#: ../widgets/misc/e-attachment-view.c:379
 msgid "A_dd Attachment..."
 msgstr "Anlage _hinzufÃ¼gen â?¦"
 
-#: ../widgets/misc/e-attachment-view.c:401
+#: ../widgets/misc/e-attachment-view.c:403
 msgid "_Hide"
 msgstr "_Verbergen"
 
-#: ../widgets/misc/e-attachment-view.c:408
+#: ../widgets/misc/e-attachment-view.c:410
 msgid "Hid_e All"
 msgstr "_Alle verbergen"
 
-#: ../widgets/misc/e-attachment-view.c:415
+#: ../widgets/misc/e-attachment-view.c:417
 msgid "_View Inline"
 msgstr "_Eingebettet anzeigen"
 
-#: ../widgets/misc/e-attachment-view.c:422
+#: ../widgets/misc/e-attachment-view.c:424
 msgid "Vie_w All Inline"
 msgstr "_Alle eingebetteten anzeigen"
 
-#: ../widgets/misc/e-attachment-view.c:739
+#: ../widgets/misc/e-attachment-view.c:741
 #, c-format
 msgid "Open with \"%s\""
 msgstr "Mit Â»%sÂ« Ã¶ffnen"
 
-#: ../widgets/misc/e-attachment-view.c:742
+#: ../widgets/misc/e-attachment-view.c:744
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Diese Anlage mit Â»%sÂ« Ã¶ffnen"
@@ -21384,55 +21260,55 @@ msgstr "Diese Anlage mit Â»%sÂ« Ã¶ffnen"
 msgid "Attached message"
 msgstr "Beigelegte Nachricht"
 
-#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2629
+#: ../widgets/misc/e-attachment.c:1829 ../widgets/misc/e-attachment.c:2630
 msgid "A load operation is already in progress"
 msgstr "Ein Ladevorgang lÃ¤uft bereits"
 
-#: ../widgets/misc/e-attachment.c:1836 ../widgets/misc/e-attachment.c:2637
+#: ../widgets/misc/e-attachment.c:1837 ../widgets/misc/e-attachment.c:2638
 msgid "A save operation is already in progress"
 msgstr "Ein Speichervorgang lÃ¤uft bereits"
 
-#: ../widgets/misc/e-attachment.c:1928
+#: ../widgets/misc/e-attachment.c:1929
 #, c-format
 msgid "Could not load '%s'"
 msgstr "Â»%sÂ« konnte nicht geladen werden"
 
-#: ../widgets/misc/e-attachment.c:1931
+#: ../widgets/misc/e-attachment.c:1932
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Die Anlage konnte nicht geladen werden"
 
-#: ../widgets/misc/e-attachment.c:2207
+#: ../widgets/misc/e-attachment.c:2208
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Â»%sÂ« konnte nicht geÃ¶ffnet werden"
 
-#: ../widgets/misc/e-attachment.c:2210
+#: ../widgets/misc/e-attachment.c:2211
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Die Anlage konnte nicht geÃ¶ffnet werden"
 
-#: ../widgets/misc/e-attachment.c:2645
+#: ../widgets/misc/e-attachment.c:2646
 msgid "Attachment contents not loaded"
 msgstr "Anlagen wurden nicht geladen"
 
-#: ../widgets/misc/e-attachment.c:2721
+#: ../widgets/misc/e-attachment.c:2722
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Â»%sÂ« konnte nicht gespeichert werden"
 
-#: ../widgets/misc/e-attachment.c:2724
+#: ../widgets/misc/e-attachment.c:2725
 #, 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:362
 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:1258
+#: ../widgets/misc/e-calendar-item.c:1261
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -21452,52 +21328,52 @@ msgstr "Geben Sie den zu verwendenden Zeichensatz ein"
 msgid "Other..."
 msgstr "Weitere â?¦"
 
-#: ../widgets/misc/e-dateedit.c:505
+#: ../widgets/misc/e-dateedit.c:508
 msgid "Date and Time"
 msgstr "Datum und Uhrzeit"
 
-#: ../widgets/misc/e-dateedit.c:526
+#: ../widgets/misc/e-dateedit.c:529
 msgid "Text entry to input date"
 msgstr "Eingabefeld fÃ¼r das Datum"
 
-#: ../widgets/misc/e-dateedit.c:548
+#: ../widgets/misc/e-dateedit.c:551
 msgid "Click this button to show a calendar"
 msgstr "Diesen Knopf drÃ¼cken, um den Kalender anzuzeigen"
 
-#: ../widgets/misc/e-dateedit.c:594
+#: ../widgets/misc/e-dateedit.c:597
 msgid "Drop-down combination box to select time"
 msgstr "Auswahlliste fÃ¼r die Zeit"
 
-#: ../widgets/misc/e-dateedit.c:666
+#: ../widgets/misc/e-dateedit.c:669
 msgid "No_w"
 msgstr "_Jetzt"
 
-#: ../widgets/misc/e-dateedit.c:672
+#: ../widgets/misc/e-dateedit.c:675
 msgid "_Today"
 msgstr "_Heute"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../widgets/misc/e-dateedit.c:680
+#: ../widgets/misc/e-dateedit.c:683
 msgid "_None"
 msgstr "_Keine"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1685 ../widgets/misc/e-dateedit.c:1917
+#: ../widgets/misc/e-dateedit.c:1688 ../widgets/misc/e-dateedit.c:1920
 msgctxt "date"
 msgid "None"
 msgstr "Keine"
 
-#: ../widgets/misc/e-dateedit.c:1812
+#: ../widgets/misc/e-dateedit.c:1815
 msgid "Invalid Date Value"
 msgstr "UngÃ¼ltiges Datum"
 
-#: ../widgets/misc/e-dateedit.c:1856
+#: ../widgets/misc/e-dateedit.c:1859
 msgid "Invalid Time Value"
 msgstr "UngÃ¼ltige Zeitangabe"
 
-#: ../widgets/misc/e-import-assistant.c:249
+#: ../widgets/misc/e-import-assistant.c:252
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
@@ -21505,37 +21381,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:266
+#: ../widgets/misc/e-import-assistant.c:269
 msgid "F_ilename:"
 msgstr "Datei_name:"
 
-#: ../widgets/misc/e-import-assistant.c:276
+#: ../widgets/misc/e-import-assistant.c:279
 msgid "Select a file"
 msgstr "Eine Datei wÃ¤hlen"
 
-#: ../widgets/misc/e-import-assistant.c:290
-#: ../widgets/misc/e-import-assistant.c:465
+#: ../widgets/misc/e-import-assistant.c:293
+#: ../widgets/misc/e-import-assistant.c:468
 msgid "File _type:"
 msgstr "Datei_typ:"
 
-#: ../widgets/misc/e-import-assistant.c:333
-#: ../widgets/misc/e-import-assistant.c:916
+#: ../widgets/misc/e-import-assistant.c:336
+#: ../widgets/misc/e-import-assistant.c:912
 msgid "Choose the destination for this import"
 msgstr "WÃ¤hlen Sie das Ziel dieses Imports"
 
-#: ../widgets/misc/e-import-assistant.c:358
+#: ../widgets/misc/e-import-assistant.c:361
 msgid "Choose the type of importer to run:"
 msgstr "WÃ¤hlen Sie den auszufÃ¼hrenden Importeur:"
 
-#: ../widgets/misc/e-import-assistant.c:366
+#: ../widgets/misc/e-import-assistant.c:369
 msgid "Import data and settings from _older programs"
 msgstr "Daten und Einstellungen aus Ã¤_lteren Programmen importieren"
 
-#: ../widgets/misc/e-import-assistant.c:374
+#: ../widgets/misc/e-import-assistant.c:377
 msgid "Import a _single file"
 msgstr "Eine _einzelne Datei importieren"
 
-#: ../widgets/misc/e-import-assistant.c:526
+#: ../widgets/misc/e-import-assistant.c:529
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
@@ -21547,37 +21423,37 @@ msgstr ""
 "es noch einmal versuchen wollen."
 
 #. Install a custom "Cancel Import" button.
-#: ../widgets/misc/e-import-assistant.c:773
+#: ../widgets/misc/e-import-assistant.c:769
 msgid "_Cancel Import"
 msgstr "Import abbre_chen"
 
-#: ../widgets/misc/e-import-assistant.c:915
+#: ../widgets/misc/e-import-assistant.c:911
 msgid "Preview data to be imported"
 msgstr "Vorschau der zu importierenden Daten"
 
-#: ../widgets/misc/e-import-assistant.c:921
-#: ../widgets/misc/e-import-assistant.c:934
-#: ../widgets/misc/e-import-assistant.c:1284
-#: ../widgets/misc/e-import-assistant.c:1350
-#: ../widgets/misc/e-import-assistant.c:1359
+#: ../widgets/misc/e-import-assistant.c:917
+#: ../widgets/misc/e-import-assistant.c:930
+#: ../widgets/misc/e-import-assistant.c:1280
+#: ../widgets/misc/e-import-assistant.c:1346
+#: ../widgets/misc/e-import-assistant.c:1355
 msgid "Import Data"
 msgstr "Daten importieren"
 
-#: ../widgets/misc/e-import-assistant.c:929
+#: ../widgets/misc/e-import-assistant.c:925
 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:1274
-#: ../widgets/misc/e-import-assistant.c:1308
+#: ../widgets/misc/e-import-assistant.c:1270
+#: ../widgets/misc/e-import-assistant.c:1304
 msgid "Evolution Import Assistant"
 msgstr "Evolution-Importassistent"
 
-#: ../widgets/misc/e-import-assistant.c:1291
-#: ../widgets/misc/e-import-assistant.c:1338
+#: ../widgets/misc/e-import-assistant.c:1287
+#: ../widgets/misc/e-import-assistant.c:1334
 msgid "Import Location"
 msgstr "Ort importieren"
 
-#: ../widgets/misc/e-import-assistant.c:1302
+#: ../widgets/misc/e-import-assistant.c:1298
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -21587,28 +21463,28 @@ msgstr ""
 "Dieser Assistent fÃ¼hrt Sie durch das Importieren externer Dateien in "
 "Evolution."
 
-#: ../widgets/misc/e-import-assistant.c:1316
+#: ../widgets/misc/e-import-assistant.c:1312
 msgid "Importer Type"
 msgstr "Importeurtyp"
 
-#: ../widgets/misc/e-import-assistant.c:1324
+#: ../widgets/misc/e-import-assistant.c:1320
 msgid "Select Information to Import"
 msgstr "Zu importierende Informationen auswÃ¤hlen"
 
-#: ../widgets/misc/e-import-assistant.c:1331
+#: ../widgets/misc/e-import-assistant.c:1327
 msgid "Select a File"
 msgstr "WÃ¤hlen Sie eine Datei"
 
-#: ../widgets/misc/e-import-assistant.c:1345
+#: ../widgets/misc/e-import-assistant.c:1341
 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:557
+#: ../widgets/misc/e-map.c:538
 msgid "World Map"
 msgstr "Weltkarte"
 
-#: ../widgets/misc/e-map.c:559
+#: ../widgets/misc/e-map.c:540
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -21634,52 +21510,52 @@ msgid "Evolution is currently offline because the network is unavailable."
 msgstr ""
 "Evolution ist im Augenblick offline, weil das Netzwerk nicht verfÃ¼gbar ist."
 
-#: ../widgets/misc/e-preferences-window.c:278
+#: ../widgets/misc/e-preferences-window.c:281
 msgid "Evolution Preferences"
 msgstr "Evolution-Einstellungen"
 
-#: ../widgets/misc/e-search-bar.c:81
+#: ../widgets/misc/e-search-bar.c:84
 #, c-format
 msgid "Matches: %d"
 msgstr "Passt auf: %d"
 
-#: ../widgets/misc/e-search-bar.c:557
+#: ../widgets/misc/e-search-bar.c:560
 msgid "Close the find bar"
 msgstr "Die Suchleiste schlieÃ?en"
 
-#: ../widgets/misc/e-search-bar.c:565
+#: ../widgets/misc/e-search-bar.c:568
 msgid "Fin_d:"
 msgstr "_Suchen:"
 
-#: ../widgets/misc/e-search-bar.c:577
+#: ../widgets/misc/e-search-bar.c:580
 msgid "Clear the search"
 msgstr "Das Suchfeld leeren"
 
-#: ../widgets/misc/e-search-bar.c:600
+#: ../widgets/misc/e-search-bar.c:603
 msgid "_Previous"
 msgstr "_RÃ¼ckwÃ¤rts suchen"
 
-#: ../widgets/misc/e-search-bar.c:606
+#: ../widgets/misc/e-search-bar.c:609
 msgid "Find the previous occurrence of the phrase"
 msgstr "Den letzten Suchtreffer finden"
 
-#: ../widgets/misc/e-search-bar.c:616
+#: ../widgets/misc/e-search-bar.c:619
 msgid "_Next"
 msgstr "_Weitersuchen"
 
-#: ../widgets/misc/e-search-bar.c:622
+#: ../widgets/misc/e-search-bar.c:625
 msgid "Find the next occurrence of the phrase"
 msgstr "Den nÃ¤chsten Suchtreffer finden"
 
-#: ../widgets/misc/e-search-bar.c:632
+#: ../widgets/misc/e-search-bar.c:635
 msgid "Mat_ch case"
 msgstr "_GroÃ?-/Kleinschreibung berÃ¼cksichtigen"
 
-#: ../widgets/misc/e-search-bar.c:660
+#: ../widgets/misc/e-search-bar.c:663
 msgid "Reached bottom of page, continued from top"
 msgstr "Seitenende erreicht, ab Anfang wird fortgesetzt"
 
-#: ../widgets/misc/e-search-bar.c:682
+#: ../widgets/misc/e-search-bar.c:685
 msgid "Reached top of page, continued from bottom"
 msgstr "Seitenanfang erreicht, ab Ende wird fortgesetzt"
 
@@ -21814,34 +21690,34 @@ msgctxt "send-options"
 msgid "None"
 msgstr "Keine"
 
-#: ../widgets/misc/e-signature-editor.c:136
-#: ../widgets/misc/e-signature-editor.c:524
-#: ../widgets/misc/e-signature-manager.c:353
+#: ../widgets/misc/e-signature-editor.c:138
+#: ../widgets/misc/e-signature-editor.c:526
+#: ../widgets/misc/e-signature-manager.c:356
 #: ../widgets/misc/e-signature-script-dialog.c:220
 msgid "Unnamed"
 msgstr "Namenlose"
 
-#: ../widgets/misc/e-signature-editor.c:213
+#: ../widgets/misc/e-signature-editor.c:215
 msgid "_Save and Close"
 msgstr "_Speichern und schlieÃ?en"
 
-#: ../widgets/misc/e-signature-editor.c:391
+#: ../widgets/misc/e-signature-editor.c:393
 msgid "Edit Signature"
 msgstr "Signatur bearbeiten"
 
-#: ../widgets/misc/e-signature-editor.c:406
+#: ../widgets/misc/e-signature-editor.c:408
 msgid "_Signature Name:"
 msgstr "_Signaturname:"
 
-#: ../widgets/misc/e-signature-manager.c:298
+#: ../widgets/misc/e-signature-manager.c:301
 msgid "Add Signature Script"
 msgstr "Signaturskript hinzufÃ¼gen"
 
-#: ../widgets/misc/e-signature-manager.c:363
+#: ../widgets/misc/e-signature-manager.c:366
 msgid "Edit Signature Script"
 msgstr "Signatur bearbeiten"
 
-#: ../widgets/misc/e-signature-manager.c:579
+#: ../widgets/misc/e-signature-manager.c:582
 msgid "Add _Script"
 msgstr "_Skript hinzufÃ¼gen"
 
@@ -21920,25 +21796,25 @@ msgstr "Kalender: von %s bis %s"
 msgid "evolution calendar item"
 msgstr "Evolution Kalenderelement"
 
-#: ../widgets/table/e-cell-combo.c:174
+#: ../widgets/table/e-cell-combo.c:177
 msgid "popup list"
 msgstr "Popup-Liste"
 
-#: ../widgets/table/e-cell-date-edit.c:300
+#: ../widgets/table/e-cell-date-edit.c:303
 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:320
 msgctxt "table-date"
 msgid "None"
 msgstr "Keine"
 
-#: ../widgets/table/e-cell-date-edit.c:325
+#: ../widgets/table/e-cell-date-edit.c:328
 msgid "OK"
 msgstr "OK"
 
-#: ../widgets/table/e-cell-date-edit.c:869
+#: ../widgets/table/e-cell-date-edit.c:872
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Die Zeit muss folgendes Format haben: %s"
@@ -21947,7 +21823,7 @@ 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:595
+#: ../widgets/table/e-table-click-to-add.c:598
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
 msgid "click to add"
@@ -21983,7 +21859,7 @@ msgid "A_vailable Fields:"
 msgstr "_VerfÃ¼gbare Felder:"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1702
+#: ../widgets/table/e-table-header-item.c:1704
 msgid "Ascending"
 msgstr "Aufsteigend"
 
@@ -21996,7 +21872,7 @@ msgid "Clear _All"
 msgstr "Alles _entfernen"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1702
+#: ../widgets/table/e-table-header-item.c:1704
 msgid "Descending"
 msgstr "Absteigend"
 
@@ -22075,7 +21951,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:354
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
@@ -22088,72 +21964,72 @@ 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:366
 #, 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:1546
+#: ../widgets/table/e-table-header-item.c:1548
 msgid "Customize Current View"
 msgstr "Aktuelle Ansicht anpassen"
 
-#: ../widgets/table/e-table-header-item.c:1567
+#: ../widgets/table/e-table-header-item.c:1569
 msgid "Sort _Ascending"
 msgstr "A_ufsteigend sortieren"
 
-#: ../widgets/table/e-table-header-item.c:1570
+#: ../widgets/table/e-table-header-item.c:1572
 msgid "Sort _Descending"
 msgstr "A_bsteigend sortieren"
 
-#: ../widgets/table/e-table-header-item.c:1573
+#: ../widgets/table/e-table-header-item.c:1575
 msgid "_Unsort"
 msgstr "_Nicht sortieren"
 
-#: ../widgets/table/e-table-header-item.c:1576
+#: ../widgets/table/e-table-header-item.c:1578
 msgid "Group By This _Field"
 msgstr "Nach diesem _Feld gruppieren"
 
-#: ../widgets/table/e-table-header-item.c:1579
+#: ../widgets/table/e-table-header-item.c:1581
 msgid "Group By _Box"
 msgstr "Nach FÃ¤c_hern gruppieren"
 
-#: ../widgets/table/e-table-header-item.c:1583
+#: ../widgets/table/e-table-header-item.c:1585
 msgid "Remove This _Column"
 msgstr "_Diese Spalte entfernen"
 
-#: ../widgets/table/e-table-header-item.c:1586
+#: ../widgets/table/e-table-header-item.c:1588
 msgid "Add a C_olumn..."
 msgstr "Spalte hin_zufÃ¼gen â?¦"
 
-#: ../widgets/table/e-table-header-item.c:1590
+#: ../widgets/table/e-table-header-item.c:1592
 msgid "A_lignment"
 msgstr "Aus_richtung"
 
-#: ../widgets/table/e-table-header-item.c:1593
+#: ../widgets/table/e-table-header-item.c:1595
 msgid "B_est Fit"
 msgstr "_Optimal"
 
-#: ../widgets/table/e-table-header-item.c:1596
+#: ../widgets/table/e-table-header-item.c:1598
 msgid "Format Column_s..."
 msgstr "Spalten for_matieren â?¦"
 
-#: ../widgets/table/e-table-header-item.c:1600
+#: ../widgets/table/e-table-header-item.c:1602
 msgid "Custo_mize Current View..."
 msgstr "A_ktuelle Ansicht anpassen â?¦"
 
-#: ../widgets/table/e-table-header-item.c:1659
+#: ../widgets/table/e-table-header-item.c:1661
 msgid "_Sort By"
 msgstr "_Sortieren nach"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1677
+#: ../widgets/table/e-table-header-item.c:1679
 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:126
 msgid "popup a child"
 msgstr "Kind aufklappen"
 
@@ -22189,14 +22065,174 @@ msgstr "Klicken"
 msgid "sort"
 msgstr "Sortieren"
 
-#: ../widgets/text/e-text.c:2536
+#: ../widgets/text/e-text.c:2538
 msgid "Select All"
 msgstr "Alle auswÃ¤hlen"
 
-#: ../widgets/text/e-text.c:2548
+#: ../widgets/text/e-text.c:2550
 msgid "Input Methods"
 msgstr "Eingabemethoden"
 
+#~ msgid "%s..."
+#~ msgstr "%s â?¦"
+
+#~ msgid "Evolution Error"
+#~ msgstr "Evolution-Fehler"
+
+#~ msgid "Evolution Warning"
+#~ msgstr "Evolution-Warnung"
+
+#~ msgid "Internal error, unknown error '%s' requested"
+#~ msgstr "Interner Fehler, unbekannter Fehler Â»%sÂ« angefordert"
+
+#~ msgid "This store does not support subscriptions, or they are not enabled."
+#~ msgstr ""
+#~ "Dieser Speicher unterstÃ¼tzt keine Abonnements oder sie sind nicht "
+#~ "aktiviert."
+
+#~ msgid "Folder"
+#~ msgstr "Ordner"
+
+#~ msgid "Please select a server."
+#~ msgstr "Bitte wÃ¤hlen Sie einen Server."
+
+#~ msgid "No server has been selected"
+#~ msgstr "Es wurde kein Server gewÃ¤hlt"
+
+#~ msgid "Default height of the subscribe dialog."
+#~ msgstr "Die voreingestellte HÃ¶he des Abonnementdialogs."
+
+#~ msgid "Default width of the subscribe dialog."
+#~ msgstr "Die voreingestellte Breite des Abonnementdialogs."
+
+#~ msgid "Subscribe dialog default height"
+#~ msgstr "Voreingestellte HÃ¶he des Abonnementdialogs"
+
+#~ msgid "Subscribe dialog default width"
+#~ msgstr "Voreingestellte Breite des Abonnementdialogs"
+
+#~ msgid "(Not Recommended)"
+#~ msgstr "(Nicht empfohlen)"
+
+#~ msgid "(Note: Requires restart of the application)"
+#~ msgstr "(Hinweis: Erfordert einen Neustart der Anwendung)"
+
+#~ msgid "Checks incoming mail messages to be Junk"
+#~ msgstr "Ã?berprÃ¼ft, ob eingehende Nachrichten unerwÃ¼nscht sind"
+
+#~ msgid "Do not display messages when text si_ze exceeds"
+#~ msgstr "Nachrichten nicht anzeigen, wenn Text _grÃ¶Ã?er als"
+
+#~ msgid "Enable Magic S_pacebar"
+#~ msgstr "Magische _Leertaste einschalten"
+
+#~ msgid "Enable Sea_rch Folders"
+#~ msgstr "Such_ordner aktivieren"
+
+#~ msgid "Fi_xed-width:"
+#~ msgstr "_Dicktengleich:"
+
+#~ msgid "Font Properties"
+#~ msgstr "Schrifteigenschaften"
+
+#~ msgid "KB"
+#~ msgstr "KB"
+
+#~ msgid "Message Fonts"
+#~ msgstr "Nachrichtenschriften"
+
+#~ msgid ""
+#~ "Note: you will not be prompted for a password until you connect for the "
+#~ "first time"
+#~ msgstr ""
+#~ "Hinweis: Sie werden erst nach dem Passwort gefragt, wenn Sie das erste Mal "
+#~ "eine Verbindung mit dem Server aufbauen"
+
+#~ msgid "Printed Fonts"
+#~ msgstr "Gedruckte Schriften"
+
+#~ msgid "Prompt when sending replies to _many recipients"
+#~ msgstr "Beim Antworten an _viele EmpfÃ¤ngern nachfragen"
+
+#~ msgid "Select Drafts Folder"
+#~ msgstr "Ordner fÃ¼r EntwÃ¼rfe wÃ¤hlen"
+
+#~ msgid "Select HTML fixed width font for printing"
+#~ msgstr "Dicktengleiche HTML-Druckschrift wÃ¤hlen"
+
+#~ msgid "Select HTML variable width font for printing"
+#~ msgstr "HTML-Proportionaldruckschrift wÃ¤hlen"
+
+#~ msgid "Select Junk Folder"
+#~ msgstr "UnerwÃ¼nscht-Ordner wÃ¤hlen"
+
+#~ msgid "Select Sent Folder"
+#~ msgstr "Gesendet-Ordner wÃ¤hlen"
+
+#~ msgid "Select Trash Folder"
+#~ msgstr "Ordner fÃ¼r MÃ¼ll wÃ¤hlen"
+
+#~ msgid "Sending Mail"
+#~ msgstr "Verschicken von E-Mails"
+
+#~ msgid "Sent and Draft Messages"
+#~ msgstr "Verschickte und entworfene Nachrichten"
+
+#~ msgid "Top Posting Option"
+#~ msgstr "Top-Posting-Option"
+
+#~ msgid "V_ariable-width:"
+#~ msgstr "_Proportional:"
+
+#~ msgid "_Mark messages as read after"
+#~ msgstr "_Nachrichten als gelesen markieren nach"
+
+#~ msgid "_Show image animations"
+#~ msgstr "Bildanimationen an_zeigen"
+
+#~ msgid "_Shrink To / Cc / Bcc headers to "
+#~ msgstr "EmpfÃ¤ngerkopfzeilen (An/Kopie/Blindkopie) _verkleinern zu "
+
+#~ msgid "addresses"
+#~ msgstr "Adressen"
+
+#~ msgid "S_erver:"
+#~ msgstr "_Server:"
+
+#~ msgid "Saving attachment"
+#~ msgstr "Anlage wird gespeichert"
+
+#~ msgid ""
+#~ "Cannot create output file: %s:\n"
+#~ " %s"
+#~ msgstr ""
+#~ "Ausgabedatei konnte nicht angelegt werden: %s:\n"
+#~ " %s"
+
+#~ msgid "Could not write data: "
+#~ msgstr "Daten konnten nicht geschrieben werden:"
+
+#~ msgid "_Backup Evolution Settings..."
+#~ msgstr "Evolution-Einstellungen sic_hern â?¦"
+
+#~ msgid "R_estore Evolution Settings..."
+#~ msgstr "Evolution-Einstellungen wiederherstell_en â?¦"
+
+#~ msgid "_Sharing"
+#~ msgstr "_Freigeben"
+
+#~ msgid "Manage your Evolution plugins."
+#~ msgstr "Die Plugins fÃ¼r Evolution verwalten."
+
+#~ msgid "Sort mail message threads by subject."
+#~ msgstr "Nachrichtenthreads nach ihrem Betreff sortieren."
+
+#~ msgid "Subject Threading"
+#~ msgstr "Betreffsbezogenes Threading"
+
+#~ msgid "Thread messages by subject"
+#~ msgstr "Betreffsbezogenes Threading der Nachrichten"
+
 #~ msgid "<span size=\"large\" weight=\"bold\">Details:</span>"
 #~ msgstr "<span size=\"large\" weight=\"bold\">Details:</span>"
 
@@ -22229,30 +22265,30 @@ msgstr "Eingabemethoden"
 #~ "wiederhergestellt werden"
 
 #~ msgid ""
-#~ "Evolution backup can start only when Evolution is not running. Please "
-#~ "make sure that you save and close all your unsaved windows before "
-#~ "proceeding.  If you want Evolution to restart automatically after backup, "
-#~ "please enable the toggle button."
+#~ "Evolution backup can start only when Evolution is not running. Please make "
+#~ "sure that you save and close all your unsaved windows before proceeding.  "
+#~ "If you want Evolution to restart automatically after backup, please enable "
+#~ "the toggle button."
 #~ msgstr ""
 #~ "Die Evolution-Sicherung kann nur gestartet werden, wenn Evolution nicht "
-#~ "lÃ¤uft. Bitte stellen Sie sicher, dass alle ungesicherten Evolution-"
-#~ "Fenster zunÃ¤chst gespeichert und dann geschlossen werden. Sie kÃ¶nnen "
-#~ "zudem auswÃ¤hlen, ob Evolution nach der Sicherung automatisch neu "
-#~ "gestartet werden soll."
+#~ "lÃ¤uft. Bitte stellen Sie sicher, dass alle ungesicherten Evolution-Fenster "
+#~ "zunÃ¤chst gespeichert und dann geschlossen werden. Sie kÃ¶nnen zudem "
+#~ "auswÃ¤hlen, ob Evolution nach der Sicherung automatisch neu gestartet "
+#~ "werden soll."
 
 #~ msgid ""
 #~ "This will delete all your current Evolution data and settings and restore "
 #~ "them from your backup. Evolution restore can start only when Evolution is "
 #~ "not running. Please make sure that you close all your unsaved windows "
-#~ "before you proceed. If you want Evolution to restart automatically "
-#~ "restart after restore, please enable the toggle button."
+#~ "before you proceed. If you want Evolution to restart automatically restart "
+#~ "after restore, please enable the toggle button."
 #~ msgstr ""
 #~ "Dies lÃ¶scht alle momentanen Evolution-Daten und -Einstellungen und stellt "
-#~ "diese aus der Sicherungsdatei wieder her. Die Evolution-Sicherung kann "
-#~ "nur gestartet werden, wenn Evolution nicht lÃ¤uft. Bitte stellen Sie "
-#~ "sicher, dass alle ungesicherten Evolution-Fenster zunÃ¤chst gespeichert "
-#~ "und dann geschlossen werden. Sie kÃ¶nnen zudem auswÃ¤hlen, ob Evolution "
-#~ "nach der Sicherung automatisch neu gestartet werden soll."
+#~ "diese aus der Sicherungsdatei wieder her. Die Evolution-Sicherung kann nur "
+#~ "gestartet werden, wenn Evolution nicht lÃ¤uft. Bitte stellen Sie sicher, "
+#~ "dass alle ungesicherten Evolution-Fenster zunÃ¤chst gespeichert und dann "
+#~ "geschlossen werden. Sie kÃ¶nnen zudem auswÃ¤hlen, ob Evolution nach der "
+#~ "Sicherung automatisch neu gestartet werden soll."
 
 #~ msgid "Success"
 #~ msgstr "Erfolg"
@@ -22317,8 +22353,7 @@ msgstr "Eingabemethoden"
 #~ "Die Aufgabe konnte auf Grund eines Corba-Fehlers nicht gelÃ¶scht werden"
 
 #~ msgid "The memo could not be deleted due to a corba error"
-#~ msgstr ""
-#~ "Die Notiz konnte auf Grund eines Corba-Fehlers nicht gelÃ¶scht werden"
+#~ msgstr "Die Notiz konnte auf Grund eines Corba-Fehlers nicht gelÃ¶scht werden"
 
 #~ msgid "The item could not be deleted due to a corba error"
 #~ msgstr ""
@@ -22517,8 +22552,8 @@ msgstr "Eingabemethoden"
 #~ "Font size (as a multiple of PANGO_SCALE, eg. 12*PANGO_SCALE for a 12pt "
 #~ "font size)"
 #~ msgstr ""
-#~ "SchriftgrÃ¶Ã?e (ein Mehrfaches von PANGO_SCALE, z.B. 12*PANGO_SCALE fÃ¼r "
-#~ "eine GrÃ¶Ã?e von 12pt)"
+#~ "SchriftgrÃ¶Ã?e (ein Mehrfaches von PANGO_SCALE, z.B. 12*PANGO_SCALE fÃ¼r eine "
+#~ "GrÃ¶Ã?e von 12pt)"
 
 #~| msgid "contains"
 #~ msgid "Font points"
@@ -22881,8 +22916,7 @@ msgstr "Eingabemethoden"
 
 #~ msgid "Check this to use system timezone in Evolution."
 #~ msgstr ""
-#~ "Kreuzen Sie dies an, um die Zeitzone des Systems in Evolution zu "
-#~ "verwenden."
+#~ "Kreuzen Sie dies an, um die Zeitzone des Systems in Evolution zu verwenden."
 
 #~ msgid "Attendee_s..."
 #~ msgstr "Teil_nehmer â?¦"
@@ -22998,8 +23032,8 @@ msgstr "Eingabemethoden"
 #~ msgstr "Lokaler E-Mail-Speicher unter Â»%sÂ« konnte nicht angelegt werden: %s"
 
 #~ msgid ""
-#~ "Unable to read settings from previous Evolution install, `evolution/"
-#~ "config.xmldb' does not exist or is corrupt."
+#~ "Unable to read settings from previous Evolution install, `evolution/config."
+#~ "xmldb' does not exist or is corrupt."
 #~ msgstr ""
 #~ "Die Einstellungen der vorhandenen Evolution-Installation konnten nicht "
 #~ "gelesen werden, Â»evolution/config.xmldbÂ« existiert nicht oder ist "
@@ -23213,8 +23247,8 @@ msgstr "Eingabemethoden"
 #~ msgstr "Das Tabellenmodell fÃ¼r Aufgaben"
 
 #~ msgid ""
-#~ "The location and hierarchy of the Evolution task folders has changed "
-#~ "since Evolution 1.x.\n"
+#~ "The location and hierarchy of the Evolution task folders has changed since "
+#~ "Evolution 1.x.\n"
 #~ "\n"
 #~ "Please be patient while Evolution migrates your folders..."
 #~ msgstr ""
@@ -23271,8 +23305,8 @@ msgstr "Eingabemethoden"
 #~ "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."
+#~ "Liste der Begriffe, nach denen die Anlagenerinnerung im Text der Nachricht "
+#~ "sucht."
 
 #~ msgid "<b>Server</b>"
 #~ msgstr "<b>Server</b>"
@@ -23433,8 +23467,8 @@ msgstr "Eingabemethoden"
 #~ msgstr "Alte Daten wirklich lÃ¶schen?"
 
 #~ msgid ""
-#~ "The entire contents of the &quot;evolution&quot; directory are about to "
-#~ "be permanently removed.\n"
+#~ "The entire contents of the &quot;evolution&quot; directory are about to be "
+#~ "permanently removed.\n"
 #~ "\n"
 #~ "It is suggested you manually verify that all of your mail, contact, and "
 #~ "calendar data is present, and that this version of Evolution operates "
@@ -23471,8 +23505,8 @@ msgstr "Eingabemethoden"
 #~ "Â»evolutionÂ« jederzeit manuell entfernen.\n"
 
 #~ msgid ""
-#~ "Upgrading your data and settings will require up to {0} of disk space, "
-#~ "but you only have {1} available.\n"
+#~ "Upgrading your data and settings will require up to {0} of disk space, but "
+#~ "you only have {1} available.\n"
 #~ "\n"
 #~ "You will need to make more space available in your home directory before "
 #~ "you can continue."
@@ -23885,8 +23919,8 @@ msgstr "Eingabemethoden"
 
 #~ msgid ""
 #~ "The search base is the distinguished name (DN) of the entry where your "
-#~ "searches will begin. If you leave this blank, the search will begin at "
-#~ "the root of the directory tree."
+#~ "searches will begin. If you leave this blank, the search will begin at the "
+#~ "root of the directory tree."
 #~ msgstr ""
 #~ "Die Suchbasis ist der eindeutige Name (Distinguished Name, kurz DN) des "
 #~ "Eintrags, bei dem die Suche beginnt. Wenn Sie dieses Feld leer lassen, "
@@ -23907,8 +23941,8 @@ msgstr "Eingabemethoden"
 #~ "zu hoch angesetzt ist, werden VorgÃ¤nge im Adressbuch verlangsamt."
 
 #~ msgid ""
-#~ "This is the name for this server that will appear in your Evolution "
-#~ "folder list. It is for display purposes only. "
+#~ "This is the name for this server that will appear in your Evolution folder "
+#~ "list. It is for display purposes only. "
 #~ msgstr ""
 #~ "Dies ist der Name fÃ¼r diesen Server, der in der Ordnerliste von Evolution "
 #~ "angezeigt wird. Er dient lediglich zu Anzeigezwecken. "
@@ -24508,8 +24542,8 @@ msgstr "Eingabemethoden"
 #~ msgid ""
 #~ "Configure mail preferences, including security and message display, here"
 #~ msgstr ""
-#~ "Hier kÃ¶nnen Sie die E-Mail-Einstellungen einschlieÃ?lich der Sicherheit "
-#~ "und der Anzeige von Nachrichten festlegen"
+#~ "Hier kÃ¶nnen Sie die E-Mail-Einstellungen einschlieÃ?lich der Sicherheit und "
+#~ "der Anzeige von Nachrichten festlegen"
 
 #~ msgid "Configure spell-checking, signatures, and the message composer here"
 #~ msgstr ""
@@ -24642,8 +24676,8 @@ msgstr "Eingabemethoden"
 
 #~ msgid "Prompt to check if the user wants to go offline immediately"
 #~ msgstr ""
-#~ "Legt fest, ob der Benutzer gefragt werden soll, ob er sofort offline "
-#~ "gehen mÃ¶chte"
+#~ "Legt fest, ob der Benutzer gefragt werden soll, ob er sofort offline gehen "
+#~ "mÃ¶chte"
 
 #~ msgid "Thread the message list."
 #~ msgstr "Die Nachrichtenliste nach Threads sortieren."
@@ -24804,9 +24838,6 @@ msgstr "Eingabemethoden"
 #~ msgid "Copy Tool"
 #~ msgstr "Werkzeug zum Kopieren"
 
-#~ msgid "_Account:"
-#~ msgstr "_Konto:"
-
 #~ msgid "_Folder Name:"
 #~ msgstr "Ordner_name:"
 
@@ -24830,8 +24861,8 @@ msgstr "Eingabemethoden"
 #~ "This option will connect to the Exchange server using standard plaintext "
 #~ "password authentication."
 #~ msgstr ""
-#~ "Diese Option stellt eine Verbindung mit dem Exchange-Server her, wobei "
-#~ "ein einfaches Klartext-Passwort verwendet wird."
+#~ "Diese Option stellt eine Verbindung mit dem Exchange-Server her, wobei ein "
+#~ "einfaches Klartext-Passwort verwendet wird."
 
 #~ msgid "Out Of Office"
 #~ msgstr "Nicht im BÃ¼ro"
@@ -24909,8 +24940,7 @@ msgstr "Eingabemethoden"
 
 #~ msgid "The two passwords do not match. Please re-enter the passwords."
 #~ msgstr ""
-#~ "Die beiden Passworte stimmen nicht Ã¼berein. Bitte geben Sie sie erneut "
-#~ "ein."
+#~ "Die beiden Passworte stimmen nicht Ã¼berein. Bitte geben Sie sie erneut ein."
 
 #~ msgid "Confirm Password:"
 #~ msgstr "Passwort bestÃ¤tigen:"
@@ -24947,12 +24977,11 @@ msgstr "Eingabemethoden"
 
 #~ msgid ""
 #~ "This message was sent automatically by Evolution to inform you that you "
-#~ "have been designated as a delegate. You can now send messages on my "
-#~ "behalf."
+#~ "have been designated as a delegate. You can now send messages on my behalf."
 #~ msgstr ""
-#~ "Diese Nachricht wurde automatisch von Evolution verschickt, um Sie "
-#~ "darÃ¼ber zu informieren, dass Sie als Delegat bestimmt wurden. Sie kÃ¶nnen "
-#~ "nun Nachrichten in meinem Namen verschicken."
+#~ "Diese Nachricht wurde automatisch von Evolution verschickt, um Sie darÃ¼ber "
+#~ "zu informieren, dass Sie als Delegat bestimmt wurden. Sie kÃ¶nnen nun "
+#~ "Nachrichten in meinem Namen verschicken."
 
 #~ msgid "You have been given the following permissions on my folders:"
 #~ msgstr "Sie haben nun folgende Zugriffserlaubnis auf meine Ordner:"
@@ -25383,8 +25412,7 @@ msgstr "Eingabemethoden"
 
 #~ msgid "Please make sure the Global Catalog Server name is correct."
 #~ msgstr ""
-#~ "Stellen Sie sicher, dass der Name des globalen Katalog-Servers korrekt "
-#~ "ist."
+#~ "Stellen Sie sicher, dass der Name des globalen Katalog-Servers korrekt ist."
 
 #~ msgid "Please restart Evolution for changes to take effect"
 #~ msgstr ""
@@ -25400,8 +25428,7 @@ msgstr "Eingabemethoden"
 #~ msgstr "Das Exchange-Konto wird entfernt, sobald Sie Evolution beenden"
 
 #~ msgid "The Exchange server is not compatible with Exchange Connector."
-#~ msgstr ""
-#~ "Der Exchange-Server ist mit dem Exchange-Connector nicht kompatibel."
+#~ msgstr "Der Exchange-Server ist mit dem Exchange-Connector nicht kompatibel."
 
 #~ msgid ""
 #~ "The server is running Exchange 5.5. Exchange Connector \n"
@@ -25439,8 +25466,7 @@ msgstr "Eingabemethoden"
 #~ msgid "Unsupported operation"
 #~ msgstr "Nicht unterstÃ¼tzte Aktion"
 
-#~ msgid ""
-#~ "You are nearing your quota available for storing mail on this server."
+#~ msgid "You are nearing your quota available for storing mail on this server."
 #~ msgstr ""
 #~ "Sie nÃ¤hern sich Ihrem Speicherplatzlimit zum Ablegen von Nachrichten auf "
 #~ "diesem Server."
@@ -25461,8 +25487,8 @@ msgstr "Eingabemethoden"
 #~ "Server Ã¼berschritten."
 
 #~ msgid ""
-#~ "Your current usage is: {0} KB. Try to clear up some space by deleting "
-#~ "some mail."
+#~ "Your current usage is: {0} KB. Try to clear up some space by deleting some "
+#~ "mail."
 #~ msgstr ""
 #~ "Ihre momentane Speicherplatznutzung liegt bei {0} kB. Versuchen Sie durch "
 #~ "das LÃ¶schen einiger Nachrichten etwas Platz zu schaffen."
@@ -25471,12 +25497,12 @@ msgstr "Eingabemethoden"
 #~ "Your current usage is: {0} KB. You will not be able to either send or "
 #~ "receive mail now."
 #~ msgstr ""
-#~ "Ihre momentane Speicherplatznutzung liegt bei {0} kB. Sie sind jetzt "
-#~ "nicht mehr in der Lage, Nachrichten zu senden oder zu empfangen."
+#~ "Ihre momentane Speicherplatznutzung liegt bei {0} kB. Sie sind jetzt nicht "
+#~ "mehr in der Lage, Nachrichten zu senden oder zu empfangen."
 
 #~ msgid ""
-#~ "Your current usage is: {0} KB. You will not be able to send mail until "
-#~ "you clear up some space by deleting some mail."
+#~ "Your current usage is: {0} KB. You will not be able to send mail until you "
+#~ "clear up some space by deleting some mail."
 #~ msgstr ""
 #~ "Ihre momentane Speicherplatznutzung liegt bei {0} kB. Erst nachdem etwas "
 #~ "Speicherplatz durch das LÃ¶schen einiger Nachrichten freigemacht wurde, "
@@ -25523,8 +25549,7 @@ msgstr "Eingabemethoden"
 #~ msgstr "Ordner abbestellen"
 
 #~ msgid ""
-#~ "Unsubscribe from an IMAP folder by right-clicking on it in the folder "
-#~ "tree."
+#~ "Unsubscribe from an IMAP folder by right-clicking on it in the folder tree."
 #~ msgstr "Einen IMAP-Ordner durch Rechtsklick im Ordnerbaum abbestellen."
 
 #~ msgid "Add Novell GroupWise support to Evolution."
@@ -25686,8 +25711,7 @@ msgstr "Eingabemethoden"
 
 #~ msgid "Click OK to close these connections and go offline"
 #~ msgstr ""
-#~ "Klicken Sie auf OK, um diese Verbindungen zu schlieÃ?en und offline zu "
-#~ "gehen"
+#~ "Klicken Sie auf OK, um diese Verbindungen zu schlieÃ?en und offline zu gehen"
 
 #~ msgid "The GNOME Pilot tools do not appear to be installed on this system."
 #~ msgstr ""
@@ -25892,8 +25916,7 @@ msgstr "Eingabemethoden"
 
 #~ msgid "Forget remembered passwords so you will be prompted for them again"
 #~ msgstr ""
-#~ "Erinnerte PasswÃ¶rter verwerfen, sodass Sie wieder nach ihnen gefragt "
-#~ "werden"
+#~ "Erinnerte PasswÃ¶rter verwerfen, sodass Sie wieder nach ihnen gefragt werden"
 
 #~ msgid "Hide window buttons"
 #~ msgstr "FensterknÃ¶pfe verbergen"
@@ -26262,8 +26285,8 @@ msgstr "Eingabemethoden"
 
 #~ msgid "A plugin for saving all attachments or parts of a message at once."
 #~ msgstr ""
-#~ "Ein Plugin zum Speichern aller Anlagen oder von Teilen einer Nachricht "
-#~ "auf einmal."
+#~ "Ein Plugin zum Speichern aller Anlagen oder von Teilen einer Nachricht auf "
+#~ "einmal."
 
 #~ msgid ""
 #~ "If set, an underline in the text indicates the next character should be "
@@ -26384,9 +26407,9 @@ msgstr "Eingabemethoden"
 #~ msgstr "_Anrufen â?¦"
 
 #~ msgid ""
-#~ "Enable side bar search feature so that you can start interactive "
-#~ "searching by typing in the text. Use is that you can easily find a folder "
-#~ "in that side bar by just typing the folder name and the selection jumps "
+#~ "Enable side bar search feature so that you can start interactive searching "
+#~ "by typing in the text. Use is that you can easily find a folder in that "
+#~ "side bar by just typing the folder name and the selection jumps "
 #~ "automatically to that folder."
 #~ msgstr ""
 #~ "Aktivieren der Seitenleisten-Suchfunktion, damit Sie interaktiv suchen "
@@ -26489,8 +26512,8 @@ msgstr "Eingabemethoden"
 #~ msgstr "_Namen des Postfachs angeben"
 
 #~ msgid ""
-#~ "A plugin that manages a collection of Exchange account specific "
-#~ "operations and features."
+#~ "A plugin that manages a collection of Exchange account specific operations "
+#~ "and features."
 #~ msgstr ""
 #~ "Ein Plugin, das eine Reihe von Exchange-spezifischen AblÃ¤ufen und "
 #~ "Funktionen bereitstellt."
@@ -26579,8 +26602,8 @@ msgstr "Eingabemethoden"
 #~ "Filters junk messages using SpamAssassin. This plugin requires "
 #~ "SpamAssassin to be installed."
 #~ msgstr ""
-#~ "Filtert unerwÃ¼nschte Nachrichten unter Verwendung von SpamAssassin. "
-#~ "Dieses Plugin erfordert, dass SpamAssassin installiert ist."
+#~ "Filtert unerwÃ¼nschte Nachrichten unter Verwendung von SpamAssassin. Dieses "
+#~ "Plugin erfordert, dass SpamAssassin installiert ist."
 
 #~ msgid "Indicates if threading of messages should fall back to subject."
 #~ msgstr ""
@@ -27490,8 +27513,8 @@ msgstr "Eingabemethoden"
 
 #, fuzzy
 #~ msgid ""
-#~ "A plugin which allows the creation of meetings from the contents of a "
-#~ "mail message."
+#~ "A plugin which allows the creation of meetings from the contents of a mail "
+#~ "message."
 #~ msgstr ""
 #~ "Ein Plugin zur Erstellung von Aufgaben aus den Inhalten einer E-Mail."
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]