[evolution-data-server] Updated German translation

From: Mario Blättermann <mariobl src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution-data-server] Updated German translation
Date: Wed, 28 Apr 2010 20:40:11 +0000 (UTC)
commit 7dc43f9001a1927d97178f8efd031cbcdf089407
Author: Mario BlÃ¤ttermann <mariobl gnome org>
Date:   Wed Apr 28 22:39:11 2010 +0200

    Updated German translation

 po/de.po | 2841 ++++++++++++++++++++++++++++++--------------------------------
 1 files changed, 1374 insertions(+), 1467 deletions(-)
---
diff --git a/po/de.po b/po/de.po
index 340fed6..ad6bd57 100644
--- a/po/de.po
+++ b/po/de.po
@@ -16,8 +16,8 @@ msgstr ""
 "Project-Id-Version: evolution-data-server\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution-data-server&component=general\n"
-"POT-Creation-Date: 2010-02-20 15:05+0000\n"
-"PO-Revision-Date: 2010-02-20 16:08+0100\n"
+"POT-Creation-Date: 2010-04-24 15:06+0000\n"
+"PO-Revision-Date: 2010-04-28 22:34+0100\n"
 "Last-Translator: Mario BlÃ¤ttermann <mariobl gnome org>\n"
 "Language-Team: Deutsch <gnome-de gnome org>\n"
 "MIME-Version: 1.0\n"
@@ -35,13 +35,13 @@ msgstr "Ladevorgang â?¦"
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2261
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2283
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2328
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4551
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4553
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
 msgid "Searching..."
 msgstr "Suchvorgang â?¦"
 
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2696
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4715
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4717
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "Kontakte werden heruntergeladen (%d) â?¦"
@@ -53,41 +53,42 @@ msgstr "Kontakte werden heruntergeladen (%d) â?¦"
 msgid "Updating contacts cache (%d)... "
 msgstr "Zwischenspeicher fÃ¼r Kontakte wird aktualisiert (%d) â?¦"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:816
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:818
 msgid "Using Distinguished Name (DN)"
 msgstr "Eindeutiger Name (EN) wird verwendet"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:819
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:821
 msgid "Using Email Address"
 msgstr "E-Mail-Adresse wird verwendet"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1096
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1098
 msgid "Reconnecting to LDAP server..."
 msgstr "Verbindung mit LDAP-Server wird erneut hergestellt â?¦"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1738
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1740
 msgid "Adding contact to LDAP server..."
 msgstr "Kontakt wird zu LDAP-Server hinzugefÃ¼gt â?¦"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1872
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1874
 msgid "Removing contact from LDAP server..."
 msgstr "Kontakt wird von LDAP-Server entfernt â?¦"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2309
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2311
 msgid "Modifying contact from LDAP server..."
 msgstr "Kontakt auf LDAP-Server wird verÃ¤ndert â?¦"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4412
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4414
 msgid "Receiving LDAP search results..."
 msgstr "LDAP-Suchergebnisse werden empfangen â?¦"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4573
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4575
 msgid "Error performing search"
 msgstr "Fehler beim AusfÃ¼hren der Suche"
 
-#: ../addressbook/libebook/e-book.c:2149
+#: ../addressbook/libebook/e-book.c:2152
 #, c-format
-msgid "%s: there was no source for uid `%s' stored in gconf."
+#| msgid "%s: there was no source for uid `%s' stored in gconf."
+msgid "%s: there was no source for UID '%s' stored in GConf."
 msgstr "%s: Es gab keine in GConf gespeicherte Quelle der Benutzerkennung Â»%sÂ«."
 
 #. Dummy row as EContactField starts from 1
@@ -356,27 +357,33 @@ msgid "GroupWise Work Screen Name 3"
 msgstr "Angezeigter GroupWise-GeschÃ¤ftsname 3"
 
 #: ../addressbook/libebook/e-contact.c:203
-msgid "Jabber Home Id 1"
+#| msgid "Jabber Home Id 1"
+msgid "Jabber Home ID 1"
 msgstr "Jabber-Privatkennung 1"
 
 #: ../addressbook/libebook/e-contact.c:204
-msgid "Jabber Home Id 2"
+#| msgid "Jabber Home Id 2"
+msgid "Jabber Home ID 2"
 msgstr "Jabber-Privatkennung 2"
 
 #: ../addressbook/libebook/e-contact.c:205
-msgid "Jabber Home Id 3"
+#| msgid "Jabber Home Id 3"
+msgid "Jabber Home ID 3"
 msgstr "Jabber-Privatkennung 3"
 
 #: ../addressbook/libebook/e-contact.c:206
-msgid "Jabber Work Id 1"
+#| msgid "Jabber Work Id 1"
+msgid "Jabber Work ID 1"
 msgstr "Jabber-GeschÃ¤ftskennung 1"
 
 #: ../addressbook/libebook/e-contact.c:207
-msgid "Jabber Work Id 2"
+#| msgid "Jabber Work Id 2"
+msgid "Jabber Work ID 2"
 msgstr "Jabber-GeschÃ¤ftskennung 2"
 
 #: ../addressbook/libebook/e-contact.c:208
-msgid "Jabber Work Id 3"
+#| msgid "Jabber Work Id 3"
+msgid "Jabber Work ID 3"
 msgstr "Jabber-GeschÃ¤ftskennung 3"
 
 #: ../addressbook/libebook/e-contact.c:209
@@ -428,27 +435,33 @@ msgid "MSN Work Screen Name 3"
 msgstr "Angezeigter MSN-GeschÃ¤ftsname 3"
 
 #: ../addressbook/libebook/e-contact.c:221
-msgid "ICQ Home Id 1"
+#| msgid "ICQ Home Id 1"
+msgid "ICQ Home ID 1"
 msgstr "ICQ-Privatkennung 1"
 
 #: ../addressbook/libebook/e-contact.c:222
-msgid "ICQ Home Id 2"
+#| msgid "ICQ Home Id 2"
+msgid "ICQ Home ID 2"
 msgstr "ICQ-Privatkennung 2"
 
 #: ../addressbook/libebook/e-contact.c:223
-msgid "ICQ Home Id 3"
+#| msgid "ICQ Home Id 3"
+msgid "ICQ Home ID 3"
 msgstr "ICQ-Privatkennung 3"
 
 #: ../addressbook/libebook/e-contact.c:224
-msgid "ICQ Work Id 1"
+#| msgid "ICQ Work Id 1"
+msgid "ICQ Work ID 1"
 msgstr "ICQ-GeschÃ¤ftskennung 1"
 
 #: ../addressbook/libebook/e-contact.c:225
-msgid "ICQ Work Id 2"
+#| msgid "ICQ Work Id 2"
+msgid "ICQ Work ID 2"
 msgstr "ICQ-GeschÃ¤ftskennung 2"
 
 #: ../addressbook/libebook/e-contact.c:226
-msgid "ICQ Work Id 3"
+#| msgid "ICQ Work Id 3"
+msgid "ICQ Work ID 3"
 msgstr "ICQ-GeschÃ¤ftskennung 3"
 
 #. Last modified time
@@ -505,11 +518,13 @@ msgid "AIM Screen Name List"
 msgstr "Liste angezeigter AIM-Namen"
 
 #: ../addressbook/libebook/e-contact.c:250
-msgid "GroupWise Id List"
+#| msgid "GroupWise Id List"
+msgid "GroupWise ID List"
 msgstr "GroupWise-Kennungsliste"
 
 #: ../addressbook/libebook/e-contact.c:251
-msgid "Jabber Id List"
+#| msgid "Jabber Id List"
+msgid "Jabber ID List"
 msgstr "Jabber-Kennungsliste"
 
 #: ../addressbook/libebook/e-contact.c:252
@@ -521,7 +536,8 @@ msgid "MSN Screen Name List"
 msgstr "Liste angezeigter MSN-Namen"
 
 #: ../addressbook/libebook/e-contact.c:254
-msgid "ICQ Id List"
+#| msgid "ICQ Id List"
+msgid "ICQ ID List"
 msgstr "ICQ-Kennungsliste"
 
 #: ../addressbook/libebook/e-contact.c:256
@@ -552,31 +568,38 @@ msgid "X.509 Certificate"
 msgstr "X.509-Zertifikat"
 
 #: ../addressbook/libebook/e-contact.c:267
-msgid "Gadu-Gadu Home Id 1"
+#| msgid "Gadu-Gadu Home Id 1"
+msgid "Gadu-Gadu Home ID 1"
 msgstr "Gadu-Gadu-Privatkennung 1"
 
 #: ../addressbook/libebook/e-contact.c:268
-msgid "Gadu-Gadu Home Id 2"
+#| msgid "Gadu-Gadu Home Id 2"
+msgid "Gadu-Gadu Home ID 2"
 msgstr "Gadu-Gadu-Privatkennung 2"
 
 #: ../addressbook/libebook/e-contact.c:269
-msgid "Gadu-Gadu Home Id 3"
+#| msgid "Gadu-Gadu Home Id 3"
+msgid "Gadu-Gadu Home ID 3"
 msgstr "Gadu-Gadu-Privatkennung 3"
 
 #: ../addressbook/libebook/e-contact.c:270
-msgid "Gadu-Gadu Work Id 1"
+#| msgid "Gadu-Gadu Work Id 1"
+msgid "Gadu-Gadu Work ID 1"
 msgstr "Gadu-Gadu-GeschÃ¤ftskennung 1"
 
 #: ../addressbook/libebook/e-contact.c:271
-msgid "Gadu-Gadu Work Id 2"
+#| msgid "Gadu-Gadu Work Id 2"
+msgid "Gadu-Gadu Work ID 2"
 msgstr "Gadu-Gadu-GeschÃ¤ftskennung 2"
 
 #: ../addressbook/libebook/e-contact.c:272
-msgid "Gadu-Gadu Work Id 3"
+#| msgid "Gadu-Gadu Work Id 3"
+msgid "Gadu-Gadu Work ID 3"
 msgstr "Gadu-Gadu-GeschÃ¤ftskennung 3"
 
 #: ../addressbook/libebook/e-contact.c:273
-msgid "Gadu-Gadu Id List"
+#| msgid "Gadu-Gadu Id List"
+msgid "Gadu-Gadu ID List"
 msgstr "Gadu-Gadu-Kennungsliste"
 
 #. Geo information
@@ -620,7 +643,7 @@ msgstr "Liste angezeigter Skype-Namen"
 msgid "SIP address"
 msgstr "SIP-Adresse"
 
-#: ../addressbook/libebook/e-contact.c:1513
+#: ../addressbook/libebook/e-contact.c:1515
 #: ../addressbook/libebook/e-destination.c:739
 msgid "Unnamed List"
 msgstr "Namenlose Liste"
@@ -674,7 +697,7 @@ msgid "Cannot remove contacts"
 msgstr "Kontakte kÃ¶nnen nicht entfernt werden"
 
 #: ../addressbook/libedata-book/e-data-book.c:569
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
+#: ../calendar/libedata-cal/e-cal-backend-util.c:141
 msgid "Invalid query"
 msgstr "UngÃ¼ltige Abfrage"
 
@@ -712,59 +735,59 @@ msgstr ""
 msgid "Cannot save calendar data"
 msgstr "Kalenderdaten konnten nicht gespeichert werden"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:342
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:321
 msgid "Could not create thread for getting deltas"
 msgstr "Thread zum Abrufen von Ã?nderungen konnte nicht angelegt werden"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:374
-#: ../calendar/backends/google/e-cal-backend-google.c:1144
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1081
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1382
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:353
+#: ../calendar/backends/google/e-cal-backend-google.c:1120
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1088
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1386
 #: ../calendar/backends/http/e-cal-backend-http.c:678
 #: ../calendar/backends/weather/e-cal-backend-weather.c:492
 msgid "Could not create cache file"
 msgstr "Datei zum Zwischenspeichern konnte nicht angelegt werden"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:387
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1094
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:366
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1101
 msgid "Could not create thread for populating cache"
 msgstr "Thread zum Belegen des Zwischenspeichers konnte nicht angelegt werden"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1082
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2122
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1118
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2160
 msgid "Reply Requested: by "
 msgstr "Antwort erbeten: durch "
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1087
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2127
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1123
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2165
 msgid "Reply Requested: When convenient"
 msgstr "Antwort erbeten: Wenn es passt"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:283
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:293
 #, c-format
 msgid "Loading %s items"
 msgstr "%s-Elemente werden geladen"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:919
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:927
 msgid "Calendar"
 msgstr "Kalender"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:977
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:985
 msgid "Invalid server URI"
 msgstr "UngÃ¼ltige Server-URI"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:996
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1005
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1099
-#: ../calendar/libecal/e-cal.c:4020
-#: ../calendar/libedata-cal/e-cal-backend-util.c:117
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1335
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1371
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1386
-#: ../camel/providers/groupwise/camel-groupwise-store.c:598
-#: ../camel/providers/groupwise/camel-groupwise-store.c:773
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:181
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1004
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1013
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1106
+#: ../calendar/libecal/e-cal.c:4019
+#: ../calendar/libedata-cal/e-cal-backend-util.c:119
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1360
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1398
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1413
+#: ../camel/providers/groupwise/camel-groupwise-store.c:603
+#: ../camel/providers/groupwise/camel-groupwise-store.c:780
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:84
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:115
 msgid "Authentication failed"
 msgstr "Legitimation gescheitert"
 
@@ -969,7 +992,7 @@ msgstr "Niedrig"
 msgid "Undefined"
 msgstr "Nicht festgelegt"
 
-#: ../calendar/libecal/e-cal.c:1173 ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1172 ../libedataserverui/e-book-auth-util.c:199
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Geben Sie das Passwort fÃ¼r %s ein (Benutzer %s)"
@@ -978,110 +1001,104 @@ msgstr "Geben Sie das Passwort fÃ¼r %s ein (Benutzer %s)"
 #. This password prompt will be prompted rarely. Since the key that is passed to
 #. the auth_func corresponds to the parent user.
 #.
-#: ../calendar/libecal/e-cal.c:1187
+#: ../calendar/libecal/e-cal.c:1186
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr ""
 "Geben Sie das Passwort fÃ¼r %s ein, um die Stellvertretung fÃ¼r den Benutzer %s "
 "zu aktivieren"
 
-#: ../calendar/libecal/e-cal.c:3992
+#: ../calendar/libecal/e-cal.c:3991
 msgid "Invalid argument"
 msgstr "Argument ungÃ¼ltig"
 
-#: ../calendar/libecal/e-cal.c:3994
+#: ../calendar/libecal/e-cal.c:3993
 msgid "Backend is busy"
 msgstr "Backend belegt"
 
-#: ../calendar/libecal/e-cal.c:3996
-#: ../calendar/libedata-cal/e-cal-backend-util.c:105
+#: ../calendar/libecal/e-cal.c:3995
+#: ../calendar/libedata-cal/e-cal-backend-util.c:107
 msgid "Repository is offline"
 msgstr "Repository offline"
 
 # CHECK
-#: ../calendar/libecal/e-cal.c:3998
-#: ../calendar/libedata-cal/e-cal-backend-util.c:129
+#: ../calendar/libecal/e-cal.c:3997
+#: ../calendar/libedata-cal/e-cal-backend-util.c:131
 msgid "No such calendar"
 msgstr "Kein derartiger Kalender"
 
-#: ../calendar/libecal/e-cal.c:4000
-#: ../calendar/libedata-cal/e-cal-backend-util.c:111
+#: ../calendar/libecal/e-cal.c:3999
+#: ../calendar/libedata-cal/e-cal-backend-util.c:113
 #: ../servers/groupwise/e-gw-connection.c:235
 msgid "Object not found"
 msgstr "Objekt nicht gefunden"
 
-#: ../calendar/libecal/e-cal.c:4002
-#: ../calendar/libedata-cal/e-cal-backend-util.c:113
+#: ../calendar/libecal/e-cal.c:4001
+#: ../calendar/libedata-cal/e-cal-backend-util.c:115
 #: ../servers/groupwise/e-gw-connection.c:229
 msgid "Invalid object"
 msgstr "Objekt ungÃ¼ltig"
 
-#: ../calendar/libecal/e-cal.c:4004
+#: ../calendar/libecal/e-cal.c:4003
 msgid "URI not loaded"
 msgstr "URI nicht geladen"
 
-#: ../calendar/libecal/e-cal.c:4006
+#: ../calendar/libecal/e-cal.c:4005
 msgid "URI already loaded"
 msgstr "URI bereits geladen"
 
-#: ../calendar/libecal/e-cal.c:4008
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
+#: ../calendar/libecal/e-cal.c:4007
+#: ../calendar/libedata-cal/e-cal-backend-util.c:109
 msgid "Permission denied"
 msgstr "Erlaubnis verweigert"
 
-#: ../calendar/libecal/e-cal.c:4010
-#: ../calendar/libedata-cal/e-cal-backend-util.c:131
+#: ../calendar/libecal/e-cal.c:4009
+#: ../calendar/libedata-cal/e-cal-backend-util.c:133
 #: ../servers/groupwise/e-gw-connection.c:237
 msgid "Unknown User"
 msgstr "Unbekannter Benutzer"
 
-#: ../calendar/libecal/e-cal.c:4012
-#: ../calendar/libedata-cal/e-cal-backend-util.c:115
+#: ../calendar/libecal/e-cal.c:4011
+#: ../calendar/libedata-cal/e-cal-backend-util.c:117
 msgid "Object ID already exists"
 msgstr "Objektkennung existiert bereits"
 
-#: ../calendar/libecal/e-cal.c:4014
+#: ../calendar/libecal/e-cal.c:4013
 msgid "Protocol not supported"
 msgstr "Protokoll nicht unterstÃ¼tzt"
 
-#: ../calendar/libecal/e-cal.c:4016
+#: ../calendar/libecal/e-cal.c:4015
 msgid "Operation has been canceled"
 msgstr "Aktion wurde abgebrochen"
 
-#: ../calendar/libecal/e-cal.c:4018
-#: ../calendar/libedata-cal/e-cal-backend-util.c:143
+#: ../calendar/libecal/e-cal.c:4017
+#: ../calendar/libedata-cal/e-cal-backend-util.c:145
 msgid "Could not cancel operation"
 msgstr "Aktion konnte nicht abgebrochen werden"
 
-#: ../calendar/libecal/e-cal.c:4022
-#: ../calendar/libedata-cal/e-cal-backend-util.c:119
-#: ../camel/providers/smtp/camel-smtp-transport.c:217
+#: ../calendar/libecal/e-cal.c:4021
+#: ../calendar/libedata-cal/e-cal-backend-util.c:121
+#: ../camel/providers/smtp/camel-smtp-transport.c:167
 msgid "Authentication required"
 msgstr "Legitimation erforderlich"
 
-#: ../calendar/libecal/e-cal.c:4024
+#: ../calendar/libecal/e-cal.c:4023
 msgid "A CORBA exception has occurred"
 msgstr "Es ist eine CORBA-Exception aufgetreten"
 
-#: ../calendar/libecal/e-cal.c:4026
-#: ../calendar/libedata-cal/e-cal-backend-util.c:146
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
-#: ../camel/providers/imap/camel-imap-command.c:432
-#: ../camel/providers/imap/camel-imap-store.c:741
-#: ../camel/providers/imap4/camel-imap4-engine.c:1547
-#: ../camel/providers/imap4/camel-imap4-engine.c:1585
-#: ../camel/providers/imap4/camel-imap4-engine.c:1629
-#: ../camel/providers/imap4/camel-imap4-engine.c:1684
-#: ../camel/providers/imap4/camel-imap4-store.c:311
-#: ../camel/providers/imap4/camel-imap4-store.c:818
-#: ../camel/providers/imap4/camel-imap4-store.c:1574
-#: ../camel/providers/pop3/camel-pop3-store.c:582
+#: ../calendar/libecal/e-cal.c:4025
+#: ../calendar/libedata-cal/e-cal-backend-util.c:148
+#: ../camel/camel-net-utils.c:534
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:153
+#: ../camel/providers/imap/camel-imap-command.c:451
+#: ../camel/providers/imap/camel-imap-store.c:725
+#: ../camel/providers/pop3/camel-pop3-store.c:593
 #: ../servers/groupwise/e-gw-connection.c:243
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: ../calendar/libecal/e-cal.c:4028
-#: ../calendar/libedata-cal/e-cal-backend-util.c:103
+#: ../calendar/libecal/e-cal.c:4027
+#: ../calendar/libedata-cal/e-cal-backend-util.c:105
 msgid "No error"
 msgstr "Kein Fehler"
 
@@ -1180,157 +1197,157 @@ msgstr ""
 "Â»%sÂ« erwartet als Argumente Zeichenketten, oder aber ein einziges Argument mit "
 "dem Wahrheitswert Â»falschÂ« (#f)"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
+#: ../calendar/libedata-cal/e-cal-backend-util.c:111
 msgid "Invalid range"
 msgstr "UngÃ¼ltiger Bereich"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
+#: ../calendar/libedata-cal/e-cal-backend-util.c:123
 msgid "Unsupported field"
 msgstr "Nicht unterstÃ¼tztes Feld"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
+#: ../calendar/libedata-cal/e-cal-backend-util.c:125
 msgid "Unsupported method"
 msgstr "Nicht unterstÃ¼tzte Methode"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
+#: ../calendar/libedata-cal/e-cal-backend-util.c:127
 msgid "Unsupported authentication method"
 msgstr "Nicht unterstÃ¼tzte Legitimationsmethode"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
+#: ../calendar/libedata-cal/e-cal-backend-util.c:129
 msgid "TLS not available"
 msgstr "TLS nicht verfÃ¼gbar"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
+#: ../calendar/libedata-cal/e-cal-backend-util.c:135
 msgid "Offline mode unavailable"
 msgstr "Offline-Modus nicht verfÃ¼gbar"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
+#: ../calendar/libedata-cal/e-cal-backend-util.c:137
 msgid "Search size limit exceeded"
 msgstr "SuchgrÃ¶Ã?e Ã¼berschritten"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:137
+#: ../calendar/libedata-cal/e-cal-backend-util.c:139
 msgid "Search time limit exceeded"
 msgstr "Suchzeit Ã¼berschritten"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:141
+#: ../calendar/libedata-cal/e-cal-backend-util.c:143
 msgid "Query refused"
 msgstr "Abfrage verweigert"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:148
+#: ../calendar/libedata-cal/e-cal-backend-util.c:150
 msgid "Invalid server version"
 msgstr "UngÃ¼ltige Server-Version"
 
-#: ../calendar/libedata-cal/e-data-cal.c:491
+#: ../calendar/libedata-cal/e-data-cal.c:501
 #, c-format
 msgid "Cannot retrieve calendar address"
 msgstr "Kalenderadresse kann nicht ermittelt werden"
 
-#: ../calendar/libedata-cal/e-data-cal.c:509
+#: ../calendar/libedata-cal/e-data-cal.c:519
 #, c-format
 msgid "Cannot retrieve calendar alarm e-mail address"
 msgstr "Die E-Mail-Adresse des Kalenderalarms kann nicht ermittelt werden"
 
-#: ../calendar/libedata-cal/e-data-cal.c:527
+#: ../calendar/libedata-cal/e-data-cal.c:537
 #, c-format
 msgid "Cannot retrieve calendar's ldap attribute"
 msgstr "LDAP-Attribut des Kalenders kann nicht ermittelt werden"
 
-#: ../calendar/libedata-cal/e-data-cal.c:545
+#: ../calendar/libedata-cal/e-data-cal.c:555
 #, c-format
 msgid "Cannot retrieve calendar scheduling information"
 msgstr "Plandaten des Kalenders kÃ¶nnen nicht abgerufen werden"
 
-#: ../calendar/libedata-cal/e-data-cal.c:562
+#: ../calendar/libedata-cal/e-data-cal.c:572
 #, c-format
 msgid "Cannot open calendar"
 msgstr "Kalender kann nicht geÃ¶ffnet werden"
 
-#: ../calendar/libedata-cal/e-data-cal.c:579
+#: ../calendar/libedata-cal/e-data-cal.c:591
 #, c-format
 msgid "Cannot refresh calendar"
 msgstr "Kalender kann nicht aufgefrischt werden"
 
-#: ../calendar/libedata-cal/e-data-cal.c:596
+#: ../calendar/libedata-cal/e-data-cal.c:608
 #, c-format
 msgid "Cannot remove calendar"
 msgstr "Kalender kann nicht entfernt werden"
 
-#: ../calendar/libedata-cal/e-data-cal.c:615
+#: ../calendar/libedata-cal/e-data-cal.c:627
 #, c-format
 msgid "Cannot create calendar object"
 msgstr "Kalenderobjekt kann nicht angelegt werden"
 
-#: ../calendar/libedata-cal/e-data-cal.c:637
+#: ../calendar/libedata-cal/e-data-cal.c:649
 #, c-format
 msgid "Cannot modify calendar object"
 msgstr "Kalenderobjekt kann nicht verÃ¤ndert werden"
 
-#: ../calendar/libedata-cal/e-data-cal.c:661
+#: ../calendar/libedata-cal/e-data-cal.c:673
 #, c-format
 msgid "Cannot remove calendar object"
 msgstr "Kalenderobjekt kann nicht entfernt werden"
 
-#: ../calendar/libedata-cal/e-data-cal.c:680
+#: ../calendar/libedata-cal/e-data-cal.c:692
 #, c-format
 msgid "Cannot receive calendar objects"
 msgstr "Kalenderobjekte kÃ¶nnen nicht empfangen werden"
 
-#: ../calendar/libedata-cal/e-data-cal.c:697
+#: ../calendar/libedata-cal/e-data-cal.c:709
 #, c-format
 msgid "Cannot discard calendar alarm"
 msgstr "Kalenderalarm kann nicht verworfen werden"
 
-#: ../calendar/libedata-cal/e-data-cal.c:716
+#: ../calendar/libedata-cal/e-data-cal.c:728
 #, c-format
 msgid "Cannot send calendar objects"
 msgstr "Kalenderobjekte kÃ¶nnen nicht gesendet werden"
 
-#: ../calendar/libedata-cal/e-data-cal.c:751
+#: ../calendar/libedata-cal/e-data-cal.c:763
 #, c-format
 msgid "Cannot retrieve default calendar object path"
 msgstr "Objektpfad des voreingestellten Kalenders kann nicht abgerufen werden"
 
-#: ../calendar/libedata-cal/e-data-cal.c:769
+#: ../calendar/libedata-cal/e-data-cal.c:781
 #, c-format
 msgid "Cannot retrieve calendar object path"
 msgstr "Objektpfad des Kalenders kann nicht abgerufen werden"
 
