[evolution-data-server] Updated Norwegian bokmål translation

From: Kjartan Maraas <kmaraas src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution-data-server] Updated Norwegian bokmål translation
Date: Sun, 11 Jul 2010 15:44:39 +0000 (UTC)
commit e70b5d9e1a90b249e80e88585b7384b260896fff
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Sun Jul 11 17:44:10 2010 +0200

    Updated Norwegian bokmÃ¥l translation

 po/nb.po | 2410 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 1295 insertions(+), 1115 deletions(-)
---
diff --git a/po/nb.po b/po/nb.po
index fb29bcd..f0049d7 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,76 +7,85 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server 2.31.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-24 16:20+0200\n"
-"PO-Revision-Date: 2010-07-11 15:42+0200\n"
+"POT-Creation-Date: 2010-07-11 17:31+0200\n"
+"PO-Revision-Date: 2010-07-11 17:44+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Norwegian Bokmal <i18n-nb lister ping uio no>\n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:560
+#: ../addressbook/backends/file/e-book-backend-file.c:570
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2330
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
 msgid "Loading..."
 msgstr "Lasterâ?¦"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:563
+#: ../addressbook/backends/file/e-book-backend-file.c:573
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2261
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2283
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2328
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4553
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4492
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
 msgid "Searching..."
 msgstr "SÃ¸kerâ?¦"
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2696
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4717
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2698
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4651
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "Laster ned kontakter (%d)â?¦"
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2845
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2846
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3029
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3073
 #, c-format
 msgid "Updating contacts cache (%d)... "
 msgstr "Oppdaterer buffer for kontakter (%d)â?¦"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:818
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:172
+msgid "Not connected"
+msgstr "Ikke tilkoblet"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:753
 msgid "Using Distinguished Name (DN)"
 msgstr "Bruker distinguished name (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:821
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:756
 msgid "Using Email Address"
 msgstr "Bruker e-post-adresse"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1098
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1031
 msgid "Reconnecting to LDAP server..."
 msgstr "Kobler til LDAP-tjener pÃ¥ nyttâ?¦"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1740
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1156
+msgid "Invalid DN syntax"
+msgstr "Ugyldig DN-syntaks"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1672
 msgid "Adding contact to LDAP server..."
 msgstr "Legger til kontakt pÃ¥ LDAP-tjenerâ?¦"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1874
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1804
 msgid "Removing contact from LDAP server..."
 msgstr "Fjerner kontakt fra LDAP-tjenerâ?¦"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2311
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2238
 msgid "Modifying contact from LDAP server..."
 msgstr "Endrer kontakt fra LDAP-tjenerâ?¦"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4414
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4341
 msgid "Receiving LDAP search results..."
 msgstr "Mottar sÃ¸keresultater fra LDAP-tjenerâ?¦"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4575
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4514
 msgid "Error performing search"
 msgstr "Feil ved utfÃ¸ring av sÃ¸k"
 
-#: ../addressbook/libebook/e-book.c:2152
+#: ../addressbook/libebook/e-book.c:2986
 #, c-format
 msgid "%s: there was no source for UID '%s' stored in GConf."
 msgstr "%s: ingen kilde lagret i GConf for uid Â«%sÂ»."
@@ -532,8 +541,8 @@ msgid "Birth Date"
 msgstr "FÃ¸dselsdato"
 
 #: ../addressbook/libebook/e-contact.c:262
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:715
-#: ../libedataserver/e-categories.c:45
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
+#: ../libedataserver/e-categories.c:43
 msgid "Anniversary"
 msgstr "Jubileum"
 
@@ -616,193 +625,329 @@ msgstr "SIP-adresse"
 msgid "Unnamed List"
 msgstr "Liste uten navn"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:290
+#: ../addressbook/libedata-book/e-data-book-factory.c:302
 #, c-format
 msgid "Empty URI"
 msgstr "Tom URI"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:305
-#: ../addressbook/libedata-book/e-data-book-factory.c:332
-#: ../calendar/libedata-cal/e-data-cal-factory.c:323
-#: ../calendar/libedata-cal/e-data-cal-factory.c:332
+#: ../addressbook/libedata-book/e-data-book-factory.c:317
+#: ../addressbook/libedata-book/e-data-book-factory.c:348
+#: ../calendar/libedata-cal/e-data-cal-factory.c:324
+#: ../calendar/libedata-cal/e-data-cal-factory.c:333
 #, c-format
 msgid "Invalid source"
 msgstr "Ugyldig kilde"
 
-#: ../addressbook/libedata-book/e-data-book.c:301
-msgid "Cannot open book"
-msgstr "Kan ikke Ã¥pne bok"
+#: ../addressbook/libedata-book/e-data-book.c:185
+#: ../calendar/libedata-cal/e-data-cal.c:113
+msgid "Success"
+msgstr "Suksess"
 
-#: ../addressbook/libedata-book/e-data-book.c:319
-msgid "Cannot remove book"
-msgstr "Kan ikke fjerne bok"
+#: ../addressbook/libedata-book/e-data-book.c:186
+#: ../calendar/libedata-cal/e-data-cal.c:114
+msgid "Repository offline"
+msgstr "Lageret er frakoblet"
 
-#: ../addressbook/libedata-book/e-data-book.c:331
-#: ../addressbook/libedata-book/e-data-book.c:346
-msgid "Cannot get contact"
-msgstr "Kan ikke hente kontakt"
+#: ../addressbook/libedata-book/e-data-book.c:187
+#: ../calendar/libecal/e-cal.c:4118 ../calendar/libedata-cal/e-data-cal.c:115
+msgid "Permission denied"
+msgstr "Tilgang nektet"
 
-#: ../addressbook/libedata-book/e-data-book.c:358
-msgid "Empty query"
-msgstr "Tom spÃ¸rring"
+#: ../addressbook/libedata-book/e-data-book.c:188
+msgid "Contact not found"
+msgstr "Kontakten ble ikke funnet"
 
-#: ../addressbook/libedata-book/e-data-book.c:402
-msgid "Cannot authenticate user"
-msgstr "Kan ikke autentisere bruker"
+#: ../addressbook/libedata-book/e-data-book.c:189
+msgid "Contact ID already exists"
+msgstr "Kontakt-ID eksisterer allerede"
 
-#: ../addressbook/libedata-book/e-data-book.c:414
-#: ../addressbook/libedata-book/e-data-book.c:429
-msgid "Cannot add contact"
-msgstr "Kan ikke legge til kontakt"
+#: ../addressbook/libedata-book/e-data-book.c:190
+#: ../calendar/libedata-cal/e-data-cal.c:120
+msgid "Authentication Failed"
+msgstr "Autentisering feilet"
+
+#: ../addressbook/libedata-book/e-data-book.c:191
+#: ../calendar/libedata-cal/e-data-cal.c:121
+msgid "Authentication Required"
+msgstr "Autentisering kreves"
 
-#: ../addressbook/libedata-book/e-data-book.c:444
-#: ../addressbook/libedata-book/e-data-book.c:459
-msgid "Cannot modify contact"
-msgstr "Kan ikke endre kontakt"
+#: ../addressbook/libedata-book/e-data-book.c:192
+#: ../calendar/libedata-cal/e-data-cal.c:122
+msgid "Unsupported field"
+msgstr "Ikke stÃ¸ttet felt"
 
-#: ../addressbook/libedata-book/e-data-book.c:494
-msgid "Cannot remove contacts"
-msgstr "Kan ikke fjerne kontakter"
+#: ../addressbook/libedata-book/e-data-book.c:193
+#: ../calendar/libedata-cal/e-data-cal.c:124
+msgid "Unsupported authentication method"
+msgstr "Ikke stÃ¸ttet autentiseringsmetode"
+
+#: ../addressbook/libedata-book/e-data-book.c:194
+#: ../calendar/libedata-cal/e-data-cal.c:125
+msgid "TLS not available"
+msgstr "TLS er ikke tilgjengelig"
+
+#: ../addressbook/libedata-book/e-data-book.c:195
+msgid "Address Book does not exist"
+msgstr "Adresseboken eksisterer ikke"
+
+#: ../addressbook/libedata-book/e-data-book.c:196
+msgid "Book removed"
+msgstr "Bok fjernet"
+
+#: ../addressbook/libedata-book/e-data-book.c:197
+#: ../calendar/libedata-cal/e-data-cal.c:128
+msgid "Not available in offline mode"
+msgstr "Ikke tilgjengelig i frakoblet modus"
+
+#: ../addressbook/libedata-book/e-data-book.c:198
+#: ../calendar/libedata-cal/e-data-cal.c:129
+msgid "Search size limit exceeded"
+msgstr "SÃ¸kets stÃ¸rrelsesgrense oversteget"
+
+#: ../addressbook/libedata-book/e-data-book.c:199
+#: ../calendar/libedata-cal/e-data-cal.c:130
+msgid "Search time limit exceeded"
+msgstr "Tidsbegrensning for sÃ¸k oversteget"
 
-#: ../addressbook/libedata-book/e-data-book.c:569
-#: ../calendar/libedata-cal/e-cal-backend-util.c:141
+#: ../addressbook/libedata-book/e-data-book.c:200
+#: ../calendar/libedata-cal/e-data-cal.c:131
 msgid "Invalid query"
 msgstr "Ugyldig spÃ¸rring"
 
-#: ../addressbook/libedata-book/e-data-book.c:598
-msgid "Cannot get changes"
-msgstr "Kan ikke hente endringer"
+#: ../addressbook/libedata-book/e-data-book.c:201
+#: ../calendar/libedata-cal/e-data-cal.c:132
+msgid "Query refused"
+msgstr "SpÃ¸rring nektet"
 
-#: ../addressbook/libedata-book/e-data-book.c:699
-msgid "Cannot complete operation"
-msgstr "Kan ikke fullfÃ¸re operasjon"
+#: ../addressbook/libedata-book/e-data-book.c:202
+#: ../calendar/libedata-cal/e-data-cal.c:133
+msgid "Could not cancel"
+msgstr "Kunne ikke avbryte"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
-#: ../libedataserver/e-categories.c:46
+#. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
+#. { OtherError,			N_("Other error") },
+#: ../addressbook/libedata-book/e-data-book.c:204
+#: ../calendar/libedata-cal/e-data-cal.c:135
+msgid "Invalid server version"
+msgstr "Ugyldig versjon for tjener"
+
+#: ../addressbook/libedata-book/e-data-book.c:205
+msgid "No space"
+msgstr "Ingen plass"
+
+#: ../addressbook/libedata-book/e-data-book.c:206
+#: ../calendar/libecal/e-cal.c:4102 ../calendar/libedata-cal/e-data-cal.c:136
+msgid "Invalid argument"
+msgstr "Ugyldig argument"
+
+#: ../addressbook/libedata-book/e-data-book.c:207
+#: ../calendar/libecal/e-cal.c:4140 ../calendar/libedata-cal/e-data-cal.c:137
+msgid "Not supported"
+msgstr "Ikke stÃ¸ttet"
+
+#: ../addressbook/libedata-book/e-data-book.c:216
+#: ../calendar/libedata-cal/e-data-cal.c:145
+msgid "Other error"
+msgstr "Annen feil"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:374
+#, c-format
+msgid "Cannot open book: %s"
+msgstr "Kan ikke Ã¥pne bok: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:394
+#, c-format
+msgid "Cannot remove book: %s"
+msgstr "Kan ikke fjerne bok: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:411
+#: ../addressbook/libedata-book/e-data-book.c:428
+#, c-format
+msgid "Cannot get contact: %s"
+msgstr "Kan ikke hente kontakt: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:443
+#, c-format
+msgid "Empty query: %s"
+msgstr "Tom spÃ¸rring: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:457
+#, c-format
+msgid "Cannot get contact list: %s"
+msgstr "Kan ikke hente kontaktliste: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:492
+#, c-format
+msgid "Cannot authenticate user: %s"
+msgstr "Kan ikke autentisere bruker: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:507
+#: ../addressbook/libedata-book/e-data-book.c:524
+#, c-format
+msgid "Cannot add contact: %s"
+msgstr "Kan ikke legge til kontakt: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:542
+#: ../addressbook/libedata-book/e-data-book.c:559
+#, c-format
+msgid "Cannot modify contact: %s"
+msgstr "Kan ikke endre kontakt: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:596
+#, c-format
+msgid "Cannot remove contacts: %s"
+msgstr "Kan ikke fjerne kontakter: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:626
+#, c-format
+msgid "Cannot get supported fields: %s"
+msgstr "Kan ikke hente stÃ¸ttede felt: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:639
+#, c-format
+msgid "Cannot get required fields: %s"
+msgstr "Kan ikke hente obligatoriske felt: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:652
+#, c-format
+msgid "Cannot get supported auth methods: %s"
+msgstr "Kan ikke hente stÃ¸ttede autentiseringsmetoder: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:677
+#, c-format
+msgid "Invalid query: %s"
+msgstr "Ugyldig spÃ¸rring: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:708
+#, c-format
+msgid "Cannot get changes: %s"
+msgstr "Kan ikke hente endringer: %s"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:719
+#: ../libedataserver/e-categories.c:44
 msgid "Birthday"
 msgstr "FÃ¸dselsdag"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:746
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:748
 #, c-format
 msgid "Birthday: %s"
 msgstr "FÃ¸dselsdag: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:770
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:772
 #, c-format
 msgid "Anniversary: %s"
 msgstr "Bryllupsdag: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:236
+#: ../calendar/backends/file/e-cal-backend-file.c:239
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "Kan ikke lagre kalenderdata: Feil i URI."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:243
-#: ../calendar/backends/file/e-cal-backend-file.c:249
+#: ../calendar/backends/file/e-cal-backend-file.c:246
+#: ../calendar/backends/file/e-cal-backend-file.c:252
 msgid "Cannot save calendar data"
 msgstr "Kan ikke lagre kalenderdata"
 
 #: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1118
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2251
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2224
 msgid "Reply Requested: by "
 msgstr "Svar etterspurt: innen "
 
 #: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1123
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2256
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2229
 msgid "Reply Requested: When convenient"
 msgstr "Svar etterspurt: NÃ¥r det passer"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:292
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:296
 #, c-format
 msgid "Loading %s items"
 msgstr "Laster %s elementer"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:925
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:928
 msgid "Calendar"
 msgstr "Kalender"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:983
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:992
 msgid "Invalid server URI"
 msgstr "Ugyldig URI for tjener"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1002
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1011
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1104
-#: ../calendar/libecal/e-cal.c:4025
-#: ../calendar/libedata-cal/e-cal-backend-util.c:119
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1423
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1461
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1476
-#: ../camel/providers/groupwise/camel-groupwise-store.c:603
-#: ../camel/providers/groupwise/camel-groupwise-store.c:789
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:84
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:115
-msgid "Authentication failed"
-msgstr "Autentisering feilet"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1086
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1384
-#: ../calendar/backends/http/e-cal-backend-http.c:678
-#: ../calendar/backends/weather/e-cal-backend-weather.c:492
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1096
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1383
+#: ../calendar/backends/http/e-cal-backend-http.c:671
+#: ../calendar/backends/weather/e-cal-backend-weather.c:484
 msgid "Could not create cache file"
 msgstr "Kunne ikke opprette bufferfil"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1099
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1109
 msgid "Could not create thread for populating cache"
 msgstr "Kunne ikke opprette trÃ¥d for Ã¥ populere buffer"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:335
+#: ../calendar/backends/http/e-cal-backend-http.c:327
 msgid "Redirected to Invalid URI"
 msgstr "Omdirigert til ugyldig URI"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:358
+#: ../calendar/backends/http/e-cal-backend-http.c:350
 msgid "Bad file format."
 msgstr "Ugyldig filformat."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:365
+#: ../calendar/backends/http/e-cal-backend-http.c:357
 msgid "Not a calendar."
 msgstr "Ikke en kalender."
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:152
+#: ../calendar/backends/weather/e-cal-backend-weather.c:154
 msgid "Could not retrieve weather data"
 msgstr "Kunne ikke hente vÃ¦rdata"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:253
 msgid "Weather: Fog"
 msgstr "VÃ¦r: TÃ¥ke"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
+#: ../calendar/backends/weather/e-cal-backend-weather.c:254
 msgid "Weather: Cloudy Night"
 msgstr "VÃ¦r: Overskyet natt"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
+#: ../calendar/backends/weather/e-cal-backend-weather.c:255
 msgid "Weather: Cloudy"
 msgstr "VÃ¦r: Overskyet"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:256
 msgid "Weather: Overcast"
 msgstr "VÃ¦r: Overskyet"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:255
+#: ../calendar/backends/weather/e-cal-backend-weather.c:257
 msgid "Weather: Showers"
 msgstr "VÃ¦r: Regnbyger"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:256
+#: ../calendar/backends/weather/e-cal-backend-weather.c:258
 msgid "Weather: Snow"
 msgstr "VÃ¦r: SnÃ¸"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:257
+#: ../calendar/backends/weather/e-cal-backend-weather.c:259
 msgid "Weather: Clear Night"
 msgstr "VÃ¦r: Klar natt"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:258
+#: ../calendar/backends/weather/e-cal-backend-weather.c:260
 msgid "Weather: Sunny"
 msgstr "VÃ¦r: Solskinn"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:259
+#: ../calendar/backends/weather/e-cal-backend-weather.c:261
 msgid "Weather: Thunderstorms"
 msgstr "VÃ¦r: TordenvÃ¦r"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:405
+#: ../calendar/backends/weather/e-cal-backend-weather.c:407
 msgid "Forecast"
 msgstr "VÃ¦rmelding"
 
@@ -951,7 +1096,7 @@ msgstr "Lav"
 msgid "Undefined"
 msgstr "Udefinert"
 
-#: ../calendar/libecal/e-cal.c:1178 ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1233 ../libedataserverui/e-book-auth-util.c:206
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Oppgi passord for %s (bruker %s)"
@@ -960,101 +1105,91 @@ msgstr "Oppgi passord for %s (bruker %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:1192
+#: ../calendar/libecal/e-cal.c:1247
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "Oppgi passord for %s for Ã¥ aktivere proxy for bruker %s"
 
-#: ../calendar/libecal/e-cal.c:3997
-msgid "Invalid argument"
-msgstr "Ugyldig argument"
-
-#: ../calendar/libecal/e-cal.c:3999
+#: ../calendar/libecal/e-cal.c:4104
 msgid "Backend is busy"
 msgstr "Motoren er opptatt"
 
-#: ../calendar/libecal/e-cal.c:4001
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
+#: ../calendar/libecal/e-cal.c:4106
 msgid "Repository is offline"
 msgstr "Lageret er frakoblet"
 
-#: ../calendar/libecal/e-cal.c:4003
-#: ../calendar/libedata-cal/e-cal-backend-util.c:131
+#: ../calendar/libecal/e-cal.c:4108
 msgid "No such calendar"
 msgstr "Ingen slik kalender"
 
-#: ../calendar/libecal/e-cal.c:4005
-#: ../calendar/libedata-cal/e-cal-backend-util.c:113
+#: ../calendar/libecal/e-cal.c:4110 ../calendar/libedata-cal/e-data-cal.c:117
 #: ../servers/groupwise/e-gw-connection.c:235
 msgid "Object not found"
 msgstr "Objektet ble ikke funnet"
 
-#: ../calendar/libecal/e-cal.c:4007
-#: ../calendar/libedata-cal/e-cal-backend-util.c:115
+#: ../calendar/libecal/e-cal.c:4112 ../calendar/libedata-cal/e-data-cal.c:118
 #: ../servers/groupwise/e-gw-connection.c:229
 msgid "Invalid object"
 msgstr "Ugyldig objekt"
 
-#: ../calendar/libecal/e-cal.c:4009
+#: ../calendar/libecal/e-cal.c:4114
 msgid "URI not loaded"
 msgstr "URI ble ikke lastet"
 
-#: ../calendar/libecal/e-cal.c:4011
+#: ../calendar/libecal/e-cal.c:4116
 msgid "URI already loaded"
 msgstr "URI allerede lastet"
 
