[evolution-data-server] Updated Swedish translation

[Daniel Nylander <dnylande src gnome org>]

commit 7e87ade9986801f1fead3f48a84cc401cd6dad34
Author: Daniel Nylander <po danielnylander se>
Date:   Mon Aug 1 18:43:41 2011 +0200

    Updated Swedish translation

 po/sv.po | 1494 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 744 insertions(+), 750 deletions(-)
---
diff --git a/po/sv.po b/po/sv.po
index ce480f5..a9bcd8d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-01 09:44+0200\n"
-"PO-Revision-Date: 2011-07-01 09:54+0100\n"
+"POT-Creation-Date: 2011-08-01 18:32+0200\n"
+"PO-Revision-Date: 2011-08-01 18:43+0100\n"
 "Last-Translator: Daniel Nylander <po danielnylander se>\n"
 "Language-Team: Swedish <tp-sv listor tp-sv se>\n"
 "Language: sv\n"
@@ -21,12 +21,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:668
+#: ../addressbook/backends/file/e-book-backend-file.c:712
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
 msgid "Loading..."
 msgstr "LÃser in..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:671
+#: ../addressbook/backends/file/e-book-backend-file.c:715
 #: ../addressbook/backends/ldap/e-book-backend-ldap.c:4708
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
 msgid "Searching..."
@@ -40,7 +40,7 @@ msgstr "FrÃgar efter uppdaterade kontakter..."
 #: ../addressbook/backends/google/e-book-backend-google.c:672
 #: ../addressbook/libebook/e-book.c:3572
 #: ../calendar/libecal/e-cal.c:1331
-#: ../libedataserver/e-client.c:1777
+#: ../libedataserver/e-client.c:1779
 msgid "Personal"
 msgstr "Personligt"
 
@@ -129,15 +129,14 @@ msgstr "HÃmtar kontakter (%d)... "
 
 #: ../addressbook/backends/webdav/e-book-backend-webdav.c:274
 #: ../addressbook/backends/webdav/e-book-backend-webdav.c:880
-#: ../addressbook/libedata-book/e-data-book.c:440
+#: ../addressbook/libedata-book/e-data-book.c:442
 #: ../calendar/backends/caldav/e-cal-backend-caldav.c:519
 #: ../calendar/backends/caldav/e-cal-backend-caldav.c:548
 #: ../calendar/backends/http/e-cal-backend-http.c:422
 #: ../calendar/libecal/e-cal.c:4462
-#: ../camel/providers/imap/camel-imap-command.c:492
-#: ../camel/providers/imap/camel-imap-store.c:436
-#: ../camel/providers/pop3/camel-pop3-store.c:513
-#: ../camel/providers/smtp/camel-smtp-transport.c:526
+#: ../camel/providers/imap/camel-imap-command.c:484
+#: ../camel/providers/imap/camel-imap-store.c:385
+#: ../camel/providers/smtp/camel-smtp-transport.c:520
 msgid "Unknown error"
 msgstr "OkÃnt fel"
 
@@ -153,7 +152,7 @@ msgstr "%s: det finns ingen kÃlla fÃr UID \"%s\" lagrad i GConf."
 
 #: ../addressbook/libebook/e-book.c:3555
 #: ../calendar/libecal/e-cal.c:1311
-#: ../libedataserver/e-client.c:1772
+#: ../libedataserver/e-client.c:1774
 msgid "On This Computer"
 msgstr "PÃ denna dator"
 
@@ -164,10 +163,9 @@ msgid "Address book does not exist"
 msgstr "Adressboken finns inte"
 
 #: ../addressbook/libebook/e-book-client.c:85
-#, fuzzy
 msgctxt "BookClientError"
 msgid "No such book"
-msgstr "Det finns ingen mapp %s"
+msgstr "Det finns ingen sÃdan bok"
 
 #: ../addressbook/libebook/e-book-client.c:87
 msgctxt "BookClientError"
@@ -175,16 +173,14 @@ msgid "Contact not found"
 msgstr "Kontakten hittades inte"
 
 #: ../addressbook/libebook/e-book-client.c:89
-#, fuzzy
 msgctxt "BookClientError"
 msgid "Contact ID already exists"
 msgstr "Kontakt-id finns redan"
 
 #: ../addressbook/libebook/e-book-client.c:91
-#, fuzzy
 msgctxt "BookClientError"
 msgid "No such source"
-msgstr "Det finns inget sÃdant meddelande"
+msgstr "Det finns inget sÃdan kÃlla"
 
 #: ../addressbook/libebook/e-book-client.c:93
 msgctxt "BookClientError"
@@ -198,18 +194,17 @@ msgstr "OkÃnt fel"
 
 #: ../addressbook/libebook/e-book-client.c:168
 msgid "D-Bus book proxy gone"
-msgstr ""
+msgstr "D-Bus-bokproxy fÃrsvann"
 
 #: ../addressbook/libebook/e-book-client.c:429
-#, fuzzy
 msgid "Failed to run book factory"
-msgstr "Misslyckades med att koda data"
+msgstr "Misslyckades med att kÃra bokfabriken"
 
 #: ../addressbook/libebook/e-book-client.c:439
 #: ../addressbook/libedata-book/e-data-book-factory.c:371
 #: ../addressbook/libedata-book/e-data-book-factory.c:429
 #: ../calendar/libecal/e-cal-client.c:545
-#: ../calendar/libedata-cal/e-data-cal-factory.c:377
+#: ../calendar/libedata-cal/e-data-cal-factory.c:391
 #, c-format
 msgid "Invalid source"
 msgstr "Ogiltig kÃlla"
@@ -221,36 +216,34 @@ msgid "Incorrect uri '%s'"
 msgstr "Felaktig uri \"%s\""
 
 #: ../addressbook/libebook/e-book-client.c:577
-#, fuzzy
 msgid "Failed to find system book"
-msgstr "Misslyckades med meddelande %d"
+msgstr "Misslyckades med att hitta systemboken"
 
 #: ../addressbook/libebook/e-book-client.c:684
 #: ../calendar/libecal/e-cal-client.c:805
-#, fuzzy, c-format
+#, c-format
 msgid "There was no source for UID '%s' stored in a source list."
-msgstr "%s: det finns ingen kÃlla fÃr UID \"%s\" lagrad i GConf."
+msgstr "Det finns ingen kÃlla fÃr UID \"%s\" lagrad i en kÃllista."
 
 #: ../addressbook/libebook/e-book-client.c:2007
-#: ../calendar/libecal/e-cal-client.c:3580
-#, fuzzy
+#: ../calendar/libecal/e-cal-client.c:3612
 msgid "Cannot get connection to view"
-msgstr "Kan inte hÃmta kontaktlistan: %s"
+msgstr "Kan inte hÃmta anslutning att visa"
 
 #: ../addressbook/libebook/e-book-client-view.c:218
 #: ../calendar/libecal/e-cal-client-view.c:456
 msgid "Cannot start view, D-Bus proxy gone"
-msgstr ""
+msgstr "Kan inte starta vy, D-Bus-proxyn fÃrsvann"
 
 #: ../addressbook/libebook/e-book-client-view.c:247
 #: ../calendar/libecal/e-cal-client-view.c:485
 msgid "Cannot stop view, D-Bus proxy gone"
-msgstr ""
+msgstr "Kan inte stoppa vy, D-Bus-proxyn fÃrsvann"
 
 #: ../addressbook/libebook/e-book-client-view.c:288
 #: ../calendar/libecal/e-cal-client-view.c:526
 msgid "Cannot set fields of interest, D-Bus proxy gone"
-msgstr ""
+msgstr "Kan inte ange fÃlt av intresse, D-Bus-proxyn fÃrsvann"
 
 #. Dummy row as EContactField starts from 1
 #: ../addressbook/libebook/e-contact.c:116
@@ -790,51 +783,50 @@ msgstr "NamnlÃs lista"
 
 #: ../addressbook/libedata-book/e-book-backend.c:19
 msgid "Cannot process, book backend is opening"
-msgstr ""
+msgstr "Kan inte behandla. BokbakÃnden Ãppnar"
 
-#: ../addressbook/libedata-book/e-book-backend.c:91
-#, fuzzy, c-format
+#: ../addressbook/libedata-book/e-book-backend.c:92
+#, c-format
 msgid "Unknown book property '%s'"
-msgstr "OkÃnt fel: %s"
+msgstr "OkÃnd bokegenskap \"%s\""
 
-#: ../addressbook/libedata-book/e-book-backend.c:103
-#, fuzzy, c-format
+#: ../addressbook/libedata-book/e-book-backend.c:104
+#, c-format
 msgid "Cannot change value of book property '%s'"
-msgstr "Kan inte skapa mappen \"%s\": %s"
+msgstr "Kan inte Ãndra vÃrde fÃr bokegenskapen \"%s\""
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:355
-#: ../addressbook/libedata-book/e-data-book-factory.c:388
-#: ../calendar/libedata-cal/e-data-cal-factory.c:391
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:420
+#: ../camel/camel-db.c:470
 #, c-format
-msgid "Empty URI"
-msgstr "Tom URI"
+msgid "Insufficient memory"
+msgstr "Inte tillrÃckligt mycket minne"
 
 #. Translators: This is prefix to a detailed error message
 #: ../addressbook/libedata-book/e-data-book.c:196
 #: ../addressbook/libedata-book/e-data-book.c:209
-#: ../addressbook/libedata-book/e-data-book.c:692
+#: ../addressbook/libedata-book/e-data-book.c:694
 msgid "Invalid query: "
 msgstr "Ogiltig frÃgesats: "
 
 #: ../addressbook/libedata-book/e-data-book.c:299
-#: ../calendar/libedata-cal/e-data-cal.c:413
+#: ../calendar/libedata-cal/e-data-cal.c:414
 msgid "Success"
 msgstr "Lyckades"
 
 #: ../addressbook/libedata-book/e-data-book.c:300
 #: ../calendar/libecal/e-cal.c:4430
-#: ../calendar/libedata-cal/e-data-cal.c:414
+#: ../calendar/libedata-cal/e-data-cal.c:415
 msgid "Backend is busy"
 msgstr "BakÃnden Ãr upptagen"
 
 #: ../addressbook/libedata-book/e-data-book.c:301
-#: ../calendar/libedata-cal/e-data-cal.c:415
+#: ../calendar/libedata-cal/e-data-cal.c:416
 msgid "Repository offline"
 msgstr "Lagret Ãr frÃnkopplat"
 
 #: ../addressbook/libedata-book/e-data-book.c:302
 #: ../calendar/libecal/e-cal.c:4444
-#: ../calendar/libedata-cal/e-data-cal.c:416
+#: ../calendar/libedata-cal/e-data-cal.c:417
 msgid "Permission denied"
 msgstr "Ãtkomst nekas"
 
@@ -847,27 +839,27 @@ msgid "Contact ID already exists"
 msgstr "Kontakt-id finns redan"
 
 #: ../addressbook/libedata-book/e-data-book.c:305
-#: ../calendar/libedata-cal/e-data-cal.c:421
+#: ../calendar/libedata-cal/e-data-cal.c:422
 msgid "Authentication Failed"
 msgstr "Autentisering misslyckades"
 
 #: ../addressbook/libedata-book/e-data-book.c:306
-#: ../calendar/libedata-cal/e-data-cal.c:422
+#: ../calendar/libedata-cal/e-data-cal.c:423
 msgid "Authentication Required"
 msgstr "Autentisering krÃvs"
 
 #: ../addressbook/libedata-book/e-data-book.c:307
-#: ../calendar/libedata-cal/e-data-cal.c:423
+#: ../calendar/libedata-cal/e-data-cal.c:424
 msgid "Unsupported field"
 msgstr "FÃltet stÃds inte"
 
 #: ../addressbook/libedata-book/e-data-book.c:308
-#: ../calendar/libedata-cal/e-data-cal.c:425
+#: ../calendar/libedata-cal/e-data-cal.c:426
 msgid "Unsupported authentication method"
 msgstr "Autentiseringsmetoden stÃds inte"
 
 #: ../addressbook/libedata-book/e-data-book.c:309
-#: ../calendar/libedata-cal/e-data-cal.c:426
+#: ../calendar/libedata-cal/e-data-cal.c:427
 msgid "TLS not available"
 msgstr "TLS Ãr inte tillgÃngligt"
 
@@ -876,39 +868,39 @@ msgid "Book removed"
 msgstr "Boken togs bort"
 
 #: ../addressbook/libedata-book/e-data-book.c:312
-#: ../calendar/libedata-cal/e-data-cal.c:429
+#: ../calendar/libedata-cal/e-data-cal.c:430
 msgid "Not available in offline mode"
 msgstr "Inte tillgÃngligt i frÃnkopplat lÃge"
 
 #: ../addressbook/libedata-book/e-data-book.c:313
-#: ../calendar/libedata-cal/e-data-cal.c:430
+#: ../calendar/libedata-cal/e-data-cal.c:431
 msgid "Search size limit exceeded"
 msgstr "SÃkstorleksgrÃns Ãverskreds"
 
 #: ../addressbook/libedata-book/e-data-book.c:314
-#: ../calendar/libedata-cal/e-data-cal.c:431
+#: ../calendar/libedata-cal/e-data-cal.c:432
 msgid "Search time limit exceeded"
 msgstr "SÃktidsgrÃns Ãverskreds"
 
 #: ../addressbook/libedata-book/e-data-book.c:315