-#: ../calendar/libedata-cal/e-data-cal.c:787
+#: ../calendar/libedata-cal/e-data-cal.c:799
 #, c-format
 msgid "Cannot retrieve calendar object list"
 msgstr "Liste der Kalenderobjekte kann nicht abgerufen werden"
 
-#: ../calendar/libedata-cal/e-data-cal.c:825
+#: ../calendar/libedata-cal/e-data-cal.c:837
 #, c-format
 msgid "Could not retrieve attachment list"
 msgstr "Liste der AnhÃ¤nge kann nicht abgerufen werden"
 
-#: ../calendar/libedata-cal/e-data-cal.c:847
+#: ../calendar/libedata-cal/e-data-cal.c:859
 #, c-format
 msgid "Could not complete calendar query"
 msgstr "Kalenderanfrage konnte nicht beendet werden"
 
-#: ../calendar/libedata-cal/e-data-cal.c:865
+#: ../calendar/libedata-cal/e-data-cal.c:877
 #, c-format
 msgid "Could not retrieve calendar time zone"
 msgstr "Zeitzone des Kalenders konnte nicht beendet werden"
 
-#: ../calendar/libedata-cal/e-data-cal.c:883
+#: ../calendar/libedata-cal/e-data-cal.c:895
 #, c-format
 msgid "Could not add calendar time zone"
 msgstr "Zeitzone des Kalenders konnte nicht hinzugefÃ¼gt werden"
 
-#: ../calendar/libedata-cal/e-data-cal.c:900
+#: ../calendar/libedata-cal/e-data-cal.c:912
 #, c-format
 msgid "Could not set default calendar time zone"
 msgstr "Voreingestellte Zeitzone des Kalenders konnte nicht eingestellt werden"
 
-#: ../calendar/libedata-cal/e-data-cal.c:921
+#: ../calendar/libedata-cal/e-data-cal.c:933
 #, c-format
 msgid "Cannot retrieve calendar changes"
 msgstr "KalenderÃ¤nderungen kÃ¶nnen nicht abgerufen werden"
 
-#: ../calendar/libedata-cal/e-data-cal.c:971
+#: ../calendar/libedata-cal/e-data-cal.c:983
 #, c-format
 msgid "Cannot retrieve calendar free/busy list"
 msgstr "VerfÃ¼gbarkeitsliste des Kalenders kann nicht abgerufen werden"
@@ -1350,60 +1367,60 @@ msgstr "Keine Backend-Factory fÃ¼r Â»%sÂ« von Â»%sÂ«"
 msgid "Could not instantiate backend"
 msgstr "Backend-Instanz konnte nicht angelegt werden"
 
-#: ../camel/camel-cipher-context.c:102
+#: ../camel/camel-cipher-context.c:74
 msgid "Signing is not supported by this cipher"
 msgstr "Signieren wird von dieser VerschlÃ¼sselung nicht unterstÃ¼tzt"
 
-#: ../camel/camel-cipher-context.c:128
+#: ../camel/camel-cipher-context.c:109
 msgid "Signing message"
 msgstr "Nachricht wird signiert"
 
-#: ../camel/camel-cipher-context.c:145
+#: ../camel/camel-cipher-context.c:129
 msgid "Verifying is not supported by this cipher"
 msgstr "PrÃ¼fen wird von dieser VerschlÃ¼sselung nicht unterstÃ¼tzt"
 
-#: ../camel/camel-cipher-context.c:171
+#: ../camel/camel-cipher-context.c:162
 msgid "Verifying message"
 msgstr "Nachricht wird verifiziert"
 
-#: ../camel/camel-cipher-context.c:189
+#: ../camel/camel-cipher-context.c:185
 msgid "Encryption is not supported by this cipher"
 msgstr "VerschlÃ¼sseln wird von dieser VerschlÃ¼sselung nicht unterstÃ¼tzt"
 
-#: ../camel/camel-cipher-context.c:215
+#: ../camel/camel-cipher-context.c:220
 msgid "Encrypting message"
 msgstr "Nachricht wird verschlÃ¼sselt"
 
-#: ../camel/camel-cipher-context.c:232
+#: ../camel/camel-cipher-context.c:242
 msgid "Decryption is not supported by this cipher"
 msgstr "Entziffern wird von dieser VerschlÃ¼sselung nicht unterstÃ¼tzt"
 
-#: ../camel/camel-cipher-context.c:254
+#: ../camel/camel-cipher-context.c:272
 msgid "Decrypting message"
 msgstr "Nachricht wird entschlÃ¼sselt"
 
-#: ../camel/camel-cipher-context.c:271
+#: ../camel/camel-cipher-context.c:292
 msgid "You may not import keys with this cipher"
 msgstr "Sie dÃ¼rfen keine SchlÃ¼ssel mit dieser VerschlÃ¼sselung importieren"
 
-#: ../camel/camel-cipher-context.c:301
+#: ../camel/camel-cipher-context.c:332
 msgid "You may not export keys with this cipher"
 msgstr "Sie dÃ¼rfen keine SchlÃ¼ssel mit dieser VerschlÃ¼sselung exportieren"
 
-#: ../camel/camel-data-cache.c:135
+#: ../camel/camel-data-cache.c:184
 msgid "Unable to create cache path"
 msgstr "Cache-Pfad konnte nicht angelegt werden"
 
-#: ../camel/camel-data-cache.c:401
+#: ../camel/camel-data-cache.c:475
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Cache-Eintrag konnte nicht entfernt werden: %s: %s"
 
-#: ../camel/camel-db.c:411
+#: ../camel/camel-db.c:458
 msgid "Insufficient memory"
 msgstr "Nicht ausreichender Speicher"
 
-#: ../camel/camel-disco-diary.c:197
+#: ../camel/camel-disco-diary.c:188
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -1414,8 +1431,8 @@ msgstr ""
 "Auf diesem Server kÃ¶nnen keine weiteren VorgÃ¤nge wiedergegeben\n"
 "werden, sobald Sie die Netzwerkverbindung erneut herstellen."
 
-#: ../camel/camel-disco-diary.c:260
-#: ../camel/providers/imap/camel-imap-journal.c:320
+#: ../camel/camel-disco-diary.c:252
+#: ../camel/providers/imap/camel-imap-journal.c:297
 #, c-format
 msgid ""
 "Could not open '%s':\n"
@@ -1426,120 +1443,123 @@ msgstr ""
 "%s\n"
 "Ã?nderungen an diesem Ordner werden nicht neu abgeglichen werden."
 
-#: ../camel/camel-disco-diary.c:296
+#: ../camel/camel-disco-diary.c:292
 msgid "Resynchronizing with server"
 msgstr "Neu abgleichen mit dem Server"
 
-#: ../camel/camel-disco-folder.c:43 ../camel/camel-offline-folder.c:51
+#: ../camel/camel-disco-folder.c:38 ../camel/camel-offline-folder.c:37
 msgid "Copy folder content locally for offline operation"
 msgstr "Den Ordnerinhalt lokal zum Arbeiten im Offline-Modus kopieren"
 
-#: ../camel/camel-disco-folder.c:105 ../camel/camel-offline-folder.c:107
+#: ../camel/camel-disco-folder.c:59 ../camel/camel-offline-folder.c:56
 msgid "Downloading new messages for offline mode"
 msgstr "Neue Nachrichten werden fÃ¼r Offline-Modus abgerufen"
 
-#: ../camel/camel-disco-folder.c:466
+#: ../camel/camel-disco-folder.c:360
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Ordner Â»%sÂ« wird fÃ¼r den Offline-Modus vorbereitet"
 
-#: ../camel/camel-disco-store.c:400
-#: ../camel/providers/groupwise/camel-groupwise-store.c:223
-#: ../camel/providers/imap/camel-imap-store.c:1001
-#: ../camel/providers/imap/camel-imap-store.c:1843
-#: ../camel/providers/imap/camel-imap-store.c:2259
-#: ../camel/providers/imap/camel-imap-store.c:3068
+#: ../camel/camel-disco-store.c:373
+#: ../camel/providers/groupwise/camel-groupwise-store.c:227
+#: ../camel/providers/imap/camel-imap-store.c:988
+#: ../camel/providers/imap/camel-imap-store.c:1845
+#: ../camel/providers/imap/camel-imap-store.c:2303
+#: ../camel/providers/imap/camel-imap-store.c:3134
+#: ../camel/providers/imapx/camel-imapx-store.c:172
+#: ../camel/providers/imapx/camel-imapx-store.c:649
+#: ../camel/providers/imapx/camel-imapx-store.c:713
+#: ../camel/providers/imapx/camel-imapx-store.c:764
 msgid "You must be working online to complete this operation"
 msgstr "Sie mÃ¼ssen online arbeiten, um diesen Vorgang abzuschlieÃ?en"
 
-#: ../camel/camel-exception.c:260
+#: ../camel/camel-exception.c:259
 msgid "No description available"
 msgstr "Keine Beschreibung verfÃ¼gbar"
 
-#: ../camel/camel-filter-driver.c:794 ../camel/camel-filter-search.c:579
+#: ../camel/camel-filter-driver.c:803 ../camel/camel-filter-search.c:583
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "Kindprozess Â»%sÂ« konnte nicht erstellt werden: %s"
 
-#: ../camel/camel-filter-driver.c:836
+#: ../camel/camel-filter-driver.c:846
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "UngÃ¼ltiger Nachrichten-Datenstrom von %s erhalten: %s"
 
-#: ../camel/camel-filter-driver.c:1025 ../camel/camel-filter-driver.c:1034
+#: ../camel/camel-filter-driver.c:1035 ../camel/camel-filter-driver.c:1044
 msgid "Syncing folders"
 msgstr "Ordner werden abgeglichen"
 
-#: ../camel/camel-filter-driver.c:1121 ../camel/camel-filter-driver.c:1522
+#: ../camel/camel-filter-driver.c:1132 ../camel/camel-filter-driver.c:1559
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fehler beim Analysieren der Filtersyntax: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1130 ../camel/camel-filter-driver.c:1531
+#: ../camel/camel-filter-driver.c:1142 ../camel/camel-filter-driver.c:1569
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fehler beim AusfÃ¼hren des Filters: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1216
+#: ../camel/camel-filter-driver.c:1234
 msgid "Unable to open spool folder"
 msgstr "Der Spool-Ordner konnte nicht geÃ¶ffnet werden"
 
-#: ../camel/camel-filter-driver.c:1225
+#: ../camel/camel-filter-driver.c:1245
 msgid "Unable to process spool folder"
 msgstr "Der Spool-Ordner konnte nicht verarbeitet werden"
 
-#: ../camel/camel-filter-driver.c:1241
+#: ../camel/camel-filter-driver.c:1262
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Nachricht %d wird abgerufen (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1245
+#: ../camel/camel-filter-driver.c:1268
 msgid "Cannot open message"
 msgstr "Nachricht konnte nicht geÃ¶ffnet werden"
 
-#: ../camel/camel-filter-driver.c:1246 ../camel/camel-filter-driver.c:1264
+#: ../camel/camel-filter-driver.c:1269 ../camel/camel-filter-driver.c:1290
 #, c-format
 msgid "Failed on message %d"
 msgstr "Fehlgeschlagen bei Nachricht %d"
 
-#: ../camel/camel-filter-driver.c:1278 ../camel/camel-filter-driver.c:1368
+#: ../camel/camel-filter-driver.c:1304 ../camel/camel-filter-driver.c:1401
 msgid "Syncing folder"
 msgstr "Ordner wird abgeglichen"
 
-#: ../camel/camel-filter-driver.c:1282 ../camel/camel-filter-driver.c:1373
+#: ../camel/camel-filter-driver.c:1308 ../camel/camel-filter-driver.c:1406
 msgid "Complete"
 msgstr "Abgeschlossen"
 
-#: ../camel/camel-filter-driver.c:1338
+#: ../camel/camel-filter-driver.c:1368
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Nachricht %d von %d wird abgerufen"
 
-#: ../camel/camel-filter-driver.c:1353
+#: ../camel/camel-filter-driver.c:1386
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Fehlgeschlagen bei Nachricht %d von %d"
 
-#: ../camel/camel-filter-search.c:137
+#: ../camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "Nachricht konnte nicht abgerufen werden"
 
-#: ../camel/camel-filter-search.c:399
+#: ../camel/camel-filter-search.c:402
 msgid "Invalid arguments to (system-flag)"
 msgstr "UngÃ¼ltige Argumente bei (system-flag)"
 
-#: ../camel/camel-filter-search.c:414
+#: ../camel/camel-filter-search.c:417
 msgid "Invalid arguments to (user-tag)"
 msgstr "UngÃ¼ltige Argumente bei (user-tag)"
 
-#. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: ../camel/camel-filter-search.c:735 ../camel/camel-filter-search.c:743
+#: ../camel/camel-filter-search.c:742 ../camel/camel-filter-search.c:751
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Fehler beim AusfÃ¼hren einer Filtersuche: %s: %s"
 
-#: ../camel/camel-folder-search.c:351 ../camel/camel-folder-search.c:453
-#: ../camel/camel-folder-search.c:608
+#: ../camel/camel-folder-search.c:346 ../camel/camel-folder-search.c:458
+#: ../camel/camel-folder-search.c:622
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1548,8 +1568,8 @@ msgstr ""
 "Syntax des Suchausdrucks konnte nicht analysiert werden: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:361 ../camel/camel-folder-search.c:463
-#: ../camel/camel-folder-search.c:618
+#: ../camel/camel-folder-search.c:359 ../camel/camel-folder-search.c:471
+#: ../camel/camel-folder-search.c:635
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1558,73 +1578,68 @@ msgstr ""
 "Fehler beim AusfÃ¼hren eines Suchausdrucks: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:810 ../camel/camel-folder-search.c:852
+#: ../camel/camel-folder-search.c:829 ../camel/camel-folder-search.c:871
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) erfordert einen einzelnen Boole'schen Wert als Ergebnis"
 
-#: ../camel/camel-folder-search.c:905
+#: ../camel/camel-folder-search.c:924
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) nicht erlaubt innerhalb von %s"
 
-#: ../camel/camel-folder-search.c:911 ../camel/camel-folder-search.c:918
+#: ../camel/camel-folder-search.c:930 ../camel/camel-folder-search.c:937
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) erfordert den Treffertyp Zeichenkette"
 
-#: ../camel/camel-folder-search.c:945
+#: ../camel/camel-folder-search.c:964
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) erwartet ein Array-Ergebnis"
 
-#: ../camel/camel-folder-search.c:954
+#: ../camel/camel-folder-search.c:973
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) erfordert, dass der Ordner festgelegt ist"
 
-#: ../camel/camel-folder.c:676
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Nicht unterstÃ¼tzter Vorgang: Nachricht anhÃ¤ngen: fÃ¼r %s"
-
-#: ../camel/camel-folder.c:1381
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Nicht unterstÃ¼tzter Vorgang: Suche nach Ausdruck: fÃ¼r %s"
-
-#: ../camel/camel-folder.c:1422
-#, c-format
-msgid "Unsupported operation: count by expression: for %s"
-msgstr "Nicht unterstÃ¼tzter Vorgang: Anzahl nach Ausdruck: fÃ¼r %s"
-
-#: ../camel/camel-folder.c:1461
-#, c-format
-msgid "Unsupported operation: search by UIDs: for %s"
-msgstr "Nicht unterstÃ¼tzter Vorgang: Suche nach UIDs: fÃ¼r %s"
-
-#: ../camel/camel-folder.c:1574
-#: ../camel/providers/local/camel-maildir-folder.c:387
+#: ../camel/camel-folder.c:624
+#: ../camel/providers/local/camel-maildir-folder.c:393
 msgid "Moving messages"
 msgstr "Nachrichten werden verschoben"
 
-#: ../camel/camel-folder.c:1574
+#: ../camel/camel-folder.c:626
 msgid "Copying messages"
 msgstr "Nachrichten werden kopiert"
 
-#: ../camel/camel-folder.c:1915
-msgid "Learning junk"
-msgstr "WerbemÃ¼ll wird erlernt"
-
-#: ../camel/camel-folder.c:1933
-msgid "Learning non-junk"
-msgstr "Â»Kein WerbemÃ¼llÂ« wird gelernt"
-
-#: ../camel/camel-folder.c:1953
-msgid "Filtering new message(s)"
-msgstr "Neue Nachricht(en) wird/werden gefiltert"
-
-#: ../camel/camel-gpg-context.c:760
+#. Translators: The %s is replaced with a folder name where the operation is running.
+#: ../camel/camel-folder.c:2126
+#, fuzzy, c-format
+#| msgid "Scanning for changed messages in %s"
+msgid "Learning new spam message in '%s'"
+msgid_plural "Learning new spam messages in '%s'"
+msgstr[0] "GeÃ¤nderte Nachrichten werden in %s gesucht"
+msgstr[1] "GeÃ¤nderte Nachrichten werden in %s gesucht"
+
+#. Translators: The %s is replaced with a folder name where the operation is running.
+#: ../camel/camel-folder.c:2145
+#, fuzzy, c-format
+#| msgid "Scanning for changed messages in %s"
+msgid "Learning new ham message in '%s'"
+msgid_plural "Learning new ham messages in '%s'"
+msgstr[0] "GeÃ¤nderte Nachrichten werden in %s gesucht"
+msgstr[1] "GeÃ¤nderte Nachrichten werden in %s gesucht"
+
+#. Translators: The %s is replaced with a folder name where the operation is running.
+#: ../camel/camel-folder.c:2166
+#, c-format
+#| msgid "Filtering new message(s)"
+msgid "Filtering new message in '%s'"
+msgid_plural "Filtering new messages in '%s'"
+msgstr[0] "Neue Nachricht in Â»%sÂ« wird gefiltert"
+msgstr[1] "Neue Nachrichten in Â»%sÂ« werden gefiltert"
+
+#: ../camel/camel-gpg-context.c:740
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1635,18 +1650,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:775
+#: ../camel/camel-gpg-context.c:757
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 "Die Syntax des gpg-Wink auf die Benutzerkennung konnte nicht analysiert "
 "werden."
 
-#: ../camel/camel-gpg-context.c:799 ../camel/camel-gpg-context.c:813
+#: ../camel/camel-gpg-context.c:782 ../camel/camel-gpg-context.c:797
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 "Die Syntax des gpg-Winks auf das Passwort konnte nicht analysiert werden."
 
-#: ../camel/camel-gpg-context.c:833
+#: ../camel/camel-gpg-context.c:817
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1655,7 +1670,7 @@ msgstr ""
 "FÃ¼r das Entsperren Ihrer SmartCard\n"
 "Â»%sÂ« ist ein Passwort erforderlich"
 
-#: ../camel/camel-gpg-context.c:837
+#: ../camel/camel-gpg-context.c:821
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1664,296 +1679,293 @@ msgstr ""
 "FÃ¼r das Entsperren des SchlÃ¼ssels fÃ¼r den\n"
 "Benutzer %s ist ein Passwort erforderlich."
 
-#: ../camel/camel-gpg-context.c:842
+#: ../camel/camel-gpg-context.c:827
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "Unerwartete Anfrage von GnuPG fÃ¼r Â»%sÂ«"
 
-#: ../camel/camel-gpg-context.c:867 ../camel/camel-gpg-context.c:1113
-#: ../camel/providers/nntp/camel-nntp-store.c:1313
+#: ../camel/camel-gpg-context.c:855 ../camel/camel-gpg-context.c:1107
 msgid "Canceled."
 msgstr "Abgesagt."
 
-#: ../camel/camel-gpg-context.c:881
+#: ../camel/camel-gpg-context.c:870
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "GeheimschlÃ¼ssel konnte nicht entsperrt werden: 3 falsche PasswÃ¶rter "
 "eingegeben."
 
-#: ../camel/camel-gpg-context.c:889
+#: ../camel/camel-gpg-context.c:882
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Unerwartete GnuPG-Antwort: %s"
 
-#: ../camel/camel-gpg-context.c:988
+#: ../camel/camel-gpg-context.c:982
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 "Nachricht konnte nicht verschlÃ¼sselt werden: keine gÃ¼ltigen EmpfÃ¤nger "
 "angegeben."
 
-#. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1262 ../camel/camel-gpg-context.c:1387
-#: ../camel/camel-gpg-context.c:1953 ../camel/camel-gpg-context.c:1998
+#: ../camel/camel-gpg-context.c:1261 ../camel/camel-gpg-context.c:1400
+#: ../camel/camel-gpg-context.c:2022 ../camel/camel-gpg-context.c:2074
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "gpg konnte nicht ausgefÃ¼hrt werden: %s"
 
-#: ../camel/camel-gpg-context.c:1355 ../camel/camel-smime-context.c:605
+#: ../camel/camel-gpg-context.c:1366 ../camel/camel-smime-context.c:752
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Signaturdaten konnten nicht erzeugt werden: %s"
 
-#: ../camel/camel-gpg-context.c:1402 ../camel/camel-gpg-context.c:1630
-#: ../camel/camel-gpg-context.c:1646 ../camel/camel-gpg-context.c:1728
-#: ../camel/camel-gpg-context.c:1743 ../camel/camel-gpg-context.c:1859
-#: ../camel/camel-gpg-context.c:1874 ../camel/camel-gpg-context.c:1969
-#: ../camel/camel-gpg-context.c:2014
+#: ../camel/camel-gpg-context.c:1419 ../camel/camel-gpg-context.c:1665
+#: ../camel/camel-gpg-context.c:1684 ../camel/camel-gpg-context.c:1777
+#: ../camel/camel-gpg-context.c:1796 ../camel/camel-gpg-context.c:1920
+#: ../camel/camel-gpg-context.c:1938 ../camel/camel-gpg-context.c:2041
+#: ../camel/camel-gpg-context.c:2093
 msgid "Failed to execute gpg."
 msgstr "gpg konnte nicht ausgefÃ¼hrt werden."
 
-#: ../camel/camel-gpg-context.c:1534 ../camel/camel-gpg-context.c:1540
-#: ../camel/camel-gpg-context.c:1546 ../camel/camel-gpg-context.c:1561
-#: ../camel/camel-smime-context.c:929 ../camel/camel-smime-context.c:940
-#: ../camel/camel-smime-context.c:947
+#: ../camel/camel-gpg-context.c:1559 ../camel/camel-gpg-context.c:1567
+#: ../camel/camel-gpg-context.c:1575 ../camel/camel-gpg-context.c:1592
+#: ../camel/camel-smime-context.c:874 ../camel/camel-smime-context.c:887
+#: ../camel/camel-smime-context.c:895
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 "Nachrichtensignatur konnte nicht verifiziert werden: Nachrichtenformat "
 "fehlerhaft"
 
-#: ../camel/camel-gpg-context.c:1600
+#: ../camel/camel-gpg-context.c:1633
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Die Nachrichtensignatur konnte nicht verifiziert werden: TemporÃ¤re Datei "
 "konnte nicht erstellt werden: %s"
 
-#: ../camel/camel-gpg-context.c:1711
+#: ../camel/camel-gpg-context.c:1758
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "VerschlÃ¼sselungsdaten konnten nicht erzeugt werden: %s"
 
-#: ../camel/camel-gpg-context.c:1761
+#: ../camel/camel-gpg-context.c:1814
 msgid "This is a digitally encrypted message part"
 msgstr "Dies ist ein digital verschlÃ¼sselter Nachrichtenteil"
 
-#: ../camel/camel-gpg-context.c:1814 ../camel/camel-gpg-context.c:1822
-#: ../camel/camel-gpg-context.c:1841
+#: ../camel/camel-gpg-context.c:1870 ../camel/camel-gpg-context.c:1879
+#: ../camel/camel-gpg-context.c:1901
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr ""
 "Nachricht konnte nicht entschlÃ¼sselt werden: Nachrichtenformat fehlerhaft"
 
-#: ../camel/camel-gpg-context.c:1831
+#: ../camel/camel-gpg-context.c:1890
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "MIME-Teil konnte nicht entschlÃ¼sselt werden: Protokollfehler"
 
-#: ../camel/camel-gpg-context.c:1909 ../camel/camel-smime-context.c:1205
+#: ../camel/camel-gpg-context.c:1974 ../camel/camel-smime-context.c:1168
 msgid "Encrypted content"
 msgstr "VerschlÃ¼sselter Inhalt"
 
-#: ../camel/camel-gpg-context.c:1930
+#: ../camel/camel-gpg-context.c:1996
 msgid "Unable to parse message content"
 msgstr "Syntax des Nachrichteninhalts konnte nicht analysiert werden"
 
-#: ../camel/camel-gpg-context.c:1954 ../camel/camel-gpg-context.c:1999
-#: ../camel/providers/imap4/camel-imap4-utils.c:614
-#: ../camel/providers/smtp/camel-smtp-transport.c:165
-#: ../camel/providers/smtp/camel-smtp-transport.c:220
+#: ../camel/camel-gpg-context.c:2023 ../camel/camel-gpg-context.c:2075
+#: ../camel/providers/smtp/camel-smtp-transport.c:115
+#: ../camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../camel/camel-lock-client.c:104
+#: ../camel/camel-lock-client.c:105
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Weiterleitung an Sperrhilfsprogramm konnte nicht angelegt werden: %s"
 
-#: ../camel/camel-lock-client.c:126
+#: ../camel/camel-lock-client.c:128
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "Sperrhilfsprogramm konnte nicht abgespalten werden: %s"
 
-#: ../camel/camel-lock-client.c:203 ../camel/camel-lock-client.c:226
+#: ../camel/camel-lock-client.c:208 ../camel/camel-lock-client.c:234
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "Â»%sÂ« konnte nicht gesperrt werden: Protokollfehler mit lock-helper"
 
-#: ../camel/camel-lock-client.c:216
+#: ../camel/camel-lock-client.c:223
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "Â»%sÂ« konnte nicht gesperrt werden"
 
-#: ../camel/camel-lock.c:103
+#: ../camel/camel-lock.c:104
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Sperrdatei fÃ¼r %s konnte nicht angelegt werden: %s"
 
-#: ../camel/camel-lock.c:144
+#: ../camel/camel-lock.c:147
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "ZeitÃ¼berschreitung beim Versuch, eine Sperrdatei auf %s zu erhalten. "
 "Versuchen Sie es spÃ¤ter noch einmal."
 
-#: ../camel/camel-lock.c:199
+#: ../camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "fcntl(2)-Sperre konnte nicht erhalten werden: %s"
 
-#: ../camel/camel-lock.c:262
+#: ../camel/camel-lock.c:272
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2)-Sperre konnte nicht erhalten werden: %s"
 