-#: ../calendar/libecal/e-cal.c:4013
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
-msgid "Permission denied"
-msgstr "Tilgang nektet"
-
-#: ../calendar/libecal/e-cal.c:4015
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
-#: ../servers/groupwise/e-gw-connection.c:237
+#: ../calendar/libecal/e-cal.c:4120 ../servers/groupwise/e-gw-connection.c:237
 msgid "Unknown User"
 msgstr "Ukjent bruker"
 
-#: ../calendar/libecal/e-cal.c:4017
-#: ../calendar/libedata-cal/e-cal-backend-util.c:117
+#: ../calendar/libecal/e-cal.c:4122 ../calendar/libedata-cal/e-data-cal.c:119
 msgid "Object ID already exists"
 msgstr "Objekt-ID eksisterer allerede"
 
-#: ../calendar/libecal/e-cal.c:4019
+#: ../calendar/libecal/e-cal.c:4124
 msgid "Protocol not supported"
 msgstr "Protokollen er ikke stÃ¸ttet"
 
-#: ../calendar/libecal/e-cal.c:4021
+#: ../calendar/libecal/e-cal.c:4126
 msgid "Operation has been canceled"
 msgstr "Operasjonen ble avbrutt"
 
-#: ../calendar/libecal/e-cal.c:4023
-#: ../calendar/libedata-cal/e-cal-backend-util.c:145
+#: ../calendar/libecal/e-cal.c:4128
 msgid "Could not cancel operation"
 msgstr "Kunne ikke avbryte operasjon"
 
-#: ../calendar/libecal/e-cal.c:4027
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
-#: ../camel/providers/smtp/camel-smtp-transport.c:167
+#: ../calendar/libecal/e-cal.c:4130
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1434
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1452
+#: ../camel/providers/groupwise/camel-groupwise-store.c:618
+#: ../camel/providers/groupwise/camel-groupwise-store.c:793
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:85
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:118
+#, c-format
+msgid "Authentication failed"
+msgstr "Autentisering feilet"
+
+#: ../calendar/libecal/e-cal.c:4132
+#: ../camel/providers/smtp/camel-smtp-transport.c:166
 msgid "Authentication required"
 msgstr "Autentisering kreves"
 
-#: ../calendar/libecal/e-cal.c:4029
-msgid "A CORBA exception has occurred"
-msgstr "Et CORBA-unntak har oppstÃ¥tt"
-
-#: ../calendar/libecal/e-cal.c:4031
-#: ../calendar/libedata-cal/e-cal-backend-util.c:148
-#: ../camel/camel-net-utils.c:534
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:153
-#: ../camel/providers/imap/camel-imap-command.c:455
-#: ../camel/providers/imap/camel-imap-store.c:597
-#: ../camel/providers/pop3/camel-pop3-store.c:593
+#: ../calendar/libecal/e-cal.c:4134
+msgid "A DBUS exception has occurred"
+msgstr "Et DBUS-unntak har oppstÃ¥tt"
+
+#: ../calendar/libecal/e-cal.c:4136
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:158
+#: ../camel/providers/imap/camel-imap-command.c:457
+#: ../camel/providers/imap/camel-imap-store.c:626
+#: ../camel/providers/pop3/camel-pop3-store.c:605
 #: ../servers/groupwise/e-gw-connection.c:243
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
-#: ../calendar/libecal/e-cal.c:4033
-#: ../calendar/libedata-cal/e-cal-backend-util.c:105
+#: ../calendar/libecal/e-cal.c:4138
 msgid "No error"
 msgstr "Ingen feil"
 
@@ -1150,220 +1285,226 @@ msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
 "be a boolean false (#f)"
 msgstr ""
-"Â«%sÂ» forventer at alle argumenter er strenger eller ett, og kun ett, argument "
-"er den bolske verdien falsk (#f)"
+"Â«%sÂ» forventer at alle argumenter er strenger eller ett, og kun ett, "
+"argument er den bolske verdien falsk (#f)"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:111
+#: ../calendar/libedata-cal/e-data-cal.c:116
 msgid "Invalid range"
 msgstr "Ugyldig omrÃ¥de"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
-msgid "Unsupported field"
-msgstr "Ikke stÃ¸ttet felt"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
+#: ../calendar/libedata-cal/e-data-cal.c:123
 msgid "Unsupported method"
 msgstr "Ikke stÃ¸ttet metode"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
-msgid "Unsupported authentication method"
-msgstr "Ikke stÃ¸ttet autentiseringsmetode"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:129
-msgid "TLS not available"
-msgstr "TLS er ikke tilgjengelig"
+#: ../calendar/libedata-cal/e-data-cal.c:126
+msgid "Calendar does not exist"
+msgstr "Kalender eksisterer ikke."
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
-msgid "Offline mode unavailable"
-msgstr "Frakoblet modus ikke tilgjengelig"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:137
-msgid "Search size limit exceeded"
-msgstr "SÃ¸kets stÃ¸rrelsesgrense oversteget"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
-msgid "Search time limit exceeded"
-msgstr "Tidsbegrensning for sÃ¸k oversteget"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:143
-msgid "Query refused"
-msgstr "SpÃ¸rring nektet"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:150
-msgid "Invalid server version"
-msgstr "Ugyldig versjon for tjener"
+#: ../calendar/libedata-cal/e-data-cal.c:127
+msgid "UnknownUser"
+msgstr "Ukjent bruker"
 
-#: ../calendar/libedata-cal/e-data-cal.c:501
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:595
 #, c-format
-msgid "Cannot retrieve calendar address"
-msgstr "Kan ikke hente kalenderadresse"
+msgid "Cannot retrieve calendar address: %s"
+msgstr "Kan ikke hente kalenderadresse: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:519
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:615
 #, c-format
-msgid "Cannot retrieve calendar alarm e-mail address"
-msgstr "Kan ikke hente e-postadresse for kalenderalarm"
+msgid "Cannot retrieve calendar alarm e-mail address: %s"
+msgstr "Kan ikke hente e-postadresse for kalenderalarm: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:537
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:635
 #, c-format
-msgid "Cannot retrieve calendar's ldap attribute"
-msgstr "Kan ikke hente LDAP-attributt for kalender"
+msgid "Cannot retrieve calendar's ldap attribute: %s"
+msgstr "Kan ikke hente LDAP-attributt for kalender: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:555
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:655
 #, c-format
-msgid "Cannot retrieve calendar scheduling information"
-msgstr "Kan ikke hente informasjon om mÃ¸tetidspunkter"
+msgid "Cannot retrieve calendar scheduling information: %s"
+msgstr "Kan ikke hente informasjon om mÃ¸tetidspunkter: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:572
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:674
 #, c-format
-msgid "Cannot open calendar"
-msgstr "Kan ikke Ã¥pne kalender"
+msgid "Cannot open calendar: %s"
+msgstr "Kan ikke Ã¥pne kalender: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:591
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:695
 #, c-format
-msgid "Cannot refresh calendar"
-msgstr "Kan ikke oppdatere kalender"
+msgid "Cannot refresh calendar: %s"
+msgstr "Kan ikke oppdatere kalender: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:608
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:714
 #, c-format
-msgid "Cannot remove calendar"
-msgstr "Kan ikke fjerne kalender"
+msgid "Cannot remove calendar: %s"
+msgstr "Kan ikke fjerne kalender: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:627
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:735
 #, c-format
-msgid "Cannot create calendar object"
-msgstr "Kan ikke lage kalenderobjekt"
+msgid "Cannot create calendar object: %s"
+msgstr "Kan ikke lage kalenderobjekt: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:649
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:759
 #, c-format
-msgid "Cannot modify calendar object"
-msgstr "Kan ikke endre kalenderobjekt"
+msgid "Cannot modify calendar object: %s"
+msgstr "Kan ikke endre kalenderobjekt: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:673
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:785
 #, c-format
-msgid "Cannot remove calendar object"
-msgstr "Kan ikke fjerne kalenderobjekt"
+msgid "Cannot remove calendar object: %s"
+msgstr "Kan ikke fjerne kalenderobjekt: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:692
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:806
 #, c-format
-msgid "Cannot receive calendar objects"
-msgstr "Kan ikke hente kalenderobjekter"
+msgid "Cannot receive calendar objects: %s"
+msgstr "Kan ikke hente kalenderobjekter: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:709
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:825
 #, c-format
-msgid "Cannot discard calendar alarm"
-msgstr "Kan ikke forkaste kalenderalarm"
+msgid "Cannot discard calendar alarm: %s"
+msgstr "Kan ikke forkaste kalenderalarm: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:728
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:846
 #, c-format
-msgid "Cannot send calendar objects"
-msgstr "Kan ikke sende kalenderobjekter"
+msgid "Cannot send calendar objects: %s"
+msgstr "Kan ikke sende kalenderobjekter: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:763
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:883
 #, c-format
-msgid "Cannot retrieve default calendar object path"
-msgstr "Kan ikke hente objektsti til forvalgt kalender"
+msgid "Cannot retrieve default calendar object path: %s"
+msgstr "Kan ikke hente objektsti til forvalgt kalender: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:781
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:903
 #, c-format
-msgid "Cannot retrieve calendar object path"
-msgstr "Kan ikke hente objektsti for kalender"
+msgid "Cannot retrieve calendar object path: %s"
+msgstr "Kan ikke hente objektsti for kalender: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:799
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:923
 #, c-format
-msgid "Cannot retrieve calendar object list"
-msgstr "Kan ikke hente objektliste for kalender"
+msgid "Cannot retrieve calendar object list: %s"
+msgstr "Kan ikke hente objektliste for kalender: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:837
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:963
 #, c-format
-msgid "Could not retrieve attachment list"
-msgstr "Kunne ikke hente vedleggsliste"
+msgid "Could not retrieve attachment list: %s"
+msgstr "Kunne ikke hente vedleggsliste: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:859
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:987
 #, c-format
-msgid "Could not complete calendar query"
-msgstr "Kunne ikke fullfÃ¸re kalenderspÃ¸rring"
+msgid "Could not complete calendar query: %s"
+msgstr "Kunne ikke fullfÃ¸re kalenderspÃ¸rring: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:877
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1007
 #, c-format
-msgid "Could not retrieve calendar time zone"
-msgstr "Kunne ikke hente tidssone for kalender"
+msgid "Could not retrieve calendar time zone: %s"
+msgstr "Kunne ikke hente tidssone for kalender: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:895
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1027
 #, c-format
-msgid "Could not add calendar time zone"
-msgstr "Kunne ikke legge til tidssone for kalender"
+msgid "Could not add calendar time zone: %s"
+msgstr "Kunne ikke legge til tidssone for kalender: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:912
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1046
 #, c-format
-msgid "Could not set default calendar time zone"
-msgstr "Kunne ikke sette forvalgt tidssone for kalender"
+msgid "Could not set default calendar time zone: %s"
+msgstr "Kunne ikke sette forvalgt tidssone for kalender: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:933
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1069
 #, c-format
-msgid "Cannot retrieve calendar changes"
-msgstr "Kan ikke hente endringer i kalender"
+msgid "Cannot retrieve calendar changes: %s"
+msgstr "Kan ikke hente endringer i kalender: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:983
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1121
 #, c-format
-msgid "Cannot retrieve calendar free/busy list"
-msgstr "Kan ikke ledig/opptatliste for kalender"
+msgid "Cannot retrieve calendar free/busy list: %s"
+msgstr "Kan ikke ledig/opptatliste for kalender: %s"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:339
+#: ../calendar/libedata-cal/e-data-cal-factory.c:340
 #, c-format
 msgid "Invalid URI"
 msgstr "Ugyldig URI"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:350
+#: ../calendar/libedata-cal/e-data-cal-factory.c:351
 #, c-format
 msgid "No backend factory for '%s' of '%s'"
 msgstr "Ingen fabrikk for motor for Â«%sÂ» for Â«%sÂ»"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:390
+#: ../calendar/libedata-cal/e-data-cal-factory.c:391
 #, c-format
 msgid "Could not instantiate backend"
 msgstr "Kunne ikke starte motor"
 
-#: ../camel/camel-cipher-context.c:74
+#: ../camel/camel-cipher-context.c:75
+#, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "Signering er ikke stÃ¸ttet av dette cipheret"
 
-#: ../camel/camel-cipher-context.c:109
+#: ../camel/camel-cipher-context.c:110
 msgid "Signing message"
 msgstr "Signerer melding"
 
-#: ../camel/camel-cipher-context.c:129
+#: ../camel/camel-cipher-context.c:131
+#, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "Verifisering er ikke stÃ¸ttet av dette cipheret"
 
-#: ../camel/camel-cipher-context.c:162
+#: ../camel/camel-cipher-context.c:164
 msgid "Verifying message"
 msgstr "Verifiserer melding"
 
-#: ../camel/camel-cipher-context.c:185
+#: ../camel/camel-cipher-context.c:188
+#, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "Kryptering er ikke stÃ¸ttet av dette cipheret"
 
-#: ../camel/camel-cipher-context.c:220
+#: ../camel/camel-cipher-context.c:223
 msgid "Encrypting message"
 msgstr "Krypterer melding"
 
-#: ../camel/camel-cipher-context.c:242
+#: ../camel/camel-cipher-context.c:246
+#, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "Dekryptering er ikke stÃ¸ttet av dette cipheret"
 
-#: ../camel/camel-cipher-context.c:272
+#: ../camel/camel-cipher-context.c:276
 msgid "Decrypting message"
 msgstr "Dekrypterer melding"
 
-#: ../camel/camel-cipher-context.c:292
+#: ../camel/camel-cipher-context.c:297
+#, c-format
 msgid "You may not import keys with this cipher"
 msgstr "Du kan ikke importere nÃ¸kler med dette cipheret"
 
-#: ../camel/camel-cipher-context.c:332
+#: ../camel/camel-cipher-context.c:341
+#, c-format
 msgid "You may not export keys with this cipher"
 msgstr "Du kan ikke eksportere nÃ¸kler med dette cipheret"
 
-#: ../camel/camel-data-cache.c:184
+#: ../camel/camel-data-cache.c:181
+#, c-format
 msgid "Unable to create cache path"
 msgstr "Kunne ikke opprette sti til buffer"
 
@@ -1372,7 +1513,13 @@ msgstr "Kunne ikke opprette sti til buffer"
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Kunne ikke fjerne cache-oppfÃ¸ring: %s: %s"
 
-#: ../camel/camel-db.c:458
+#: ../camel/camel-data-wrapper.c:89
+#, c-format
+msgid "No stream available"
+msgstr "Ingen strÃ¸m tilgjengelig"
+
+#: ../camel/camel-db.c:464
+#, c-format
 msgid "Insufficient memory"
 msgstr "Ikke nok minne"
 
@@ -1387,8 +1534,8 @@ msgstr ""
 "Videre operasjoner pÃ¥ denne tjeneren vil ikke kunne spilles av nÃ¥r\n"
 "du kobler til dette nettverket igjen."
 
-#: ../camel/camel-disco-diary.c:259
-#: ../camel/providers/imap/camel-imap-journal.c:299
+#: ../camel/camel-disco-diary.c:258
+#: ../camel/providers/imap/camel-imap-journal.c:298
 #, c-format
 msgid ""
 "Could not open '%s':\n"
@@ -1407,115 +1554,133 @@ msgstr "Re-synkroniserer med tjener"
 msgid "Downloading new messages for offline mode"
 msgstr "Laster ned nye meldinger for frakoblet modus"
 
-#: ../camel/camel-disco-folder.c:346
+#: ../camel/camel-disco-folder.c:379
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Forbereder mappe Â«%sÂ» pÃ¥ frakobling"
 
-#: ../camel/camel-disco-folder.c:412 ../camel/camel-offline-folder.c:225
+#: ../camel/camel-disco-folder.c:445 ../camel/camel-offline-folder.c:224
 msgid "Copy folder content locally for offline operation"
 msgstr "Kopier mappeinnhold lokalt for frakoblet operasjon"
 
-#: ../camel/camel-disco-store.c:376
-#: ../camel/providers/groupwise/camel-groupwise-store.c:228
-#: ../camel/providers/imap/camel-imap-store.c:860
-#: ../camel/providers/imap/camel-imap-store.c:1720
-#: ../camel/providers/imap/camel-imap-store.c:2178
-#: ../camel/providers/imap/camel-imap-store.c:3010
-#: ../camel/providers/imapx/camel-imapx-store.c:172
-#: ../camel/providers/imapx/camel-imapx-store.c:651
-#: ../camel/providers/imapx/camel-imapx-store.c:713
-#: ../camel/providers/imapx/camel-imapx-store.c:764
+#: ../camel/camel-disco-store.c:395
+#: ../camel/providers/groupwise/camel-groupwise-store.c:230
+#: ../camel/providers/imap/camel-imap-store.c:895
+#: ../camel/providers/imap/camel-imap-store.c:1739
+#: ../camel/providers/imap/camel-imap-store.c:2197
+#: ../camel/providers/imap/camel-imap-store.c:3041
+#: ../camel/providers/imapx/camel-imapx-store.c:176
+#: ../camel/providers/imapx/camel-imapx-store.c:699
+#: ../camel/providers/imapx/camel-imapx-store.c:760
+#: ../camel/providers/imapx/camel-imapx-store.c:817
+#, c-format
 msgid "You must be working online to complete this operation"
 msgstr "Du mÃ¥ arbeide tilknyttet for Ã¥ fullfÃ¸re denne operasjonen"
 
-#: ../camel/camel-exception.c:281
-msgid "No description available"
-msgstr "Ingen beskrivelse tilgjengelig"
+#: ../camel/camel-file-utils.c:430 ../camel/camel-file-utils.c:489
+#: ../camel/camel-file-utils.c:529 ../camel/camel-file-utils.c:599
+#: ../camel/camel-file-utils.c:691 ../camel/camel-gpg-context.c:887
+#: ../camel/camel-gpg-context.c:1175 ../camel/camel-net-utils.c:512
+#: ../camel/camel-net-utils.c:689 ../camel/camel-net-utils.c:838
+#: ../camel/providers/imapx/camel-imapx-server.c:4675
+#: ../camel/providers/imapx/camel-imapx-server.c:4692
+#: ../camel/providers/nntp/camel-nntp-summary.c:396
+#: ../camel/providers/pop3/camel-pop3-folder.c:269
+#: ../camel/providers/pop3/camel-pop3-folder.c:625
+#: ../camel/providers/pop3/camel-pop3-folder.c:690
+#: ../camel/providers/pop3/camel-pop3-store.c:597
+#: ../libedataserverui/e-book-auth-util.c:229
+#, c-format
+msgid "Cancelled"
+msgstr "Avbrutt"
+
+#: ../camel/camel-file-utils.c:643 ../camel/camel-file-utils.c:734
+#: ../camel/camel-file-utils.c:791
+#, c-format
+msgid "Canceled"
+msgstr "Avbrutt"
 
-#: ../camel/camel-filter-driver.c:803 ../camel/camel-filter-search.c:583
+#: ../camel/camel-filter-driver.c:808 ../camel/camel-filter-search.c:582
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "Kunne ikke opprette underprosess Â«%sÂ»: %s"
 
-#: ../camel/camel-filter-driver.c:846
+#: ../camel/camel-filter-driver.c:853
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Ugyldig meldingsstrÃ¸m mottatt fra %s: %s"
 
-#: ../camel/camel-filter-driver.c:1035 ../camel/camel-filter-driver.c:1044
+#: ../camel/camel-filter-driver.c:1037 ../camel/camel-filter-driver.c:1046
 msgid "Syncing folders"
 msgstr "Synkroniserer mapper"
 
-#: ../camel/camel-filter-driver.c:1132 ../camel/camel-filter-driver.c:1559
+#: ../camel/camel-filter-driver.c:1134 ../camel/camel-filter-driver.c:1568
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Feil under lesing av filter: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1142 ../camel/camel-filter-driver.c:1569
+#: ../camel/camel-filter-driver.c:1145 ../camel/camel-filter-driver.c:1579
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Feil under kjÃ¸ring av filter: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1234
+#: ../camel/camel-filter-driver.c:1239
+#, c-format
 msgid "Unable to open spool folder"
 msgstr "Kunne ikke Ã¥pne spool-mappen"
 