-#: ../calendar/libedata-cal/e-data-cal.c:432
+#: ../calendar/libedata-cal/e-data-cal.c:433
 msgid "Invalid query"
 msgstr "Ogiltig begÃran"
 
 #: ../addressbook/libedata-book/e-data-book.c:316
-#: ../calendar/libedata-cal/e-data-cal.c:433
+#: ../calendar/libedata-cal/e-data-cal.c:434
 msgid "Query refused"
 msgstr "BegÃran avvisades"
 
 #: ../addressbook/libedata-book/e-data-book.c:317
-#: ../calendar/libedata-cal/e-data-cal.c:434
+#: ../calendar/libedata-cal/e-data-cal.c:435
 msgid "Could not cancel"
 msgstr "Kunde inte avbryta"
 
 #. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
 #. { OtherError,			N_("Other error") },
 #: ../addressbook/libedata-book/e-data-book.c:319
-#: ../calendar/libedata-cal/e-data-cal.c:436
+#: ../calendar/libedata-cal/e-data-cal.c:437
 msgid "Invalid server version"
 msgstr "Ogiltig serverversion"
 
@@ -918,98 +910,106 @@ msgstr "Inget utrymme"
 
 #: ../addressbook/libedata-book/e-data-book.c:321
 #: ../calendar/libecal/e-cal.c:4428
-#: ../calendar/libedata-cal/e-data-cal.c:437
+#: ../calendar/libedata-cal/e-data-cal.c:438
 msgid "Invalid argument"
 msgstr "Ogiltigt argument"
 
 #. Translators: The string for NOT_SUPPORTED error
 #: ../addressbook/libedata-book/e-data-book.c:323
 #: ../calendar/libecal/e-cal.c:4467
-#: ../calendar/libedata-cal/e-data-cal.c:439
+#: ../calendar/libedata-cal/e-data-cal.c:440
 msgid "Not supported"
 msgstr "StÃds inte"
 
-#: ../addressbook/libedata-book/e-data-book.c:331
+#: ../addressbook/libedata-book/e-data-book.c:324
+#: ../calendar/libedata-cal/e-data-cal.c:441
+msgid "Backend is not opened yet"
+msgstr "BakÃnden Ãr inte Ãppnad Ãn"
+
+#: ../addressbook/libedata-book/e-data-book.c:332
 #: ../calendar/libecal/e-cal-client.c:553
-#: ../calendar/libedata-cal/e-data-cal.c:447
+#: ../calendar/libedata-cal/e-data-cal.c:449
 msgid "Other error"
 msgstr "Annat fel"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:534
-#: ../addressbook/libedata-book/e-data-book.c:864
+#: ../addressbook/libedata-book/e-data-book.c:536
+#: ../addressbook/libedata-book/e-data-book.c:866
 msgid "Cannot get contact: "
 msgstr "Kan inte hÃmta kontakt: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:556
-#: ../addressbook/libedata-book/e-data-book.c:578
+#: ../addressbook/libedata-book/e-data-book.c:558
+#: ../addressbook/libedata-book/e-data-book.c:580
 msgid "Empty query: "
 msgstr "Tom frÃgesats: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:600
-#: ../addressbook/libedata-book/e-data-book.c:930
+#: ../addressbook/libedata-book/e-data-book.c:602
+#: ../addressbook/libedata-book/e-data-book.c:932
 msgid "Cannot add contact: "
 msgstr "Kan inte lÃgga till kontakt: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:622
-#: ../addressbook/libedata-book/e-data-book.c:949
+#: ../addressbook/libedata-book/e-data-book.c:624
+#: ../addressbook/libedata-book/e-data-book.c:951
 msgid "Cannot modify contact: "
 msgstr "Kan inte Ãndra kontakt: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:715
-#: ../calendar/libedata-cal/e-data-cal.c:822
+#: ../addressbook/libedata-book/e-data-book.c:717
+#: ../calendar/libedata-cal/e-data-cal.c:824
 msgid "Cannot authenticate user: "
 msgstr "Kan inte autentisera anvÃndaren: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:777
+#: ../addressbook/libedata-book/e-data-book.c:779
 msgid "Cannot open book: "
 msgstr "Kan inte Ãppna bok: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:791
+#: ../addressbook/libedata-book/e-data-book.c:793
 msgid "Cannot remove book: "
 msgstr "Kan inte ta bort bok: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:816
+#: ../addressbook/libedata-book/e-data-book.c:818
 msgid "Cannot refresh address book: "
 msgstr "Kan inte uppdatera adressbok: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:832
-#, fuzzy
+#: ../addressbook/libedata-book/e-data-book.c:834
 msgid "Cannot get backend property: "
-msgstr "Kan inte skapa kalenderobjektet: %s"
+msgstr "Kan inte hÃmta bakÃndesegenskap: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:848
-#: ../calendar/libedata-cal/e-data-cal.c:999
-#, fuzzy
+#: ../addressbook/libedata-book/e-data-book.c:850
+#: ../calendar/libedata-cal/e-data-cal.c:1001
 msgid "Cannot set backend property: "
-msgstr "Kan inte skicka kalenderobjekt: %s"
+msgstr "Kan inte ange bakÃndesegenskap: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:879
-#, fuzzy
+#: ../addressbook/libedata-book/e-data-book.c:881
 msgid "Cannot get contact list: "
-msgstr "Kan inte hÃmta kontaktlistan: %s"
+msgstr "Kan inte hÃmta kontaktlistan: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:903
-#, fuzzy
+#: ../addressbook/libedata-book/e-data-book.c:905
 msgid "Cannot get contact list uids: "
-msgstr "Kan inte hÃmta kontaktlistan: %s"
+msgstr "Kan inte hÃmta UIDer fÃr kontaktlista: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:967
+#: ../addressbook/libedata-book/e-data-book.c:969
 msgid "Cannot remove contacts: "
 msgstr "Kan inte ta bort kontakter: "
 
+#: ../addressbook/libedata-book/e-data-book-factory.c:355
+#: ../addressbook/libedata-book/e-data-book-factory.c:388
+#: ../calendar/libedata-cal/e-data-cal-factory.c:406
+#, c-format
+msgid "Empty URI"
+msgstr "Tom URI"
+
 #: ../calendar/backends/caldav/e-cal-backend-caldav.c:517
 #, c-format
 msgid "Server is unreachable (%s)"
@@ -1119,6 +1119,87 @@ msgstr "VÃder: ÃskvÃder"
 msgid "Forecast"
 msgstr "Prognos"
 
+#: ../calendar/libecal/e-cal.c:860
+#: ../libedataserverui/e-book-auth-util.c:204
+#: ../libedataserverui/e-book-auth-util.c:427
+#: ../libedataserverui/e-client-utils.c:758
+#, c-format
+msgid "Enter password for %s (user %s)"
+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:874
+#, 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:4432
+msgid "Repository is offline"
+msgstr "Lagret Ãr frÃnkopplat"
+
+#: ../calendar/libecal/e-cal.c:4434
+msgid "No such calendar"
+msgstr "Det finns ingen sÃdan kalender"
+
+#: ../calendar/libecal/e-cal.c:4436
+#: ../calendar/libedata-cal/e-data-cal.c:419
+msgid "Object not found"
+msgstr "Objektet kunde inte hittas"
+
+#: ../calendar/libecal/e-cal.c:4438
+#: ../calendar/libedata-cal/e-data-cal.c:420
+msgid "Invalid object"
+msgstr "Ogiltigt objekt"
+
+#: ../calendar/libecal/e-cal.c:4440
+msgid "URI not loaded"
+msgstr "URI:n Ãr inte inlÃst"
+
+#: ../calendar/libecal/e-cal.c:4442
+msgid "URI already loaded"
+msgstr "URI:n Ãr redan inlÃst"
+
+#: ../calendar/libecal/e-cal.c:4446
+msgid "Unknown User"
+msgstr "OkÃnd anvÃndare"
+
+#: ../calendar/libecal/e-cal.c:4448
+#: ../calendar/libedata-cal/e-data-cal.c:421
+msgid "Object ID already exists"
+msgstr "Objektid finns redan"
+
+#: ../calendar/libecal/e-cal.c:4450
+msgid "Protocol not supported"
+msgstr "Protokollet stÃds inte"
+
+#: ../calendar/libecal/e-cal.c:4452
+msgid "Operation has been canceled"
+msgstr "ÃtgÃrden har avbrutits"
+
+#: ../calendar/libecal/e-cal.c:4454
+msgid "Could not cancel operation"
+msgstr "Kunde inte avbryta ÃtgÃrden"
+
+#: ../calendar/libecal/e-cal.c:4456
+msgid "Authentication failed"
+msgstr "Autentisering misslyckades"
+
+#: ../calendar/libecal/e-cal.c:4458
+#: ../camel/providers/smtp/camel-smtp-transport.c:864
+msgid "Authentication required"
+msgstr "Autentisering krÃvs"
+
+#: ../calendar/libecal/e-cal.c:4460
+msgid "A D-Bus exception has occurred"
+msgstr "Ett D-Bus-undantag har intrÃffat"
+
+#: ../calendar/libecal/e-cal.c:4464
+msgid "No error"
+msgstr "Inga fel"
+
 #: ../calendar/libecal/e-cal-client.c:127
 msgctxt "CalClientError"
 msgid "No such calendar"
@@ -1156,20 +1237,18 @@ msgstr "OkÃnt fel"
 
 #: ../calendar/libecal/e-cal-client.c:214
 msgid "D-Bus calendar proxy gone"
-msgstr ""
+msgstr "D-Bus-kalenderproxyn fÃrsvann"
 
 #: ../calendar/libecal/e-cal-client.c:535
-#, fuzzy
 msgid "Failed to run calendar factory"
-msgstr "Misslyckades med att koda data"
+msgstr "Misslyckades med att kÃra kalenderfabriken"
 
 #: ../calendar/libecal/e-cal-client.c:696
-#, fuzzy
 msgid "Failed to find system calendar"
-msgstr "Misslyckades med att koda data"
+msgstr "Misslyckades med att hitta systemkalendern"
 
 #: ../calendar/libecal/e-cal-client.c:734
-#: ../calendar/libedata-cal/e-data-cal.c:427
+#: ../calendar/libedata-cal/e-data-cal.c:428
 msgid "Calendar does not exist"
 msgstr "Kalendern finns inte"
 
@@ -1307,104 +1386,41 @@ msgstr "31:a"
 
 #: ../calendar/libecal/e-cal-util.c:677
 #: ../calendar/libecal/e-cal-util.c:704
+msgctxt "Priority"
 msgid "High"
 msgstr "HÃg"
 
 #: ../calendar/libecal/e-cal-util.c:679
 #: ../calendar/libecal/e-cal-util.c:706
+msgctxt "Priority"
 msgid "Normal"
 msgstr "Normal"
 
 #: ../calendar/libecal/e-cal-util.c:681
 #: ../calendar/libecal/e-cal-util.c:708
+msgctxt "Priority"
 msgid "Low"
 msgstr "LÃg"
 
 #. An empty string is the same as 'None'.
 #: ../calendar/libecal/e-cal-util.c:702
+msgctxt "Priority"
 msgid "Undefined"
 msgstr "Odefinierad"
 
-#: ../calendar/libecal/e-cal.c:860
-#: ../libedataserverui/e-book-auth-util.c:211
-#: ../libedataserverui/e-book-auth-util.c:445
-#: ../libedataserverui/e-client-utils.c:791
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "Ange lÃsenord fÃr %s (anvÃndare %s)"
+#: ../calendar/libedata-cal/e-cal-backend.c:34
+msgid "Cannot process, calendar backend is opening"
+msgstr "Kan inte behandla. KalenderbakÃnden Ãppnar"
 
-#.
-#. 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:874
+#: ../calendar/libedata-cal/e-cal-backend.c:207
 #, 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:4432
-msgid "Repository is offline"
-msgstr "Lagret Ãr frÃnkopplat"
-
-#: ../calendar/libecal/e-cal.c:4434
-msgid "No such calendar"
-msgstr "Det finns ingen sÃdan kalender"
-
-#: ../calendar/libecal/e-cal.c:4436
-#: ../calendar/libedata-cal/e-data-cal.c:418
-msgid "Object not found"
-msgstr "Objektet kunde inte hittas"
-
-#: ../calendar/libecal/e-cal.c:4438
-#: ../calendar/libedata-cal/e-data-cal.c:419
-msgid "Invalid object"
-msgstr "Ogiltigt objekt"
-
-#: ../calendar/libecal/e-cal.c:4440
-msgid "URI not loaded"
-msgstr "URI:n Ãr inte inlÃst"
-
-#: ../calendar/libecal/e-cal.c:4442
-msgid "URI already loaded"
-msgstr "URI:n Ãr redan inlÃst"
-
-#: ../calendar/libecal/e-cal.c:4446
-msgid "Unknown User"
-msgstr "OkÃnd anvÃndare"
-
-#: ../calendar/libecal/e-cal.c:4448
-#: ../calendar/libedata-cal/e-data-cal.c:420
-msgid "Object ID already exists"
-msgstr "Objektid finns redan"
-
-#: ../calendar/libecal/e-cal.c:4450
-msgid "Protocol not supported"
-msgstr "Protokollet stÃds inte"
-
-#: ../calendar/libecal/e-cal.c:4452
-msgid "Operation has been canceled"
-msgstr "ÃtgÃrden har avbrutits"
-
-#: ../calendar/libecal/e-cal.c:4454
-msgid "Could not cancel operation"
-msgstr "Kunde inte avbryta ÃtgÃrden"
-
-#: ../calendar/libecal/e-cal.c:4456
-msgid "Authentication failed"
-msgstr "Autentisering misslyckades"
-
-#: ../calendar/libecal/e-cal.c:4458
-#: ../camel/providers/smtp/camel-smtp-transport.c:802
-msgid "Authentication required"
-msgstr "Autentisering krÃvs"
-
-#: ../calendar/libecal/e-cal.c:4460
-msgid "A D-Bus exception has occurred"
-msgstr "Ett D-Bus-undantag har intrÃffat"
+msgid "Unknown calendar property '%s'"
+msgstr "OkÃnd kalenderegenskap \"%s\""
 
