[evolution-data-server] Updated Swedish translation



commit 5d972da53139e90fc652e2fc0a56c846ef09d0c3
Author: Daniel Nylander <po danielnylander se>
Date:   Thu Aug 5 17:05:49 2010 +0200

    Updated Swedish translation

 po/sv.po | 3581 +++++++++++++++++++++++++++++---------------------------------
 1 files changed, 1688 insertions(+), 1893 deletions(-)
---
diff --git a/po/sv.po b/po/sv.po
index 5d0756c..4b6970d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -11,78 +11,92 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 12:59+0100\n"
-"PO-Revision-Date: 2010-02-28 13:01+0100\n"
+"POT-Creation-Date: 2010-08-05 17:05+0200\n"
+"PO-Revision-Date: 2010-08-05 17:05+0100\n"
 "Last-Translator: Daniel Nylander <po danielnylander se>\n"
 "Language-Team: Swedish <tp-sv listor tp-sv se>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:560
+#: ../addressbook/backends/file/e-book-backend-file.c:570
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2330
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
 msgid "Loading..."
 msgstr "Läser in..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:563
+#: ../addressbook/backends/file/e-book-backend-file.c:573
 #: ../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/vcf/e-book-backend-vcf.c:476
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4491
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
 msgid "Searching..."
 msgstr "Söker..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2696
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4715
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2698
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4650
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "Hämtar kontakter (%d)... "
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2845
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2846
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3029
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3073
 #, c-format
 msgid "Updating contacts cache (%d)... "
 msgstr "Uppdaterar kontaktcache (%d)... "
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:816
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:172
+msgid "Not connected"
+msgstr "Inte ansluten"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:753
 msgid "Using Distinguished Name (DN)"
 msgstr "Använder distinguished name (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:819
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:756
 msgid "Using Email Address"
 msgstr "Använder e-postadress"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1096
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1031
 msgid "Reconnecting to LDAP server..."
 msgstr "Ã?teransluter till LDAP-servern..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1738
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1156
+msgid "Invalid DN syntax"
+msgstr "Ogiltig DN-syntax"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1672
 msgid "Adding contact to LDAP server..."
 msgstr "Lägger till kontakt till LDAP-server..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1872
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1804
 msgid "Removing contact from LDAP server..."
 msgstr "Tar bort kontakt från LDAP-server..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2309
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2238
 msgid "Modifying contact from LDAP server..."
 msgstr "�ndrar kontakt från LDAP-servern..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4412
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4341
 msgid "Receiving LDAP search results..."
 msgstr "Mottar LDAP-sökresultat..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4573
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4513
 msgid "Error performing search"
 msgstr "Fel vid sökning"
 
-#: ../addressbook/libebook/e-book.c:2149
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:329
+#, c-format
+msgid "Create resource '%s' failed with http status: %d"
+msgstr "Skapandet av resursen \"%s\" misslyckades med http-status: %d"
+
+#: ../addressbook/libebook/e-book.c:2940
 #, c-format
-msgid "%s: there was no source for uid `%s' stored in gconf."
-msgstr "%s: det finns ingen källa för UID \"%s\" lagrad i gconf."
+msgid "%s: there was no source for UID '%s' stored in GConf."
+msgstr "%s: det finns ingen källa för UID \"%s\" lagrad i GConf."
 
 #. Dummy row as EContactField starts from 1
 #: ../addressbook/libebook/e-contact.c:115
@@ -350,27 +364,27 @@ msgid "GroupWise Work Screen Name 3"
 msgstr "GroupWise-jobbskärmnamn 3"
 
 #: ../addressbook/libebook/e-contact.c:203
-msgid "Jabber Home Id 1"
+msgid "Jabber Home ID 1"
 msgstr "Jabber-hemid 1"
 
 #: ../addressbook/libebook/e-contact.c:204
-msgid "Jabber Home Id 2"
+msgid "Jabber Home ID 2"
 msgstr "Jabber-hemid 2"
 
 #: ../addressbook/libebook/e-contact.c:205
-msgid "Jabber Home Id 3"
+msgid "Jabber Home ID 3"
 msgstr "Jabber-hemid 3"
 
 #: ../addressbook/libebook/e-contact.c:206
-msgid "Jabber Work Id 1"
+msgid "Jabber Work ID 1"
 msgstr "Jabber-jobbid 1"
 
 #: ../addressbook/libebook/e-contact.c:207
-msgid "Jabber Work Id 2"
+msgid "Jabber Work ID 2"
 msgstr "Jabber-jobbid 2"
 
 #: ../addressbook/libebook/e-contact.c:208
-msgid "Jabber Work Id 3"
+msgid "Jabber Work ID 3"
 msgstr "Jabber-jobbid 3"
 
 #: ../addressbook/libebook/e-contact.c:209
@@ -422,27 +436,27 @@ msgid "MSN Work Screen Name 3"
 msgstr "MSN-jobbskärmnamn 3"
 
 #: ../addressbook/libebook/e-contact.c:221
-msgid "ICQ Home Id 1"
+msgid "ICQ Home ID 1"
 msgstr "ICQ-hemid 1"
 
 #: ../addressbook/libebook/e-contact.c:222
-msgid "ICQ Home Id 2"
+msgid "ICQ Home ID 2"
 msgstr "ICQ-hemid 2"
 
 #: ../addressbook/libebook/e-contact.c:223
-msgid "ICQ Home Id 3"
+msgid "ICQ Home ID 3"
 msgstr "ICQ-hemid 3"
 
 #: ../addressbook/libebook/e-contact.c:224
-msgid "ICQ Work Id 1"
+msgid "ICQ Work ID 1"
 msgstr "ICQ-jobbid 1"
 
 #: ../addressbook/libebook/e-contact.c:225
-msgid "ICQ Work Id 2"
+msgid "ICQ Work ID 2"
 msgstr "ICQ-jobbid 2"
 
 #: ../addressbook/libebook/e-contact.c:226
-msgid "ICQ Work Id 3"
+msgid "ICQ Work ID 3"
 msgstr "ICQ-jobbid 3"
 
 #. Last modified time
@@ -499,11 +513,11 @@ msgid "AIM Screen Name List"
 msgstr "Lista med AIM-skärmnamn"
 
 #: ../addressbook/libebook/e-contact.c:250
-msgid "GroupWise Id List"
+msgid "GroupWise ID List"
 msgstr "Lista med GroupWise-id"
 
 #: ../addressbook/libebook/e-contact.c:251
-msgid "Jabber Id List"
+msgid "Jabber ID List"
 msgstr "Lista med Jabber-id"
 
 #: ../addressbook/libebook/e-contact.c:252
@@ -515,7 +529,7 @@ msgid "MSN Screen Name List"
 msgstr "Lista med MSN-skärmnamn"
 
 #: ../addressbook/libebook/e-contact.c:254
-msgid "ICQ Id List"
+msgid "ICQ ID List"
 msgstr "Lista med ICQ-id"
 
 #: ../addressbook/libebook/e-contact.c:256
@@ -535,8 +549,8 @@ msgid "Birth Date"
 msgstr "Födelsedatum"
 
 #: ../addressbook/libebook/e-contact.c:262
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:715
-#: ../libedataserver/e-categories.c:45
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
+#: ../libedataserver/e-categories.c:44
 msgid "Anniversary"
 msgstr "Jubileum"
 
@@ -546,32 +560,32 @@ msgid "X.509 Certificate"
 msgstr "X.509-certifikat"
 
 #: ../addressbook/libebook/e-contact.c:267
-msgid "Gadu-Gadu Home Id 1"
+msgid "Gadu-Gadu Home ID 1"
 msgstr "Gadu-Gadu-hemid 1"
 
 #: ../addressbook/libebook/e-contact.c:268
-msgid "Gadu-Gadu Home Id 2"
+msgid "Gadu-Gadu Home ID 2"
 msgstr "Gadu-Gadu-hemid 2"
 
 #: ../addressbook/libebook/e-contact.c:269
-msgid "Gadu-Gadu Home Id 3"
+msgid "Gadu-Gadu Home ID 3"
 msgstr "Gadu-Gadu-hemid 3"
 
 #: ../addressbook/libebook/e-contact.c:270
-msgid "Gadu-Gadu Work Id 1"
+msgid "Gadu-Gadu Work ID 1"
 msgstr "Gadu-Gadu-jobbid 1"
 
 #: ../addressbook/libebook/e-contact.c:271
-msgid "Gadu-Gadu Work Id 2"
+msgid "Gadu-Gadu Work ID 2"
 msgstr "Gadu-Gadu-jobbid 2"
 
 #: ../addressbook/libebook/e-contact.c:272
-msgid "Gadu-Gadu Work Id 3"
+msgid "Gadu-Gadu Work ID 3"
 msgstr "Gadu-Gadu-jobbid 3"
 
 #: ../addressbook/libebook/e-contact.c:273
-msgid "Gadu-Gadu Id List"
-msgstr "Gadu-Gadu-idlista"
+msgid "Gadu-Gadu ID List"
+msgstr "Lista med Gadu-Gadu-id"
 
 #. Geo information
 #: ../addressbook/libebook/e-contact.c:276
@@ -614,205 +628,353 @@ msgstr "Lista med Skype-namn"
 msgid "SIP address"
 msgstr "SIP-adress"
 
-#: ../addressbook/libebook/e-contact.c:1513
+#: ../addressbook/libebook/e-contact.c:1517
 #: ../addressbook/libebook/e-destination.c:739
 msgid "Unnamed List"
 msgstr "Namnlös lista"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:290
+#: ../addressbook/libedata-book/e-data-book-factory.c:287
 #, c-format
 msgid "Empty URI"
 msgstr "Tom URI"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:305
-#: ../addressbook/libedata-book/e-data-book-factory.c:332
-#: ../calendar/libedata-cal/e-data-cal-factory.c:323
-#: ../calendar/libedata-cal/e-data-cal-factory.c:332
+#: ../addressbook/libedata-book/e-data-book-factory.c:306
+#: ../addressbook/libedata-book/e-data-book-factory.c:344
+#: ../calendar/libedata-cal/e-data-cal-factory.c:331
+#: ../calendar/libedata-cal/e-data-cal-factory.c:343
 #, c-format
 msgid "Invalid source"
 msgstr "Ogiltig källa"
 
-#: ../addressbook/libedata-book/e-data-book.c:301
-msgid "Cannot open book"
-msgstr "Kan inte öppna boken"
+#: ../addressbook/libedata-book/e-data-book.c:166
+#: ../calendar/libedata-cal/e-data-cal.c:104
+msgid "Success"
+msgstr "Lyckades"
 
-#: ../addressbook/libedata-book/e-data-book.c:319
-msgid "Cannot remove book"
-msgstr "Kan inte ta bort boken"
+#: ../addressbook/libedata-book/e-data-book.c:167
+#: ../calendar/libedata-cal/e-data-cal.c:105
+msgid "Repository offline"
+msgstr "Lagret är frånkopplat"
 
-#: ../addressbook/libedata-book/e-data-book.c:331
-#: ../addressbook/libedata-book/e-data-book.c:346
-msgid "Cannot get contact"
-msgstr "Kan inte hämta kontakten"
+#: ../addressbook/libedata-book/e-data-book.c:168
+#: ../calendar/libecal/e-cal.c:3945
+#: ../calendar/libedata-cal/e-data-cal.c:106
+msgid "Permission denied"
+msgstr "Ã?tkomst nekas"
+
+#: ../addressbook/libedata-book/e-data-book.c:169
+msgid "Contact not found"
+msgstr "Kontakten hittades inte"
 
-#: ../addressbook/libedata-book/e-data-book.c:358
-msgid "Empty query"
-msgstr "Tom frågesats"
+#: ../addressbook/libedata-book/e-data-book.c:170
+msgid "Contact ID already exists"
+msgstr "Kontakt-id finns redan"
 
-#: ../addressbook/libedata-book/e-data-book.c:402
-msgid "Cannot authenticate user"
-msgstr "Kan inte autentisera användaren"
+#: ../addressbook/libedata-book/e-data-book.c:171
+#: ../calendar/libedata-cal/e-data-cal.c:111
+msgid "Authentication Failed"
+msgstr "Autentisering misslyckades"
+
+#: ../addressbook/libedata-book/e-data-book.c:172
+#: ../calendar/libedata-cal/e-data-cal.c:112
+msgid "Authentication Required"
+msgstr "Autentisering krävs"
+
+#: ../addressbook/libedata-book/e-data-book.c:173
+#: ../calendar/libedata-cal/e-data-cal.c:113
+msgid "Unsupported field"
+msgstr "Fältet stöds inte"
 
-#: ../addressbook/libedata-book/e-data-book.c:414
-#: ../addressbook/libedata-book/e-data-book.c:429
-msgid "Cannot add contact"
-msgstr "Kan inte lägga till användaren"
+#: ../addressbook/libedata-book/e-data-book.c:174
+#: ../calendar/libedata-cal/e-data-cal.c:115
+msgid "Unsupported authentication method"
+msgstr "Autentiseringsmetoden stöds inte"
+
+#: ../addressbook/libedata-book/e-data-book.c:175
+#: ../calendar/libedata-cal/e-data-cal.c:116
+msgid "TLS not available"
+msgstr "TLS är inte tillgängligt"
 
-#: ../addressbook/libedata-book/e-data-book.c:444
-#: ../addressbook/libedata-book/e-data-book.c:459
-msgid "Cannot modify contact"
-msgstr "Kan inte ändra kontakten"
+#: ../addressbook/libedata-book/e-data-book.c:176
+msgid "Address Book does not exist"
+msgstr "Adressboken finns inte"
 
-#: ../addressbook/libedata-book/e-data-book.c:494
-msgid "Cannot remove contacts"
-msgstr "Kan inte ta bort kontakterna"
+#: ../addressbook/libedata-book/e-data-book.c:177
+msgid "Book removed"
+msgstr "Boken togs bort"
 
-#: ../addressbook/libedata-book/e-data-book.c:569
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
+#: ../addressbook/libedata-book/e-data-book.c:178
+#: ../calendar/libedata-cal/e-data-cal.c:119
+msgid "Not available in offline mode"
+msgstr "Inte tillgängligt i frånkopplat läge"
+
+#: ../addressbook/libedata-book/e-data-book.c:179
+#: ../calendar/libedata-cal/e-data-cal.c:120
+msgid "Search size limit exceeded"
+msgstr "Sökstorleksgräns överskreds"
+
+#: ../addressbook/libedata-book/e-data-book.c:180
+#: ../calendar/libedata-cal/e-data-cal.c:121
+msgid "Search time limit exceeded"
+msgstr "Söktidsgräns överskreds"
+
+#: ../addressbook/libedata-book/e-data-book.c:181
+#: ../calendar/libedata-cal/e-data-cal.c:122
 msgid "Invalid query"
 msgstr "Ogiltig begäran"
 
-#: ../addressbook/libedata-book/e-data-book.c:598
-msgid "Cannot get changes"
-msgstr "Kan inte hämta ändringar"
+#: ../addressbook/libedata-book/e-data-book.c:182
+#: ../calendar/libedata-cal/e-data-cal.c:123
+msgid "Query refused"
+msgstr "Begäran avvisades"
 
-#: ../addressbook/libedata-book/e-data-book.c:699
-msgid "Cannot complete operation"
-msgstr "Kunde inte färdigställa åtgärden"
+#: ../addressbook/libedata-book/e-data-book.c:183
+#: ../calendar/libedata-cal/e-data-cal.c:124
+msgid "Could not cancel"
+msgstr "Kunde inte avbryta"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
-#: ../libedataserver/e-categories.c:46
+#. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
+#. { OtherError,			N_("Other error") },
+#: ../addressbook/libedata-book/e-data-book.c:185
+#: ../calendar/libedata-cal/e-data-cal.c:126
+msgid "Invalid server version"
+msgstr "Ogiltig serverversion"
+
+#: ../addressbook/libedata-book/e-data-book.c:186
+msgid "No space"
+msgstr "Inget utrymme"
+
+#: ../addressbook/libedata-book/e-data-book.c:187
+#: ../calendar/libecal/e-cal.c:3929
+#: ../calendar/libedata-cal/e-data-cal.c:127
+msgid "Invalid argument"
+msgstr "Ogiltigt argument"
+
+#: ../addressbook/libedata-book/e-data-book.c:188
+#: ../calendar/libecal/e-cal.c:3967
+#: ../calendar/libedata-cal/e-data-cal.c:128
+msgid "Not supported"
+msgstr "Stöds inte"
+
+#: ../addressbook/libedata-book/e-data-book.c:196
+#: ../calendar/libedata-cal/e-data-cal.c:136
+msgid "Other error"
+msgstr "Annat fel"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:307
+#, c-format
+msgid "Cannot open book: %s"
+msgstr "Kan inte öppna boken: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:329
+#, c-format
+msgid "Cannot remove book: %s"
+msgstr "Kan inte ta bort boken: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:346
+#: ../addressbook/libedata-book/e-data-book.c:365
+#, c-format
+msgid "Cannot get contact: %s"
+msgstr "Kan inte hämta kontakten: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:380
+#, c-format
+msgid "Empty query: %s"
+msgstr "Tom frågesats: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:396
+#, c-format
+msgid "Cannot get contact list: %s"
+msgstr "Kan inte hämta kontaktlistan: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:433
+#, c-format
+msgid "Cannot authenticate user: %s"
+msgstr "Kan inte autentisera användaren: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:448
+#: ../addressbook/libedata-book/e-data-book.c:467
+#, c-format
+msgid "Cannot add contact: %s"
+msgstr "Kan inte lägga till användaren: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:485
+#: ../addressbook/libedata-book/e-data-book.c:504
+#, c-format
+msgid "Cannot modify contact: %s"
+msgstr "Kan inte ändra kontakten: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:543
+#, c-format
+msgid "Cannot remove contacts: %s"
+msgstr "Kan inte ta bort kontakterna: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:580
+#, c-format
+msgid "Cannot get supported fields: %s"
+msgstr "Kan inte hämta fält som stöds: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:595
+#, c-format
+msgid "Cannot get required fields: %s"
+msgstr "Kan inte hämta nödvändiga fält: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:610
+#, c-format
+msgid "Cannot get supported auth methods: %s"
+msgstr "Kan inte hämta autentiseringsmetoder som stöds: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:636
+#: ../addressbook/libedata-book/e-data-book.c:647
+#, c-format
+msgid "Invalid query: %s"
+msgstr "Ogiltig frågesats: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:683
+#, c-format
+msgid "Cannot get changes: %s"
+msgstr "Kan inte hämta ändringar: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:722
+#, c-format
+msgid "Cancel operation failed: %s"
+msgstr "Avbrytsåtgärden misslyckades: %s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:498
+#, c-format
+msgid "Unexpected HTTP status code %d returned"
+msgstr "Oväntad HTTP-statuskod %d returnerades"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4094
+msgid "Calendar doesn't support Free/Busy"
+msgstr "Kalendern saknar stöd för Ledig/Upptagen"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:719
+#: ../libedataserver/e-categories.c:45
 msgid "Birthday"
 msgstr "Födelsedag"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:746
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:748
 #, c-format
 msgid "Birthday: %s"
 msgstr "Födelsedag: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:770
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:772
 #, c-format
 msgid "Anniversary: %s"
 msgstr "Jubileum: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:236
+#: ../calendar/backends/file/e-cal-backend-file.c:239
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "Kan inte spara kalenderdata: Felaktigt utformad URI."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:243
-#: ../calendar/backends/file/e-cal-backend-file.c:249
+#: ../calendar/backends/file/e-cal-backend-file.c:246
+#: ../calendar/backends/file/e-cal-backend-file.c:252
 msgid "Cannot save calendar data"
 msgstr "Kan inte spara kalenderdata"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:342
-msgid "Could not create thread for getting deltas"
-msgstr "Kunde inte skapa tråd för framtagning av deltan"
-
-#: ../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/http/e-cal-backend-http.c:678
-#: ../calendar/backends/weather/e-cal-backend-weather.c:492
-msgid "Could not create cache file"
-msgstr "Kunde inte skapa cachefil"
-
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:387
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1094
-msgid "Could not create thread for populating cache"
-msgstr "Kunde inte skapa tråd för populering av cache"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1082
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2121
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1121
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2224
 msgid "Reply Requested: by "
 msgstr "Svar begärt: av "
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1087
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2126
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1126
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2229
 msgid "Reply Requested: When convenient"
 msgstr "Svar begärt: Då det passar"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:283
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:295
 #, c-format
 msgid "Loading %s items"
 msgstr "Läser in %s objekt"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:919
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:926
 msgid "Calendar"
 msgstr "Kalender"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:977
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:989
 msgid "Invalid server URI"
 msgstr "Ogiltig 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:1334
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1370
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1385
-#: ../camel/providers/groupwise/camel-groupwise-store.c:591
-#: ../camel/providers/groupwise/camel-groupwise-store.c:766
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:181
-msgid "Authentication failed"
-msgstr "Autentisering misslyckades"
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1082
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1343
+#: ../calendar/backends/http/e-cal-backend-http.c:659
+#: ../calendar/backends/weather/e-cal-backend-weather.c:487
+msgid "Could not create cache file"
+msgstr "Kunde inte skapa cachefil"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1095
+msgid "Could not create thread for populating cache"
+msgstr "Kunde inte skapa tråd för populering av cache"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:335
+#: ../calendar/backends/http/e-cal-backend-http.c:327
 msgid "Redirected to Invalid URI"
 msgstr "Omdirigerad till ogiltig URI"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:358
+#: ../calendar/backends/http/e-cal-backend-http.c:350
 msgid "Bad file format."
 msgstr "Felaktigt filformat."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:365
+#: ../calendar/backends/http/e-cal-backend-http.c:357
 msgid "Not a calendar."
 msgstr "Inte en kalender."
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:152
+#: ../calendar/backends/weather/e-cal-backend-weather.c:154
 msgid "Could not retrieve weather data"
 msgstr "Kunde inte hämta väderdata"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:253
 msgid "Weather: Fog"
 msgstr "Väder: Dimma"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
+#: ../calendar/backends/weather/e-cal-backend-weather.c:254
 msgid "Weather: Cloudy Night"
 msgstr "Väder: Molnig natt"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
+#: ../calendar/backends/weather/e-cal-backend-weather.c:255
 msgid "Weather: Cloudy"
 msgstr "Väder: Molnigt"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:256
 msgid "Weather: Overcast"
 msgstr "Väder: Heltäckande"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:255