-#: ../camel/camel-filter-driver.c:1245
+#: ../camel/camel-filter-driver.c:1250
+#, c-format
 msgid "Unable to process spool folder"
 msgstr "Kan ikke prosessere spool-mappen"
 
-#: ../camel/camel-filter-driver.c:1262
+#: ../camel/camel-filter-driver.c:1268
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Henter melding %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1268
-msgid "Cannot open message"
-msgstr "Kan ikke Ã¥pne melding"
-
-#: ../camel/camel-filter-driver.c:1269 ../camel/camel-filter-driver.c:1290
+#: ../camel/camel-filter-driver.c:1274 ../camel/camel-filter-driver.c:1296
 #, c-format
 msgid "Failed on message %d"
 msgstr "Feilet pÃ¥ melding %d"
 
-#: ../camel/camel-filter-driver.c:1304 ../camel/camel-filter-driver.c:1401
+#: ../camel/camel-filter-driver.c:1311 ../camel/camel-filter-driver.c:1410
 msgid "Syncing folder"
 msgstr "Synkroniserer mappe"
 
-#: ../camel/camel-filter-driver.c:1308 ../camel/camel-filter-driver.c:1406
+#: ../camel/camel-filter-driver.c:1315 ../camel/camel-filter-driver.c:1415
 msgid "Complete"
 msgstr "FullfÃ¸rt"
 
-#: ../camel/camel-filter-driver.c:1368
+#: ../camel/camel-filter-driver.c:1376
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Henter melding %d av %d"
 
-#: ../camel/camel-filter-driver.c:1386
+#: ../camel/camel-filter-driver.c:1394
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Feilet pÃ¥ melding %d av %d"
 
-#: ../camel/camel-filter-search.c:136
+#: ../camel/camel-filter-search.c:135
 msgid "Failed to retrieve message"
 msgstr "Feil under henting av melding"
 
-#: ../camel/camel-filter-search.c:402
+#: ../camel/camel-filter-search.c:401
 msgid "Invalid arguments to (system-flag)"
 msgstr "Ugyldige argumenter til (system-flag)"
 
-#: ../camel/camel-filter-search.c:417
+#: ../camel/camel-filter-search.c:416
 msgid "Invalid arguments to (user-tag)"
 msgstr "Ugyldige argumenter til (user-tag)"
 
-#: ../camel/camel-filter-search.c:742 ../camel/camel-filter-search.c:751
+#: ../camel/camel-filter-search.c:744 ../camel/camel-filter-search.c:753
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Feil under lagring av filtersÃ¸k: %s: %s"
 
-#: ../camel/camel-folder-search.c:346 ../camel/camel-folder-search.c:458
-#: ../camel/camel-folder-search.c:628
+#: ../camel/camel-folder-search.c:345 ../camel/camel-folder-search.c:456
+#: ../camel/camel-folder-search.c:627
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1524,8 +1689,8 @@ msgstr ""
 "Kan ikke tolke uttrykket: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:359 ../camel/camel-folder-search.c:471
-#: ../camel/camel-folder-search.c:641
+#: ../camel/camel-folder-search.c:357 ../camel/camel-folder-search.c:468
+#: ../camel/camel-folder-search.c:639
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1534,62 +1699,74 @@ msgstr ""
 "Feil under kjÃ¸ring av sÃ¸keuttrykket %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:841 ../camel/camel-folder-search.c:883
+#: ../camel/camel-folder-search.c:843 ../camel/camel-folder-search.c:885
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) krever et enkelt bolsk resultat"
 
-#: ../camel/camel-folder-search.c:936
+#: ../camel/camel-folder-search.c:938
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) tillates ikke inne i %s"
 
-#: ../camel/camel-folder-search.c:942 ../camel/camel-folder-search.c:949
+#: ../camel/camel-folder-search.c:944 ../camel/camel-folder-search.c:951
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) krever en streng for trefftype"
 
-#: ../camel/camel-folder-search.c:976
+#: ../camel/camel-folder-search.c:978
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) forventer resultat pÃ¥ tabellform"
 
-#: ../camel/camel-folder-search.c:985
+#: ../camel/camel-folder-search.c:987
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) krever et mappesett"
 
-#: ../camel/camel-folder.c:126
+#: ../camel/camel-folder.c:125
 #, c-format
 msgid "Learning new spam message in '%s'"
 msgid_plural "Learning new spam messages in '%s'"
 msgstr[0] "LÃ¦rer ny uÃ¸nsket melding i Â«%sÂ»"
 msgstr[1] "LÃ¦rer nye uÃ¸nskede meldinger i Â«%sÂ»"
 
-#: ../camel/camel-folder.c:149
+#: ../camel/camel-folder.c:147
 #, c-format
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
 msgstr[0] "LÃ¦rer ny Ã¸nsket melding i Â«%sÂ»"
 msgstr[1] "LÃ¦rer nye Ã¸nskede meldinger i Â«%sÂ»"
 
-#: ../camel/camel-folder.c:174
+#: ../camel/camel-folder.c:171
 #, c-format
 msgid "Filtering new message in '%s'"
 msgid_plural "Filtering new messages in '%s'"
 msgstr[0] "Filtrerer ny melding i Â«%sÂ»"
 msgstr[1] "Filtrerer nye meldinger i Â«%sÂ»"
 
-#: ../camel/camel-folder.c:689
-#: ../camel/providers/local/camel-maildir-folder.c:375
+#: ../camel/camel-folder.c:688
+#: ../camel/providers/local/camel-maildir-folder.c:366
 msgid "Moving messages"
 msgstr "Flytter meldinger"
 
-#: ../camel/camel-folder.c:691
+#: ../camel/camel-folder.c:690
 msgid "Copying messages"
 msgstr "Kopierer meldinger"
 
-#: ../camel/camel-gpg-context.c:758
+#: ../camel/camel-gpg-context.c:701 ../camel/camel-gpg-context.c:706
+#: ../camel/camel-gpg-context.c:1330
+#, c-format
+msgid "Failed to execute gpg: %s"
+msgstr "Feil ved kjÃ¸ring av gpg: %s"
+
+#: ../camel/camel-gpg-context.c:706
+#: ../camel/providers/smtp/camel-smtp-transport.c:114
+#: ../camel/providers/smtp/camel-smtp-transport.c:169
+msgid "Unknown"
+msgstr "Ukjent"
+
+#: ../camel/camel-gpg-context.c:770
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1600,15 +1777,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:775
+#: ../camel/camel-gpg-context.c:787
+#, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "Feil under tolking av hint for gpg brukerid."
 
-#: ../camel/camel-gpg-context.c:800 ../camel/camel-gpg-context.c:815
+#: ../camel/camel-gpg-context.c:812 ../camel/camel-gpg-context.c:827
+#, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "Kunne ikke tolke forespÃ¸rsel pÃ¥ gpg-passordfrase."
 
-#: ../camel/camel-gpg-context.c:835
+#: ../camel/camel-gpg-context.c:848
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1617,7 +1796,7 @@ msgstr ""
 "Du trenger en PIN for Ã¥ lÃ¥se opp nÃ¸kkelen for\n"
 "ditt SmartCard: Â«%sÂ»"
 
-#: ../camel/camel-gpg-context.c:839
+#: ../camel/camel-gpg-context.c:852
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1626,124 +1805,102 @@ msgstr ""
 "Du trenger et passord for Ã¥ lÃ¥se opp nÃ¸kkelen for\n"
 "bruker Â«%sÂ»"
 
-#: ../camel/camel-gpg-context.c:845
+#: ../camel/camel-gpg-context.c:858
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "Uventet forespÃ¸rsel fra GnuPG for Â«%sÂ»"
 
-#: ../camel/camel-gpg-context.c:873 ../camel/camel-gpg-context.c:1156
-msgid "Canceled."
-msgstr "Avbrutt."
-
-#: ../camel/camel-gpg-context.c:888
+#: ../camel/camel-gpg-context.c:905
+#, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Feil ved Ã¥pning av hemmelig nÃ¸kkel: 3 ugyldige passord oppgitt."
 
-#: ../camel/camel-gpg-context.c:900
+#: ../camel/camel-gpg-context.c:917
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Uventet svar fra GnuPG: %s"
 
-#: ../camel/camel-gpg-context.c:1031
+#: ../camel/camel-gpg-context.c:1048
+#, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Kan ikke kryptere: Ingen gyldige mottakere spesifisert."
 
-#: ../camel/camel-gpg-context.c:1310 ../camel/camel-gpg-context.c:1449
-#: ../camel/camel-gpg-context.c:2071 ../camel/camel-gpg-context.c:2123
-#, c-format
-msgid "Failed to execute gpg: %s"
-msgstr "Feil ved kjÃ¸ring av gpg: %s"
+#: ../camel/camel-gpg-context.c:1434 ../camel/camel-smime-context.c:821
+msgid "Could not generate signing data: "
+msgstr "Kan ikke generere signeringsdata: "
 
-#: ../camel/camel-gpg-context.c:1415 ../camel/camel-smime-context.c:820
-#, c-format
-msgid "Could not generate signing data: %s"
-msgstr "Kan ikke generere signeringsdata: %s"
-
-#: ../camel/camel-gpg-context.c:1468 ../camel/camel-gpg-context.c:1714
-#: ../camel/camel-gpg-context.c:1733 ../camel/camel-gpg-context.c:1826
-#: ../camel/camel-gpg-context.c:1845 ../camel/camel-gpg-context.c:1969
-#: ../camel/camel-gpg-context.c:1987 ../camel/camel-gpg-context.c:2090
-#: ../camel/camel-gpg-context.c:2142
+#: ../camel/camel-gpg-context.c:1481 ../camel/camel-gpg-context.c:1740
+#: ../camel/camel-gpg-context.c:1848 ../camel/camel-gpg-context.c:1987
+#: ../camel/camel-gpg-context.c:2081 ../camel/camel-gpg-context.c:2128
 msgid "Failed to execute gpg."
 msgstr "Feil ved kjÃ¸ring av gpg."
 
-#: ../camel/camel-gpg-context.c:1608 ../camel/camel-gpg-context.c:1616
-#: ../camel/camel-gpg-context.c:1624 ../camel/camel-gpg-context.c:1641
-#: ../camel/camel-smime-context.c:942 ../camel/camel-smime-context.c:955
-#: ../camel/camel-smime-context.c:963
+#: ../camel/camel-gpg-context.c:1622 ../camel/camel-gpg-context.c:1630
+#: ../camel/camel-gpg-context.c:1638 ../camel/camel-gpg-context.c:1655
+#: ../camel/camel-smime-context.c:943 ../camel/camel-smime-context.c:957
+#: ../camel/camel-smime-context.c:966
+#, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Kunne ikke verifisere meldingens signatur: Ugyldig meldingsformat"
 
-#: ../camel/camel-gpg-context.c:1682
-#, c-format
-msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr ""
-"Kunne ikke verifisere meldingens signatur: kunne ikke opprette midlertidig "
-"fil: %s"
+#: ../camel/camel-gpg-context.c:1695
+msgid "Cannot verify message signature: "
+msgstr "Kunne ikke verifisere meldingens signatur: "
 
-#: ../camel/camel-gpg-context.c:1807
-#, c-format
-msgid "Could not generate encrypting data: %s"
-msgstr "Kunne ikke generere krypteringsdata: %s"
+#: ../camel/camel-gpg-context.c:1814
+msgid "Could not generate encrypting data: "
+msgstr "Kunne ikke generere krypteringsdata: "
 
-#: ../camel/camel-gpg-context.c:1863
+#: ../camel/camel-gpg-context.c:1866
 msgid "This is a digitally encrypted message part"
 msgstr "Dette er en digitalt kryptert meldingsdel"
 
-#: ../camel/camel-gpg-context.c:1919 ../camel/camel-gpg-context.c:1928
-#: ../camel/camel-gpg-context.c:1950
+#: ../camel/camel-gpg-context.c:1922 ../camel/camel-gpg-context.c:1931
+#: ../camel/camel-gpg-context.c:1954
+#, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "Kan ikke dekryptere e-post: Ikke korrekt e-postformat"
 
-#: ../camel/camel-gpg-context.c:1939
+#: ../camel/camel-gpg-context.c:1942
+#, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Feil under dekryptering av MIME-del: protokollfeil"
 
-#: ../camel/camel-gpg-context.c:2023 ../camel/camel-smime-context.c:1235
+#: ../camel/camel-gpg-context.c:2023 ../camel/camel-smime-context.c:1241
 msgid "Encrypted content"
 msgstr "Kryptert innhold"
 
-#: ../camel/camel-gpg-context.c:2045
-msgid "Unable to parse message content"
-msgstr "Kunne ikke lese meldingsinnhold"
-
-#: ../camel/camel-gpg-context.c:2072 ../camel/camel-gpg-context.c:2124
-#: ../camel/providers/smtp/camel-smtp-transport.c:115
-#: ../camel/providers/smtp/camel-smtp-transport.c:170
-msgid "Unknown"
-msgstr "Ukjent"
-
-#: ../camel/camel-lock-client.c:105
+#: ../camel/camel-lock-client.c:106
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Kunne ikke rÃ¸r for lÃ¥shjelper: %s"
 
-#: ../camel/camel-lock-client.c:128
+#: ../camel/camel-lock-client.c:130
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "Kan ikke kjÃ¸re fork for lÃ¥shjelper: %s"
 
-#: ../camel/camel-lock-client.c:208 ../camel/camel-lock-client.c:234
+#: ../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 "Kunne ikke lÃ¥se Â«%sÂ»: protokollfeil med lÃ¥shjelper"
 
-#: ../camel/camel-lock-client.c:223
+#: ../camel/camel-lock-client.c:227
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "Kunne ikke lÃ¥se Â«%sÂ»"
 
-#: ../camel/camel-lock.c:104
+#: ../camel/camel-lock.c:102
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Kunne ikke opprette lÃ¥sfil for %s: %s"
 
-#: ../camel/camel-lock.c:147
+#: ../camel/camel-lock.c:145
 #, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
+msgid "Timed out trying to get lock file on %s.  Try again later."
 msgstr "Tidsavbrudd under venting pÃ¥ lÃ¥sfil for %s. PrÃ¸v igjen senere."
 
-#: ../camel/camel-lock.c:206
+#: ../camel/camel-lock.c:205
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Feil under lÃ¥sing ved bruk av fcntl(2): %s"
@@ -1753,17 +1910,17 @@ msgstr "Feil under lÃ¥sing ved bruk av fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Feil under lÃ¥sing ved bruk av flock(2): %s"
 
-#: ../camel/camel-movemail.c:108
+#: ../camel/camel-movemail.c:105
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Kunne ikke sjekke e-post fil %s: %s"
 
-#: ../camel/camel-movemail.c:121
+#: ../camel/camel-movemail.c:119
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Kunne ikke Ã¥pne postfil %s: %s"
 
-#: ../camel/camel-movemail.c:130
+#: ../camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Kunne ikke Ã¥pne midlertidig postfil %s: %s"
@@ -1773,116 +1930,116 @@ msgstr "Kunne ikke Ã¥pne midlertidig postfil %s: %s"
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Kunne ikke lagre post i midlertidig fil %s: %s"
 
-#: ../camel/camel-movemail.c:192
+#: ../camel/camel-movemail.c:193
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Kunne ikke opprette rÃ¸r: %s"
 
-#: ../camel/camel-movemail.c:205
+#: ../camel/camel-movemail.c:207
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Kunne ikke kjÃ¸re fork: %s"
 
-#: ../camel/camel-movemail.c:243
+#: ../camel/camel-movemail.c:245
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail-programmet feilet: %s"
 
-#: ../camel/camel-movemail.c:244
+#: ../camel/camel-movemail.c:246
 msgid "(Unknown error)"
 msgstr "(Ukjent feil)"
 
-#: ../camel/camel-movemail.c:270
+#: ../camel/camel-movemail.c:273
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Feil under lesing av postfil: %s"
 
-#: ../camel/camel-movemail.c:282
+#: ../camel/camel-movemail.c:286
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Feil under skriving av midlertidig fil: %s"
 
-#: ../camel/camel-movemail.c:478 ../camel/camel-movemail.c:546
+#: ../camel/camel-movemail.c:483 ../camel/camel-movemail.c:552
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Feil under kopiering midlertidig meldingsfil: %s"
 
-#: ../camel/camel-multipart-signed.c:593
-msgid "parse error"
-msgstr "lesefeil"
+#: ../camel/camel-multipart-signed.c:285
+#, c-format
+msgid "No content available"
+msgstr "Ikke noe innhold tilgjengelig"
 
-#: ../camel/camel-net-utils.c:511 ../camel/camel-net-utils.c:694
-#: ../camel/camel-net-utils.c:842
-#: ../camel/providers/pop3/camel-pop3-store.c:477
-#: ../camel/providers/pop3/camel-pop3-store.c:586
-msgid "Canceled"
-msgstr "Avbrutt"
+#: ../camel/camel-multipart-signed.c:293
+#, c-format
+msgid "No signature available"
+msgstr "Ingen signatur tilgjengelig"
 
-#: ../camel/camel-net-utils.c:533
-msgid "cannot create thread"
-msgstr "kan ikke opprette trÃ¥d"
+#: ../camel/camel-multipart-signed.c:612
+#, c-format
+msgid "parse error"
+msgstr "lesefeil"
 
-#: ../camel/camel-net-utils.c:698
+#: ../camel/camel-net-utils.c:693
 #, c-format
 msgid "Resolving: %s"
 msgstr "Finner: Â«%sÂ»"
 
-#: ../camel/camel-net-utils.c:720
+#: ../camel/camel-net-utils.c:715
 msgid "Host lookup failed"
 msgstr "Vertsoppslag feilet"
 
-#: ../camel/camel-net-utils.c:724
+#: ../camel/camel-net-utils.c:719
 #, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr "Navneoppslag feilet: %s: %s"
 
-#: ../camel/camel-net-utils.c:846
+#: ../camel/camel-net-utils.c:842
 msgid "Resolving address"
 msgstr "Finner adresse"
 
-#: ../camel/camel-net-utils.c:866
+#: ../camel/camel-net-utils.c:862
 msgid "Name lookup failed"
 msgstr "Navneoppslag feilet"
 
-#: ../camel/camel-net-utils.c:871
+#: ../camel/camel-net-utils.c:867
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "Navneoppslag feilet: %s"
 
-#: ../camel/camel-offline-folder.c:170
+#: ../camel/camel-offline-folder.c:169
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "Synkroniserer meldinger i mappe Â«%sÂ» til disk"
 
-#: ../camel/camel-offline-journal.c:143 ../camel/camel-offline-journal.c:168
+#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:170
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "Kan ikke skrive journal for frakoblet tilstand for mappe Â«%sÂ»: %s"
 
-#: ../camel/camel-provider.c:59
+#: ../camel/camel-provider.c:58
 msgid "Virtual folder email provider"
 msgstr "E-post-tilbyder for virtuelle mapper"
 
-#: ../camel/camel-provider.c:61
+#: ../camel/camel-provider.c:60
 msgid "For reading mail as a query of another set of folders"
 msgstr "For lesing av e-post som en spÃ¸rring pÃ¥ et annet sett med mapper"
 
-#: ../camel/camel-provider.c:189
+#: ../camel/camel-provider.c:188
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "Kunne ikke laste %s: Modullasting er ikke stÃ¸ttet pÃ¥ dette systemet."
 
-#: ../camel/camel-provider.c:198
+#: ../camel/camel-provider.c:197
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Kunne ikke laste %s: %s"
 
-#: ../camel/camel-provider.c:207
+#: ../camel/camel-provider.c:206
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Kunne ikke laste %s: Ingen initieringskode i modulen."
 