-#: ../calendar/libecal/e-cal.c:4464
-msgid "No error"
-msgstr "Inga fel"
+#: ../calendar/libedata-cal/e-cal-backend.c:219
+#, c-format
+msgid "Cannot change value of calendar property '%s'"
+msgstr "Kan inte Ãndra vÃrdet fÃr kalenderegenskapen \"%s\""
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:69
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
@@ -1491,142 +1507,119 @@ 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.c:34
-#, fuzzy
-msgid "Cannot process, calendar backend is opening"
-msgstr "Kan inte ta bort kalenderobjektet: %s"
-
-#: ../calendar/libedata-cal/e-cal-backend.c:206
-#, fuzzy, c-format
-msgid "Unknown calendar property '%s'"
-msgstr "OkÃnt fel: %s"
-
-#: ../calendar/libedata-cal/e-cal-backend.c:218
-#, fuzzy, c-format
-msgid "Cannot change value of calendar property '%s'"
-msgstr "Kan inte skapa kalenderobjektet: %s"
-
-#: ../calendar/libedata-cal/e-data-cal.c:417
+#: ../calendar/libedata-cal/e-data-cal.c:418
 msgid "Invalid range"
 msgstr "Ogiltigt intervall"
 
-#: ../calendar/libedata-cal/e-data-cal.c:424
+#: ../calendar/libedata-cal/e-data-cal.c:425
 msgid "Unsupported method"
 msgstr "Metoden stÃds inte"
 
-#: ../calendar/libedata-cal/e-data-cal.c:428
+#: ../calendar/libedata-cal/e-data-cal.c:429
 msgid "Unknown user"
 msgstr "OkÃnd anvÃndare"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:907
+#: ../calendar/libedata-cal/e-data-cal.c:909
 msgid "Cannot open calendar: "
 msgstr "Kan inte Ãppna kalender: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:928
+#: ../calendar/libedata-cal/e-data-cal.c:930
 msgid "Cannot remove calendar: "
 msgstr "Kan inte ta bort kalender: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:953
+#: ../calendar/libedata-cal/e-data-cal.c:955
 msgid "Cannot refresh calendar: "
 msgstr "Kan inte uppdatera kalender: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:977
-#, fuzzy
+#: ../calendar/libedata-cal/e-data-cal.c:979
 msgid "Cannot retrieve backend property: "
-msgstr "Kan inte hÃmta kalenderadress: %s"
+msgstr "Kan inte hÃmta bakÃndesegenskap: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1023
-#, fuzzy
+#: ../calendar/libedata-cal/e-data-cal.c:1025
 msgid "Cannot retrieve calendar object path: "
-msgstr "Kan inte hÃmta sÃkvÃg fÃr kalenderobjekt: %s"
+msgstr "Kan inte hÃmta sÃkvÃg fÃr kalenderobjekt: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1048
-#, fuzzy
+#: ../calendar/libedata-cal/e-data-cal.c:1050
 msgid "Cannot retrieve calendar object list: "
-msgstr "Kan inte hÃmta lista Ãver kalenderobjekt: %s"
+msgstr "Kan inte hÃmta lista Ãver kalenderobjekt: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1073
-#, fuzzy
+#: ../calendar/libedata-cal/e-data-cal.c:1075
 msgid "Cannot retrieve calendar free/busy list: "
-msgstr "Kan inte hÃmta ledig/upptagen-lista fÃr kalender: %s"
+msgstr "Kan inte hÃmta ledig/upptagen-lista fÃr kalender: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1099
+#: ../calendar/libedata-cal/e-data-cal.c:1101
 msgid "Cannot create calendar object: "
 msgstr "Kan inte skapa kalenderobjekt: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1126
+#: ../calendar/libedata-cal/e-data-cal.c:1128
 msgid "Cannot modify calendar object: "
 msgstr "Kan inte Ãndra kalenderobjekt: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1154
+#: ../calendar/libedata-cal/e-data-cal.c:1156
 msgid "Cannot remove calendar object: "
 msgstr "Kan inte ta bort kalenderobjekt: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1177
+#: ../calendar/libedata-cal/e-data-cal.c:1179
 msgid "Cannot receive calendar objects: "
 msgstr "Kan inte ta emot kalenderobjekt: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1202
+#: ../calendar/libedata-cal/e-data-cal.c:1204
 msgid "Cannot send calendar objects: "
 msgstr "Kan inte skicka kalenderobjekt: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1229
-#, fuzzy
+#: ../calendar/libedata-cal/e-data-cal.c:1231
 msgid "Could not retrieve attachment uris: "
-msgstr "Kunde inte hÃmta lista Ãver bilagor: %s"
+msgstr "Kunde inte hÃmta URIer fÃr bilagor: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1253
+#: ../calendar/libedata-cal/e-data-cal.c:1255
 msgid "Could not discard alarm: "
 msgstr "Kan inte fÃrkasta kalenderlarm: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1277
-#, fuzzy
+#: ../calendar/libedata-cal/e-data-cal.c:1279
 msgid "Could not get calendar view path: "
-msgstr "Kunde inte hÃmta tidszon fÃr kalender: %s"
+msgstr "Kunde inte hÃmta sÃkvÃg fÃr kalendervy: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1302
-#, fuzzy
+#: ../calendar/libedata-cal/e-data-cal.c:1304
 msgid "Could not retrieve calendar time zone: "
-msgstr "Kunde inte hÃmta tidszon fÃr kalender: %s"
+msgstr "Kunde inte hÃmta tidszon fÃr kalender: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1324
-#, fuzzy
+#: ../calendar/libedata-cal/e-data-cal.c:1326
 msgid "Could not add calendar time zone: "
-msgstr "Kunde inte lÃgga till tidszon fÃr kalender: %s"
+msgstr "Kunde inte lÃgga till tidszon fÃr kalender: "
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:366
+#: ../calendar/libedata-cal/e-data-cal-factory.c:379
 #, c-format
 msgid "Invalid call"
 msgstr "Ogiltigt anrop"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:404
+#: ../calendar/libedata-cal/e-data-cal-factory.c:420
 #, c-format
 msgid "Invalid URI"
 msgstr "Ogiltig URI"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:422
+#: ../calendar/libedata-cal/e-data-cal-factory.c:438
 #, 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:472
+#: ../calendar/libedata-cal/e-data-cal-factory.c:481
 #, c-format
 msgid "Could not instantiate backend"
 msgstr "Kunde inte instantifiera bakÃnde"
@@ -1683,16 +1676,6 @@ msgstr "Kan inte skapa cachesÃkvÃg"
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Kunde inte ta bort cacheposten: %s: %s"
 
-#: ../camel/camel-data-wrapper.c:143
-#, c-format
-msgid "No stream available"
-msgstr "Ingen strÃm tillgÃnglig"
-
-#: ../camel/camel-db.c:470
-#, c-format
-msgid "Insufficient memory"
-msgstr "Inte tillrÃckligt mycket minne"
-
 #: ../camel/camel-disco-diary.c:195
 #, c-format
 msgid ""
@@ -1736,10 +1719,10 @@ msgid "Copy folder content locally for offline operation"
 msgstr "Kopiera mappinnehÃll lokalt fÃr frÃnkopplad operation"
 
 #: ../camel/camel-disco-store.c:436
-#: ../camel/providers/imap/camel-imap-store.c:1192
-#: ../camel/providers/imap/camel-imap-store.c:1844
-#: ../camel/providers/imap/camel-imap-store.c:2327
-#: ../camel/providers/imap/camel-imap-store.c:3148
+#: ../camel/providers/imap/camel-imap-store.c:1179
+#: ../camel/providers/imap/camel-imap-store.c:1901
+#: ../camel/providers/imap/camel-imap-store.c:2384
+#: ../camel/providers/imap/camel-imap-store.c:3205
 #: ../camel/providers/imapx/camel-imapx-folder.c:298
 #: ../camel/providers/imapx/camel-imapx-folder.c:331
 #: ../camel/providers/imapx/camel-imapx-folder.c:385
@@ -1747,10 +1730,10 @@ msgstr "Kopiera mappinnehÃll lokalt fÃr frÃnkopplad operation"
 #: ../camel/providers/imapx/camel-imapx-folder.c:465
 #: ../camel/providers/imapx/camel-imapx-folder.c:505
 #: ../camel/providers/imapx/camel-imapx-folder.c:541
-#: ../camel/providers/imapx/camel-imapx-store.c:258
-#: ../camel/providers/imapx/camel-imapx-store.c:1276
+#: ../camel/providers/imapx/camel-imapx-store.c:348
 #: ../camel/providers/imapx/camel-imapx-store.c:1364
-#: ../camel/providers/imapx/camel-imapx-store.c:1404
+#: ../camel/providers/imapx/camel-imapx-store.c:1452
+#: ../camel/providers/imapx/camel-imapx-store.c:1492
 #, 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"
@@ -1766,65 +1749,65 @@ msgstr "Avbruten"
 msgid "Failed to create child process '%s': %s"
 msgstr "Misslyckades med att skapa barnprocessen \"%s\": %s"
 
-#: ../camel/camel-filter-driver.c:865
+#: ../camel/camel-filter-driver.c:866
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Ogiltig meddelandestrÃm mottagen frÃn %s: %s"
 
-#: ../camel/camel-filter-driver.c:1052
-#: ../camel/camel-filter-driver.c:1061
+#: ../camel/camel-filter-driver.c:1053
+#: ../camel/camel-filter-driver.c:1062
 msgid "Syncing folders"
 msgstr "Synkroniserar mappar"
 
-#: ../camel/camel-filter-driver.c:1149
-#: ../camel/camel-filter-driver.c:1593
+#: ../camel/camel-filter-driver.c:1150
+#: ../camel/camel-filter-driver.c:1594
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fel vid tolkning av filter: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1160
-#: ../camel/camel-filter-driver.c:1604
+#: ../camel/camel-filter-driver.c:1161
+#: ../camel/camel-filter-driver.c:1605
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fel vid kÃrning av filter: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1257
+#: ../camel/camel-filter-driver.c:1258
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "Kan inte Ãppna spool-mappen"
 
-#: ../camel/camel-filter-driver.c:1268
+#: ../camel/camel-filter-driver.c:1269
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "Kan inte bearbeta spool-mappen"
 
-#: ../camel/camel-filter-driver.c:1286
+#: ../camel/camel-filter-driver.c:1287
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "HÃmtar meddelande %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1293
-#: ../camel/camel-filter-driver.c:1315
+#: ../camel/camel-filter-driver.c:1294
+#: ../camel/camel-filter-driver.c:1316
 #, c-format
 msgid "Failed on message %d"
 msgstr "Misslyckades med meddelande %d"
 
-#: ../camel/camel-filter-driver.c:1330
-#: ../camel/camel-filter-driver.c:1431
+#: ../camel/camel-filter-driver.c:1331
+#: ../camel/camel-filter-driver.c:1432
 msgid "Syncing folder"
 msgstr "Synkroniserar mapp"
 
-#: ../camel/camel-filter-driver.c:1335
-#: ../camel/camel-filter-driver.c:1437
+#: ../camel/camel-filter-driver.c:1336
+#: ../camel/camel-filter-driver.c:1438
 msgid "Complete"
 msgstr "FÃrdigt"
 
-#: ../camel/camel-filter-driver.c:1395
+#: ../camel/camel-filter-driver.c:1396
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "HÃmtar meddelande %d av %d"
 
-#: ../camel/camel-filter-driver.c:1413
+#: ../camel/camel-filter-driver.c:1414
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Misslyckades vid meddelande %d av %d"
@@ -1841,12 +1824,57 @@ msgstr "Ogiltiga argument till (system-flag)"
 msgid "Invalid arguments to (user-tag)"
 msgstr "Ogiltiga argument till (user-tag)"
 
-#: ../camel/camel-filter-search.c:790
 #: ../camel/camel-filter-search.c:799
+#: ../camel/camel-filter-search.c:808
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Fel vid kÃrning av filtersÃkning: %s: %s"
 
+#: ../camel/camel-folder.c:243
+#, c-format
+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:283
+#, c-format
+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:331
+#, c-format
+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:898
+#: ../camel/providers/local/camel-maildir-folder.c:318
+msgid "Moving messages"
+msgstr "Flyttar meddelanden"
+
+#: ../camel/camel-folder.c:901
+msgid "Copying messages"
+msgstr "Kopierar meddelanden"
+
+#: ../camel/camel-folder.c:1156
+#, c-format
+msgid "Quota information not supported for folder '%s'"
+msgstr "Kvotinformation stÃds inte fÃr mappen \"%s\""
+
+#: ../camel/camel-folder.c:3265
+#, c-format
+msgid "Retrieving message '%s' in %s"
+msgstr "HÃmtar meddelande \"%s\" i %s"
+
+#: ../camel/camel-folder.c:3389
+#, c-format
+msgid "Retrieving quota information for '%s'"
+msgstr "HÃmtar kvotinformation fÃr \"%s\""
+
 #: ../camel/camel-folder-search.c:345
 #: ../camel/camel-folder-search.c:456
 #: ../camel/camel-folder-search.c:627