-#: ../camel/camel-movemail.c:106
+#: ../camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "E-Mail-Datei %s konnte nicht Ã¼berprÃ¼ft werden: %s"
 
-#: ../camel/camel-movemail.c:119
+#: ../camel/camel-movemail.c:121
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "E-Mail-Datei %s konnte nicht geÃ¶ffnet werden: %s"
 
-#: ../camel/camel-movemail.c:127
+#: ../camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "TemporÃ¤re E-Mail-Datei %s konnte nicht geÃ¶ffnet werden: %s"
 
-#: ../camel/camel-movemail.c:156
+#: ../camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "E-Mail konnte nicht in temporÃ¤rer Datei %s gespeichert werden: %s"
 
-#: ../camel/camel-movemail.c:186
+#: ../camel/camel-movemail.c:192
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Weiterleitung konnte nicht angelegt werden: %s"
 
-#: ../camel/camel-movemail.c:198
+#: ../camel/camel-movemail.c:205
 #, c-format
 msgid "Could not fork: %s"
 msgstr "forK() konnte nicht durchgefÃ¼hrt werden: %s"
 
-#: ../camel/camel-movemail.c:236
+#: ../camel/camel-movemail.c:243
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail-Programm gescheitert: %s"
 
-#: ../camel/camel-movemail.c:237
+#: ../camel/camel-movemail.c:244
 msgid "(Unknown error)"
 msgstr "(Unbekannter Fehler)"
 
-#: ../camel/camel-movemail.c:260
+#: ../camel/camel-movemail.c:270
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Fehler beim Lesen der E-Mail-Datei: %s"
 
-#: ../camel/camel-movemail.c:271
+#: ../camel/camel-movemail.c:282
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Fehler beim Schreiben der temporÃ¤ren E-Mail-Datei: %s"
 
-#: ../camel/camel-movemail.c:464 ../camel/camel-movemail.c:531
+#: ../camel/camel-movemail.c:478 ../camel/camel-movemail.c:546
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Fehler beim Kopieren der temporÃ¤ren E-Mail-Datei: %s"
 
-#: ../camel/camel-multipart-signed.c:592
+#: ../camel/camel-multipart-signed.c:593
 msgid "parse error"
 msgstr "Fehler bei der Syntaxanalyse"
 
-#: ../camel/camel-net-utils.c:503 ../camel/camel-net-utils.c:674
-#: ../camel/camel-net-utils.c:805
-#: ../camel/providers/pop3/camel-pop3-store.c:476
-#: ../camel/providers/pop3/camel-pop3-store.c:576
+#: ../camel/camel-net-utils.c:511 ../camel/camel-net-utils.c:694
+#: ../camel/camel-net-utils.c:842
+#: ../camel/providers/pop3/camel-pop3-store.c:477
+#: ../camel/providers/pop3/camel-pop3-store.c:586
 msgid "Canceled"
 msgstr "Abgesagt"
 
-#: ../camel/camel-net-utils.c:521
+#: ../camel/camel-net-utils.c:533
 msgid "cannot create thread"
 msgstr "Thread konnte nicht erstellt werden"
 
-#: ../camel/camel-net-utils.c:678
+#: ../camel/camel-net-utils.c:698
 #, c-format
 msgid "Resolving: %s"
 msgstr "%s wird aufgelÃ¶st"
 
-#: ../camel/camel-net-utils.c:700
+#: ../camel/camel-net-utils.c:720
 msgid "Host lookup failed"
 msgstr "Finden eines Rechners gescheitert"
 
-#: ../camel/camel-net-utils.c:702
+#: ../camel/camel-net-utils.c:724
 #, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr "Finden eines Rechners gescheitert: %s: %s"
 
-#: ../camel/camel-net-utils.c:809
+#: ../camel/camel-net-utils.c:846
 msgid "Resolving address"
 msgstr "Adresse wird aufgelÃ¶st"
 
-#: ../camel/camel-net-utils.c:829
+#: ../camel/camel-net-utils.c:866
 msgid "Name lookup failed"
 msgstr "Namenssuche fehlgeschlagen"
 
-#: ../camel/camel-net-utils.c:832
+#: ../camel/camel-net-utils.c:871
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "Namenssuche fehlgeschlagen: %s"
 
-#: ../camel/camel-offline-folder.c:249
+#: ../camel/camel-offline-folder.c:191
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "Nachrichten im Ordner Â»%sÂ« werden auf Festplatte abgeglichen"
 
-#: ../camel/camel-offline-journal.c:159 ../camel/camel-offline-journal.c:182
+#: ../camel/camel-offline-journal.c:143 ../camel/camel-offline-journal.c:167
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "Offline-Journal fÃ¼r Ordner Â»%sÂ« konnte nicht geschrieben werden: %s"
 
-#: ../camel/camel-provider.c:60
+#: ../camel/camel-provider.c:59
 msgid "Virtual folder email provider"
 msgstr "E-Mail-Treiber: Virtueller Ordner"
 
-#: ../camel/camel-provider.c:62
+#: ../camel/camel-provider.c:61
 msgid "For reading mail as a query of another set of folders"
 msgstr "Zum Lesen von E-Mails in Form einer Abfrage Ã¼ber andere Ordner"
 
-#: ../camel/camel-provider.c:184
+#: ../camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "%s konnte nicht geladen werden: Laden von Modulen wird von diesem System "
 "nicht unterstÃ¼tzt."
 
-#: ../camel/camel-provider.c:193
+#: ../camel/camel-provider.c:198
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s konnte nicht geladen werden: %s"
 
-#: ../camel/camel-provider.c:201
+#: ../camel/camel-provider.c:207
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s konnte nicht geladen werden: Kein Initialisationscode im Modul."
 
-#: ../camel/camel-provider.c:379 ../camel/camel-session.c:180
+#: ../camel/camel-provider.c:388 ../camel/camel-session.c:133
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "Kein Treiber fÃ¼r Protokoll Â»%sÂ« verfÃ¼gbar"
 
-#: ../camel/camel-sasl-anonymous.c:36
+#: ../camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: ../camel/camel-sasl-anonymous.c:38
+#: ../camel/camel-sasl-anonymous.c:37
 msgid "This option will connect to the server using an anonymous login."
 msgstr ""
 "Dies stellt unter Verwendung einer anonymen Anmeldekennung eine Verbindung "
 "mit dem Server her"
 
-#: ../camel/camel-sasl-anonymous.c:121 ../camel/camel-sasl-plain.c:91
+#: ../camel/camel-sasl-anonymous.c:68
 msgid "Authentication failed."
 msgstr "Legitimation gescheitert."
 
-#: ../camel/camel-sasl-anonymous.c:130
+#: ../camel/camel-sasl-anonymous.c:78
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -1962,7 +1974,7 @@ msgstr ""
 "UngÃ¼ltige E-Mail-Adressverfolgungsinformationen:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:142
+#: ../camel/camel-sasl-anonymous.c:91
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -1971,7 +1983,7 @@ msgstr ""
 "UngÃ¼ltige opake Verfolgungsinformationen:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:154
+#: ../camel/camel-sasl-anonymous.c:104
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -1980,11 +1992,11 @@ msgstr ""
 "UngÃ¼ltige Verfolgungsinformationen:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:38
+#: ../camel/camel-sasl-cram-md5.c:45
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:40
+#: ../camel/camel-sasl-cram-md5.c:47
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -1992,11 +2004,11 @@ msgstr ""
 "Dies stellt eine Verbindung mit dem SMTP-Server her und verwendet dazu ein "
 "sicheres CRAM-MD5-Passwort, falls der Server dies unterstÃ¼tzt."
 
-#: ../camel/camel-sasl-digest-md5.c:48
+#: ../camel/camel-sasl-digest-md5.c:56
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:50
+#: ../camel/camel-sasl-digest-md5.c:58
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, if "
 "the server supports it."
@@ -2004,42 +2016,42 @@ msgstr ""
 "Dies stellt eine Verbindung mit dem SMTP-Server her und verwendet dazu ein "
 "sicheres DIGEST-MD5-Passwort, falls der Server dies unterstÃ¼tzt."
 
-#: ../camel/camel-sasl-digest-md5.c:844
+#: ../camel/camel-sasl-digest-md5.c:817
 msgid "Server challenge too long (>2048 octets)"
 msgstr "Server-Herausforderung zu lang (>2048 Oktette)"
 
-#: ../camel/camel-sasl-digest-md5.c:853
+#: ../camel/camel-sasl-digest-md5.c:827
 msgid "Server challenge invalid\n"
 msgstr "Server-Herausforderung ungÃ¼ltig\n"
 
-#: ../camel/camel-sasl-digest-md5.c:859
+#: ../camel/camel-sasl-digest-md5.c:834
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "Server-Herausforderung enthielt ungÃ¼ltiges Â»Quality-of-ProtectionÂ«-Token"
 
-#: ../camel/camel-sasl-digest-md5.c:889
+#: ../camel/camel-sasl-digest-md5.c:865
 msgid "Server response did not contain authorization data"
 msgstr "Serverantwort enthielt keine Legitimationsdaten"
 
-#: ../camel/camel-sasl-digest-md5.c:907
+#: ../camel/camel-sasl-digest-md5.c:885
 msgid "Server response contained incomplete authorization data"
 msgstr "Serverantwort enthielt unvollstÃ¤ndige Legitimationsdaten"
 
-#: ../camel/camel-sasl-digest-md5.c:917
+#: ../camel/camel-sasl-digest-md5.c:897
 msgid "Server response does not match"
 msgstr "Antwort des Servers passt nicht"
 
 # CHECK
-#: ../camel/camel-sasl-gssapi.c:72
+#: ../camel/camel-sasl-gssapi.c:82
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:74
+#: ../camel/camel-sasl-gssapi.c:84
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr ""
 "Dies stellt eine Verbindung mit dem Server her und verwendet zur Legitimation "
 "Kerberos 5"
 
-#: ../camel/camel-sasl-gssapi.c:168
+#: ../camel/camel-sasl-gssapi.c:121
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -2047,12 +2059,12 @@ msgstr ""
 "Der angegebene Mechanismus wird vom Ã¼bergebenen Berechtigungsnachweis nicht "
 "unterstÃ¼tzt oder wird von der Implementierung nicht erkannt."
 
-#: ../camel/camel-sasl-gssapi.c:173
+#: ../camel/camel-sasl-gssapi.c:126
 msgid "The provided target_name parameter was ill-formed."
 msgstr ""
 "Der Ã¼bergebene Parameter Â»target_nameÂ« liegt in fehlerhafter Formatierung vor."
 
-#: ../camel/camel-sasl-gssapi.c:176
+#: ../camel/camel-sasl-gssapi.c:129
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
@@ -2060,7 +2072,7 @@ msgstr ""
 "Der Ã¼bergebene Parameter Â»target_nameÂ« enthÃ¤lt einen ungÃ¼ltigen oder nicht "
 "unterstÃ¼tzten Namenstyp "
 
-#: ../camel/camel-sasl-gssapi.c:180
+#: ../camel/camel-sasl-gssapi.c:133
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -2068,7 +2080,7 @@ msgstr ""
 "Das Eingabe-Token Â»input_tokenÂ« enthÃ¤lt andere Kanalbindungen als die vom "
 "Parameter Â»input_chan_bindingsÂ« angegebenen."
 
-#: ../camel/camel-sasl-gssapi.c:185
+#: ../camel/camel-sasl-gssapi.c:138
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
@@ -2077,7 +2089,7 @@ msgstr ""
 "verifizierbare Signatur."
 
 # CHECK
-#: ../camel/camel-sasl-gssapi.c:189
+#: ../camel/camel-sasl-gssapi.c:142
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -2086,57 +2098,57 @@ msgstr ""
 "Kontextes gÃ¼ltig oder der Berechtigungsnachweis-Handle hat auf keine "
 "Berechtigungsnachweise Bezug genommen."
 
-#: ../camel/camel-sasl-gssapi.c:194
+#: ../camel/camel-sasl-gssapi.c:147
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "Der Ã¼bergebene Kontext-Handle fÃ¼hrte zu keinem gÃ¼ltigen Kontext."
 
-#: ../camel/camel-sasl-gssapi.c:197
+#: ../camel/camel-sasl-gssapi.c:150
 msgid "The consistency checks performed on the input_token failed."
 msgstr ""
 "Die fÃ¼r das Eingabe-Token Â»input_tokenÂ« durchgefÃ¼hrten KonsistenzprÃ¼fungen "
 "schlugen fehl."
 
-#: ../camel/camel-sasl-gssapi.c:200
+#: ../camel/camel-sasl-gssapi.c:153
 msgid "The consistency checks performed on the credential failed."
 msgstr ""
 "Die fÃ¼r den Berechtigungsnachweis durchgefÃ¼hrten KonsistenzÃ¼berprÃ¼fungen "
 "schlugen fehl."
 
-#: ../camel/camel-sasl-gssapi.c:203
+#: ../camel/camel-sasl-gssapi.c:156
 msgid "The referenced credentials have expired."
 msgstr ""
 "Die Berechtigungsnachweise, auf die Bezug genommen wurde, sind nicht mehr "
 "gÃ¼ltig."
 
-#: ../camel/camel-sasl-gssapi.c:209 ../camel/camel-sasl-gssapi.c:316
-#: ../camel/camel-sasl-gssapi.c:358 ../camel/camel-sasl-gssapi.c:373
-#: ../camel/providers/imap/camel-imap-store.c:1272
+#: ../camel/camel-sasl-gssapi.c:162 ../camel/camel-sasl-gssapi.c:296
+#: ../camel/camel-sasl-gssapi.c:339 ../camel/camel-sasl-gssapi.c:355
+#: ../camel/providers/imap/camel-imap-store.c:1263
 msgid "Bad authentication response from server."
 msgstr "Fehlerhafte Legitimationsantwort vom Server."
 
-#: ../camel/camel-sasl-gssapi.c:383
+#: ../camel/camel-sasl-gssapi.c:366
 msgid "Unsupported security layer."
 msgstr "Nicht unterstÃ¼tzte Sicherheitsebene."
 
-#: ../camel/camel-sasl-login.c:36
+#: ../camel/camel-sasl-login.c:39
 msgid "Login"
 msgstr "Anmelden"
 
-#: ../camel/camel-sasl-login.c:38 ../camel/camel-sasl-plain.c:38
+#: ../camel/camel-sasl-login.c:41 ../camel/camel-sasl-plain.c:45
 msgid "This option will connect to the server using a simple password."
 msgstr ""
 "Dies stellt unter Verwendung eines einfachen Passworts eine Verbindung mit "
 "dem Server her."
 
-#: ../camel/camel-sasl-login.c:134
+#: ../camel/camel-sasl-login.c:94
 msgid "Unknown authentication state."
 msgstr "Unbekannter Legitimationszustand."
 
-#: ../camel/camel-sasl-ntlm.c:34
+#: ../camel/camel-sasl-ntlm.c:41
 msgid "NTLM / SPA"
 msgstr "NTLM/SPA"
 
-#: ../camel/camel-sasl-ntlm.c:36
+#: ../camel/camel-sasl-ntlm.c:43
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
@@ -2144,51 +2156,51 @@ msgstr ""
 "Mit dieser Option werden Sie mit einem Windows-basierten Server, der "
 "NTLM/Â»Secure Password AuthenticationÂ« verwendet, verbunden."
 
-#: ../camel/camel-sasl-plain.c:36
+#: ../camel/camel-sasl-plain.c:43
 msgid "PLAIN"
 msgstr "KLARTEXT"
 
-#: ../camel/camel-sasl-popb4smtp.c:39
+#: ../camel/camel-sasl-popb4smtp.c:46
 msgid "POP before SMTP"
 msgstr "POP vor SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:41
+#: ../camel/camel-sasl-popb4smtp.c:48
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "Dies autorisiert eine POP-Verbindung, bevor SMTP versucht wird"
 
-#: ../camel/camel-sasl-popb4smtp.c:106
+#: ../camel/camel-sasl-popb4smtp.c:82
 msgid "POP Source URI"
 msgstr "POP-Quell-URI"
 
-#: ../camel/camel-sasl-popb4smtp.c:109
+#: ../camel/camel-sasl-popb4smtp.c:88
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr "POP-vor-SMTP-Authentifikation mit einem unbekannten Ã?bertragungsweg"
 
-#: ../camel/camel-sasl-popb4smtp.c:114
+#: ../camel/camel-sasl-popb4smtp.c:95
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "POP-vor-SMTP-Authentifikation mit einer Nicht-POP-Quelle"
 
-#: ../camel/camel-search-private.c:147
+#: ../camel/camel-search-private.c:113
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Fehler beim Kompilieren eines regulÃ¤ren Ausdrucks: %s: %s"
 
-#: ../camel/camel-service.c:265
+#: ../camel/camel-service.c:215
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "Adresse Â»%sÂ« benÃ¶tigt eine Benutzernamen-Komponente"
 
-#: ../camel/camel-service.c:269
+#: ../camel/camel-service.c:219
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "Adresse Â»%sÂ« benÃ¶tigt eine Rechnernamen-Komponente"
 
-#: ../camel/camel-service.c:273
+#: ../camel/camel-service.c:223
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "Adresse Â»%sÂ« benÃ¶tigt eine Pfadkomponente"
 
-#: ../camel/camel-session.c:305
+#: ../camel/camel-session.c:188
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2197,264 +2209,240 @@ msgstr ""
 "Ordner %s konnte nicht angelegt werden:\n"
 "%s"
 
-#: ../camel/camel-session.c:477
+#: ../camel/camel-session.c:645
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "Bitte geben Sie das %s-Passwort fÃ¼r %s auf dem Rechner %s ein."
 
-#: ../camel/camel-session.c:815
-msgid "Camel session doesn't support forwarding of a message."
-msgstr "Die Camel-Sitzung unterstÃ¼tzt die Weiterleitung einer Nachricht nicht."
-
-#: ../camel/camel-smime-context.c:447 ../camel/camel-smime-context.c:1012
+#: ../camel/camel-smime-context.c:344 ../camel/camel-smime-context.c:969
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "Es konnte kein Zertifikat fÃ¼r Â»%sÂ« gefunden werden"
 
-#: ../camel/camel-smime-context.c:453
+#: ../camel/camel-smime-context.c:350
 msgid "Cannot create CMS message"
 msgstr "CMS-Nachricht konnte nicht angelegt werden"
 
-#: ../camel/camel-smime-context.c:458
+#: ../camel/camel-smime-context.c:355
 msgid "Cannot create CMS signed data"
 msgstr "CMS-signierte Daten konnten nicht angelegt werden"
 
-#: ../camel/camel-smime-context.c:464
+#: ../camel/camel-smime-context.c:361
 msgid "Cannot attach CMS signed data"
 msgstr "CMS-signierte Daten konnten nicht beigelegt werden"
 
-#: ../camel/camel-smime-context.c:471
+#: ../camel/camel-smime-context.c:368
 msgid "Cannot attach CMS data"
 msgstr "CMS-Daten konnten nicht beigelegt werden"
 
-#: ../camel/camel-smime-context.c:477
+#: ../camel/camel-smime-context.c:374
 msgid "Cannot create CMS Signer information"
 msgstr "CMS-Unterzeichnerinformationen konnten nicht angelegt werden"
 
-#: ../camel/camel-smime-context.c:483
+#: ../camel/camel-smime-context.c:380
 msgid "Cannot find certificate chain"
 msgstr "Zertifikatkette konnte nicht gefunden werden"
 
-#: ../camel/camel-smime-context.c:489
+#: ../camel/camel-smime-context.c:386
 msgid "Cannot add CMS Signing time"
 msgstr "CMS-Unterzeichnungszeit konnte nicht hinzugefÃ¼gt werden"
 
-#: ../camel/camel-smime-context.c:511 ../camel/camel-smime-context.c:523
+#: ../camel/camel-smime-context.c:410 ../camel/camel-smime-context.c:425
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "Es existiert kein VerschlÃ¼sselungszertifikat fÃ¼r Â»%sÂ«"
 
-#: ../camel/camel-smime-context.c:530
+#: ../camel/camel-smime-context.c:432
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "SMIMEEncKeyPrefs-Attribut konnte nicht hinzugefÃ¼gt werden"
 
-#: ../camel/camel-smime-context.c:535
+#: ../camel/camel-smime-context.c:437
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "MS SMIMEEncKeyPrefs-Attribut konnte nicht hinzugefÃ¼gt werden"
 
-#: ../camel/camel-smime-context.c:540
+#: ../camel/camel-smime-context.c:442
 msgid "Cannot add encryption certificate"
 msgstr "VerschlÃ¼sselungszertifikat konnte nicht hinzugefÃ¼gt werden"
 
-#: ../camel/camel-smime-context.c:546
+#: ../camel/camel-smime-context.c:448
 msgid "Cannot add CMS Signer information"
 msgstr "CMS-Unterzeichnerinformation konnte nicht hinzugefÃ¼gt werden"
 
-#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:1084
-msgid "Cannot create encoder context"
-msgstr "VerschlÃ¼sselungskontext konnte nicht angelegt werden"
-
-#: ../camel/camel-smime-context.c:622
-msgid "Failed to add data to CMS encoder"
-msgstr "Daten konnten nicht zu CMS-Kodierer hinzugefÃ¼gt werden"
-
-#: ../camel/camel-smime-context.c:627 ../camel/camel-smime-context.c:1101
-msgid "Failed to encode data"
-msgstr "DatenverschlÃ¼sselung gescheitert"
-
-#: ../camel/camel-smime-context.c:700
+#: ../camel/camel-smime-context.c:480
 msgid "Unverified"
 msgstr "Nicht verifiziert"
 
-#: ../camel/camel-smime-context.c:702
+#: ../camel/camel-smime-context.c:482
 msgid "Good signature"
 msgstr "Signatur einwandfrei"
 
-#: ../camel/camel-smime-context.c:704
+#: ../camel/camel-smime-context.c:484
 msgid "Bad signature"
 msgstr "Signatur fehlerhaft"
 
-#: ../camel/camel-smime-context.c:706
+#: ../camel/camel-smime-context.c:486
 msgid "Content tampered with or altered in transit"
 msgstr "Inhalt bei Ã?bertragung beschÃ¤digt oder verÃ¤ndert"
 
-#: ../camel/camel-smime-context.c:708
+#: ../camel/camel-smime-context.c:488
 msgid "Signing certificate not found"
 msgstr "Signaturzertifikat nicht gefunden"
 
-#: ../camel/camel-smime-context.c:710
+#: ../camel/camel-smime-context.c:490
 msgid "Signing certificate not trusted"
 msgstr "Signaturzertifikat nicht vertrauenswÃ¼rdig"
 
-#: ../camel/camel-smime-context.c:712
+#: ../camel/camel-smime-context.c:492
 msgid "Signature algorithm unknown"
 msgstr "Signaturalgorithmus unbekannt"
 
-#: ../camel/camel-smime-context.c:714
+#: ../camel/camel-smime-context.c:494
 msgid "Signature algorithm unsupported"
 msgstr "Signaturalgorithmus nicht unterstÃ¼tzt"
 
-#: ../camel/camel-smime-context.c:716
+#: ../camel/camel-smime-context.c:496
 msgid "Malformed signature"
 msgstr "Signatur fehlerhaft formatiert"
 
-#: ../camel/camel-smime-context.c:718
+#: ../camel/camel-smime-context.c:498
 msgid "Processing error"
 msgstr "Verarbeitungsfehler"
 
-#: ../camel/camel-smime-context.c:772
+#: ../camel/camel-smime-context.c:540
 msgid "No signed data in signature"
 msgstr "Keine signierten Daten in Signatur"
 
-#: ../camel/camel-smime-context.c:777
+#: ../camel/camel-smime-context.c:545
 msgid "Digests missing from enveloped data"
 msgstr "Digest der kuvertieren Daten fehlt"
 
-#: ../camel/camel-smime-context.c:790 ../camel/camel-smime-context.c:800
+#: ../camel/camel-smime-context.c:558 ../camel/camel-smime-context.c:569
 msgid "Cannot calculate digests"
 msgstr "Digests konnten nicht berechnet werden"
 
-#: ../camel/camel-smime-context.c:807 ../camel/camel-smime-context.c:811
+#: ../camel/camel-smime-context.c:576 ../camel/camel-smime-context.c:580
 msgid "Cannot set message digests"
 msgstr "Nachrichten-Digests konnten nicht festgelegt werden"
 
-#: ../camel/camel-smime-context.c:821 ../camel/camel-smime-context.c:826
+#: ../camel/camel-smime-context.c:590 ../camel/camel-smime-context.c:595
 msgid "Certificate import failed"
 msgstr "Zertifikatimport gescheitert"
 
-#: ../camel/camel-smime-context.c:836
+#: ../camel/camel-smime-context.c:605
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr ""
 "Zertifikat ist die einzige Nachricht, Zertifikatverifizierung nicht mÃ¶glich"
 
-#: ../camel/camel-smime-context.c:839
+#: ../camel/camel-smime-context.c:608
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr ""
 "Zertifikat ist die einzige Nachricht, Zertifikate importiert und verifiziert"
 
-#: ../camel/camel-smime-context.c:843
+#: ../camel/camel-smime-context.c:612
 msgid "Cannot find signature digests"
 msgstr "Signatur-Digest konnte nicht gefunden werden"
 
-#: ../camel/camel-smime-context.c:859
+#: ../camel/camel-smime-context.c:628
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Unterzeichner: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:960 ../camel/camel-smime-context.c:1184
+#: ../camel/camel-smime-context.c:763 ../camel/camel-smime-context.c:1041
+msgid "Cannot create encoder context"
+msgstr "VerschlÃ¼sselungskontext konnte nicht angelegt werden"
+
+#: ../camel/camel-smime-context.c:769
+msgid "Failed to add data to CMS encoder"
+msgstr "Daten konnten nicht zu CMS-Kodierer hinzugefÃ¼gt werden"
+
+#: ../camel/camel-smime-context.c:774 ../camel/camel-smime-context.c:1059
+msgid "Failed to encode data"
+msgstr "DatenverschlÃ¼sselung gescheitert"
+
+#: ../camel/camel-smime-context.c:909 ../camel/camel-smime-context.c:1147
 msgid "Decoder failed"
 msgstr "Dekodiervorgang gescheitert"
 
 # CHECK
-#: ../camel/camel-smime-context.c:1019
+#: ../camel/camel-smime-context.c:976
 msgid "Cannot find common bulk encryption algorithm"
 msgstr ""
 "Es konnte kein gemeinsamer MassenverschlÃ¼sselungsalgorithmus gefunden werden"
 
 # CHECK