-#: ../camel/camel-provider.c:388 ../camel/camel-session.c:203
+#: ../camel/camel-provider.c:388 ../camel/camel-session.c:207
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "Ingen tilbyder tilgjengelig for protokoll Â«%sÂ»"
@@ -1895,11 +2052,12 @@ msgstr "Anonym"
 msgid "This option will connect to the server using an anonymous login."
 msgstr "Dette valget vil koble til tjeneren med anonym pÃ¥logging."
 
-#: ../camel/camel-sasl-anonymous.c:68
+#: ../camel/camel-sasl-anonymous.c:69
+#, c-format
 msgid "Authentication failed."
 msgstr "Autentisering feilet."
 
-#: ../camel/camel-sasl-anonymous.c:78
+#: ../camel/camel-sasl-anonymous.c:80
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -1908,7 +2066,7 @@ msgstr ""
 "Ugyldig informasjon i sporing av e-postadresse:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:91
+#: ../camel/camel-sasl-anonymous.c:94
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -1917,7 +2075,7 @@ msgstr ""
 "Ugyldig ugjennomsiktig sporingsinformasjon:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:104
+#: ../camel/camel-sasl-anonymous.c:108
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -1950,27 +2108,33 @@ msgstr ""
 "Dette alternativet kobler til tjeneren med bruk av DIGEST-MD5-passord, hvis "
 "tjeneren stÃ¸tter det."
 
-#: ../camel/camel-sasl-digest-md5.c:817
+#: ../camel/camel-sasl-digest-md5.c:818
+#, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "SpÃ¸rring fra tjener for lang (>2048 oktetter)"
 
-#: ../camel/camel-sasl-digest-md5.c:827
+#: ../camel/camel-sasl-digest-md5.c:829
+#, c-format
 msgid "Server challenge invalid\n"
 msgstr "Ugyldig spÃ¸rring fra tjener\n"
 
-#: ../camel/camel-sasl-digest-md5.c:834
+#: ../camel/camel-sasl-digest-md5.c:837
+#, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "SpÃ¸rring fra tjener inneholdt ugyldig Â«Quality of ProtectionÂ»-tegn"
 
-#: ../camel/camel-sasl-digest-md5.c:865
+#: ../camel/camel-sasl-digest-md5.c:869
+#, c-format
 msgid "Server response did not contain authorization data"
 msgstr "Svar fra tjener inneholdt ikke godkjenningsdata"
 
-#: ../camel/camel-sasl-digest-md5.c:885
+#: ../camel/camel-sasl-digest-md5.c:890
+#, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "Svar fra tjener inneholdt ufullstendige godkjenningsdata"
 
-#: ../camel/camel-sasl-digest-md5.c:897
+#: ../camel/camel-sasl-digest-md5.c:903
+#, c-format
 msgid "Server response does not match"
 msgstr "Svar fra tjener er ikke likt"
 
@@ -2043,13 +2207,15 @@ msgstr "Konsistenssjekk utfÃ¸rt pÃ¥ akkreditivene feilet."
 msgid "The referenced credentials have expired."
 msgstr "Refererte akkreditiver har utlÃ¸pt."
 
-#: ../camel/camel-sasl-gssapi.c:162 ../camel/camel-sasl-gssapi.c:296
-#: ../camel/camel-sasl-gssapi.c:339 ../camel/camel-sasl-gssapi.c:355
-#: ../camel/providers/imap/camel-imap-store.c:1135
+#: ../camel/camel-sasl-gssapi.c:162 ../camel/camel-sasl-gssapi.c:300
+#: ../camel/camel-sasl-gssapi.c:344 ../camel/camel-sasl-gssapi.c:361
+#: ../camel/providers/smtp/camel-smtp-transport.c:1192
+#, c-format
 msgid "Bad authentication response from server."
 msgstr "Ugyldig svar pÃ¥ autentisering fra tjener."
 
-#: ../camel/camel-sasl-gssapi.c:366
+#: ../camel/camel-sasl-gssapi.c:373
+#, c-format
 msgid "Unsupported security layer."
 msgstr "UstÃ¸ttet sikkerhetslag."
 
@@ -2062,6 +2228,7 @@ msgid "This option will connect to the server using a simple password."
 msgstr "Dette valget vil koble til tjeneren ved bruk av et passord."
 
 #: ../camel/camel-sasl-login.c:94
+#, c-format
 msgid "Unknown authentication state."
 msgstr "Ukjent autentiseringstilstand."
 
@@ -2094,35 +2261,37 @@ msgstr ""
 msgid "POP Source URI"
 msgstr "Kilde-URI for POP"
 
-#: ../camel/camel-sasl-popb4smtp.c:88
+#: ../camel/camel-sasl-popb4smtp.c:89
+#, c-format
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr "POP fÃ¸r SMTP autentisering via en ukjent transport"
 
-#: ../camel/camel-sasl-popb4smtp.c:95
+#: ../camel/camel-sasl-popb4smtp.c:97
+#, c-format
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "POP fÃ¸r SMTP autentisering via ikke-pop kilde"
 
-#: ../camel/camel-search-private.c:113
+#: ../camel/camel-search-private.c:112
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Kompilering av regulÃ¦rt uttrykk feilet: %s: %s"
 
-#: ../camel/camel-service.c:97
+#: ../camel/camel-service.c:88
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL Â«%sÂ» mÃ¥ inneholde et brukernavn"
 
-#: ../camel/camel-service.c:101
+#: ../camel/camel-service.c:92
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL Â«%sÂ» mÃ¥ inneholde et vertsnavn"
 
-#: ../camel/camel-service.c:105
+#: ../camel/camel-service.c:96
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL Â«%sÂ» mÃ¥ inneholde en sti"
 
-#: ../camel/camel-session.c:258
+#: ../camel/camel-session.c:263
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2131,235 +2300,235 @@ msgstr ""
 "Kan ikke opprette katalog %s:\n"
 "%s"
 
-#: ../camel/camel-session.c:743
+#: ../camel/camel-session.c:760
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "Vennligst oppgi %s-passord for %s pÃ¥ vert %s"
 
-#: ../camel/camel-smime-context.c:346 ../camel/camel-smime-context.c:1037
+#: ../camel/camel-smime-context.c:348 ../camel/camel-smime-context.c:1041
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "Kan ikke finne sertifikat for Â«%sÂ»"
 
-#: ../camel/camel-smime-context.c:374
+#: ../camel/camel-smime-context.c:376
 msgid "Cannot create CMS message"
 msgstr "Kan ikke opprette CMS-melding"
 
-#: ../camel/camel-smime-context.c:379
+#: ../camel/camel-smime-context.c:381
 msgid "Cannot create CMS signed data"
 msgstr "Kan ikke opprette CMS-signerte data"
 
-#: ../camel/camel-smime-context.c:385
+#: ../camel/camel-smime-context.c:387
 msgid "Cannot attach CMS signed data"
 msgstr "Kan ikke legge ved CMS-signerte data"
 
-#: ../camel/camel-smime-context.c:392
+#: ../camel/camel-smime-context.c:394
 msgid "Cannot attach CMS data"
 msgstr "Kan ikke legge ved CMS-data"
 
-#: ../camel/camel-smime-context.c:398
+#: ../camel/camel-smime-context.c:400
 msgid "Cannot create CMS Signer information"
 msgstr "Kan ikke opprette informasjon om CMS-signerer"
 
-#: ../camel/camel-smime-context.c:404
+#: ../camel/camel-smime-context.c:406
 msgid "Cannot find certificate chain"
 msgstr "Kan ikke finne sertifikatkjede"
 
-#: ../camel/camel-smime-context.c:410
+#: ../camel/camel-smime-context.c:412
 msgid "Cannot add CMS Signing time"
 msgstr "Kan ikke legge til tid for CMS-signering"
 
-#: ../camel/camel-smime-context.c:434 ../camel/camel-smime-context.c:449
+#: ../camel/camel-smime-context.c:436 ../camel/camel-smime-context.c:451
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "Krypteringssertifikat for Â«%sÂ» eksisterer ikke"
 
-#: ../camel/camel-smime-context.c:456
+#: ../camel/camel-smime-context.c:458
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "Kan ikke legge til SMIMEEncKeyPrefs-attributt"
 
-#: ../camel/camel-smime-context.c:461
+#: ../camel/camel-smime-context.c:463
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "Kan ikke legge til MS SMIMEEncKeyPrefs-attributt"
 
-#: ../camel/camel-smime-context.c:466
+#: ../camel/camel-smime-context.c:468
 msgid "Cannot add encryption certificate"
 msgstr "Kan ikke legge til sertifikat for kryptering"
 
-#: ../camel/camel-smime-context.c:472
+#: ../camel/camel-smime-context.c:474
 msgid "Cannot add CMS Signer information"
 msgstr "Kan ikke legge til informasjon om CMS-signerer"
 
-#: ../camel/camel-smime-context.c:504
+#: ../camel/camel-smime-context.c:506
 msgid "Unverified"
 msgstr "Uverifisert"
 
-#: ../camel/camel-smime-context.c:506
+#: ../camel/camel-smime-context.c:508
 msgid "Good signature"
 msgstr "Gyldig signatur"
 
-#: ../camel/camel-smime-context.c:508
+#: ../camel/camel-smime-context.c:510
 msgid "Bad signature"
 msgstr "Ugyldig signatur"
 
-#: ../camel/camel-smime-context.c:510
+#: ../camel/camel-smime-context.c:512
 msgid "Content tampered with or altered in transit"
 msgstr "Innholdet er endret under overfÃ¸ring"
 
-#: ../camel/camel-smime-context.c:512
+#: ../camel/camel-smime-context.c:514
 msgid "Signing certificate not found"
 msgstr "Sertifikat for signering ble ikke funnet"
 
-#: ../camel/camel-smime-context.c:514
+#: ../camel/camel-smime-context.c:516
 msgid "Signing certificate not trusted"
 msgstr "Stoler ikke pÃ¥ sertifikat for signering"
 
-#: ../camel/camel-smime-context.c:516
+#: ../camel/camel-smime-context.c:518
 msgid "Signature algorithm unknown"
 msgstr "Ukjent signeringsalgoritme"
 
-#: ../camel/camel-smime-context.c:518
+#: ../camel/camel-smime-context.c:520
 msgid "Signature algorithm unsupported"
 msgstr "Signaturalgoritmen er ikke stÃ¸ttet"
 
-#: ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:522
 msgid "Malformed signature"
 msgstr "Feilutformet signatur"
 
-#: ../camel/camel-smime-context.c:522
+#: ../camel/camel-smime-context.c:524
 msgid "Processing error"
 msgstr "Lesefeil"
 
-#: ../camel/camel-smime-context.c:564
+#: ../camel/camel-smime-context.c:566
 msgid "No signed data in signature"
 msgstr "Ingen signerte data i signatur"
 
-#: ../camel/camel-smime-context.c:569
+#: ../camel/camel-smime-context.c:571
 msgid "Digests missing from enveloped data"
 msgstr "Sammendrag av innpakkede data mangler"
 
-#: ../camel/camel-smime-context.c:582 ../camel/camel-smime-context.c:593
+#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
 msgid "Cannot calculate digests"
 msgstr "Kan ikke beregne sammendrag"
 
-#: ../camel/camel-smime-context.c:600 ../camel/camel-smime-context.c:604
+#: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
 msgid "Cannot set message digests"
 msgstr "Kan ikke sette sammendrag for melding"
 
-#: ../camel/camel-smime-context.c:614 ../camel/camel-smime-context.c:619
+#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
 msgid "Certificate import failed"
 msgstr "Import av sertifikat feilet"
 
-#: ../camel/camel-smime-context.c:629
+#: ../camel/camel-smime-context.c:631
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr ""
 "Sertifikatet er den eneste meldingen. Kan ikke verifisere sertifikatene"
 
-#: ../camel/camel-smime-context.c:632
+#: ../camel/camel-smime-context.c:634
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr ""
 "Sertifikatet er den eneste meldingen. Sertifikater importert og verifisert"
 
-#: ../camel/camel-smime-context.c:636
+#: ../camel/camel-smime-context.c:638
 msgid "Cannot find signature digests"
 msgstr "Kan ikke finne signatursammendrag"
 
-#: ../camel/camel-smime-context.c:652
+#: ../camel/camel-smime-context.c:654
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Signeringspart: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:831 ../camel/camel-smime-context.c:1109
+#: ../camel/camel-smime-context.c:832 ../camel/camel-smime-context.c:1114
 msgid "Cannot create encoder context"
 msgstr "Kan ikke opprette kontekst for koding"
 
-#: ../camel/camel-smime-context.c:837
+#: ../camel/camel-smime-context.c:838
 msgid "Failed to add data to CMS encoder"
 msgstr "Kunne ikke legge til data i CMS-koder"
 
-#: ../camel/camel-smime-context.c:842 ../camel/camel-smime-context.c:1126
+#: ../camel/camel-smime-context.c:843 ../camel/camel-smime-context.c:1131
 msgid "Failed to encode data"
 msgstr "Kunne ikke kode data"
 
-#: ../camel/camel-smime-context.c:977 ../camel/camel-smime-context.c:1214
+#: ../camel/camel-smime-context.c:981 ../camel/camel-smime-context.c:1220
 msgid "Decoder failed"
 msgstr "Dekoder feilet"
 
-#: ../camel/camel-smime-context.c:1044
+#: ../camel/camel-smime-context.c:1049
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "Kan ikke finne felles krypteringsalgoritme"
 
-#: ../camel/camel-smime-context.c:1052
+#: ../camel/camel-smime-context.c:1057
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Kan ikke allokere plass for krypteringsnÃ¸kkel"
 
-#: ../camel/camel-smime-context.c:1063
+#: ../camel/camel-smime-context.c:1068
 msgid "Cannot create CMS Message"
 msgstr "Kan ikke opprette CMS-melding"
 
-#: ../camel/camel-smime-context.c:1069
+#: ../camel/camel-smime-context.c:1074
 msgid "Cannot create CMS Enveloped data"
 msgstr "Kan ikke opprette CMS-innpakkede data"
 
-#: ../camel/camel-smime-context.c:1075
+#: ../camel/camel-smime-context.c:1080
 msgid "Cannot attach CMS Enveloped data"
 msgstr "Kan ikke legge ved CMS-innpakkede data"
 
-#: ../camel/camel-smime-context.c:1081
+#: ../camel/camel-smime-context.c:1086
 msgid "Cannot attach CMS data object"
 msgstr "Kan ikke legge ved dataobjekt for CMS"
 
-#: ../camel/camel-smime-context.c:1090
+#: ../camel/camel-smime-context.c:1095
 msgid "Cannot create CMS Recipient information"
 msgstr "Kan ikke opprette mottakerinformasjon for CMS"
 
-#: ../camel/camel-smime-context.c:1095
+#: ../camel/camel-smime-context.c:1100
 msgid "Cannot add CMS Recipient information"
 msgstr "Kan ikke legge til mottakerinformasjon for CMS"
 
-#: ../camel/camel-smime-context.c:1120
+#: ../camel/camel-smime-context.c:1125
 msgid "Failed to add data to encoder"
 msgstr "Klarte ikke Ã¥ legge til data for koder"
 
-#: ../camel/camel-smime-context.c:1221
+#: ../camel/camel-smime-context.c:1227
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME dekryptering: Fant ikke kryptert innhold"
 
-#: ../camel/camel-store.c:426
+#: ../camel/camel-store.c:444
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "Kan ikke opprette mappe Â«%sÂ»: mappen eksisterer"
 
-#: ../camel/camel-store.c:520
+#: ../camel/camel-store.c:543
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Kan ikke opprette mappe: Â«%sÂ»: mappen eksisterer"
 
-#: ../camel/camel-store.c:591 ../camel/camel-vee-store.c:261
-#: ../camel/providers/local/camel-maildir-store.c:218
+#: ../camel/camel-store.c:616 ../camel/camel-vee-store.c:263
+#: ../camel/providers/local/camel-maildir-store.c:224
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kan ikke slette mappe: %s: Ugyldig operasjon"
 
-#: ../camel/camel-store.c:655 ../camel/camel-vee-store.c:213
-#: ../camel/providers/local/camel-maildir-store.c:305
+#: ../camel/camel-store.c:680 ../camel/camel-vee-store.c:213
+#: ../camel/providers/local/camel-maildir-store.c:314
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kan ikke endre navn pÃ¥ mappe: %s: Ugyldig operasjon"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:1086 ../camel/camel-vtrash-folder.c:49
+#: ../camel/camel-store.c:1128 ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "Papirkurv"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:1089 ../camel/camel-vtrash-folder.c:51
+#: ../camel/camel-store.c:1131 ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "SÃ¸ppel"
 
-#: ../camel/camel-tcp-stream-ssl.c:729
+#: ../camel/camel-tcp-stream-ssl.c:786
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2372,16 +2541,16 @@ msgstr ""
 "Fingeravtrykk      %s\n"
 "Signatur:          %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:735
+#: ../camel/camel-tcp-stream-ssl.c:792
 msgid "GOOD"
 msgstr "GODTATT"
 
-#: ../camel/camel-tcp-stream-ssl.c:735
+#: ../camel/camel-tcp-stream-ssl.c:792
 msgid "BAD"
 msgstr "UGYLDIG"
 
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:739
+#: ../camel/camel-tcp-stream-ssl.c:796
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2396,7 +2565,7 @@ msgstr ""
 "\n"
 "Vil du akseptere?"
 
-#: ../camel/camel-tcp-stream-ssl.c:783
+#: ../camel/camel-tcp-stream-ssl.c:840
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2405,7 +2574,7 @@ msgstr ""
 "Sertifikatproblem: %s\n"
 "Utsteder: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:835
+#: ../camel/camel-tcp-stream-ssl.c:892
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2414,7 +2583,7 @@ msgstr ""
 "Ugyldig sertifikatdomene: %s\n"
 "Utsteder: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:853
+#: ../camel/camel-tcp-stream-ssl.c:910
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2423,7 +2592,7 @@ msgstr ""
 "Sertifikatet har gÃ¥tt ut: %s\n"
 "Utsteder: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:870
+#: ../camel/camel-tcp-stream-ssl.c:927
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2432,49 +2601,50 @@ msgstr ""
 "Listen over sertifikater som er trukket tilbake er gÃ¥tt ut: %s\n"
 "Utsteder: %s"
 
-#: ../camel/camel-url.c:315
+#: ../camel/camel-url.c:314
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "Kunne ikke tolke URL Â«%sÂ»"
 
-#: ../camel/camel-vee-folder.c:1050
+#: ../camel/camel-vee-folder.c:1044
 #, c-format
-msgid "Error storing '%s': %s"
-msgstr "Feil ved lagring av Â«%sÂ»: %s"
+msgid "Error storing '%s': "
+msgstr "Feil ved lagring av Â«%sÂ»: "
 
-#: ../camel/camel-vee-folder.c:1123
+#: ../camel/camel-vee-folder.c:1117
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Ingen slik melding %s i %s"
 
-#: ../camel/camel-vee-folder.c:1139 ../camel/camel-vee-folder.c:1154
+#: ../camel/camel-vee-folder.c:1133 ../camel/camel-vee-folder.c:1148
+#, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Kan ikke kopiere eller flytte meldinger inn i en virtuell mappe"
 
-#: ../camel/camel-vee-store.c:142 ../camel/camel-vee-store.c:144
-#: ../camel/camel-vee-store.c:414
+#: ../camel/camel-vee-store.c:141 ../camel/camel-vee-store.c:143
+#: ../camel/camel-vee-store.c:417
 msgid "Unmatched"
 msgstr "Ingen treff"
 
-#: ../camel/camel-vee-store.c:222
+#: ../camel/camel-vee-store.c:223
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kan ikke endre navn pÃ¥ mappe: %s: Ingen slik mappe"
 
-#: ../camel/camel-vee-store.c:286
+#: ../camel/camel-vee-store.c:289
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kan ikke slette mappe: %s: Ingen slik mappe"
 