@@ -1871,86 +1899,46 @@ msgstr ""
 
 # Detta krÃver nog en fÃrklaring.
 # http://bugzilla.ximian.com/show_bug.cgi?id=61084
-#: ../camel/camel-folder-search.c:843
-#: ../camel/camel-folder-search.c:885
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:844
+#: ../camel/camel-folder-search.c:887
 #, 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:938
+#. Translators: Each '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:941
 #, 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:944
-#: ../camel/camel-folder-search.c:951
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:948
+#: ../camel/camel-folder-search.c:956
 #, 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:978
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:984
 #, 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:987
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:994
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) krÃver att mappen Ãr instÃlld"
 
-#: ../camel/camel-folder.c:236
-#, c-format
-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:271
-#, c-format
-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:312
-#, c-format
-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:870
-#: ../camel/providers/local/camel-maildir-folder.c:318
-msgid "Moving messages"
-msgstr "Flyttar meddelanden"
-
-#: ../camel/camel-folder.c:873
-msgid "Copying messages"
-msgstr "Kopierar meddelanden"
-
-#: ../camel/camel-folder.c:1128
-#, c-format
-msgid "Quota information not supported for folder '%s'"
-msgstr ""
-
-#: ../camel/camel-folder.c:3235
-#, c-format
-msgid "Retrieving message '%s' in %s"
-msgstr "HÃmtar meddelande \"%s\" i %s"
-
-#: ../camel/camel-folder.c:3359
-#, fuzzy, c-format
-msgid "Retrieving quota information for '%s'"
-msgstr "HÃmtar sammandragsinformation fÃr nya meddelanden i %s"
-
 #: ../camel/camel-gpg-context.c:642
 #: ../camel/camel-gpg-context.c:647
 #: ../camel/camel-gpg-context.c:1272
@@ -1959,8 +1947,7 @@ msgid "Failed to execute gpg: %s"
 msgstr "Misslyckades med att kÃra gpg: %s"
 
 #: ../camel/camel-gpg-context.c:647
-#: ../camel/providers/smtp/camel-smtp-transport.c:750
-#: ../camel/providers/smtp/camel-smtp-transport.c:805
+#: ../camel/providers/smtp/camel-smtp-transport.c:867
 msgid "Unknown"
 msgstr "OkÃnd"
 
@@ -2012,15 +1999,11 @@ msgstr "OvÃntad begÃran frÃn GnuPG fÃr \"%s\""
 #: ../camel/camel-gpg-context.c:828
 #: ../camel/camel-net-utils.c:515
 #: ../camel/camel-tcp-stream-raw.c:255
-#: ../camel/providers/imapx/camel-imapx-server.c:5010
-#: ../camel/providers/imapx/camel-imapx-server.c:5027
-#: ../camel/providers/imapx/camel-imapx-store.c:179
+#: ../camel/providers/imapx/camel-imapx-server.c:4981
+#: ../camel/providers/imapx/camel-imapx-server.c:4998
+#: ../camel/providers/imapx/camel-imapx-store.c:269
 #: ../camel/providers/nntp/camel-nntp-summary.c:409
-#: ../camel/providers/pop3/camel-pop3-folder.c:371
-#: ../camel/providers/pop3/camel-pop3-folder.c:436
-#: ../camel/providers/pop3/camel-pop3-folder.c:513
-#: ../camel/providers/pop3/camel-pop3-store.c:505
-#: ../libedataserverui/e-book-auth-util.c:234
+#: ../libedataserverui/e-book-auth-util.c:227
 #, c-format
 msgid "Cancelled"
 msgstr "Avbruten"
@@ -2045,75 +2028,59 @@ msgstr "Misslyckades med att kryptera: inga giltiga mottagare angivna."
 msgid "Could not generate signing data: "
 msgstr "Kunde inte generera signeringsdata: "
 
-#: ../camel/camel-gpg-context.c:1582
-#: ../camel/camel-gpg-context.c:1782
-#: ../camel/camel-gpg-context.c:1892
-#: ../camel/camel-gpg-context.c:2038
-#: ../camel/camel-gpg-context.c:2137
-#: ../camel/camel-gpg-context.c:2185
+#: ../camel/camel-gpg-context.c:1584
+#: ../camel/camel-gpg-context.c:1788
+#: ../camel/camel-gpg-context.c:1898
+#: ../camel/camel-gpg-context.c:2045
+#: ../camel/camel-gpg-context.c:2145
+#: ../camel/camel-gpg-context.c:2193
 msgid "Failed to execute gpg."
 msgstr "Misslyckades med att kÃra gpg."
 
-#: ../camel/camel-gpg-context.c:1662
-#: ../camel/camel-gpg-context.c:1670
-#: ../camel/camel-gpg-context.c:1678
-#: ../camel/camel-gpg-context.c:1697
-#: ../camel/camel-smime-context.c:948
-#: ../camel/camel-smime-context.c:962
-#: ../camel/camel-smime-context.c:971
+#: ../camel/camel-gpg-context.c:1663
+#: ../camel/camel-gpg-context.c:1671
+#: ../camel/camel-gpg-context.c:1679
+#: ../camel/camel-gpg-context.c:1699
+#: ../camel/camel-smime-context.c:950
+#: ../camel/camel-smime-context.c:964
+#: ../camel/camel-smime-context.c:973
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Kan inte verifiera meddelandesignatur: Felaktigt meddelandeformat"
 
-#: ../camel/camel-gpg-context.c:1737
+#: ../camel/camel-gpg-context.c:1741
 msgid "Cannot verify message signature: "
 msgstr "Kan inte verifiera meddelandesignatur: "
 
-#: ../camel/camel-gpg-context.c:1858
+#: ../camel/camel-gpg-context.c:1864
 msgid "Could not generate encrypting data: "
 msgstr "Kunde inte generera krypteringsdata: "
 
-#: ../camel/camel-gpg-context.c:1911
+#: ../camel/camel-gpg-context.c:1917
 msgid "This is a digitally encrypted message part"
 msgstr "Detta Ãr en digitalt signerad meddelandedel"
 
-#: ../camel/camel-gpg-context.c:1969
-#: ../camel/camel-gpg-context.c:1978
-#: ../camel/camel-gpg-context.c:2001
+#: ../camel/camel-gpg-context.c:1975
+#: ../camel/camel-gpg-context.c:1984
+#: ../camel/camel-gpg-context.c:2007
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "Kan inte dekryptera meddelande: Felaktigt meddelandeformat"
 
-#: ../camel/camel-gpg-context.c:1989
+#: ../camel/camel-gpg-context.c:1995
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Misslyckades med att dekryptera MIME-del: protokollfel"
 
-#: ../camel/camel-gpg-context.c:2078
-#: ../camel/camel-smime-context.c:1255
+#: ../camel/camel-gpg-context.c:2086
+#: ../camel/camel-smime-context.c:1261
 msgid "Encrypted content"
 msgstr "Krypterat innehÃll"
 
-#: ../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:130
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Kan inte grena lÃsande hjÃlpprogram: %s"
-
-#: ../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:227
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Kunde inte lÃsa \"%s\""
+#: ../camel/camel-http-stream.c:546
+#: ../camel/camel-stream-null.c:78
+msgid "Only reset to beginning is supported with CamelHttpStream"
+msgstr "ÃterstÃll endast till bÃrjan stÃds med CamelHttpStream"
 
 #: ../camel/camel-lock.c:102
 #, c-format
@@ -2135,6 +2102,27 @@ msgstr "Misslyckades med att fà lÃs med fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Misslyckades med att fà lÃs med flock(2): %s"
 
+#: ../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:130
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Kan inte grena lÃsande hjÃlpprogram: %s"
+
+#: ../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:227
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Kunde inte lÃsa \"%s\""
+
 #: ../camel/camel-movemail.c:105
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -2190,21 +2178,35 @@ msgstr "Fel vid skrivande av temporÃr brevlÃdefil: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Fel vid kopierande av temporÃr brevfil: %s"
 
-#: ../camel/camel-multipart-signed.c:327
+#: ../camel/camel-multipart-signed.c:296
 #, c-format
 msgid "No content available"
 msgstr "InnehÃll saknas"
 
-#: ../camel/camel-multipart-signed.c:335
+#: ../camel/camel-multipart-signed.c:304
 #, c-format
 msgid "No signature available"
 msgstr "Ingen signatur tillgÃnglig"
 
-#: ../camel/camel-multipart-signed.c:663
+#: ../camel/camel-multipart-signed.c:688
 #, c-format
 msgid "parse error"
 msgstr "tolkningsfel"
 
+#: ../camel/camel-network-service.c:91
+#, c-format
+msgid "Could not connect to %s: %s"
+msgstr "Kunde inte ansluta till %s: %s"
+
+#: ../camel/camel-network-service.c:92
+msgid "SSL unavailable"
+msgstr "SSL Ãr inte tillgÃngligt"
+
+#: ../camel/camel-network-service.c:115
+#, c-format
+msgid "Could not connect to %s: "
+msgstr "Kunde inte ansluta till %s: "
+
 #: ../camel/camel-net-utils.c:695
 #, c-format
 msgid "Resolving: %s"
@@ -2267,7 +2269,7 @@ 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:391
-#: ../camel/camel-session.c:332
+#: ../camel/camel-session.c:351
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "Det finns ingen leverantÃr fÃr protokollet \"%s\""
@@ -2410,7 +2412,7 @@ msgstr "De refererade kreditiven har gÃtt ut."
 #: ../camel/camel-sasl-gssapi.c:312
 #: ../camel/camel-sasl-gssapi.c:356
 #: ../camel/camel-sasl-gssapi.c:373
-#: ../camel/providers/smtp/camel-smtp-transport.c:1281
+#: ../camel/providers/smtp/camel-smtp-transport.c:1336
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "Felaktigt autentiseringssvar frÃn servern."
@@ -2455,9 +2457,8 @@ 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:80
-#, fuzzy
 msgid "POP Source UID"
-msgstr "URI fÃr POP-kÃlla"
+msgstr "UID fÃr POP-kÃlla"
 
 #: ../camel/camel-sasl-popb4smtp.c:92
 #, c-format
@@ -2466,42 +2467,42 @@ msgstr "POP innan SMTP-autentisering med en okÃnd transport"
 
 #: ../camel/camel-sasl-popb4smtp.c:104
 #: ../camel/camel-sasl-popb4smtp.c:114
-#, fuzzy, c-format
+#, c-format
 msgid "POP Before SMTP authentication attempted with a %s service"
-msgstr "POP innan SMTP-autentisering med en icke-POP-kÃlla"
+msgstr "POP innan SMTP-autentisering fÃrsÃktes med en %s-tjÃnst"
 
 #: ../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:487
+#: ../camel/camel-service.c:492
 #, c-format
 msgid "URL '%s' needs a user component"
 msgstr "URL:en \"%s\" behÃver en anvÃndarkomponent"
 
-#: ../camel/camel-service.c:498
+#: ../camel/camel-service.c:503
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL:en \"%s\" behÃver ett vÃrdnamn"
 
-#: ../camel/camel-service.c:509
+#: ../camel/camel-service.c:514
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL:en \"%s\" behÃver en sÃkvÃg"
 
-#: ../camel/camel-session.c:342
+#: ../camel/camel-session.c:361
 #, c-format
 msgid "Invalid GType registered for protocol '%s'"
 msgstr "Ogiltig GType registrerad fÃr protokollet \"%s\""
 
-#: ../camel/camel-session.c:856
+#: ../camel/camel-session.c:907
 #, 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-smime-context.c:344
-#: ../camel/camel-smime-context.c:1048
+#: ../camel/camel-smime-context.c:1050
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "Kan inte hitta certifikat fÃr \"%s\""
@@ -2665,7 +2666,7 @@ msgid "Signer: %s <%s>: %s\n"
 msgstr "Signerare: %s <%s>: %s\n"
 
 #: ../camel/camel-smime-context.c:835
-#: ../camel/camel-smime-context.c:1121
+#: ../camel/camel-smime-context.c:1123
 msgid "Cannot create encoder context"
 msgstr "Kan inte skapa kodarsammanhang"
 
@@ -2674,116 +2675,130 @@ msgid "Failed to add data to CMS encoder"
 msgstr "Misslyckades med att lÃgga till data till CMS-kodare"
 
 #: ../camel/camel-smime-context.c:846
-#: ../camel/camel-smime-context.c:1138
+#: ../camel/camel-smime-context.c:1140
 msgid "Failed to encode data"
 msgstr "Misslyckades med att koda data"
 
-#: ../camel/camel-smime-context.c:987
-#: ../camel/camel-smime-context.c:1233
+#: ../camel/camel-smime-context.c:989
+#: ../camel/camel-smime-context.c:1236
 msgid "Decoder failed"
 msgstr "Avkodaren misslyckades"
 
-#: ../camel/camel-smime-context.c:1056
+#: ../camel/camel-smime-context.c:1058
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "Kan inte hitta gemensam algoritm fÃr bulkkryptering"
 
-#: ../camel/camel-smime-context.c:1064
+#: ../camel/camel-smime-context.c:1066
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Kan inte allokera plats fÃr bulknyckel fÃr kryptering"
 
-#: ../camel/camel-smime-context.c:1075
+#: ../camel/camel-smime-context.c:1077
 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:1081
+#: ../camel/camel-smime-context.c:1083
 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:1087