-#: ../camel/camel-smime-context.c:1027
+#: ../camel/camel-smime-context.c:984
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 "Es konnte kein Slot fÃ¼r den MassenverschlÃ¼sselungsschlÃ¼ssel bereitgestellt "
 "werden"
 
-#: ../camel/camel-smime-context.c:1038
+#: ../camel/camel-smime-context.c:995
 msgid "Cannot create CMS Message"
 msgstr "CMS-Nachricht konnte nicht angelegt werden"
 
-#: ../camel/camel-smime-context.c:1044
+#: ../camel/camel-smime-context.c:1001
 msgid "Cannot create CMS Enveloped data"
 msgstr "CMS-Umschlagsdaten konnten nicht angelegt werden"
 
-#: ../camel/camel-smime-context.c:1050
+#: ../camel/camel-smime-context.c:1007
 msgid "Cannot attach CMS Enveloped data"
 msgstr "CMS-Umschlagsdaten konnten nicht beigelegt werden"
 
-#: ../camel/camel-smime-context.c:1056
+#: ../camel/camel-smime-context.c:1013
 msgid "Cannot attach CMS data object"
 msgstr "CMS-Datenobjekt konnte nicht beigelegt werden"
 
-#: ../camel/camel-smime-context.c:1065
+#: ../camel/camel-smime-context.c:1022
 msgid "Cannot create CMS Recipient information"
 msgstr "CMS-EmpfÃ¤ngerinformationen konnten nicht angelegt werden"
 
-#: ../camel/camel-smime-context.c:1070
+#: ../camel/camel-smime-context.c:1027
 msgid "Cannot add CMS Recipient information"
 msgstr "CMS-EmpfÃ¤ngerinformationen konnten nicht hinzugefÃ¼gt werden"
 
-#: ../camel/camel-smime-context.c:1095
+#: ../camel/camel-smime-context.c:1053
 msgid "Failed to add data to encoder"
 msgstr "HinzufÃ¼gen von Daten zum Kodierer gescheitert"
 
-#: ../camel/camel-smime-context.c:1191
+#: ../camel/camel-smime-context.c:1154
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME-EntschlÃ¼sselung: Kein entschlÃ¼sselter Inhalt gefunden"
 
-#: ../camel/camel-smime-context.c:1219
-msgid "import keys: unimplemented"
-msgstr "SchlÃ¼ssel importieren: Nicht implementiert"
-
-#: ../camel/camel-smime-context.c:1227
-msgid "export keys: unimplemented"
-msgstr "SchlÃ¼ssel exportieren: Nicht implementiert"
-
-#: ../camel/camel-store.c:283
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:171
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr ""
-"Auf Ordner konnte nicht zugegriffen werden: UngÃ¼ltiger Vorgang auf diesem "
-"Speicher"
-
-#: ../camel/camel-store.c:316
+#: ../camel/camel-store.c:361
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "Ordner Â»%sÂ« konnte nicht angelegt werden: Ordner existiert"
 
-#: ../camel/camel-store.c:395
-msgid "Cannot create folder: Invalid operation on this store"
-msgstr ""
-"Ordner konnte nicht angelegt werden: UngÃ¼ltiger Vorgang auf diesem Speicher"
-
-#: ../camel/camel-store.c:423
+#: ../camel/camel-store.c:455
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Ordner konnte nicht angelegt werden: %s: Ordner existiert"
 
-#: ../camel/camel-store.c:487 ../camel/camel-vee-store.c:377
-#: ../camel/providers/local/camel-maildir-store.c:219
+#: ../camel/camel-store.c:526 ../camel/camel-vee-store.c:245
+#: ../camel/providers/local/camel-maildir-store.c:218
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ordner konnte nicht gelÃ¶scht werden: %s: UngÃ¼ltiger Vorgang"
 
-#: ../camel/camel-store.c:544 ../camel/camel-vee-store.c:414
-#: ../camel/providers/local/camel-maildir-store.c:291
+#: ../camel/camel-store.c:590 ../camel/camel-vee-store.c:197
+#: ../camel/providers/local/camel-maildir-store.c:305
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ordner konnte nicht umbenannt werden: %s: UngÃ¼ltiger Vorgang"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:900 ../camel/camel-vtrash-folder.c:54
+#: ../camel/camel-store.c:909 ../camel/camel-vtrash-folder.c:49
 msgid "Trash"
 msgstr "MÃ¼ll"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:903 ../camel/camel-vtrash-folder.c:56
+#: ../camel/camel-store.c:912 ../camel/camel-vtrash-folder.c:51
 msgid "Junk"
 msgstr "UnerwÃ¼nscht"
 
-#: ../camel/camel-tcp-stream-ssl.c:870
+#: ../camel/camel-tcp-stream-ssl.c:729
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2467,16 +2455,16 @@ msgstr ""
 "Fingerabdruck:       %s\n"
 "Signatur:                %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:876
+#: ../camel/camel-tcp-stream-ssl.c:735
 msgid "GOOD"
 msgstr "GUT"
 
-#: ../camel/camel-tcp-stream-ssl.c:876
+#: ../camel/camel-tcp-stream-ssl.c:735
 msgid "BAD"
 msgstr "SCHLECHT"
 
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:880
+#: ../camel/camel-tcp-stream-ssl.c:739
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2491,7 +2479,7 @@ msgstr ""
 "\n"
 "MÃ¶chten Sie es akzeptieren?"
 
-#: ../camel/camel-tcp-stream-ssl.c:924
+#: ../camel/camel-tcp-stream-ssl.c:783
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2500,7 +2488,7 @@ msgstr ""
 "Zertifikatproblem: %s\n"
 "Aussteller: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:976
+#: ../camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2509,7 +2497,7 @@ msgstr ""
 "Fehlerhafte ZertifikatdomÃ¤ne: %s\n"
 "Aussteller: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:994
+#: ../camel/camel-tcp-stream-ssl.c:853
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2518,7 +2506,7 @@ msgstr ""
 "Zertifikat nicht mehr gÃ¼ltig: %s\n"
 "Aussteller: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1011
+#: ../camel/camel-tcp-stream-ssl.c:870
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2527,50 +2515,50 @@ msgstr ""
 "ZertifikatrÃ¼cknahmeliste nicht mehr gÃ¼ltig: %s\n"
 "Aussteller: %s"
 
-#: ../camel/camel-url.c:313
+#: ../camel/camel-url.c:315
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "Syntax der Adresse Â»%sÂ« konnte nicht analysiert werden"
 
-#: ../camel/camel-vee-folder.c:577
+#: ../camel/camel-vee-folder.c:1089
 #, c-format
 msgid "Error storing '%s': %s"
 msgstr "Fehler beim Speichern von Â»%sÂ«: %s"
 
-#: ../camel/camel-vee-folder.c:654
+#: ../camel/camel-vee-folder.c:1174
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Nachricht %s existiert nicht in %s"
 
-#: ../camel/camel-vee-folder.c:813 ../camel/camel-vee-folder.c:819
+#: ../camel/camel-vee-folder.c:1190 ../camel/camel-vee-folder.c:1205
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 "Nachrichten kÃ¶nnen nicht in virtuelle Ordner kopiert oder verschoben werden"
 
-#: ../camel/camel-vee-store.c:113 ../camel/camel-vee-store.c:114
-#: ../camel/camel-vee-store.c:353
+#: ../camel/camel-vee-store.c:131 ../camel/camel-vee-store.c:132
+#: ../camel/camel-vee-store.c:394
 msgid "Unmatched"
 msgstr "Nicht einsortiert"
 
-#: ../camel/camel-vee-store.c:400
-#, c-format
-msgid "Cannot delete folder: %s: No such folder"
-msgstr "Ordner konnte nicht gelÃ¶scht werden: %s: Ordner existiert nicht"
-
-#: ../camel/camel-vee-store.c:422
+#: ../camel/camel-vee-store.c:206
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ordner konnte umbenannt werden: %s: Ordner existiert nicht"
 
-#: ../camel/camel-vtrash-folder.c:55
+#: ../camel/camel-vee-store.c:270
+#, c-format
+msgid "Cannot delete folder: %s: No such folder"
+msgstr "Ordner konnte nicht gelÃ¶scht werden: %s: Ordner existiert nicht"
+
+#: ../camel/camel-vtrash-folder.c:50
 msgid "Cannot copy messages to the Trash folder"
 msgstr "Nachrichten kÃ¶nnen nicht in den MÃ¼llordner kopiert werden"
 
-#: ../camel/camel-vtrash-folder.c:57
+#: ../camel/camel-vtrash-folder.c:52
 msgid "Cannot copy messages to the Junk folder"
 msgstr "Nachrichten kÃ¶nnen nicht in den UnerwÃ¼nscht-Ordner kopiert werden"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:137
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:132
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2579,248 +2567,242 @@ msgstr ""
 "Nachricht konnte nicht abgerufen werden: %s\n"
 "  %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:137
-#: ../camel/providers/local/camel-maildir-folder.c:264
-#: ../camel/providers/local/camel-maildir-folder.c:293
-#: ../camel/providers/local/camel-maildir-folder.c:401
-#: ../camel/providers/local/camel-mbox-folder.c:363
-#: ../camel/providers/local/camel-mbox-folder.c:414
-#: ../camel/providers/local/camel-mh-folder.c:226
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:132
+#: ../camel/providers/local/camel-maildir-folder.c:257
+#: ../camel/providers/local/camel-maildir-folder.c:288
+#: ../camel/providers/local/camel-maildir-folder.c:407
+#: ../camel/providers/local/camel-mbox-folder.c:328
+#: ../camel/providers/local/camel-mbox-folder.c:379
+#: ../camel/providers/local/camel-mh-folder.c:214
 msgid "No such message"
 msgstr "Nachricht existiert nicht"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:149
-#: ../camel/providers/imap4/camel-imap4-folder.c:814
-#: ../camel/providers/nntp/camel-nntp-folder.c:173
-#: ../camel/providers/nntp/camel-nntp-folder.c:248
-#: ../camel/providers/nntp/camel-nntp-folder.c:408
-#: ../camel/providers/pop3/camel-pop3-folder.c:268
-#: ../camel/providers/pop3/camel-pop3-folder.c:578
-#: ../camel/providers/pop3/camel-pop3-folder.c:639
-#: ../camel/providers/pop3/camel-pop3-folder.c:657
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:146
+#: ../camel/providers/pop3/camel-pop3-folder.c:252
+#: ../camel/providers/pop3/camel-pop3-folder.c:584
+#: ../camel/providers/pop3/camel-pop3-folder.c:647
+#: ../camel/providers/pop3/camel-pop3-folder.c:669
 msgid "User canceled"
 msgstr "Benutzer hat abgebrochen"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:156
-#: ../camel/providers/imap4/camel-imap4-folder.c:819
-#: ../camel/providers/nntp/camel-nntp-folder.c:164
-#: ../camel/providers/nntp/camel-nntp-folder.c:166
-#: ../camel/providers/nntp/camel-nntp-folder.c:175
-#: ../camel/providers/nntp/camel-nntp-folder.c:250
-#: ../camel/providers/pop3/camel-pop3-folder.c:388
-#: ../camel/providers/pop3/camel-pop3-folder.c:581
-#: ../camel/providers/pop3/camel-pop3-folder.c:642
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
-#: ../camel/providers/pop3/camel-pop3-folder.c:660
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:155
+#: ../camel/providers/nntp/camel-nntp-folder.c:186
+#: ../camel/providers/nntp/camel-nntp-folder.c:190
+#: ../camel/providers/nntp/camel-nntp-folder.c:203
+#: ../camel/providers/nntp/camel-nntp-folder.c:294
+#: ../camel/providers/pop3/camel-pop3-folder.c:379
+#: ../camel/providers/pop3/camel-pop3-folder.c:588
+#: ../camel/providers/pop3/camel-pop3-folder.c:651
+#: ../camel/providers/pop3/camel-pop3-folder.c:659
+#: ../camel/providers/pop3/camel-pop3-folder.c:673
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Nachricht %s konnte nicht abgerufen werden: %s"
 
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:173
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:181
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2507
-#: ../camel/providers/imap4/camel-imap4-folder.c:837
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:182
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2554
 msgid "This message is not available in offline mode."
 msgstr "Diese Nachricht ist im Offline-Modus nicht verfÃ¼gbar."
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:195
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:202
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2010
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2061
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:198
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:207
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2046
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2099
 msgid "Could not get message"
 msgstr "Abrufen der Nachricht gescheitert"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:983
-#: ../camel/providers/imap/camel-imap-folder.c:295
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1009
+#: ../camel/providers/imap/camel-imap-folder.c:309
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Zusammenfassung fÃ¼r %s konnte nicht geladen werden"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1056
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1080
 #, c-format
 msgid "Checking for deleted messages %s"
 msgstr "Auf gelÃ¶schte Nachrichten Ã¼berprÃ¼fen in %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1331
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1356
 msgid "Trash Folder Full. Please Empty."
 msgstr "Bitte leeren Sie den MÃ¼ll, er ist voll."
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1565
-#: ../camel/providers/groupwise/camel-groupwise-store.c:633
-#: ../camel/providers/groupwise/camel-groupwise-store.c:763
-#: ../camel/providers/imap/camel-imap-folder.c:3429
-#: ../camel/providers/imap/camel-imap-folder.c:3505
-#: ../camel/providers/imapx/camel-imapx-server.c:2728
-#: ../camel/providers/imapx/camel-imapx-server.c:2813
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1590
+#: ../camel/providers/groupwise/camel-groupwise-store.c:638
+#: ../camel/providers/groupwise/camel-groupwise-store.c:768
+#: ../camel/providers/imap/camel-imap-folder.c:3519
+#: ../camel/providers/imap/camel-imap-folder.c:3595
+#: ../camel/providers/imapx/camel-imapx-server.c:2968
+#: ../camel/providers/imapx/camel-imapx-server.c:3054
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr ""
 "Zusammenfassende Informationen fÃ¼r neue Nachrichten in %s werden abgerufen"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2361
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2404
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2402
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2448
 #, c-format
 msgid "Cannot append message to folder '%s': %s"
 msgstr "Nachricht konnte nicht an Ordner Â»%sÂ« angehÃ¤ngt werden: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2392
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2434
 #, c-format
 msgid "Cannot create message: %s"
 msgstr "Nachricht konnte nicht angelegt werden: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:281
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:238
 #, c-format
 msgid "Cannot get folder container %s"
 msgstr "OrdnerbehÃ¤lter Â»%sÂ« konnte nicht abgerufen werden"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:343
-#: ../camel/providers/imap4/camel-imap4-journal.c:311
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:301
 msgid "Cannot append message in offline mode: cache unavailable"
 msgstr ""
 "Nachricht konnte im Offline-Modus nicht angehÃ¤ngt werden: Zwischenspeicher "
 "nicht verfÃ¼gbar"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:359
-#: ../camel/providers/imap4/camel-imap4-journal.c:327
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:318
 #, c-format
 msgid "Cannot append message in offline mode: %s"
 msgstr "Nachricht konnte im Offline-Modus nicht angehÃ¤ngt werden: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:54
-#: ../camel/providers/imap4/camel-imap4-provider.c:38
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:48
 msgid "Checking for new mail"
 msgstr "Nach neuen E-Mails sehen"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:56
-#: ../camel/providers/hula/camel-hula-provider.c:50
-#: ../camel/providers/imap/camel-imap-provider.c:46
-#: ../camel/providers/imap4/camel-imap4-provider.c:40
-#: ../camel/providers/imapx/camel-imapx-provider.c:48
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:50
+#: ../camel/providers/imap/camel-imap-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:45
 msgid "C_heck for new messages in all folders"
 msgstr "In allen Ordnern nach neuen E-Mails se_hen"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
-#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imap4/camel-imap4-provider.c:51
-#: ../camel/providers/imapx/camel-imapx-provider.c:72
-#: ../camel/providers/local/camel-local-provider.c:46
-#: ../camel/providers/local/camel-local-provider.c:86
-#: ../camel/providers/local/camel-local-provider.c:106
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:53
+#: ../camel/providers/imap/camel-imap-provider.c:64
+#: ../camel/providers/imapx/camel-imapx-provider.c:71
+#: ../camel/providers/local/camel-local-provider.c:42
+#: ../camel/providers/local/camel-local-provider.c:82
+#: ../camel/providers/local/camel-local-provider.c:102
 msgid "Options"
 msgstr "Optionen"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr "_Filter auf neue Nachrichten im Eingang dieses Servers anwenden"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:63
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
 msgid "Check new messages for J_unk contents"
 msgstr "Neue Nachrichten auf _unerwÃ¼nschten Inhalt prÃ¼fen"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:65
-#: ../camel/providers/imap/camel-imap-provider.c:74
-#: ../camel/providers/imapx/camel-imapx-provider.c:78
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
+#: ../camel/providers/imap/camel-imap-provider.c:70
+#: ../camel/providers/imapx/camel-imapx-provider.c:77
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr "A_usschlieÃ?lich den Eingangsordner auf unerwÃ¼nschte Nachrichten prÃ¼fen"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:67
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
 msgid "Automatically synchroni_ze account locally"
 msgstr "Konto automatisch lokal a_bgleichen"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:72
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
 msgid "SOAP Settings"
 msgstr "SOAP-Einstellungen"
 
 # CHECK
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:75
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:69
 msgid "Post Office Agent SOAP _Port:"
 msgstr "Post-Office-Agent-SOAP-_Port:"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:87
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:81
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "For accessing Novell GroupWise servers"
 msgstr "FÃ¼r den Zugriff auf Novell GroupWise-Server"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:104
-#: ../camel/providers/hula/camel-hula-provider.c:93
-#: ../camel/providers/imap/camel-imap-provider.c:100
-#: ../camel/providers/imap4/camel-imap4-provider.c:83
-#: ../camel/providers/imapx/camel-imapx-provider.c:104
-#: ../camel/providers/nntp/camel-nntp-provider.c:74
-#: ../camel/providers/pop3/camel-pop3-provider.c:74
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:98
+#: ../camel/providers/imap/camel-imap-provider.c:96
+#: ../camel/providers/imapx/camel-imapx-provider.c:103
+#: ../camel/providers/nntp/camel-nntp-provider.c:72
+#: ../camel/providers/pop3/camel-pop3-provider.c:70
 msgid "Password"
 msgstr "Passwort"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:100
 msgid ""
 "This option will connect to the GroupWise server using a plaintext password."
 msgstr ""
 "Dies stellt unter Verwendung eines unverschlÃ¼sselten Passworts eine "
 "Verbindung mit dem GroupWise-Server her."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:102
+#: ../camel/providers/groupwise/camel-groupwise-store.c:106
 msgid "Host or user not available in url"
 msgstr "Rechner oder Benutzer in der URL nicht verfÃ¼gbar"
 
 #: ../camel/providers/groupwise/camel-groupwise-store.c:204
-#: ../camel/providers/imap/camel-imap-store.c:1356
+#: ../camel/providers/imap/camel-imap-store.c:1350
+#: ../camel/providers/imapx/camel-imapx-server.c:2298
 msgid "You did not enter a password."
 msgstr "Sie haben kein Passwort eingegeben."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:319
+#: ../camel/providers/groupwise/camel-groupwise-store.c:322
 msgid "Some features may not work correctly with your current server version"
 msgstr ""
 "Einige Funktionen werden mit Ihrer momentanen Server-Version mÃ¶glicherweise "
 "nicht einwandfrei arbeiten."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:540
-#: ../camel/providers/imap/camel-imap-store.c:1879
-#: ../camel/providers/imap/camel-imap-store.c:2077
-#: ../camel/providers/imapx/camel-imapx-store.c:297
+#: ../camel/providers/groupwise/camel-groupwise-store.c:543
+#: ../camel/providers/imap/camel-imap-store.c:1882
+#: ../camel/providers/imap/camel-imap-store.c:2078
+#: ../camel/providers/imapx/camel-imapx-store.c:352
 #, c-format
 msgid "No such folder %s"
 msgstr "Ordner Â»%sÂ« nicht vorhanden"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1266
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1219
 msgid "Cannot create GroupWise folders in offline mode."
 msgstr "GroupWise-Ordner kÃ¶nnen im Offline-Modus nicht angelegt werden."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1280
-#: ../camel/providers/imap/camel-imap-store.c:1954
-#: ../camel/providers/imap/camel-imap-store.c:2334
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1237
+#: ../camel/providers/imap/camel-imap-store.c:1959
+#: ../camel/providers/imap/camel-imap-store.c:2378
+#: ../camel/providers/imapx/camel-imapx-store.c:801
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Der Elternordner darf keine Unterordner enthalten"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1359
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1382
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1320
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1345
 #, c-format
 msgid "Cannot rename GroupWise folder '%s' to '%s'"
 msgstr "GroupWise-Ordner Â»%sÂ« konnte nicht in Â»%sÂ« umbenannt werden"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1414
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1379
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:54
 #, c-format
 msgid "GroupWise server %s"
 msgstr "GroupWise-Server %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1416
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1381
 #, c-format
 msgid "GroupWise service for %s on %s"
 msgstr "GroupWise-Dienst fÃ¼r %s auf %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:122
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:58
 #, c-format
 msgid "GroupWise mail delivery via %s"
 msgstr "GroupWise E-Mail-Auslieferung Ã¼ber %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:164
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:94
 msgid "Sending Message"
 msgstr "Nachricht wird verschickt"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:212
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:103
+msgid "Cannot get folder: Invalid operation on this store"
+msgstr ""
+"Auf Ordner konnte nicht zugegriffen werden: UngÃ¼ltiger Vorgang auf diesem "
+"Speicher"
+
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:148
 msgid ""
 "You have exceeded this account's storage limit. Your messages are queued in "
 "your Outbox. Resend by pressing Send/Receive after deleting/archiving some of "
@@ -2831,102 +2813,38 @@ msgstr ""
 "von Verschicken/Abrufen, nachdem Sie einige Ihrer E-Mails archiviert oder "
 "gelÃ¶scht haben.\n"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:207
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:152
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Nachricht konnte nicht verschickt werden: %s"
 
-#: ../camel/providers/hula/camel-hula-provider.c:48
-#: ../camel/providers/imap/camel-imap-provider.c:44
-#: ../camel/providers/imapx/camel-imapx-provider.c:44
-msgid "Checking for New Mail"
-msgstr "Nach neuen E-Mails sehen"
-
-#: ../camel/providers/hula/camel-hula-provider.c:53
-#: ../camel/providers/imap/camel-imap-provider.c:52
-#: ../camel/providers/imapx/camel-imapx-provider.c:54
-msgid "Connection to Server"
-msgstr "Server-Verbindung"
-
-#: ../camel/providers/hula/camel-hula-provider.c:55
-#: ../camel/providers/imap/camel-imap-provider.c:54
-#: ../camel/providers/imapx/camel-imapx-provider.c:56
-msgid "_Use custom command to connect to server"
-msgstr "_Benutzerdefinierten Befehl fÃ¼r die Server-Verbindung verwenden"
-
-#: ../camel/providers/hula/camel-hula-provider.c:57
-#: ../camel/providers/imap/camel-imap-provider.c:56
-#: ../camel/providers/imapx/camel-imapx-provider.c:58
-msgid "Command:"
-msgstr "Befehl:"
-
-#: ../camel/providers/hula/camel-hula-provider.c:60
-#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imap4/camel-imap4-provider.c:43
-#: ../camel/providers/imapx/camel-imapx-provider.c:64
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
-msgid "Folders"
-msgstr "Ordner"
-
-#: ../camel/providers/hula/camel-hula-provider.c:62
-#: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:45
-#: ../camel/providers/imapx/camel-imapx-provider.c:66
-msgid "_Show only subscribed folders"
-msgstr "Nur abonnierte Ordner an_zeigen"
-
-#: ../camel/providers/hula/camel-hula-provider.c:64
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imap4/camel-imap4-provider.c:47
-#: ../camel/providers/imapx/camel-imapx-provider.c:68
-msgid "O_verride server-supplied folder namespace"
-msgstr "Ã?ber vom Server vorgegebenen Ordner-Namensraum hin_wegsetzen"
-
-#: ../camel/providers/hula/camel-hula-provider.c:66
-msgid "Namespace"
-msgstr "Namensraum"
-
-#: ../camel/providers/hula/camel-hula-provider.c:76
-msgid "Hula"
-msgstr "Hula"
-
-#: ../camel/providers/hula/camel-hula-provider.c:78
-msgid "For accessing Hula servers"
-msgstr "FÃ¼r den Zugriff auf Hula-Server"
-
-#: ../camel/providers/hula/camel-hula-provider.c:95
-msgid "This option will connect to the Hula server using a plaintext password."
-msgstr ""
-"Dies stellt unter Verwendung eines unverschlÃ¼sselten Passworts eine "
-"Verbindung mit dem Hula-Server her."
-
-#: ../camel/providers/imap/camel-imap-command.c:181
-#: ../camel/providers/imap/camel-imap-command.c:265
+#: ../camel/providers/imap/camel-imap-command.c:185
+#: ../camel/providers/imap/camel-imap-command.c:278
 msgid "No output stream"
 msgstr "Kein Ausgangsdatenstrom"
 
-#: ../camel/providers/imap/camel-imap-command.c:186
-#: ../camel/providers/imap/camel-imap-command.c:270
+#: ../camel/providers/imap/camel-imap-command.c:192
+#: ../camel/providers/imap/camel-imap-command.c:285
 msgid "No input stream"
 msgstr "Kein Eingangsdatenstrom"
 
-#: ../camel/providers/imap/camel-imap-command.c:229
-#: ../camel/providers/imap/camel-imap-command.c:278
-#: ../camel/providers/imap/camel-imap-command.c:492
-#: ../camel/providers/imap/camel-imap-store.c:3105
+#: ../camel/providers/imap/camel-imap-command.c:237
+#: ../camel/providers/imap/camel-imap-command.c:294
+#: ../camel/providers/imap/camel-imap-command.c:516
+#: ../camel/providers/imap/camel-imap-store.c:3173
 msgid "Operation cancelled"
 msgstr "Vorgang abgebrochen"
 
-#: ../camel/providers/imap/camel-imap-command.c:331
-#: ../camel/providers/imap/camel-imap-store.c:3110
+#: ../camel/providers/imap/camel-imap-command.c:349
+#: ../camel/providers/imap/camel-imap-store.c:3181
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server-Verbindung unerwartet getrennt: %s"
 
 #. for imap ALERT codes, account user host
 #. we might get a ']' from a BAD response since we +12, but who cares?