+#: ../calendar/backends/weather/e-cal-backend-weather.c:257
 msgid "Weather: Showers"
 msgstr "Väder: Skurar"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:256
+#: ../calendar/backends/weather/e-cal-backend-weather.c:258
 msgid "Weather: Snow"
 msgstr "Väder: Snö"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:257
+#: ../calendar/backends/weather/e-cal-backend-weather.c:259
 msgid "Weather: Clear Night"
 msgstr "Väder: Klar natt"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:258
+#: ../calendar/backends/weather/e-cal-backend-weather.c:260
 msgid "Weather: Sunny"
 msgstr "Väder: Soligt"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:259
+#: ../calendar/backends/weather/e-cal-backend-weather.c:261
 msgid "Weather: Thunderstorms"
 msgstr "Väder: �skväder"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:405
+#: ../calendar/backends/weather/e-cal-backend-weather.c:407
 msgid "Forecast"
 msgstr "Prognos"
 
@@ -964,8 +1126,8 @@ msgstr "LÃ¥g"
 msgid "Undefined"
 msgstr "Odefinierad"
 
-#: ../calendar/libecal/e-cal.c:1173
-#: ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1128
+#: ../libedataserverui/e-book-auth-util.c:206
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Ange lösenord för %s (användare %s)"
@@ -974,108 +1136,95 @@ msgstr "Ange lösenord för %s (användare %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:1142
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "Ange lösenord för %s för att aktivera proxyn för användaren %s"
 
-#: ../calendar/libecal/e-cal.c:3992
-msgid "Invalid argument"
-msgstr "Ogiltigt argument"
-
-#: ../calendar/libecal/e-cal.c:3994
+#: ../calendar/libecal/e-cal.c:3931
 msgid "Backend is busy"
 msgstr "Bakänden är upptagen"
 
-#: ../calendar/libecal/e-cal.c:3996
-#: ../calendar/libedata-cal/e-cal-backend-util.c:105
+#: ../calendar/libecal/e-cal.c:3933
 msgid "Repository is offline"
 msgstr "Lagret är frånkopplat"
 
-#: ../calendar/libecal/e-cal.c:3998
-#: ../calendar/libedata-cal/e-cal-backend-util.c:129
+#: ../calendar/libecal/e-cal.c:3935
 msgid "No such calendar"
 msgstr "Det finns ingen sådan kalender"
 
-#: ../calendar/libecal/e-cal.c:4000
-#: ../calendar/libedata-cal/e-cal-backend-util.c:111
+#: ../calendar/libecal/e-cal.c:3937
+#: ../calendar/libedata-cal/e-data-cal.c:108
 #: ../servers/groupwise/e-gw-connection.c:235
 msgid "Object not found"
 msgstr "Objektet kunde inte hittas"
 
-#: ../calendar/libecal/e-cal.c:4002
-#: ../calendar/libedata-cal/e-cal-backend-util.c:113
+#: ../calendar/libecal/e-cal.c:3939
+#: ../calendar/libedata-cal/e-data-cal.c:109
 #: ../servers/groupwise/e-gw-connection.c:229
 msgid "Invalid object"
 msgstr "Ogiltigt objekt"
 
-#: ../calendar/libecal/e-cal.c:4004
+#: ../calendar/libecal/e-cal.c:3941
 msgid "URI not loaded"
 msgstr "URI:n är inte inläst"
 
-#: ../calendar/libecal/e-cal.c:4006
+#: ../calendar/libecal/e-cal.c:3943
 msgid "URI already loaded"
 msgstr "URI:n är redan inläst"
 
-#: ../calendar/libecal/e-cal.c:4008
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
-msgid "Permission denied"
-msgstr "Ã?tkomst nekas"
-
-#: ../calendar/libecal/e-cal.c:4010
-#: ../calendar/libedata-cal/e-cal-backend-util.c:131
+#: ../calendar/libecal/e-cal.c:3947
 #: ../servers/groupwise/e-gw-connection.c:237
 msgid "Unknown User"
 msgstr "Okänd användare"
 
-#: ../calendar/libecal/e-cal.c:4012
-#: ../calendar/libedata-cal/e-cal-backend-util.c:115
+#: ../calendar/libecal/e-cal.c:3949
+#: ../calendar/libedata-cal/e-data-cal.c:110
 msgid "Object ID already exists"
 msgstr "Objektid finns redan"
 
-#: ../calendar/libecal/e-cal.c:4014
+#: ../calendar/libecal/e-cal.c:3951
 msgid "Protocol not supported"
 msgstr "Protokollet stöds inte"
 
-#: ../calendar/libecal/e-cal.c:4016
+#: ../calendar/libecal/e-cal.c:3953
 msgid "Operation has been canceled"
 msgstr "�tgärden har avbrutits"
 
-#: ../calendar/libecal/e-cal.c:4018
-#: ../calendar/libedata-cal/e-cal-backend-util.c:143
+#: ../calendar/libecal/e-cal.c:3955
 msgid "Could not cancel operation"
 msgstr "Kunde inte avbryta åtgärden"
 
-#: ../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:3957
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1434
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1452
+#: ../camel/providers/groupwise/camel-groupwise-store.c:618
+#: ../camel/providers/groupwise/camel-groupwise-store.c:793
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:85
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:118
+#, c-format
+msgid "Authentication failed"
+msgstr "Autentisering misslyckades"
+
+#: ../calendar/libecal/e-cal.c:3959
+#: ../camel/providers/smtp/camel-smtp-transport.c:166
 msgid "Authentication required"
 msgstr "Autentisering krävs"
 
-#: ../calendar/libecal/e-cal.c:4024
-msgid "A CORBA exception has occurred"
-msgstr "Ett CORBA-undantag har inträffat"
-
-#: ../calendar/libecal/e-cal.c:4026
-#: ../calendar/libedata-cal/e-cal-backend-util.c:146
-#: ../camel/camel-net-utils.c:523
-#: ../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:3961
+msgid "A DBUS exception has occurred"
+msgstr "Ett DBUS-undantag har inträffat"
+
+#: ../calendar/libecal/e-cal.c:3963
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:158
+#: ../camel/providers/imap/camel-imap-command.c:457
+#: ../camel/providers/imap/camel-imap-store.c:626
+#: ../camel/providers/pop3/camel-pop3-store.c:495
 #: ../servers/groupwise/e-gw-connection.c:243
 msgid "Unknown error"
 msgstr "Okänt fel"
 
-#: ../calendar/libecal/e-cal.c:4028
-#: ../calendar/libedata-cal/e-cal-backend-util.c:103
+#: ../calendar/libecal/e-cal.c:3965
 msgid "No error"
 msgstr "Inga fel"
 
@@ -1164,230 +1313,242 @@ msgstr "\"%s\" förväntar sig minst ett argument"
 msgid "\"%s\" expects all arguments to be strings or one and only one argument to be a boolean false (#f)"
 msgstr "\"%s\" förväntar sig att alla argument är strängar eller att ett och endast ett argument är booleskt falsk (#f)"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
+#: ../calendar/libedata-cal/e-data-cal.c:107
 msgid "Invalid range"
 msgstr "Ogiltigt intervall"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
-msgid "Unsupported field"
-msgstr "Fältet stöds inte"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
+#: ../calendar/libedata-cal/e-data-cal.c:114
 msgid "Unsupported method"
 msgstr "Metoden stöds inte"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
-msgid "Unsupported authentication method"
-msgstr "Autentiseringsmetoden stöds inte"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
-msgid "TLS not available"
-msgstr "TLS är inte tillgängligt"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
-msgid "Offline mode unavailable"
-msgstr "Frånkopplat läge är inte tillgängligt"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
-msgid "Search size limit exceeded"
-msgstr "Sökstorleksgräns överskreds"
+#: ../calendar/libedata-cal/e-data-cal.c:117
+msgid "Calendar does not exist"
+msgstr "Kalendern finns inte"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:137
-msgid "Search time limit exceeded"
-msgstr "Söktidsgräns överskreds"
+#: ../calendar/libedata-cal/e-data-cal.c:118
+msgid "UnknownUser"
+msgstr "OkändAnvändare"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:141
-msgid "Query refused"
-msgstr "Begäran avvisades"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:148
-msgid "Invalid server version"
-msgstr "Ogiltig serverversion"
-
-#: ../calendar/libedata-cal/e-data-cal.c:491
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:589
 #, c-format
-msgid "Cannot retrieve calendar address"
-msgstr "Kan inte hämta kalenderadress"
+msgid "Cannot retrieve calendar address: %s"
+msgstr "Kan inte hämta kalenderadress: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:509
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:609
 #, c-format
-msgid "Cannot retrieve calendar alarm e-mail address"
-msgstr "Kan inte hämta e-postadress för kalenderlarm"
+msgid "Cannot retrieve calendar alarm e-mail address: %s"
+msgstr "Kan inte hämta e-postadress för kalenderlarm: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:527
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:629
 #, c-format
-msgid "Cannot retrieve calendar's ldap attribute"
-msgstr "Kan inte hämta kalenderns ldap-attribut"
+msgid "Cannot retrieve calendar's ldap attribute: %s"
+msgstr "Kan inte hämta kalenderns ldap-attribut: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:545
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:649
 #, c-format
-msgid "Cannot retrieve calendar scheduling information"
-msgstr "Kan inte hämta kalenderns schemainformation"
+msgid "Cannot retrieve calendar scheduling information: %s"
+msgstr "Kan inte hämta kalenderns schemainformation: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:562
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:668
 #, c-format
-msgid "Cannot open calendar"
-msgstr "Kan inte öppna kalendern"
+msgid "Cannot open calendar: %s"
+msgstr "Kan inte öppna kalendern: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:579
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:689
 #, c-format
-msgid "Cannot refresh calendar"
-msgstr "Kan inte uppdatera kalendern"
+msgid "Cannot refresh calendar: %s"
+msgstr "Kan inte uppdatera kalendern: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:596
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:708
 #, c-format
-msgid "Cannot remove calendar"
-msgstr "Kan inte ta bort kalendern"
+msgid "Cannot remove calendar: %s"
+msgstr "Kan inte ta bort kalendern: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:615
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:729
 #, c-format
-msgid "Cannot create calendar object"
-msgstr "Kan inte skapa kalenderobjektet"
+msgid "Cannot create calendar object: %s"
+msgstr "Kan inte skapa kalenderobjektet: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:637
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:753
 #, c-format
-msgid "Cannot modify calendar object"
-msgstr "Kan inte ändra kalenderobjektet"
+msgid "Cannot modify calendar object: %s"
+msgstr "Kan inte ändra kalenderobjektet: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:661
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:779
 #, c-format
-msgid "Cannot remove calendar object"
-msgstr "Kan inte ta bort kalenderobjektet"
+msgid "Cannot remove calendar object: %s"
+msgstr "Kan inte ta bort kalenderobjektet: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:680
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:800
 #, c-format
-msgid "Cannot receive calendar objects"
-msgstr "Kan inte hämta kalenderobjekt"
+msgid "Cannot receive calendar objects: %s"
+msgstr "Kan inte hämta kalenderobjekt: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:697
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:819
 #, c-format
-msgid "Cannot discard calendar alarm"
-msgstr "Kan inte förkasta kalenderlarm"
+msgid "Cannot discard calendar alarm: %s"
+msgstr "Kan inte förkasta kalenderlarm: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:716
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:840
 #, c-format
-msgid "Cannot send calendar objects"
-msgstr "Kan inte skicka kalenderobjekt"
+msgid "Cannot send calendar objects: %s"
+msgstr "Kan inte skicka kalenderobjekt: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:751
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:865
 #, c-format
-msgid "Cannot retrieve default calendar object path"
-msgstr "Kan inte hämta standardsökväg för kalenderobjekt"
+msgid "Cannot retrieve default calendar object path: %s"
+msgstr "Kan inte hämta standardsökväg för kalenderobjekt: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:769
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:885
 #, c-format
-msgid "Cannot retrieve calendar object path"
-msgstr "Kan inte hämta sökväg för kalenderobjekt"
+msgid "Cannot retrieve calendar object path: %s"
+msgstr "Kan inte hämta sökväg för kalenderobjekt: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:787
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:905
 #, c-format
-msgid "Cannot retrieve calendar object list"
-msgstr "Kan inte hämta lista över kalenderobjekt"
+msgid "Cannot retrieve calendar object list: %s"
+msgstr "Kan inte hämta lista över kalenderobjekt: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:825
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:933
 #, c-format
-msgid "Could not retrieve attachment list"
-msgstr "Kunde inte hämta bilageslista"
+msgid "Could not retrieve attachment list: %s"
+msgstr "Kunde inte hämta lista över bilagor: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:847
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:959
 #, c-format
-msgid "Could not complete calendar query"
-msgstr "Kunde inte färdigställa kalenderfråga"
+msgid "Could not complete calendar query: %s"
+msgstr "Kunde inte färdigställa kalenderfråga: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:865
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:979
 #, c-format
-msgid "Could not retrieve calendar time zone"
-msgstr "Kunde inte hämta tidszon för kalender"
+msgid "Could not retrieve calendar time zone: %s"
+msgstr "Kunde inte hämta tidszon för kalender: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:883
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:999
 #, c-format
-msgid "Could not add calendar time zone"
-msgstr "Kunde inte lägga till tidszon för kalender"
+msgid "Could not add calendar time zone: %s"
+msgstr "Kunde inte lägga till tidszon för kalender: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:900
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1018
 #, c-format
-msgid "Could not set default calendar time zone"
-msgstr "Kunde inte ställa in standardtidszon för kalender"
+msgid "Could not set default calendar time zone: %s"
+msgstr "Kunde inte ställa in standardtidszon för kalender: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:921
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1041
 #, c-format
-msgid "Cannot retrieve calendar changes"
-msgstr "Kan inte hämta kalenderändringar"
+msgid "Cannot retrieve calendar changes: %s"
+msgstr "Kan inte hämta kalenderändringar: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:971
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1072
 #, c-format
-msgid "Cannot retrieve calendar free/busy list"
-msgstr "Kan inte hämta ledig/upptagen-lista för kalender"
+msgid "Cannot retrieve calendar free/busy list: %s"
+msgstr "Kan inte hämta ledig/upptagen-lista för kalender: %s"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:339
+#: ../calendar/libedata-cal/e-data-cal-factory.c:353
 #, c-format
 msgid "Invalid URI"
 msgstr "Ogiltig URI"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:350
+#: ../calendar/libedata-cal/e-data-cal-factory.c:371
 #, c-format
 msgid "No backend factory for '%s' of '%s'"
 msgstr "Ingen bakändesfabrik för \"%s\" för \"%s\""
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:390
+#: ../calendar/libedata-cal/e-data-cal-factory.c:421
 #, c-format
 msgid "Could not instantiate backend"
 msgstr "Kunde inte instantifiera bakände"
 
-#: ../camel/camel-cipher-context.c:102
+#: ../camel/camel-cipher-context.c:75
+#, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "Signering stöds inte av detta chiffer"
 
-#: ../camel/camel-cipher-context.c:128
+#: ../camel/camel-cipher-context.c:110
 msgid "Signing message"
 msgstr "Signerar meddelande"
 
-#: ../camel/camel-cipher-context.c:145
+#: ../camel/camel-cipher-context.c:131
+#, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "Verifiering stöds inte av detta chiffer"
 
-#: ../camel/camel-cipher-context.c:171
+#: ../camel/camel-cipher-context.c:164
 msgid "Verifying message"
 msgstr "Verifierar meddelande"
 
-#: ../camel/camel-cipher-context.c:189
+#: ../camel/camel-cipher-context.c:188
+#, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "Kryptering stöds inte av detta chiffer"
 
-#: ../camel/camel-cipher-context.c:215
+#: ../camel/camel-cipher-context.c:223
 msgid "Encrypting message"
 msgstr "Krypterar meddelande"
 
-#: ../camel/camel-cipher-context.c:232
+#: ../camel/camel-cipher-context.c:246
+#, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "Dekryptering stöds inte av detta chiffer"
 
-#: ../camel/camel-cipher-context.c:254
+#: ../camel/camel-cipher-context.c:276
 msgid "Decrypting message"
 msgstr "Dekrypterar meddelande"
 
-#: ../camel/camel-cipher-context.c:271
+#: ../camel/camel-cipher-context.c:297
+#, c-format
 msgid "You may not import keys with this cipher"
 msgstr "Du kan inte importera nycklar med detta chiffer"
 
-#: ../camel/camel-cipher-context.c:301
+#: ../camel/camel-cipher-context.c:341
+#, c-format
 msgid "You may not export keys with this cipher"
 msgstr "Du kan inte exportera nycklar med detta chiffer"
 
-#: ../camel/camel-data-cache.c:135
+#: ../camel/camel-data-cache.c:181
+#, c-format
 msgid "Unable to create cache path"
 msgstr "Kan inte skapa cachesökväg"
 
-#: ../camel/camel-data-cache.c:401
+#: ../camel/camel-data-cache.c:494
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Kunde inte ta bort cacheposten: %s: %s"
 
-#: ../camel/camel-db.c:411
+#: ../camel/camel-data-wrapper.c:89
+#, c-format
+msgid "No stream available"
+msgstr "Ingen ström tillgänglig"
+
+#: ../camel/camel-db.c:464
+#, c-format
 msgid "Insufficient memory"
 msgstr "Inte tillräckligt mycket minne"
 
-#: ../camel/camel-disco-diary.c:197
+#: ../camel/camel-disco-diary.c:195
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -1398,8 +1559,8 @@ msgstr ""
 "Ytterligare åtgärder på denna server kommer inte att spelas tillbaka\n"
 "då du återansluter till nätverket."
 
-#: ../camel/camel-disco-diary.c:260
-#: ../camel/providers/imap/camel-imap-journal.c:320
+#: ../camel/camel-disco-diary.c:258
+#: ../camel/providers/imap/camel-imap-journal.c:298
 #, c-format
 msgid ""
 "Could not open '%s':\n"
@@ -1410,131 +1571,158 @@ msgstr ""
 "%s\n"
 "�ndringar gjorda för denna mapp kommer inte att återsynkroniseras."
 
-#: ../camel/camel-disco-diary.c:296
+#: ../camel/camel-disco-diary.c:299
 msgid "Resynchronizing with server"
 msgstr "Ã?tersynkroniserar med servern"
 
-#: ../camel/camel-disco-folder.c:43
-#: ../camel/camel-offline-folder.c:51
-msgid "Copy folder content locally for offline operation"
-msgstr "Kopiera mappinnehåll lokalt för frånkopplad operation"
-
-#: ../camel/camel-disco-folder.c:105
-#: ../camel/camel-offline-folder.c:107
+#: ../camel/camel-disco-folder.c:68
+#: ../camel/camel-offline-folder.c:66
 msgid "Downloading new messages for offline mode"
 msgstr "Hämtar nya meddelanden för frånkopplat läge"
 
-#: ../camel/camel-disco-folder.c:466
+#: ../camel/camel-disco-folder.c:379
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Förbereder mappen \"%s\" för frånkopplat"
 
-#: ../camel/camel-disco-store.c:400
-#: ../camel/providers/groupwise/camel-groupwise-store.c:216
-#: ../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-folder.c:445
+#: ../camel/camel-offline-folder.c:224
+msgid "Copy folder content locally for offline operation"
+msgstr "Kopiera mappinnehåll lokalt för frånkopplad operation"
+
+#: ../camel/camel-disco-store.c:395
+#: ../camel/providers/groupwise/camel-groupwise-store.c:230
+#: ../camel/providers/imap/camel-imap-store.c:895
+#: ../camel/providers/imap/camel-imap-store.c:1739
+#: ../camel/providers/imap/camel-imap-store.c:2197
+#: ../camel/providers/imap/camel-imap-store.c:3041
+#: ../camel/providers/imapx/camel-imapx-store.c:185
+#: ../camel/providers/imapx/camel-imapx-store.c:709
+#: ../camel/providers/imapx/camel-imapx-store.c:772
+#: ../camel/providers/imapx/camel-imapx-store.c:831
+#, c-format
 msgid "You must be working online to complete this operation"
 msgstr "Du måste vara ansluten för att kunna genomföra denna åtgärd"
 
-#: ../camel/camel-exception.c:260
-msgid "No description available"
-msgstr "Ingen beskrivning tillgänglig"
+#: ../camel/camel-file-utils.c:430
+#: ../camel/camel-file-utils.c:489
+#: ../camel/camel-file-utils.c:529
+#: ../camel/camel-file-utils.c:599
+#: ../camel/camel-file-utils.c:691
+#: ../camel/camel-gpg-context.c:887
+#: ../camel/camel-gpg-context.c:1175
+#: ../camel/camel-net-utils.c:512
+#: ../camel/camel-net-utils.c:689
+#: ../camel/camel-net-utils.c:838
+#: ../camel/providers/imapx/camel-imapx-server.c:4678
+#: ../camel/providers/imapx/camel-imapx-server.c:4695
+#: ../camel/providers/nntp/camel-nntp-summary.c:396
+#: ../camel/providers/pop3/camel-pop3-folder.c:269
+#: ../camel/providers/pop3/camel-pop3-folder.c:625
+#: ../camel/providers/pop3/camel-pop3-folder.c:690
+#: ../camel/providers/pop3/camel-pop3-store.c:487
+#: ../libedataserverui/e-book-auth-util.c:229
+#, c-format
+msgid "Cancelled"
+msgstr "Avbruten"
 
-#: ../camel/camel-filter-driver.c:794
-#: ../camel/camel-filter-search.c:579
+#: ../camel/camel-file-utils.c:643
+#: ../camel/camel-file-utils.c:734
+#: ../camel/camel-file-utils.c:791
+#, c-format
+msgid "Canceled"
+msgstr "Avbruten"
+
+#: ../camel/camel-filter-driver.c:808
+#: ../camel/camel-filter-search.c:582
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "Misslyckades med att skapa barnprocessen \"%s\": %s"
 
-#: ../camel/camel-filter-driver.c:836
+#: ../camel/camel-filter-driver.c:853
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Ogiltig meddelandeström mottagen från %s: %s"
 
-#: ../camel/camel-filter-driver.c:1025
-#: ../camel/camel-filter-driver.c:1034
+#: ../camel/camel-filter-driver.c:1037
+#: ../camel/camel-filter-driver.c:1046
 msgid "Syncing folders"
 msgstr "Synkroniserar mappar"
 