+#: ../camel/camel-smime-context.c:1089
 msgid "Cannot attach CMS Enveloped data"
 msgstr "Kan inte bifoga CMS-kuverterade data"
 
-#: ../camel/camel-smime-context.c:1093
+#: ../camel/camel-smime-context.c:1095
 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:1102
+#: ../camel/camel-smime-context.c:1104
 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:1107
+#: ../camel/camel-smime-context.c:1109
 msgid "Cannot add CMS Recipient information"
 msgstr "Kan inte lÃgga till CMS-mottagarinformation"
 
-#: ../camel/camel-smime-context.c:1132
+#: ../camel/camel-smime-context.c:1134
 msgid "Failed to add data to encoder"
 msgstr "Misslyckades med att lÃgga till data till kodare"
 
-#: ../camel/camel-smime-context.c:1240
+#: ../camel/camel-smime-context.c:1243
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME-dekryptering: Inget krypterat innehÃll hittades"
 
-#: ../camel/camel-store.c:2087
+#: ../camel/camel-store.c:2084
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "Kan inte skapa mappen \"%s\": mappen finns redan"
 
-#: ../camel/camel-store.c:2131
+#: ../camel/camel-store.c:2127
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "Ãppnar mappen \"%s\""
 
-#: ../camel/camel-store.c:2320
+#: ../camel/camel-store.c:2314
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "SÃker igenom mappar i \"%s\""
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:2332
-#: ../camel/camel-store.c:2342
+#: ../camel/camel-store.c:2326
+#: ../camel/camel-store.c:2336
 #: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "Papperskorg"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:2335
-#: ../camel/camel-store.c:2346
+#: ../camel/camel-store.c:2329
+#: ../camel/camel-store.c:2340
 #: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "SkrÃppost"
 
-#: ../camel/camel-store.c:2797
+#: ../camel/camel-store.c:2791
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Kan inte skapa mapp: %s: mappen finns redan"
 
-#: ../camel/camel-store.c:2811
+#: ../camel/camel-store.c:2805
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "Skapar mappen \"%s\""
 
-#: ../camel/camel-store.c:2929
-#: ../camel/camel-vee-store.c:346
+#: ../camel/camel-store.c:2923
+#: ../camel/camel-vee-store.c:350
 #: ../camel/providers/local/camel-maildir-store.c:272
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kan inte ta bort mapp: %s: Ogiltig ÃtgÃrd"
 
-#: ../camel/camel-store.c:3072
-#: ../camel/camel-vee-store.c:396
+#: ../camel/camel-store.c:3066
+#: ../camel/camel-vee-store.c:400
 #: ../camel/providers/local/camel-maildir-store.c:704
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kan inte byta namn pà mapp: %s: Ogiltig ÃtgÃrd"
 
+#: ../camel/camel-stream-filter.c:327
+msgid "Only reset to beginning is supported with CamelStreamFilter"
+msgstr "ÃterstÃll endast till bÃrjan stÃds med CamelStreamFilter"
+
+#: ../camel/camel-stream-process.c:265
+#, c-format
+msgid "Connection cancelled"
+msgstr "Anslutning avbruten"
+
+#: ../camel/camel-stream-process.c:270
+#, c-format
+msgid "Could not connect with command \"%s\": %s"
+msgstr "Kunde inte ansluta med kommandot \"%s\": %s"
+
 #: ../camel/camel-tcp-stream-raw.c:749
 #: ../camel/camel-tcp-stream-raw.c:760
 #, c-format
@@ -2959,18 +2974,18 @@ msgstr "Det finns inget sÃdant meddelande %s i %s"
 msgid "Error storing '%s': "
 msgstr "Fel vid lagring av \"%s\": "
 
-#: ../camel/camel-vee-store.c:125
-#: ../camel/camel-vee-store.c:130
-#: ../camel/camel-vee-store.c:297
+#. Translators: 'Unmatched' is a folder name under Search folders where are shown
+#. all messages not belonging into any other configured search folder
+#: ../camel/camel-vee-store.c:37
 msgid "Unmatched"
 msgstr "Omatchade"
 
-#: ../camel/camel-vee-store.c:372
+#: ../camel/camel-vee-store.c:376
 #, 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:406
+#: ../camel/camel-vee-store.c:410
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kan inte byta namn pà mapp: %s: Det finns ingen sÃdan mapp"
@@ -2983,29 +2998,24 @@ msgstr "Kan inte kopiera meddelanden till papperskorgsmappen"
 msgid "Cannot copy messages to the Junk folder"
 msgstr "Kan inte kopiera meddelanden till skrÃppostmappen"
 
-#: ../camel/providers/imap/camel-imap-command.c:197
-#: ../camel/providers/imap/camel-imap-command.c:301
+#: ../camel/providers/imap/camel-imap-command.c:198
+#: ../camel/providers/imap/camel-imap-command.c:293
 #, c-format
 msgid "No output stream"
 msgstr "Ingen utmatningsstrÃm"
 
-#: ../camel/providers/imap/camel-imap-command.c:205
-#: ../camel/providers/imap/camel-imap-command.c:309
+#: ../camel/providers/imap/camel-imap-command.c:206
+#: ../camel/providers/imap/camel-imap-command.c:301
 #, c-format
 msgid "No input stream"
 msgstr "Ingen inmatningsstrÃm"
 
-#: ../camel/providers/imap/camel-imap-command.c:255
-#, c-format
-msgid "Operation cancelled"
-msgstr "ÃtgÃrden avbruten"
-
-#: ../camel/providers/imap/camel-imap-command.c:373
+#: ../camel/providers/imap/camel-imap-command.c:365
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Servern kopplade ifrÃn ovÃntat: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:403
+#: ../camel/providers/imap/camel-imap-command.c:395
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -3014,27 +3024,27 @@ msgstr ""
 "Varning frÃn IMAP-servern %s %s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:479
+#: ../camel/providers/imap/camel-imap-command.c:471
 #, 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:491
+#: ../camel/providers/imap/camel-imap-command.c:483
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-kommandot misslyckades: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:571
+#: ../camel/providers/imap/camel-imap-command.c:563
 #, c-format
 msgid "Server response ended too soon."
 msgstr "Serversvaret tog slut fÃr tidigt."
 
-#: ../camel/providers/imap/camel-imap-command.c:782
+#: ../camel/providers/imap/camel-imap-command.c:774
 #, 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:820
+#: ../camel/providers/imap/camel-imap-command.c:812
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "OvÃntat OK-svar frÃn IMAP-servern: %s"
@@ -3054,7 +3064,7 @@ msgid "Could not load summary for %s"
 msgstr "Kunde inte lÃsa in sammandrag fÃr %s"
 
 #: ../camel/providers/imap/camel-imap-folder.c:995
-#: ../camel/providers/imapx/camel-imapx-server.c:4013
+#: ../camel/providers/imapx/camel-imapx-server.c:3984
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "Letar efter Ãndrade meddelanden i %s"
@@ -3064,27 +3074,27 @@ msgid "Unable to retrieve message: "
 msgstr "Kan inte hÃmta meddelande: "
 
 #: ../camel/providers/imap/camel-imap-folder.c:3415
-#: ../camel/providers/imapx/camel-imapx-server.c:5343
+#: ../camel/providers/imapx/camel-imapx-server.c:5319
 #, 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:3416
-#: ../camel/providers/imapx/camel-imapx-server.c:5344
+#: ../camel/providers/imapx/camel-imapx-server.c:5320
 msgid "No such message available."
 msgstr "Det finns inget sÃdant meddelande."
 
 #: ../camel/providers/imap/camel-imap-folder.c:3491
 #: ../camel/providers/imap/camel-imap-folder.c:4391
-#: ../camel/providers/nntp/camel-nntp-folder.c:402
+#: ../camel/providers/nntp/camel-nntp-folder.c:407
 #, 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:3975
 #: ../camel/providers/imap/camel-imap-folder.c:4058
-#: ../camel/providers/imapx/camel-imapx-server.c:3969
-#: ../camel/providers/imapx/camel-imapx-server.c:4111
+#: ../camel/providers/imapx/camel-imapx-server.c:3940
+#: ../camel/providers/imapx/camel-imapx-server.c:4082
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "HÃmtar sammandragsinformation fÃr nya meddelanden i %s"
@@ -3119,7 +3129,7 @@ msgstr "Misslyckades med att mellanlagra meddelande %s: %s"
 msgid "Failed to cache message %s: "
 msgstr "Misslyckades med att mellanlagra meddelande %s: "
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:529
+#: ../camel/providers/imap/camel-imap-message-cache.c:531
 #, c-format
 msgid "Failed to cache %s: "
 msgstr "Misslyckades med att mellanlagra %s: "
@@ -3232,92 +3242,58 @@ msgstr "LÃsenord"
 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:255
-#: ../camel/providers/nntp/camel-nntp-store.c:360
-#: ../camel/providers/pop3/camel-pop3-store.c:139
-#: ../camel/providers/smtp/camel-smtp-transport.c:155
-#, c-format
-msgid "Could not connect to %s: %s"
-msgstr "Kunde inte ansluta till %s: %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:256
-#: ../camel/providers/nntp/camel-nntp-store.c:361
-#: ../camel/providers/pop3/camel-pop3-store.c:140
-#: ../camel/providers/smtp/camel-smtp-transport.c:156
-msgid "SSL unavailable"
-msgstr "SSL Ãr inte tillgÃngligt"
-
-#: ../camel/providers/imap/camel-imap-store.c:275
-#: ../camel/providers/nntp/camel-nntp-store.c:379
-#, c-format
-msgid "Could not connect to %s: "
-msgstr "Kunde inte ansluta till %s: "
-
-#: ../camel/providers/imap/camel-imap-store.c:381
-#: ../camel/providers/imap/camel-imap-store.c:401
-#: ../camel/providers/imap/camel-imap-store.c:408
-#: ../camel/providers/imap/camel-imap-store.c:435
-#: ../camel/providers/imapx/camel-imapx-server.c:2989
-#: ../camel/providers/imapx/camel-imapx-server.c:3029
+#: ../camel/providers/imap/camel-imap-store.c:330
+#: ../camel/providers/imap/camel-imap-store.c:357
+#: ../camel/providers/imap/camel-imap-store.c:384
+#: ../camel/providers/imapx/camel-imapx-server.c:2964
 #, 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:382
-#: ../camel/providers/imapx/camel-imapx-server.c:2990
-#: ../camel/providers/smtp/camel-smtp-transport.c:241
+#: ../camel/providers/imap/camel-imap-store.c:331
+#: ../camel/providers/imapx/camel-imapx-server.c:2965
+#: ../camel/providers/smtp/camel-smtp-transport.c:198
 msgid "STARTTLS not supported"
 msgstr "STARTTLS stÃds inte"
 
-#: ../camel/providers/imap/camel-imap-store.c:402
-#: ../camel/providers/imapx/camel-imapx-server.c:3030
-msgid "SSL negotiations failed"
-msgstr "SSL-fÃrhandlingar misslyckades"
+#: ../camel/providers/imap/camel-imap-store.c:350
+#: ../camel/providers/imapx/camel-imapx-server.c:3003
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: "
+msgstr "Misslyckades med att ansluta till IMAP-servern %s i sÃkert lÃge: "
 
-#: ../camel/providers/imap/camel-imap-store.c:409
-#: ../camel/providers/smtp/camel-smtp-transport.c:288
+#: ../camel/providers/imap/camel-imap-store.c:358
+#: ../camel/providers/smtp/camel-smtp-transport.c:244
 msgid "SSL is not available in this build"
 msgstr "SSL Ãr inte tillgÃngligt i detta bygge"
 
-#: ../camel/providers/imap/camel-imap-store.c:563
-#: ../camel/providers/imapx/camel-imapx-server.c:2817
-#, c-format
-msgid "Connection cancelled"
-msgstr "Anslutning avbruten"
-
-#: ../camel/providers/imap/camel-imap-store.c:568
-#: ../camel/providers/imapx/camel-imapx-server.c:2822
-#, c-format
-msgid "Could not connect with command \"%s\": %s"
-msgstr "Kunde inte ansluta med kommandot \"%s\": %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:769
-#: ../camel/providers/imapx/camel-imapx-server.c:3114
+#: ../camel/providers/imap/camel-imap-store.c:681
+#: ../camel/providers/imapx/camel-imapx-server.c:3087
 #, 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:780
-#: ../camel/providers/imapx/camel-imapx-server.c:3126
-#: ../camel/providers/smtp/camel-smtp-transport.c:434
+#: ../camel/providers/imap/camel-imap-store.c:692
+#: ../camel/providers/imapx/camel-imapx-server.c:3099
+#: ../camel/providers/smtp/camel-smtp-transport.c:428
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Inget stÃd fÃr autentiseringstypen %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:791
-#: ../camel/providers/smtp/camel-smtp-transport.c:447
+#: ../camel/providers/imap/camel-imap-store.c:703
+#: ../camel/providers/smtp/camel-smtp-transport.c:441
 #, c-format
 msgid "Error creating SASL authentication object."
 msgstr "Fel vid skapande av SASL-autentiseringsobjekt."
 
-#: ../camel/providers/imap/camel-imap-store.c:839
-#: ../camel/providers/imapx/camel-imapx-server.c:3172
+#: ../camel/providers/imap/camel-imap-store.c:751
+#: ../camel/providers/imapx/camel-imapx-server.c:3143
 #, c-format
 msgid "You did not enter a password."
 msgstr "Du angav inte nÃgot lÃsenord."
 