-#: ../camel/camel-vtrash-folder.c:50
+#: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
 msgstr "Kan ikke kopiere meldinger til papirkurvmappen"
 
-#: ../camel/camel-vtrash-folder.c:52
+#: ../camel/camel-vtrash-folder.c:51
 msgid "Cannot copy messages to the Junk folder"
 msgstr "Kan ikke kopiere meldinger til sÃ¸ppelmappen"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:138
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:139
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2483,101 +2653,85 @@ msgstr ""
 "Kan ikke hente melding: %s\n"
 "  %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:138
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:139
 #: ../camel/providers/local/camel-maildir-folder.c:233
 #: ../camel/providers/local/camel-maildir-folder.c:268
-#: ../camel/providers/local/camel-maildir-folder.c:389
-#: ../camel/providers/local/camel-mbox-folder.c:334
-#: ../camel/providers/local/camel-mbox-folder.c:385
-#: ../camel/providers/local/camel-mh-folder.c:221
+#: ../camel/providers/local/camel-maildir-folder.c:380
+#: ../camel/providers/local/camel-mbox-folder.c:329
+#: ../camel/providers/local/camel-mbox-folder.c:380
+#: ../camel/providers/local/camel-mh-folder.c:215
 msgid "No such message"
 msgstr "Ingen slik melding"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:152
-#: ../camel/providers/pop3/camel-pop3-folder.c:268
-#: ../camel/providers/pop3/camel-pop3-folder.c:620
-#: ../camel/providers/pop3/camel-pop3-folder.c:683
-#: ../camel/providers/pop3/camel-pop3-folder.c:705
-msgid "User canceled"
-msgstr "Bruker avbrÃ¸t"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:161
-#: ../camel/providers/nntp/camel-nntp-folder.c:232
-#: ../camel/providers/nntp/camel-nntp-folder.c:236
-#: ../camel/providers/nntp/camel-nntp-folder.c:249
-#: ../camel/providers/nntp/camel-nntp-folder.c:349
-#: ../camel/providers/pop3/camel-pop3-folder.c:400
-#: ../camel/providers/pop3/camel-pop3-folder.c:624
-#: ../camel/providers/pop3/camel-pop3-folder.c:687
-#: ../camel/providers/pop3/camel-pop3-folder.c:695
-#: ../camel/providers/pop3/camel-pop3-folder.c:709
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:158
+#: ../camel/providers/nntp/camel-nntp-folder.c:244
+#: ../camel/providers/nntp/camel-nntp-folder.c:337
+#: ../camel/providers/pop3/camel-pop3-folder.c:714
 #, c-format
-msgid "Cannot get message %s: %s"
-msgstr "Kan ikke hente melding %s: %s"
+msgid "Cannot get message %s: "
+msgstr "Kan ikke hente melding %s: "
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:179
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:188
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2668
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:176
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:186
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2644
+#, c-format
 msgid "This message is not available in offline mode."
 msgstr "Denne meldingen er ikke tilgjengelig i frakoblet modus."
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:204
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:203
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:213
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2137
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2190
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2109
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2163
+#, c-format
 msgid "Could not get message"
 msgstr "Kunne ikke hente melding"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1044
-#: ../camel/providers/imap/camel-imap-folder.c:369
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1038
+#: ../camel/providers/imap/camel-imap-folder.c:376
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Kunne ikke laste sammendrag for %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1119
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1112
 #, c-format
 msgid "Checking for deleted messages %s"
 msgstr "Ser etter slettede meldinger %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1419
-msgid "Trash Folder Full. Please Empty."
-msgstr "Papirkurven er full. Vennligst tÃ¸m den."
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1666
-#: ../camel/providers/groupwise/camel-groupwise-store.c:639
-#: ../camel/providers/groupwise/camel-groupwise-store.c:776
-#: ../camel/providers/imap/camel-imap-folder.c:3628
-#: ../camel/providers/imap/camel-imap-folder.c:3706
-#: ../camel/providers/imapx/camel-imapx-server.c:3009
-#: ../camel/providers/imapx/camel-imapx-server.c:3105
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1637
+#: ../camel/providers/groupwise/camel-groupwise-store.c:654
+#: ../camel/providers/groupwise/camel-groupwise-store.c:779
+#: ../camel/providers/imap/camel-imap-folder.c:3806
+#: ../camel/providers/imap/camel-imap-folder.c:3884
+#: ../camel/providers/imapx/camel-imapx-server.c:3718
+#: ../camel/providers/imapx/camel-imapx-server.c:3842
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "Henter sammendragsinformasjon for nye meldinger i %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2501
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2550
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2474
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2524
 #, c-format
 msgid "Cannot append message to folder '%s': %s"
 msgstr "Kan ikke legge til melding i mappe Â«%sÂ»: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2536
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2510
 #, c-format
 msgid "Cannot create message: %s"
 msgstr "Kan ikke opprette melding: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:241
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:240
 #, c-format
 msgid "Cannot get folder container %s"
 msgstr "Kan ikke finne mappekontainer %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:304
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:303
+#, c-format
 msgid "Cannot append message in offline mode: cache unavailable"
 msgstr "Kan ikke legge til melding i frakoblet modus: buffer ikke tilgjengelig"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:321
-#, c-format
-msgid "Cannot append message in offline mode: %s"
-msgstr "Kan ikke legge til melding i frakoblet modus: %s"
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:320
+msgid "Cannot append message in offline mode: "
+msgstr "Kan ikke legge til melding i frakoblet modus: "
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:48
 msgid "Checking for new mail"
@@ -2585,13 +2739,13 @@ msgstr "Ser etter nye meldinger"
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:50
 #: ../camel/providers/imap/camel-imap-provider.c:42
-#: ../camel/providers/imapx/camel-imapx-provider.c:45
+#: ../camel/providers/imapx/camel-imapx-provider.c:47
 msgid "C_heck for new messages in all folders"
 msgstr "_Se etter nye meldinger i alle mapper"
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:53
 #: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imapx/camel-imapx-provider.c:71
+#: ../camel/providers/imapx/camel-imapx-provider.c:75
 #: ../camel/providers/local/camel-local-provider.c:42
 #: ../camel/providers/local/camel-local-provider.c:82
 #: ../camel/providers/local/camel-local-provider.c:102
@@ -2608,7 +2762,7 @@ msgstr "Se etter s_Ã¸ppelinnhold i nye meldinger"
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:59
 #: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imapx/camel-imapx-provider.c:77
+#: ../camel/providers/imapx/camel-imapx-provider.c:81
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr "Se kun etter sÃ¸ppelinnhold i nye meldinger i inn_boksen"
 
@@ -2633,8 +2787,8 @@ msgid "For accessing Novell GroupWise servers"
 msgstr "For tilgang til Novell GroupWise-tjenere"
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:98
-#: ../camel/providers/imap/camel-imap-provider.c:96
-#: ../camel/providers/imapx/camel-imapx-provider.c:103
+#: ../camel/providers/imap/camel-imap-provider.c:97
+#: ../camel/providers/imapx/camel-imapx-provider.c:107
 #: ../camel/providers/nntp/camel-nntp-provider.c:72
 #: ../camel/providers/pop3/camel-pop3-provider.c:70
 msgid "Password"
@@ -2646,53 +2800,62 @@ msgid ""
 msgstr ""
 "Dette valget vil la deg koble til en GroupWise-tjener med klartekst-passord."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:106
+#: ../camel/providers/groupwise/camel-groupwise-store.c:107
+#, c-format
 msgid "Host or user not available in url"
 msgstr "Vert eller bruker ikke tilgjengelig i URL"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:205
-#: ../camel/providers/imap/camel-imap-store.c:1223
-#: ../camel/providers/imapx/camel-imapx-server.c:2323
+#: ../camel/providers/groupwise/camel-groupwise-store.c:207
+#: ../camel/providers/imap/camel-imap-store.c:1207
+#: ../camel/providers/imapx/camel-imapx-server.c:2972
+#, c-format
 msgid "You did not enter a password."
 msgstr "Du skrev ikke inn et passord."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:322
+#: ../camel/providers/groupwise/camel-groupwise-store.c:328
 msgid "Some features may not work correctly with your current server version"
 msgstr ""
 "Noen funksjoner vil ikke fungere korrekt med din nÃ¥vÃ¦rende tjenerversjon"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:543
-#: ../camel/providers/imap/camel-imap-store.c:1757
-#: ../camel/providers/imap/camel-imap-store.c:1953
-#: ../camel/providers/imapx/camel-imapx-store.c:354
+#: ../camel/providers/groupwise/camel-groupwise-store.c:550
+#: ../camel/providers/imap/camel-imap-store.c:1776
+#: ../camel/providers/imap/camel-imap-store.c:1971
+#: ../camel/providers/imapx/camel-imapx-store.c:400
 #, c-format
 msgid "No such folder %s"
 msgstr "Mappen %s eksisterer ikke"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1228
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1187
+#, c-format
 msgid "Cannot create GroupWise folders in offline mode."
 msgstr "Kan ikke opprette GroupWise-mapper i frakoblet modus."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1246
-#: ../camel/providers/imap/camel-imap-store.c:1834
-#: ../camel/providers/imap/camel-imap-store.c:2253
-#: ../camel/providers/imapx/camel-imapx-store.c:801
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1196
+#, c-format
+msgid "Cannot create a special system folder"
+msgstr "Kan ikke lage en spesiell systemmappe"
+
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1206
+#: ../camel/providers/imap/camel-imap-store.c:1854
+#: ../camel/providers/imap/camel-imap-store.c:2276
+#: ../camel/providers/imapx/camel-imapx-store.c:859
+#, c-format
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Opphavsmappen tillates ikke Ã¥ ha undermapper"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1329
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1354
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1289
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1314
 #, c-format
 msgid "Cannot rename GroupWise folder '%s' to '%s'"
 msgstr "Kan ikke endre navn pÃ¥ GroupWise-mappe Â«%sÂ» til Â«%sÂ»"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1388
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1348
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:54
 #, c-format
 msgid "GroupWise server %s"
 msgstr "GroupWise-tjener %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1390
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1350
 #, c-format
 msgid "GroupWise service for %s on %s"
 msgstr "GroupWise-tjeneste for %s pÃ¥ %s"
@@ -2702,15 +2865,17 @@ msgstr "GroupWise-tjeneste for %s pÃ¥ %s"
 msgid "GroupWise mail delivery via %s"
 msgstr "GroupWise e-postlevering via %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:94
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:95
 msgid "Sending Message"
 msgstr "Sender melding"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:103
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:105
+#, c-format
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Kan ikke finne mappe: Ugyldig operasjon pÃ¥ dette lageret"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:148
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:152
+#, c-format
 msgid ""
 "You have exceeded this account's storage limit. Your messages are queued in "
 "your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
@@ -2720,31 +2885,29 @@ msgstr ""
 "i utboksen. Send pÃ¥ nytt ved Ã¥ trykke send/motta etter Ã¥ ha slettet eller "
 "arkivert noen meldinger.\n"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:152
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:193
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:157
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Kunne ikke sende meldingen: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:189
-#: ../camel/providers/imap/camel-imap-command.c:282
+#: ../camel/providers/imap/camel-imap-command.c:190
+#: ../camel/providers/imap/camel-imap-command.c:288
+#, c-format
 msgid "No output stream"
 msgstr "Ingen utdatastrÃ¸m"
 
-#: ../camel/providers/imap/camel-imap-command.c:196
-#: ../camel/providers/imap/camel-imap-command.c:289
+#: ../camel/providers/imap/camel-imap-command.c:198
+#: ../camel/providers/imap/camel-imap-command.c:296
+#, c-format
 msgid "No input stream"
 msgstr "Ingen inndatastrÃ¸m"
 
-#: ../camel/providers/imap/camel-imap-command.c:241
-#: ../camel/providers/imap/camel-imap-command.c:298
-#: ../camel/providers/imap/camel-imap-command.c:520
-#: ../camel/providers/imap/camel-imap-store.c:3049
+#: ../camel/providers/imap/camel-imap-command.c:245
+#, c-format
 msgid "Operation cancelled"
 msgstr "Operasjon avbrutt"
 
 #: ../camel/providers/imap/camel-imap-command.c:353
-#: ../camel/providers/imap/camel-imap-store.c:3057
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Tjener koblet fra uventet: %s"
@@ -2760,112 +2923,102 @@ msgstr ""
 "Melding fra IMAP-tjener %s %s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:443
+#: ../camel/providers/imap/camel-imap-command.c:444
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Uventet svar fra IMAP-tjener: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:454
+#: ../camel/providers/imap/camel-imap-command.c:456
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-kommando feilet: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:536
+#: ../camel/providers/imap/camel-imap-command.c:532
+#, c-format
 msgid "Server response ended too soon."
 msgstr "Svar fra tjener ble avsluttet for tidlig."
 
-#: ../camel/providers/imap/camel-imap-command.c:743
+#: ../camel/providers/imap/camel-imap-command.c:740
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Svar fra IMAP-tjener inneholdt ikke %s-informasjon"
 
-#: ../camel/providers/imap/camel-imap-command.c:780
+#: ../camel/providers/imap/camel-imap-command.c:778
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Uventet svar Â«OKÂ» fra IMAP-tjener: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:275
+#: ../camel/providers/imap/camel-imap-folder.c:281
 msgid "Always check for new mail in this folder"
 msgstr "Alltid se etter nye meldinger i denne mappen"
 
-#: ../camel/providers/imap/camel-imap-folder.c:346
+#: ../camel/providers/imap/camel-imap-folder.c:353
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kan ikke opprette katalog %s: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:939
-#: ../camel/providers/imapx/camel-imapx-server.c:3043
+#: ../camel/providers/imap/camel-imap-folder.c:960
+#: ../camel/providers/imapx/camel-imapx-server.c:3757
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "SÃ¸ker etter endrede meldinger i %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2079
-#, c-format
-msgid "Unexpected response status '%s' after APPEND command"
-msgstr "Uventet status for svar Â«%sÂ» etter APPEND-kommando"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2097
-msgid "No response on continuation after APPEND command"
-msgstr "Ingen svar eller fortsettelse etter APPEND-kommando"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2150
-msgid "Unknown error occurred during APPEND command!"
-msgstr "Ukjent feil oppsto under APPEND-kommando"
+#: ../camel/providers/imap/camel-imap-folder.c:3231
+msgid "Unable to retrieve message: "
+msgstr "Kan ikke hente melding: "
 
-#: ../camel/providers/imap/camel-imap-folder.c:3055
-#, c-format
-msgid "Unable to retrieve message: %s"
-msgstr "Kan ikke hente melding: %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:3090
-#: ../camel/providers/imapx/camel-imapx-server.c:4050
+#: ../camel/providers/imap/camel-imap-folder.c:3266
+#: ../camel/providers/imapx/camel-imapx-server.c:4955
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "Kan ikke hente melding med meldings-ID %s: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3091
-#: ../camel/providers/imapx/camel-imapx-server.c:4051
+#: ../camel/providers/imap/camel-imap-folder.c:3267
+#: ../camel/providers/imapx/camel-imapx-server.c:4956
 msgid "No such message available."
 msgstr "Ingen slik melding tilgjengelig."
 
-#: ../camel/providers/imap/camel-imap-folder.c:3159
-#: ../camel/providers/imap/camel-imap-folder.c:4039
-#: ../camel/providers/nntp/camel-nntp-folder.c:331
+#: ../camel/providers/imap/camel-imap-folder.c:3337
+#: ../camel/providers/imap/camel-imap-folder.c:4203
+#: ../camel/providers/nntp/camel-nntp-folder.c:326
+#, c-format
 msgid "This message is not currently available"
 msgstr "Denne meldingen er ikke tilgjengelig"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3835
+#: ../camel/providers/imap/camel-imap-folder.c:4013
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "Uferdig svar fra tjener: ingen informasjon gitt for melding %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3845
+#: ../camel/providers/imap/camel-imap-folder.c:4023
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "Uferdig svar fra tjener: ingen UID oppgitt for melding %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4079
+#: ../camel/providers/imap/camel-imap-folder.c:4243
+#, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "Kunne ikke finne meldingskropp i FETCH-svar."
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:196
-#: ../camel/providers/imap/camel-imap-message-cache.c:261
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "Kan ikke Ã¥pne cache-katalog: %s"
+#: ../camel/providers/imap/camel-imap-message-cache.c:193
+#: ../camel/providers/imap/camel-imap-message-cache.c:253
+msgid "Could not open cache directory: "
+msgstr "Kan ikke Ã¥pne cache-katalog: "
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:335
-#: ../camel/providers/imap/camel-imap-message-cache.c:399
-#: ../camel/providers/imap/camel-imap-message-cache.c:433
-#: ../camel/providers/imap/camel-imap-message-cache.c:468
+#: ../camel/providers/imap/camel-imap-message-cache.c:326
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Feil under mellomlagring av melding %s: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:549
+#: ../camel/providers/imap/camel-imap-message-cache.c:388
+#, c-format
+msgid "Failed to cache message %s: "
+msgstr "Feil under mellomlagring av melding %s: "
+
+#: ../camel/providers/imap/camel-imap-message-cache.c:525
 #, c-format
-msgid "Failed to cache %s: %s"
-msgstr "Feil ved mellomlagring av %s: %s"
+msgid "Failed to cache %s: "
+msgstr "Feil ved mellomlagring av %s: "
 
 #: ../camel/providers/imap/camel-imap-provider.c:40
 #: ../camel/providers/imapx/camel-imapx-provider.c:41
@@ -2873,17 +3026,17 @@ msgid "Checking for New Mail"
 msgstr "Ser etter nye meldinger"
 
 #: ../camel/providers/imap/camel-imap-provider.c:44
-#: ../camel/providers/imapx/camel-imapx-provider.c:47
+#: ../camel/providers/imapx/camel-imapx-provider.c:49
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "S_e etter nye meldinger i abonnerte mapper"
 
 #: ../camel/providers/imap/camel-imap-provider.c:48
-#: ../camel/providers/imapx/camel-imapx-provider.c:51
+#: ../camel/providers/imapx/camel-imapx-provider.c:53
 msgid "Connection to Server"
 msgstr "Tilkobling til tjener"
 
 #: ../camel/providers/imap/camel-imap-provider.c:50
-#: ../camel/providers/imapx/camel-imapx-provider.c:53
+#: ../camel/providers/imapx/camel-imapx-provider.c:55
 msgid "_Use custom command to connect to server"
 msgstr "Br_uk egendefinert kommando for Ã¥ koble til tjener"
 
@@ -2892,18 +3045,18 @@ msgid "Co_mmand:"
 msgstr "Ko_mmando:"
 
 #: ../camel/providers/imap/camel-imap-provider.c:56
-#: ../camel/providers/imapx/camel-imapx-provider.c:61
+#: ../camel/providers/imapx/camel-imapx-provider.c:65
 #: ../camel/providers/nntp/camel-nntp-provider.c:42
 msgid "Folders"
 msgstr "Mapper"
 
 #: ../camel/providers/imap/camel-imap-provider.c:58
-#: ../camel/providers/imapx/camel-imapx-provider.c:63
+#: ../camel/providers/imapx/camel-imapx-provider.c:67
 msgid "_Show only subscribed folders"
 msgstr "Vi_s kun abonnerte mapper"
 
 #: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imapx/camel-imapx-provider.c:66
+#: ../camel/providers/imapx/camel-imapx-provider.c:70
 msgid "O_verride server-supplied folder namespace"
 msgstr "O_verstyr tjeners navneomrÃ¥de for mapper"
 
@@ -2912,17 +3065,17 @@ msgid "Names_pace:"
 msgstr "_NavneomrÃ¥de:"
 
 #: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imapx/camel-imapx-provider.c:73
+#: ../camel/providers/imapx/camel-imapx-provider.c:77
 msgid "_Apply filters to new messages in INBOX on this server"
 msgstr "_Bruk filtre for nye meldinger i INBOX pÃ¥ denne tjeneren"
 
 #: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imapx/camel-imapx-provider.c:75