-#: ../camel/camel-filter-driver.c:1121
-#: ../camel/camel-filter-driver.c:1522
+#: ../camel/camel-filter-driver.c:1134
+#: ../camel/camel-filter-driver.c:1569
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fel vid tolkning av filter: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1130
-#: ../camel/camel-filter-driver.c:1531
+#: ../camel/camel-filter-driver.c:1145
+#: ../camel/camel-filter-driver.c:1580
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fel vid körning av filter: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1216
+#: ../camel/camel-filter-driver.c:1240
+#, c-format
 msgid "Unable to open spool folder"
 msgstr "Kan inte öppna spool-mappen"
 
-#: ../camel/camel-filter-driver.c:1225
+#: ../camel/camel-filter-driver.c:1251
+#, c-format
 msgid "Unable to process spool folder"
 msgstr "Kan inte bearbeta spool-mappen"
 
-#: ../camel/camel-filter-driver.c:1241
+#: ../camel/camel-filter-driver.c:1269
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Hämtar meddelande %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1245
-msgid "Cannot open message"
-msgstr "Kan inte öppna meddelande"
-
-#: ../camel/camel-filter-driver.c:1246
-#: ../camel/camel-filter-driver.c:1264
+#: ../camel/camel-filter-driver.c:1275
+#: ../camel/camel-filter-driver.c:1297
 #, c-format
 msgid "Failed on message %d"
 msgstr "Misslyckades med meddelande %d"
 
-#: ../camel/camel-filter-driver.c:1278
-#: ../camel/camel-filter-driver.c:1368
+#: ../camel/camel-filter-driver.c:1312
+#: ../camel/camel-filter-driver.c:1411
 msgid "Syncing folder"
 msgstr "Synkroniserar mapp"
 
-#: ../camel/camel-filter-driver.c:1282
-#: ../camel/camel-filter-driver.c:1373
+#: ../camel/camel-filter-driver.c:1316
+#: ../camel/camel-filter-driver.c:1416
 msgid "Complete"
 msgstr "Färdigt"
 
-#: ../camel/camel-filter-driver.c:1338
+#: ../camel/camel-filter-driver.c:1377
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Hämtar meddelande %d av %d"
 
-#: ../camel/camel-filter-driver.c:1353
+#: ../camel/camel-filter-driver.c:1395
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Misslyckades vid meddelande %d av %d"
 
-#: ../camel/camel-filter-search.c:137
+#: ../camel/camel-filter-search.c:135
 msgid "Failed to retrieve message"
 msgstr "Misslyckades med att hämta meddelande"
 
-#: ../camel/camel-filter-search.c:399
+#: ../camel/camel-filter-search.c:401
 msgid "Invalid arguments to (system-flag)"
 msgstr "Ogiltiga argument till (system-flag)"
 
-#: ../camel/camel-filter-search.c:414
+#: ../camel/camel-filter-search.c:416
 msgid "Invalid arguments to (user-tag)"
 msgstr "Ogiltiga argument till (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:744
+#: ../camel/camel-filter-search.c:753
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Fel vid körning av filtersökning: %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:345
+#: ../camel/camel-folder-search.c:456
+#: ../camel/camel-folder-search.c:627
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1543,9 +1731,9 @@ msgstr ""
 "Kan inte tolka sökuttrycket: %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:357
+#: ../camel/camel-folder-search.c:468
+#: ../camel/camel-folder-search.c:639
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1556,87 +1744,85 @@ msgstr ""
 
 # Detta kräver nog en förklaring.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61084
-#: ../camel/camel-folder-search.c:810
-#: ../camel/camel-folder-search.c:852
+#: ../camel/camel-folder-search.c:843
+#: ../camel/camel-folder-search.c:885
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) kräver ett ensamt booleskt resultat"
 
 # Detta kräver nog en förklaring.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61084
-#: ../camel/camel-folder-search.c:905
+#: ../camel/camel-folder-search.c:938
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) är inte tillåtet inuti %s"
 
 # Detta kräver nog en förklaring.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61084
-#: ../camel/camel-folder-search.c:911
-#: ../camel/camel-folder-search.c:918
+#: ../camel/camel-folder-search.c:944
+#: ../camel/camel-folder-search.c:951
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) kräver en matchtypssträng"
 
 # Detta kräver nog en förklaring.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61084
-#: ../camel/camel-folder-search.c:945
+#: ../camel/camel-folder-search.c:978
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) kräver ett vektorresultat"
 
 # Detta kräver nog en förklaring.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61084
-#: ../camel/camel-folder-search.c:954
+#: ../camel/camel-folder-search.c:987
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) kräver att mappen är inställd"
 
-#: ../camel/camel-folder.c:676
+#: ../camel/camel-folder.c:125
 #, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "�tgärden stöds inte: lägg till meddelande: för %s"
+msgid "Learning new spam message in '%s'"
+msgid_plural "Learning new spam messages in '%s'"
+msgstr[0] "Lär om nytt skräppostmeddelande i \"%s\""
+msgstr[1] "Lär om nya skräppostmeddelanden i \"%s\""
 
-#: ../camel/camel-folder.c:1381
+#: ../camel/camel-folder.c:147
 #, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "�tgärden stöds inte: sökning med uttryck: för %s"
+msgid "Learning new ham message in '%s'"
+msgid_plural "Learning new ham messages in '%s'"
+msgstr[0] "Lär om nytt icke-skräppostmeddelande i \"%s\""
+msgstr[1] "Lär om nya icke-skräppostmeddelanden i \"%s\""
 
-#: ../camel/camel-folder.c:1422
+#: ../camel/camel-folder.c:171
 #, c-format
-msgid "Unsupported operation: count by expression: for %s"
-msgstr "�tgärden stöds inte: räkning med uttryck: för %s"
+msgid "Filtering new message in '%s'"
+msgid_plural "Filtering new messages in '%s'"
+msgstr[0] "Filtrerar nytt meddelande i \"%s\""
+msgstr[1] "Filtrerar nya meddelanden i \"%s\""
 
-#: ../camel/camel-folder.c:1461
-#, c-format
-msgid "Unsupported operation: search by UIDs: for %s"
-msgstr "�tgärden stöds inte: sökning med uid: för %s"
-
-#: ../camel/camel-folder.c:1574
-#: ../camel/providers/local/camel-maildir-folder.c:387
+#: ../camel/camel-folder.c:688
+#: ../camel/providers/local/camel-maildir-folder.c:366
 msgid "Moving messages"
 msgstr "Flyttar meddelanden"
 
-#: ../camel/camel-folder.c:1574
+#: ../camel/camel-folder.c:690
 msgid "Copying messages"
 msgstr "Kopierar meddelanden"
 
-# Detta kräver nog en förklaring.
-# http://bugzilla.ximian.com/show_bug.cgi?id=61087
-#: ../camel/camel-folder.c:1915
-msgid "Learning junk"
-msgstr "Lär sig skräp"
-
-# Detta kräver nog en förklaring.
-# http://bugzilla.ximian.com/show_bug.cgi?id=61087
-#: ../camel/camel-folder.c:1933
-msgid "Learning non-junk"
-msgstr "Lär sig ickeskräp"
+#: ../camel/camel-gpg-context.c:701
+#: ../camel/camel-gpg-context.c:706
+#: ../camel/camel-gpg-context.c:1330
+#, c-format
+msgid "Failed to execute gpg: %s"
+msgstr "Misslyckades med att köra gpg: %s"
 
-#: ../camel/camel-folder.c:1953
-msgid "Filtering new message(s)"
-msgstr "Filtrerar nya meddelanden"
+#: ../camel/camel-gpg-context.c:706
+#: ../camel/providers/smtp/camel-smtp-transport.c:114
+#: ../camel/providers/smtp/camel-smtp-transport.c:169
+msgid "Unknown"
+msgstr "Okänd"
 
-#: ../camel/camel-gpg-context.c:760
+#: ../camel/camel-gpg-context.c:770
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1647,16 +1833,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:775
+#: ../camel/camel-gpg-context.c:787
+#, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "Misslyckades med att tolka gpg-tips för användarid."
 
-#: ../camel/camel-gpg-context.c:799
-#: ../camel/camel-gpg-context.c:813
+#: ../camel/camel-gpg-context.c:812
+#: ../camel/camel-gpg-context.c:827
+#, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "Misslyckades med att tolka gpg-lösenfrasbegäran."
 
-#: ../camel/camel-gpg-context.c:833
+#: ../camel/camel-gpg-context.c:848
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1665,7 +1853,7 @@ msgstr ""
 "Du behöver en pin-kod för att låsa upp nyckeln för\n"
 "ditt smartkort: \"%s\""
 
-#: ../camel/camel-gpg-context.c:837
+#: ../camel/camel-gpg-context.c:852
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1674,150 +1862,122 @@ msgstr ""
 "Du behöver en lösenfras för att låsa upp nyckeln för\n"
 "användaren: \"%s\""
 
-#: ../camel/camel-gpg-context.c:842
+#: ../camel/camel-gpg-context.c:858
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "Oväntad begäran från GnuPG för \"%s\""
 
-#: ../camel/camel-gpg-context.c:867
-#: ../camel/camel-gpg-context.c:1113
-#: ../camel/providers/nntp/camel-nntp-store.c:1313
-msgid "Canceled."
-msgstr "Avbruten."
-
-#: ../camel/camel-gpg-context.c:881
+#: ../camel/camel-gpg-context.c:905
+#, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Misslyckades med att låsa upp hemlig nyckel: 3 felaktiga lösenfraser angivna."
 
-#: ../camel/camel-gpg-context.c:889
+#: ../camel/camel-gpg-context.c:917
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Oväntat svar från GnuPG: %s"
 
-#: ../camel/camel-gpg-context.c:988
+#: ../camel/camel-gpg-context.c:1048
+#, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Misslyckades med att kryptera: inga giltiga mottagare angivna."
 
-#. 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
-#, c-format
-msgid "Failed to execute gpg: %s"
-msgstr "Misslyckades med att köra gpg: %s"
-
-#: ../camel/camel-gpg-context.c:1355
-#: ../camel/camel-smime-context.c:605
-#, c-format
-msgid "Could not generate signing data: %s"
-msgstr "Kunde inte generera signeringsdata: %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:1434
+#: ../camel/camel-smime-context.c:821
+msgid "Could not generate signing data: "
+msgstr "Kunde inte generera signeringsdata: "
+
+#: ../camel/camel-gpg-context.c:1481
+#: ../camel/camel-gpg-context.c:1740
+#: ../camel/camel-gpg-context.c:1848
+#: ../camel/camel-gpg-context.c:1987
+#: ../camel/camel-gpg-context.c:2081
+#: ../camel/camel-gpg-context.c:2128
 msgid "Failed to execute gpg."
 msgstr "Misslyckades med att köra gpg."
 
-#: ../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:1622
+#: ../camel/camel-gpg-context.c:1630
+#: ../camel/camel-gpg-context.c:1638
+#: ../camel/camel-gpg-context.c:1655
+#: ../camel/camel-smime-context.c:943
+#: ../camel/camel-smime-context.c:957
+#: ../camel/camel-smime-context.c:966
+#, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Kan inte verifiera meddelandesignatur: Felaktigt meddelandeformat"
 
-#: ../camel/camel-gpg-context.c:1600
-#, c-format
-msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr "Kan inte verifiera meddelandesignatur: kunde inte skapa temporär fil: %s"
+#: ../camel/camel-gpg-context.c:1695
+msgid "Cannot verify message signature: "
+msgstr "Kan inte verifiera meddelandesignatur: "
 
-#: ../camel/camel-gpg-context.c:1711
-#, c-format
-msgid "Could not generate encrypting data: %s"
-msgstr "Kunde inte generera krypteringsdata: %s"
+#: ../camel/camel-gpg-context.c:1814
+msgid "Could not generate encrypting data: "
+msgstr "Kunde inte generera krypteringsdata: "
 
-#: ../camel/camel-gpg-context.c:1761
+#: ../camel/camel-gpg-context.c:1866
 msgid "This is a digitally encrypted message part"
 msgstr "Detta är en digitalt signerad meddelandedel"
 
-#: ../camel/camel-gpg-context.c:1814
-#: ../camel/camel-gpg-context.c:1822
-#: ../camel/camel-gpg-context.c:1841
+#: ../camel/camel-gpg-context.c:1922
+#: ../camel/camel-gpg-context.c:1931
+#: ../camel/camel-gpg-context.c:1954
+#, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "Kan inte dekryptera meddelande: Felaktigt meddelandeformat"
 
-#: ../camel/camel-gpg-context.c:1831
+#: ../camel/camel-gpg-context.c:1942
+#, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Misslyckades med att dekryptera MIME-del: protokollfel"
 
-#: ../camel/camel-gpg-context.c:1909
-#: ../camel/camel-smime-context.c:1205
+#: ../camel/camel-gpg-context.c:2023
+#: ../camel/camel-smime-context.c:1241
 msgid "Encrypted content"
 msgstr "Krypterat innehåll"
 
-#: ../camel/camel-gpg-context.c:1930
-msgid "Unable to parse message content"
-msgstr "Kunde inte tolka meddelandeinnehåll"
-
-#: ../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
-msgid "Unknown"
-msgstr "Okänd"
-
-#: ../camel/camel-lock-client.c:104
+#: ../camel/camel-lock-client.c:106
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Kunde inte skapa låsande hjälpprogramsrör: %s"
 
-#: ../camel/camel-lock-client.c:126
+#: ../camel/camel-lock-client.c:130
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "Kan inte grena låsande hjälpprogram: %s"
 
-#: ../camel/camel-lock-client.c:203
-#: ../camel/camel-lock-client.c:226
+#: ../camel/camel-lock-client.c:211
+#: ../camel/camel-lock-client.c:239
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "Kunde inte låsa \"%s\": protokollfel med låshjälpprogram"
 
-#: ../camel/camel-lock-client.c:216
+#: ../camel/camel-lock-client.c:227
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "Kunde inte låsa \"%s\""
 
-#: ../camel/camel-lock.c:103
+#: ../camel/camel-lock.c:102
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Kunde inte skapa låsfil för %s: %s"
 
-#: ../camel/camel-lock.c:144
+#: ../camel/camel-lock.c:145
 #, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "Gjorde time-out när låsfil skulle fås för %s. Försök igen senare."
+msgid "Timed out trying to get lock file on %s.  Try again later."
+msgstr "Tidsgräns överstegs när låsfil skulle fås för %s. Försök igen senare."
 
-#: ../camel/camel-lock.c:199
+#: ../camel/camel-lock.c:205
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Misslyckades med att få lås med fcntl(2): %s"
 
-#: ../camel/camel-lock.c:262
+#: ../camel/camel-lock.c:272
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Misslyckades med att få lås med flock(2): %s"
 
-#: ../camel/camel-movemail.c:106
+#: ../camel/camel-movemail.c:105
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Kunde inte kontrollera brevlådefilen %s: %s"
@@ -1827,148 +1987,147 @@ msgstr "Kunde inte kontrollera brevlådefilen %s: %s"
 msgid "Could not open mail file %s: %s"
 msgstr "Kunde inte öppna brevlådefilen %s: %s"
 
-#: ../camel/camel-movemail.c:127
+#: ../camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Kunde inte öppna temporära brevlådefilen %s: %s"
 
-#: ../camel/camel-movemail.c:156
+#: ../camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Misslyckades med att lagra e-post i temporära filen %s: %s"
 
-#: ../camel/camel-movemail.c:186
+#: ../camel/camel-movemail.c:193
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Kunde inte skapa rör: %s"
 
-#: ../camel/camel-movemail.c:198
+#: ../camel/camel-movemail.c:207
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Kunde inte grena: %s"
 
-#: ../camel/camel-movemail.c:236
+#: ../camel/camel-movemail.c:245
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Programmet movemail misslyckades: %s"
 
-#: ../camel/camel-movemail.c:237
+#: ../camel/camel-movemail.c:246
 msgid "(Unknown error)"
 msgstr "(Okänt fel)"
 
-#: ../camel/camel-movemail.c:260
+#: ../camel/camel-movemail.c:273
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Fel vid läsning av brevlådefil: %s"
 
-#: ../camel/camel-movemail.c:271
+#: ../camel/camel-movemail.c:286
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Fel vid skrivande av temporär brevlådefil: %s"
 
-#: ../camel/camel-movemail.c:464
-#: ../camel/camel-movemail.c:531
+#: ../camel/camel-movemail.c:483
+#: ../camel/camel-movemail.c:552
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Fel vid kopierande av temporär brevfil: %s"
 
-#: ../camel/camel-multipart-signed.c:592
-msgid "parse error"
-msgstr "tolkningsfel"
+#: ../camel/camel-multipart-signed.c:285
+#, c-format
+msgid "No content available"
+msgstr "Innehåll saknas"
 
-#: ../camel/camel-net-utils.c:503
-#: ../camel/camel-net-utils.c:673
-#: ../camel/camel-net-utils.c:802
-#: ../camel/providers/pop3/camel-pop3-store.c:476
-#: ../camel/providers/pop3/camel-pop3-store.c:576
-msgid "Canceled"
-msgstr "Avbruten"
+#: ../camel/camel-multipart-signed.c:293
+#, c-format
+msgid "No signature available"
+msgstr "Ingen signatur tillgänglig"
 
-#: ../camel/camel-net-utils.c:523
-msgid "cannot create thread"
-msgstr "kan inte skapa tråd"
+#: ../camel/camel-multipart-signed.c:612
+#, c-format
+msgid "parse error"
+msgstr "tolkningsfel"
 
-#: ../camel/camel-net-utils.c:677
+#: ../camel/camel-net-utils.c:693
 #, c-format
 msgid "Resolving: %s"
 msgstr "Slår upp: %s"
 
-#: ../camel/camel-net-utils.c:699
+#: ../camel/camel-net-utils.c:715
 msgid "Host lookup failed"
 msgstr "Uppslagning av värdnamn misslyckades"
 
-#: ../camel/camel-net-utils.c:701
+#: ../camel/camel-net-utils.c:719
 #, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr "Uppslagning av värdnamn misslyckades: %s: %s"
 
-#: ../camel/camel-net-utils.c:806
+#: ../camel/camel-net-utils.c:842
 msgid "Resolving address"
 msgstr "Slår upp adress"
 
-#: ../camel/camel-net-utils.c:826
+#: ../camel/camel-net-utils.c:862
 msgid "Name lookup failed"
 msgstr "Namnuppslagning misslyckades"
 
-#: ../camel/camel-net-utils.c:829
+#: ../camel/camel-net-utils.c:867
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "Namnuppslagning misslyckades: %s"
 
-#: ../camel/camel-offline-folder.c:249
+#: ../camel/camel-offline-folder.c:169
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "Synkroniserar meddelanden i mappen \"%s\" till disk"
 
-#: ../camel/camel-offline-journal.c:159
-#: ../camel/camel-offline-journal.c:182
+#: ../camel/camel-offline-journal.c:144
+#: ../camel/camel-offline-journal.c:170
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "Kan inte skriva frånkopplad dagbok för mappen \"%s\": %s"
 
-#: ../camel/camel-provider.c:60
+#: ../camel/camel-provider.c:58
 msgid "Virtual folder email provider"
 msgstr "E-postleverantör för virtuell mapp"
 
-#: ../camel/camel-provider.c:62
+#: ../camel/camel-provider.c:60
 msgid "For reading mail as a query of another set of folders"
 msgstr "För läsande av e-post som en fråga av en annan samling mappar"
 
-#: ../camel/camel-provider.c:184
+#: ../camel/camel-provider.c:188
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "Kunde inte läsa in %s: Modulinläsning stöds inte på detta system."
 
-#: ../camel/camel-provider.c:193
+#: ../camel/camel-provider.c:197
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Kunde inte läsa in %s: %s"
 
-#: ../camel/camel-provider.c:201
+#: ../camel/camel-provider.c:206
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Kunde inte läsa in %s: Ingen initieringskod i modulen."
 
-#: ../camel/camel-provider.c:379
-#: ../camel/camel-session.c:180
+#: ../camel/camel-provider.c:388
+#: ../camel/camel-session.c:207
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "Det finns ingen leverantör för protokollet \"%s\""
 
-#: ../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 "Detta alternativ ansluter till servern genom att använda anonym inloggning."
 
-#: ../camel/camel-sasl-anonymous.c:121
-#: ../camel/camel-sasl-plain.c:91
+#: ../camel/camel-sasl-anonymous.c:69
+#, c-format
 msgid "Authentication failed."
 msgstr "Autentisering misslyckades."
 
-#: ../camel/camel-sasl-anonymous.c:130
+#: ../camel/camel-sasl-anonymous.c:80
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -1977,7 +2136,7 @@ msgstr ""
 "Spårningsinformation för ogiltig e-postadress:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:142
+#: ../camel/camel-sasl-anonymous.c:94
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -1986,7 +2145,7 @@ msgstr ""
 "Spårningsinformation för ogiltig ogenomskinlig:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:154
+#: ../camel/camel-sasl-anonymous.c:108
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -1995,172 +2154,183 @@ msgstr ""
 "Spårningsinformation för ogiltig:\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."
 msgstr "Detta alternativ kommer att ansluta till servern med ett säkert CRAM-MD5-lösenord, om servern stöder det."
 
-#: ../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."
 msgstr "Detta alternativ kommer att ansluta till servern med ett DIGEST-MD5-lösenord, om servern stöder det."
 
-#: ../camel/camel-sasl-digest-md5.c:844
+#: ../camel/camel-sasl-digest-md5.c:818
+#, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "Serverutmaningen var för lång (>2048 oktetter)"
 
-#: ../camel/camel-sasl-digest-md5.c:853
+#: ../camel/camel-sasl-digest-md5.c:829
+#, c-format
 msgid "Server challenge invalid\n"
 msgstr "Serverutmaningen var ogiltig\n"
 
-#: ../camel/camel-sasl-digest-md5.c:859
+#: ../camel/camel-sasl-digest-md5.c:837
+#, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "Serverutmaningen innehöll ogiltig \"Quality of Protection\"-flagga"
 
-#: ../camel/camel-sasl-digest-md5.c:889
+#: ../camel/camel-sasl-digest-md5.c:869
+#, c-format
 msgid "Server response did not contain authorization data"
 msgstr "Serversvaret innehöll inte auktoriseringsdata"
 