-#: ../camel/providers/imap/camel-imap-store.c:880
-#: ../camel/providers/imapx/camel-imapx-server.c:3217
+#: ../camel/providers/imap/camel-imap-store.c:792
+#: ../camel/providers/imapx/camel-imapx-server.c:3188
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3328,73 +3304,73 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:940
-#: ../camel/providers/imapx/camel-imapx-store.c:162
+#: ../camel/providers/imap/camel-imap-store.c:927
+#: ../camel/providers/imapx/camel-imapx-store.c:252
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP-server %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:943
-#: ../camel/providers/imapx/camel-imapx-store.c:165
+#: ../camel/providers/imap/camel-imap-store.c:930
+#: ../camel/providers/imapx/camel-imapx-store.c:255
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP-tjÃnst fÃr %s pà %s"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1414
-#: ../camel/providers/imap/camel-imap-store.c:2498
-#: ../camel/providers/imapx/camel-imapx-store.c:353
-#: ../camel/providers/imapx/camel-imapx-store.c:772
+#: ../camel/providers/imap/camel-imap-store.c:1471
+#: ../camel/providers/imap/camel-imap-store.c:2555
+#: ../camel/providers/imapx/camel-imapx-store.c:443
+#: ../camel/providers/imapx/camel-imapx-store.c:860
 #: ../camel/providers/local/camel-maildir-folder.c:434
 #: ../camel/providers/local/camel-maildir-store.c:273
 #: ../camel/providers/local/camel-maildir-store.c:619
 #: ../camel/providers/local/camel-maildir-store.c:625
 #: ../camel/providers/local/camel-maildir-store.c:705
-#: ../camel/providers/local/camel-spool-store.c:293
+#: ../camel/providers/local/camel-spool-store.c:324
 msgid "Inbox"
 msgstr "Inkorg"
 
-#: ../camel/providers/imap/camel-imap-store.c:1881
-#: ../camel/providers/imap/camel-imap-store.c:2083
-#: ../camel/providers/imapx/camel-imapx-store.c:329
+#: ../camel/providers/imap/camel-imap-store.c:1938
+#: ../camel/providers/imap/camel-imap-store.c:2140
+#: ../camel/providers/imapx/camel-imapx-store.c:419
 #, c-format
 msgid "No such folder %s"
 msgstr "Det finns ingen mapp %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:1895
-#: ../camel/providers/imap/camel-imap-store.c:2342
-#: ../camel/providers/imapx/camel-imapx-store.c:1297
+#: ../camel/providers/imap/camel-imap-store.c:1952
+#: ../camel/providers/imap/camel-imap-store.c:2399
+#: ../camel/providers/imapx/camel-imapx-store.c:1385
 #, 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:1959
-#: ../camel/providers/imap/camel-imap-store.c:2406
-#: ../camel/providers/imapx/camel-imapx-store.c:1318
+#: ../camel/providers/imap/camel-imap-store.c:2016
+#: ../camel/providers/imap/camel-imap-store.c:2463
+#: ../camel/providers/imapx/camel-imapx-store.c:1406
 #, c-format
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "FÃrÃldermappen fÃr inte innehÃlla undermappar"
 
-#: ../camel/providers/imap/camel-imap-store.c:2012
+#: ../camel/providers/imap/camel-imap-store.c:2069
 #: ../camel/providers/local/camel-maildir-store.c:244
-#: ../camel/providers/local/camel-mbox-store.c:409
-#: ../camel/providers/local/camel-mh-store.c:494
+#: ../camel/providers/local/camel-mbox-store.c:416
+#: ../camel/providers/local/camel-mh-store.c:566
 #, 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:2355
-#: ../camel/providers/imapx/camel-imapx-store.c:1308
+#: ../camel/providers/imap/camel-imap-store.c:2412
+#: ../camel/providers/imapx/camel-imapx-store.c:1396
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "OkÃnd fÃrÃldermapp: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:3191
+#: ../camel/providers/imap/camel-imap-store.c:3248
 #, c-format
 msgid "Server unexpectedly disconnected"
 msgstr "Servern kopplade ovÃntat ifrÃn"
 
-#: ../camel/providers/imap/camel-imap-store.c:3194
+#: ../camel/providers/imap/camel-imap-store.c:3251
 msgid "Server unexpectedly disconnected: "
 msgstr "Servern kopplade ifrÃn ovÃntat: "
 
@@ -3436,31 +3412,26 @@ msgstr "Standardport fÃr IMAP"
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:1460
+#: ../camel/providers/imapx/camel-imapx-server.c:1488
 msgid "Error writing to cache stream: "
 msgstr "Fel vid skrivning till mellanlagringsstrÃm: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2143
+#: ../camel/providers/imapx/camel-imapx-server.c:2172
 #, c-format
 msgid "Not authenticated"
 msgstr "Inte autentiserad"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2912
-#, c-format
-msgid "Could not connect to %s (port %s): "
-msgstr "Kunde inte ansluta till %s (port %s): "
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3399
+#: ../camel/providers/imapx/camel-imapx-server.c:3370
 msgid "Closing tmp stream failed: "
 msgstr "StÃngning av temporÃrstrÃm misslyckades: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5489
-#: ../camel/providers/imapx/camel-imapx-server.c:5504
+#: ../camel/providers/imapx/camel-imapx-server.c:5465
+#: ../camel/providers/imapx/camel-imapx-server.c:5480
 msgid "Cannot create spool file: "
 msgstr "Kan inte skapa kÃfil: "
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1093
-#: ../camel/providers/nntp/camel-nntp-store.c:1686
+#: ../camel/providers/imapx/camel-imapx-store.c:1181
+#: ../camel/providers/nntp/camel-nntp-store.c:1778
 #, c-format
 msgid "No such folder: %s"
 msgstr "Det finns ingen sÃdan mapp: %s"
@@ -3558,60 +3529,60 @@ msgstr ""
 msgid "Standard Unix mbox spool directory"
 msgstr "Standard Unix mbox-kÃkatalog"
 
-#: ../camel/providers/local/camel-local-store.c:177
-#: ../camel/providers/local/camel-local-store.c:322
+#: ../camel/providers/local/camel-local-store.c:79
+#, 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:156
+#, c-format
+msgid "Local mail file %s"
+msgstr "Lokal brevlÃdefil %s"
+
+#: ../camel/providers/local/camel-local-store.c:187
+#: ../camel/providers/local/camel-local-store.c:329
 #: ../camel/providers/local/camel-maildir-store.c:92
-#: ../camel/providers/local/camel-mbox-store.c:519
-#: ../camel/providers/local/camel-spool-store.c:507
+#: ../camel/providers/local/camel-mbox-store.c:534
+#: ../camel/providers/local/camel-spool-store.c:570
 #, 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:186
+#: ../camel/providers/local/camel-local-store.c:196
 #, 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:197
 #: ../camel/providers/local/camel-local-store.c:207
-#: ../camel/providers/local/camel-local-store.c:335
+#: ../camel/providers/local/camel-local-store.c:217
+#: ../camel/providers/local/camel-local-store.c:342
 #: ../camel/providers/local/camel-maildir-store.c:124
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Kan inte hÃmta mapp: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:223
+#: ../camel/providers/local/camel-local-store.c:249
 #, c-format
 msgid "Local stores do not have an inbox"
 msgstr "Lokala lager har ingen inkorg"
 
-#: ../camel/providers/local/camel-local-store.c:284
-#, c-format
-msgid "Local mail file %s"
-msgstr "Lokal brevlÃdefil %s"
-
-#: ../camel/providers/local/camel-local-store.c:396
-#, 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:470
-#, c-format
-msgid "Could not rename '%s': %s"
-msgstr "Kunde inte byta namn pà \"%s\": %s"
-
-#: ../camel/providers/local/camel-local-store.c:501
-#: ../camel/providers/local/camel-mbox-store.c:688
+#: ../camel/providers/local/camel-local-store.c:387
+#: ../camel/providers/local/camel-mbox-store.c:708
 #, 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:529
-#: ../camel/providers/local/camel-mbox-store.c:717
+#: ../camel/providers/local/camel-local-store.c:415
+#: ../camel/providers/local/camel-mbox-store.c:738
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "Kunde inte ta bort mappmetafilen \"%s\": %s"
 
+#: ../camel/providers/local/camel-local-store.c:501
+#, c-format
+msgid "Could not rename '%s': %s"
+msgstr "Kunde inte byta namn pà \"%s\": %s"
+
 #: ../camel/providers/local/camel-local-summary.c:548
 #, c-format
 msgid "Unable to add message to summary: unknown reason"
@@ -3657,22 +3628,22 @@ msgstr "Mappen %s finns redan"
 
 #: ../camel/providers/local/camel-maildir-store.c:191
 #: ../camel/providers/local/camel-maildir-store.c:222
-#: ../camel/providers/local/camel-mbox-store.c:377
-#: ../camel/providers/local/camel-mbox-store.c:391
+#: ../camel/providers/local/camel-mbox-store.c:384
+#: ../camel/providers/local/camel-mbox-store.c:398
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "Kan inte skapa mappen \"%s\": %s"
 
 #: ../camel/providers/local/camel-maildir-store.c:206
-#: ../camel/providers/local/camel-mbox-store.c:343
-#: ../camel/providers/local/camel-mh-store.c:454
+#: ../camel/providers/local/camel-mbox-store.c:350
+#: ../camel/providers/local/camel-mh-store.c:521
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "Kan inte hÃmta mappen \"%s\": %s"
 
 #: ../camel/providers/local/camel-maildir-store.c:212
-#: ../camel/providers/local/camel-mbox-store.c:353
-#: ../camel/providers/local/camel-mh-store.c:463
+#: ../camel/providers/local/camel-mbox-store.c:360
+#: ../camel/providers/local/camel-mh-store.c:530
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "Kan inte hÃmta mappen \"%s\": mappen finns inte."
@@ -3684,7 +3655,7 @@ msgstr "Kan inte hÃmta mappen \"%s\": inte en maildir-katalog."
 
 #: ../camel/providers/local/camel-maildir-store.c:293
 #: ../camel/providers/local/camel-maildir-store.c:333
-#: ../camel/providers/local/camel-mh-store.c:572
+#: ../camel/providers/local/camel-mh-store.c:656
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "Kunde inte ta bort mappen \"%s\": %s"
@@ -3695,8 +3666,8 @@ msgstr "Ãr inte en maildir-katalog"
 
 #: ../camel/providers/local/camel-maildir-store.c:510
 #: ../camel/providers/local/camel-maildir-store.c:874
-#: ../camel/providers/local/camel-spool-store.c:144
 #: ../camel/providers/local/camel-spool-store.c:160
+#: ../camel/providers/local/camel-spool-store.c:179
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "Kunde inte sÃka igenom mappen \"%s\": %s"
@@ -3748,34 +3719,34 @@ msgstr "Mappen verkar vara obotligt skadad."
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Kan inte skapa mapplÃs pà %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:365
-#: ../camel/providers/local/camel-mbox-store.c:527
+#: ../camel/providers/local/camel-mbox-store.c:372
+#: ../camel/providers/local/camel-mbox-store.c:542
 #, 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:402
+#: ../camel/providers/local/camel-mbox-store.c:409
 #, 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:543
+#: ../camel/providers/local/camel-mbox-store.c:558
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "Kan inte skapa katalogen \"%s\": %s."
 
-#: ../camel/providers/local/camel-mbox-store.c:559
+#: ../camel/providers/local/camel-mbox-store.c:574
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Kan inte skapa mapp: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:561
+#: ../camel/providers/local/camel-mbox-store.c:576
 msgid "Folder already exists"
 msgstr "Mappen finns redan"
 
-#: ../camel/providers/local/camel-mbox-store.c:602
-#: ../camel/providers/local/camel-mbox-store.c:615
-#: ../camel/providers/local/camel-mbox-store.c:644
+#: ../camel/providers/local/camel-mbox-store.c:619
+#: ../camel/providers/local/camel-mbox-store.c:632
+#: ../camel/providers/local/camel-mbox-store.c:661
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3784,33 +3755,33 @@ msgstr ""
 "Kunde inte ta bort mappen \"%s\":\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:625
+#: ../camel/providers/local/camel-mbox-store.c:642
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "\"%s\" Ãr inte en vanlig fil."
 
-#: ../camel/providers/local/camel-mbox-store.c:634
+#: ../camel/providers/local/camel-mbox-store.c:651
 #, 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:660
-#: ../camel/providers/local/camel-mbox-store.c:674
+#: ../camel/providers/local/camel-mbox-store.c:678
+#: ../camel/providers/local/camel-mbox-store.c:693
 #, 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:753
+#: ../camel/providers/local/camel-mbox-store.c:775
 #, c-format
 msgid "The new folder name is illegal."
 msgstr "Det nya mappnamnet Ãr inte tillÃtet."
 
-#: ../camel/providers/local/camel-mbox-store.c:768
+#: ../camel/providers/local/camel-mbox-store.c:791
 #, 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:851
+#: ../camel/providers/local/camel-mbox-store.c:874
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Kunde inte byta namn pà \"%s\" till \"%s\": %s"
@@ -3899,12 +3870,12 @@ msgstr "Skrivning till temporÃr brevlÃda misslyckades: %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:473
+#: ../camel/providers/local/camel-mh-store.c:541
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "Kunde inte skapa mappen \"%s\": %s"
 