-#: ../camel/providers/imap/camel-imap-command.c:352
+#: ../camel/providers/imap/camel-imap-command.c:369
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -2935,262 +2853,287 @@ msgstr ""
 "Alarm von IMAP-Server %s %s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:421
+#: ../camel/providers/imap/camel-imap-command.c:439
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Unerwartete Antwort von IMAP-Server: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:431
+#: ../camel/providers/imap/camel-imap-command.c:450
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-Befehl gescheitert: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:506
+#: ../camel/providers/imap/camel-imap-command.c:532
 msgid "Server response ended too soon."
 msgstr "Antwort des Servers endete zu frÃ¼h."
 
-#: ../camel/providers/imap/camel-imap-command.c:712
+#: ../camel/providers/imap/camel-imap-command.c:739
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Antwort des IMAP-Servers enthielt keine %s-Informationen"
 
-#: ../camel/providers/imap/camel-imap-command.c:748
+#: ../camel/providers/imap/camel-imap-command.c:776
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Unerwartete OK-Antwort von IMAP-Server: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:90
+#: ../camel/providers/imap/camel-imap-folder.c:68
 msgid "Always check for new mail in this folder"
 msgstr "Immer in diesem Ordner nach neuen E-Mails schauen"
 
-#: ../camel/providers/imap/camel-imap-folder.c:276
+#: ../camel/providers/imap/camel-imap-folder.c:289
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Ordner %s konnte nicht angelegt werden: %s"
 
 #. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:918
-#: ../camel/providers/imapx/camel-imapx-server.c:2758
+#: ../camel/providers/imap/camel-imap-folder.c:912
+#: ../camel/providers/imapx/camel-imapx-server.c:2997
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "GeÃ¤nderte Nachrichten werden in %s gesucht"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1986
+#: ../camel/providers/imap/camel-imap-folder.c:2011
 #, c-format
 msgid "Unexpected response status '%s' after APPEND command"
 msgstr "Unerwarteter Antwortstatus Â»%sÂ« nach APPEND-Befehl"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2001
+#: ../camel/providers/imap/camel-imap-folder.c:2029
 msgid "No response on continuation after APPEND command"
 msgstr "Keine Antwort zur FortfÃ¼hrung nach APPEND-Befehl"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2046
+#: ../camel/providers/imap/camel-imap-folder.c:2078
 msgid "Unknown error occurred during APPEND command!"
 msgstr "Unbekannter Fehler wÃ¤hrend APPEND-Befehl aufgetreten!"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2877
+#: ../camel/providers/imap/camel-imap-folder.c:2955
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Nachricht konnte nicht abgerufen werden: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2912
+#: ../camel/providers/imap/camel-imap-folder.c:2990
+#: ../camel/providers/imapx/camel-imapx-server.c:3980
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "Nachricht mit Kennung %s konnte nicht abgerufen werden: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2913
+#: ../camel/providers/imap/camel-imap-folder.c:2991
+#: ../camel/providers/imapx/camel-imapx-server.c:3981
 msgid "No such message available."
 msgstr "Nachricht nicht verfÃ¼gbar."
 
-#: ../camel/providers/imap/camel-imap-folder.c:2974
-#: ../camel/providers/imap/camel-imap-folder.c:3819
-#: ../camel/providers/nntp/camel-nntp-folder.c:236
+#: ../camel/providers/imap/camel-imap-folder.c:3055
+#: ../camel/providers/imap/camel-imap-folder.c:3919
+#: ../camel/providers/nntp/camel-nntp-folder.c:276
 msgid "This message is not currently available"
 msgstr "Diese Nachricht ist derzeit nicht verfÃ¼gbar"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3632
+#: ../camel/providers/imap/camel-imap-folder.c:3723
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr ""
 "UnvollstÃ¤ndige Server-Antwort: Keine Informationen zu Nachricht %d erhalten"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3640
+#: ../camel/providers/imap/camel-imap-folder.c:3733
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "UnvollstÃ¤ndige Server-Antwort: Keine UID fÃ¼r Nachricht %d erhalten"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3857
+#: ../camel/providers/imap/camel-imap-folder.c:3959
 msgid "Could not find message body in FETCH response."
 msgstr "Nachrichtenrumpf in Antwort auf FETCH konnte nicht gefunden werden."
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:181
-#: ../camel/providers/imap/camel-imap-message-cache.c:244
+#: ../camel/providers/imap/camel-imap-message-cache.c:182
+#: ../camel/providers/imap/camel-imap-message-cache.c:247
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Cache-Ordner konnte nicht geÃ¶ffnet werden: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:330
-#: ../camel/providers/imap/camel-imap-message-cache.c:387
-#: ../camel/providers/imap/camel-imap-message-cache.c:418
-#: ../camel/providers/imap/camel-imap-message-cache.c:450
+#: ../camel/providers/imap/camel-imap-message-cache.c:334
+#: ../camel/providers/imap/camel-imap-message-cache.c:398
+#: ../camel/providers/imap/camel-imap-message-cache.c:432
+#: ../camel/providers/imap/camel-imap-message-cache.c:467
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Nachricht %s konnte nicht in den Zwischenspeicher geladen werden: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:530
+#: ../camel/providers/imap/camel-imap-message-cache.c:548
 #, c-format
 msgid "Failed to cache %s: %s"
 msgstr "%s konnte nicht in den Zwischenspeicher geladen werden: %s"
 
-#: ../camel/providers/imap/camel-imap-provider.c:48
-#: ../camel/providers/imapx/camel-imapx-provider.c:50
+#: ../camel/providers/imap/camel-imap-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:41
+msgid "Checking for New Mail"
+msgstr "Nach neuen E-Mails sehen"
+
+#: ../camel/providers/imap/camel-imap-provider.c:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:47
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "In abonnierten Ordnern nach neuen E-Mails se_hen"
 
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imap4/camel-imap4-provider.c:49
-#: ../camel/providers/imapx/camel-imapx-provider.c:70
-msgid "Namespace:"
-msgstr "Namensraum:"
+#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:51
+msgid "Connection to Server"
+msgstr "Server-Verbindung"
 
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imap4/camel-imap4-provider.c:53
-#: ../camel/providers/imapx/camel-imapx-provider.c:74
+#: ../camel/providers/imap/camel-imap-provider.c:50
+#: ../camel/providers/imapx/camel-imapx-provider.c:53
+msgid "_Use custom command to connect to server"
+msgstr "_Benutzerdefinierten Befehl fÃ¼r die Server-Verbindung verwenden"
+
+#: ../camel/providers/imap/camel-imap-provider.c:52
+#| msgid "Command:"
+msgid "Co_mmand:"
+msgstr "_Befehl:"
+
+#: ../camel/providers/imap/camel-imap-provider.c:56
+#: ../camel/providers/imapx/camel-imapx-provider.c:61
+#: ../camel/providers/nntp/camel-nntp-provider.c:42
+msgid "Folders"
+msgstr "Ordner"
+
+#: ../camel/providers/imap/camel-imap-provider.c:58
+#: ../camel/providers/imapx/camel-imapx-provider.c:63
+msgid "_Show only subscribed folders"
+msgstr "Nur abonnierte Ordner an_zeigen"
+
+#: ../camel/providers/imap/camel-imap-provider.c:60
+#: ../camel/providers/imapx/camel-imapx-provider.c:66
+msgid "O_verride server-supplied folder namespace"
+msgstr "Ã?ber vom Server vorgegebenen Ordner-Namensraum hin_wegsetzen"
+
+#: ../camel/providers/imap/camel-imap-provider.c:62
+#| msgid "Namespace:"
+msgid "Names_pace:"
+msgstr "Namens_raum:"
+
+#: ../camel/providers/imap/camel-imap-provider.c:66
+#: ../camel/providers/imapx/camel-imapx-provider.c:73
 msgid "_Apply filters to new messages in INBOX on this server"
 msgstr "Filter auf neue Nachrichten in INBOX dieses Servers _anwenden"
 
-#: ../camel/providers/imap/camel-imap-provider.c:72
-#: ../camel/providers/imapx/camel-imapx-provider.c:76
+#: ../camel/providers/imap/camel-imap-provider.c:68
+#: ../camel/providers/imapx/camel-imapx-provider.c:75
 msgid "Check new messages for Jun_k contents"
 msgstr "Neue Nachrichten auf _unerwÃ¼nschten Inhalt prÃ¼fen"
 
-#: ../camel/providers/imap/camel-imap-provider.c:76
-#: ../camel/providers/imap4/camel-imap4-provider.c:59
-#: ../camel/providers/imapx/camel-imapx-provider.c:80
+#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imapx/camel-imapx-provider.c:79
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "Entfernte E-Mails automatisch lokal a_bgleichen"
 
-#: ../camel/providers/imap/camel-imap-provider.c:83
+#: ../camel/providers/imap/camel-imap-provider.c:79
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:85
-#: ../camel/providers/imapx/camel-imapx-provider.c:90
+#: ../camel/providers/imap/camel-imap-provider.c:81
+#: ../camel/providers/imapx/camel-imapx-provider.c:89
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Zum Lesen und Speichern von E-Mails auf IMAP-Servern."
 
-#: ../camel/providers/imap/camel-imap-provider.c:102
-#: ../camel/providers/imapx/camel-imapx-provider.c:106
+#: ../camel/providers/imap/camel-imap-provider.c:98
+#: ../camel/providers/imapx/camel-imapx-provider.c:105
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Dies stellt unter Verwendung eines unverschlÃ¼sselten Passworts eine "
 "Verbindung mit dem IMAP-Server her."
 
-#: ../camel/providers/imap/camel-imap-store.c:435
-#: ../camel/providers/imap4/camel-imap4-store.c:210
-#: ../camel/providers/imapx/camel-imapx-store.c:167
+#: ../camel/providers/imap/camel-imap-store.c:415
+#: ../camel/providers/imapx/camel-imapx-store.c:206
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP-Server %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:437
-#: ../camel/providers/imap4/camel-imap4-store.c:212
-#: ../camel/providers/imapx/camel-imapx-store.c:169
+#: ../camel/providers/imap/camel-imap-store.c:417
+#: ../camel/providers/imapx/camel-imapx-store.c:208
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP-Dienst fÃ¼r %s auf %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:566
-#: ../camel/providers/imap/camel-imap-store.c:581
-#: ../camel/providers/imap4/camel-imap4-store.c:247
-#: ../camel/providers/imap4/camel-imap4-store.c:262
-#: ../camel/providers/nntp/camel-nntp-store.c:182
-#: ../camel/providers/nntp/camel-nntp-store.c:197
-#: ../camel/providers/pop3/camel-pop3-store.c:192
-#: ../camel/providers/pop3/camel-pop3-store.c:206
-#: ../camel/providers/smtp/camel-smtp-transport.c:259
-#: ../camel/providers/smtp/camel-smtp-transport.c:274
+#: ../camel/providers/imap/camel-imap-store.c:547
+#: ../camel/providers/imap/camel-imap-store.c:564
+#: ../camel/providers/nntp/camel-nntp-store.c:230
+#: ../camel/providers/nntp/camel-nntp-store.c:246
+#: ../camel/providers/pop3/camel-pop3-store.c:170
+#: ../camel/providers/pop3/camel-pop3-store.c:186
+#: ../camel/providers/smtp/camel-smtp-transport.c:212
+#: ../camel/providers/smtp/camel-smtp-transport.c:227
 #, c-format
 msgid "Could not connect to %s: %s"
 msgstr "Verbindung mit %s gescheitert: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:567
-#: ../camel/providers/imap4/camel-imap4-store.c:248
-#: ../camel/providers/nntp/camel-nntp-store.c:183
-#: ../camel/providers/pop3/camel-pop3-store.c:193
-#: ../camel/providers/smtp/camel-smtp-transport.c:260
+#: ../camel/providers/imap/camel-imap-store.c:548
+#: ../camel/providers/nntp/camel-nntp-store.c:231
+#: ../camel/providers/pop3/camel-pop3-store.c:171
+#: ../camel/providers/smtp/camel-smtp-transport.c:213
 msgid "SSL unavailable"
 msgstr "SSL nicht verfÃ¼gbar"
 
-#: ../camel/providers/imap/camel-imap-store.c:578
-#: ../camel/providers/imap/camel-imap-store.c:860
-#: ../camel/providers/imapx/camel-imapx-server.c:2017
+#: ../camel/providers/imap/camel-imap-store.c:560
+#: ../camel/providers/imap/camel-imap-store.c:845
+#: ../camel/providers/imapx/camel-imapx-server.c:2160
 msgid "Connection cancelled"
 msgstr "Verbindung abgebrochen"
 
-#: ../camel/providers/imap/camel-imap-store.c:689
-#: ../camel/providers/imap/camel-imap-store.c:708
-#: ../camel/providers/imap/camel-imap-store.c:714
-#: ../camel/providers/imap/camel-imap-store.c:740
-#: ../camel/providers/imap4/camel-imap4-store.c:310
-#: ../camel/providers/imap4/camel-imap4-store.c:325
-#: ../camel/providers/imap4/camel-imap4-store.c:334
-#: ../camel/providers/imapx/camel-imapx-server.c:2057
-#: ../camel/providers/imapx/camel-imapx-server.c:2071
+#: ../camel/providers/imap/camel-imap-store.c:670
+#: ../camel/providers/imap/camel-imap-store.c:690
+#: ../camel/providers/imap/camel-imap-store.c:697
+#: ../camel/providers/imap/camel-imap-store.c:724
+#: ../camel/providers/imapx/camel-imapx-server.c:2205
+#: ../camel/providers/imapx/camel-imapx-server.c:2227
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Verbindung mit IMAP-Server %s im sicheren Modus ist gescheitert: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:690
-#: ../camel/providers/imapx/camel-imapx-server.c:2058
-#: ../camel/providers/smtp/camel-smtp-transport.c:332
+#: ../camel/providers/imap/camel-imap-store.c:671
+#: ../camel/providers/imapx/camel-imapx-server.c:2206
+#: ../camel/providers/smtp/camel-smtp-transport.c:286
 msgid "STARTTLS not supported"
 msgstr "STARTTLS nicht unterstÃ¼tzt"
 
-#: ../camel/providers/imap/camel-imap-store.c:709
-#: ../camel/providers/imapx/camel-imapx-server.c:2072
+#: ../camel/providers/imap/camel-imap-store.c:691
+#: ../camel/providers/imapx/camel-imapx-server.c:2228
 msgid "SSL negotiations failed"
 msgstr "SSL-Â»VerhandlungenÂ« gescheitert"
 
-#: ../camel/providers/imap/camel-imap-store.c:715
-#: ../camel/providers/imap4/camel-imap4-store.c:335
-#: ../camel/providers/smtp/camel-smtp-transport.c:371
+#: ../camel/providers/imap/camel-imap-store.c:698
+#: ../camel/providers/smtp/camel-smtp-transport.c:327
 msgid "SSL is not available in this build"
 msgstr "SSL ist in diesem Build nicht verfÃ¼gbar"
 
-#: ../camel/providers/imap/camel-imap-store.c:863
+#: ../camel/providers/imap/camel-imap-store.c:849
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Verbindung mit Befehl Â»%sÂ« konnte nicht hergestellt werden: %s"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1051
-#: ../camel/providers/imap/camel-imap-store.c:2430
-#: ../camel/providers/imap4/camel-imap4-store-summary.c:356
-#: ../camel/providers/imap4/camel-imap4-store.c:1403
-#: ../camel/providers/imapx/camel-imapx-store.c:349
-#: ../camel/providers/imapx/camel-imapx-store.c:578
-#: ../camel/providers/local/camel-maildir-folder.c:81
+#: ../camel/providers/imap/camel-imap-store.c:1038
+#: ../camel/providers/imap/camel-imap-store.c:2471
+#: ../camel/providers/imapx/camel-imapx-store.c:404
+#: ../camel/providers/imapx/camel-imapx-store.c:970
+#: ../camel/providers/local/camel-maildir-folder.c:72
 #: ../camel/providers/local/camel-maildir-store.c:219
-#: ../camel/providers/local/camel-maildir-store.c:291
-#: ../camel/providers/local/camel-maildir-store.c:517
-#: ../camel/providers/local/camel-maildir-store.c:530
-#: ../camel/providers/local/camel-spool-store.c:461
+#: ../camel/providers/local/camel-maildir-store.c:306
+#: ../camel/providers/local/camel-maildir-store.c:552
+#: ../camel/providers/local/camel-maildir-store.c:565
+#: ../camel/providers/local/camel-spool-store.c:500
 msgid "Inbox"
 msgstr "Eingang"
 
-#: ../camel/providers/imap/camel-imap-store.c:1303
+#: ../camel/providers/imap/camel-imap-store.c:1295
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP-Server %s unterstÃ¼tzt den verlangten Legitimationstyp %s nicht."
 
-#: ../camel/providers/imap/camel-imap-store.c:1313
-#: ../camel/providers/smtp/camel-smtp-transport.c:506
+#: ../camel/providers/imap/camel-imap-store.c:1306
+#: ../camel/providers/smtp/camel-smtp-transport.c:465
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Keine UnterstÃ¼tzung fÃ¼r Legitimationstyp %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:1387
+#: ../camel/providers/imap/camel-imap-store.c:1381
+#: ../camel/providers/imapx/camel-imapx-server.c:2326
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3201,448 +3144,131 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:1891
-#: ../camel/providers/imap/camel-imap-store.c:2272
-#: ../camel/providers/imap4/camel-imap4-store.c:954
+#: ../camel/providers/imap/camel-imap-store.c:1895
+#: ../camel/providers/imap/camel-imap-store.c:2317
+#: ../camel/providers/imapx/camel-imapx-store.c:786
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "Der Ordnername Â»%sÂ« ist ungÃ¼ltig, da er das Zeichen Â»%cÂ« enthÃ¤lt"
 
-#: ../camel/providers/imap/camel-imap-store.c:2008
-#: ../camel/providers/local/camel-maildir-store.c:192
-#: ../camel/providers/local/camel-mbox-store.c:202
-#: ../camel/providers/local/camel-mh-store.c:249
+#: ../camel/providers/imap/camel-imap-store.c:2014
+#: ../camel/providers/local/camel-maildir-store.c:184
+#: ../camel/providers/local/camel-mbox-store.c:189
+#: ../camel/providers/local/camel-mh-store.c:250
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "Ordner Â»%sÂ« konnte nicht angelegt werden: Ordner existiert."
 
-#: ../camel/providers/imap/camel-imap-store.c:2283
+#: ../camel/providers/imap/camel-imap-store.c:2328
+#: ../camel/providers/imapx/camel-imapx-store.c:794
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Unbekannter Elternerdner: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:3107
+#: ../camel/providers/imap/camel-imap-store.c:3177
 msgid "Server unexpectedly disconnected"
 msgstr "Server-Verbindung wurde unerwartet getrennt"
 
-#: ../camel/providers/imap4/camel-imap4-command.c:572
-#: ../camel/providers/imap4/camel-imap4-command.c:579
-#, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "Schicken eines Befehls an IMAP-Server %s gescheitert: %s"
-
-#: ../camel/providers/imap4/camel-imap4-command.c:681
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Unerwartete Antwort von IMAP4-Server %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:215
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "Unerwartete BegrÃ¼Ã?ung durch IMAP-Server: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:440
-#, c-format
-msgid "Cannot select folder '%s': Invalid mailbox name"
-msgstr "Ordner Â»%sÂ« konnte nicht gewÃ¤hlt werden: UngÃ¼ltiger Postfachname"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:446
-#, c-format
-msgid "Cannot select folder '%s': Bad command"
-msgstr "Ordner Â»%sÂ« konnte nicht gewÃ¤hlt werden: UngÃ¼ltiger Befehl"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1414
-#, c-format
-msgid "Failed to send command to IMAP server %s: %s"
-msgstr "Schicken eines Befehls an IMAP-Server %s gescheitert: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1416
-msgid "service unavailable"
-msgstr "Dienst nicht verfÃ¼gbar"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1546
-#: ../camel/providers/imap4/camel-imap4-engine.c:1584
-#: ../camel/providers/imap4/camel-imap4-engine.c:1628
-#: ../camel/providers/imap4/camel-imap4-engine.c:1683
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Verbindung mit IMAP4-Server %s unerwartet getrennt: %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:87
-msgid ""
-"Enable extended Mailing-List detection required for some filter and vFolder "
-"rules"
-msgstr ""
-"Erweiterte Erkennung von Mailinglisten aktivieren (dies wird fÃ¼r einige "
-"Filter und VOrdner-Regeln benÃ¶tigt)"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:88
-msgid "Expire cached messages that haven't been read in X seconds"
-msgstr ""
-"Zwischengespeicherte Nachrichten lÃ¶schen, die nicht innerhalb von X Sekunden "
-"gelesen werden konnten"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:89
-msgid "Expire cached messages older than X seconds"
-msgstr "Zwischengespeicherte Nachrichten lÃ¶schen, die Ã¤lter als X Sekunden sind"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:427
-#, c-format
-msgid "Cannot access folder '%s': %s"
-msgstr "Auf den Ordner Â»%sÂ« konnte nicht zugegriffen werden: %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:484
-#, c-format
-msgid "Cannot sync flags to folder '%s': Unknown error"
-msgstr ""
-"Flags konnten nicht mit Ordner Â»%sÂ« abgeglichen werden: Unbekannter Fehler"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:490
-#, c-format
-msgid "Cannot sync flags to folder '%s': Bad command"
-msgstr ""
-"Flags konnten nicht mit Ordner Â»%sÂ« abgeglichen werden: UngÃ¼ltiger Befehl"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:630
-#, c-format
-msgid "Cannot expunge folder '%s': Unknown error"
-msgstr "Ordner Â»%sÂ« konnte nicht gesÃ¤ubert werden: Unbekannter Fehler"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:635
-#, c-format
-msgid "Cannot expunge folder '%s': Bad command"
-msgstr "Ordner Â»%sÂ« konnte nicht gesÃ¤ubert werden: UngÃ¼ltiger Befehl"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:891
-#, c-format
-msgid "Cannot get message %s from folder '%s': No such message"
-msgstr ""
-"Nachricht %s konnte nicht aus Ordner %s abgerufen werden: Keine derartige "
-"Nachricht"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:896
-#, c-format
-msgid "Cannot get message %s from folder '%s': Bad command"
-msgstr ""
-"Nachricht %s konnte nicht aus Ordner Â»%sÂ« abgerufen werden: Fehlerhafter Befehl"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:940
-#, c-format
-msgid "Cannot append message to folder '%s': Folder is read-only"
-msgstr ""
-"Nachricht konnte nicht an Ordner Â»%sÂ« angehÃ¤ngt werden: Ordner ist "
-"schreibgeschÃ¼tzt"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1033
-#, c-format
-msgid "Cannot append message to folder '%s': Unknown error"
-msgstr ""
-"Nachricht konnte nicht an Ordner Â»%sÂ« angehÃ¤ngt werden: Unbekannter Fehler"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1063
-#, c-format
-msgid "Cannot append message to folder '%s': Bad command"
-msgstr ""
-"Nachricht konnte nicht an Ordner Â»%sÂ« angehÃ¤ngt werden: UngÃ¼ltiger Befehl"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1182
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
-msgstr ""
-"Nachrichten aus Ordner Â»%sÂ« konnten nicht in Ordner Â»%sÂ« verschoben werden: "
-"Unbekannter Fehler"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1186
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
-msgstr ""
-"Nachrichten aus Ordner Â»%sÂ« konnten nicht in Ordner Â»%sÂ« kopiert werden: "
-"Unbekannter Fehler"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1194
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
-msgstr ""
-"Nachrichten aus Ordner Â»%sÂ« konnten nicht in Ordner Â»%sÂ« verschoben werden: "
-"UngÃ¼ltiger Befehl"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1198
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
-msgstr ""
-"Nachrichten aus Ordner Â»%sÂ« konnten nicht in Ordner Â»%sÂ« kopiert werden: "
-"UngÃ¼ltiger Befehl"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:55
-msgid "Check new messages for _Junk contents"
-msgstr "Neue Nachrichten auf unerwÃ¼nschten Inhalt _prÃ¼fen"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:57
-msgid "Only check for Junk messa_ges in the INBOX folder"
-msgstr "AusschlieÃ?lich den Ein_gangsordner auf unerwÃ¼nschte Nachrichten prÃ¼fen"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:66
-msgid "IMAP4rev1"
-msgstr "IMAP4rev1"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:68
-msgid "For reading and storing mail on IMAPv4rev1 servers."
-msgstr "Zum Lesen und Speichern von E-Mails auf IMAPv4rev1-Servern."
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:85
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"Dies stellt unter Verwendung eines unverschlÃ¼sselten Passworts eine "
-"Verbindung mit dem IMAPv4rev1-Server her."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:259
-#: ../camel/providers/nntp/camel-nntp-store.c:194
-#: ../camel/providers/nntp/camel-nntp-store.c:213
-#: ../camel/providers/pop3/camel-pop3-store.c:203
-#: ../camel/providers/smtp/camel-smtp-transport.c:271
-msgid "Connection canceled"
-msgstr "Verbindung abgebrochen"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:296
-#, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr ""
-"Verbindung mit IMAP-Server %s im sicheren Modus ist gescheitert: Der Server "
-"unterstÃ¼tzt STARTTLS nicht"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:326
-#: ../camel/providers/pop3/camel-pop3-store.c:275
-msgid "TLS negotiations failed"
-msgstr "TLS-Â»VerhandlungenÂ« gescheitert"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:411
-#, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Legitimation am IMAP-Server %s mit Hilfe des Legitimationsmechanismus %s "
-"gescheitert"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:534
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Legitimation am POP-Server %s mit Hilfe von %s gescheitert"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:697
-#: ../camel/providers/imap4/camel-imap4-store.c:964
-msgid "Cannot create IMAP folders in offline mode."
-msgstr "IMAP-Ordner kÃ¶nnen im Offline-Modus nicht angelegt werden."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:736
-#, c-format
-msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
-msgstr ""
-"Ordner Â»%sÂ« auf IMAP-Server %s konnte nicht abgerufen werden: Unbekannter "
-"Fehler"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:816
-#, c-format
-msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
-msgstr ""
-"LIST-Informationen fÃ¼r Â»%sÂ« auf IMAP-Server %s konnten nicht abgerufen werden: "
-"%s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:818
-#: ../camel/providers/imap4/camel-imap4-store.c:1574
-msgid "Bad command"
-msgstr "UngÃ¼ltiger Befehl"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:897
-#, c-format
-msgid "Cannot create folder '%s': Invalid mailbox name"
-msgstr "Ordner Â»%sÂ« konnte nicht angelegt werden: UngÃ¼ltiger Postfachname"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:902
-#, c-format
-msgid "Cannot create folder '%s': Bad command"
-msgstr "Ordner Â»%sÂ« konnte nicht angelegt werden: UngÃ¼ltiger Befehl"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1008
-#, c-format
-msgid "Cannot delete folder '%s': Special folder"
-msgstr "Ordner Â»%sÂ« konnte nicht gelÃ¶scht werden: Ordner mit Sonderstatus"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1015
-msgid "Cannot delete IMAP folders in offline mode."
-msgstr "IMAP-Ordner kÃ¶nnen im Offline-Modus nicht gelÃ¶scht werden."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1074
-#, c-format
-msgid "Cannot delete folder '%s': Invalid mailbox name"
-msgstr "Ordner Â»%sÂ« konnte nicht gelÃ¶scht werden: UngÃ¼ltiger Postfachname"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1079
-#, c-format
-msgid "Cannot delete folder '%s': Bad command"
-msgstr "Ordner Â»%sÂ« konnte nicht gelÃ¶scht werden: UngÃ¼ltiger Befehl"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1099
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Special folder"
-msgstr ""
-"Ordner Â»%sÂ« konnte nicht in Â»%sÂ« umbenannt werden: Ordner mit Sonderstatus"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1106
-msgid "Cannot rename IMAP folders in offline mode."
-msgstr "IMAP-Ordner kÃ¶nnen im Offline-Modus nicht umbenannt werden."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1137
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
-msgstr ""
-"Ordner Â»%sÂ« konnte nicht in Â»%sÂ« umbenannt werden: UngÃ¼ltiger Postfachname"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1142
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Bad command"
-msgstr "Ordner Â»%sÂ« konnte nicht in Â»%sÂ« umbenannt werden: UngÃ¼ltiger Befehl"
-
-#. Translators: the first %s is an IMAP4 command, either LSUB or LIST.
-#. * The fourth one is an error message.
-#: ../camel/providers/imap4/camel-imap4-store.c:1572
-#, c-format
-msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
-msgstr ""
-"%s-Informationen fÃ¼r Muster Â»%sÂ« auf IMAP-Server %s konnten nicht abgerufen "
-"werden: %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1633
-msgid "Cannot subscribe to IMAP folders in offline mode."
-msgstr "IMAP-Ordner kÃ¶nnen im Offline-Modus nicht abonniert werden."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1678
-#, c-format
-msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
-msgstr "Abonnieren des Ordners Â»%sÂ« gescheitert: UngÃ¼ltiger Postfachname"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1683
-#, c-format
-msgid "Cannot subscribe to folder '%s': Bad command"
-msgstr "Abonnieren des Ordners Â»%sÂ« gescheitert: UngÃ¼ltiger Befehl"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1705
-msgid "Cannot unsubscribe from IMAP folders in offline mode."
-msgstr ""
-"Abonnements von IMAP-Ordnern kÃ¶nnen im Offline-Modus nicht beendet werden."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1750
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
-msgstr "Abbestellen des Ordners Â»%sÂ« gescheitert: UngÃ¼ltiger Postfachname"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1755
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Bad command"
-msgstr "Abbestellen des Ordners Â»%sÂ« gescheitert: UngÃ¼ltiger Befehl"
-
-#: ../camel/providers/imap4/camel-imap4-summary.c:1590
-msgid "Scanning for changed messages"
-msgstr "GeÃ¤nderte Nachrichten werden gesucht"
-
-#: ../camel/providers/imap4/camel-imap4-summary.c:1611
-#, c-format
-msgid "IMAP server %s is in an inconsistent state."
-msgstr "IMAP-Server %s befindet sich in einem inkonsistenten Zustand."
-
-#: ../camel/providers/imap4/camel-imap4-summary.c:1638
-msgid "Fetching envelopes of new messages"
-msgstr "Envelopes der neuen Nachrichten werden abgerufen"
-
-#: ../camel/providers/imap4/camel-imap4-utils.c:429
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Unerwartete Kennung in Antwort von IMAP-Server %s: "
-
-#: ../camel/providers/imap4/camel-imap4-utils.c:452
-msgid "No data"
-msgstr "Keine Daten"
-
-#: ../camel/providers/imap4/camel-imap4-utils.c:613
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "Verbindung mit IMAP-Server %s unerwartet getrennt: %s"
-
-#: ../camel/providers/imapx/camel-imapx-folder.c:84
+#: ../camel/providers/imapx/camel-imapx-folder.c:71
 #, c-format
 msgid "Could not create folder summary for %s"
 msgstr "Zusammenfassung fÃ¼r %s konnte nicht erstellt werden"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:92