-#: ../camel/camel-sasl-digest-md5.c:907
+#: ../camel/camel-sasl-digest-md5.c:890
+#, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "Serversvaret innehöll ofullständiga auktoriseringsdata"
 
-#: ../camel/camel-sasl-digest-md5.c:917
+#: ../camel/camel-sasl-digest-md5.c:903
+#, c-format
 msgid "Server response does not match"
 msgstr "Serversvaret stämmer inte överens"
 
-#: ../camel/camel-sasl-gssapi.c:72
+#: ../camel/camel-sasl-gssapi.c:80
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:74
+#: ../camel/camel-sasl-gssapi.c:82
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "Detta alternativ kommer att ansluta till servern med Kerberos 5-autentisering."
 
-#: ../camel/camel-sasl-gssapi.c:168
+#: ../camel/camel-sasl-gssapi.c:119
 msgid "The specified mechanism is not supported by the provided credential, or is unrecognized by the implementation."
 msgstr "Den angivna mekanismen stöds inte av det tillhandahållna kreditivet, eller är okänt av implementationen."
 
-#: ../camel/camel-sasl-gssapi.c:173
+#: ../camel/camel-sasl-gssapi.c:124
 msgid "The provided target_name parameter was ill-formed."
 msgstr "Den angivna target_name-parametern var felaktigt utformad."
 
-#: ../camel/camel-sasl-gssapi.c:176
+#: ../camel/camel-sasl-gssapi.c:127
 msgid "The provided target_name parameter contained an invalid or unsupported type of name."
 msgstr "Den angivna target_name-parametern innehöll en ogiltig namntyp eller en som inte stöds."
 
-#: ../camel/camel-sasl-gssapi.c:180
+#: ../camel/camel-sasl-gssapi.c:131
 msgid "The input_token contains different channel bindings to those specified via the input_chan_bindings parameter."
 msgstr "input_token innehåller andra kanalbindningar än de som är angivna via parametern input_chan_bindings."
 
-#: ../camel/camel-sasl-gssapi.c:185
+#: ../camel/camel-sasl-gssapi.c:136
 msgid "The input_token contains an invalid signature, or a signature that could not be verified."
 msgstr "input_token innehåller en ogiltig signatur, eller en signatur som inte kunde verifieras."
 
-#: ../camel/camel-sasl-gssapi.c:189
+#: ../camel/camel-sasl-gssapi.c:140
 msgid "The supplied credentials were not valid for context initiation, or the credential handle did not reference any credentials."
 msgstr "De kreditiv som angavs var inte giltiga för sammanhangsinitiering, eller så refererade kreditivhandtaget inga kreditiv."
 
-#: ../camel/camel-sasl-gssapi.c:194
+#: ../camel/camel-sasl-gssapi.c:145
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "Det angivna sammanhangshandtaget refererade inte till ett giltigt sammanhang."
 
-#: ../camel/camel-sasl-gssapi.c:197
+#: ../camel/camel-sasl-gssapi.c:148
 msgid "The consistency checks performed on the input_token failed."
 msgstr "Konsekvenskontrollerna som utfördes på input_token misslyckades."
 
-#: ../camel/camel-sasl-gssapi.c:200
+#: ../camel/camel-sasl-gssapi.c:151
 msgid "The consistency checks performed on the credential failed."
 msgstr "Konsekvenskontrollerna som utförts på kreditivet misslyckades."
 
-#: ../camel/camel-sasl-gssapi.c:203
+#: ../camel/camel-sasl-gssapi.c:154
 msgid "The referenced credentials have expired."
 msgstr "De refererade kreditiven har gått ut."
 
-#: ../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:160
+#: ../camel/camel-sasl-gssapi.c:296
+#: ../camel/camel-sasl-gssapi.c:340
+#: ../camel/camel-sasl-gssapi.c:357
+#: ../camel/providers/smtp/camel-smtp-transport.c:1192
+#, c-format
 msgid "Bad authentication response from server."
 msgstr "Felaktigt autentiseringssvar från servern."
 
-#: ../camel/camel-sasl-gssapi.c:383
+#: ../camel/camel-sasl-gssapi.c:369
+#, c-format
 msgid "Unsupported security layer."
 msgstr "Säkerhetslagret stöds inte."
 
-#: ../camel/camel-sasl-login.c:36
+#: ../camel/camel-sasl-login.c:39
 msgid "Login"
 msgstr "Inloggning"
 
-#: ../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 "Detta alternativ ansluter till servern genom att använda ett enkelt lösenord."
 
-#: ../camel/camel-sasl-login.c:134
+#: ../camel/camel-sasl-login.c:94
+#, c-format
 msgid "Unknown authentication state."
 msgstr "Okänt autentiseringstillstånd."
 
-#: ../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."
 msgstr "Detta alternativ kommer att ansluta till med NTLM / säker lösenordsautentisering (SPA)."
 
-#: ../camel/camel-sasl-plain.c:36
+#: ../camel/camel-sasl-plain.c:43
 msgid "PLAIN"
 msgstr "VANLIG"
 
-#: ../camel/camel-sasl-popb4smtp.c:39
+#: ../camel/camel-sasl-popb4smtp.c:46
 msgid "POP before SMTP"
 msgstr "POP innan 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 "Detta alternativ kommer att auktorisera en POP-anslutning innan ett försök med SMTP görs"
 
-#: ../camel/camel-sasl-popb4smtp.c:106
+#: ../camel/camel-sasl-popb4smtp.c:82
 msgid "POP Source URI"
 msgstr "URI för POP-källa"
 
-#: ../camel/camel-sasl-popb4smtp.c:109
+#: ../camel/camel-sasl-popb4smtp.c:89
+#, c-format
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr "POP innan SMTP-auktorisering med en okänd förbindelse"
 
-#: ../camel/camel-sasl-popb4smtp.c:114
+#: ../camel/camel-sasl-popb4smtp.c:97
+#, c-format
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "POP innan SMTP-auktorisering med en källa som inte är POP"
 
-#: ../camel/camel-search-private.c:147
+#: ../camel/camel-search-private.c:112
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Misslyckades med kompilering av reguljärt uttryck: %s: %s"
 
-#: ../camel/camel-service.c:265
+#: ../camel/camel-service.c:88
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL:en \"%s\" behöver ett användarnamn"
 
-#: ../camel/camel-service.c:269
+#: ../camel/camel-service.c:92
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL:en \"%s\" behöver ett värdnamn"
 
-#: ../camel/camel-service.c:273
+#: ../camel/camel-service.c:96
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL:en \"%s\" behöver en sökväg"
 
-#: ../camel/camel-session.c:305
+#: ../camel/camel-session.c:261
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2169,299 +2339,278 @@ msgstr ""
 "Kunde inte skapa katalogen %s:\n"
 "%s"
 
-#: ../camel/camel-session.c:477
+#: ../camel/camel-session.c:758
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "Ange %s-lösenordet för %s på värden %s."
 
-#: ../camel/camel-session.c:815
-msgid "Camel session doesn't support forwarding of a message."
-msgstr "Camel-sessionen saknar stöd för vidarebefordring av ett meddelande."
-
-#: ../camel/camel-smime-context.c:447
-#: ../camel/camel-smime-context.c:1012
+#: ../camel/camel-smime-context.c:348
+#: ../camel/camel-smime-context.c:1041
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "Kan inte hitta certifikat för \"%s\""
 
-#: ../camel/camel-smime-context.c:453
+#: ../camel/camel-smime-context.c:376
 msgid "Cannot create CMS message"
 msgstr "Kan inte skapa CMS-meddelande"
 
 # Detta kräver nog en förklaring.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61088
-#: ../camel/camel-smime-context.c:458
+#: ../camel/camel-smime-context.c:381
 msgid "Cannot create CMS signed data"
 msgstr "Kan inte skapa CMS-signerade data"
 
 # Detta kräver nog en förklaring.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61088
-#: ../camel/camel-smime-context.c:464
+#: ../camel/camel-smime-context.c:387
 msgid "Cannot attach CMS signed data"
 msgstr "Kan inte bifoga CMS-signerade data"
 
-#: ../camel/camel-smime-context.c:471
+#: ../camel/camel-smime-context.c:394
 msgid "Cannot attach CMS data"
 msgstr "Kan inte bifoga CMS-data"
 
 # Detta kräver nog en förklaring.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61088
-#: ../camel/camel-smime-context.c:477
+#: ../camel/camel-smime-context.c:400
 msgid "Cannot create CMS Signer information"
 msgstr "Kan inte skapa CMS-signerarinformation"
 
 # Detta kräver nog bättre formulering.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61088
-#: ../camel/camel-smime-context.c:483
+#: ../camel/camel-smime-context.c:406
 msgid "Cannot find certificate chain"
 msgstr "Kan inte hitta certifikatkedja"
 
 # Detta kräver nog en förklaring.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61088
-#: ../camel/camel-smime-context.c:489
+#: ../camel/camel-smime-context.c:412
 msgid "Cannot add CMS Signing time"
 msgstr "Kan inte lägga till CMS-signeringstid"
 
 # Detta kräver nog en bättre formulering.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61088
-#: ../camel/camel-smime-context.c:511
-#: ../camel/camel-smime-context.c:523
+#: ../camel/camel-smime-context.c:436
+#: ../camel/camel-smime-context.c:451
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "Krypteringscertifikatet för \"%s\" finns inte"
 
-#: ../camel/camel-smime-context.c:530
+#: ../camel/camel-smime-context.c:458
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "Kan inte lägga till SMIMEEncKeyPrefs-attribut"
 
-#: ../camel/camel-smime-context.c:535
+#: ../camel/camel-smime-context.c:463
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "Kan inte lägga till MS SMIMEEncKeyPrefs-attribut"
 
-#: ../camel/camel-smime-context.c:540
+#: ../camel/camel-smime-context.c:468
 msgid "Cannot add encryption certificate"
 msgstr "Kan inte lägga till krypteringscertifikat"
 
 # Detta kräver en förklaring.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61088
-#: ../camel/camel-smime-context.c:546
+#: ../camel/camel-smime-context.c:474
 msgid "Cannot add CMS Signer information"
 msgstr "Kan inte lägga till CMS-signerarinformation"
 
-#: ../camel/camel-smime-context.c:616
-#: ../camel/camel-smime-context.c:1084
-msgid "Cannot create encoder context"
-msgstr "Kan inte skapa kodarsammanhang"
-
-#: ../camel/camel-smime-context.c:622
-msgid "Failed to add data to CMS encoder"
-msgstr "Misslyckades med att lägga till data till CMS-kodare"
-
-#: ../camel/camel-smime-context.c:627
-#: ../camel/camel-smime-context.c:1101
-msgid "Failed to encode data"
-msgstr "Misslyckades med att koda data"
-
-#: ../camel/camel-smime-context.c:700
+#: ../camel/camel-smime-context.c:506
 msgid "Unverified"
 msgstr "Overifierad"
 
-#: ../camel/camel-smime-context.c:702
+#: ../camel/camel-smime-context.c:508
 msgid "Good signature"
 msgstr "Bra signatur"
 
-#: ../camel/camel-smime-context.c:704
+#: ../camel/camel-smime-context.c:510
 msgid "Bad signature"
 msgstr "DÃ¥lig signatur"
 
 # Osäker
-#: ../camel/camel-smime-context.c:706
+#: ../camel/camel-smime-context.c:512
 msgid "Content tampered with or altered in transit"
 msgstr "Innehållet fifflat med eller ändrat i överföringen"
 
-#: ../camel/camel-smime-context.c:708
+#: ../camel/camel-smime-context.c:514
 msgid "Signing certificate not found"
 msgstr "Signeringscertifikat hittades inte"
 
-#: ../camel/camel-smime-context.c:710
+#: ../camel/camel-smime-context.c:516
 msgid "Signing certificate not trusted"
 msgstr "Signeringscertifikatet opålitligt"
 
-#: ../camel/camel-smime-context.c:712
+#: ../camel/camel-smime-context.c:518
 msgid "Signature algorithm unknown"
 msgstr "Signaturalgoritmen okänd"
 
-#: ../camel/camel-smime-context.c:714
+#: ../camel/camel-smime-context.c:520
 msgid "Signature algorithm unsupported"
 msgstr "Signaturalgoritmen stöds inte"
 
-#: ../camel/camel-smime-context.c:716
+#: ../camel/camel-smime-context.c:522
 msgid "Malformed signature"
 msgstr "Felaktig signatur"
 
-#: ../camel/camel-smime-context.c:718
+#: ../camel/camel-smime-context.c:524
 msgid "Processing error"
 msgstr "Tolkningsfel"
 
 # Detta behöver bättre formulering.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61088
-#: ../camel/camel-smime-context.c:772
+#: ../camel/camel-smime-context.c:566
 msgid "No signed data in signature"
 msgstr "Inga signerade data i signatur"
 
 # Osäker
-#: ../camel/camel-smime-context.c:777
+#: ../camel/camel-smime-context.c:571
 msgid "Digests missing from enveloped data"
 msgstr "Samlingar saknas i kuvertdata"
 
 # Osäker
-#: ../camel/camel-smime-context.c:790
-#: ../camel/camel-smime-context.c:800
+#: ../camel/camel-smime-context.c:584
+#: ../camel/camel-smime-context.c:595
 msgid "Cannot calculate digests"
 msgstr "Kan inte beräkna samlingar"
 
 # Osäker
-#: ../camel/camel-smime-context.c:807
-#: ../camel/camel-smime-context.c:811
+#: ../camel/camel-smime-context.c:602
+#: ../camel/camel-smime-context.c:606
 msgid "Cannot set message digests"
 msgstr "Kan inte ställa in meddelandesamlingar"
 
-#: ../camel/camel-smime-context.c:821
-#: ../camel/camel-smime-context.c:826
+#: ../camel/camel-smime-context.c:616
+#: ../camel/camel-smime-context.c:621
 msgid "Certificate import failed"
 msgstr "Certifikatimport misslyckades"
 
 # Detta kräver en förklaring.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61088
-#: ../camel/camel-smime-context.c:836
+#: ../camel/camel-smime-context.c:631
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "Certifikatet är enda meddelandet, kan inte verifiera certifikat"
 
 # Detta kräver en förklaring.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61088
-#: ../camel/camel-smime-context.c:839
+#: ../camel/camel-smime-context.c:634
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "Certifikatet är det enda meddelandet, certifikat importerade och verifierade"
 
 # Osäker
-#: ../camel/camel-smime-context.c:843
+#: ../camel/camel-smime-context.c:638
 msgid "Cannot find signature digests"
 msgstr "Kan inte hitta signatursamlingar"
 
-#: ../camel/camel-smime-context.c:859
+#: ../camel/camel-smime-context.c:654
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Signerare: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:960
-#: ../camel/camel-smime-context.c:1184
+#: ../camel/camel-smime-context.c:832
+#: ../camel/camel-smime-context.c:1114
+msgid "Cannot create encoder context"
+msgstr "Kan inte skapa kodarsammanhang"
+
+#: ../camel/camel-smime-context.c:838
+msgid "Failed to add data to CMS encoder"
+msgstr "Misslyckades med att lägga till data till CMS-kodare"
+
+#: ../camel/camel-smime-context.c:843
+#: ../camel/camel-smime-context.c:1131
+msgid "Failed to encode data"
+msgstr "Misslyckades med att koda data"
+
+#: ../camel/camel-smime-context.c:981
+#: ../camel/camel-smime-context.c:1220
 msgid "Decoder failed"
 msgstr "Avkodaren misslyckades"
 
-#: ../camel/camel-smime-context.c:1019
+#: ../camel/camel-smime-context.c:1049
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "Kan inte hitta gemensam algoritm för bulkkryptering"
 
-#: ../camel/camel-smime-context.c:1027
+#: ../camel/camel-smime-context.c:1057
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Kan inte allokera plats för bulknyckel för kryptering"
 
-#: ../camel/camel-smime-context.c:1038
+#: ../camel/camel-smime-context.c:1068
 msgid "Cannot create CMS Message"
 msgstr "Kan inte skapa CMS-meddelande"
 
 # Detta borde nog omformuleras.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61088
-#: ../camel/camel-smime-context.c:1044
+#: ../camel/camel-smime-context.c:1074
 msgid "Cannot create CMS Enveloped data"
 msgstr "Kan inte skapa CMS-kuverterade data"
 
 # Detta borde nog omformuleras.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61088
-#: ../camel/camel-smime-context.c:1050
+#: ../camel/camel-smime-context.c:1080
 msgid "Cannot attach CMS Enveloped data"
 msgstr "Kan inte bifoga CMS-kuverterade data"
 
-#: ../camel/camel-smime-context.c:1056
+#: ../camel/camel-smime-context.c:1086
 msgid "Cannot attach CMS data object"
 msgstr "Kan inte bifoga CMS-dataobjekt"
 
 # Detta borde nog omformuleras.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61088
-#: ../camel/camel-smime-context.c:1065
+#: ../camel/camel-smime-context.c:1095
 msgid "Cannot create CMS Recipient information"
 msgstr "Kan inte skapa CMS-mottagarinformation"
 
 # Detta borde nog omformuleras.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61088
-#: ../camel/camel-smime-context.c:1070
+#: ../camel/camel-smime-context.c:1100
 msgid "Cannot add CMS Recipient information"
 msgstr "Kan inte lägga till CMS-mottagarinformation"
 
-#: ../camel/camel-smime-context.c:1095
+#: ../camel/camel-smime-context.c:1125
 msgid "Failed to add data to encoder"
 msgstr "Misslyckades med att lägga till data till kodare"
 
-#: ../camel/camel-smime-context.c:1191
+#: ../camel/camel-smime-context.c:1227
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME-dekryptering: Inget krypterat innehåll hittades"
 
-#: ../camel/camel-smime-context.c:1219
-msgid "import keys: unimplemented"
-msgstr "importera nycklar: inte implementerat"
-
-#: ../camel/camel-smime-context.c:1227
-msgid "export keys: unimplemented"
-msgstr "exportera nycklar: inte implementerat"
-
-#: ../camel/camel-store.c:283
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:171
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr "Kan inte hämta mapp: Ogiltig åtgärd på detta lager"
-
-#: ../camel/camel-store.c:316
+#: ../camel/camel-store.c:444
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "Kan inte skapa mappen \"%s\": mappen finns redan"
 
-#: ../camel/camel-store.c:395
-msgid "Cannot create folder: Invalid operation on this store"
-msgstr "Kan inte skapa mapp: Ogiltig åtgärd på detta lager"
-
-#: ../camel/camel-store.c:423
+#: ../camel/camel-store.c:543
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Kan inte skapa mapp: %s: mappen finns redan"
 
-#: ../camel/camel-store.c:487
-#: ../camel/camel-vee-store.c:377
-#: ../camel/providers/local/camel-maildir-store.c:219
+#: ../camel/camel-store.c:616
+#: ../camel/camel-vee-store.c:263
+#: ../camel/providers/local/camel-maildir-store.c:224
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kan inte ta bort mapp: %s: Ogiltig åtgärd"
 
-#: ../camel/camel-store.c:544
-#: ../camel/camel-vee-store.c:414
-#: ../camel/providers/local/camel-maildir-store.c:291
+#: ../camel/camel-store.c:680
+#: ../camel/camel-vee-store.c:213
+#: ../camel/providers/local/camel-maildir-store.c:314
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kan inte byta namn på mapp: %s: Ogiltig åtgärd"
 
 #. 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:1128
+#: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "Papperskorg"
 
 #. 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:1131
+#: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "Skräppost"
 
-#: ../camel/camel-tcp-stream-ssl.c:870
+#: ../camel/camel-tcp-stream-ssl.c:786
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2474,16 +2623,16 @@ msgstr ""
 "Fingeravtryck:     %s\n"
 "Signatur:          %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:876
+#: ../camel/camel-tcp-stream-ssl.c:792
 msgid "GOOD"
 msgstr "BRA"
 
-#: ../camel/camel-tcp-stream-ssl.c:876
+#: ../camel/camel-tcp-stream-ssl.c:792
 msgid "BAD"
 msgstr "DÃ?LIG"
 
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:880
+#: ../camel/camel-tcp-stream-ssl.c:796
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2498,7 +2647,7 @@ msgstr ""
 "\n"
 "Vill du acceptera?"
 
-#: ../camel/camel-tcp-stream-ssl.c:924
+#: ../camel/camel-tcp-stream-ssl.c:840
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2507,7 +2656,7 @@ msgstr ""
 "Certifikatproblem: %s\n"
 "Utfärdare: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:976
+#: ../camel/camel-tcp-stream-ssl.c:892
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2516,7 +2665,7 @@ msgstr ""
 "Felaktig certifikatdomän: %s\n"
 "Utfärdare: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:994
+#: ../camel/camel-tcp-stream-ssl.c:910
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2525,7 +2674,7 @@ msgstr ""
 "Certifikatet har gått ut: %s\n"
 "Utfärdare: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1011
+#: ../camel/camel-tcp-stream-ssl.c:927
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2534,51 +2683,52 @@ msgstr ""
 "Certifikatspärrlistan har gått ut: %s\n"
 "Utfärdare: %s"
 
-#: ../camel/camel-url.c:313
+#: ../camel/camel-url.c:314
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "Kunde inte tolka URL:en \"%s\""
 
-#: ../camel/camel-vee-folder.c:577
+#: ../camel/camel-vee-folder.c:1044
 #, c-format
-msgid "Error storing '%s': %s"
-msgstr "Fel vid lagring av \"%s\": %s"
+msgid "Error storing '%s': "
+msgstr "Fel vid lagring av \"%s\": "
 
-#: ../camel/camel-vee-folder.c:654
+#: ../camel/camel-vee-folder.c:1117
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Det finns inget sådant meddelande %s i %s"
 
-#: ../camel/camel-vee-folder.c:813
-#: ../camel/camel-vee-folder.c:819
+#: ../camel/camel-vee-folder.c:1133
+#: ../camel/camel-vee-folder.c:1148
+#, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Kan inte kopiera eller flytta meddelanden till en virtuell mapp"
 
-#: ../camel/camel-vee-store.c:113
-#: ../camel/camel-vee-store.c:114
-#: ../camel/camel-vee-store.c:353
+#: ../camel/camel-vee-store.c:141
+#: ../camel/camel-vee-store.c:143
+#: ../camel/camel-vee-store.c:417
 msgid "Unmatched"
 msgstr "Omatchade"
 