+#: ../camel/providers/imapx/camel-imapx-provider.c:79
 msgid "Check new messages for Jun_k contents"
 msgstr "Se etter sÃ¸ppelinn_hold i nye meldinger"
 
 #: ../camel/providers/imap/camel-imap-provider.c:72
-#: ../camel/providers/imapx/camel-imapx-provider.c:79
+#: ../camel/providers/imapx/camel-imapx-provider.c:83
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "S_ynkroniser eksterne meldinger med lokale meldinger automatisk"
 
@@ -2931,112 +3084,117 @@ msgid "IMAP"
 msgstr "IMAP"
 
 #: ../camel/providers/imap/camel-imap-provider.c:81
-#: ../camel/providers/imapx/camel-imapx-provider.c:89
+#: ../camel/providers/imapx/camel-imapx-provider.c:93
 msgid "For reading and storing mail on IMAP servers."
 msgstr "For lesing og lagring av e-post pÃ¥ IMAP-tjenere."
 
-#: ../camel/providers/imap/camel-imap-provider.c:98
-#: ../camel/providers/imapx/camel-imapx-provider.c:105
+#: ../camel/providers/imap/camel-imap-provider.c:99
+#: ../camel/providers/imapx/camel-imapx-provider.c:109
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Dette valget vil la deg koble til en IMAP-tjener ved Ã¥ bruke et klartekst-"
 "passord."
 
-#: ../camel/providers/imap/camel-imap-store.c:287
-#: ../camel/providers/imapx/camel-imapx-store.c:206
+#: ../camel/providers/imap/camel-imap-store.c:310
+#: ../camel/providers/imapx/camel-imapx-store.c:210
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP-tjener %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:289
-#: ../camel/providers/imapx/camel-imapx-store.c:208
+#: ../camel/providers/imap/camel-imap-store.c:312
+#: ../camel/providers/imapx/camel-imapx-store.c:212
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP-tjeneste for %s pÃ¥ %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:419
-#: ../camel/providers/imap/camel-imap-store.c:436
-#: ../camel/providers/nntp/camel-nntp-store.c:230
-#: ../camel/providers/nntp/camel-nntp-store.c:246
-#: ../camel/providers/pop3/camel-pop3-store.c:170
-#: ../camel/providers/pop3/camel-pop3-store.c:186
-#: ../camel/providers/smtp/camel-smtp-transport.c:212
-#: ../camel/providers/smtp/camel-smtp-transport.c:227
+#: ../camel/providers/imap/camel-imap-store.c:446
+#: ../camel/providers/nntp/camel-nntp-store.c:234
+#: ../camel/providers/pop3/camel-pop3-store.c:172
+#: ../camel/providers/smtp/camel-smtp-transport.c:215
 #, c-format
 msgid "Could not connect to %s: %s"
 msgstr "Kunne ikke koble til %s: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:420
-#: ../camel/providers/nntp/camel-nntp-store.c:231
-#: ../camel/providers/pop3/camel-pop3-store.c:171
-#: ../camel/providers/smtp/camel-smtp-transport.c:213
+#: ../camel/providers/imap/camel-imap-store.c:447
+#: ../camel/providers/nntp/camel-nntp-store.c:235
+#: ../camel/providers/pop3/camel-pop3-store.c:173
+#: ../camel/providers/smtp/camel-smtp-transport.c:216
 msgid "SSL unavailable"
 msgstr "SSL er ikke tilgjengelig"
 
-#: ../camel/providers/imap/camel-imap-store.c:432
-#: ../camel/providers/imap/camel-imap-store.c:717
-#: ../camel/providers/imapx/camel-imapx-server.c:2185
-msgid "Connection cancelled"
-msgstr "Tilkobling avbrutt"
+#: ../camel/providers/imap/camel-imap-store.c:465
+#: ../camel/providers/nntp/camel-nntp-store.c:252
+#, c-format
+msgid "Could not connect to %s: "
+msgstr "Kunne ikke koble til %s: "
 
-#: ../camel/providers/imap/camel-imap-store.c:542
-#: ../camel/providers/imap/camel-imap-store.c:562
-#: ../camel/providers/imap/camel-imap-store.c:569
-#: ../camel/providers/imap/camel-imap-store.c:596
-#: ../camel/providers/imapx/camel-imapx-server.c:2230
-#: ../camel/providers/imapx/camel-imapx-server.c:2251
+#: ../camel/providers/imap/camel-imap-store.c:571
+#: ../camel/providers/imap/camel-imap-store.c:591
+#: ../camel/providers/imap/camel-imap-store.c:598
+#: ../camel/providers/imap/camel-imap-store.c:625
+#: ../camel/providers/imapx/camel-imapx-server.c:2825
+#: ../camel/providers/imapx/camel-imapx-server.c:2861
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Kunne ikke koble til IMAP-tjener %s i sikker modus: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:543
-#: ../camel/providers/imapx/camel-imapx-server.c:2231
-#: ../camel/providers/smtp/camel-smtp-transport.c:286
+#: ../camel/providers/imap/camel-imap-store.c:572
+#: ../camel/providers/imapx/camel-imapx-server.c:2826
+#: ../camel/providers/smtp/camel-smtp-transport.c:295
 msgid "STARTTLS not supported"
 msgstr "STARTTLS er ikke stÃ¸ttet"
 
-#: ../camel/providers/imap/camel-imap-store.c:563
-#: ../camel/providers/imapx/camel-imapx-server.c:2252
+#: ../camel/providers/imap/camel-imap-store.c:592
+#: ../camel/providers/imapx/camel-imapx-server.c:2862
 msgid "SSL negotiations failed"
 msgstr "SSL-forhandling feilet"
 
-#: ../camel/providers/imap/camel-imap-store.c:570
-#: ../camel/providers/smtp/camel-smtp-transport.c:327
+#: ../camel/providers/imap/camel-imap-store.c:599
+#: ../camel/providers/smtp/camel-smtp-transport.c:339
 msgid "SSL is not available in this build"
 msgstr "SSL er ikke stÃ¸ttet i denne versjonen"
 
-#: ../camel/providers/imap/camel-imap-store.c:721
+#: ../camel/providers/imap/camel-imap-store.c:747
+#: ../camel/providers/imapx/camel-imapx-server.c:2645
+#, c-format
+msgid "Connection cancelled"
+msgstr "Tilkobling avbrutt"
+
+#: ../camel/providers/imap/camel-imap-store.c:752
+#: ../camel/providers/imapx/camel-imapx-server.c:2650
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Kunne ikke koble til med kommando Â«%sÂ»: %s"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:910
-#: ../camel/providers/imap/camel-imap-store.c:2346
-#: ../camel/providers/imapx/camel-imapx-store.c:406
-#: ../camel/providers/imapx/camel-imapx-store.c:968
+#: ../camel/providers/imap/camel-imap-store.c:945
+#: ../camel/providers/imap/camel-imap-store.c:2369
+#: ../camel/providers/imapx/camel-imapx-store.c:447
+#: ../camel/providers/imapx/camel-imapx-store.c:1040
 #: ../camel/providers/local/camel-maildir-folder.c:90
-#: ../camel/providers/local/camel-maildir-store.c:219
-#: ../camel/providers/local/camel-maildir-store.c:306
-#: ../camel/providers/local/camel-maildir-store.c:552
-#: ../camel/providers/local/camel-maildir-store.c:565
-#: ../camel/providers/local/camel-spool-store.c:500
+#: ../camel/providers/local/camel-maildir-store.c:225
+#: ../camel/providers/local/camel-maildir-store.c:315
+#: ../camel/providers/local/camel-maildir-store.c:562
+#: ../camel/providers/local/camel-maildir-store.c:575
+#: ../camel/providers/local/camel-spool-store.c:508
 msgid "Inbox"
 msgstr "Innboks"
 
-#: ../camel/providers/imap/camel-imap-store.c:1168
+#: ../camel/providers/imap/camel-imap-store.c:1148
+#: ../camel/providers/imapx/camel-imapx-server.c:2928
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP-tjener %s stÃ¸tter ikke etterspurt autentiseringstype %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:1179
-#: ../camel/providers/smtp/camel-smtp-transport.c:465
+#: ../camel/providers/imap/camel-imap-store.c:1160
+#: ../camel/providers/imapx/camel-imapx-server.c:2940
+#: ../camel/providers/smtp/camel-smtp-transport.c:483
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ingen stÃ¸tte for autentiseringstype %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:1254
-#: ../camel/providers/imapx/camel-imapx-server.c:2351
+#: ../camel/providers/imap/camel-imap-store.c:1239
+#: ../camel/providers/imapx/camel-imapx-server.c:3010
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3047,66 +3205,108 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:1770
-#: ../camel/providers/imap/camel-imap-store.c:2192
-#: ../camel/providers/imapx/camel-imapx-store.c:786
+#: ../camel/providers/imap/camel-imap-store.c:1790
+#: ../camel/providers/imap/camel-imap-store.c:2212
+#: ../camel/providers/imapx/camel-imapx-store.c:838
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "Mappenavn Â«%sÂ» er ugyldig fordi det inneholder tegnet Â«%cÂ»"
 
-#: ../camel/providers/imap/camel-imap-store.c:1889
-#: ../camel/providers/local/camel-maildir-store.c:184
-#: ../camel/providers/local/camel-mbox-store.c:189
-#: ../camel/providers/local/camel-mh-store.c:250
+#: ../camel/providers/imap/camel-imap-store.c:1906
+#: ../camel/providers/local/camel-maildir-store.c:189
+#: ../camel/providers/local/camel-mbox-store.c:193
+#: ../camel/providers/local/camel-mh-store.c:255
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "Kan ikke opprette mappe Â«%sÂ»: mappen eksisterer."
 
-#: ../camel/providers/imap/camel-imap-store.c:2203
-#: ../camel/providers/imapx/camel-imapx-store.c:794
+#: ../camel/providers/imap/camel-imap-store.c:2225
+#: ../camel/providers/imapx/camel-imapx-store.c:849
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ukjent opphavsmappe: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:3053
+#: ../camel/providers/imap/camel-imap-store.c:3081
+#, c-format
 msgid "Server unexpectedly disconnected"
 msgstr "Tjener koblet fra uventet"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:74
+#: ../camel/providers/imap/camel-imap-store.c:3084
+msgid "Server unexpectedly disconnected: "
+msgstr "Tjener koblet fra uventet: "
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:75
 #, c-format
 msgid "Could not create folder summary for %s"
 msgstr "Kunne ikke lage sammendrag for mappe %s"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:82
+#: ../camel/providers/imapx/camel-imapx-folder.c:83
 #, c-format
-msgid "Could not create cache for %s"
-msgstr "Kunne ikke lage bufferfil for %s"
+msgid "Could not create cache for %s: "
+msgstr "Kunne ikke lage mellomlager for %s: "
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:43
+msgid "Use _Quick Resync if the server supports it"
+msgstr "Bruk _rask omsynkronisering hvis tjeneren stÃ¸tter det"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:45
 msgid "Use I_dle if the server supports it"
 msgstr "Bruk i_dle hvis tjeneren stÃ¸tter det"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:55
+#: ../camel/providers/imapx/camel-imapx-provider.c:57
 msgid "Command:"
 msgstr "Kommando:"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:57
+#: ../camel/providers/imapx/camel-imapx-provider.c:60
 msgid "Numbe_r of cached connections to use"
 msgstr "Antall mellomlag_rede tilkoblinger som skal brukes"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:68
+#: ../camel/providers/imapx/camel-imapx-provider.c:72
 msgid "Namespace:"
 msgstr "NavneomrÃ¥de:"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:87
+#: ../camel/providers/imapx/camel-imapx-provider.c:91
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2188
+#: ../camel/providers/imapx/camel-imapx-server.c:1365
+msgid "Error writing to cache stream: "
+msgstr "Feil under skriving til mellomlagerstrÃ¸m: "
+
+#: ../camel/providers/imapx/camel-imapx-server.c:2007
+#, c-format
+msgid "Not authenticated"
+msgstr "Ikke autentisert"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:2753
 #, c-format
-msgid "Could not connect to %s (port %s): %s"
-msgstr "Kunne ikke koble til %s (port %s): %s"
+msgid "Could not connect to %s (port %s): "
+msgstr "Kunne ikke koble til %s (port %s): "
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3182
+msgid "Closing tmp stream failed: "
+msgstr "Feil ved lukking av midlertidig strÃ¸m: "
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5079
+#, c-format
+msgid "Cannot create spool file: %s"
+msgstr "Kan ikke spool-fil: %s"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5094
+msgid "Cannot create spool file: "
+msgstr "Kan ikke spool-fil: "
+
+#: ../camel/providers/imapx/camel-imapx-store.c:416
+#: ../camel/providers/nntp/camel-nntp-store.c:1529
+#, c-format
+msgid "No such folder: %s"
+msgstr "Ingen slik mappe: %s"
+
+#: ../camel/providers/imapx/camel-imapx-stream.c:73
+#, c-format
+msgid "Source stream unavailable"
+msgstr "KildestrÃ¸m er ikke tilgjengelig"
 
 #: ../camel/providers/local/camel-local-folder.c:199
 #, c-format
@@ -3128,10 +3328,7 @@ msgstr "%s (%s)"
 msgid "Index message body data"
 msgstr "Indekser data i meldingskropp"
 
-#. Translators: The first %s is replaced with a message ID,
-#. the second %s is replaced with the folder path,
-#. the third %s is replaced with a detailed error string
-#: ../camel/providers/local/camel-local-folder.c:682
+#: ../camel/providers/local/camel-local-folder.c:683
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -3198,187 +3395,183 @@ msgstr ""
 msgid "Standard Unix mbox spool directory"
 msgstr "Standard Unix mbox Â«spoolÂ»-katalog"
 
-#: ../camel/providers/local/camel-local-store.c:148
-#: ../camel/providers/local/camel-local-store.c:278
-#: ../camel/providers/local/camel-mbox-store.c:361
-#: ../camel/providers/local/camel-spool-store.c:111
+#: ../camel/providers/local/camel-local-store.c:149
+#: ../camel/providers/local/camel-local-store.c:284
+#: ../camel/providers/local/camel-mbox-store.c:371
+#: ../camel/providers/local/camel-spool-store.c:109
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Lagerrot %s er ikke en absolutt sti"
 
-#: ../camel/providers/local/camel-local-store.c:156
+#: ../camel/providers/local/camel-local-store.c:158
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Lagerrot %s er ikke en vanlig katalog"
 
-#: ../camel/providers/local/camel-local-store.c:166
-#: ../camel/providers/local/camel-local-store.c:175
-#: ../camel/providers/local/camel-local-store.c:290
+#: ../camel/providers/local/camel-local-store.c:169
+#: ../camel/providers/local/camel-local-store.c:179
+#: ../camel/providers/local/camel-local-store.c:297
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Finner ikke mappe: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:188
+#: ../camel/providers/local/camel-local-store.c:193
+#, c-format
 msgid "Local stores do not have an inbox"
 msgstr "Lokalt lager har ikke en innboks"
 
-#: ../camel/providers/local/camel-local-store.c:245
+#: ../camel/providers/local/camel-local-store.c:250
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokal e-post-fil %s"
 
-#: ../camel/providers/local/camel-local-store.c:350
+#: ../camel/providers/local/camel-local-store.c:358
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Kunne ikke endre navn pÃ¥ mappe %s til %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:422
+#: ../camel/providers/local/camel-local-store.c:431
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Kunne ikke endre navn pÃ¥ Â«%sÂ»: %s"
 
-#: ../camel/providers/local/camel-local-store.c:452
-#: ../camel/providers/local/camel-mbox-store.c:293
+#: ../camel/providers/local/camel-local-store.c:461
+#: ../camel/providers/local/camel-mbox-store.c:304
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "Kunne ikke slette indeksfil for mappe Â«%sÂ»: %s"
 
-#: ../camel/providers/local/camel-local-store.c:482
-#: ../camel/providers/local/camel-mbox-store.c:324
+#: ../camel/providers/local/camel-local-store.c:489
+#: ../camel/providers/local/camel-mbox-store.c:333
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "Kunne ikke slette metadatafil for mappe Â«%sÂ»: %s"
 
 #: ../camel/providers/local/camel-local-summary.c:537
+#, c-format
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Kunne ikke legge til melding i sammendraget: ukjent grunn"
 
-#: ../camel/providers/local/camel-maildir-folder.c:191
-msgid "Maildir append message canceled"
-msgstr "Operasjon for Ã¥ legge til melding i maildir avbrutt"
-
 #: ../camel/providers/local/camel-maildir-folder.c:195
 #, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "Kan ikke legge til melding i maildir mappe: %s: %s"
+msgid "Cannot append message to maildir folder: %s: "
+msgstr "Kan ikke legge til melding i maildir mappe: %s: "
 
+#: ../camel/providers/local/camel-maildir-folder.c:283
 #: ../camel/providers/local/camel-maildir-folder.c:291
-msgid "Invalid message contents"
-msgstr "Ugyldig meldingsinnhold"
+#: ../camel/providers/local/camel-mbox-folder.c:440
+#: ../camel/providers/local/camel-mh-folder.c:227
+#: ../camel/providers/local/camel-mh-folder.c:235
+#, c-format
+msgid "Cannot get message %s from folder %s: "
+msgstr "Kan ikke hente melding %s fra mappe %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:407
-msgid "Cannot transfer message to destination folder"
-msgstr "Kan ikke overfÃ¸re melding til mÃ¥lmappen"
+#: ../camel/providers/local/camel-maildir-folder.c:399
+#, c-format
+msgid "Cannot transfer message to destination folder: %s"
+msgstr "Kan ikke overfÃ¸re melding til mÃ¥lmappe: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:134
-#: ../camel/providers/local/camel-maildir-store.c:162
-#: ../camel/providers/local/camel-mbox-store.c:158
-#: ../camel/providers/local/camel-mbox-store.c:171
+#: ../camel/providers/local/camel-maildir-store.c:136
+#: ../camel/providers/local/camel-maildir-store.c:167
+#: ../camel/providers/local/camel-mbox-store.c:161
+#: ../camel/providers/local/camel-mbox-store.c:175
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "Kan ikke opprette mappe Â«%sÂ»: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:148
-#: ../camel/providers/local/camel-mbox-store.c:126
-#: ../camel/providers/local/camel-mh-store.c:213
+#: ../camel/providers/local/camel-maildir-store.c:151
+#: ../camel/providers/local/camel-mbox-store.c:127
+#: ../camel/providers/local/camel-mh-store.c:215
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "Finner ikke mappe Â«%sÂ»: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:153
-#: ../camel/providers/local/camel-mbox-store.c:135
-#: ../camel/providers/local/camel-mh-store.c:221
+#: ../camel/providers/local/camel-maildir-store.c:157
+#: ../camel/providers/local/camel-mbox-store.c:137
+#: ../camel/providers/local/camel-mh-store.c:224
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "Finner ikke mappe Â«%sÂ»: mappen eksisterer ikke."
 
-#: ../camel/providers/local/camel-maildir-store.c:179
+#: ../camel/providers/local/camel-maildir-store.c:184
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "Kan ikke hente mappe Â«%sÂ»: ikke en maildir katalog."
 
-#: ../camel/providers/local/camel-maildir-store.c:235
-#: ../camel/providers/local/camel-maildir-store.c:274
-#: ../camel/providers/local/camel-mh-store.c:281
+#: ../camel/providers/local/camel-maildir-store.c:242
+#: ../camel/providers/local/camel-maildir-store.c:282
+#: ../camel/providers/local/camel-mh-store.c:287
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "Kunne ikke slette mappe Â«%sÂ»: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:237
+#: ../camel/providers/local/camel-maildir-store.c:244
 msgid "not a maildir directory"
 msgstr "ikke en maildir katalog"
 