-#: ../camel/providers/local/camel-mh-store.c:487
+#: ../camel/providers/local/camel-mh-store.c:558
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "Kan inte hÃmta mappen \"%s\": inte en katalog."
@@ -3914,22 +3885,22 @@ msgstr "Kan inte hÃmta mappen \"%s\": inte en katalog."
 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:314
+#: ../camel/providers/local/camel-spool-store.c:346
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Spool-brevlÃdefil %s"
 
-#: ../camel/providers/local/camel-spool-store.c:315
+#: ../camel/providers/local/camel-spool-store.c:349
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "Spool-mapptrÃd %s"
 
-#: ../camel/providers/local/camel-spool-store.c:352
+#: ../camel/providers/local/camel-spool-store.c:390
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "Mappen \"%s/%s\" finns inte."
 
-#: ../camel/providers/local/camel-spool-store.c:364
+#: ../camel/providers/local/camel-spool-store.c:404
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -3938,12 +3909,12 @@ msgstr ""
 "Kunde inte Ãppna mappen \"%s\":\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:370
+#: ../camel/providers/local/camel-spool-store.c:410
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "Mappen \"%s\" finns inte."
 
-#: ../camel/providers/local/camel-spool-store.c:377
+#: ../camel/providers/local/camel-spool-store.c:417
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -3952,32 +3923,32 @@ msgstr ""
 "Kunde inte skapa mappen \"%s\":\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:387
+#: ../camel/providers/local/camel-spool-store.c:429
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "\"%s\" Ãr ingen brevlÃdefil."
 
-#: ../camel/providers/local/camel-spool-store.c:423
+#: ../camel/providers/local/camel-spool-store.c:477
 #, c-format
 msgid "Store does not support an INBOX"
 msgstr "Lagret stÃder inte en INKORG"
 
-#: ../camel/providers/local/camel-spool-store.c:437
+#: ../camel/providers/local/camel-spool-store.c:491
 #, c-format
 msgid "Spool folders cannot be deleted"
 msgstr "Spool-mappar kan inte tas bort"
 
-#: ../camel/providers/local/camel-spool-store.c:452
+#: ../camel/providers/local/camel-spool-store.c:506
 #, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "Spool-mappar kan inte bytas namn pÃ"
 
-#: ../camel/providers/local/camel-spool-store.c:516
+#: ../camel/providers/local/camel-spool-store.c:579
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "Spoolen \"%s\" kan inte Ãppnas: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:530
+#: ../camel/providers/local/camel-spool-store.c:595
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "Spoolen \"%s\" Ãr inte en vanlig fil eller katalog"
@@ -4005,47 +3976,47 @@ msgstr ""
 "Kunde inte synkronisera spool-mappen %s: %s\n"
 "Mappen kan vara skadad, kopia sparad i \"%s\""
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:195
-#: ../camel/providers/nntp/camel-nntp-folder.c:274
-#: ../camel/providers/nntp/camel-nntp-folder.c:388
+#: ../camel/providers/nntp/camel-nntp-folder.c:194
+#: ../camel/providers/nntp/camel-nntp-folder.c:279
+#: ../camel/providers/nntp/camel-nntp-folder.c:393
 #, 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:236
-#: ../camel/providers/nntp/camel-nntp-folder.c:240
-#: ../camel/providers/pop3/camel-pop3-folder.c:376
-#: ../camel/providers/pop3/camel-pop3-folder.c:441
-#: ../camel/providers/pop3/camel-pop3-folder.c:453
-#: ../camel/providers/pop3/camel-pop3-folder.c:713
+#: ../camel/providers/nntp/camel-nntp-folder.c:241
+#: ../camel/providers/nntp/camel-nntp-folder.c:245
+#: ../camel/providers/pop3/camel-pop3-folder.c:429
+#: ../camel/providers/pop3/camel-pop3-folder.c:681
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Kan inte hÃmta meddelande %s: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:246
-#: ../camel/providers/nntp/camel-nntp-folder.c:413
-#: ../camel/providers/pop3/camel-pop3-folder.c:462
+#: ../camel/providers/nntp/camel-nntp-folder.c:251
+#: ../camel/providers/nntp/camel-nntp-folder.c:418
+#: ../camel/providers/pop3/camel-pop3-folder.c:366
+#: ../camel/providers/pop3/camel-pop3-folder.c:418
+#: ../camel/providers/pop3/camel-pop3-folder.c:438
 #, c-format
 msgid "Cannot get message %s: "
 msgstr "Kan inte hÃmta meddelande %s: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:472
-#: ../camel/providers/nntp/camel-nntp-folder.c:478
-#: ../camel/providers/nntp/camel-nntp-folder.c:525
+#: ../camel/providers/nntp/camel-nntp-folder.c:477
+#: ../camel/providers/nntp/camel-nntp-folder.c:483
+#: ../camel/providers/nntp/camel-nntp-folder.c:530
 #, c-format
 msgid "Posting failed: %s"
 msgstr "Postande misslyckades: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:520
+#: ../camel/providers/nntp/camel-nntp-folder.c:525
 msgid "Posting failed: "
 msgstr "Postande misslyckades: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:549
+#: ../camel/providers/nntp/camel-nntp-folder.c:554
 #, 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:569
+#: ../camel/providers/nntp/camel-nntp-folder.c:574
 #, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Du kan inte kopiera meddelanden frÃn en NNTP-mapp!"
@@ -4078,32 +4049,32 @@ msgstr "Det hÃr Ãr en leverantÃr fÃr lÃsning och postning till USENET-disku
 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:86
+#: ../camel/providers/nntp/camel-nntp-store.c:107
 #, 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:98
+#: ../camel/providers/nntp/camel-nntp-store.c:119
 #, c-format
 msgid "Cannot authenticate to server: %s"
 msgstr "Kan inte autentisera till servern: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:392
+#: ../camel/providers/nntp/camel-nntp-store.c:442
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "Kunde inte lÃsa hÃlsning frÃn %s: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:405
+#: ../camel/providers/nntp/camel-nntp-store.c:455
 #, 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:605
+#: ../camel/providers/nntp/camel-nntp-store.c:612
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET-diskussionsgrupper via %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1112
+#: ../camel/providers/nntp/camel-nntp-store.c:1119
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4114,7 +4085,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1227
+#: ../camel/providers/nntp/camel-nntp-store.c:1234
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4125,7 +4096,7 @@ msgstr ""
 "\n"
 "Diskussionsgruppen finns inte. Det markerade objektet Ãr troligtvis en fÃrÃldermapp."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1269
+#: ../camel/providers/nntp/camel-nntp-store.c:1276
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4136,26 +4107,26 @@ msgstr ""
 "\n"
 "diskussionsgruppen finns inte!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1302
+#: ../camel/providers/nntp/camel-nntp-store.c:1309
 #, 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:1318
+#: ../camel/providers/nntp/camel-nntp-store.c:1325
 #, 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:1335
+#: ../camel/providers/nntp/camel-nntp-store.c:1342
 #, 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:1555
+#: ../camel/providers/nntp/camel-nntp-store.c:1647
 msgid "NNTP Command failed: "
 msgstr "NNTP-kommandot misslyckades: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1629
+#: ../camel/providers/nntp/camel-nntp-store.c:1721
 #, c-format
 msgid "Not connected."
 msgstr "Inte ansluten."
@@ -4182,35 +4153,34 @@ msgstr "OvÃntat serversvar frÃn head: %s"
 msgid "Operation failed: %s"
 msgstr "ÃtgÃrden misslyckades: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:282
-#: ../camel/providers/pop3/camel-pop3-folder.c:341
+#: ../camel/providers/pop3/camel-pop3-folder.c:283
+#: ../camel/providers/pop3/camel-pop3-folder.c:342
 #, c-format
 msgid "No message with UID %s"
 msgstr "Inget meddelande med uid %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:349
+#: ../camel/providers/pop3/camel-pop3-folder.c:350
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "HÃmtar POP-meddelande %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:454
+#: ../camel/providers/pop3/camel-pop3-folder.c:430
 msgid "Unknown reason"
 msgstr "OkÃnd anledning"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:494
+#: ../camel/providers/pop3/camel-pop3-folder.c:470
 msgid "Retrieving POP summary"
 msgstr "HÃmtar POP-sammandrag"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:518
-#, c-format
-msgid "Cannot get POP summary: %s"
-msgstr "Kan inte hÃmta POP-sammandrag: %s"
+#: ../camel/providers/pop3/camel-pop3-folder.c:485
+msgid "Cannot get POP summary: "
+msgstr "Kan inte hÃmta POP-sammandrag: "
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:576
+#: ../camel/providers/pop3/camel-pop3-folder.c:542
 msgid "Expunging old messages"
 msgstr "TÃmmer gamla meddelanden"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:590
+#: ../camel/providers/pop3/camel-pop3-folder.c:556
 msgid "Expunging deleted messages"
 msgstr "TÃmmer borttagna meddelanden"
 
@@ -4261,78 +4231,78 @@ msgid "This option will connect to the POP server using an encrypted password vi
 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."
 
 #. Translators: This is the separator between an error and an explanation
-#: ../camel/providers/pop3/camel-pop3-store.c:98
+#: ../camel/providers/pop3/camel-pop3-store.c:97
 msgid ": "
 msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:184
+#: ../camel/providers/pop3/camel-pop3-store.c:151
 #, 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:202
-#: ../camel/providers/pop3/camel-pop3-store.c:233
-#: ../camel/providers/pop3/camel-pop3-store.c:240
+#: ../camel/providers/pop3/camel-pop3-store.c:169
+#: ../camel/providers/pop3/camel-pop3-store.c:208
 #, 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:203
+#: ../camel/providers/pop3/camel-pop3-store.c:170
 msgid "STLS not supported by server"
 msgstr "STLS stÃds inte av servern"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:221
+#: ../camel/providers/pop3/camel-pop3-store.c:188
 #, 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:234
-msgid "TLS negotiations failed"
-msgstr "TLS-fÃrhandlingar misslyckades"
+#: ../camel/providers/pop3/camel-pop3-store.c:201
+#, c-format
+msgid "Failed to connect to POP server %s in secure mode: "
+msgstr "Misslyckades med att ansluta till POP-servern %s i sÃkert lÃge: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:241
+#: ../camel/providers/pop3/camel-pop3-store.c:209
 msgid "TLS is not available in this build"
 msgstr "TLS Ãr inte tillgÃngligt i detta bygge"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:328
-#: ../camel/providers/pop3/camel-pop3-store.c:490
+#: ../camel/providers/pop3/camel-pop3-store.c:260
+#: ../camel/providers/pop3/camel-pop3-store.c:433
 #, 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."
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:351
+#: ../camel/providers/pop3/camel-pop3-store.c:288
 #, 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:367
+#: ../camel/providers/pop3/camel-pop3-store.c:305
 #, 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:384
+#: ../camel/providers/pop3/camel-pop3-store.c:327
 #, c-format
 msgid "Failed to authenticate on POP server %s: "
 msgstr "Misslyckades med autentisering fÃr POP-servern %s: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:456
+#: ../camel/providers/pop3/camel-pop3-store.c:399
 #, 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:510
+#: ../camel/providers/pop3/camel-pop3-store.c:446
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
-"Error sending password: %s"
+"Error sending password: "
 msgstr ""
-"Kan inte ansluta till POP-servern %s.\n"
-"Fel vid skickande av lÃsenord: %s"
+"Kunde inte ansluta till POP-servern %s.\n"
+"Fel vid sÃndning av lÃsenord: "
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:523
+#: ../camel/providers/pop3/camel-pop3-store.c:456
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4342,7 +4312,7 @@ msgstr ""
 "Fel vid sÃndning av anvÃndarnamn%s"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:535
+#: ../camel/providers/pop3/camel-pop3-store.c:468
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4351,27 +4321,27 @@ msgstr ""
 "Kan inte ansluta till POP-servern %s.\n"
 "Fel vid sÃndning av lÃsenord%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:578
+#: ../camel/providers/pop3/camel-pop3-store.c:586
 #, c-format
 msgid "POP3 server %s"
 msgstr "POP3-server %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:581
+#: ../camel/providers/pop3/camel-pop3-store.c:589
 #, c-format
 msgid "POP3 server for %s on %s"
 msgstr "POP3-server fÃr %s pà %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:712
+#: ../camel/providers/pop3/camel-pop3-store.c:720
 #, 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:739
+#: ../camel/providers/pop3/camel-pop3-store.c:747
 #, c-format
 msgid "No such folder '%s'."
 msgstr "Det finns ingen sÃdan mapp \"%s\"."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:756
+#: ../camel/providers/pop3/camel-pop3-store.c:764
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "POP3-lager saknar mapphierarki"
@@ -4446,40 +4416,44 @@ msgstr "SMTP"
 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:196
-#: ../camel/providers/smtp/camel-smtp-transport.c:203
+#: ../camel/providers/smtp/camel-smtp-transport.c:155
+#: ../camel/providers/smtp/camel-smtp-transport.c:162
 msgid "Welcome response error: "
 msgstr "Fel i vÃlkomstsvar: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:280
-#: ../camel/providers/smtp/camel-smtp-transport.c:287
+#: ../camel/providers/smtp/camel-smtp-transport.c:197
+#: ../camel/providers/smtp/camel-smtp-transport.c:243
 #, 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:249
-#: ../camel/providers/smtp/camel-smtp-transport.c:262
-#: ../camel/providers/smtp/camel-smtp-transport.c:269
+#: ../camel/providers/smtp/camel-smtp-transport.c:206
+#: ../camel/providers/smtp/camel-smtp-transport.c:219
+#: ../camel/providers/smtp/camel-smtp-transport.c:226
 msgid "STARTTLS command failed: "
 msgstr "STARTTLS-kommandot misslyckades: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:367