-#: ../camel/camel-vee-store.c:400
-#, c-format
-msgid "Cannot delete folder: %s: No such folder"
-msgstr "Kan inte ta bort mapp: %s: Det finns ingen sådan mapp"
-
-#: ../camel/camel-vee-store.c:422
+#: ../camel/camel-vee-store.c:223
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kan inte byta namn på mapp: %s: Det finns ingen sådan mapp"
 
-#: ../camel/camel-vtrash-folder.c:55
+#: ../camel/camel-vee-store.c:289
+#, c-format
+msgid "Cannot delete folder: %s: No such folder"
+msgstr "Kan inte ta bort mapp: %s: Det finns ingen sådan mapp"
+
+#: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
 msgstr "Kan inte kopiera meddelanden till papperskorgsmappen"
 
-#: ../camel/camel-vtrash-folder.c:57
+#: ../camel/camel-vtrash-folder.c:51
 msgid "Cannot copy messages to the Junk folder"
 msgstr "Kan inte kopiera meddelanden till skräppostmappen"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:137
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:139
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2587,337 +2737,260 @@ msgstr ""
 "Kan inte hämta meddelande: %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:139
+#: ../camel/providers/local/camel-maildir-folder.c:233
+#: ../camel/providers/local/camel-maildir-folder.c:268
+#: ../camel/providers/local/camel-maildir-folder.c:380
+#: ../camel/providers/local/camel-mbox-folder.c:329
+#: ../camel/providers/local/camel-mbox-folder.c:380
+#: ../camel/providers/local/camel-mh-folder.c:215
 msgid "No such message"
 msgstr "Det finns inget sådant meddelande"
 
-#: ../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
-msgid "User canceled"
-msgstr "Användaren avbröt"
-
-#: ../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:158
+#: ../camel/providers/nntp/camel-nntp-folder.c:244
+#: ../camel/providers/nntp/camel-nntp-folder.c:337
+#: ../camel/providers/pop3/camel-pop3-folder.c:714
 #, c-format
-msgid "Cannot get message %s: %s"
-msgstr "Kan inte hämta meddelande %s: %s"
+msgid "Cannot get message %s: "
+msgstr "Kan inte hämta meddelande %s: "
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:173
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:181
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2506
-#: ../camel/providers/imap4/camel-imap4-folder.c:837
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:176
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:186
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2645
+#, c-format
 msgid "This message is not available in offline mode."
 msgstr "Detta meddelande är inte tillgängligt i frånkopplat läge."
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:195
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:202
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2009
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2060
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:203
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:213
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2109
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2163
+#, c-format
 msgid "Could not get message"
 msgstr "Kunde inte hämta meddelande"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:982
-#: ../camel/providers/imap/camel-imap-folder.c:295
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1038
+#: ../camel/providers/imap/camel-imap-folder.c:376
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Kunde inte läsa in sammandrag för %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1055
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1112
 #, c-format
 msgid "Checking for deleted messages %s"
 msgstr "Letar efter borttagna meddelanden %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1330
-msgid "Trash Folder Full. Please Empty."
-msgstr "Papperskorgen är full. Var god töm den."
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1564
-#: ../camel/providers/groupwise/camel-groupwise-store.c:626
-#: ../camel/providers/groupwise/camel-groupwise-store.c:756
-#: ../camel/providers/imap/camel-imap-folder.c:3429
-#: ../camel/providers/imap/camel-imap-folder.c:3505
-#: ../camel/providers/imapx/camel-imapx-server.c:2772
-#: ../camel/providers/imapx/camel-imapx-server.c:2858
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1637
+#: ../camel/providers/groupwise/camel-groupwise-store.c:654
+#: ../camel/providers/groupwise/camel-groupwise-store.c:779
+#: ../camel/providers/imap/camel-imap-folder.c:3814
+#: ../camel/providers/imap/camel-imap-folder.c:3892
+#: ../camel/providers/imapx/camel-imapx-server.c:3721
+#: ../camel/providers/imapx/camel-imapx-server.c:3845
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "Hämtar sammandragsinformation för nya meddelanden i %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2360
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2403
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2475
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2525
 #, c-format
 msgid "Cannot append message to folder '%s': %s"
 msgstr "Kan inte lägga till meddelande i mappen \"%s\": %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2391
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2511
 #, c-format
 msgid "Cannot create message: %s"
 msgstr "Kan inte skapa meddelande: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:281
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:240
 #, c-format
 msgid "Cannot get folder container %s"
 msgstr "Kan inte hämta mappcontainern %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:343
-#: ../camel/providers/imap4/camel-imap4-journal.c:311
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:303
+#, c-format
 msgid "Cannot append message in offline mode: cache unavailable"
 msgstr "Kan inte lägga till meddelanden i frånkopplat läge: cachen inte tillgänglig"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:359
-#: ../camel/providers/imap4/camel-imap4-journal.c:327
-#, c-format
-msgid "Cannot append message in offline mode: %s"
-msgstr "Kan inte lägga till meddelande i frånkopplat läge: %s"
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:320
+msgid "Cannot append message in offline mode: "
+msgstr "Kan inte lägga till meddelande i frånkopplat läge: "
 
-#: ../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 "Kontroll av ny e-post"
 
-#: ../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:47
 msgid "C_heck for new messages in all folders"
 msgstr "Le_ta efter nya meddelanden i alla mappar"
 
-#: ../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:73
+#: ../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 "Alternativ"
 
-#: ../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 "_Tillämpa filtren på nya meddelanden i inkorgen på denna server"
 
-#: ../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 "Kontrollera om nya meddelanden är s_kräppost"
 
-#: ../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:79
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr "Kontrollera endast om det finns skräppostmeddelanden i IN_BOX-mappen"
 
 # LÃ¥ter konstigt
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:67
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
 msgid "Automatically synchroni_ze account locally"
 msgstr "_Synkronisera automatiskt kontot lokalt"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:72
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
 msgid "SOAP Settings"
 msgstr "SOAP-inställningar"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:75
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:69
 msgid "Post Office Agent SOAP _Port:"
 msgstr "SOAP-port för _postkontorsagent:"
 
-#: ../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 att komma åt Novell GroupWise-servrar"
 
-#: ../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:97
+#: ../camel/providers/imapx/camel-imapx-provider.c:105
+#: ../camel/providers/nntp/camel-nntp-provider.c:72
+#: ../camel/providers/pop3/camel-pop3-provider.c:70
 msgid "Password"
 msgstr "Lösenord"
 
-#: ../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 "Detta alternativ kommer att ansluta till GroupWise-servern med ett lösenord i klartext."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:102
+#: ../camel/providers/groupwise/camel-groupwise-store.c:107
+#, c-format
 msgid "Host or user not available in url"
 msgstr "Värd eller användare inte tillgänglig i url"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:197
-#: ../camel/providers/imap/camel-imap-store.c:1356
+#: ../camel/providers/groupwise/camel-groupwise-store.c:207
+#: ../camel/providers/imap/camel-imap-store.c:1207
+#: ../camel/providers/imapx/camel-imapx-server.c:2975
+#, c-format
 msgid "You did not enter a password."
 msgstr "Du angav inte något lösenord."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:312
+#: ../camel/providers/groupwise/camel-groupwise-store.c:328
 msgid "Some features may not work correctly with your current server version"
 msgstr "En del funktioner kommer kanske inte att fungera korrekt med din nuvarande serverversion"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:533
-#: ../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:550
+#: ../camel/providers/imap/camel-imap-store.c:1776
+#: ../camel/providers/imap/camel-imap-store.c:1971
+#: ../camel/providers/imapx/camel-imapx-store.c:410
 #, c-format
 msgid "No such folder %s"
 msgstr "Det finns ingen mapp %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1201
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1187
+#, c-format
 msgid "Cannot create GroupWise folders in offline mode."
 msgstr "Kan inte skapa GroupWise-mappar i frånkopplat läge."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1215
-#: ../camel/providers/imap/camel-imap-store.c:1954
-#: ../camel/providers/imap/camel-imap-store.c:2334
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1196
+#, c-format
+msgid "Cannot create a special system folder"
+msgstr "Kan inte skapa en specialsystemmapp"
+
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1206
+#: ../camel/providers/imap/camel-imap-store.c:1854
+#: ../camel/providers/imap/camel-imap-store.c:2276
+#: ../camel/providers/imapx/camel-imapx-store.c:873
+#, c-format
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Föräldermappen får inte innehålla undermappar"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1294
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1317
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1289
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1314
 #, c-format
 msgid "Cannot rename GroupWise folder '%s' to '%s'"
 msgstr "Kan inte byta namn på GroupWise-mappen \"%s\" till \"%s\""
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1349
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1348
+#: ../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:1351
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1350
 #, c-format
 msgid "GroupWise service for %s on %s"
 msgstr "GroupWise-tjänst för %s på %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-epostleverans via %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:164
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:95
 msgid "Sending Message"
 msgstr "Skickar meddelande"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:212
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:105
+#, c-format
+msgid "Cannot get folder: Invalid operation on this store"
+msgstr "Kan inte hämta mapp: Ogiltig åtgärd på detta lager"
+
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:152
+#, c-format
 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 your mail.\n"
 msgstr "Du har överskridit det här kontot lagringsgräns. Dina meddelanden köas upp i din Utkorg. Sänd om genom att trycka på Skicka/Ta emot efter borttagning/arkivering av några av dina brev.\n"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:207
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:157
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Kunde inte skicka meddelande: %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 "Kontroll av ny e-post"
-
-#: ../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 "Anslutning till server"
-
-#: ../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 "_Använd anpassat kommando för att ansluta till servern"
-
-#: ../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 "Kommando:"
-
-#: ../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 "Mappar"
-
-#: ../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 "_Visa endast prenumererade mappar"
-
-#: ../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 "_�sidosätt mappnamnrymden som servern tillhandahåller"
-
-#: ../camel/providers/hula/camel-hula-provider.c:66
-msgid "Namespace"
-msgstr "Namnrymd"
-
-#: ../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 att komma åt Hula-servrar"
-
-#: ../camel/providers/hula/camel-hula-provider.c:95
-msgid "This option will connect to the Hula server using a plaintext password."
-msgstr "Detta alternativ ansluter till Hula-servern med ett lösenord i klartext."
-
-#: ../camel/providers/imap/camel-imap-command.c:181
-#: ../camel/providers/imap/camel-imap-command.c:265
+#: ../camel/providers/imap/camel-imap-command.c:190
+#: ../camel/providers/imap/camel-imap-command.c:288
+#, c-format
 msgid "No output stream"
 msgstr "Ingen utmatningsström"
 
-#: ../camel/providers/imap/camel-imap-command.c:186
-#: ../camel/providers/imap/camel-imap-command.c:270
+#: ../camel/providers/imap/camel-imap-command.c:198
+#: ../camel/providers/imap/camel-imap-command.c:296
+#, c-format
 msgid "No input stream"
 msgstr "Ingen inmatningsström"
 
-#: ../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:245
+#, c-format
 msgid "Operation cancelled"
 msgstr "�tgärden avbruten"
 
-#: ../camel/providers/imap/camel-imap-command.c:331
-#: ../camel/providers/imap/camel-imap-store.c:3110
+#: ../camel/providers/imap/camel-imap-command.c:353
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Servern kopplade ifrån oväntat: %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:373
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -2926,260 +2999,277 @@ msgstr ""
 "Varning från IMAP-servern %s %s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:421
+#: ../camel/providers/imap/camel-imap-command.c:444
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Oväntat svar från IMAP-servern: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:431
+#: ../camel/providers/imap/camel-imap-command.c:456
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-kommandot misslyckades: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:506
+#: ../camel/providers/imap/camel-imap-command.c:532
+#, c-format
 msgid "Server response ended too soon."
 msgstr "Serversvaret tog slut för tidigt."
 
-#: ../camel/providers/imap/camel-imap-command.c:712
+#: ../camel/providers/imap/camel-imap-command.c:740
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP-serversvaret innehöll inte %s-information"
 
-#: ../camel/providers/imap/camel-imap-command.c:748
+#: ../camel/providers/imap/camel-imap-command.c:778
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Oväntat OK-svar från IMAP-servern: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:90
+#: ../camel/providers/imap/camel-imap-folder.c:281
 msgid "Always check for new mail in this folder"
 msgstr "Leta alltid efter nya meddelanden i denna mapp"
 
-#: ../camel/providers/imap/camel-imap-folder.c:276
+#: ../camel/providers/imap/camel-imap-folder.c:353
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kunde inte skapa katalogen %s: %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:2802
+#: ../camel/providers/imap/camel-imap-folder.c:960
+#: ../camel/providers/imapx/camel-imapx-server.c:3760
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "Letar efter ändrade meddelanden i %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1986
-#, c-format
-msgid "Unexpected response status '%s' after APPEND command"
-msgstr "Oväntad svarsstatus \"%s\" efter APPEND-kommando"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2001
-msgid "No response on continuation after APPEND command"
-msgstr "Inget svar vid fortsättning efter APPEND-kommando"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2046
-msgid "Unknown error occurred during APPEND command!"
-msgstr "Okänt fel inträffade under APPEND-kommando!"
+#: ../camel/providers/imap/camel-imap-folder.c:3231
+msgid "Unable to retrieve message: "
+msgstr "Kan inte hämta meddelande: "
 
-#: ../camel/providers/imap/camel-imap-folder.c:2877
-#, c-format
-msgid "Unable to retrieve message: %s"
-msgstr "Kan inte hämta meddelande: %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2912
+#: ../camel/providers/imap/camel-imap-folder.c:3266
+#: ../camel/providers/imapx/camel-imapx-server.c:4957
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "Kan inte hämta meddelande med meddelande-id %s: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2913
+#: ../camel/providers/imap/camel-imap-folder.c:3267
+#: ../camel/providers/imapx/camel-imapx-server.c:4958
 msgid "No such message available."
 msgstr "Det finns inget sådant meddelande."
 
-#: ../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:3341
+#: ../camel/providers/imap/camel-imap-folder.c:4211
+#: ../camel/providers/nntp/camel-nntp-folder.c:326
+#, c-format
 msgid "This message is not currently available"
 msgstr "Detta meddelande är inte tillgängligt för tillfället"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3632
+#: ../camel/providers/imap/camel-imap-folder.c:4021
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "Ofullständigt serversvar: ingen information tillhandahölls för meddelande %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3640
+#: ../camel/providers/imap/camel-imap-folder.c:4031
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "Ofullständigt serversvar: inget UID tillhandahölls för meddelande %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3857
+#: ../camel/providers/imap/camel-imap-folder.c:4251
+#, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "Kunde inte hitta meddelandetext i FETCH-svaret."
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:181
-#: ../camel/providers/imap/camel-imap-message-cache.c:244
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "Kunde inte öppna cachekatalogen: %s"
+#: ../camel/providers/imap/camel-imap-message-cache.c:193
+#: ../camel/providers/imap/camel-imap-message-cache.c:253
+msgid "Could not open cache directory: "
+msgstr "Kunde inte öppna mellanlagringskatalog: "
 
-#: ../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:326
 #, c-format
 msgid "Failed to cache message %s: %s"
-msgstr "Misslyckades med att cacha meddelande %s: %s"
+msgstr "Misslyckades med att mellanlagra meddelande %s: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:530
+#: ../camel/providers/imap/camel-imap-message-cache.c:388
 #, c-format
-msgid "Failed to cache %s: %s"
-msgstr "Misslyckades med att cacha %s: %s"
+msgid "Failed to cache message %s: "
+msgstr "Misslyckades med att mellanlagra meddelande %s: "
 
-#: ../camel/providers/imap/camel-imap-provider.c:48
-#: ../camel/providers/imapx/camel-imapx-provider.c:50
+#: ../camel/providers/imap/camel-imap-message-cache.c:525
+#, c-format
+msgid "Failed to cache %s: "
+msgstr "Misslyckades med att mellanlagra %s: "
+
+#: ../camel/providers/imap/camel-imap-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:41
+msgid "Checking for New Mail"
+msgstr "Kontroll av ny e-post"
+
+#: ../camel/providers/imap/camel-imap-provider.c:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:49
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "_Leta efter nya meddelanden i prenumererade mappar"
 
-#: ../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 "Namnrymd:"
+#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:53
+msgid "Connection to Server"
+msgstr "Anslutning till server"
 
-#: ../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:55
+msgid "_Use custom command to connect to server"
+msgstr "_Använd anpassat kommando för att ansluta till servern"
+
+#: ../camel/providers/imap/camel-imap-provider.c:52
+msgid "Co_mmand:"
+msgstr "Ko_mmando:"
+
+#: ../camel/providers/imap/camel-imap-provider.c:56
+#: ../camel/providers/imapx/camel-imapx-provider.c:63
+#: ../camel/providers/nntp/camel-nntp-provider.c:42
+msgid "Folders"
+msgstr "Mappar"
+
+#: ../camel/providers/imap/camel-imap-provider.c:58
+#: ../camel/providers/imapx/camel-imapx-provider.c:65
+msgid "_Show only subscribed folders"
+msgstr "_Visa endast prenumererade mappar"
+
+#: ../camel/providers/imap/camel-imap-provider.c:60
+#: ../camel/providers/imapx/camel-imapx-provider.c:68
+msgid "O_verride server-supplied folder namespace"
+msgstr "_�sidosätt mappnamnrymden som servern tillhandahåller"
+
+#: ../camel/providers/imap/camel-imap-provider.c:62
+msgid "Names_pace:"
+msgstr "Namn_rymd:"
+
+#: ../camel/providers/imap/camel-imap-provider.c:66
+#: ../camel/providers/imapx/camel-imapx-provider.c:75
 msgid "_Apply filters to new messages in INBOX on this server"
 msgstr "_Tillämpa filtren på nya meddelanden i INBOX på denna server"
 
-#: ../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:77
 msgid "Check new messages for Jun_k contents"
 msgstr "Kontrollera om nya meddelanden är s_kräppost"
 
 # LÃ¥ter konstigt
-#: ../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:81
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "S_ynkronisera automatiskt fjärrpost lokalt"
 
-#: ../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:91
 msgid "For reading and storing mail on IMAP servers."
 msgstr "För läsande och lagrande av e-post på IMAP-servrar."
 
-#: ../camel/providers/imap/camel-imap-provider.c:102
-#: ../camel/providers/imapx/camel-imapx-provider.c:106
+#: ../camel/providers/imap/camel-imap-provider.c:99
+#: ../camel/providers/imapx/camel-imapx-provider.c:107
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Detta alternativ ansluter till IMAP-servern med ett lösenord i klartext."
 
-#: ../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:310
+#: ../camel/providers/imapx/camel-imapx-store.c:220
 #, 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:312
+#: ../camel/providers/imapx/camel-imapx-store.c:222
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP-tjänst för %s på %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:446
+#: ../camel/providers/nntp/camel-nntp-store.c:234
+#: ../camel/providers/pop3/camel-pop3-store.c:132
+#: ../camel/providers/smtp/camel-smtp-transport.c:215
 #, c-format
 msgid "Could not connect to %s: %s"
 msgstr "Kunde inte ansluta till %s: %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:447
+#: ../camel/providers/nntp/camel-nntp-store.c:235
+#: ../camel/providers/pop3/camel-pop3-store.c:133
+#: ../camel/providers/smtp/camel-smtp-transport.c:216
 msgid "SSL unavailable"
 msgstr "SSL är inte tillgängligt"
 
-#: ../camel/providers/imap/camel-imap-store.c:578
-#: ../camel/providers/imap/camel-imap-store.c:860
-#: ../camel/providers/imapx/camel-imapx-server.c:2035
-msgid "Connection cancelled"
-msgstr "Anslutning avbruten"
+#: ../camel/providers/imap/camel-imap-store.c:465
+#: ../camel/providers/nntp/camel-nntp-store.c:252
+#, c-format
+msgid "Could not connect to %s: "
+msgstr "Kunde inte ansluta till %s: "
 
-#: ../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:2075
-#: ../camel/providers/imapx/camel-imapx-server.c:2089
+#: ../camel/providers/imap/camel-imap-store.c:571
+#: ../camel/providers/imap/camel-imap-store.c:591
+#: ../camel/providers/imap/camel-imap-store.c:598
+#: ../camel/providers/imap/camel-imap-store.c:625
+#: ../camel/providers/imapx/camel-imapx-server.c:2828
+#: ../camel/providers/imapx/camel-imapx-server.c:2864
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Misslyckades med att ansluta till IMAP-servern %s i säkert läge: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:690
-#: ../camel/providers/imapx/camel-imapx-server.c:2076
-#: ../camel/providers/smtp/camel-smtp-transport.c:332
+#: ../camel/providers/imap/camel-imap-store.c:572
+#: ../camel/providers/imapx/camel-imapx-server.c:2829
+#: ../camel/providers/smtp/camel-smtp-transport.c:295
 msgid "STARTTLS not supported"
 msgstr "STARTTLS stöds inte"
 
-#: ../camel/providers/imap/camel-imap-store.c:709
-#: ../camel/providers/imapx/camel-imapx-server.c:2090
+#: ../camel/providers/imap/camel-imap-store.c:592
+#: ../camel/providers/imapx/camel-imapx-server.c:2865
 msgid "SSL negotiations failed"
 msgstr "SSL-förhandlingar misslyckades"
 
-#: ../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:599
+#: ../camel/providers/smtp/camel-smtp-transport.c:339
 msgid "SSL is not available in this build"
 msgstr "SSL är inte tillgängligt i detta bygge"
 
-#: ../camel/providers/imap/camel-imap-store.c:863
+#: ../camel/providers/imap/camel-imap-store.c:747
+#: ../camel/providers/imapx/camel-imapx-server.c:2648
+#, c-format
+msgid "Connection cancelled"
+msgstr "Anslutning avbruten"
+
+#: ../camel/providers/imap/camel-imap-store.c:752
+#: ../camel/providers/imapx/camel-imapx-server.c:2653
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Kunde inte ansluta med kommandot \"%s\": %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/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/imap/camel-imap-store.c:945
+#: ../camel/providers/imap/camel-imap-store.c:2369
+#: ../camel/providers/imapx/camel-imapx-store.c:457
+#: ../camel/providers/imapx/camel-imapx-store.c:1054
+#: ../camel/providers/local/camel-maildir-folder.c:90
+#: ../camel/providers/local/camel-maildir-store.c:225
+#: ../camel/providers/local/camel-maildir-store.c:315
+#: ../camel/providers/local/camel-maildir-store.c:562
+#: ../camel/providers/local/camel-maildir-store.c:575
+#: ../camel/providers/local/camel-spool-store.c:508
 msgid "Inbox"
 msgstr "Inkorg"
 