-#: ../camel/providers/local/camel-maildir-store.c:472
-#: ../camel/providers/local/camel-spool-store.c:357
-#: ../camel/providers/local/camel-spool-store.c:372
+#: ../camel/providers/local/camel-maildir-store.c:482
+#: ../camel/providers/local/camel-spool-store.c:364
+#: ../camel/providers/local/camel-spool-store.c:380
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "Kunne ikke sÃ¸ke i mappe Â«%sÂ»: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:433
-#: ../camel/providers/local/camel-maildir-summary.c:555
+#: ../camel/providers/local/camel-maildir-summary.c:435
+#: ../camel/providers/local/camel-maildir-summary.c:558
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Kan ikke Ã¥pne maildir katalogsti: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:547
+#: ../camel/providers/local/camel-maildir-summary.c:549
 msgid "Checking folder consistency"
 msgstr "Sjekker om mappen er konsistent"
 
-#: ../camel/providers/local/camel-maildir-summary.c:638
+#: ../camel/providers/local/camel-maildir-summary.c:641
 msgid "Checking for new messages"
 msgstr "Ser etter nye meldinger"
 
-#: ../camel/providers/local/camel-maildir-summary.c:729
-#: ../camel/providers/local/camel-mbox-summary.c:462
-#: ../camel/providers/local/camel-mbox-summary.c:664
-#: ../camel/providers/local/camel-mbox-summary.c:789
-#: ../camel/providers/local/camel-spool-summary.c:129
+#: ../camel/providers/local/camel-maildir-summary.c:732
+#: ../camel/providers/local/camel-mbox-summary.c:465
+#: ../camel/providers/local/camel-mbox-summary.c:669
+#: ../camel/providers/local/camel-mbox-summary.c:799
+#: ../camel/providers/local/camel-spool-summary.c:130
 msgid "Storing folder"
 msgstr "Lagrer mappe"
 
-#: ../camel/providers/local/camel-mbox-folder.c:123
-#: ../camel/providers/local/camel-spool-folder.c:123
+#: ../camel/providers/local/camel-mbox-folder.c:124
+#: ../camel/providers/local/camel-spool-folder.c:125
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Kan ikke opprette mappelÃ¥s pÃ¥: %s: %s"
 
 #: ../camel/providers/local/camel-mbox-folder.c:194
 #, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "Kan ikke Ã¥pne postboks: %s: %s\n"
-
-#: ../camel/providers/local/camel-mbox-folder.c:261
-msgid "Mail append canceled"
-msgstr "Operasjon for Ã¥ legge til e-post avbrutt"
+msgid "Cannot open mailbox: %s: "
+msgstr "Kan ikke Ã¥pne postboks: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:265
+#: ../camel/providers/local/camel-mbox-folder.c:260
 #, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "Kan ikke legge til melding i mbox-filen: %s: %s"
+msgid "Cannot append message to mbox file: %s: "
+msgstr "Kan ikke legge til melding i mbox-fil: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:438
+#: ../camel/providers/local/camel-mbox-folder.c:433
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Mappen ser ut til Ã¥ ha blitt korrupt og kan ikke repareres."
 
-#: ../camel/providers/local/camel-mbox-folder.c:448
-#: ../camel/providers/local/camel-mh-folder.c:241
-msgid "Message construction failed."
-msgstr "Oppbygging av melding feilet."
-
-#: ../camel/providers/local/camel-mbox-store.c:147
-#: ../camel/providers/local/camel-mbox-store.c:369
+#: ../camel/providers/local/camel-mbox-store.c:149
+#: ../camel/providers/local/camel-mbox-store.c:379
+#, c-format
 msgid "Cannot create a folder by this name."
 msgstr "Kan ikke opprette en mappe med dette navnet."
 
-#: ../camel/providers/local/camel-mbox-store.c:182
+#: ../camel/providers/local/camel-mbox-store.c:186
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "Kan ikke hente mappe Â«%sÂ»: ikke en vanlig fil."
 
-#: ../camel/providers/local/camel-mbox-store.c:214
-#: ../camel/providers/local/camel-mbox-store.c:226
-#: ../camel/providers/local/camel-mbox-store.c:252
+#: ../camel/providers/local/camel-mbox-store.c:218
+#: ../camel/providers/local/camel-mbox-store.c:231
+#: ../camel/providers/local/camel-mbox-store.c:260
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3387,149 +3580,146 @@ msgstr ""
 "Kunne ikke slette mappen Â«%sÂ»\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:235
+#: ../camel/providers/local/camel-mbox-store.c:241
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "Â«%sÂ» er ikke en vanlig fil."
 
-#: ../camel/providers/local/camel-mbox-store.c:243
+#: ../camel/providers/local/camel-mbox-store.c:250
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "Mappen Â«%sÂ» er ikke tom. Ikke slettet."
 
-#: ../camel/providers/local/camel-mbox-store.c:267
-#: ../camel/providers/local/camel-mbox-store.c:280
+#: ../camel/providers/local/camel-mbox-store.c:276
+#: ../camel/providers/local/camel-mbox-store.c:290
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "Kunne ikke slette sammendragsfil for mappe Â«%sÂ»: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:384
+#: ../camel/providers/local/camel-mbox-store.c:395
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "Kan ikke opprette katalog Â«%sÂ»: %s."
 
-#: ../camel/providers/local/camel-mbox-store.c:399
+#: ../camel/providers/local/camel-mbox-store.c:411
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Kan ikke opprette mappe: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:401
+#: ../camel/providers/local/camel-mbox-store.c:413
 msgid "Folder already exists"
 msgstr "Mappen eksisterer allerede"
 
-#: ../camel/providers/local/camel-mbox-store.c:495
+#: ../camel/providers/local/camel-mbox-store.c:507
+#, c-format
 msgid "The new folder name is illegal."
 msgstr "Det nye mappenavnet er ugyldig."
 
-#: ../camel/providers/local/camel-mbox-store.c:509
+#: ../camel/providers/local/camel-mbox-store.c:522
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "Kunne ikke endre navn pÃ¥ Â«%sÂ»: Â«%sÂ»: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:591
+#: ../camel/providers/local/camel-mbox-store.c:605
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Kunne ikke endre navn pÃ¥ Â«%sÂ» til %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:469
+#: ../camel/providers/local/camel-mbox-summary.c:473
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Kunne ikke Ã¥pne mappe %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:520
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "Fatal feil i lesing av postboksen nÃ¦r posisjon %ld i mappe %s"
+#: ../camel/providers/local/camel-mbox-summary.c:524
+msgid "Fatal mail parser error near position %"
+msgstr "Fatal feil i lesing av postboksen nÃ¦r posisjon %"
 
-#: ../camel/providers/local/camel-mbox-summary.c:600
+#: ../camel/providers/local/camel-mbox-summary.c:605
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Kan ikke sjekke mappe: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:670
-#: ../camel/providers/local/camel-mbox-summary.c:795
-#: ../camel/providers/local/camel-spool-summary.c:135
+#: ../camel/providers/local/camel-mbox-summary.c:676
+#: ../camel/providers/local/camel-mbox-summary.c:806
+#: ../camel/providers/local/camel-spool-summary.c:137
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Kunne ikke Ã¥pne fil %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:683
-#: ../camel/providers/local/camel-spool-summary.c:149
+#: ../camel/providers/local/camel-mbox-summary.c:690
+#: ../camel/providers/local/camel-spool-summary.c:152
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kan ikke Ã¥pne midlertidig postboks: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:697
-#: ../camel/providers/local/camel-mbox-summary.c:909
+#: ../camel/providers/local/camel-mbox-summary.c:705
+#: ../camel/providers/local/camel-mbox-summary.c:923
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kunne ikke lukke kildemappe %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:707
+#: ../camel/providers/local/camel-mbox-summary.c:716
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "Kunne ikke lukke midlertidig mappe: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:723
+#: ../camel/providers/local/camel-mbox-summary.c:733
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunne ikke endre navn pÃ¥ mappe: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:807
-#: ../camel/providers/local/camel-mbox-summary.c:1045
+#: ../camel/providers/local/camel-mbox-summary.c:819
+#: ../camel/providers/local/camel-mbox-summary.c:1061
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Kunne ikke lagre mappe: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:847
-#: ../camel/providers/local/camel-mbox-summary.c:856
-#: ../camel/providers/local/camel-mbox-summary.c:1077
-#: ../camel/providers/local/camel-mbox-summary.c:1086
+#: ../camel/providers/local/camel-mbox-summary.c:860
+#: ../camel/providers/local/camel-mbox-summary.c:869
+#: ../camel/providers/local/camel-mbox-summary.c:1094
+#: ../camel/providers/local/camel-mbox-summary.c:1103
+#, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Sammendrag og mappe stemmer ikke overens selv etter synkronisering"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1005
-#: ../camel/providers/local/camel-spool-summary.c:326
+#: ../camel/providers/local/camel-mbox-summary.c:1020
+#: ../camel/providers/local/camel-spool-summary.c:337
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ukjent feil: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1155
-#: ../camel/providers/local/camel-mbox-summary.c:1183
+#: ../camel/providers/local/camel-mbox-summary.c:1173
+#: ../camel/providers/local/camel-mbox-summary.c:1203
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "Skriving til midlertidig postboks feilet: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1173
+#: ../camel/providers/local/camel-mbox-summary.c:1192
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "Skriving til midlertidig postboks feilet: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:166
-msgid "MH append message canceled"
-msgstr "Operasjon for Ã¥ legge til melding for MH avbrutt"
-
-#: ../camel/providers/local/camel-mh-folder.c:170
+#: ../camel/providers/local/camel-mh-folder.c:165
 #, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "Kan ikke legge til melding i mh-mappe: %s: %s"
+msgid "Cannot append message to mh folder: %s: "
+msgstr "Kan ikke legge til melding i mh-mappe: %s: "
 
-#: ../camel/providers/local/camel-mh-store.c:230
+#: ../camel/providers/local/camel-mh-store.c:234
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "Kunne ikke opprette mappe Â«%sÂ»: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:243
+#: ../camel/providers/local/camel-mh-store.c:248
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "Kan ikke hente mappe Â«%sÂ»: ikke en katalog."
 
-#: ../camel/providers/local/camel-mh-summary.c:227
+#: ../camel/providers/local/camel-mh-summary.c:228
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Kan ikke Ã¥pne MH-katalogsti: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:119
+#: ../camel/providers/local/camel-spool-store.c:118
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "Spool Â«%sÂ» kan ikke Ã¥pnes: %s"
@@ -3539,12 +3729,12 @@ msgstr "Spool Â«%sÂ» kan ikke Ã¥pnes: %s"
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "Spool Â«%sÂ» er ikke en vanlig fil eller katalog"
 
-#: ../camel/providers/local/camel-spool-store.c:157
+#: ../camel/providers/local/camel-spool-store.c:158
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "Mappen Â«%s/%sÂ» eksisterer ikke."
 
-#: ../camel/providers/local/camel-spool-store.c:168
+#: ../camel/providers/local/camel-spool-store.c:170
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -3553,12 +3743,12 @@ msgstr ""
 "Kan ikke Ã¥pne mappe Â«%sÂ»:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:173
+#: ../camel/providers/local/camel-spool-store.c:176
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "Mappen Â«%sÂ» eksisterer ikke."
 
-#: ../camel/providers/local/camel-spool-store.c:179
+#: ../camel/providers/local/camel-spool-store.c:183
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -3567,48 +3757,51 @@ msgstr ""
 "Kunne ikke opprette mappe Â«%sÂ»:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:188
+#: ../camel/providers/local/camel-spool-store.c:193
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "Â«%sÂ» er ikke en postboks-fil."
 
-#: ../camel/providers/local/camel-spool-store.c:207
+#: ../camel/providers/local/camel-spool-store.c:213
+#, c-format
 msgid "Store does not support an INBOX"
 msgstr "Lager stÃ¸tter ikke en INNBOKS"
 
-#: ../camel/providers/local/camel-spool-store.c:220
+#: ../camel/providers/local/camel-spool-store.c:226
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Spool e-post-fil %s"
 
-#: ../camel/providers/local/camel-spool-store.c:220
+#: ../camel/providers/local/camel-spool-store.c:226
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "Tre av spool-mapper %s"
 
-#: ../camel/providers/local/camel-spool-store.c:232
+#: ../camel/providers/local/camel-spool-store.c:238
+#, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "Spool-mapper kan ikke vÃ¦re gis nytt navn"
 
-#: ../camel/providers/local/camel-spool-store.c:245
+#: ../camel/providers/local/camel-spool-store.c:251
+#, c-format
 msgid "Spool folders cannot be deleted"
 msgstr "Spoolmapper kan ikke vÃ¦re slettes"
 
-#: ../camel/providers/local/camel-spool-summary.c:162
-#: ../camel/providers/local/camel-spool-summary.c:173
-#: ../camel/providers/local/camel-spool-summary.c:184
+#: ../camel/providers/local/camel-spool-summary.c:166
+#: ../camel/providers/local/camel-spool-summary.c:178
+#: ../camel/providers/local/camel-spool-summary.c:190
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Kunne ikke synkronisere midlertidig mappe %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:201
+#: ../camel/providers/local/camel-spool-summary.c:208
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Kunne ikke synkronisere spool-mappe %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:232
-#: ../camel/providers/local/camel-spool-summary.c:250
-#: ../camel/providers/local/camel-spool-summary.c:262
+#: ../camel/providers/local/camel-spool-summary.c:240
+#: ../camel/providers/local/camel-spool-summary.c:259
+#: ../camel/providers/local/camel-spool-summary.c:272
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -3617,34 +3810,41 @@ msgstr ""
 "Kunne ikke synkronisere spool-mappe %s: %s\n"
 "Mappen kan vÃ¦re korrupt, kopi lagret i Â«%sÂ»"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:196
-#: ../camel/providers/nntp/camel-nntp-folder.c:277
-#: ../camel/providers/nntp/camel-nntp-folder.c:318
+#: ../camel/providers/nntp/camel-nntp-folder.c:197
+#: ../camel/providers/nntp/camel-nntp-folder.c:271
+#: ../camel/providers/nntp/camel-nntp-folder.c:312
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "Intern feil: UID har ugyldig format: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:245
-#: ../camel/providers/nntp/camel-nntp-folder.c:345
-#: ../camel/providers/nntp/camel-nntp-folder.c:527
-#: ../camel/providers/nntp/camel-nntp-store.c:1426
-#: ../camel/providers/nntp/camel-nntp-summary.c:395
-msgid "User cancelled the operation"
-msgstr "Operasjonen ble avbrutt av bruker"
+#: ../camel/providers/nntp/camel-nntp-folder.c:234
+#: ../camel/providers/nntp/camel-nntp-folder.c:238
+#: ../camel/providers/pop3/camel-pop3-folder.c:402
+#: ../camel/providers/pop3/camel-pop3-folder.c:630
+#: ../camel/providers/pop3/camel-pop3-folder.c:695
+#: ../camel/providers/pop3/camel-pop3-folder.c:706
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "Kan ikke hente melding %s: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:477
-#: ../camel/providers/nntp/camel-nntp-folder.c:482
-#: ../camel/providers/nntp/camel-nntp-folder.c:531
-#: ../camel/providers/nntp/camel-nntp-folder.c:536
+#: ../camel/providers/nntp/camel-nntp-folder.c:465
+#: ../camel/providers/nntp/camel-nntp-folder.c:471
+#: ../camel/providers/nntp/camel-nntp-folder.c:518
 #, c-format
 msgid "Posting failed: %s"
 msgstr "Posting feilet: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:558
+#: ../camel/providers/nntp/camel-nntp-folder.c:513
+msgid "Posting failed: "
+msgstr "Posting feilet: "
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:541
+#, c-format
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "Du kan ikke poste NNTP-meldinger mens du arbeider frakoblet!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:576
+#: ../camel/providers/nntp/camel-nntp-folder.c:560
+#, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Du kan ikke kopiere meldinger fra en NNTP-mappe!"
 
@@ -3676,29 +3876,22 @@ msgstr ""
 "Dette alternativet vil autentisere mot NNTP-tjeneren ved bruk av klartekst "
 "passord."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:242
-#: ../camel/providers/nntp/camel-nntp-store.c:260
-#: ../camel/providers/pop3/camel-pop3-store.c:182
-#: ../camel/providers/smtp/camel-smtp-transport.c:224
-msgid "Connection canceled"
-msgstr "Tilkobling avbrutt"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:263
+#: ../camel/providers/nntp/camel-nntp-store.c:265
 #, c-format
-msgid "Could not read greeting from %s: %s"
-msgstr "Kan ikke lese hilsen fra %s: %s"
+msgid "Could not read greeting from %s: "
+msgstr "Kan ikke lese hilsen fra %s: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:275
+#: ../camel/providers/nntp/camel-nntp-store.c:278
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP-tjener %s returnerte feilkode %d: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:463
+#: ../camel/providers/nntp/camel-nntp-store.c:453
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET News via %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:963
+#: ../camel/providers/nntp/camel-nntp-store.c:946
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -3709,7 +3902,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1059
+#: ../camel/providers/nntp/camel-nntp-store.c:1043
+#, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -3719,7 +3913,8 @@ msgstr ""
 "\n"
 "Nyhetsgruppen finnes ikke. Valgt oppfÃ¸ring er sannsynligvis en opphavsmappe."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1098
+#: ../camel/providers/nntp/camel-nntp-store.c:1083
+#, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -3729,42 +3924,41 @@ msgstr ""
 "\n"
 "nyhetsgruppen eksisterer ikke!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1127
+#: ../camel/providers/nntp/camel-nntp-store.c:1113
+#, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "Du kan ikke opprette mapper i et News-lager: abonner i stedet."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1138
+#: ../camel/providers/nntp/camel-nntp-store.c:1125
+#, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "Du kan ikke endre navn pÃ¥ en mappe pÃ¥ en nyhetstjener."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1150
+#: ../camel/providers/nntp/camel-nntp-store.c:1138
+#, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "Du kan ikke fjerne en mappe i et News-lager: slett abonnement i stedet."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1287
+#: ../camel/providers/nntp/camel-nntp-store.c:1276
+#, c-format
 msgid "Authentication requested but no username provided"
 msgstr "Autentisering forespurt men brukernavn ble ikke oppgitt"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1299
+#: ../camel/providers/nntp/camel-nntp-store.c:1288
 #, c-format
 msgid "Cannot authenticate to server: %s"
 msgstr "Kan ikke autentisere mot tjener: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1430
-#, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP-kommando feilet: %s"
+#: ../camel/providers/nntp/camel-nntp-store.c:1414
+msgid "NNTP Command failed: "
+msgstr "NNTP-kommando feilet: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1486
+#: ../camel/providers/nntp/camel-nntp-store.c:1472
+#, c-format
 msgid "Not connected."
 msgstr "Ingen tilkoblet."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1543
-#, c-format
-msgid "No such folder: %s"
-msgstr "Ingen slik mappe: %s"
-
 #: ../camel/providers/nntp/camel-nntp-summary.c:238
 #: ../camel/providers/nntp/camel-nntp-summary.c:340
 #, c-format
@@ -3781,7 +3975,7 @@ msgstr "Uventet svar fra xover: %s"
 msgid "Unexpected server response from head: %s"
 msgstr "Uventet svar fra head: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:399
+#: ../camel/providers/nntp/camel-nntp-summary.c:401
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Operasjonen feilet: %s"
@@ -3790,33 +3984,33 @@ msgstr "Operasjonen feilet: %s"
 msgid "Retrieving POP summary"
 msgstr "Henter POP-sammendrag"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:272
+#: ../camel/providers/pop3/camel-pop3-folder.c:274
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Kan ikke hente POP-sammendrag: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:322
+#: ../camel/providers/pop3/camel-pop3-folder.c:324
 msgid "Expunging old messages"
 msgstr "Fjerner gamle meldinger"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:330
+#: ../camel/providers/pop3/camel-pop3-folder.c:332
 msgid "Expunging deleted messages"
 msgstr "Fjerner slettede meldinger"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:563