+#: ../camel/providers/imapx/camel-imapx-folder.c:79
 #, c-format
 msgid "Could not create cache for %s"
 msgstr "Zwischenspeicher konnte nicht fÃ¼r Â»%sÂ« angelegt werden"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
+#: ../camel/providers/imapx/camel-imapx-provider.c:43
 msgid "Use I_dle if the server supports it"
 msgstr "Â»UntÃ¤tigÂ« verwen_den, falls der Server es unterstÃ¼tzt"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:60
+#: ../camel/providers/imapx/camel-imapx-provider.c:55
+msgid "Command:"
+msgstr "Befehl:"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:57
 msgid "Numbe_r of cached connections to use"
 msgstr "Anzahl de_r zu verwendenden zwischengespeicherten Verbindungen"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:88
+#: ../camel/providers/imapx/camel-imapx-provider.c:68
+msgid "Namespace:"
+msgstr "Namensraum:"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:87
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2020
+#: ../camel/providers/imapx/camel-imapx-server.c:2163
 #, c-format
 msgid "Could not connect to %s (port %s): %s"
 msgstr "Verbindung mit %s (Port %s) gescheitert: %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2100
-#, c-format
-msgid "%sPlease enter the IMAP password for %s %s"
-msgstr "%s Bitte geben Sie das IMAP-Passwort fÃ¼r %s %s ein"
-
-#: ../camel/providers/local/camel-local-folder.c:178
+#: ../camel/providers/local/camel-local-folder.c:81
 msgid "Index message body data"
 msgstr "Rumpfdaten der Nachricht indizieren"
 
-#. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:395
+#. Translators: This is used for a folder description, for folders being under $HOME.
+#. The first %s is replaced with a relative path under $HOME,
+#. the second %s is replaced with a protocol name, like mbox/maldir/...
+#: ../camel/providers/local/camel-local-folder.c:391
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#. /var/spool/mail relative path + protocol
-#: ../camel/providers/local/camel-local-folder.c:399
-#: ../camel/providers/local/camel-local-folder.c:402
+#. Translators: This is used for a folder description, for folders being under /var/spool/mail.
+#. The first %s is replaced with a relative path under /var/spool/mail,
+#. the second %s is replaced with a protocol name, like mbox/maldir/...
+#. Translators: This is used for a folder description, for folders being under /var/mail.
+#. The first %s is replaced with a relative path under /var/mail,
+#. the second %s is replaced with a protocol name, like mbox/maldir/...
+#: ../camel/providers/local/camel-local-folder.c:397
+#: ../camel/providers/local/camel-local-folder.c:403
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "Postfach: %s (%s)"
 
-#. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:406
+#. Translators: This is used for a folder description.
+#. The first %s is replaced with a folder's full path,
+#. the second %s is replaced with a protocol name, like mbox/maldir/...
+#: ../camel/providers/local/camel-local-folder.c:409
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-provider.c:48
+#. Translators: The first %s is replaced with a message ID,
+#. the second %s is replaced with the folder path,
+#. the third %s is replaced with a detailed error string
+#: ../camel/providers/local/camel-local-folder.c:668
+#, c-format
+#| msgid ""
+#| "Cannot get message: %s from folder %s\n"
+#| "  %s"
+msgid ""
+"Cannot get message %s from folder %s\n"
+"%s"
+msgstr ""
+"Nachricht %s konnte nicht aus Ordner %s abgerufen werden\n"
+"%s"
+
+#: ../camel/providers/local/camel-local-provider.c:44
 msgid "_Use the '.folders' folder summary file (exmh)"
 msgstr "Die Ordner-_Zusammenfassungsdatei Â».foldersÂ« verwenden (exmh)"
 
-#: ../camel/providers/local/camel-local-provider.c:55
+#: ../camel/providers/local/camel-local-provider.c:51
 msgid "MH-format mail directories"
 msgstr "E-Mail-Ordner im MH-Format"
 
-#: ../camel/providers/local/camel-local-provider.c:56
+#: ../camel/providers/local/camel-local-provider.c:52
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Zum Speichern lokaler E-Mails in MH-artigen E-Mail-Ordnern."
 
-#: ../camel/providers/local/camel-local-provider.c:73
+#: ../camel/providers/local/camel-local-provider.c:69
 msgid "Local delivery"
 msgstr "Lokale Auslieferung"
 
-#: ../camel/providers/local/camel-local-provider.c:74
+#: ../camel/providers/local/camel-local-provider.c:70
 msgid ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
@@ -3650,29 +3276,29 @@ msgstr ""
 "Zum Abrufen (Verschieben) von lokalen E-Mails aus Standardspools im mbox-"
 "Format in von Evolution verwaltete Ordner."
 
-#: ../camel/providers/local/camel-local-provider.c:88
-#: ../camel/providers/local/camel-local-provider.c:107
+#: ../camel/providers/local/camel-local-provider.c:84
+#: ../camel/providers/local/camel-local-provider.c:103
 msgid "_Apply filters to new messages in INBOX"
 msgstr "_Filter auf neue Nachrichten in INBOX anwenden"
 
-#: ../camel/providers/local/camel-local-provider.c:95
+#: ../camel/providers/local/camel-local-provider.c:91
 msgid "Maildir-format mail directories"
 msgstr "E-Mail-Ordner im Maildir-Format"
 
-#: ../camel/providers/local/camel-local-provider.c:96
+#: ../camel/providers/local/camel-local-provider.c:92
 msgid "For storing local mail in maildir directories."
 msgstr "Zum Speichern lokaler E-Mails in Maildir-Ordnern."
 
-#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:104
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr "Status-_Kopfzeilen im Elm/Pine/Mutt-Format speichern"
 
-#: ../camel/providers/local/camel-local-provider.c:115
+#: ../camel/providers/local/camel-local-provider.c:111
 msgid "Standard Unix mbox spool file"
 msgstr "Standard-UNIX-mbox-Spool-Datei"
 
-#: ../camel/providers/local/camel-local-provider.c:116
-#: ../camel/providers/local/camel-local-provider.c:127
+#: ../camel/providers/local/camel-local-provider.c:112
+#: ../camel/providers/local/camel-local-provider.c:123
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
@@ -3682,151 +3308,130 @@ msgstr ""
 "Kann auÃ?erdem zum Einlesen eines Baums mit Elm-, Pine- oder Mutt-Ordnern "
 "verwendet werden."
 
-#: ../camel/providers/local/camel-local-provider.c:126
+#: ../camel/providers/local/camel-local-provider.c:122
 msgid "Standard Unix mbox spool directory"
 msgstr "Standard-UNIX-mbox-Spool-Ordner"
 
-#: ../camel/providers/local/camel-local-store.c:163
-#: ../camel/providers/local/camel-local-store.c:274
-#: ../camel/providers/local/camel-mbox-store.c:357
-#: ../camel/providers/local/camel-spool-store.c:126
+#: ../camel/providers/local/camel-local-store.c:148
+#: ../camel/providers/local/camel-local-store.c:276
+#: ../camel/providers/local/camel-mbox-store.c:356
+#: ../camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Speicherwurzel %s ist kein absoluter Pfad"
 
-#: ../camel/providers/local/camel-local-store.c:170
+#: ../camel/providers/local/camel-local-store.c:156
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Speicherwurzel Â»%sÂ« ist kein regulÃ¤rer Ordner."
 
-#: ../camel/providers/local/camel-local-store.c:179
-#: ../camel/providers/local/camel-local-store.c:187
-#: ../camel/providers/local/camel-local-store.c:285
+#: ../camel/providers/local/camel-local-store.c:166
+#: ../camel/providers/local/camel-local-store.c:175
+#: ../camel/providers/local/camel-local-store.c:288
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ordner konnte nicht abgerufen werden: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:199
+#: ../camel/providers/local/camel-local-store.c:188
 msgid "Local stores do not have an inbox"
 msgstr "Lokale Speicher haben keinen Eingangsordner"
 
-#: ../camel/providers/local/camel-local-store.c:245
+#: ../camel/providers/local/camel-local-store.c:243
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokale E-Mail-Datei %s"
 
-#: ../camel/providers/local/camel-local-store.c:340
+#: ../camel/providers/local/camel-local-store.c:352
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Ordner %s konnte nicht in %s umbenannt werden: %s"
 
-#: ../camel/providers/local/camel-local-store.c:408
+#: ../camel/providers/local/camel-local-store.c:424
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Â»%sÂ« konnte nicht umbenannt werden: %s"
 
-#: ../camel/providers/local/camel-local-store.c:433
-#: ../camel/providers/local/camel-mbox-store.c:298
+#: ../camel/providers/local/camel-local-store.c:454
+#: ../camel/providers/local/camel-mbox-store.c:293
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "Ordner-Indexdatei Â»%sÂ« konnte nicht gelÃ¶scht werden: %s"
 
-#: ../camel/providers/local/camel-local-store.c:456
-#: ../camel/providers/local/camel-mbox-store.c:322
+#: ../camel/providers/local/camel-local-store.c:478
+#: ../camel/providers/local/camel-mbox-store.c:318
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "Ordner-Metadatei Â»%sÂ« konnte nicht gelÃ¶scht werden: %s"
 
-#: ../camel/providers/local/camel-local-summary.c:515
+#: ../camel/providers/local/camel-local-summary.c:537
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 "Nachricht konnte nicht zur Zusammenfassung hinzugefÃ¼gt werden: Grund unbekannt"
 
-#: ../camel/providers/local/camel-maildir-folder.c:230
+#: ../camel/providers/local/camel-maildir-folder.c:216
 msgid "Maildir append message canceled"
 msgstr "AnhÃ¤ngen der Nachricht an Maildir abgebrochen"
 
-#: ../camel/providers/local/camel-maildir-folder.c:233
+#: ../camel/providers/local/camel-maildir-folder.c:220
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Nachricht konnte nicht an Maildir-Ordner angehÃ¤ngt werden: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:263
-#: ../camel/providers/local/camel-maildir-folder.c:292
-#: ../camel/providers/local/camel-maildir-folder.c:306
-#: ../camel/providers/local/camel-maildir-folder.c:314
-#: ../camel/providers/local/camel-maildir-folder.c:400
-#: ../camel/providers/local/camel-mbox-folder.c:362
-#: ../camel/providers/local/camel-mbox-folder.c:413
-#: ../camel/providers/local/camel-mbox-folder.c:434
-#: ../camel/providers/local/camel-mbox-folder.c:465
-#: ../camel/providers/local/camel-mbox-folder.c:473
-#: ../camel/providers/local/camel-mh-folder.c:225
-#: ../camel/providers/local/camel-mh-folder.c:236
-#: ../camel/providers/local/camel-mh-folder.c:244
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Nachricht %s konnte nicht aus Ordner %s abgerufen werden\n"
-"  %s"
-
-#: ../camel/providers/local/camel-maildir-folder.c:315
+#: ../camel/providers/local/camel-maildir-folder.c:311
 msgid "Invalid message contents"
 msgstr "UngÃ¼ltiger Inhalt der Nachricht"
 
-#: ../camel/providers/local/camel-maildir-folder.c:418
+#: ../camel/providers/local/camel-maildir-folder.c:425
 msgid "Cannot transfer message to destination folder"
 msgstr "Nachricht kann nicht in den Zielordner Ã¼bertragen werden"
 
-#: ../camel/providers/local/camel-maildir-store.c:148
-#: ../camel/providers/local/camel-maildir-store.c:173
-#: ../camel/providers/local/camel-mbox-store.c:174
-#: ../camel/providers/local/camel-mbox-store.c:186
+#: ../camel/providers/local/camel-maildir-store.c:134
+#: ../camel/providers/local/camel-maildir-store.c:162
+#: ../camel/providers/local/camel-mbox-store.c:158
+#: ../camel/providers/local/camel-mbox-store.c:171
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "Ordner Â»%sÂ« konnte nicht angelegt werden: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:145
-#: ../camel/providers/local/camel-mh-store.c:217
+#: ../camel/providers/local/camel-maildir-store.c:148
+#: ../camel/providers/local/camel-mbox-store.c:126
+#: ../camel/providers/local/camel-mh-store.c:213
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "Ordner Â»%sÂ« konnte nicht abgerufen werden: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:165
-#: ../camel/providers/local/camel-mbox-store.c:153
-#: ../camel/providers/local/camel-mh-store.c:224
+#: ../camel/providers/local/camel-maildir-store.c:153
+#: ../camel/providers/local/camel-mbox-store.c:135
+#: ../camel/providers/local/camel-mh-store.c:221
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "Ordner Â»%sÂ« konnte nicht abgerufen werden: Ordner existiert nicht."
 
-#: ../camel/providers/local/camel-maildir-store.c:189
+#: ../camel/providers/local/camel-maildir-store.c:179
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "Ordner Â»%sÂ« konnte nicht abgerufen werden: kein Maildir-Ordner."
 
-#: ../camel/providers/local/camel-maildir-store.c:234
-#: ../camel/providers/local/camel-maildir-store.c:272
-#: ../camel/providers/local/camel-mh-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:235
+#: ../camel/providers/local/camel-maildir-store.c:274
+#: ../camel/providers/local/camel-mh-store.c:281
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "Ordner Â»%sÂ« konnte nicht gelÃ¶scht werden: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-maildir-store.c:237
 msgid "not a maildir directory"
 msgstr "kein Maildir-Ordner"
 
-#: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:328
-#: ../camel/providers/local/camel-spool-store.c:342
+#: ../camel/providers/local/camel-maildir-store.c:472
+#: ../camel/providers/local/camel-spool-store.c:357
+#: ../camel/providers/local/camel-spool-store.c:372
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "Ordner Â»%sÂ« konnte nicht eingelesen werden: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:432
-#: ../camel/providers/local/camel-maildir-summary.c:551
+#: ../camel/providers/local/camel-maildir-summary.c:430
+#: ../camel/providers/local/camel-maildir-summary.c:552
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Maildir-Ordnerpfad konnte nicht geÃ¶ffnet werden: %s: %s"
@@ -3835,60 +3440,60 @@ msgstr "Maildir-Ordnerpfad konnte nicht geÃ¶ffnet werden: %s: %s"
 msgid "Checking folder consistency"
 msgstr "Konsistenz des Ordners wird Ã¼berprÃ¼ft"
 
-#: ../camel/providers/local/camel-maildir-summary.c:637
+#: ../camel/providers/local/camel-maildir-summary.c:638
 msgid "Checking for new messages"
 msgstr "Nach neuen Nachrichten sehen"
 
-#: ../camel/providers/local/camel-maildir-summary.c:724
-#: ../camel/providers/local/camel-mbox-summary.c:526
-#: ../camel/providers/local/camel-mbox-summary.c:722
-#: ../camel/providers/local/camel-mbox-summary.c:842
-#: ../camel/providers/local/camel-spool-summary.c:150
+#: ../camel/providers/local/camel-maildir-summary.c:729
+#: ../camel/providers/local/camel-mbox-summary.c:489
+#: ../camel/providers/local/camel-mbox-summary.c:689
+#: ../camel/providers/local/camel-mbox-summary.c:814
+#: ../camel/providers/local/camel-spool-summary.c:126
 msgid "Storing folder"
 msgstr "Ordner wird gespeichert"
 
-#: ../camel/providers/local/camel-mbox-folder.c:167
-#: ../camel/providers/local/camel-spool-folder.c:150
+#: ../camel/providers/local/camel-mbox-folder.c:117
+#: ../camel/providers/local/camel-spool-folder.c:116
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Ordnersperre auf %s konnte nicht erzeugt werden: %s"
 
-#: ../camel/providers/local/camel-mbox-folder.c:231
+#: ../camel/providers/local/camel-mbox-folder.c:188
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Postfach konnte nicht geÃ¶ffnet werden: %s: %s\n"
 
-#: ../camel/providers/local/camel-mbox-folder.c:297
+#: ../camel/providers/local/camel-mbox-folder.c:255
 msgid "Mail append canceled"
 msgstr "AnhÃ¤ngen der E-Mail abgebrochen"
 
-#: ../camel/providers/local/camel-mbox-folder.c:300
+#: ../camel/providers/local/camel-mbox-folder.c:259
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Nachricht konnte nicht an mbox-Datei angehÃ¤ngt werden: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-folder.c:466
+#: ../camel/providers/local/camel-mbox-folder.c:432
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Dieser Ordner scheint irreparabel beschÃ¤digt zu sein."
 
-#: ../camel/providers/local/camel-mbox-folder.c:474
-#: ../camel/providers/local/camel-mh-folder.c:245
+#: ../camel/providers/local/camel-mbox-folder.c:442
+#: ../camel/providers/local/camel-mh-folder.c:234
 msgid "Message construction failed."
 msgstr "Erstellen der Nachricht gescheitert."
 
-#: ../camel/providers/local/camel-mbox-store.c:164
-#: ../camel/providers/local/camel-mbox-store.c:363
+#: ../camel/providers/local/camel-mbox-store.c:147
+#: ../camel/providers/local/camel-mbox-store.c:364
 msgid "Cannot create a folder by this name."
 msgstr "Es konnte kein Ordner mit diesem Namen angelegt werden."
 
-#: ../camel/providers/local/camel-mbox-store.c:196
+#: ../camel/providers/local/camel-mbox-store.c:182
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "Ordner Â»%sÂ« konnte nicht abgerufen werden: keine regulÃ¤re Datei."
 
+#: ../camel/providers/local/camel-mbox-store.c:214
 #: ../camel/providers/local/camel-mbox-store.c:226
-#: ../camel/providers/local/camel-mbox-store.c:237
-#: ../camel/providers/local/camel-mbox-store.c:260
+#: ../camel/providers/local/camel-mbox-store.c:252
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3897,168 +3502,168 @@ msgstr ""
 "Ordner Â»%sÂ« konnte nicht gelÃ¶scht werden:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:245
+#: ../camel/providers/local/camel-mbox-store.c:235
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "Â»%sÂ« ist keine regulÃ¤re Datei."
 
-#: ../camel/providers/local/camel-mbox-store.c:252
+#: ../camel/providers/local/camel-mbox-store.c:243
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "Ordner Â»%sÂ« ist nicht leer. Nicht gelÃ¶scht."
 
-#: ../camel/providers/local/camel-mbox-store.c:274
-#: ../camel/providers/local/camel-mbox-store.c:286
+#: ../camel/providers/local/camel-mbox-store.c:267
+#: ../camel/providers/local/camel-mbox-store.c:280
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "Ordner-Zusammenfassungsdatei Â»%sÂ« konnte nicht gelÃ¶scht werden: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:376
+#: ../camel/providers/local/camel-mbox-store.c:379
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "Ordner Â»%sÂ« konnte nicht angelegt werden: %s."
 
-#: ../camel/providers/local/camel-mbox-store.c:390
+#: ../camel/providers/local/camel-mbox-store.c:394
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Ordner konnte nicht angelegt werden: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:392
+#: ../camel/providers/local/camel-mbox-store.c:396
 msgid "Folder already exists"
 msgstr "Ordner existiert bereits"
 
-#: ../camel/providers/local/camel-mbox-store.c:483
+#: ../camel/providers/local/camel-mbox-store.c:490
 msgid "The new folder name is illegal."
 msgstr "Der neue Ordnername ist nicht zulÃ¤ssig."
 
-#: ../camel/providers/local/camel-mbox-store.c:496
+#: ../camel/providers/local/camel-mbox-store.c:504
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "Â»%sÂ« konnte nicht umbenannt werden: Â»%sÂ«: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:577
+#: ../camel/providers/local/camel-mbox-store.c:586
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "%s konnte nicht in %s umbenannt werden: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:532
+#: ../camel/providers/local/camel-mbox-summary.c:496
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Ordner konnte nicht geÃ¶ffnet werden: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:582
+#: ../camel/providers/local/camel-mbox-summary.c:548
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 "Schwerwiegender Fehler beim Analysieren der E-Mail-Syntax nahe Position %ld "
 "in Ordner %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:659
+#: ../camel/providers/local/camel-mbox-summary.c:626
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Ordner konnte nicht geprÃ¼ft werden: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:727
-#: ../camel/providers/local/camel-mbox-summary.c:847
-#: ../camel/providers/local/camel-spool-summary.c:155
+#: ../camel/providers/local/camel-mbox-summary.c:695
+#: ../camel/providers/local/camel-mbox-summary.c:820
+#: ../camel/providers/local/camel-spool-summary.c:132
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Datei konnte nicht geÃ¶ffnet werden: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:739
-#: ../camel/providers/local/camel-spool-summary.c:168
+#: ../camel/providers/local/camel-mbox-summary.c:708
+#: ../camel/providers/local/camel-spool-summary.c:146
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "TemporÃ¤res Postfach konnte nicht angelegt werden: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:752
-#: ../camel/providers/local/camel-mbox-summary.c:957
+#: ../camel/providers/local/camel-mbox-summary.c:722
+#: ../camel/providers/local/camel-mbox-summary.c:934
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Quellordner %s konnte nicht geschlossen werden: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:761
+#: ../camel/providers/local/camel-mbox-summary.c:732
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "TemporÃ¤rer Ordner konnte nicht geschlossen werden: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:776
+#: ../camel/providers/local/camel-mbox-summary.c:748
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Ordner konnte nicht umbenannt werden: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:858
-#: ../camel/providers/local/camel-mbox-summary.c:1084
+#: ../camel/providers/local/camel-mbox-summary.c:832
+#: ../camel/providers/local/camel-mbox-summary.c:1063
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Ordner konnte nicht gespeichert werden: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:897
-#: ../camel/providers/local/camel-mbox-summary.c:905
-#: ../camel/providers/local/camel-mbox-summary.c:1114
-#: ../camel/providers/local/camel-mbox-summary.c:1122
+#: ../camel/providers/local/camel-mbox-summary.c:872
+#: ../camel/providers/local/camel-mbox-summary.c:881
+#: ../camel/providers/local/camel-mbox-summary.c:1094
+#: ../camel/providers/local/camel-mbox-summary.c:1103
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 "Zusammenfassung und Ordner stimmen nicht Ã¼berein, sogar nach einem "
 "Datenabgleich"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1047