-#: ../camel/providers/imap/camel-imap-store.c:1303
+#: ../camel/providers/imap/camel-imap-store.c:1148
+#: ../camel/providers/imapx/camel-imapx-server.c:2931
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP-servern %s stöder inte den begärda autentiseringstypen %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:1313
-#: ../camel/providers/smtp/camel-smtp-transport.c:506
+#: ../camel/providers/imap/camel-imap-store.c:1160
+#: ../camel/providers/imapx/camel-imapx-server.c:2943
+#: ../camel/providers/smtp/camel-smtp-transport.c:483
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Inget stöd för autentiseringstypen %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:1387
+#: ../camel/providers/imap/camel-imap-store.c:1239
+#: ../camel/providers/imapx/camel-imapx-server.c:3013
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3190,431 +3280,185 @@ 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:1790
+#: ../camel/providers/imap/camel-imap-store.c:2212
+#: ../camel/providers/imapx/camel-imapx-store.c:852
 #, c-format
 msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "Mappnamnet \"%s\" är ogiltigt eftersom det innehåller tecknet \"%c\""
 
-#: ../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:1906
+#: ../camel/providers/local/camel-maildir-store.c:189
+#: ../camel/providers/local/camel-mbox-store.c:193
+#: ../camel/providers/local/camel-mh-store.c:255
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "Kan inte skapa mappen \"%s\": mappen finns redan."
 
-#: ../camel/providers/imap/camel-imap-store.c:2283
+#: ../camel/providers/imap/camel-imap-store.c:2225
+#: ../camel/providers/imapx/camel-imapx-store.c:863
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Okänd föräldermapp: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:3107
+#: ../camel/providers/imap/camel-imap-store.c:3081
+#, c-format
 msgid "Server unexpectedly disconnected"
 msgstr "Servern kopplade oväntat ifrån"
 
-#: ../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 "Misslyckades med att skicka kommando till IMAP-servern %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-command.c:681
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Oväntat svar från IMAP4-servern %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:215
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "Oväntad hälsning från IMAP-servern %s."
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:440
-#, c-format
-msgid "Cannot select folder '%s': Invalid mailbox name"
-msgstr "Kan inte välja mappen \"%s\": Ogiltigt namn på brevlåda"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:446
-#, c-format
-msgid "Cannot select folder '%s': Bad command"
-msgstr "Kan inte välja mappen \"%s\": Felaktigt kommando"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1414
-#, c-format
-msgid "Failed to send command to IMAP server %s: %s"
-msgstr "Misslyckades med att skicka kommando till IMAP-servern %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1416
-msgid "service unavailable"
-msgstr "tjänsten är inte tillgänglig"
-
-#: ../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 "IMAP4-servern %s kopplade ifrån oväntat: %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:87
-msgid "Enable extended Mailing-List detection required for some filter and vFolder rules"
-msgstr "Aktivera utökad detektering av sändlistor som krävs av vissa filter och vFolder-regler"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:88
-msgid "Expire cached messages that haven't been read in X seconds"
-msgstr "Låt mellanlagrade meddelanden som inte har blivit lästa på X sekunder utgå"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:89
-msgid "Expire cached messages older than X seconds"
-msgstr "Låt mellanlagrade meddelanden äldre än X sekunder utgå"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:427
-#, c-format
-msgid "Cannot access folder '%s': %s"
-msgstr "Kan inte komma åt mappen \"%s\": %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:484
-#, c-format
-msgid "Cannot sync flags to folder '%s': Unknown error"
-msgstr "Kan inte synkronisera flaggor till mappen \"%s\": Okänt fel"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:490
-#, c-format
-msgid "Cannot sync flags to folder '%s': Bad command"
-msgstr "Kan inte synkronisera flaggor till mappen \"%s\": Felaktigt kommando"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:630
-#, c-format
-msgid "Cannot expunge folder '%s': Unknown error"
-msgstr "Kan inte tömma mappen \"%s\": Okänt fel"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:635
-#, c-format
-msgid "Cannot expunge folder '%s': Bad command"
-msgstr "Kan inte tömma mappen \"%s\": Felaktigt kommando"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:891
-#, c-format
-msgid "Cannot get message %s from folder '%s': No such message"
-msgstr "Kan inte hämta meddelandet %s från mappen \"%s\": Inget sådant meddelande"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:896
-#, c-format
-msgid "Cannot get message %s from folder '%s': Bad command"
-msgstr "Kan inte hämta meddelandet %s från mappen \"%s\": Felaktigt kommando"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:940
-#, c-format
-msgid "Cannot append message to folder '%s': Folder is read-only"
-msgstr "Kan inte lägga till meddelande i mappen \"%s\": Mappen är skrivskyddad"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1033
-#, c-format
-msgid "Cannot append message to folder '%s': Unknown error"
-msgstr "Kan inte lägga till meddelande i mappen \"%s\": Okänt fel"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1063
-#, c-format
-msgid "Cannot append message to folder '%s': Bad command"
-msgstr "Kan inte lägga till meddelandet i mappen \"%s\": Felaktigt kommando"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1182
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
-msgstr "Kan inte flytta meddelanden från mappen \"%s\" till mappen \"%s\": Okänt fel"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1186
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
-msgstr "Kan inte kopiera meddelanden från mappen \"%s\" till mappen \"%s\": Okänt fel"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1194
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
-msgstr "Kan inte flytta meddelanden från mappen \"%s\" till mappen \"%s\": Felaktigt kommando"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1198
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
-msgstr "Kan inte kopiera meddelanden från mappen \"%s\" till mappen \"%s\": Felaktigt kommando"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:55
-msgid "Check new messages for _Junk contents"
-msgstr "Kontrollera om nya meddelanden är _skräppost"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:57
-msgid "Only check for Junk messa_ges in the INBOX folder"
-msgstr "Kontrollera endast om det finns skräpme_ddelanden i INBOX-mappen"
-
-#: ../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 "För läsande och lagrande av e-post på IMAPv4rev1-servrar."
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:85
-msgid "This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr "Detta alternativ ansluter till IMAPv4rev1-servern med ett lösenord i klartext."
-
-#: ../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 "Anslutning avbruten"
-
-#: ../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 "Misslyckades med att ansluta till IMAP-servern %s i säkert läge: Servern saknar stöd för STARTTLS"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:326
-#: ../camel/providers/pop3/camel-pop3-store.c:275
-msgid "TLS negotiations failed"
-msgstr "TLS-förhandlingar misslyckades"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:411
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr "Kan inte autentisera till IMAP-servern %s med hjälp av autentiseringsmekanismen %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:534
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Kan inte autentisera till IMAP-servern %s med hjälp av %s"
-
-#: ../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 "Kan inte skapa IMAP-mappar i frånkopplat läge."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:736
-#, c-format
-msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
-msgstr "Kan inte hämta mappen \"%s\" på IMAP-servern %s: Okänt fel"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:816
-#, c-format
-msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
-msgstr "Kan inte hämta LIST-information för \"%s\" på IMAP-servern %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:818
-#: ../camel/providers/imap4/camel-imap4-store.c:1574
-msgid "Bad command"
-msgstr "Felaktigt kommando"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:897
-#, c-format
-msgid "Cannot create folder '%s': Invalid mailbox name"
-msgstr "Kan inte skapa mappen \"%s\": Ogiltigt namn på brevlåda"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:902
-#, c-format
-msgid "Cannot create folder '%s': Bad command"
-msgstr "Kan inte skapa mappen \"%s\": Felaktigt kommando"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1008
-#, c-format
-msgid "Cannot delete folder '%s': Special folder"
-msgstr "Kan inte ta bort mappen \"%s\": Specialmapp"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1015
-msgid "Cannot delete IMAP folders in offline mode."
-msgstr "Kan inte ta bort IMAP-mappar i frånkopplat läge."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1074
-#, c-format
-msgid "Cannot delete folder '%s': Invalid mailbox name"
-msgstr "Kan inte ta bort mappen \"%s\": Ogiltigt namn på brevlåda"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1079
-#, c-format
-msgid "Cannot delete folder '%s': Bad command"
-msgstr "Kan inte ta bort mappen \"%s\": Felaktigt kommando"
+#: ../camel/providers/imap/camel-imap-store.c:3084
+msgid "Server unexpectedly disconnected: "
+msgstr "Servern kopplade ifrån oväntat: "
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1099
+#: ../camel/providers/imapx/camel-imapx-folder.c:75
 #, c-format
-msgid "Cannot rename folder '%s' to '%s': Special folder"
-msgstr "Kan inte byta namn på mappen \"%s\" till \"%s\": Specialmapp"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1106
-msgid "Cannot rename IMAP folders in offline mode."
-msgstr "Kan inte byta namn på IMAP-mappar i frånkopplat läge."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1137
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
-msgstr "Kan inte byta namn på mappen \"%s\" till \"%s\": Ogiltigt namn på brevlåda"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1142
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Bad command"
-msgstr "Kan inte byta namn på mappen \"%s\" till \"%s\": Felaktigt kommando"
+msgid "Could not create folder summary for %s"
+msgstr "Kunde inte skapa mappsammandrag för %s"
 
-#. 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
+#: ../camel/providers/imapx/camel-imapx-folder.c:83
 #, c-format
-msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
-msgstr "Kan inte hämta %s-information för mönstret \"%s\" på IMAP-servern %s: %s"
+msgid "Could not create cache for %s: "
+msgstr "Kunde inte skapa mellanlagring för %s: "
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1633
-msgid "Cannot subscribe to IMAP folders in offline mode."
-msgstr "Kan inte prenumerera på IMAP-mappar i frånkopplat läge."
+#: ../camel/providers/imapx/camel-imapx-provider.c:43
+msgid "Use _Quick Resync if the server supports it"
+msgstr "Använd Sna_bb omsynkronisering om servern har stöd för det"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1678
-#, c-format
-msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
-msgstr "Kan inte prenumerera på mappen \"%s\": Ogiltigt namn på brevlåda"
+#: ../camel/providers/imapx/camel-imapx-provider.c:45
+msgid "Use I_dle if the server supports it"
+msgstr "Använd _Inaktiv om servern har stöd för det"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1683
-#, c-format
-msgid "Cannot subscribe to folder '%s': Bad command"
-msgstr "Kan inte prenumerera på mappen \"%s\": Felaktigt kommando"
+#: ../camel/providers/imapx/camel-imapx-provider.c:57
+msgid "Command:"
+msgstr "Kommando:"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1705
-msgid "Cannot unsubscribe from IMAP folders in offline mode."
-msgstr "Kan inte säga upp prenumeration på IMAP-mappar i frånkopplat läge."
+#: ../camel/providers/imapx/camel-imapx-provider.c:59
+msgid "Numbe_r of cached connections to use"
+msgstr "Anta_l mellanlagrade anslutningar att använda"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1750
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
-msgstr "Kan inte säga upp prenumeration på mappen \"%s\": Ogiltigt namn på brevlåda"
+#: ../camel/providers/imapx/camel-imapx-provider.c:70
+msgid "Namespace:"
+msgstr "Namnrymd:"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1755
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Bad command"
-msgstr "Kan inte säga upp prenumeration på mappen \"%s\": Felaktigt kommando"
+#: ../camel/providers/imapx/camel-imapx-provider.c:89
+msgid "IMAP+"
+msgstr "IMAP+"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1590
-msgid "Scanning for changed messages"
-msgstr "Letar efter ändrade meddelanden"
+#: ../camel/providers/imapx/camel-imapx-server.c:1365
+msgid "Error writing to cache stream: "
+msgstr "Fel vid skrivning till mellanlagringsström: "
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1611
+#: ../camel/providers/imapx/camel-imapx-server.c:2008
 #, c-format
-msgid "IMAP server %s is in an inconsistent state."
-msgstr "IMAP-servern %s är i ett inkonsistent tillstånd."
-
-#: ../camel/providers/imap4/camel-imap4-summary.c:1638
-msgid "Fetching envelopes of new messages"
-msgstr "Hämtar kuvert för nya meddelanden"
+msgid "Not authenticated"
+msgstr "Inte autentiserad"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:429
+#: ../camel/providers/imapx/camel-imapx-server.c:2756
 #, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Oväntad flagga i svar från IMAP-servern %s: "
+msgid "Could not connect to %s (port %s): "
+msgstr "Kunde inte ansluta till %s (port %s): "
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:452
-msgid "No data"
-msgstr "Inga data"
+#: ../camel/providers/imapx/camel-imapx-server.c:3185
+msgid "Closing tmp stream failed: "
+msgstr "Stängning av temporärström misslyckades: "
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:613
+#: ../camel/providers/imapx/camel-imapx-server.c:5081
 #, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "IMAP-servern %s kopplade ifrån oväntat: %s"
+msgid "Cannot create spool file: %s"
+msgstr "Kan inte skapa köfil: %s"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:84
-#, c-format
-msgid "Could not create folder summary for %s"
-msgstr "Kunde inte skapa mappsammandrag för %s"
+#: ../camel/providers/imapx/camel-imapx-server.c:5096
+msgid "Cannot create spool file: "
+msgstr "Kan inte skapa köfil: "
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:92
+#: ../camel/providers/imapx/camel-imapx-store.c:426
+#: ../camel/providers/nntp/camel-nntp-store.c:1529
 #, c-format
-msgid "Could not create cache for %s"
-msgstr "Kunde inte skapa cache för %s"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
-msgid "Use I_dle if the server supports it"
-msgstr "Använd _Inaktiv om servern har stöd för det"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:60
-msgid "Numbe_r of cached connections to use"
-msgstr "Anta_l cachade anslutningar att använda"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:88
-msgid "IMAP+"
-msgstr "IMAP+"
+msgid "No such folder: %s"
+msgstr "Det finns ingen sådan mapp: %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2038
+#: ../camel/providers/imapx/camel-imapx-stream.c:71
 #, c-format
-msgid "Could not connect to %s (port %s): %s"
-msgstr "Kunde inte ansluta till %s (port %s): %s"
+msgid "Source stream returned no data"
+msgstr "Källströmmen returnerade inget data"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2118
+#: ../camel/providers/imapx/camel-imapx-stream.c:80
 #, c-format
-msgid "%sPlease enter the IMAP password for %s %s"
-msgstr "%sAnge IMAP-lösenordet för %s %s"
-
-#: ../camel/providers/local/camel-local-folder.c:178
-msgid "Index message body data"
-msgstr "Indexera data i meddelandetext"
+msgid "Source stream unavailable"
+msgstr "Källströmmen är inte tillgänglig"
 
-#. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:395
+#: ../camel/providers/local/camel-local-folder.c:199
 #, 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
+#: ../camel/providers/local/camel-local-folder.c:209
+#: ../camel/providers/local/camel-local-folder.c:218
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "brevlåda: %s (%s)"
 
-#. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:406
+#: ../camel/providers/local/camel-local-folder.c:227
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-provider.c:48
+#: ../camel/providers/local/camel-local-folder.c:272
+msgid "Index message body data"
+msgstr "Indexera data i meddelandetext"
+
+#: ../camel/providers/local/camel-local-folder.c:686
+#, c-format
+msgid ""
+"Cannot get message %s from folder %s\n"
+"%s"
+msgstr ""
+"Kan inte hämta meddelande %s från mappen %s\n"
+"%s"
+
+#: ../camel/providers/local/camel-local-provider.c:44
 msgid "_Use the '.folders' folder summary file (exmh)"
 msgstr "An_vänd mappsammandragsfilen \".folders\" (exmh)"
 
-#: ../camel/providers/local/camel-local-provider.c:55
+#: ../camel/providers/local/camel-local-provider.c:51
 msgid "MH-format mail directories"
 msgstr "Brevlådekataloger i 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 "För lagrande av lokal e-post i MH-liknande brevlådekataloger."
 
-#: ../camel/providers/local/camel-local-provider.c:73
+#: ../camel/providers/local/camel-local-provider.c:69
 msgid "Local delivery"
 msgstr "Lokal leverans"
 
-#: ../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."
 msgstr "För hämtning (flytt) av lokal post från standardformaterade mbox-brevlådor till mappar som hanteras av Evolution."
 
-#: ../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 "_Tillämpa filtren på nya meddelanden i INBOX"
 
-#: ../camel/providers/local/camel-local-provider.c:95
+#: ../camel/providers/local/camel-local-provider.c:91
 msgid "Maildir-format mail directories"
 msgstr "Brevlådekataloger i 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 "För lagrande av lokal e-post i maildir-kataloger."
 
-#: ../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 "_Lagra statushuvuden i Elm/Pine/Mutt-format"
 
-#: ../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-köfil"
 
-#: ../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."
@@ -3622,211 +3466,186 @@ msgstr ""
 "För läsande och lagrande av lokal e-post i mbox-standardspoolfiler.\n"
 "Kan också användas för läsande av ett träd i mappar av Elm-, Pine- eller Mutt-typ."
 
-#: ../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-kökatalog"
 
-#: ../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:149
+#: ../camel/providers/local/camel-local-store.c:284
+#: ../camel/providers/local/camel-mbox-store.c:371
+#: ../camel/providers/local/camel-spool-store.c:109
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Lagringsroten %s är inte en absolut sökväg"
 
-#: ../camel/providers/local/camel-local-store.c:170
+#: ../camel/providers/local/camel-local-store.c:158
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Lagringsroten %s är ingen vanlig katalog"
 
+#: ../camel/providers/local/camel-local-store.c:169
 #: ../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:297
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Kan inte hämta mapp: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:199
+#: ../camel/providers/local/camel-local-store.c:193
+#, c-format
 msgid "Local stores do not have an inbox"
 msgstr "Lokala lager har ingen inkorg"
 
-#: ../camel/providers/local/camel-local-store.c:245
+#: ../camel/providers/local/camel-local-store.c:250
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokal brevlådefil %s"
 
-#: ../camel/providers/local/camel-local-store.c:340
+#: ../camel/providers/local/camel-local-store.c:358
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Kunde inte byta namn på mappen %s till %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:408
+#: ../camel/providers/local/camel-local-store.c:431
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Kunde inte byta namn på \"%s\": %s"
 
-#: ../camel/providers/local/camel-local-store.c:433
-#: ../camel/providers/local/camel-mbox-store.c:298
+#: ../camel/providers/local/camel-local-store.c:461
+#: ../camel/providers/local/camel-mbox-store.c:304
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "Kunde inte ta bort mappindexfilen \"%s\": %s"
 
-#: ../camel/providers/local/camel-local-store.c:456
-#: ../camel/providers/local/camel-mbox-store.c:322
+#: ../camel/providers/local/camel-local-store.c:489
+#: ../camel/providers/local/camel-mbox-store.c:333
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "Kunde inte ta bort mappmetafilen \"%s\": %s"
 
-#: ../camel/providers/local/camel-local-summary.c:515
+#: ../camel/providers/local/camel-local-summary.c:537
+#, c-format
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Kunde inte lägga till meddelande till sammandrag: okänd orsak"
 
-#: ../camel/providers/local/camel-maildir-folder.c:230
-msgid "Maildir append message canceled"
-msgstr "Tillägg av meddelande i brevlåda avbröts"
-
-#: ../camel/providers/local/camel-maildir-folder.c:233
+#: ../camel/providers/local/camel-maildir-folder.c:195
 #, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "Kan inte lägga till meddelande i mapp för brevlådekatalog: %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 ""
-"Kan inte hämta meddelande: %s från mappen %s\n"
-"  %s"
+msgid "Cannot append message to maildir folder: %s: "
+msgstr "Kan inte lägga till meddelande i mapp för brevlådekatalog: %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:315
-msgid "Invalid message contents"
-msgstr "Ogiltigt meddelandeinnehåll"
+#: ../camel/providers/local/camel-maildir-folder.c:283
+#: ../camel/providers/local/camel-maildir-folder.c:291
+#: ../camel/providers/local/camel-mbox-folder.c:440
+#: ../camel/providers/local/camel-mh-folder.c:227
+#: ../camel/providers/local/camel-mh-folder.c:235
+#, c-format
+msgid "Cannot get message %s from folder %s: "
+msgstr "Kan inte hämta meddelande %s från mappen %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:418
-msgid "Cannot transfer message to destination folder"
-msgstr "Kan inte överföra meddelande till målmappen"
+#: ../camel/providers/local/camel-maildir-folder.c:399
+#, c-format
+msgid "Cannot transfer message to destination folder: %s"
+msgstr "Kan inte överföra meddelande till målmappen: %s"
 
-#: ../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:136
+#: ../camel/providers/local/camel-maildir-store.c:167
+#: ../camel/providers/local/camel-mbox-store.c:161
+#: ../camel/providers/local/camel-mbox-store.c:175
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "Kan inte skapa mappen \"%s\": %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:151
+#: ../camel/providers/local/camel-mbox-store.c:127
+#: ../camel/providers/local/camel-mh-store.c:215
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "Kan inte hämta mappen \"%s\": %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:165
-#: ../camel/providers/local/camel-mbox-store.c:153
+#: ../camel/providers/local/camel-maildir-store.c:157
+#: ../camel/providers/local/camel-mbox-store.c:137
 #: ../camel/providers/local/camel-mh-store.c:224
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "Kan inte hämta mappen \"%s\": mappen finns inte."
 
-#: ../camel/providers/local/camel-maildir-store.c:189
+#: ../camel/providers/local/camel-maildir-store.c:184
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "Kan inte hämta mappen \"%s\": inte en maildir-katalog."
 
-#: ../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:242
+#: ../camel/providers/local/camel-maildir-store.c:282
+#: ../camel/providers/local/camel-mh-store.c:287
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "Kunde inte ta bort mappen \"%s\": %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-maildir-store.c:244
 msgid "not a maildir directory"
 msgstr "är inte en maildir-katalog"
 
-#: ../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:482
+#: ../camel/providers/local/camel-spool-store.c:364
+#: ../camel/providers/local/camel-spool-store.c:380
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "Kunde inte söka igenom mappen \"%s\": %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:432
-#: ../camel/providers/local/camel-maildir-summary.c:551
+#: ../camel/providers/local/camel-maildir-summary.c:435
+#: ../camel/providers/local/camel-maildir-summary.c:558
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Kan inte öppna sökvägen till maildir-katalogen: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:544
+#: ../camel/providers/local/camel-maildir-summary.c:549
 msgid "Checking folder consistency"
 msgstr "Kontrollerar mapptillstånd"
 