-#: ../camel/providers/pop3/camel-pop3-folder.c:592
+#: ../camel/providers/pop3/camel-pop3-folder.c:566
+#: ../camel/providers/pop3/camel-pop3-folder.c:596
 #, c-format
 msgid "No message with UID %s"
 msgstr "Ingen melding med UID %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: ../camel/providers/pop3/camel-pop3-folder.c:599
+#: ../camel/providers/pop3/camel-pop3-folder.c:603
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Henter POP-melding %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:696
+#: ../camel/providers/pop3/camel-pop3-folder.c:707
 msgid "Unknown reason"
 msgstr "Ukjent Ã¥rsak"
 
@@ -3865,33 +4059,33 @@ msgstr ""
 "selv pÃ¥ tjenere som hevder Ã¥ stÃ¸tte det."
 
 #. Translators: This is the separator between an error and an explanation
-#: ../camel/providers/pop3/camel-pop3-store.c:140
+#: ../camel/providers/pop3/camel-pop3-store.c:138
 msgid ": "
 msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:209
+#: ../camel/providers/pop3/camel-pop3-store.c:208
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "Kunne ikke lese en gyldig hilsen fra POP-tjener %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:227
-#: ../camel/providers/pop3/camel-pop3-store.c:258
+#: ../camel/providers/pop3/camel-pop3-store.c:226
+#: ../camel/providers/pop3/camel-pop3-store.c:257
 #: ../camel/providers/pop3/camel-pop3-store.c:264
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Kunne ikke koble til POP-tjener %s i sikker modus: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:228
+#: ../camel/providers/pop3/camel-pop3-store.c:227
 msgid "STLS not supported by server"
 msgstr "STLS er ikke stÃ¸ttet av tjeneren"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:246
+#: ../camel/providers/pop3/camel-pop3-store.c:245
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode%s"
 msgstr "Kunne ikke koble til POP-tjener %s i sikker modus%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:259
+#: ../camel/providers/pop3/camel-pop3-store.c:258
 msgid "TLS negotiations failed"
 msgstr "TLS-forhandling feilet"
 
@@ -3899,13 +4093,13 @@ msgstr "TLS-forhandling feilet"
 msgid "TLS is not available in this build"
 msgstr "TLS er ikke stÃ¸ttet i denne versjonen"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:378
+#: ../camel/providers/pop3/camel-pop3-store.c:386
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Kunne ikke koble til POP-tjener %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:422
-#: ../camel/providers/pop3/camel-pop3-store.c:574
+#: ../camel/providers/pop3/camel-pop3-store.c:431
+#: ../camel/providers/pop3/camel-pop3-store.c:583
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -3915,22 +4109,22 @@ msgstr ""
 "autentiseringsmekanisme."
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:444
+#: ../camel/providers/pop3/camel-pop3-store.c:454
 #, c-format
 msgid "SASL '%s' Login failed for POP server %s%s"
 msgstr "SASL Â«%sÂ»-login feilet for POP-tjener %s%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:460
+#: ../camel/providers/pop3/camel-pop3-store.c:471
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Kan ikke logge inn til POP-tjener %s: SASL-protokollfeil"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:481
+#: ../camel/providers/pop3/camel-pop3-store.c:488
 #, c-format
-msgid "Failed to authenticate on POP server %s: %s"
-msgstr "Kunne ikke autentisere mot POP-tjener %s: %s"
+msgid "Failed to authenticate on POP server %s: "
+msgstr "Klarte ikke Ã¥ autentisere mot POP-tjener %s: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:544
+#: ../camel/providers/pop3/camel-pop3-store.c:552
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -3939,7 +4133,7 @@ msgstr ""
 "Kan ikke koble til POP-tjener %s:\\tUgyldig APOP-ID mottatt. Mulig "
 "identitetstyveri. Kontakt din administrator."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:590
+#: ../camel/providers/pop3/camel-pop3-store.c:602
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -3949,7 +4143,7 @@ msgstr ""
 "Feil ved oversending av passord: %s"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:601
+#: ../camel/providers/pop3/camel-pop3-store.c:615
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -3959,7 +4153,7 @@ msgstr ""
 "Feil ved oversending av brukernavn%s"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:613
+#: ../camel/providers/pop3/camel-pop3-store.c:628
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -3968,7 +4162,7 @@ msgstr ""
 "Kunne ikke koble til POP-tjener %s.\n"
 "Feil ved oversending av passord%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:729
+#: ../camel/providers/pop3/camel-pop3-store.c:750
 #, c-format
 msgid "No such folder '%s'."
 msgstr "Ingen slik mappe Â«%sÂ»."
@@ -3982,23 +4176,28 @@ msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr ""
-"For levering av e-post ved Ã¥ videresende den til Â«sendmailÂ»-programmet pÃ¥ det "
-"lokale systemet."
+"For levering av e-post ved Ã¥ videresende den til Â«sendmailÂ»-programmet pÃ¥ "
+"det lokale systemet."
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:98
+#, c-format
 msgid "Could not parse recipient list"
 msgstr "Kunne ikke tolke mottakerliste"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:130
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:131
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Kunne ikke opprette rÃ¸r til sendmail: %s: melding ikke sendt"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:151
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:153
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Kunne ikke kjÃ¸re fork pÃ¥ sendmail: %s: melding ikke sendt"
 
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:194
+msgid "Could not send message: "
+msgstr "Kunne ikke sende meldingen: "
+
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:222
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
@@ -4030,128 +4229,126 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "For levering av e-post via en ekstern e-posttjener med SMTP."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:117
+#: ../camel/providers/smtp/camel-smtp-transport.c:116
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaksfeil, kommando ikke gjenkjent"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:119
+#: ../camel/providers/smtp/camel-smtp-transport.c:118
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaksfeil i parametere eller argumenter"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:121
+#: ../camel/providers/smtp/camel-smtp-transport.c:120
 msgid "Command not implemented"
 msgstr "Kommando ikke implementert"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:123
+#: ../camel/providers/smtp/camel-smtp-transport.c:122
 msgid "Command parameter not implemented"
 msgstr "Kommandoparameter ikke implementert"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:125
+#: ../camel/providers/smtp/camel-smtp-transport.c:124
 msgid "System status, or system help reply"
 msgstr "Systemstatus, eller svar pÃ¥ systemhjelp"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:127
+#: ../camel/providers/smtp/camel-smtp-transport.c:126
 msgid "Help message"
 msgstr "Hjelp-melding"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:129
+#: ../camel/providers/smtp/camel-smtp-transport.c:128
 msgid "Service ready"
 msgstr "Tjeneste klar"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:131
+#: ../camel/providers/smtp/camel-smtp-transport.c:130
 msgid "Service closing transmission channel"
 msgstr "Tjenesten lukker sendekanalen"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:133
+#: ../camel/providers/smtp/camel-smtp-transport.c:132
 msgid "Service not available, closing transmission channel"
 msgstr "Tjenesten er ikke tilgjengelig, lukker sendekanalen"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:135
+#: ../camel/providers/smtp/camel-smtp-transport.c:134
 msgid "Requested mail action okay, completed"
 msgstr "Forespurt e-post handling er ok, fullfÃ¸rt"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:137
+#: ../camel/providers/smtp/camel-smtp-transport.c:136
 msgid "User not local; will forward to <forward-path>"
 msgstr "Ikke lokal bruker; videresender til <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:139
+#: ../camel/providers/smtp/camel-smtp-transport.c:138
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Forespurt e-post handling er ikke utfÃ¸rt: postboks ikke tilgjengelig"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:141
+#: ../camel/providers/smtp/camel-smtp-transport.c:140
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Forespurt handling ikke utfÃ¸rt: postboks ikke tilgjengelig"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:143
+#: ../camel/providers/smtp/camel-smtp-transport.c:142
 msgid "Requested action aborted: error in processing"
 msgstr "Forespurt handling avbrutt: feil i prosessering"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:145
+#: ../camel/providers/smtp/camel-smtp-transport.c:144
 msgid "User not local; please try <forward-path>"
 msgstr "Ikke lokal bruker; vennligst prÃ¸v <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:147
+#: ../camel/providers/smtp/camel-smtp-transport.c:146
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Forespurt handling ikke utfÃ¸rt: utilstrekkelig lagringsplass"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:149
+#: ../camel/providers/smtp/camel-smtp-transport.c:148
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Forespurt e-post handling avbrutt: lagringsallokering oversteget"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:151
+#: ../camel/providers/smtp/camel-smtp-transport.c:150
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Forespurt handling ikke utfÃ¸rt: postboksnavn ikke tillatt"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:153
+#: ../camel/providers/smtp/camel-smtp-transport.c:152
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Start e-post input; slutt med <CRLF>.<CRLF>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:155
+#: ../camel/providers/smtp/camel-smtp-transport.c:154
 msgid "Transaction failed"
 msgstr "Transaksjonen feilet"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:159
+#: ../camel/providers/smtp/camel-smtp-transport.c:158
 msgid "A password transition is needed"
 msgstr "PassordoverfÃ¸ring kreves"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:161
+#: ../camel/providers/smtp/camel-smtp-transport.c:160
 msgid "Authentication mechanism is too weak"
 msgstr "Autentiseringsmekanismen er for svak"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:163
+#: ../camel/providers/smtp/camel-smtp-transport.c:162
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Kryptering kreves for forespurt autentiseringsmekanisme."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:165
+#: ../camel/providers/smtp/camel-smtp-transport.c:164
 msgid "Temporary authentication failure"
 msgstr "Midlertidig autentiseringsfeil"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:249
-msgid "Welcome response error"
-msgstr "Feil i velkommen-svar"
+#: ../camel/providers/smtp/camel-smtp-transport.c:252
+#: ../camel/providers/smtp/camel-smtp-transport.c:258
+msgid "Welcome response error: "
+msgstr "Feil i velkommen-svar: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:285
-#: ../camel/providers/smtp/camel-smtp-transport.c:319
-#: ../camel/providers/smtp/camel-smtp-transport.c:326
+#: ../camel/providers/smtp/camel-smtp-transport.c:294
+#: ../camel/providers/smtp/camel-smtp-transport.c:331
+#: ../camel/providers/smtp/camel-smtp-transport.c:338
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Kunne ikke koble til SMTP-tjener %s i sikker modus: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:295
-#, c-format
-msgid "STARTTLS command failed: %s"
-msgstr "STARTTLS-kommando feilet: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:309
-msgid "STARTTLS command failed"
-msgstr "STARTTLS-kommando feilet"
+#: ../camel/providers/smtp/camel-smtp-transport.c:302
+#: ../camel/providers/smtp/camel-smtp-transport.c:314
+#: ../camel/providers/smtp/camel-smtp-transport.c:320
+msgid "STARTTLS command failed: "
+msgstr "STARTTLS-kommando feilet: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:454
+#: ../camel/providers/smtp/camel-smtp-transport.c:471
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP-tjener %s stÃ¸tter ikke etterspurt autentiseringstype %s."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:526
+#: ../camel/providers/smtp/camel-smtp-transport.c:547
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4162,199 +4359,182 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:664
+#: ../camel/providers/smtp/camel-smtp-transport.c:685
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-tjener %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:666
+#: ../camel/providers/smtp/camel-smtp-transport.c:687
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP e-postlevering via %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:685
+#: ../camel/providers/smtp/camel-smtp-transport.c:707
+#, c-format
 msgid "Cannot send message: service not connected."
 msgstr "Kan ikke sende melding: tjenesten er ikke tilkoblet."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:692
+#: ../camel/providers/smtp/camel-smtp-transport.c:714
+#, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan ikke sende melding: senderadresse ikke gyldig."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:696
+#: ../camel/providers/smtp/camel-smtp-transport.c:718
 msgid "Sending message"
 msgstr "Sender melding"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:712
+#: ../camel/providers/smtp/camel-smtp-transport.c:734
+#, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan ikke sende melding: ingen mottakere definert."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:724
+#: ../camel/providers/smtp/camel-smtp-transport.c:746
+#, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Kan ikke sende melding: en eller flere ugyldige mottakere"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:961
+#: ../camel/providers/smtp/camel-smtp-transport.c:982
 msgid "SMTP Greeting"
 msgstr "SMTP-velkomst"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:986
-#, c-format
-msgid "HELO command failed: %s"
-msgstr "HELO-kommando feilet: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1003
-msgid "HELO command failed"
-msgstr "HELO-kommando feilet"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1006
+#: ../camel/providers/smtp/camel-smtp-transport.c:1021
+#: ../camel/providers/smtp/camel-smtp-transport.c:1028
+msgid "HELO command failed: "
+msgstr "HELO-kommando feilet: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1070
+#: ../camel/providers/smtp/camel-smtp-transport.c:1095
 msgid "SMTP Authentication"
 msgstr "SMTP-autentisering"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1077
+#: ../camel/providers/smtp/camel-smtp-transport.c:1102
+#, c-format
 msgid "Error creating SASL authentication object."
 msgstr "Feil under oppretting av SASL-autentiseringsobjekt."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1094
-#: ../camel/providers/smtp/camel-smtp-transport.c:1105
-#, c-format
-msgid "AUTH command failed: %s"
-msgstr "AUTH-kommando feilet: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1113
-msgid "AUTH command failed"
-msgstr "AUTH-kommando feilet"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1184
-msgid "Bad authentication response from server.\n"
-msgstr "Ugyldig svar pÃ¥ autentisering fra tjener.\n"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1211
-#, c-format
-msgid "MAIL FROM command failed: %s: mail not sent"
-msgstr "MAIL FROM-kommando feilet: %s: melding ikke sendt"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1226
-msgid "MAIL FROM command failed"
-msgstr "MAIL FROM-kommando feilet"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1250
-#, c-format
-msgid "RCPT TO command failed: %s: mail not sent"
-msgstr "RCPT TO-kommando feilet: %s: melding ikke sendt"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1269
-#, c-format
-msgid "RCPT TO <%s> failed"
-msgstr "RCPT TO <%s> feilet"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1309
-#: ../camel/providers/smtp/camel-smtp-transport.c:1384
-#: ../camel/providers/smtp/camel-smtp-transport.c:1402
-#, c-format
-msgid "DATA command failed: %s: mail not sent"
-msgstr "DATA-kommando feilet: %s: melding ikke sendt"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1326
-#: ../camel/providers/smtp/camel-smtp-transport.c:1415
-msgid "DATA command failed"
-msgstr "DATA-kommando feilet"
-
+#: ../camel/providers/smtp/camel-smtp-transport.c:1118
+#: ../camel/providers/smtp/camel-smtp-transport.c:1128
+#: ../camel/providers/smtp/camel-smtp-transport.c:1136
+msgid "AUTH command failed: "
+msgstr "AUTH-kommando feilet: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1233
+#: ../camel/providers/smtp/camel-smtp-transport.c:1245
+#: ../camel/providers/smtp/camel-smtp-transport.c:1252
+msgid "MAIL FROM command failed: "
+msgstr "MAIL FROM-kommando feilet: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1275
+msgid "RCPT TO command failed: "
+msgstr "RCPT TO-kommando feilet: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1289
+#: ../camel/providers/smtp/camel-smtp-transport.c:1297
+#, c-format
+msgid "RCPT TO <%s> failed: "
+msgstr "RCPT TO <%s> feilet: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1335
+#: ../camel/providers/smtp/camel-smtp-transport.c:1344
+#: ../camel/providers/smtp/camel-smtp-transport.c:1354
+#: ../camel/providers/smtp/camel-smtp-transport.c:1411
+#: ../camel/providers/smtp/camel-smtp-transport.c:1427
 #: ../camel/providers/smtp/camel-smtp-transport.c:1438
-#, c-format
-msgid "RSET command failed: %s"
-msgstr "RSET-kommando feilet: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1453
-msgid "RSET command failed"
-msgstr "RSET-kommando feilet"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1445
+msgid "DATA command failed: "
+msgstr "DATA-kommando feilet: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1467
+#: ../camel/providers/smtp/camel-smtp-transport.c:1479
+#: ../camel/providers/smtp/camel-smtp-transport.c:1486
+msgid "RSET command failed: "
+msgstr "RSET-kommando feilet: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1508
+#: ../camel/providers/smtp/camel-smtp-transport.c:1521
+#: ../camel/providers/smtp/camel-smtp-transport.c:1527
+msgid "QUIT command failed: "
+msgstr "QUIT-kommando feilet: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1476
-#, c-format
-msgid "QUIT command failed: %s"
-msgstr "QUIT-kommando feilet: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1492
-msgid "QUIT command failed"
-msgstr "QUIT-kommando feilet"
-
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:45
 msgid "Business"
 msgstr "Arbeid"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:46
 msgid "Competition"
 msgstr "Konkurranse"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:47
 msgid "Favorites"
 msgstr "Favoritter"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:48
 msgid "Gifts"
 msgstr "Gaver"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:49
 msgid "Goals/Objectives"
 msgstr "MÃ¥l"
 
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:50
 msgid "Holiday"
 msgstr "Ferie"
 
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:51
 msgid "Holiday Cards"
 msgstr "Postkort"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:53
 msgid "Hot Contacts"
 msgstr "Viktige kontakter"
 
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:54
 msgid "Ideas"
 msgstr "IdÃ©er"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:55
 msgid "International"
 msgstr "Internasjonalt"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:56
 msgid "Key Customer"
 msgstr "NÃ¸kkelkunde"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:57
 msgid "Miscellaneous"
 msgstr "Forskjellig"
 
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:58
 msgid "Personal"
 msgstr "Personlig"
 
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:59
 msgid "Phone Calls"
 msgstr "Telefonsamtaler"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:61
 msgid "Status"
 msgstr "Status"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:62
 msgid "Strategies"
 msgstr "Strategier"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:63
 msgid "Suppliers"
 msgstr "LeverandÃ¸rer"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:64
 msgid "Time & Expenses"
 msgstr "Tid og utgifter"
 
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:65
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:68
+#: ../libedataserver/e-categories.c:66
 msgid "Waiting"
 msgstr "Venter"
 
@@ -4486,11 +4666,11 @@ msgstr "%H.%M"
 msgid "%I %p"
 msgstr "%H"
 
-#: ../libedataserverui/e-book-auth-util.c:90
+#: ../libedataserverui/e-book-auth-util.c:93
 msgid "Accessing LDAP Server anonymously"
 msgstr "Kobler til LDAP-tjener anonymt"
 
-#: ../libedataserverui/e-book-auth-util.c:192
+#: ../libedataserverui/e-book-auth-util.c:199
 msgid "Failed to authenticate.\n"
 msgstr "Kunne ikke autentisere.\n"
 
@@ -4556,15 +4736,15 @@ msgstr "Lag kategori Â«%sÂ»"
 msgid "Select Contacts from Address Book"
 msgstr "Velg kontakter fra adresseboken"
 
-#: ../libedataserverui/e-name-selector-dialog.c:659
+#: ../libedataserverui/e-name-selector-dialog.c:658
 msgid "_Add"
 msgstr "_Legg til"
 
-#: ../libedataserverui/e-name-selector-dialog.c:663
+#: ../libedataserverui/e-name-selector-dialog.c:662
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: ../libedataserverui/e-name-selector-dialog.c:854
+#: ../libedataserverui/e-name-selector-dialog.c:858
 #: ../libedataserverui/e-name-selector-dialog.ui.h:6
 msgid "Any Category"
 msgstr "Hvilken som helst kategori"
@@ -4606,25 +4786,25 @@ msgid "_Search:"
 msgstr "_SÃ¸k:"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2498
+#: ../libedataserverui/e-name-selector-entry.c:2559
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "Ut_vid %s i oppfÃ¸ringen"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2513
+#: ../libedataserverui/e-name-selector-entry.c:2574
 #, c-format
 msgid "Cop_y %s"
 msgstr "Ko_pier %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2523
+#: ../libedataserverui/e-name-selector-entry.c:2584
 #, c-format
 msgid "C_ut %s"
 msgstr "Klipp _ut %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2540
+#: ../libedataserverui/e-name-selector-entry.c:2601
 #, c-format
 msgid "_Edit %s"
 msgstr "_Rediger %s"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]