-#: ../camel/providers/local/camel-spool-summary.c:334
+#: ../camel/providers/local/camel-mbox-summary.c:1025
+#: ../camel/providers/local/camel-spool-summary.c:322
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Unbekannter Fehler: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1190
-#: ../camel/providers/local/camel-mbox-summary.c:1216
+#: ../camel/providers/local/camel-mbox-summary.c:1172
+#: ../camel/providers/local/camel-mbox-summary.c:1200
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "Fehler beim Schreiben in temporÃ¤res Postfach: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1207
+#: ../camel/providers/local/camel-mbox-summary.c:1190
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "Fehler beim Schreiben in temporÃ¤res Postfach %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:180
+#: ../camel/providers/local/camel-mh-folder.c:159
 msgid "MH append message canceled"
 msgstr "AnhÃ¤ngen der Nachricht mit MH abgebrochen"
 
-#: ../camel/providers/local/camel-mh-folder.c:183
+#: ../camel/providers/local/camel-mh-folder.c:163
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Nachricht konnte nicht an mh-Ordner angehÃ¤ngt werden: %s: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:232
+#: ../camel/providers/local/camel-mh-store.c:230
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "Ordner Â»%sÂ« konnte nicht angelegt werden: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:244
+#: ../camel/providers/local/camel-mh-store.c:243
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "Ordner Â»%sÂ« konnte nicht abgerufen werden: kein Ordner."
 
-#: ../camel/providers/local/camel-mh-summary.c:240
+#: ../camel/providers/local/camel-mh-summary.c:224
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH-Ordnerpfad konnte nicht geÃ¶ffnet werden: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:132
+#: ../camel/providers/local/camel-spool-store.c:119
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "Spool Â»%sÂ« konnte nicht geÃ¶ffnet werden: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:144
+#: ../camel/providers/local/camel-spool-store.c:132
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "Spool Â»%sÂ« ist weder eine regulÃ¤re Datei noch ein regulÃ¤rer Ordner"
 
-#: ../camel/providers/local/camel-spool-store.c:163
+#: ../camel/providers/local/camel-spool-store.c:157
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "Ordner Â»%s/%sÂ« existiert nicht."
 
-#: ../camel/providers/local/camel-spool-store.c:173
+#: ../camel/providers/local/camel-spool-store.c:168
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -4067,12 +3672,12 @@ msgstr ""
 "Ordner Â»%sÂ« konnte nicht geÃ¶ffnet werden:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:177
+#: ../camel/providers/local/camel-spool-store.c:173
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "Ordner Â»%sÂ« existiert nicht."
 
-#: ../camel/providers/local/camel-spool-store.c:182
+#: ../camel/providers/local/camel-spool-store.c:179
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -4081,7 +3686,7 @@ msgstr ""
 "Ordner Â»%sÂ« konnte nicht angelegt werden:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:190
+#: ../camel/providers/local/camel-spool-store.c:188
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "Â»%sÂ« ist keine Postfachdatei."
@@ -4090,39 +3695,39 @@ msgstr "Â»%sÂ« ist keine Postfachdatei."
 msgid "Store does not support an INBOX"
 msgstr "Speicher unterstÃ¼tzt keinen Eingangsordner"
 
-#: ../camel/providers/local/camel-spool-store.c:219
+#: ../camel/providers/local/camel-spool-store.c:220
 #, c-format
 msgid "Spool mail file %s"
 msgstr "E-Mail-Spooldatei %s"
 
-#: ../camel/providers/local/camel-spool-store.c:219
+#: ../camel/providers/local/camel-spool-store.c:220
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "Spool-Ordnerbaum %s"
 
-#: ../camel/providers/local/camel-spool-store.c:227
+#: ../camel/providers/local/camel-spool-store.c:232
 msgid "Spool folders cannot be renamed"
 msgstr "Spool-Ordner kÃ¶nnen nicht umbenannt werden"
 
-#: ../camel/providers/local/camel-spool-store.c:235
+#: ../camel/providers/local/camel-spool-store.c:245
 msgid "Spool folders cannot be deleted"
 msgstr "Spool-Ordner kÃ¶nnen nicht gelÃ¶scht werden"
 
-#: ../camel/providers/local/camel-spool-summary.c:180
-#: ../camel/providers/local/camel-spool-summary.c:190
-#: ../camel/providers/local/camel-spool-summary.c:200
+#: ../camel/providers/local/camel-spool-summary.c:159
+#: ../camel/providers/local/camel-spool-summary.c:170
+#: ../camel/providers/local/camel-spool-summary.c:181
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "TemporÃ¤rer Ordner %s konnte nicht abgeglichen werden: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:216
+#: ../camel/providers/local/camel-spool-summary.c:198
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Spool-Ordner %s konnte nicht abgeglichen werden: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:246
-#: ../camel/providers/local/camel-spool-summary.c:263
-#: ../camel/providers/local/camel-spool-summary.c:274
+#: ../camel/providers/local/camel-spool-summary.c:229
+#: ../camel/providers/local/camel-spool-summary.c:247
+#: ../camel/providers/local/camel-spool-summary.c:259
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -4131,71 +3736,87 @@ msgstr ""
 "Spool-Ordner %s konnte nicht abgeglichen werden: %s\n"
 "Ordner kÃ¶nnte fehlerhaft sein, Kopie in Â»%sÂ« gespeichert"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:135
-#: ../camel/providers/nntp/camel-nntp-folder.c:192
-#: ../camel/providers/nntp/camel-nntp-folder.c:224
+#: ../camel/providers/nntp/camel-nntp-folder.c:156
+#: ../camel/providers/nntp/camel-nntp-folder.c:225
+#: ../camel/providers/nntp/camel-nntp-folder.c:263
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "Interner Fehler: UID-Format ungÃ¼ltig: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:365
-#: ../camel/providers/nntp/camel-nntp-folder.c:368
-#: ../camel/providers/nntp/camel-nntp-folder.c:410
-#: ../camel/providers/nntp/camel-nntp-folder.c:412
+#: ../camel/providers/nntp/camel-nntp-folder.c:199
+#: ../camel/providers/nntp/camel-nntp-folder.c:290
+#: ../camel/providers/nntp/camel-nntp-folder.c:464
+#: ../camel/providers/nntp/camel-nntp-store.c:1334
+#: ../camel/providers/nntp/camel-nntp-summary.c:395
+#| msgid "Cannot complete operation"
+msgid "User cancelled the operation"
+msgstr "Vorgang wurde vom Benutzer abgebrochen"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:414
+#: ../camel/providers/nntp/camel-nntp-folder.c:419
+#: ../camel/providers/nntp/camel-nntp-folder.c:468
+#: ../camel/providers/nntp/camel-nntp-folder.c:473
 #, c-format
 msgid "Posting failed: %s"
 msgstr "VerÃ¶ffentlichung gescheitert: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:430
+#: ../camel/providers/nntp/camel-nntp-folder.c:495
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "Sie kÃ¶nnen im Offline-Modus keine NNTP-Nachrichten verÃ¶ffentlichen!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:441
+#: ../camel/providers/nntp/camel-nntp-folder.c:513
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Nachrichten kÃ¶nnen nicht aus NNTP-Ordnern kopiert werden!"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
+#: ../camel/providers/nntp/camel-nntp-provider.c:44
 msgid ""
 "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr "Ordner in _Kurznotation verwenden (also c.o.linux statt comp.os.linux)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:48
+#: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "_Relative Ordnernamen im Abonnementdialog anzeigen"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:53
 msgid "USENET news"
 msgstr "USENET-News"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:57
+#: ../camel/providers/nntp/camel-nntp-provider.c:55
 msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr ""
 "Dies ist ein Treiber zum Lesen und Verfassen von BeitrÃ¤gen in bzw. an USENET-"
 "Newsgroups."
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:76
+#: ../camel/providers/nntp/camel-nntp-provider.c:74
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext password."
 msgstr ""
 "Dies fÃ¼hrt die Legitimation am NNTP-Server mit einem unverschlÃ¼sselten "
 "Passwort durch."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:216
+#: ../camel/providers/nntp/camel-nntp-store.c:242
+#: ../camel/providers/nntp/camel-nntp-store.c:260
+#: ../camel/providers/pop3/camel-pop3-store.c:182
+#: ../camel/providers/smtp/camel-smtp-transport.c:224
+msgid "Connection canceled"
+msgstr "Verbindung abgebrochen"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:263
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "BegrÃ¼Ã?ung von %s konnte nicht gelesen werden: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:228
+#: ../camel/providers/nntp/camel-nntp-store.c:275
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP-Server %s antwortete mit Fehler-Code %d: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:410
+#: ../camel/providers/nntp/camel-nntp-store.c:463
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET-News Ã¼ber %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:819
+#: ../camel/providers/nntp/camel-nntp-store.c:873
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4206,7 +3827,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:913
+#: ../camel/providers/nntp/camel-nntp-store.c:969
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -4215,137 +3836,133 @@ msgstr ""
 "Sie kÃ¶nnen diese Newsgroup nicht abonnieren, da sie nicht existiert.\n"
 "Vermutlich ist das gewÃ¤hlte Objekt ein Elternordner."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:945
+#: ../camel/providers/nntp/camel-nntp-store.c:1008
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr "Sie kÃ¶nnen diese Newsgroup nicht abonnieren, da sie nicht existiert."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:970
+#: ../camel/providers/nntp/camel-nntp-store.c:1037
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 "Sie kÃ¶nnen in Newsgroups keine Ordner anlegen: Abonnieren Sie sie stattdessen."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:978
+#: ../camel/providers/nntp/camel-nntp-store.c:1048
 msgid "You cannot rename a folder in a News store."
 msgstr "Sie kÃ¶nnen in Newsgroups keine Ordner umbenennen."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:986
+#: ../camel/providers/nntp/camel-nntp-store.c:1060
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "Sie kÃ¶nnen in Newsgroups keine Ordner entfernen: Bestellen Sie sie "
 "stattdessen ab."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1180
+#: ../camel/providers/nntp/camel-nntp-store.c:1197
 msgid "Authentication requested but no username provided"
 msgstr ""
 "Legitimation wurde angefragt, es wird jedoch kein Benutzername unterstÃ¼tzt"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1192
+#: ../camel/providers/nntp/camel-nntp-store.c:1209
 #, c-format
 msgid "Cannot authenticate to server: %s"
 msgstr "Legitimation am Server gescheitert: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1315
+#: ../camel/providers/nntp/camel-nntp-store.c:1338
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP-Befehl gescheitert: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1369
+#: ../camel/providers/nntp/camel-nntp-store.c:1393
 msgid "Not connected."
 msgstr "Nicht verbunden."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1422
+#: ../camel/providers/nntp/camel-nntp-store.c:1447
 #, c-format
 msgid "No such folder: %s"
 msgstr "Ordner existiert nicht: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:272
-#: ../camel/providers/nntp/camel-nntp-summary.c:370
+#: ../camel/providers/nntp/camel-nntp-summary.c:238
+#: ../camel/providers/nntp/camel-nntp-summary.c:340
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: neue Nachrichten werden eingelesen"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:279
+#: ../camel/providers/nntp/camel-nntp-summary.c:249
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "Unerwartete Server-Antwort von xover: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:384
+#: ../camel/providers/nntp/camel-nntp-summary.c:356
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "Unerwartete Server-Antwort von head: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:420
-msgid "Use cancel"
-msgstr "Abbrechen verwenden"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:422
+#: ../camel/providers/nntp/camel-nntp-summary.c:399
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Vorgang gescheitert: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:253
+#: ../camel/providers/pop3/camel-pop3-folder.c:235
 msgid "Retrieving POP summary"
 msgstr "POP-Zusammenfassung wird abgerufen"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:271
+#: ../camel/providers/pop3/camel-pop3-folder.c:256
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "POP-Zusammenfassung konnte nicht abgerufen werden: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:314
+#: ../camel/providers/pop3/camel-pop3-folder.c:303
 msgid "Expunging old messages"
 msgstr "Alte Nachrichten werden gelÃ¶scht"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:322
+#: ../camel/providers/pop3/camel-pop3-folder.c:311
 msgid "Expunging deleted messages"
 msgstr "GelÃ¶schte Nachrichten werden ausgerÃ¤umt"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:530
-#: ../camel/providers/pop3/camel-pop3-folder.c:552
+#: ../camel/providers/pop3/camel-pop3-folder.c:533
+#: ../camel/providers/pop3/camel-pop3-folder.c:556
 #, c-format
 msgid "No message with UID %s"
 msgstr "Keine Nachricht mit der Kennung %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: ../camel/providers/pop3/camel-pop3-folder.c:559
+#: ../camel/providers/pop3/camel-pop3-folder.c:563
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "POP-Nachricht %d wird abgerufen"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
+#: ../camel/providers/pop3/camel-pop3-folder.c:660
 msgid "Unknown reason"
 msgstr "Unbekannter Grund"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
+#: ../camel/providers/pop3/camel-pop3-provider.c:39
 msgid "Message storage"
 msgstr "Nachrichtenspeicher"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:41
 msgid "_Leave messages on server"
 msgstr "Nachrichten auf _Server belassen"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
+#: ../camel/providers/pop3/camel-pop3-provider.c:43
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "_Nach %s Tag(en) lÃ¶schen"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:49
+#: ../camel/providers/pop3/camel-pop3-provider.c:45
 msgid "Disable _support for all POP3 extensions"
 msgstr "Jegliche _UnterstÃ¼tzung von POP3-Erweiterungen deaktivieren"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:57
+#: ../camel/providers/pop3/camel-pop3-provider.c:53
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:59
+#: ../camel/providers/pop3/camel-pop3-provider.c:55
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "Zum Verbinden mit und Herunterladen von E-Mails von POP-Servern."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:76
+#: ../camel/providers/pop3/camel-pop3-provider.c:72
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -4354,7 +3971,7 @@ msgstr ""
 "Verbindung mit dem POP-Server her. Viele POP-Server unterstÃ¼tzen nur diese "
 "MÃ¶glichkeit."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:86
+#: ../camel/providers/pop3/camel-pop3-provider.c:82
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that claim "
@@ -4365,42 +3982,52 @@ msgstr ""
 "mÃ¶glicherweise nicht fÃ¼r alle Benutzer, sogar auf Servern, die behaupten, es "
 "zu unterstÃ¼tzen."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:229
+#. Translators: This is the separator between an error and an explanation
+#: ../camel/providers/pop3/camel-pop3-store.c:140
+msgid ": "
+msgstr ": "
+
+#: ../camel/providers/pop3/camel-pop3-store.c:209
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "Es konnte keine gÃ¼ltige BegrÃ¼Ã?ung durch POP-Server %s gelesen werden"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:246
-#: ../camel/providers/pop3/camel-pop3-store.c:274
-#: ../camel/providers/pop3/camel-pop3-store.c:280
+#: ../camel/providers/pop3/camel-pop3-store.c:227
+#: ../camel/providers/pop3/camel-pop3-store.c:258
+#: ../camel/providers/pop3/camel-pop3-store.c:264
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 "Verbindung mit POP-Server %s konnte im sicheren Modus nicht hergestellt "
 "werden: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:247
+#: ../camel/providers/pop3/camel-pop3-store.c:228
 msgid "STLS not supported by server"
 msgstr "STLS wird vom Server nicht unterstÃ¼tzt"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:262
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:246
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode%s"
 msgstr ""
 "Verbindung mit POP-Server %s konnte im sicheren Modus nicht hergestellt "
 "werden %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:281
+#: ../camel/providers/pop3/camel-pop3-store.c:259
+msgid "TLS negotiations failed"
+msgstr "TLS-Â»VerhandlungenÂ« gescheitert"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:265
 msgid "TLS is not available in this build"
 msgstr "TLS ist in diesem Build nicht verfÃ¼gbar"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:387
+#: ../camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Verbindung mit POP-Server %s konnte nicht hergestellt werden"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:428
-#: ../camel/providers/pop3/camel-pop3-store.c:565
+#: ../camel/providers/pop3/camel-pop3-store.c:422
+#: ../camel/providers/pop3/camel-pop3-store.c:574
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -4409,7 +4036,8 @@ msgstr ""
 "Verbindung mit POP-Server %s konnte nicht hergestellt werden: Der "
 "erforderliche Legitimationsmechanismus wird nicht unterstÃ¼tzt."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:446
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:444
 #, c-format
 msgid "SASL '%s' Login failed for POP server %s%s"
 msgstr "SASL Â»%sÂ«-Anmeldung an POP-Server %s gescheitert %s"
@@ -4419,12 +4047,12 @@ msgstr "SASL Â»%sÂ«-Anmeldung an POP-Server %s gescheitert %s"
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Anmeldung an POP-Server %s gescheitert: SASL-Protokollfehler"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:479
+#: ../camel/providers/pop3/camel-pop3-store.c:481
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Legitimation am POP-Server %s gescheitert: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:538
+#: ../camel/providers/pop3/camel-pop3-store.c:544
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4434,7 +4062,7 @@ msgstr ""
 "Kennung erhalten. Es kÃ¶nnte sich um einen sogenannten Â»Man in the MiddleÂ«-"
 "Angriff handeln. Bitte kontaktieren Sie Ihren System-Administrator."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:579
+#: ../camel/providers/pop3/camel-pop3-store.c:590
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4443,7 +4071,8 @@ msgstr ""
 "Verbindung mit POP-Server %s konnte nicht hergestellt werden.\n"
 "Fehler beim Ã?bermitteln des Passworts: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:588
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:601
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4452,7 +4081,8 @@ msgstr ""
 "Verbindung mit POP-Server %s konnte nicht hergestellt werden.\n"
 "Fehler beim Ã?bermitteln des Benutzernamens %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:597
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:613
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4461,16 +4091,16 @@ msgstr ""
 "Verbindung mit POP-Server %s konnte nicht hergestellt werden.\n"
 "Fehler beim Ã?bermitteln des Passworts %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:703
+#: ../camel/providers/pop3/camel-pop3-store.c:733
 #, c-format
 msgid "No such folder '%s'."
 msgstr "Ordner Â»%sÂ« existiert nicht."
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:40
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
@@ -4478,178 +4108,178 @@ msgstr ""
 "Zum Zustellen von E-Mails durch Ã?bergabe an das Programm Â»sendmailÂ« auf dem "
 "lokalen System."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:113
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:98
 msgid "Could not parse recipient list"
 msgstr "Syntax der EmpfÃ¤ngerliste konnte nicht analysiert werden"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:144
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:130
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 "Weiterleitung an sendmail konnte nicht angelegt werden: %s: E-Mail nicht "
 "verschickt"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:165
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:151
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "sendmail konnte nicht abgespalten werden: %s: E-Mail nicht verschickt"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:235
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail brach mit Signal %s ab: E-Mail nicht verschickt."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:242
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:229
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "%s konnte nicht ausgefÃ¼hrt werden: E-Mail nicht verschickt."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:247
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:234
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail wurde mit Status %d beendet: E-Mail nicht verschickt."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:261
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:248
 msgid "sendmail"
 msgstr "sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:250
 msgid "Mail delivery via the sendmail program"
 msgstr "E-Mail-Zustellung Ã¼ber das Programm sendmail"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:43
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:43
+#: ../camel/providers/smtp/camel-smtp-provider.c:45
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 "Zum Zustellen von E-Mails per SMTP Ã¼ber einen entfernten E-Mail-Knotenpunkt."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:167
+#: ../camel/providers/smtp/camel-smtp-transport.c:117
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaxfehler, Befehl nicht erkannt"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:169
+#: ../camel/providers/smtp/camel-smtp-transport.c:119
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaxfehler in Parametern oder Argumenten"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:171
+#: ../camel/providers/smtp/camel-smtp-transport.c:121
 msgid "Command not implemented"
 msgstr "Befehl nicht implementiert"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:173
+#: ../camel/providers/smtp/camel-smtp-transport.c:123
 msgid "Command parameter not implemented"
 msgstr "Befehlsparameter nicht implementiert"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:175
+#: ../camel/providers/smtp/camel-smtp-transport.c:125
 msgid "System status, or system help reply"
 msgstr "Systemstatus- oder Systemhilfe-Antwort"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:177
+#: ../camel/providers/smtp/camel-smtp-transport.c:127
 msgid "Help message"
 msgstr "Hilfemeldung"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:179
+#: ../camel/providers/smtp/camel-smtp-transport.c:129
 msgid "Service ready"
 msgstr "Dienst ist bereit"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:181
+#: ../camel/providers/smtp/camel-smtp-transport.c:131
 msgid "Service closing transmission channel"
 msgstr "Dienst schlieÃ?t Ã?bertragungskanal"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:183
+#: ../camel/providers/smtp/camel-smtp-transport.c:133
 msgid "Service not available, closing transmission channel"
 msgstr "Dienst nicht verfÃ¼gbar, Ã?bertragungskanal wird geschlossen"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:185
+#: ../camel/providers/smtp/camel-smtp-transport.c:135
 msgid "Requested mail action okay, completed"
 msgstr "Angeforderte E-Mail-Aktion in Ordnung, abgeschlossen"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:187
+#: ../camel/providers/smtp/camel-smtp-transport.c:137
 msgid "User not local; will forward to <forward-path>"
 msgstr "Benutzer nicht lokal; Weiterleitung erfolgt zu <weiterleitungspfad>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:189
+#: ../camel/providers/smtp/camel-smtp-transport.c:139
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Angeforderte E-Mail-Aktion nicht ausgefÃ¼hrt: Postfach nicht verfÃ¼gbar"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:191
+#: ../camel/providers/smtp/camel-smtp-transport.c:141
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Angeforderte Aktion nicht ausgefÃ¼hrt: Postfach nicht verfÃ¼gbar"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:143
 msgid "Requested action aborted: error in processing"
 msgstr "Angeforderte Aktion abgebrochen: Fehler bei Verarbeitung"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:195
+#: ../camel/providers/smtp/camel-smtp-transport.c:145
 msgid "User not local; please try <forward-path>"
 msgstr "Benutzer nicht lokal; probieren Sie es mit <weiterleitungspfad>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:197
+#: ../camel/providers/smtp/camel-smtp-transport.c:147
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Angeforderte Aktion nicht ausgefÃ¼hrt: unzureichender Systemspeicher"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:199
+#: ../camel/providers/smtp/camel-smtp-transport.c:149
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Angeforderte Aktion abgebrochen: Speicherzuteilung Ã¼berschritten"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:201
+#: ../camel/providers/smtp/camel-smtp-transport.c:151
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Angeforderte Aktion nicht ausgefÃ¼hrt: Postfachname nicht erlaubt"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:203
+#: ../camel/providers/smtp/camel-smtp-transport.c:153
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "E-Mail-Eingabe beginnen; Ende mit <CRLF>.<CRLF>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:205
+#: ../camel/providers/smtp/camel-smtp-transport.c:155
 msgid "Transaction failed"
 msgstr "Transaktion gescheitert"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:209
+#: ../camel/providers/smtp/camel-smtp-transport.c:159
 msgid "A password transition is needed"
 msgstr "Ein PasswortÃ¼bergang ist notwendig"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:211
+#: ../camel/providers/smtp/camel-smtp-transport.c:161
 msgid "Authentication mechanism is too weak"
 msgstr "Legitimationsmechanismus ist zu schwach"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:213
+#: ../camel/providers/smtp/camel-smtp-transport.c:163
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 "FÃ¼r den verlangten Legitimationsmechanismus ist VerschlÃ¼sselung erforderlich."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:215
+#: ../camel/providers/smtp/camel-smtp-transport.c:165
 msgid "Temporary authentication failure"
 msgstr "Legitimation vorÃ¼bergehend gescheitert"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:296
+#: ../camel/providers/smtp/camel-smtp-transport.c:249
 msgid "Welcome response error"
 msgstr "Fehler bei Welcome-Antwort"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:331
-#: ../camel/providers/smtp/camel-smtp-transport.c:364
-#: ../camel/providers/smtp/camel-smtp-transport.c:370
+#: ../camel/providers/smtp/camel-smtp-transport.c:285
+#: ../camel/providers/smtp/camel-smtp-transport.c:319
+#: ../camel/providers/smtp/camel-smtp-transport.c:326
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Verbindung mit SMTP-Server %s im sicheren Modus ist gescheitert: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:340
+#: ../camel/providers/smtp/camel-smtp-transport.c:295
 #, c-format
 msgid "STARTTLS command failed: %s"
 msgstr "STARTTLS-Befehl gescheitert: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:355
+#: ../camel/providers/smtp/camel-smtp-transport.c:309
 msgid "STARTTLS command failed"
 msgstr "STARTTLS-Befehl gescheitert"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:496
+#: ../camel/providers/smtp/camel-smtp-transport.c:454
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 "SMTP-Server %s unterstÃ¼tzt den erforderlichen Legitimationstypen %s nicht."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:567
+#: ../camel/providers/smtp/camel-smtp-transport.c:527
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4660,121 +4290,118 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:700
+#: ../camel/providers/smtp/camel-smtp-transport.c:665
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-Server %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:702
+#: ../camel/providers/smtp/camel-smtp-transport.c:667
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP-E-Mail-Auslieferung Ã¼ber %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:720
+#: ../camel/providers/smtp/camel-smtp-transport.c:686
 msgid "Cannot send message: service not connected."
 msgstr "Nachricht konnte nicht verschickt werden: Dienst nicht verbunden."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:726
+#: ../camel/providers/smtp/camel-smtp-transport.c:693
 msgid "Cannot send message: sender address not valid."
 msgstr "Nachricht konnte nicht verschickt werden: Absenderadresse nicht gÃ¼ltig."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:730
+#: ../camel/providers/smtp/camel-smtp-transport.c:697
 msgid "Sending message"
 msgstr "Nachricht wird verschickt"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:745
+#: ../camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: no recipients defined."
 msgstr "Nachricht konnte nicht verschickt werden: Keine EmpfÃ¤nger angegeben."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:756
+#: ../camel/providers/smtp/camel-smtp-transport.c:725
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 "Nachricht konnte nicht verschickt werden: Mindestens ein EmpfÃ¤nger ungÃ¼ltig"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:985
+#: ../camel/providers/smtp/camel-smtp-transport.c:962
 msgid "SMTP Greeting"
 msgstr "SMTP-BegrÃ¼Ã?ung"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1010
+#: ../camel/providers/smtp/camel-smtp-transport.c:987
 #, c-format
 msgid "HELO command failed: %s"
 msgstr "HELO-Befehl gescheitert: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1027
+#: ../camel/providers/smtp/camel-smtp-transport.c:1004
 msgid "HELO command failed"
 msgstr "HELO-Befehl gescheitert"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1093