-#: ../camel/providers/local/camel-maildir-summary.c:637
+#: ../camel/providers/local/camel-maildir-summary.c:641
 msgid "Checking for new messages"
 msgstr "Letar efter nya meddelanden"
 
-#: ../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:732
+#: ../camel/providers/local/camel-mbox-summary.c:465
+#: ../camel/providers/local/camel-mbox-summary.c:679
+#: ../camel/providers/local/camel-mbox-summary.c:809
+#: ../camel/providers/local/camel-spool-summary.c:130
 msgid "Storing folder"
 msgstr "Lagrar mapp"
 
-#: ../camel/providers/local/camel-mbox-folder.c:167
-#: ../camel/providers/local/camel-spool-folder.c:150
+#: ../camel/providers/local/camel-mbox-folder.c:124
+#: ../camel/providers/local/camel-spool-folder.c:125
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Kan inte skapa mapplås på %s: %s"
 
-#: ../camel/providers/local/camel-mbox-folder.c:231
+#: ../camel/providers/local/camel-mbox-folder.c:194
 #, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "Kan inte öppna brevlåda: %s %s\n"
-
-#: ../camel/providers/local/camel-mbox-folder.c:297
-msgid "Mail append canceled"
-msgstr "E-posttillägg avbrutet"
+msgid "Cannot open mailbox: %s: "
+msgstr "Kan inte öppna brevlåda: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:300
+#: ../camel/providers/local/camel-mbox-folder.c:260
 #, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "Kan inte lägga till meddelande till mbox-fil: %s: %s"
+msgid "Cannot append message to mbox file: %s: "
+msgstr "Kan inte lägga till meddelande till mbox-fil: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:466
+#: ../camel/providers/local/camel-mbox-folder.c:433
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Mappen verkar vara obotligt skadad."
 
-#: ../camel/providers/local/camel-mbox-folder.c:474
-#: ../camel/providers/local/camel-mh-folder.c:245
-msgid "Message construction failed."
-msgstr "Meddelandebyggande misslyckades."
-
-#: ../camel/providers/local/camel-mbox-store.c:164
-#: ../camel/providers/local/camel-mbox-store.c:363
+#: ../camel/providers/local/camel-mbox-store.c:149
+#: ../camel/providers/local/camel-mbox-store.c:379
+#, c-format
 msgid "Cannot create a folder by this name."
 msgstr "Kan inte skapa en mapp med detta namn."
 
-#: ../camel/providers/local/camel-mbox-store.c:196
+#: ../camel/providers/local/camel-mbox-store.c:186
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "Kan inte hämta mappen \"%s\": inte en vanlig fil."
 
-#: ../camel/providers/local/camel-mbox-store.c:226
-#: ../camel/providers/local/camel-mbox-store.c:237
+#: ../camel/providers/local/camel-mbox-store.c:218
+#: ../camel/providers/local/camel-mbox-store.c:231
 #: ../camel/providers/local/camel-mbox-store.c:260
 #, c-format
 msgid ""
@@ -3836,164 +3655,162 @@ msgstr ""
 "Kunde inte ta bort mappen \"%s\":\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:245
+#: ../camel/providers/local/camel-mbox-store.c:241
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "\"%s\" är inte en vanlig fil."
 
-#: ../camel/providers/local/camel-mbox-store.c:252
+#: ../camel/providers/local/camel-mbox-store.c:250
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "Mappen \"%s\" är inte tom. Den togs inte bort."
 
-#: ../camel/providers/local/camel-mbox-store.c:274
-#: ../camel/providers/local/camel-mbox-store.c:286
+#: ../camel/providers/local/camel-mbox-store.c:276
+#: ../camel/providers/local/camel-mbox-store.c:290
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "Kunde inte ta bort mappsammandragsfilen \"%s\": %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:376
+#: ../camel/providers/local/camel-mbox-store.c:395
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "Kan inte skapa katalogen \"%s\": %s."
 
-#: ../camel/providers/local/camel-mbox-store.c:390
+#: ../camel/providers/local/camel-mbox-store.c:411
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Kan inte skapa mapp: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:392
+#: ../camel/providers/local/camel-mbox-store.c:413
 msgid "Folder already exists"
 msgstr "Mappen finns redan"
 
-#: ../camel/providers/local/camel-mbox-store.c:483
+#: ../camel/providers/local/camel-mbox-store.c:507
+#, c-format
 msgid "The new folder name is illegal."
 msgstr "Det nya mappnamnet är inte tillåtet."
 
-#: ../camel/providers/local/camel-mbox-store.c:496
+#: ../camel/providers/local/camel-mbox-store.c:522
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "Kunde inte byta namn på \"%s\": \"%s\": %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:577
+#: ../camel/providers/local/camel-mbox-store.c:605
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Kunde inte byta namn på \"%s\" till \"%s\": %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:532
+#: ../camel/providers/local/camel-mbox-summary.c:473
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Kunde inte öppna mapp: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:582
+#: ../camel/providers/local/camel-mbox-summary.c:533
 #, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "�desdigert e-posttolkningsfel nära position %ld i mappen %s"
+msgid "Fatal mail parser error near position %s in folder %s"
+msgstr "�desdigert e-posttolkningsfel nära position %s i mappen %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:659
+#: ../camel/providers/local/camel-mbox-summary.c:615
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Kan inte kontrollera mapp: %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:686
+#: ../camel/providers/local/camel-mbox-summary.c:816
+#: ../camel/providers/local/camel-spool-summary.c:137
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Kunde inte öppna fil: %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:700
+#: ../camel/providers/local/camel-spool-summary.c:152
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kan inte öppna temporär brevlåda: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:752
-#: ../camel/providers/local/camel-mbox-summary.c:957
+#: ../camel/providers/local/camel-mbox-summary.c:715
+#: ../camel/providers/local/camel-mbox-summary.c:933
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kunde inte stänga källmappen %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:761
+#: ../camel/providers/local/camel-mbox-summary.c:726
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "Kunde inte stänga temporär mapp: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:776
+#: ../camel/providers/local/camel-mbox-summary.c:743
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunde inte byta namn på mapp: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:858
-#: ../camel/providers/local/camel-mbox-summary.c:1084
+#: ../camel/providers/local/camel-mbox-summary.c:829
+#: ../camel/providers/local/camel-mbox-summary.c:1071
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Kunde inte lagra mapp: %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:870
+#: ../camel/providers/local/camel-mbox-summary.c:879
+#: ../camel/providers/local/camel-mbox-summary.c:1104
+#: ../camel/providers/local/camel-mbox-summary.c:1113
+#, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Sammandrag och mapp stämmer inte, även efter synkronisering"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1047
-#: ../camel/providers/local/camel-spool-summary.c:334
+#: ../camel/providers/local/camel-mbox-summary.c:1030
+#: ../camel/providers/local/camel-spool-summary.c:337
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Okänt fel: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1190
-#: ../camel/providers/local/camel-mbox-summary.c:1216
+#: ../camel/providers/local/camel-mbox-summary.c:1183
+#: ../camel/providers/local/camel-mbox-summary.c:1213
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "Skrivning till temporär brevlåda misslyckades: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1207
+#: ../camel/providers/local/camel-mbox-summary.c:1202
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "Skrivning till temporär brevlåda misslyckades: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:180
-msgid "MH append message canceled"
-msgstr "MH-meddelandetillägg avbrutet"
-
-#: ../camel/providers/local/camel-mh-folder.c:183
+#: ../camel/providers/local/camel-mh-folder.c:165
 #, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "Kan inte lägga till meddelande i mh-mapp: %s: %s"
+msgid "Cannot append message to mh folder: %s: "
+msgstr "Kan inte lägga till meddelande i mh-mapp: %s: "
 
-#: ../camel/providers/local/camel-mh-store.c:232
+#: ../camel/providers/local/camel-mh-store.c:234
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "Kunde inte skapa mappen \"%s\": %s"
 
-#: ../camel/providers/local/camel-mh-store.c:244
+#: ../camel/providers/local/camel-mh-store.c:248
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "Kan inte hämta mappen \"%s\": inte en katalog."
 
-#: ../camel/providers/local/camel-mh-summary.c:240
+#: ../camel/providers/local/camel-mh-summary.c:228
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Kan inte öppna sökvägen till MH-katalogen: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:132
+#: ../camel/providers/local/camel-spool-store.c:118
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "Spoolen \"%s\" kan inte öppnas: %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 "Spoolen \"%s\" är inte en vanlig fil eller katalog"
 
-#: ../camel/providers/local/camel-spool-store.c:163
+#: ../camel/providers/local/camel-spool-store.c:158
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "Mappen \"%s/%s\" finns inte."
 
-#: ../camel/providers/local/camel-spool-store.c:173
+#: ../camel/providers/local/camel-spool-store.c:170
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -4002,12 +3819,12 @@ msgstr ""
 "Kunde inte öppna mappen \"%s\":\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:177
+#: ../camel/providers/local/camel-spool-store.c:176
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "Mappen \"%s\" finns inte."
 
-#: ../camel/providers/local/camel-spool-store.c:182
+#: ../camel/providers/local/camel-spool-store.c:183
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -4016,48 +3833,51 @@ msgstr ""
 "Kunde inte skapa mappen \"%s\":\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:190
+#: ../camel/providers/local/camel-spool-store.c:193
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "\"%s\" är ingen brevlådefil."
 
-#: ../camel/providers/local/camel-spool-store.c:207
+#: ../camel/providers/local/camel-spool-store.c:213
+#, c-format
 msgid "Store does not support an INBOX"
 msgstr "Lagret stöder inte en INKORG"
 
-#: ../camel/providers/local/camel-spool-store.c:219
+#: ../camel/providers/local/camel-spool-store.c:226
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Spool-brevlådefil %s"
 
-#: ../camel/providers/local/camel-spool-store.c:219
+#: ../camel/providers/local/camel-spool-store.c:226
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "Spool-mappträd %s"
 
-#: ../camel/providers/local/camel-spool-store.c:227
+#: ../camel/providers/local/camel-spool-store.c:238
+#, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "Spool-mappar kan inte bytas namn på"
 
-#: ../camel/providers/local/camel-spool-store.c:235
+#: ../camel/providers/local/camel-spool-store.c:251
+#, c-format
 msgid "Spool folders cannot be deleted"
 msgstr "Spool-mappar kan inte tas bort"
 
-#: ../camel/providers/local/camel-spool-summary.c:180
+#: ../camel/providers/local/camel-spool-summary.c:166
+#: ../camel/providers/local/camel-spool-summary.c:178
 #: ../camel/providers/local/camel-spool-summary.c:190
-#: ../camel/providers/local/camel-spool-summary.c:200
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Kunde inte synkronisera temporära mappen %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:216
+#: ../camel/providers/local/camel-spool-summary.c:208
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Kunde inte synkronisera spool-mappen %s: %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:240
+#: ../camel/providers/local/camel-spool-summary.c:259
+#: ../camel/providers/local/camel-spool-summary.c:272
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -4066,65 +3886,80 @@ msgstr ""
 "Kunde inte synkronisera spool-mappen %s: %s\n"
 "Mappen kan vara skadad, kopia sparad i \"%s\""
 
-#: ../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:197
+#: ../camel/providers/nntp/camel-nntp-folder.c:271
+#: ../camel/providers/nntp/camel-nntp-folder.c:312
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "Internt fel: uid är i ogiltigt format: %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:234
+#: ../camel/providers/nntp/camel-nntp-folder.c:238
+#: ../camel/providers/pop3/camel-pop3-folder.c:402
+#: ../camel/providers/pop3/camel-pop3-folder.c:630
+#: ../camel/providers/pop3/camel-pop3-folder.c:695
+#: ../camel/providers/pop3/camel-pop3-folder.c:706
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "Kan inte hämta meddelande %s: %s"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:465
+#: ../camel/providers/nntp/camel-nntp-folder.c:471
+#: ../camel/providers/nntp/camel-nntp-folder.c:518
 #, c-format
 msgid "Posting failed: %s"
 msgstr "Postande misslyckades: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:430
+#: ../camel/providers/nntp/camel-nntp-folder.c:513
+msgid "Posting failed: "
+msgstr "Postande misslyckades: "
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:541
+#, c-format
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "Du kan inte posta NNTP-meddelande medan du är frånkopplad!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:441
+#: ../camel/providers/nntp/camel-nntp-folder.c:560
+#, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Du kan inte kopiera meddelanden från en NNTP-mapp!"
 
-#: ../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 "_Visa mappar med kort notation (t.ex. c.o.linux istället för 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 "Visa relativa mappnamn i prenumerations_dialogen"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:53
 msgid "USENET news"
 msgstr "USENET-diskussionsgrupper"
 
-#: ../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 "Det här är en leverantör för läsning och postning till USENET-diskussionsgrupper."
 
-#: ../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 "Detta alternativ kommer att autentisera med NNTP-servern genom att använda ett klartextlösenord."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:216
+#: ../camel/providers/nntp/camel-nntp-store.c:265
 #, c-format
-msgid "Could not read greeting from %s: %s"
-msgstr "Kunde inte skapa hälsning från %s: %s"
+msgid "Could not read greeting from %s: "
+msgstr "Kunde inte läsa hälsning från %s: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:228
+#: ../camel/providers/nntp/camel-nntp-store.c:278
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP-servern %s returnerade felkoden %d: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:410
+#: ../camel/providers/nntp/camel-nntp-store.c:453
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET-diskussionsgrupper via %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:819
+#: ../camel/providers/nntp/camel-nntp-store.c:946
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4135,7 +3970,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:913
+#: ../camel/providers/nntp/camel-nntp-store.c:1043
+#, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -4145,7 +3981,8 @@ msgstr ""
 "\n"
 "Diskussionsgruppen finns inte. Det markerade objektet är troligtvis en föräldermapp."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:945
+#: ../camel/providers/nntp/camel-nntp-store.c:1083
+#, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -4155,191 +3992,192 @@ msgstr ""
 "\n"
 "diskussionsgruppen finns inte!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:970
+#: ../camel/providers/nntp/camel-nntp-store.c:1113
+#, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "Du kan inte skapa en mapp i ett diskussionsgruppslager: prenumerera istället."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:978
+#: ../camel/providers/nntp/camel-nntp-store.c:1125
+#, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "Du kan inte byta namn på en mapp i ett diskussionsgruppslager."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:986
+#: ../camel/providers/nntp/camel-nntp-store.c:1138
+#, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Du kan inte flytta en mapp i ett diskussionsgruppslager: säg upp prenumerationen istället."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1180
+#: ../camel/providers/nntp/camel-nntp-store.c:1276
+#, c-format
 msgid "Authentication requested but no username provided"
 msgstr "Autentisering begärd men inget användarnamn angivet"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1192
+#: ../camel/providers/nntp/camel-nntp-store.c:1288
 #, c-format
 msgid "Cannot authenticate to server: %s"
 msgstr "Kan inte autentisera till servern: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1315
-#, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP-kommandot misslyckades: %s"
+#: ../camel/providers/nntp/camel-nntp-store.c:1414
+msgid "NNTP Command failed: "
+msgstr "NNTP-kommandot misslyckades: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1369
+#: ../camel/providers/nntp/camel-nntp-store.c:1472
+#, c-format
 msgid "Not connected."
 msgstr "Inte ansluten."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1422
-#, c-format
-msgid "No such folder: %s"
-msgstr "Det finns ingen sådan mapp: %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: Letar efter nya meddelanden"
 
-#: ../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 "Oväntat serversvar från xover: %s"
 
 # Osäker.
-#: ../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 "Oväntat serversvar från head: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:420
-msgid "Use cancel"
-msgstr "Använd avbryt"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:422
+#: ../camel/providers/nntp/camel-nntp-summary.c:401
 #, c-format
 msgid "Operation failed: %s"
 msgstr "�tgärden misslyckades: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:253
+#: ../camel/providers/pop3/camel-pop3-folder.c:251
 msgid "Retrieving POP summary"
 msgstr "Hämtar POP-sammandrag"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:271
+#: ../camel/providers/pop3/camel-pop3-folder.c:274
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Kan inte hämta POP-sammandrag: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:314
+#: ../camel/providers/pop3/camel-pop3-folder.c:324
 msgid "Expunging old messages"
 msgstr "Tömmer gamla meddelanden"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:322
+#: ../camel/providers/pop3/camel-pop3-folder.c:332
 msgid "Expunging deleted messages"
 msgstr "Tömmer borttagna meddelanden"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:530
-#: ../camel/providers/pop3/camel-pop3-folder.c:552
+#: ../camel/providers/pop3/camel-pop3-folder.c:566
+#: ../camel/providers/pop3/camel-pop3-folder.c:596
 #, c-format
 msgid "No message with UID %s"
 msgstr "Inget meddelande med uid %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:603
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Hämtar POP-meddelande %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
+#: ../camel/providers/pop3/camel-pop3-folder.c:707
 msgid "Unknown reason"
 msgstr "Okänd anledning"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
+#: ../camel/providers/pop3/camel-pop3-provider.c:39
 msgid "Message storage"
 msgstr "Meddelandelager"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:41
 msgid "_Leave messages on server"
 msgstr "_Lämna kvar meddelanden på servern"
 
-#: ../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 "_Ta bort efter %s dag(ar)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:49
+#: ../camel/providers/pop3/camel-pop3-provider.c:45
 msgid "Disable _support for all POP3 extensions"
 msgstr "Inaktivera _stöd för alla POP3-tillägg"
 
-#: ../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 "För anslutning till och hämtande av e-post från POP-servrar."
 
-#: ../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."
 msgstr "Detta alternativ kommer att ansluta till POP-servern med ett klartextlösenord. Det här är det enda alternativet som stöds hos många POP-servrar."
 
-#: ../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 to support it."
 msgstr "Detta alternativ kommer att ansluta till POP-servern genom att använda ett krypterat lösenord via APOP-protokollet. Det här kanske inte fungerar för alla användare även med servrar som sägs stöda detta."
 
-#: ../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:98
+msgid ": "
+msgstr ": "
+
+#: ../camel/providers/pop3/camel-pop3-store.c:168
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "Misslyckades med att läsa en giltig hälsning från POP-servern %s"
 
-#: ../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:186
+#: ../camel/providers/pop3/camel-pop3-store.c:217
+#: ../camel/providers/pop3/camel-pop3-store.c:224
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Misslyckades med att ansluta till POP-servern %s i säkert läge: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:247
+#: ../camel/providers/pop3/camel-pop3-store.c:187
 msgid "STLS not supported by server"
 msgstr "STLS stöds inte av servern"
 
-#: ../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:205
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode%s"
 msgstr "Misslyckades med att ansluta till POP-servern %s i säkert läge%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:281
+#: ../camel/providers/pop3/camel-pop3-store.c:218
+msgid "TLS negotiations failed"
+msgstr "TLS-förhandlingar misslyckades"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:225
 msgid "TLS is not available in this build"
 msgstr "TLS är inte tillgängligt i detta bygge"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:387
-#, c-format
-msgid "Could not connect to POP server %s"
-msgstr "Kunde inte ansluta till POP-servern %s"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:428
-#: ../camel/providers/pop3/camel-pop3-store.c:565
+#: ../camel/providers/pop3/camel-pop3-store.c:321
+#: ../camel/providers/pop3/camel-pop3-store.c:473
 #, c-format
 msgid "Unable to connect to POP server %s: No support for requested authentication mechanism."
 msgstr "Kan inte ansluta till POP-servern %s: Inget stöd för begärd autentiseringsmekanism."
 
-#: ../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:344
 #, c-format
 msgid "SASL '%s' Login failed for POP server %s%s"
 msgstr "SASL \"%s\"-inloggning misslyckades för POP-servern %s%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:460
+#: ../camel/providers/pop3/camel-pop3-store.c:361
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Kan inte logga in på POP-servern %s: SASL-protokollfel"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:479
+#: ../camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
-msgid "Failed to authenticate on POP server %s: %s"
-msgstr "Misslyckades med autentisering för POP-servern %s: %s"
+msgid "Failed to authenticate on POP server %s: "
+msgstr "Misslyckades med autentisering för POP-servern %s: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:538
+#: ../camel/providers/pop3/camel-pop3-store.c:442
 #, c-format
 msgid "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation attack suspected. Please contact your admin."
 msgstr "Kunde inte ansluta till POP-servern %s:\tOgiltigt APOP ID togs emot. Detta kan vara ett säkerhetsproblem. Kontakta din administratör."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:579
+#: ../camel/providers/pop3/camel-pop3-store.c:492
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4348,7 +4186,8 @@ msgstr ""
 "Kan inte ansluta till POP-servern %s.\n"
 "Fel vid skickande av lösenord: %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:505
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4357,7 +4196,8 @@ msgstr ""
 "Kan inte ansluta till POP-servern %s.\n"
 "Fel vid sändning av användarnamn%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:518
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4366,186 +4206,209 @@ msgstr ""
 "Kan inte ansluta till POP-servern %s.\n"
 "Fel vid sändning av lösenord%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:703
+#: ../camel/providers/pop3/camel-pop3-store.c:674
+#, c-format
+msgid "Could not connect to POP server %s"
+msgstr "Kunde inte ansluta till POP-servern %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:687
+#, c-format
+msgid "POP3 server %s"
+msgstr "POP3-server %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:691
+#, c-format
+msgid "POP3 server for %s on %s"
+msgstr "POP3-server för %s på %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:706
 #, c-format
 msgid "No such folder '%s'."
 msgstr "Det finns ingen sådan mapp \"%s\"."
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+#: ../camel/providers/pop3/camel-pop3-store.c:730
+#, c-format
+msgid "POP3 stores have no folder hierarchy"
+msgstr "POP3-lager saknar mapphierarki"
+
+#: ../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."
 msgstr "För leverans av e-post genom att skicka det till programmet \"sendmail\" på det lokala systemet."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:113
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:98
+#, c-format
 msgid "Could not parse recipient list"
 msgstr "Kunde inte tolka mottagarlistan"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:144
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:131
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Kunde inte skapa rör till sendmail: %s: brevet skickades inte"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:165
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:153
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Kunde inte grena sendmail: %s: brevet skickades inte"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:235
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:194
+msgid "Could not send message: "
+msgstr "Kunde inte skicka meddelande: "
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail avslutade med signal %s: brevet skickades inte."
 