+#: ../camel/providers/smtp/camel-smtp-transport.c:236
+#, c-format
+msgid "Failed to connect to SMTP server %s in secure mode: "
+msgstr "Misslyckades med att ansluta till SMTP-servern %s i sÃkert lÃge: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:361
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-server %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:371
+#: ../camel/providers/smtp/camel-smtp-transport.c:365
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP-epostleverans via %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:422
+#: ../camel/providers/smtp/camel-smtp-transport.c:416
 #, 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:524
+#: ../camel/providers/smtp/camel-smtp-transport.c:518
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4490,181 +4464,181 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:640
+#: ../camel/providers/smtp/camel-smtp-transport.c:635
 #, 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:647
+#: ../camel/providers/smtp/camel-smtp-transport.c:642
 #, 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:651
+#: ../camel/providers/smtp/camel-smtp-transport.c:646
 msgid "Sending message"
 msgstr "Skickar meddelande"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:676
+#: ../camel/providers/smtp/camel-smtp-transport.c:671
 #, 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:689
+#: ../camel/providers/smtp/camel-smtp-transport.c:684
 #, 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:752
+#: ../camel/providers/smtp/camel-smtp-transport.c:814
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaxfel, okÃnt kommando"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:754
+#: ../camel/providers/smtp/camel-smtp-transport.c:816
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaxfel i parametrar eller argument"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:756
+#: ../camel/providers/smtp/camel-smtp-transport.c:818
 msgid "Command not implemented"
 msgstr "Kommandot inte implementerat"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:758
+#: ../camel/providers/smtp/camel-smtp-transport.c:820
 msgid "Command parameter not implemented"
 msgstr "Kommandoparameter inte implementerad"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:760
+#: ../camel/providers/smtp/camel-smtp-transport.c:822
 msgid "System status, or system help reply"
 msgstr "Systemstatus, eller svar frÃn systemhjÃlp"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:762
+#: ../camel/providers/smtp/camel-smtp-transport.c:824
 msgid "Help message"
 msgstr "HjÃlpmeddelande"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:764
+#: ../camel/providers/smtp/camel-smtp-transport.c:826
 msgid "Service ready"
 msgstr "TjÃnsten klar"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:766
+#: ../camel/providers/smtp/camel-smtp-transport.c:828
 msgid "Service closing transmission channel"
 msgstr "TjÃnsten stÃnger ÃverfÃringskanalen"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:768
+#: ../camel/providers/smtp/camel-smtp-transport.c:830
 msgid "Service not available, closing transmission channel"
 msgstr "TjÃnsten inte tillgÃnglig, stÃnger ÃverfÃringskanalen"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:770
+#: ../camel/providers/smtp/camel-smtp-transport.c:832
 msgid "Requested mail action okay, completed"
 msgstr "BegÃrd e-postÃtgÃrd okej, fÃrdig"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:772
+#: ../camel/providers/smtp/camel-smtp-transport.c:834
 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:774
+#: ../camel/providers/smtp/camel-smtp-transport.c:836
 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:776
+#: ../camel/providers/smtp/camel-smtp-transport.c:838
 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:778
+#: ../camel/providers/smtp/camel-smtp-transport.c:840
 msgid "Requested action aborted: error in processing"
 msgstr "BegÃrd ÃtgÃrd avbruten: fel i behandling"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:780
+#: ../camel/providers/smtp/camel-smtp-transport.c:842
 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:782
+#: ../camel/providers/smtp/camel-smtp-transport.c:844
 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:784
+#: ../camel/providers/smtp/camel-smtp-transport.c:846
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "BegÃrd ÃtgÃrd avbruten: Ãverskriden utrymmesallokering"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:786
+#: ../camel/providers/smtp/camel-smtp-transport.c:848
 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:788
+#: ../camel/providers/smtp/camel-smtp-transport.c:850
 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:790
+#: ../camel/providers/smtp/camel-smtp-transport.c:852
 msgid "Transaction failed"
 msgstr "Transaktionen misslyckades"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:794
+#: ../camel/providers/smtp/camel-smtp-transport.c:856
 msgid "A password transition is needed"
 msgstr "En lÃsenordsÃverfÃring behÃvs"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:796
+#: ../camel/providers/smtp/camel-smtp-transport.c:858
 msgid "Authentication mechanism is too weak"
 msgstr "Autentiseringsmekanismen Ãr fÃr svag"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:798
+#: ../camel/providers/smtp/camel-smtp-transport.c:860
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Kryptering behÃvs fÃr begÃrd autentiseringsmekanism"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:800
+#: ../camel/providers/smtp/camel-smtp-transport.c:862
 msgid "Temporary authentication failure"
 msgstr "TillfÃlligt autentiseringsmisslyckande"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1057
+#: ../camel/providers/smtp/camel-smtp-transport.c:1112
 msgid "SMTP Greeting"
 msgstr "SMTP-hÃlsning"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1084
-#: ../camel/providers/smtp/camel-smtp-transport.c:1101
-#: ../camel/providers/smtp/camel-smtp-transport.c:1109
+#: ../camel/providers/smtp/camel-smtp-transport.c:1139
+#: ../camel/providers/smtp/camel-smtp-transport.c:1156
+#: ../camel/providers/smtp/camel-smtp-transport.c:1164
 msgid "HELO command failed: "
 msgstr "HELO-kommandot misslyckades: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1178
+#: ../camel/providers/smtp/camel-smtp-transport.c:1233
 msgid "SMTP Authentication"
 msgstr "SMTP-autentisering"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1197
-#: ../camel/providers/smtp/camel-smtp-transport.c:1208
-#: ../camel/providers/smtp/camel-smtp-transport.c:1221
+#: ../camel/providers/smtp/camel-smtp-transport.c:1252
+#: ../camel/providers/smtp/camel-smtp-transport.c:1263
+#: ../camel/providers/smtp/camel-smtp-transport.c:1276
 msgid "AUTH command failed: "
 msgstr "AUTH-kommandot misslyckades: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1329
-#: ../camel/providers/smtp/camel-smtp-transport.c:1343
-#: ../camel/providers/smtp/camel-smtp-transport.c:1352
+#: ../camel/providers/smtp/camel-smtp-transport.c:1384
+#: ../camel/providers/smtp/camel-smtp-transport.c:1398
+#: ../camel/providers/smtp/camel-smtp-transport.c:1407
 msgid "MAIL FROM command failed: "
 msgstr "MAIL FROM-kommandot misslyckades: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1379
+#: ../camel/providers/smtp/camel-smtp-transport.c:1434
 msgid "RCPT TO command failed: "
 msgstr "RCPT TO-kommandot misslyckades: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1395
-#: ../camel/providers/smtp/camel-smtp-transport.c:1404
+#: ../camel/providers/smtp/camel-smtp-transport.c:1450
+#: ../camel/providers/smtp/camel-smtp-transport.c:1459
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "RCPT TO <%s> misslyckades: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1446
-#: ../camel/providers/smtp/camel-smtp-transport.c:1456
-#: ../camel/providers/smtp/camel-smtp-transport.c:1466
-#: ../camel/providers/smtp/camel-smtp-transport.c:1525
-#: ../camel/providers/smtp/camel-smtp-transport.c:1544
-#: ../camel/providers/smtp/camel-smtp-transport.c:1557
-#: ../camel/providers/smtp/camel-smtp-transport.c:1565
+#: ../camel/providers/smtp/camel-smtp-transport.c:1501
+#: ../camel/providers/smtp/camel-smtp-transport.c:1511
+#: ../camel/providers/smtp/camel-smtp-transport.c:1521
+#: ../camel/providers/smtp/camel-smtp-transport.c:1580
+#: ../camel/providers/smtp/camel-smtp-transport.c:1599
+#: ../camel/providers/smtp/camel-smtp-transport.c:1612
+#: ../camel/providers/smtp/camel-smtp-transport.c:1620
 msgid "DATA command failed: "
 msgstr "DATA-kommandot misslyckades: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1590
-#: ../camel/providers/smtp/camel-smtp-transport.c:1604
-#: ../camel/providers/smtp/camel-smtp-transport.c:1612
+#: ../camel/providers/smtp/camel-smtp-transport.c:1645
+#: ../camel/providers/smtp/camel-smtp-transport.c:1659
+#: ../camel/providers/smtp/camel-smtp-transport.c:1667
 msgid "RSET command failed: "
 msgstr "RSET-kommandot misslyckades: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1637
-#: ../camel/providers/smtp/camel-smtp-transport.c:1651
-#: ../camel/providers/smtp/camel-smtp-transport.c:1658
+#: ../camel/providers/smtp/camel-smtp-transport.c:1692
+#: ../camel/providers/smtp/camel-smtp-transport.c:1706
+#: ../camel/providers/smtp/camel-smtp-transport.c:1713
 msgid "QUIT command failed: "
 msgstr "QUIT-kommandot misslyckades: "
 
@@ -4880,7 +4854,12 @@ msgctxt "ClientError"
 msgid "Other error"
 msgstr "Annat fel"
 
-#: ../libedataserver/e-client.c:147
+#: ../libedataserver/e-client.c:146
+msgctxt "ClientError"
+msgid "Backend is not opened yet"
+msgstr "BakÃnden Ãr inte Ãppnad Ãn"
+
+#: ../libedataserver/e-client.c:149
 msgctxt "ClientError"
 msgid "Unknown error"
 msgstr "OkÃnt fel"
@@ -5024,12 +5003,12 @@ msgid "%I %p"
 msgstr "%H"
 
 #: ../libedataserverui/e-book-auth-util.c:98
-#: ../libedataserverui/e-book-auth-util.c:682
+#: ../libedataserverui/e-book-auth-util.c:661
 msgid "Accessing LDAP Server anonymously"
 msgstr "Kommer Ãt LDAP-server anonymt"
 
-#: ../libedataserverui/e-book-auth-util.c:204
-#: ../libedataserverui/e-book-auth-util.c:440
+#: ../libedataserverui/e-book-auth-util.c:197
+#: ../libedataserverui/e-book-auth-util.c:422
 msgid "Failed to authenticate.\n"
 msgstr "Misslyckades med autentisering.\n"
 
@@ -5079,7 +5058,7 @@ msgstr "Kategoriegenskaper"
 msgid "There is already a category '%s' in the configuration. Please use another name"
 msgstr "Det finns redan en kategori med namnet \"%s\" i konfigurationen. AnvÃnd ett annat namn"
 
-#: ../libedataserverui/e-client-utils.c:789
+#: ../libedataserverui/e-client-utils.c:756
 #, c-format
 msgid ""
 "Enter password for %s (user %s)\n"
@@ -5088,11 +5067,11 @@ msgstr ""
 "Ange lÃsenord fÃr %s (anvÃndare %s)\n"
 "Anledning: %s"
 
-#: ../libedataserverui/e-client-utils.c:887
+#: ../libedataserverui/e-client-utils.c:850
 msgid "Enter Passphrase"
 msgstr "Ange lÃsenfras"
 
-#: ../libedataserverui/e-client-utils.c:889
+#: ../libedataserverui/e-client-utils.c:852
 msgid "Enter Password"
 msgstr "Ange lÃsenord"
 
@@ -5181,31 +5160,31 @@ msgstr "_Redigera %s"
 msgid "_Delete %s"
 msgstr "_Ta bort %s"
 
-#: ../libedataserverui/e-passwords.c:127
+#: ../libedataserverui/e-passwords.c:126
 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:701
+#: ../libedataserverui/e-passwords.c:699
 #: ../libedataserverui/e-passwords-win32.c:612
 msgid "You have the Caps Lock key on."
 msgstr "Du har Caps Lock-tangenten nedtryckt."
 
-#: ../libedataserverui/e-passwords.c:821
+#: ../libedataserverui/e-passwords.c:819
 #: ../libedataserverui/e-passwords-win32.c:735
 msgid "_Remember this passphrase"
 msgstr "_Kom ihÃg denna lÃsenfras"
 
-#: ../libedataserverui/e-passwords.c:822
+#: ../libedataserverui/e-passwords.c:820
 #: ../libedataserverui/e-passwords-win32.c:736
 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:827
+#: ../libedataserverui/e-passwords.c:825
 #: ../libedataserverui/e-passwords-win32.c:741
 msgid "_Remember this password"
 msgstr "_Kom ihÃg detta lÃsenord"
 
-#: ../libedataserverui/e-passwords.c:828
+#: ../libedataserverui/e-passwords.c:826
 #: ../libedataserverui/e-passwords-win32.c:742
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Kom ihÃg detta lÃsenord under resten av denna session"
@@ -5219,6 +5198,21 @@ msgstr "VÃlj mÃl"
 msgid "_Destination"
 msgstr "_MÃl"
 
+#~ msgid "No stream available"
+#~ msgstr "Ingen strÃm tillgÃnglig"
+
+#~ msgid "Operation cancelled"
+#~ msgstr "ÃtgÃrden avbruten"
+
+#~ msgid "SSL negotiations failed"
+#~ msgstr "SSL-fÃrhandlingar misslyckades"
+
+#~ msgid "Could not connect to %s (port %s): "
+#~ msgstr "Kunde inte ansluta till %s (port %s): "
+
+#~ msgid "TLS negotiations failed"
+#~ msgstr "TLS-fÃrhandlingar misslyckades"
+
 #~ msgid "Updating contacts cache (%d)... "
 #~ msgstr "Uppdaterar kontaktcache (%d)... "