+#: ../camel/providers/smtp/camel-smtp-transport.c:1071
 msgid "SMTP Authentication"
 msgstr "SMTP-Legitimation"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1099
+#: ../camel/providers/smtp/camel-smtp-transport.c:1078
 msgid "Error creating SASL authentication object."
 msgstr "Fehler beim Anlegen eines SASL-Legitimations-Objektes."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1116
-#: ../camel/providers/smtp/camel-smtp-transport.c:1127
+#: ../camel/providers/smtp/camel-smtp-transport.c:1095
+#: ../camel/providers/smtp/camel-smtp-transport.c:1106
 #, c-format
 msgid "AUTH command failed: %s"
 msgstr "AUTH-Befehl gescheitert: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1133
+#: ../camel/providers/smtp/camel-smtp-transport.c:1114
 msgid "AUTH command failed"
 msgstr "AUTH-Befehl gescheitert"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1203
+#: ../camel/providers/smtp/camel-smtp-transport.c:1185
 msgid "Bad authentication response from server.\n"
 msgstr "Fehlerhafte Legitimationsantwort vom Server.\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1230
+#: ../camel/providers/smtp/camel-smtp-transport.c:1212
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "MAIL FROM-Befehl gescheitert: %s: E-Mail nicht verschickt"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1247
+#: ../camel/providers/smtp/camel-smtp-transport.c:1227
 msgid "MAIL FROM command failed"
 msgstr "MAIL FROM-Befehl gescheitert"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1271
+#: ../camel/providers/smtp/camel-smtp-transport.c:1251
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "RCPT TO-Befehl gescheitert: %s: E-Mail nicht verschickt"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1290
+#: ../camel/providers/smtp/camel-smtp-transport.c:1270
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> gescheitert"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1330
-#: ../camel/providers/smtp/camel-smtp-transport.c:1399
-#: ../camel/providers/smtp/camel-smtp-transport.c:1418
+#: ../camel/providers/smtp/camel-smtp-transport.c:1310
+#: ../camel/providers/smtp/camel-smtp-transport.c:1385
+#: ../camel/providers/smtp/camel-smtp-transport.c:1403
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "DATA-Befehl gescheitert: %s: E-Mail nicht verschickt"
 
-#. we should have gotten instructions on how to use the DATA command:
-#. * 354 Enter mail, end with "." on a line by itself
-#.
-#: ../camel/providers/smtp/camel-smtp-transport.c:1347
-#: ../camel/providers/smtp/camel-smtp-transport.c:1434
+#: ../camel/providers/smtp/camel-smtp-transport.c:1327
+#: ../camel/providers/smtp/camel-smtp-transport.c:1416
 msgid "DATA command failed"
 msgstr "DATA-Befehl gescheitert"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1457
+#: ../camel/providers/smtp/camel-smtp-transport.c:1439
 #, c-format
 msgid "RSET command failed: %s"
 msgstr "RSET-Befehl gescheitert: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1473
+#: ../camel/providers/smtp/camel-smtp-transport.c:1454
 msgid "RSET command failed"
 msgstr "RSET-Befehl gescheitert"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1496
+#: ../camel/providers/smtp/camel-smtp-transport.c:1477
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr "QUIT-Befehl gescheitert: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1510
+#: ../camel/providers/smtp/camel-smtp-transport.c:1493
 msgid "QUIT command failed"
 msgstr "QUIT-Befehl gescheitert"
 
@@ -4864,7 +4491,7 @@ msgstr "Wartend"
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1633 ../libedataserver/e-time-utils.c:1898
+#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1902
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
@@ -4872,7 +4499,7 @@ msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1638 ../libedataserver/e-time-utils.c:1889
+#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1893
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a, %d. %m %Y %k:%M:%S"
 
@@ -4880,7 +4507,7 @@ msgstr "%a, %d. %m %Y %k:%M:%S"
 #. in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1643 ../libedataserver/e-time-utils.c:1894
+#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1898
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a, %d.%m.%Y, %I:%M %p"
 
@@ -4888,78 +4515,78 @@ msgstr "%a, %d.%m.%Y, %I:%M %p"
 #. in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1648 ../libedataserver/e-time-utils.c:1885
+#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1889
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a, %d.%m.%Y, %k:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1653
+#: ../libedataserver/e-time-utils.c:1655
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a, %d.%m.%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1658
+#: ../libedataserver/e-time-utils.c:1660
 msgid "%a %m/%d/%Y %H"
 msgstr "%a, %d.%m.%Y %k"
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1661 ../libedataserver/e-time-utils.c:1761
-#: ../libedataserver/e-time-utils.c:1880
+#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1765
+#: ../libedataserver/e-time-utils.c:1884
 msgid "%a %m/%d/%Y"
 msgstr "%a, %d.%m.%Y"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1668
+#: ../libedataserver/e-time-utils.c:1670
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%d.%m.%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1672
+#: ../libedataserver/e-time-utils.c:1674
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d.%m.%Y %k:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1677
+#: ../libedataserver/e-time-utils.c:1679
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%d.%m.%Y / %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1682
+#: ../libedataserver/e-time-utils.c:1684
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d.%m.%Y %k:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1687
+#: ../libedataserver/e-time-utils.c:1689
 msgid "%m/%d/%Y %I %p"
 msgstr "%d.%m.%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1692
+#: ../libedataserver/e-time-utils.c:1694
 msgid "%m/%d/%Y %H"
 msgstr "%d.%m.%Y %k"
 
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1695 ../libedataserver/e-time-utils.c:1764
+#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1768
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1822 ../libedataserver/e-time-utils.c:1942
+#: ../libedataserver/e-time-utils.c:1826 ../libedataserver/e-time-utils.c:1946
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1826 ../libedataserver/e-time-utils.c:1934
+#: ../libedataserver/e-time-utils.c:1830 ../libedataserver/e-time-utils.c:1938
 msgid "%H:%M:%S"
 msgstr "%k:%M:%S"
 
@@ -4967,24 +4594,24 @@ msgstr "%k:%M:%S"
 #. in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1831 ../libedataserver/e-time-utils.c:1939
+#: ../libedataserver/e-time-utils.c:1835 ../libedataserver/e-time-utils.c:1943
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1835 ../libedataserver/e-time-utils.c:1931
+#: ../libedataserver/e-time-utils.c:1839 ../libedataserver/e-time-utils.c:1935
 msgid "%H:%M"
 msgstr "%k:%M"
 
 #. strptime format for time of day, without seconds 24-hour format, and no colon.
-#: ../libedataserver/e-time-utils.c:1838
+#: ../libedataserver/e-time-utils.c:1842
 msgid "%H%M"
 msgstr "%k%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1842
+#: ../libedataserver/e-time-utils.c:1846
 msgid "%I %p"
 msgstr "%I %p"
 
@@ -5033,8 +4660,8 @@ msgid "Category _Name"
 msgstr "Kategorie_name"
 
 #: ../libedataserverui/e-categories-dialog.ui.h:4
-msgid "Item(s) _belong to these categories:"
-msgstr "Objekt(e) gehÃ¶ren in folgende _Kategorien:"
+msgid "Currently _used categories:"
+msgstr "GegenwÃ¤rtig gen_utzte Kategorien:"
 
 #: ../libedataserverui/e-categories-dialog.ui.h:5
 msgid "_Available Categories:"
@@ -5053,27 +4680,19 @@ msgstr "Kategorien"
 msgid "Create category \"%s\""
 msgstr "Kategorie Â»%sÂ« erstellen"
 
-#: ../libedataserverui/e-cell-renderer-color.c:222
-msgid "Color Info"
-msgstr "Farbinformation"
-
-#: ../libedataserverui/e-cell-renderer-color.c:223
-msgid "The color to render"
-msgstr "Die darzustellende Farbe"
-
-#: ../libedataserverui/e-name-selector-dialog.c:292
+#: ../libedataserverui/e-name-selector-dialog.c:310
 msgid "Select Contacts from Address Book"
 msgstr "Kontakte aus dem Adressbuch wÃ¤hlen"
 
-#: ../libedataserverui/e-name-selector-dialog.c:587
+#: ../libedataserverui/e-name-selector-dialog.c:605
 msgid "_Add"
 msgstr "_HinzufÃ¼gen"
 
-#: ../libedataserverui/e-name-selector-dialog.c:612
+#: ../libedataserverui/e-name-selector-dialog.c:632
 msgid "_Remove"
 msgstr "_Entfernen"
 
-#: ../libedataserverui/e-name-selector-dialog.c:789
+#: ../libedataserverui/e-name-selector-dialog.c:816
 #: ../libedataserverui/e-name-selector-dialog.ui.h:6
 msgid "Any Category"
 msgstr "Jede Kategorie"
@@ -5115,58 +4734,58 @@ msgid "_Search:"
 msgstr "_Suchen:"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2508
+#: ../libedataserverui/e-name-selector-entry.c:2498
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "%s aus_klappen"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2523
+#: ../libedataserverui/e-name-selector-entry.c:2513
 #, c-format
 msgid "Cop_y %s"
 msgstr "%s _kopieren"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2533
+#: ../libedataserverui/e-name-selector-entry.c:2523
 #, c-format
 msgid "C_ut %s"
 msgstr "%s ausschnei_den"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2550
+#: ../libedataserverui/e-name-selector-entry.c:2540
 #, c-format
 msgid "_Edit %s"
 msgstr "%s _bearbeiten"
 
-#: ../libedataserverui/e-name-selector-list.c:469
+#: ../libedataserverui/e-name-selector-list.c:517
 #, c-format
 msgid "_Delete %s"
 msgstr "%s _lÃ¶schen"
 
-#: ../libedataserverui/e-passwords.c:234
+#: ../libedataserverui/e-passwords.c:257
 #, c-format
 msgid "Keyring key is unusable: no user or host name"
 msgstr ""
 "SchlÃ¼ssel des SchlÃ¼sselbundes kann nicht genutzt werden: Kein Benutzer- oder "
 "Servername"
 
-#: ../libedataserverui/e-passwords.c:1093
+#: ../libedataserverui/e-passwords.c:1116
 msgid "You have the Caps Lock key on."
 msgstr "Die Umschalttaste ist aktiviert."
 
-#: ../libedataserverui/e-passwords.c:1215
+#: ../libedataserverui/e-passwords.c:1238
 msgid "_Remember this passphrase"
 msgstr "An dieses Passwort _erinnern"
 
-#: ../libedataserverui/e-passwords.c:1216
+#: ../libedataserverui/e-passwords.c:1239
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "FÃ¼r den Rest dieser Sitzung an dieses Passwort _erinnern"
 
-#: ../libedataserverui/e-passwords.c:1221
+#: ../libedataserverui/e-passwords.c:1244
 msgid "_Remember this password"
 msgstr "An dieses Passwort _erinnern"
 
-#: ../libedataserverui/e-passwords.c:1222
+#: ../libedataserverui/e-passwords.c:1245
 msgid "_Remember this password for the remainder of this session"
 msgstr "FÃ¼r den Rest dieser Sitzung an dieses Passwort _erinnern"
 
@@ -5176,7 +4795,7 @@ msgstr "FÃ¼r den Rest dieser Sitzung an dieses Passwort _erinnern"
 msgid "Select destination"
 msgstr "Ziel wÃ¤hlen"
 
-#: ../libedataserverui/e-source-selector-dialog.c:156
+#: ../libedataserverui/e-source-selector-dialog.c:172
 msgid "_Destination"
 msgstr "_Ziel"
 
@@ -5196,6 +4815,294 @@ msgstr "Server liefert keine Antwort"
 msgid "Bad parameter"
 msgstr "Fehlerhafter Parameter"
 
+#~ msgid "Unsupported operation: append message: for %s"
+#~ msgstr "Nicht unterstÃ¼tzter Vorgang: Nachricht anhÃ¤ngen: fÃ¼r %s"
+
+#~ msgid "Unsupported operation: search by expression: for %s"
+#~ msgstr "Nicht unterstÃ¼tzter Vorgang: Suche nach Ausdruck: fÃ¼r %s"
+
+#~ msgid "Unsupported operation: count by expression: for %s"
+#~ msgstr "Nicht unterstÃ¼tzter Vorgang: Anzahl nach Ausdruck: fÃ¼r %s"
+
+#~ msgid "Unsupported operation: search by UIDs: for %s"
+#~ msgstr "Nicht unterstÃ¼tzter Vorgang: Suche nach UIDs: fÃ¼r %s"
+
+#~ msgid "Learning junk"
+#~ msgstr "WerbemÃ¼ll wird erlernt"
+
+#~ msgid "Learning non-junk"
+#~ msgstr "Â»Kein WerbemÃ¼llÂ« wird gelernt"
+
+#~ msgid "Camel session doesn't support forwarding of a message."
+#~ msgstr ""
+#~ "Die Camel-Sitzung unterstÃ¼tzt die Weiterleitung einer Nachricht nicht."
+
+#~ msgid "import keys: unimplemented"
+#~ msgstr "SchlÃ¼ssel importieren: Nicht implementiert"
+
+#~ msgid "export keys: unimplemented"
+#~ msgstr "SchlÃ¼ssel exportieren: Nicht implementiert"
+
+#~ msgid "Cannot create folder: Invalid operation on this store"
+#~ msgstr ""
+#~ "Ordner konnte nicht angelegt werden: UngÃ¼ltiger Vorgang auf diesem Speicher"
+
+#~ msgid "Namespace"
+#~ msgstr "Namensraum"
+
+#~ msgid "Hula"
+#~ msgstr "Hula"
+
+#~ msgid "For accessing Hula servers"
+#~ msgstr "FÃ¼r den Zugriff auf Hula-Server"
+
+#~ msgid ""
+#~ "This option will connect to the Hula server using a plaintext password."
+#~ msgstr ""
+#~ "Dies stellt unter Verwendung eines unverschlÃ¼sselten Passworts eine "
+#~ "Verbindung mit dem Hula-Server her."
+
+#~ msgid "Failed sending command to IMAP server %s: %s"
+#~ msgstr "Schicken eines Befehls an IMAP-Server %s gescheitert: %s"
+
+#~ msgid "Unexpected response from IMAP4 server %s: %s"
+#~ msgstr "Unerwartete Antwort von IMAP4-Server %s: %s"
+
+#~ msgid "Unexpected greeting from IMAP server %s."
+#~ msgstr "Unerwartete BegrÃ¼Ã?ung durch IMAP-Server: %s"
+
+#~ msgid "Cannot select folder '%s': Invalid mailbox name"
+#~ msgstr "Ordner Â»%sÂ« konnte nicht gewÃ¤hlt werden: UngÃ¼ltiger Postfachname"
+
+#~ msgid "Cannot select folder '%s': Bad command"
+#~ msgstr "Ordner Â»%sÂ« konnte nicht gewÃ¤hlt werden: UngÃ¼ltiger Befehl"
+
+#~ msgid "Failed to send command to IMAP server %s: %s"
+#~ msgstr "Schicken eines Befehls an IMAP-Server %s gescheitert: %s"
+
+#~ msgid "service unavailable"
+#~ msgstr "Dienst nicht verfÃ¼gbar"
+
+#~ msgid "IMAP4 server %s unexpectedly disconnected: %s"
+#~ msgstr "Verbindung mit IMAP4-Server %s unerwartet getrennt: %s"
+
+#~ msgid ""
+#~ "Enable extended Mailing-List detection required for some filter and "
+#~ "vFolder rules"
+#~ msgstr ""
+#~ "Erweiterte Erkennung von Mailinglisten aktivieren (dies wird fÃ¼r einige "
+#~ "Filter und VOrdner-Regeln benÃ¶tigt)"
+
+#~ msgid "Expire cached messages that haven't been read in X seconds"
+#~ msgstr ""
+#~ "Zwischengespeicherte Nachrichten lÃ¶schen, die nicht innerhalb von X "
+#~ "Sekunden gelesen werden konnten"
+
+#~ msgid "Expire cached messages older than X seconds"
+#~ msgstr ""
+#~ "Zwischengespeicherte Nachrichten lÃ¶schen, die Ã¤lter als X Sekunden sind"
+
+#~ msgid "Cannot access folder '%s': %s"
+#~ msgstr "Auf den Ordner Â»%sÂ« konnte nicht zugegriffen werden: %s"
+
+#~ msgid "Cannot sync flags to folder '%s': Unknown error"
+#~ msgstr ""
+#~ "Flags konnten nicht mit Ordner Â»%sÂ« abgeglichen werden: Unbekannter Fehler"
+
+#~ msgid "Cannot sync flags to folder '%s': Bad command"
+#~ msgstr ""
+#~ "Flags konnten nicht mit Ordner Â»%sÂ« abgeglichen werden: UngÃ¼ltiger Befehl"
+
+#~ msgid "Cannot expunge folder '%s': Unknown error"
+#~ msgstr "Ordner Â»%sÂ« konnte nicht gesÃ¤ubert werden: Unbekannter Fehler"
+
+#~ msgid "Cannot expunge folder '%s': Bad command"
+#~ msgstr "Ordner Â»%sÂ« konnte nicht gesÃ¤ubert werden: UngÃ¼ltiger Befehl"
+
+#~ msgid "Cannot get message %s from folder '%s': No such message"
+#~ msgstr ""
+#~ "Nachricht %s konnte nicht aus Ordner %s abgerufen werden: Keine derartige "
+#~ "Nachricht"
+
+#~ msgid "Cannot get message %s from folder '%s': Bad command"
+#~ msgstr ""
+#~ "Nachricht %s konnte nicht aus Ordner Â»%sÂ« abgerufen werden: Fehlerhafter "
+#~ "Befehl"
+
+#~ msgid "Cannot append message to folder '%s': Folder is read-only"
+#~ msgstr ""
+#~ "Nachricht konnte nicht an Ordner Â»%sÂ« angehÃ¤ngt werden: Ordner ist "
+#~ "schreibgeschÃ¼tzt"
+
+#~ msgid "Cannot append message to folder '%s': Unknown error"
+#~ msgstr ""
+#~ "Nachricht konnte nicht an Ordner Â»%sÂ« angehÃ¤ngt werden: Unbekannter Fehler"
+
+#~ msgid "Cannot append message to folder '%s': Bad command"
+#~ msgstr ""
+#~ "Nachricht konnte nicht an Ordner Â»%sÂ« angehÃ¤ngt werden: UngÃ¼ltiger Befehl"
+
+#~ msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
+#~ msgstr ""
+#~ "Nachrichten aus Ordner Â»%sÂ« konnten nicht in Ordner Â»%sÂ« verschoben werden: "
+#~ "Unbekannter Fehler"
+
+#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
+#~ msgstr ""
+#~ "Nachrichten aus Ordner Â»%sÂ« konnten nicht in Ordner Â»%sÂ« kopiert werden: "
+#~ "Unbekannter Fehler"
+
+#~ msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
+#~ msgstr ""
+#~ "Nachrichten aus Ordner Â»%sÂ« konnten nicht in Ordner Â»%sÂ« verschoben werden: "
+#~ "UngÃ¼ltiger Befehl"
+
+#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
+#~ msgstr ""
+#~ "Nachrichten aus Ordner Â»%sÂ« konnten nicht in Ordner Â»%sÂ« kopiert werden: "
+#~ "UngÃ¼ltiger Befehl"
+
+#~ msgid "Check new messages for _Junk contents"
+#~ msgstr "Neue Nachrichten auf unerwÃ¼nschten Inhalt _prÃ¼fen"
+
+#~ msgid "Only check for Junk messa_ges in the INBOX folder"
+#~ msgstr ""
+#~ "AusschlieÃ?lich den Ein_gangsordner auf unerwÃ¼nschte Nachrichten prÃ¼fen"
+
+#~ msgid "IMAP4rev1"
+#~ msgstr "IMAP4rev1"
+
+#~ msgid "For reading and storing mail on IMAPv4rev1 servers."
+#~ msgstr "Zum Lesen und Speichern von E-Mails auf IMAPv4rev1-Servern."
+
+#~ msgid ""
+#~ "This option will connect to the IMAPv4rev1 server using a plaintext "
+#~ "password."
+#~ msgstr ""
+#~ "Dies stellt unter Verwendung eines unverschlÃ¼sselten Passworts eine "
+#~ "Verbindung mit dem IMAPv4rev1-Server her."
+
+#~ msgid ""
+#~ "Failed to connect to IMAP server %s in secure mode: Server does not "
+#~ "support STARTTLS"
+#~ msgstr ""
+#~ "Verbindung mit IMAP-Server %s im sicheren Modus ist gescheitert: Der "
+#~ "Server unterstÃ¼tzt STARTTLS nicht"
+
+#~ msgid ""
+#~ "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+#~ msgstr ""
+#~ "Legitimation am IMAP-Server %s mit Hilfe des Legitimationsmechanismus %s "
+#~ "gescheitert"
+
+#~ msgid "Cannot authenticate to IMAP server %s using %s"
+#~ msgstr "Legitimation am POP-Server %s mit Hilfe von %s gescheitert"
+
+#~ msgid "Cannot create IMAP folders in offline mode."
+#~ msgstr "IMAP-Ordner kÃ¶nnen im Offline-Modus nicht angelegt werden."
+
+#~ msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
+#~ msgstr ""
+#~ "Ordner Â»%sÂ« auf IMAP-Server %s konnte nicht abgerufen werden: Unbekannter "
+#~ "Fehler"
+
+#~ msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
+#~ msgstr ""
+#~ "LIST-Informationen fÃ¼r Â»%sÂ« auf IMAP-Server %s konnten nicht abgerufen "
+#~ "werden: %s"
+
+#~ msgid "Bad command"
+#~ msgstr "UngÃ¼ltiger Befehl"
+
+#~ msgid "Cannot create folder '%s': Invalid mailbox name"
+#~ msgstr "Ordner Â»%sÂ« konnte nicht angelegt werden: UngÃ¼ltiger Postfachname"
+
+#~ msgid "Cannot create folder '%s': Bad command"
+#~ msgstr "Ordner Â»%sÂ« konnte nicht angelegt werden: UngÃ¼ltiger Befehl"
+
+#~ msgid "Cannot delete folder '%s': Special folder"
+#~ msgstr "Ordner Â»%sÂ« konnte nicht gelÃ¶scht werden: Ordner mit Sonderstatus"
+
+#~ msgid "Cannot delete IMAP folders in offline mode."
+#~ msgstr "IMAP-Ordner kÃ¶nnen im Offline-Modus nicht gelÃ¶scht werden."
+
+#~ msgid "Cannot delete folder '%s': Invalid mailbox name"
+#~ msgstr "Ordner Â»%sÂ« konnte nicht gelÃ¶scht werden: UngÃ¼ltiger Postfachname"
+
+#~ msgid "Cannot delete folder '%s': Bad command"
+#~ msgstr "Ordner Â»%sÂ« konnte nicht gelÃ¶scht werden: UngÃ¼ltiger Befehl"
+
+#~ msgid "Cannot rename folder '%s' to '%s': Special folder"
+#~ msgstr ""
+#~ "Ordner Â»%sÂ« konnte nicht in Â»%sÂ« umbenannt werden: Ordner mit Sonderstatus"
+
+#~ msgid "Cannot rename IMAP folders in offline mode."
+#~ msgstr "IMAP-Ordner kÃ¶nnen im Offline-Modus nicht umbenannt werden."
+
+#~ msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
+#~ msgstr ""
+#~ "Ordner Â»%sÂ« konnte nicht in Â»%sÂ« umbenannt werden: UngÃ¼ltiger Postfachname"
+
+#~ msgid "Cannot rename folder '%s' to '%s': Bad command"
+#~ msgstr "Ordner Â»%sÂ« konnte nicht in Â»%sÂ« umbenannt werden: UngÃ¼ltiger Befehl"
+
+#~ msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
+#~ msgstr ""
+#~ "%s-Informationen fÃ¼r Muster Â»%sÂ« auf IMAP-Server %s konnten nicht abgerufen "
+#~ "werden: %s"
+
+#~ msgid "Cannot subscribe to IMAP folders in offline mode."
+#~ msgstr "IMAP-Ordner kÃ¶nnen im Offline-Modus nicht abonniert werden."
+
+#~ msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
+#~ msgstr "Abonnieren des Ordners Â»%sÂ« gescheitert: UngÃ¼ltiger Postfachname"
+
+#~ msgid "Cannot subscribe to folder '%s': Bad command"
+#~ msgstr "Abonnieren des Ordners Â»%sÂ« gescheitert: UngÃ¼ltiger Befehl"
+
+#~ msgid "Cannot unsubscribe from IMAP folders in offline mode."
+#~ msgstr ""
+#~ "Abonnements von IMAP-Ordnern kÃ¶nnen im Offline-Modus nicht beendet werden."
+
+#~ msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
+#~ msgstr "Abbestellen des Ordners Â»%sÂ« gescheitert: UngÃ¼ltiger Postfachname"
+
+#~ msgid "Cannot unsubscribe from folder '%s': Bad command"
+#~ msgstr "Abbestellen des Ordners Â»%sÂ« gescheitert: UngÃ¼ltiger Befehl"
+
+#~ msgid "Scanning for changed messages"
+#~ msgstr "GeÃ¤nderte Nachrichten werden gesucht"
+
+#~ msgid "IMAP server %s is in an inconsistent state."
+#~ msgstr "IMAP-Server %s befindet sich in einem inkonsistenten Zustand."
+
+#~ msgid "Fetching envelopes of new messages"
+#~ msgstr "Envelopes der neuen Nachrichten werden abgerufen"
+
+#~ msgid "Unexpected token in response from IMAP server %s: "
+#~ msgstr "Unerwartete Kennung in Antwort von IMAP-Server %s: "
+
+#~ msgid "No data"
+#~ msgstr "Keine Daten"
+
+#~ msgid "IMAP server %s unexpectedly disconnected: %s"
+#~ msgstr "Verbindung mit IMAP-Server %s unerwartet getrennt: %s"
+
+#~ msgid "%sPlease enter the IMAP password for %s %s"
+#~ msgstr "%s Bitte geben Sie das IMAP-Passwort fÃ¼r %s %s ein"
+
+#~ msgid "Use cancel"
+#~ msgstr "Abbrechen verwenden"
+
+#~ msgid "Item(s) _belong to these categories:"
+#~ msgstr "Objekt(e) gehÃ¶ren in folgende _Kategorien:"
+
+#~ msgid "Color Info"
+#~ msgstr "Farbinformation"
+
+#~ msgid "The color to render"
+#~ msgstr "Die darzustellende Farbe"
+
 #~ msgid ""
 #~ "Experimental IMAP 4(.1) client\n"
 #~ "This is untested and unsupported code, you want to use plain imap "
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]