-#: ../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 "Kunde inte köra %s: brevet skickades inte."
 
-#: ../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 avslutade med status %d: brevet skickades inte."
 
-#: ../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-postleverans via programmet 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 "För leverans av e-post genom anslutning till ett fjärr-epostnav som använder SMTP."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:167
+#: ../camel/providers/smtp/camel-smtp-transport.c:116
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaxfel, okänt kommando"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:169
+#: ../camel/providers/smtp/camel-smtp-transport.c:118
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaxfel i parametrar eller argument"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:171
+#: ../camel/providers/smtp/camel-smtp-transport.c:120
 msgid "Command not implemented"
 msgstr "Kommandot inte implementerat"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:173
+#: ../camel/providers/smtp/camel-smtp-transport.c:122
 msgid "Command parameter not implemented"
 msgstr "Kommandoparameter inte implementerad"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:175
+#: ../camel/providers/smtp/camel-smtp-transport.c:124
 msgid "System status, or system help reply"
 msgstr "Systemstatus, eller svar från systemhjälp"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:177
+#: ../camel/providers/smtp/camel-smtp-transport.c:126
 msgid "Help message"
 msgstr "Hjälpmeddelande"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:179
+#: ../camel/providers/smtp/camel-smtp-transport.c:128
 msgid "Service ready"
 msgstr "Tjänsten klar"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:181
+#: ../camel/providers/smtp/camel-smtp-transport.c:130
 msgid "Service closing transmission channel"
 msgstr "Tjänsten stänger överföringskanalen"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:183
+#: ../camel/providers/smtp/camel-smtp-transport.c:132
 msgid "Service not available, closing transmission channel"
 msgstr "Tjänsten inte tillgänglig, stänger överföringskanalen"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:185
+#: ../camel/providers/smtp/camel-smtp-transport.c:134
 msgid "Requested mail action okay, completed"
 msgstr "Begärd e-poståtgärd okej, färdig"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:187
+#: ../camel/providers/smtp/camel-smtp-transport.c:136
 msgid "User not local; will forward to <forward-path>"
 msgstr "Användaren inte lokal; vidarebefordrar till <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:189
+#: ../camel/providers/smtp/camel-smtp-transport.c:138
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Begärd e-poståtgärd inte utförd: brevlådan inte tillgänglig"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:191
+#: ../camel/providers/smtp/camel-smtp-transport.c:140
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Begärd åtgärd inte utförd: brevlådan inte tillgänglig"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:142
 msgid "Requested action aborted: error in processing"
 msgstr "Begärd åtgärd avbruten: fel i behandling"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:195
+#: ../camel/providers/smtp/camel-smtp-transport.c:144
 msgid "User not local; please try <forward-path>"
 msgstr "Användaren inte lokal; försök med <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:197
+#: ../camel/providers/smtp/camel-smtp-transport.c:146
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Begärd åtgärd inte utförd: otillräckligt systemutrymme"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:199
+#: ../camel/providers/smtp/camel-smtp-transport.c:148
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Begärd åtgärd avbruten: överskriden utrymmesallokering"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:201
+#: ../camel/providers/smtp/camel-smtp-transport.c:150
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Begärd åtgärd inte utförd: brevlådenamn inte tillåtet"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:203
+#: ../camel/providers/smtp/camel-smtp-transport.c:152
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Börja skriva in brevet, avsluta med <CRLF>.<CRLF>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:205
+#: ../camel/providers/smtp/camel-smtp-transport.c:154
 msgid "Transaction failed"
 msgstr "Transaktionen misslyckades"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:209
+#: ../camel/providers/smtp/camel-smtp-transport.c:158
 msgid "A password transition is needed"
 msgstr "En lösenordsöverföring behövs"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:211
+#: ../camel/providers/smtp/camel-smtp-transport.c:160
 msgid "Authentication mechanism is too weak"
 msgstr "Autentiseringsmekanismen är för svag"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:213
+#: ../camel/providers/smtp/camel-smtp-transport.c:162
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Kryptering behövs för begärd autentiseringsmekanism"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:215
+#: ../camel/providers/smtp/camel-smtp-transport.c:164
 msgid "Temporary authentication failure"
 msgstr "Tillfälligt autentiseringsmisslyckande"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:296
-msgid "Welcome response error"
-msgstr "Fel i välkomstsvar"
+#: ../camel/providers/smtp/camel-smtp-transport.c:252
+#: ../camel/providers/smtp/camel-smtp-transport.c:258
+msgid "Welcome response error: "
+msgstr "Fel i välkomstsvar: "
 
+#: ../camel/providers/smtp/camel-smtp-transport.c:294
 #: ../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:338
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Misslyckades med att ansluta till SMTP-servern %s i säkert läge: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:340
-#, c-format
-msgid "STARTTLS command failed: %s"
-msgstr "STARTTLS-kommandot misslyckades: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:355
-msgid "STARTTLS command failed"
-msgstr "STARTTLS-kommandot misslyckades"
+#: ../camel/providers/smtp/camel-smtp-transport.c:302
+#: ../camel/providers/smtp/camel-smtp-transport.c:314
+#: ../camel/providers/smtp/camel-smtp-transport.c:320
+msgid "STARTTLS command failed: "
+msgstr "STARTTLS-kommandot misslyckades: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:496
+#: ../camel/providers/smtp/camel-smtp-transport.c:471
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP-servern %s stöder inte den begärda autentiseringstypen %s."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:567
+#: ../camel/providers/smtp/camel-smtp-transport.c:547
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4556,202 +4419,182 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:700
+#: ../camel/providers/smtp/camel-smtp-transport.c:685
 #, 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:687
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP-epostleverans via %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:720
+#: ../camel/providers/smtp/camel-smtp-transport.c:707
+#, c-format
 msgid "Cannot send message: service not connected."
 msgstr "Kan inte skicka meddelande: tjänsten är inte ansluten."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:726
+#: ../camel/providers/smtp/camel-smtp-transport.c:714
+#, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan inte skicka meddelande: avsändaradressen är inte giltig."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:730
+#: ../camel/providers/smtp/camel-smtp-transport.c:718
 msgid "Sending message"
 msgstr "Skickar meddelande"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:745
+#: ../camel/providers/smtp/camel-smtp-transport.c:734
+#, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan inte skicka meddelande: inga mottagare är angivna."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:756
+#: ../camel/providers/smtp/camel-smtp-transport.c:746
+#, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Kan inte skicka meddelande: en eller flera ogiltiga mottagare"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:985
+#: ../camel/providers/smtp/camel-smtp-transport.c:982
 msgid "SMTP Greeting"
 msgstr "SMTP-hälsning"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1010
-#, c-format
-msgid "HELO command failed: %s"
-msgstr "HELO-kommandot misslyckades: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1006
+#: ../camel/providers/smtp/camel-smtp-transport.c:1021
+#: ../camel/providers/smtp/camel-smtp-transport.c:1028
+msgid "HELO command failed: "
+msgstr "HELO-kommandot misslyckades: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1027
-msgid "HELO command failed"
-msgstr "HELO-kommandot misslyckades"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1093
+#: ../camel/providers/smtp/camel-smtp-transport.c:1095
 msgid "SMTP Authentication"
 msgstr "SMTP-autentisering"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1099
+#: ../camel/providers/smtp/camel-smtp-transport.c:1102
+#, c-format
 msgid "Error creating SASL authentication object."
 msgstr "Fel vid skapande av SASL-autentiseringsobjekt."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1116
-#: ../camel/providers/smtp/camel-smtp-transport.c:1127
-#, c-format
-msgid "AUTH command failed: %s"
-msgstr "AUTH-kommandot misslyckades: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1133
-msgid "AUTH command failed"
-msgstr "AUTH-kommandot misslyckades"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1203
-msgid "Bad authentication response from server.\n"
-msgstr "Felaktigt autentiseringssvar från servern.\n"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1230
-#, c-format
-msgid "MAIL FROM command failed: %s: mail not sent"
-msgstr "MAIL FROM-kommandot misslyckades: %s: brevet skickades inte"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1247
-msgid "MAIL FROM command failed"
-msgstr "MAIL FROM-kommandot misslyckades"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1271
-#, c-format
-msgid "RCPT TO command failed: %s: mail not sent"
-msgstr "RCPT TO-kommandot misslyckades: %s: brevet skickades inte"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1290
-#, c-format
-msgid "RCPT TO <%s> failed"
-msgstr "RCPT TO <%s> misslyckades"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1330
-#: ../camel/providers/smtp/camel-smtp-transport.c:1399
-#: ../camel/providers/smtp/camel-smtp-transport.c:1418
-#, c-format
-msgid "DATA command failed: %s: mail not sent"
-msgstr "DATA-kommandot misslyckades: %s: brevet skickades inte"
-
-#. 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
-msgid "DATA command failed"
-msgstr "DATA-kommandot misslyckades"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1457
-#, c-format
-msgid "RSET command failed: %s"
-msgstr "RSET-kommandot misslyckades: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1118
+#: ../camel/providers/smtp/camel-smtp-transport.c:1128
+#: ../camel/providers/smtp/camel-smtp-transport.c:1136
+msgid "AUTH command failed: "
+msgstr "AUTH-kommandot misslyckades: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1233
+#: ../camel/providers/smtp/camel-smtp-transport.c:1245
+#: ../camel/providers/smtp/camel-smtp-transport.c:1252
+msgid "MAIL FROM command failed: "
+msgstr "MAIL FROM-kommandot misslyckades: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1275
+msgid "RCPT TO command failed: "
+msgstr "RCPT TO-kommandot misslyckades: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1289
+#: ../camel/providers/smtp/camel-smtp-transport.c:1297
+#, c-format
+msgid "RCPT TO <%s> failed: "
+msgstr "RCPT TO <%s> misslyckades: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1335
+#: ../camel/providers/smtp/camel-smtp-transport.c:1344
+#: ../camel/providers/smtp/camel-smtp-transport.c:1354
+#: ../camel/providers/smtp/camel-smtp-transport.c:1411
+#: ../camel/providers/smtp/camel-smtp-transport.c:1427
+#: ../camel/providers/smtp/camel-smtp-transport.c:1438
+#: ../camel/providers/smtp/camel-smtp-transport.c:1445
+msgid "DATA command failed: "
+msgstr "DATA-kommandot misslyckades: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1467
+#: ../camel/providers/smtp/camel-smtp-transport.c:1479
+#: ../camel/providers/smtp/camel-smtp-transport.c:1486
+msgid "RSET command failed: "
+msgstr "RSET-kommandot misslyckades: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1508
+#: ../camel/providers/smtp/camel-smtp-transport.c:1521
+#: ../camel/providers/smtp/camel-smtp-transport.c:1527
+msgid "QUIT command failed: "
+msgstr "QUIT-kommandot misslyckades: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1473
-msgid "RSET command failed"
-msgstr "RSET-kommandot misslyckades"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1496
-#, c-format
-msgid "QUIT command failed: %s"
-msgstr "QUIT-kommandot misslyckades: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1510
-msgid "QUIT command failed"
-msgstr "QUIT-kommandot misslyckades"
-
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:46
 msgid "Business"
 msgstr "Företag"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:47
 msgid "Competition"
 msgstr "Konkurrent"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:48
 msgid "Favorites"
 msgstr "Favoriter"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:49
 msgid "Gifts"
 msgstr "GÃ¥vor"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:50
 msgid "Goals/Objectives"
 msgstr "MÃ¥l"
 
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:51
 msgid "Holiday"
 msgstr "Semester"
 
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:52
 msgid "Holiday Cards"
 msgstr "Semesterkort"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:54
 msgid "Hot Contacts"
 msgstr "Heta kontakter"
 
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:55
 msgid "Ideas"
 msgstr "Idéer"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:56
 msgid "International"
 msgstr "Internationellt"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:57
 msgid "Key Customer"
 msgstr "Nyckelkund"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:58
 msgid "Miscellaneous"
 msgstr "Diverse"
 
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:59
 msgid "Personal"
 msgstr "Personligt"
 
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:60
 msgid "Phone Calls"
 msgstr "Telefonsamtal"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:62
 msgid "Status"
 msgstr "Status"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:63
 msgid "Strategies"
 msgstr "Strategier"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:64
 msgid "Suppliers"
 msgstr "Underleverantörer"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:65
 msgid "Time & Expenses"
 msgstr "Tid och utgifter"
 
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:66
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:68
+#: ../libedataserver/e-categories.c:67
 msgid "Waiting"
 msgstr "Väntar"
 
@@ -4759,8 +4602,8 @@ msgstr "Väntar"
 #. 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 %Y-%m-%d %H.%M.%S"
 
@@ -4768,8 +4611,8 @@ msgstr "%a %Y-%m-%d %H.%M.%S"
 #. 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 %Y-%m-%d %H.%M.%S"
 
@@ -4777,8 +4620,8 @@ msgstr "%a %Y-%m-%d %H.%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 %Y-%m-%d %H.%M"
 
@@ -4786,83 +4629,83 @@ msgstr "%a %Y-%m-%d %H.%M"
 #. 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 %Y-%m-%d %H.%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 %Y-%m-%d %H"
 
 #. 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 %Y-%m-%d %H"
 
 #. 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 %Y-%m-%d"
 
 #. 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 "%Y-%m-%d %H.%M.%S"
 
 #. 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 "%Y-%m-%d %H.%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 "%Y-%m-%d %H.%M"
 
 #. 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 "%Y-%m-%d %H.%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 "%Y-%m-%d %H"
 
 #. 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 "%Y-%m-%d %H"
 
 #. 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 "%Y-%m-%d"
 
 #. 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 "%H.%M.%S"
 
 #. 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 "%H.%M.%S"
 
@@ -4870,34 +4713,34 @@ msgstr "%H.%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 "%H.%M"
 
 #. 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 "%H.%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 "%H%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 "%H"
 
-#: ../libedataserverui/e-book-auth-util.c:90
+#: ../libedataserverui/e-book-auth-util.c:93
 msgid "Accessing LDAP Server anonymously"
 msgstr "Kommer åt LDAP-server anonymt"
 
-#: ../libedataserverui/e-book-auth-util.c:192
+#: ../libedataserverui/e-book-auth-util.c:199
 msgid "Failed to authenticate.\n"
 msgstr "Misslyckades med autentisering.\n"
 
@@ -4935,8 +4778,8 @@ msgid "Category _Name"
 msgstr "Kategori_namn"
 
 #: ../libedataserverui/e-categories-dialog.ui.h:4
-msgid "Item(s) _belong to these categories:"
-msgstr "Objekt t_illhör dessa kategorier:"
+msgid "Currently _used categories:"
+msgstr "För närvarande an_vända kategorier:"
 
 #: ../libedataserverui/e-categories-dialog.ui.h:5
 msgid "_Available Categories:"
@@ -4955,27 +4798,19 @@ msgstr "kategorier"
 msgid "Create category \"%s\""
 msgstr "Skapa kategorin \"%s\""
 
-#: ../libedataserverui/e-cell-renderer-color.c:222
-msgid "Color Info"
-msgstr "Färginformation"
-
-#: ../libedataserverui/e-cell-renderer-color.c:223
-msgid "The color to render"
-msgstr "Färgen att rita ut"
-
-#: ../libedataserverui/e-name-selector-dialog.c:292
+#: ../libedataserverui/e-name-selector-dialog.c:319
 msgid "Select Contacts from Address Book"
 msgstr "Välj kontakter från adressboken"
 
-#: ../libedataserverui/e-name-selector-dialog.c:587
+#: ../libedataserverui/e-name-selector-dialog.c:658
 msgid "_Add"
 msgstr "_Lägg till"
 
-#: ../libedataserverui/e-name-selector-dialog.c:612
+#: ../libedataserverui/e-name-selector-dialog.c:662
 msgid "_Remove"
 msgstr "_Ta bort"
 
-#: ../libedataserverui/e-name-selector-dialog.c:789
+#: ../libedataserverui/e-name-selector-dialog.c:858
 #: ../libedataserverui/e-name-selector-dialog.ui.h:6
 msgid "Any Category"
 msgstr "Alla kategorier"
@@ -5017,58 +4852,58 @@ msgid "_Search:"
 msgstr "_Sök:"
 
 #. 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:2586
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "E_xpandera %s infogad"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2523
+#: ../libedataserverui/e-name-selector-entry.c:2601
 #, c-format
 msgid "Cop_y %s"
 msgstr "Kop_iera %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2533
+#: ../libedataserverui/e-name-selector-entry.c:2611
 #, c-format
 msgid "C_ut %s"
 msgstr "Klipp _ut %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2550
+#: ../libedataserverui/e-name-selector-entry.c:2628
 #, c-format
 msgid "_Edit %s"
 msgstr "_Redigera %s"
 
 # Translation validated against Outlook/Exchange in Swedish.
 #
-#: ../libedataserverui/e-name-selector-list.c:469
+#: ../libedataserverui/e-name-selector-list.c:517
 #, c-format
 msgid "_Delete %s"
 msgstr "_Ta bort %s"
 
-#: ../libedataserverui/e-passwords.c:234
+#: ../libedataserverui/e-passwords.c:257
 #, c-format
 msgid "Keyring key is unusable: no user or host name"
 msgstr "Nyckelringsnyckel är inte användbar: ingen användare eller värdnamn"
 
-#: ../libedataserverui/e-passwords.c:1093
+#: ../libedataserverui/e-passwords.c:1116
 msgid "You have the Caps Lock key on."
 msgstr "Du har Caps Lock-tangenten nedtryckt."
 
-#: ../libedataserverui/e-passwords.c:1215
+#: ../libedataserverui/e-passwords.c:1238
 msgid "_Remember this passphrase"
 msgstr "_Kom ihåg denna lösenfras"
 
-#: ../libedataserverui/e-passwords.c:1216
+#: ../libedataserverui/e-passwords.c:1239
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "_Kom ihåg denna lösenfras under resten av denna session"
 
-#: ../libedataserverui/e-passwords.c:1221
+#: ../libedataserverui/e-passwords.c:1244
 msgid "_Remember this password"
 msgstr "_Kom ihåg detta lösenord"
 
-#: ../libedataserverui/e-passwords.c:1222
+#: ../libedataserverui/e-passwords.c:1245
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Kom ihåg detta lösenord under resten av denna session"
 
@@ -5097,60 +4932,20 @@ msgstr "Inget svar från servern"
 msgid "Bad parameter"
 msgstr "Felaktig parameter"
 
-#~ msgid ""
-#~ "Experimental IMAP 4(.1) client\n"
-#~ "This is untested and unsupported code, you want to use plain imap "
-#~ "instead.\n"
-#~ "\n"
-#~ " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
-#~ msgstr ""
-#~ "Experimentell IMAP 4(.1)-klient\n"
-#~ "Detta är otestad kod som inte stöds. Du vill nog använda den vanlig imap\n"
-#~ "istället.\n"
-#~ " !!! ANVÃ?ND INTE DETTA FÃ?R SKARP E-POST  !!!\n"
-#~ msgid "Could not connect to POP server on %s"
-#~ msgstr "Kunde inte ansluta till POP-servern på %s"
-#~ msgid "%s: there was no self contact UID stored in gconf"
-#~ msgstr "%s: det finns inget självkontakt-uid lagrat i gconf"
-#~ msgid "This is a digitally signed message part"
-#~ msgstr "Detta är en digitalt signerad meddelandedel"
-#~ msgid "Kerberos 4"
-#~ msgstr "Kerberos 4"
-#~ msgid ""
-#~ "This option will connect to the server using Kerberos 4 authentication."
-#~ msgstr ""
-#~ "Detta alternativ kommer att ansluta till servern med Kerberos 4-"
-#~ "autentisering."
-#~ msgid ""
-#~ "Could not get Kerberos ticket:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Kunde inte få Kerberos-biljett:\n"
-#~ "%s"
-#~ msgid "Unable to get issuer's certificate"
-#~ msgstr "Kan inte hämta utfärdarens certifikat."
-#~ msgid "Unable to get Certificate Revocation List"
-#~ msgstr "Kan inte hämta certifikatspärrlista"
-#~ msgid "Unable to decrypt certificate signature"
-#~ msgstr "Kan inte dekryptera certifikatsignatur"
-#~ msgid "Unable to decrypt Certificate Revocation List signature"
-#~ msgstr "Kan inte dekryptera signatur för certifikatspärrlista"
-#~ msgid "Unable to decode issuer's public key"
-#~ msgstr "Kan inte avkoda utfärdarens publika nyckel"
-#~ msgid "Certificate signature failure"
-#~ msgstr "Certifikatsignaturfel"
-#~ msgid "Certificate Revocation List signature failure"
-#~ msgstr "Signaturfel i certifikatspärrlista"
-#~ msgid "Certificate not yet valid"
-#~ msgstr "Certifikatet är inte giltigt ännu"
-#~ msgid "Certificate has expired"
-#~ msgstr "Certifikatet har gått ut"
-#~ msgid "Certificate Revocation List (CRL) not yet valid"
-#~ msgstr "Certifikatspärrlistan (CRL) är ännu inte giltig"
-#~ msgid "Certificate Revocation List (CRL) has expired"
-#~ msgstr "Certifikatspärrlistan (CRL) har gått ut"
-#~ msgid "Error in Certificate Revocation List (CRL)"
-#~ msgstr "Fel i certifikatspärrlistan (CRL)"
-#~ msgid "Out of memory"
-#~ msgstr "Slut på minne"
+#~ msgid "Cannot complete operation"
+#~ msgstr "Kunde inte färdigställa åtgärden"
+#~ msgid "Could not create thread for getting deltas"
+#~ msgstr "Kunde inte skapa tråd för framtagning av deltan"
+#~ msgid "Offline mode unavailable"
+#~ msgstr "Frånkopplat läge är inte tillgängligt"
+#~ msgid "Cannot open message"
+#~ msgstr "Kan inte öppna meddelande"
+#~ msgid "Unsupported operation: append message: for %s"
+#~ msgstr "�tgärden stöds inte: lägg till meddelande: för %s"
+#~ msgid "Unsupported operation: search by expression: for %s"
+#~ msgstr "�tgärden stöds inte: sökning med uttryck: för %s"
+#~ msgid "Unsupported operation: count by expression: for %s"
+#~ msgstr "�tgärden stöds inte: räkning med uttryck: för %s"
+#~ msgid "Unsupported operation: search by UIDs: for %s"
+#~ msgstr "�tgärden stöds inte: sökning med uid: för %s"
 



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