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



commit 4095c7f9f855eb065eace91185fdccf04728337b
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Tue Jul 12 12:43:17 2011 +0200

    Updated Norwegian bokmÃl translation

 po/nb.po | 1626 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 817 insertions(+), 809 deletions(-)
---
diff --git a/po/nb.po b/po/nb.po
index be4f6d5..ca6e587 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,11 +6,11 @@
 # Torstein Adolf Winterseth <kvikende fsfe org>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution-data-server 2.91.x\n"
+"Project-Id-Version: evolution-data-server 3.1.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-09 12:41+0200\n"
-"PO-Revision-Date: 2011-06-09 12:44+0200\n"
-"Last-Translator: Torstein Adolf Winterseth <kvikende fsfe org>\n"
+"POT-Creation-Date: 2011-07-12 12:40+0200\n"
+"PO-Revision-Date: 2011-07-12 12:43+0200\n"
+"Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Norwegian BokmÃl <i18n-nb lister ping uio no>\n"
 "Language: nb\n"
 "MIME-Version: 1.0\n"
@@ -25,56 +25,56 @@ msgid "Loading..."
 msgstr "Laster â"
 
 #: ../addressbook/backends/file/e-book-backend-file.c:671
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4704
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4708
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
 msgid "Searching..."
 msgstr "SÃker â"
 
 #. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:591
+#: ../addressbook/backends/google/e-book-backend-google.c:628
 msgid "Querying for updated contactsâ"
 msgstr "SpÃr etter oppdaterte kontakter â"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:626
-#: ../addressbook/libebook/e-book.c:3572 ../calendar/libecal/e-cal.c:1329
-#: ../libedataserver/e-client.c:1659
+#: ../addressbook/backends/google/e-book-backend-google.c:672
+#: ../addressbook/libebook/e-book.c:3572 ../calendar/libecal/e-cal.c:1331
+#: ../libedataserver/e-client.c:1777
 msgid "Personal"
 msgstr "Personlig"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:628
+#: ../addressbook/backends/google/e-book-backend-google.c:674
 msgid "Friends"
 msgstr "Venner"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:630
+#: ../addressbook/backends/google/e-book-backend-google.c:676
 msgid "Family"
 msgstr "Familie"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:632
+#: ../addressbook/backends/google/e-book-backend-google.c:678
 msgid "Coworkers"
 msgstr "Kolleger"
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:709
+#: ../addressbook/backends/google/e-book-backend-google.c:757
 msgid "Querying for updated groupsâ"
 msgstr "SpÃr etter oppdaterte grupper â"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:892
+#: ../addressbook/backends/google/e-book-backend-google.c:1036
 msgid "Creating new contactâ"
 msgstr "Lager ny kontakt â"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:984
+#: ../addressbook/backends/google/e-book-backend-google.c:1128
 msgid "Deleting contactâ"
 msgstr "Sletter kontakt â"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1091
+#: ../addressbook/backends/google/e-book-backend-google.c:1240
 msgid "Modifying contactâ"
 msgstr "Endrer kontakt â"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1233
+#: ../addressbook/backends/google/e-book-backend-google.c:1387
 msgid "Loadingâ"
 msgstr "Laster â"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1380
+#: ../addressbook/backends/google/e-book-backend-google.c:1540
 msgid "Authenticating with the serverâ"
 msgstr "Autentiserer mot tjener â"
 
@@ -91,35 +91,35 @@ msgstr "Bruker distinguished name (DN)"
 msgid "Using Email Address"
 msgstr "Bruker e-post-adresse"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1044
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1048
 msgid "Reconnecting to LDAP server..."
 msgstr "Kobler til LDAP-tjener pà nytt â"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1169
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1173
 msgid "Invalid DN syntax"
 msgstr "Ugyldig DN-syntaks"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1684
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1688
 msgid "Adding contact to LDAP server..."
 msgstr "Legger til kontakt pà LDAP-tjener â"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1814
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1818
 msgid "Removing contact from LDAP server..."
 msgstr "Fjerner kontakt fra LDAP-tjener â"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2246
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2250
 msgid "Modifying contact from LDAP server..."
 msgstr "Endrer kontakt fra LDAP-tjener â"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4555
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4559
 msgid "Receiving LDAP search results..."
 msgstr "Mottar sÃkeresultater fra LDAP-tjener â"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4725
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4729
 msgid "Error performing search"
 msgstr "Feil ved utfÃring av sÃk"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4845
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4849
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "Laster ned kontakter (%d) â"
@@ -130,11 +130,10 @@ msgstr "Laster ned kontakter (%d) â"
 #: ../calendar/backends/caldav/e-cal-backend-caldav.c:519
 #: ../calendar/backends/caldav/e-cal-backend-caldav.c:548
 #: ../calendar/backends/http/e-cal-backend-http.c:422
-#: ../calendar/libecal/e-cal.c:4454
-#: ../camel/providers/imap/camel-imap-command.c:492
+#: ../calendar/libecal/e-cal.c:4462
+#: ../camel/providers/imap/camel-imap-command.c:484
 #: ../camel/providers/imap/camel-imap-store.c:436
-#: ../camel/providers/pop3/camel-pop3-store.c:513
-#: ../camel/providers/smtp/camel-smtp-transport.c:526
+#: ../camel/providers/smtp/camel-smtp-transport.c:525
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
@@ -148,13 +147,13 @@ msgstr "Oppretting av ressurs Â%s feilet med HTTP-status: %d (%s)"
 msgid "%s: there was no source for UID '%s' stored in GConf."
 msgstr "%s: ingen kilde lagret i GConf for uid Â%sÂ."
 
-#: ../addressbook/libebook/e-book.c:3555 ../calendar/libecal/e-cal.c:1309
-#: ../libedataserver/e-client.c:1654
+#: ../addressbook/libebook/e-book.c:3555 ../calendar/libecal/e-cal.c:1311
+#: ../libedataserver/e-client.c:1772
 msgid "On This Computer"
 msgstr "PÃ denne datamaskinen"
 
 #: ../addressbook/libebook/e-book.c:3681
-#: ../addressbook/libebook/e-book-client.c:598
+#: ../addressbook/libebook/e-book-client.c:613
 #: ../addressbook/libedata-book/e-data-book.c:310
 msgid "Address book does not exist"
 msgstr "Adresseboken eksisterer ikke"
@@ -176,101 +175,85 @@ msgstr "Kontakt-ID eksisterer allerede"
 
 #: ../addressbook/libebook/e-book-client.c:91
 msgctxt "BookClientError"
-msgid "TLS not available"
-msgstr "TLS er ikke tilgjengelig"
-
-#: ../addressbook/libebook/e-book-client.c:93
-msgctxt "BookClientError"
 msgid "No such source"
 msgstr "Kilden eksisterer ikke"
 
-#: ../addressbook/libebook/e-book-client.c:95
-msgctxt "BookClientError"
-msgid "Offline unavailable"
-msgstr "Frakoblet modus er ikke tilgjengelig"
-
-#: ../addressbook/libebook/e-book-client.c:97
-msgctxt "BookClientError"
-msgid "Unsupported authentication method"
-msgstr "Ikke stÃttet autentiseringsmetode"
-
-#: ../addressbook/libebook/e-book-client.c:99
+#: ../addressbook/libebook/e-book-client.c:93
 msgctxt "BookClientError"
 msgid "No space"
 msgstr "Ingen plass"
 
-#: ../addressbook/libebook/e-book-client.c:102
+#: ../addressbook/libebook/e-book-client.c:96
 msgctxt "BookClientError"
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
-#: ../addressbook/libebook/e-book-client.c:156
+#: ../addressbook/libebook/e-book-client.c:167
 msgid "D-Bus book proxy gone"
 msgstr "D-Bus bokproxy ble borte"
 
-#: ../addressbook/libebook/e-book-client.c:415
+#: ../addressbook/libebook/e-book-client.c:428
 msgid "Failed to run book factory"
 msgstr "Klarte ikke à kjÃre fabrikk for bok"
 
-#: ../addressbook/libebook/e-book-client.c:424
-#: ../addressbook/libedata-book/e-data-book-factory.c:334
-#: ../addressbook/libedata-book/e-data-book-factory.c:389
-#: ../calendar/libecal/e-cal-client.c:523
-#: ../calendar/libedata-cal/e-data-cal-factory.c:377
+#: ../addressbook/libebook/e-book-client.c:438
+#: ../addressbook/libedata-book/e-data-book-factory.c:371
+#: ../addressbook/libedata-book/e-data-book-factory.c:429
+#: ../calendar/libecal/e-cal-client.c:544
+#: ../calendar/libedata-cal/e-data-cal-factory.c:391
 #, c-format
 msgid "Invalid source"
 msgstr "Ugyldig kilde"
 
-#: ../addressbook/libebook/e-book-client.c:523
-#: ../calendar/libecal/e-cal-client.c:632
+#: ../addressbook/libebook/e-book-client.c:538
+#: ../calendar/libecal/e-cal-client.c:656
 #, c-format
 msgid "Incorrect uri '%s'"
 msgstr "Ugyldig URI Â%sÂ"
 
-#: ../addressbook/libebook/e-book-client.c:561
+#: ../addressbook/libebook/e-book-client.c:576
 msgid "Failed to find system book"
 msgstr "Klarte ikke à finne bok for systemet"
 
-#: ../addressbook/libebook/e-book-client.c:668
-#: ../calendar/libecal/e-cal-client.c:780
+#: ../addressbook/libebook/e-book-client.c:683
+#: ../calendar/libecal/e-cal-client.c:804
 #, c-format
 msgid "There was no source for UID '%s' stored in a source list."
 msgstr "Ingen kilde lagret i en kildeliste for UID Â%sÂ."
 
-#: ../addressbook/libebook/e-book-client.c:1991
-#: ../calendar/libecal/e-cal-client.c:3468
+#: ../addressbook/libebook/e-book-client.c:2006
+#: ../calendar/libecal/e-cal-client.c:3611
 msgid "Cannot get connection to view"
 msgstr "Kan ikke hente tilkobling som skal vises"
 
-#: ../addressbook/libebook/e-book-client-view.c:217
-#: ../calendar/libecal/e-cal-client-view.c:455
-#, c-format
+#: ../addressbook/libebook/e-book-client-view.c:218
+#: ../calendar/libecal/e-cal-client-view.c:456
 msgid "Cannot start view, D-Bus proxy gone"
 msgstr "Kan ikke starte visning. D-Bus proxy ble borte"
 
-#: ../addressbook/libebook/e-book-client-view.c:246
-#: ../calendar/libecal/e-cal-client-view.c:484
-#, c-format
+#: ../addressbook/libebook/e-book-client-view.c:247
+#: ../calendar/libecal/e-cal-client-view.c:485
 msgid "Cannot stop view, D-Bus proxy gone"
 msgstr "Kan ikke stoppe visning. D-Bus proxy ble borte"
 
-#: ../addressbook/libebook/e-book-client-view.c:287
-#: ../calendar/libecal/e-cal-client-view.c:525
-#, c-format
+#: ../addressbook/libebook/e-book-client-view.c:288
+#: ../calendar/libecal/e-cal-client-view.c:526
 msgid "Cannot set fields of interest, D-Bus proxy gone"
 msgstr "Kan ikke sette interessefelt. D-Bus proxy ble borte"
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:114
+#: ../addressbook/libebook/e-contact.c:116
 msgid "Unique ID"
 msgstr "Unik ID"
 
-#: ../addressbook/libebook/e-contact.c:115
+#. FILE_AS is not really a structured field - we use a getter/setter
+#. so we can generate its value if necessary in the getter
+#: ../addressbook/libebook/e-contact.c:119
 msgid "File Under"
 msgstr "Arkiver under"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:117
+#: ../addressbook/libebook/e-contact.c:121
 msgid "Book URI"
 msgstr "URI til bok"
 
@@ -278,519 +261,519 @@ msgstr "URI til bok"
 #. FN isn't really a structured field - we use a getter/setter
 #. so we can set the N property (since evo 1.4 works fine with
 #. vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook/e-contact.c:123
+#: ../addressbook/libebook/e-contact.c:127
 msgid "Full Name"
 msgstr "Fullt navn"
 
-#: ../addressbook/libebook/e-contact.c:124
+#: ../addressbook/libebook/e-contact.c:128
 msgid "Given Name"
 msgstr "Gitt navn"
 
-#: ../addressbook/libebook/e-contact.c:125
+#: ../addressbook/libebook/e-contact.c:129
 msgid "Family Name"
 msgstr "Etternavn"
 
-#: ../addressbook/libebook/e-contact.c:126
+#: ../addressbook/libebook/e-contact.c:130
 msgid "Nickname"
 msgstr "Kallenavn"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:133
 msgid "Email 1"
 msgstr "E-post 1"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:134
 msgid "Email 2"
 msgstr "E-post 2"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Email 3"
 msgstr "E-post 3"
 
-#: ../addressbook/libebook/e-contact.c:132
+#: ../addressbook/libebook/e-contact.c:136
 msgid "Email 4"
 msgstr "E-post 4"
 
-#: ../addressbook/libebook/e-contact.c:134
+#: ../addressbook/libebook/e-contact.c:138
 msgid "Mailer"
 msgstr "Postprogram"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:137
+#: ../addressbook/libebook/e-contact.c:141
 msgid "Home Address Label"
 msgstr "Etikett for hjemmeadresse"
 
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:142
 msgid "Work Address Label"
 msgstr "Etikett for jobbadresse"
 
-#: ../addressbook/libebook/e-contact.c:139
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Other Address Label"
 msgstr "Etikett for annen adresse"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:146
 msgid "Assistant Phone"
 msgstr "Assistents telefon"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:147
 msgid "Business Phone"
 msgstr "Arbeidstelefon"
 
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Business Phone 2"
 msgstr "Arbeidstelefon 2"
 
-#: ../addressbook/libebook/e-contact.c:145
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Business Fax"
 msgstr "Faks pà arbeid"
 
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Callback Phone"
 msgstr "Telefon for tilbakeringing"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:151
 msgid "Car Phone"
 msgstr "Biltelefon"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:152
 msgid "Company Phone"
 msgstr "Firmatelefon"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:153
 msgid "Home Phone"
 msgstr "Hjemmetelefon"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Home Phone 2"
 msgstr "Hjemmetelefon 2"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Home Fax"
 msgstr "Faks hjemme"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:156
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Other Phone"
 msgstr "Annen telefon"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Other Fax"
 msgstr "Annen faks"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Pager"
 msgstr "PersonsÃker"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:161
 msgid "Primary Phone"
 msgstr "PrimÃr telefon"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:162
 msgid "Radio"
 msgstr "Radio"
 
-#: ../addressbook/libebook/e-contact.c:159
+#: ../addressbook/libebook/e-contact.c:163
 msgid "Telex"
 msgstr "Teleks"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:161
+#: ../addressbook/libebook/e-contact.c:165
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook/e-contact.c:168
 msgid "Organization"
 msgstr "Organisasjon"
 
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Organizational Unit"
 msgstr "Organisasjonsenhet"
 
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Office"
 msgstr "Kontor"
 
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook/e-contact.c:171
 msgid "Title"
 msgstr "Tittel"
 
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:172
 msgid "Role"
 msgstr "Rolle"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:173
 msgid "Manager"
 msgstr "Leder"
 
-#: ../addressbook/libebook/e-contact.c:170
+#: ../addressbook/libebook/e-contact.c:174
 msgid "Assistant"
 msgstr "Assistent"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:177
 msgid "Homepage URL"
 msgstr "URL til hjemmeside"
 
-#: ../addressbook/libebook/e-contact.c:174
+#: ../addressbook/libebook/e-contact.c:178
 msgid "Weblog URL"
 msgstr "URL til weblog"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:177
+#: ../addressbook/libebook/e-contact.c:181
 #: ../libedataserverui/e-categories-dialog.c:85
 msgid "Categories"
 msgstr "Kategorier"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:180
+#: ../addressbook/libebook/e-contact.c:184
 msgid "Calendar URI"
 msgstr "Kalender URI"
 
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:185
 msgid "Free/Busy URL"
 msgstr "Ledig/opptatt URL"
 
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:186
 msgid "ICS Calendar"
 msgstr "ICS-kalender"
 
-#: ../addressbook/libebook/e-contact.c:183
+#: ../addressbook/libebook/e-contact.c:187
 msgid "Video Conferencing URL"
 msgstr "Videokonferanse-URL"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:190
 msgid "Spouse's Name"
 msgstr "Ektefelles navn"
 
-#: ../addressbook/libebook/e-contact.c:187
+#: ../addressbook/libebook/e-contact.c:191
 msgid "Note"
 msgstr "Kommentar"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:190
+#: ../addressbook/libebook/e-contact.c:194
 msgid "AIM Home Screen Name 1"
 msgstr "AIM-skjermnavn 1 hjemme"
 
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:195
 msgid "AIM Home Screen Name 2"
 msgstr "AIM-skjermnavn 2 hjemme"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:196
 msgid "AIM Home Screen Name 3"
 msgstr "AIM-skjermnavn 3 hjemme"
 
-#: ../addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook/e-contact.c:197
 msgid "AIM Work Screen Name 1"
 msgstr "AIM-skjermnavn 1 arbeid"
 
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:198
 msgid "AIM Work Screen Name 2"
 msgstr "AIM-skjermnavn 2 arbeid"
 
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:199
 msgid "AIM Work Screen Name 3"
 msgstr "AIM-skjermnavn 3 arbeid"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:200
 msgid "GroupWise Home Screen Name 1"
 msgstr "GroupWise skjermnavn 1 hjemme"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:201
 msgid "GroupWise Home Screen Name 2"
 msgstr "GroupWise skjermnavn 2 hjemme"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:202
 msgid "GroupWise Home Screen Name 3"
 msgstr "GroupWise skjermnavn 3 hjemme"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:203
 msgid "GroupWise Work Screen Name 1"
 msgstr "GroupWise-skjermnavn 1 arbeid"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:204
 msgid "GroupWise Work Screen Name 2"
 msgstr "GroupWise-skjermnavn 2 arbeid"
 
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:205
 msgid "GroupWise Work Screen Name 3"
 msgstr "GroupWise-skjermnavn 3 arbeid"
 
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:206
 msgid "Jabber Home ID 1"
 msgstr "Jabber-ID 1 hjemme"
 
-#: ../addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook/e-contact.c:207
 msgid "Jabber Home ID 2"
 msgstr "Jabber-ID 2 hjemme"
 
-#: ../addressbook/libebook/e-contact.c:204
+#: ../addressbook/libebook/e-contact.c:208
 msgid "Jabber Home ID 3"
 msgstr "Jabber-ID 3 hjemme"
 
-#: ../addressbook/libebook/e-contact.c:205
+#: ../addressbook/libebook/e-contact.c:209
 msgid "Jabber Work ID 1"
 msgstr "Jabber-ID 1 arbeid"
 
-#: ../addressbook/libebook/e-contact.c:206
+#: ../addressbook/libebook/e-contact.c:210
 msgid "Jabber Work ID 2"
 msgstr "Jabber-ID 2 arbeid"
 
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook/e-contact.c:211
 msgid "Jabber Work ID 3"
 msgstr "Jabber-ID 3 arbeid"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:212
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Skjermnavn 1 for Yahoo!, hjemme"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Skjermnavn 2 for Yahoo!, hjemme"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Skjermnavn 3 for Yahoo!, hjemme"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:215
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Skjermnavn 1 for Yahoo!, arbeid"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:216
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Skjermnavn 2 for Yahoo!, arbeid"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:217
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Skjermnavn 3 for Yahoo!, arbeid"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:218
 msgid "MSN Home Screen Name 1"
 msgstr "Skjermnavn 1 for MSN, hjemme"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:219
 msgid "MSN Home Screen Name 2"
 msgstr "Skjermnavn 2 for MSN, hjemme"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:220
 msgid "MSN Home Screen Name 3"
 msgstr "Skjermnavn 3 for MSN, hjemme"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:221
 msgid "MSN Work Screen Name 1"
 msgstr "Skjermnavn 1 for MSN, arbeid"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:222
 msgid "MSN Work Screen Name 2"
 msgstr "Skjermnavn 2 for MSN, arbeid"
 
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook/e-contact.c:223
 msgid "MSN Work Screen Name 3"
 msgstr "Skjermnavn 3 for MSN, arbeid"
 
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:224
 msgid "ICQ Home ID 1"
 msgstr "ICQ-ID 1 hjemme"
 
-#: ../addressbook/libebook/e-contact.c:221
+#: ../addressbook/libebook/e-contact.c:225
 msgid "ICQ Home ID 2"
 msgstr "ICQ-ID 2 hjemme"
 
-#: ../addressbook/libebook/e-contact.c:222
+#: ../addressbook/libebook/e-contact.c:226
 msgid "ICQ Home ID 3"
 msgstr "ICQ-ID 3 hjemme"
 
-#: ../addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook/e-contact.c:227
 msgid "ICQ Work ID 1"
 msgstr "ICQ-ID 1 arbeid"
 
-#: ../addressbook/libebook/e-contact.c:224
+#: ../addressbook/libebook/e-contact.c:228
 msgid "ICQ Work ID 2"
 msgstr "ICQ-ID 2 arbeid"
 
-#: ../addressbook/libebook/e-contact.c:225
+#: ../addressbook/libebook/e-contact.c:229
 msgid "ICQ Work ID 3"
 msgstr "ICQ-ID 3 arbeid"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook/e-contact.c:232
 msgid "Last Revision"
 msgstr "Siste versjon"
 
-#: ../addressbook/libebook/e-contact.c:229
+#: ../addressbook/libebook/e-contact.c:233
 msgid "Name or Org"
 msgstr "Navn eller organisasjon"
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:236
 msgid "Address List"
 msgstr "Adresseliste"
 
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:237
 msgid "Home Address"
 msgstr "Hjemmeadresse"
 
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook/e-contact.c:238
 msgid "Work Address"
 msgstr "Jobbadresse"
 
-#: ../addressbook/libebook/e-contact.c:235
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Other Address"
 msgstr "Annen adresse"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:238
+#: ../addressbook/libebook/e-contact.c:242
 msgid "Category List"
 msgstr "Kategoriliste"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:241
+#: ../addressbook/libebook/e-contact.c:245
 msgid "Photo"
 msgstr "Fotografi"
 
-#: ../addressbook/libebook/e-contact.c:242
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Logo"
 msgstr "Logo"
 
-#: ../addressbook/libebook/e-contact.c:244
+#: ../addressbook/libebook/e-contact.c:248
 msgid "Name"
 msgstr "Navn"
 
-#: ../addressbook/libebook/e-contact.c:245
+#: ../addressbook/libebook/e-contact.c:249
 msgid "Email List"
 msgstr "E-postliste"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:248
+#: ../addressbook/libebook/e-contact.c:252
 msgid "AIM Screen Name List"
 msgstr "Liste over skjermnavn for AIM"
 
-#: ../addressbook/libebook/e-contact.c:249
+#: ../addressbook/libebook/e-contact.c:253
 msgid "GroupWise ID List"
 msgstr "GroupWise ID-liste"
 
-#: ../addressbook/libebook/e-contact.c:250
+#: ../addressbook/libebook/e-contact.c:254
 msgid "Jabber ID List"
 msgstr "Liste med Jabber-IDer"
 
-#: ../addressbook/libebook/e-contact.c:251
+#: ../addressbook/libebook/e-contact.c:255
 msgid "Yahoo! Screen Name List"
 msgstr "Liste med skjermnavn for Yahoo!"
 
-#: ../addressbook/libebook/e-contact.c:252
+#: ../addressbook/libebook/e-contact.c:256
 msgid "MSN Screen Name List"
 msgstr "Liste med skjermnavn for MSN"
 
-#: ../addressbook/libebook/e-contact.c:253
+#: ../addressbook/libebook/e-contact.c:257
 msgid "ICQ ID List"
 msgstr "Liste med ICQ-IDer"
 
-#: ../addressbook/libebook/e-contact.c:255
+#: ../addressbook/libebook/e-contact.c:259
 msgid "Wants HTML Mail"
 msgstr "Vil ha meldinger som HTML"
 
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:261
 msgid "List"
 msgstr "Liste"
 
-#: ../addressbook/libebook/e-contact.c:258
+#: ../addressbook/libebook/e-contact.c:262
 msgid "List Show Addresses"
 msgstr "Vis adresse som liste"
 
-#: ../addressbook/libebook/e-contact.c:260
+#: ../addressbook/libebook/e-contact.c:264
 msgid "Birth Date"
 msgstr "FÃdselsdato"
 
-#: ../addressbook/libebook/e-contact.c:261
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:722
+#: ../addressbook/libebook/e-contact.c:265
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:721
 msgid "Anniversary"
 msgstr "Jubileum"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:264
+#: ../addressbook/libebook/e-contact.c:268
 msgid "X.509 Certificate"
 msgstr "X.509-sertifikat"
 
-#: ../addressbook/libebook/e-contact.c:266
+#: ../addressbook/libebook/e-contact.c:270
 msgid "Gadu-Gadu Home ID 1"
 msgstr "Gadu-Gadu-ID 1 hjemme"
 
-#: ../addressbook/libebook/e-contact.c:267
+#: ../addressbook/libebook/e-contact.c:271
 msgid "Gadu-Gadu Home ID 2"
 msgstr "Gadu-Gadu-ID 2 hjemme"
 
-#: ../addressbook/libebook/e-contact.c:268
+#: ../addressbook/libebook/e-contact.c:272
 msgid "Gadu-Gadu Home ID 3"
 msgstr "Gadu-Gadu-ID 3 hjemme"
 
-#: ../addressbook/libebook/e-contact.c:269
+#: ../addressbook/libebook/e-contact.c:273
 msgid "Gadu-Gadu Work ID 1"
 msgstr "Gadu-Gadu-ID 1 arbeid"
 
-#: ../addressbook/libebook/e-contact.c:270
+#: ../addressbook/libebook/e-contact.c:274
 msgid "Gadu-Gadu Work ID 2"
 msgstr "Gadu-Gadu-ID 2 arbeid"
 
-#: ../addressbook/libebook/e-contact.c:271
+#: ../addressbook/libebook/e-contact.c:275
 msgid "Gadu-Gadu Work ID 3"
 msgstr "Gadu-Gadu-ID 3 arbeid"
 
-#: ../addressbook/libebook/e-contact.c:272
+#: ../addressbook/libebook/e-contact.c:276
 msgid "Gadu-Gadu ID List"
 msgstr "Gadu-Gadu ID-liste"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:275
+#: ../addressbook/libebook/e-contact.c:279
 msgid "Geographic Information"
 msgstr "Geografisk informasjon"
 
-#: ../addressbook/libebook/e-contact.c:277
+#: ../addressbook/libebook/e-contact.c:281
 msgid "Telephone"
 msgstr "Telefon"
 
-#: ../addressbook/libebook/e-contact.c:279
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Skype Home Name 1"
 msgstr "Skype-navn hjemme 1"
 
-#: ../addressbook/libebook/e-contact.c:280
+#: ../addressbook/libebook/e-contact.c:284
 msgid "Skype Home Name 2"
 msgstr "Skype-navn hjemme 2"
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:285
 msgid "Skype Home Name 3"
 msgstr "Skype-navn hjemme 3"
 
-#: ../addressbook/libebook/e-contact.c:282
+#: ../addressbook/libebook/e-contact.c:286
 msgid "Skype Work Name 1"
 msgstr "Skype-navn arbeid 1"
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:287
 msgid "Skype Work Name 2"
 msgstr "Skype-navn arbeid 2"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:288
 msgid "Skype Work Name 3"
 msgstr "Skype-navn arbeid 3"
 
-#: ../addressbook/libebook/e-contact.c:285
+#: ../addressbook/libebook/e-contact.c:289
 msgid "Skype Name List"
 msgstr "Liste med Skype-navn"
 
-#: ../addressbook/libebook/e-contact.c:287
+#: ../addressbook/libebook/e-contact.c:291
 msgid "SIP address"
 msgstr "SIP-adresse"
 
-#: ../addressbook/libebook/e-contact.c:1515
-#: ../addressbook/libebook/e-destination.c:741
+#: ../addressbook/libebook/e-contact.c:1542
+#: ../addressbook/libebook/e-destination.c:870
 msgid "Unnamed List"
 msgstr "Liste uten navn"
 
@@ -808,12 +791,11 @@ msgstr "Ukjent egenskap Â%s for bok"
 msgid "Cannot change value of book property '%s'"
 msgstr "Kan ikke endre verdi for bokegenskap Â%sÂ"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:321
-#: ../addressbook/libedata-book/e-data-book-factory.c:348
-#: ../calendar/libedata-cal/e-data-cal-factory.c:391
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:420
+#: ../camel/camel-db.c:470
 #, c-format
-msgid "Empty URI"
-msgstr "Tom URI"
+msgid "Insufficient memory"
+msgstr "Ikke nok minne"
 
 #. Translators: This is prefix to a detailed error message
 #: ../addressbook/libedata-book/e-data-book.c:196
@@ -828,7 +810,7 @@ msgid "Success"
 msgstr "Suksess"
 
 #: ../addressbook/libedata-book/e-data-book.c:300
-#: ../calendar/libecal/e-cal.c:4422 ../calendar/libedata-cal/e-data-cal.c:414
+#: ../calendar/libecal/e-cal.c:4430 ../calendar/libedata-cal/e-data-cal.c:414
 msgid "Backend is busy"
 msgstr "Motoren er opptatt"
 
@@ -838,7 +820,7 @@ msgid "Repository offline"
 msgstr "Lageret er frakoblet"
 
 #: ../addressbook/libedata-book/e-data-book.c:302
-#: ../calendar/libecal/e-cal.c:4436 ../calendar/libedata-cal/e-data-cal.c:416
+#: ../calendar/libecal/e-cal.c:4444 ../calendar/libedata-cal/e-data-cal.c:416
 msgid "Permission denied"
 msgstr "Tilgang nektet"
 
@@ -921,18 +903,18 @@ msgid "No space"
 msgstr "Ingen plass"
 
 #: ../addressbook/libedata-book/e-data-book.c:321
-#: ../calendar/libecal/e-cal.c:4420 ../calendar/libedata-cal/e-data-cal.c:437
+#: ../calendar/libecal/e-cal.c:4428 ../calendar/libedata-cal/e-data-cal.c:437
 msgid "Invalid argument"
 msgstr "Ugyldig argument"
 
 #. Translators: The string for NOT_SUPPORTED error
 #: ../addressbook/libedata-book/e-data-book.c:323
-#: ../calendar/libecal/e-cal.c:4459 ../calendar/libedata-cal/e-data-cal.c:439
+#: ../calendar/libecal/e-cal.c:4467 ../calendar/libedata-cal/e-data-cal.c:439
 msgid "Not supported"
 msgstr "Ikke stÃttet"
 
 #: ../addressbook/libedata-book/e-data-book.c:331
-#: ../calendar/libecal/e-cal-client.c:530
+#: ../calendar/libecal/e-cal-client.c:552
 #: ../calendar/libedata-cal/e-data-cal.c:447
 msgid "Other error"
 msgstr "Annen feil"
@@ -963,7 +945,7 @@ msgstr "Kan ikke endre kontakt: "
 
 #. Translators: This is prefix to a detailed error message
 #: ../addressbook/libedata-book/e-data-book.c:715
-#: ../calendar/libedata-cal/e-data-cal.c:823
+#: ../calendar/libedata-cal/e-data-cal.c:822
 msgid "Cannot authenticate user: "
 msgstr "Kan ikke autentisere bruker: "
 
@@ -989,7 +971,7 @@ msgstr "Kan ikke hente egenskap for motor: "
 
 #. Translators: This is prefix to a detailed error message
 #: ../addressbook/libedata-book/e-data-book.c:848
-#: ../calendar/libedata-cal/e-data-cal.c:1000
+#: ../calendar/libedata-cal/e-data-cal.c:999
 msgid "Cannot set backend property: "
 msgstr "Kan ikke sette egenskap for motor: "
 
@@ -1008,6 +990,13 @@ msgstr "Kan ikke hente UIDer for kontaktliste: "
 msgid "Cannot remove contacts: "
 msgstr "Kan ikke fjerne kontakter: "
 
+#: ../addressbook/libedata-book/e-data-book-factory.c:355
+#: ../addressbook/libedata-book/e-data-book-factory.c:388
+#: ../calendar/libedata-cal/e-data-cal-factory.c:406
+#, c-format
+msgid "Empty URI"
+msgstr "Tom URI"
+
 #: ../calendar/backends/caldav/e-cal-backend-caldav.c:517
 #, c-format
 msgid "Server is unreachable (%s)"
@@ -1028,20 +1017,20 @@ msgstr ""
 "Tjeneren kan ikke nÃs. Kalender Ãpnes i skrivebeskyttet modus.\n"
 "Feilmelding: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4185
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4187
 msgid "Calendar doesn't support Free/Busy"
 msgstr "Kalender stÃtter ikke ledig/opptatt"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:724
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:723
 msgid "Birthday"
 msgstr "FÃdselsdag"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:753
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:752
 #, c-format
 msgid "Birthday: %s"
 msgstr "FÃdselsdag: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:777
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:776
 #, c-format
 msgid "Anniversary: %s"
 msgstr "Bryllupsdag: %s"
@@ -1117,6 +1106,83 @@ msgstr "VÃr: TordenvÃr"
 msgid "Forecast"
 msgstr "VÃrmelding"
 
+#: ../calendar/libecal/e-cal.c:860 ../libedataserverui/e-book-auth-util.c:204
+#: ../libedataserverui/e-book-auth-util.c:427
+#: ../libedataserverui/e-client-utils.c:758
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr "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:874
+#, 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:4432
+msgid "Repository is offline"
+msgstr "Lageret er frakoblet"
+
+#: ../calendar/libecal/e-cal.c:4434
+msgid "No such calendar"
+msgstr "Ingen slik kalender"
+
+#: ../calendar/libecal/e-cal.c:4436 ../calendar/libedata-cal/e-data-cal.c:418
+msgid "Object not found"
+msgstr "Objektet ble ikke funnet"
+
+#: ../calendar/libecal/e-cal.c:4438 ../calendar/libedata-cal/e-data-cal.c:419
+msgid "Invalid object"
+msgstr "Ugyldig objekt"
+
+#: ../calendar/libecal/e-cal.c:4440
+msgid "URI not loaded"
+msgstr "URI ble ikke lastet"
+
+#: ../calendar/libecal/e-cal.c:4442
+msgid "URI already loaded"
+msgstr "URI allerede lastet"
+
+#: ../calendar/libecal/e-cal.c:4446
+msgid "Unknown User"
+msgstr "Ukjent bruker"
+
+#: ../calendar/libecal/e-cal.c:4448 ../calendar/libedata-cal/e-data-cal.c:420
+msgid "Object ID already exists"
+msgstr "Objekt-ID eksisterer allerede"
+
+#: ../calendar/libecal/e-cal.c:4450
+msgid "Protocol not supported"
+msgstr "Protokollen er ikke stÃttet"
+
+#: ../calendar/libecal/e-cal.c:4452
+msgid "Operation has been canceled"
+msgstr "Operasjonen ble avbrutt"
+
+#: ../calendar/libecal/e-cal.c:4454
+msgid "Could not cancel operation"
+msgstr "Kunne ikke avbryte operasjon"
+
+#: ../calendar/libecal/e-cal.c:4456
+msgid "Authentication failed"
+msgstr "Autentisering feilet"
+
+#: ../calendar/libecal/e-cal.c:4458
+#: ../camel/providers/smtp/camel-smtp-transport.c:795
+msgid "Authentication required"
+msgstr "Autentisering kreves"
+
+#: ../calendar/libecal/e-cal.c:4460
+msgid "A D-Bus exception has occurred"
+msgstr "Et D-Bus-unntak har oppstÃtt"
+
+#: ../calendar/libecal/e-cal.c:4464
+msgid "No error"
+msgstr "Ingen feil"
+
 #: ../calendar/libecal/e-cal-client.c:127
 msgctxt "CalClientError"
 msgid "No such calendar"
@@ -1142,29 +1208,34 @@ msgctxt "CalClientError"
 msgid "Object ID already exists"
 msgstr "Objekt-ID eksisterer allerede"
 
-#: ../calendar/libecal/e-cal-client.c:138
+#: ../calendar/libecal/e-cal-client.c:137
+msgctxt "CalClientError"
+msgid "Invalid range"
+msgstr "Ugyldig omrÃde"
+
+#: ../calendar/libecal/e-cal-client.c:140
 msgctxt "CalClientError"
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
-#: ../calendar/libecal/e-cal-client.c:194
+#: ../calendar/libecal/e-cal-client.c:213
 msgid "D-Bus calendar proxy gone"
 msgstr "D-Bus kalenderproxy ble borte"
 
-#: ../calendar/libecal/e-cal-client.c:514
+#: ../calendar/libecal/e-cal-client.c:534
 msgid "Failed to run calendar factory"
 msgstr "Klarte ikke à kjÃre fabrikk for kalender"
 
-#: ../calendar/libecal/e-cal-client.c:671
+#: ../calendar/libecal/e-cal-client.c:695
 msgid "Failed to find system calendar"
 msgstr "Klarte ikke à finne kalender for systemet"
 
-#: ../calendar/libecal/e-cal-client.c:709
+#: ../calendar/libecal/e-cal-client.c:733
 #: ../calendar/libedata-cal/e-data-cal.c:427
 msgid "Calendar does not exist"
 msgstr "Kalender eksisterer ikke."
 
-#: ../calendar/libecal/e-cal-client.c:819
+#: ../calendar/libecal/e-cal-client.c:843
 msgid "Invalid source type"
 msgstr "Ugyldig type kilde"
 
@@ -1313,82 +1384,19 @@ msgstr "Lav"
 msgid "Undefined"
 msgstr "Udefinert"
 
-#: ../calendar/libecal/e-cal.c:858 ../libedataserverui/e-book-auth-util.c:206
-#: ../libedataserverui/e-book-auth-util.c:440
-#: ../libedataserverui/e-client-utils.c:662
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "Oppgi passord for %s (bruker %s)"
+#: ../calendar/libedata-cal/e-cal-backend.c:34
+msgid "Cannot process, calendar backend is opening"
+msgstr "Kan ikke prosessere fordi kalendermotoren er i ferd med à Ãpnes"
 
-#.
-#. 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:872
+#: ../calendar/libedata-cal/e-cal-backend.c:206
 #, 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:4424
-msgid "Repository is offline"
-msgstr "Lageret er frakoblet"
-
-#: ../calendar/libecal/e-cal.c:4426
-msgid "No such calendar"
-msgstr "Ingen slik kalender"
-
-#: ../calendar/libecal/e-cal.c:4428 ../calendar/libedata-cal/e-data-cal.c:418
-msgid "Object not found"
-msgstr "Objektet ble ikke funnet"
-
-#: ../calendar/libecal/e-cal.c:4430 ../calendar/libedata-cal/e-data-cal.c:419
-msgid "Invalid object"
-msgstr "Ugyldig objekt"
-
-#: ../calendar/libecal/e-cal.c:4432
-msgid "URI not loaded"
-msgstr "URI ble ikke lastet"
-
-#: ../calendar/libecal/e-cal.c:4434
-msgid "URI already loaded"
-msgstr "URI allerede lastet"
-
-#: ../calendar/libecal/e-cal.c:4438
-msgid "Unknown User"
-msgstr "Ukjent bruker"
-
-#: ../calendar/libecal/e-cal.c:4440 ../calendar/libedata-cal/e-data-cal.c:420
-msgid "Object ID already exists"
-msgstr "Objekt-ID eksisterer allerede"
-
-#: ../calendar/libecal/e-cal.c:4442
-msgid "Protocol not supported"
-msgstr "Protokollen er ikke stÃttet"
-
-#: ../calendar/libecal/e-cal.c:4444
-msgid "Operation has been canceled"
-msgstr "Operasjonen ble avbrutt"
-
-#: ../calendar/libecal/e-cal.c:4446
-msgid "Could not cancel operation"
-msgstr "Kunne ikke avbryte operasjon"
-
-#: ../calendar/libecal/e-cal.c:4448
-msgid "Authentication failed"
-msgstr "Autentisering feilet"
-
-#: ../calendar/libecal/e-cal.c:4450
-#: ../camel/providers/smtp/camel-smtp-transport.c:802
-msgid "Authentication required"
-msgstr "Autentisering kreves"
-
-#: ../calendar/libecal/e-cal.c:4452
-msgid "A D-Bus exception has occurred"
-msgstr "Et D-Bus-unntak har oppstÃtt"
+msgid "Unknown calendar property '%s'"
+msgstr "Ukjent kalenderegenskap Â%sÂ"
 
-#: ../calendar/libecal/e-cal.c:4456
-msgid "No error"
-msgstr "Ingen feil"
+#: ../calendar/libedata-cal/e-cal-backend.c:218
+#, c-format
+msgid "Cannot change value of calendar property '%s'"
+msgstr "Kan ikke lage endre verdi for kalenderegenskap Â%sÂ"
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:69
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
@@ -1485,20 +1493,6 @@ msgstr ""
 "Â%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.c:34
-msgid "Cannot process, calendar backend is opening"
-msgstr "Kan ikke prosessere fordi kalendermotoren er i ferd med à Ãpnes"
-
-#: ../calendar/libedata-cal/e-cal-backend.c:206
-#, c-format
-msgid "Unknown calendar property '%s'"
-msgstr "Ukjent kalenderegenskap Â%sÂ"
-
-#: ../calendar/libedata-cal/e-cal-backend.c:218
-#, c-format
-msgid "Cannot change value of calendar property '%s'"
-msgstr "Kan ikke lage endre verdi for kalenderegenskap Â%sÂ"
-
 #: ../calendar/libedata-cal/e-data-cal.c:417
 msgid "Invalid range"
 msgstr "Ugyldig omrÃde"
@@ -1512,106 +1506,106 @@ msgid "Unknown user"
 msgstr "Ukjent bruker"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:908
+#: ../calendar/libedata-cal/e-data-cal.c:907
 msgid "Cannot open calendar: "
 msgstr "Kan ikke Ãpne kalender: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:929
+#: ../calendar/libedata-cal/e-data-cal.c:928
 msgid "Cannot remove calendar: "
 msgstr "Kan ikke fjerne kalender: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:954
+#: ../calendar/libedata-cal/e-data-cal.c:953
 msgid "Cannot refresh calendar: "
 msgstr "Kan ikke oppdatere kalender: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:978
+#: ../calendar/libedata-cal/e-data-cal.c:977
 msgid "Cannot retrieve backend property: "
 msgstr "Kan ikke hente egenskap for motor: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1024
+#: ../calendar/libedata-cal/e-data-cal.c:1023
 msgid "Cannot retrieve calendar object path: "
 msgstr "Kan ikke hente objektsti for kalender: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1049
+#: ../calendar/libedata-cal/e-data-cal.c:1048
 msgid "Cannot retrieve calendar object list: "
 msgstr "Kan ikke hente objektliste for kalender: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1074
+#: ../calendar/libedata-cal/e-data-cal.c:1073
 msgid "Cannot retrieve calendar free/busy list: "
 msgstr "Kan ikke ledig/opptattliste for kalender: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1100
+#: ../calendar/libedata-cal/e-data-cal.c:1099
 msgid "Cannot create calendar object: "
 msgstr "Kan ikke lage kalenderobjekt: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1127
+#: ../calendar/libedata-cal/e-data-cal.c:1126
 msgid "Cannot modify calendar object: "
 msgstr "Kan ikke endre kalenderobjekt: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1155
+#: ../calendar/libedata-cal/e-data-cal.c:1154
 msgid "Cannot remove calendar object: "
 msgstr "Kan ikke fjerne kalenderobjekt: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1178
+#: ../calendar/libedata-cal/e-data-cal.c:1177
 msgid "Cannot receive calendar objects: "
 msgstr "Kan ikke motta kalenderobjekter: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1203
+#: ../calendar/libedata-cal/e-data-cal.c:1202
 msgid "Cannot send calendar objects: "
 msgstr "Kan ikke sende kalenderobjekter: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1230
+#: ../calendar/libedata-cal/e-data-cal.c:1229
 msgid "Could not retrieve attachment uris: "
 msgstr "Kunne ikke hente vedleggslenker: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1254
+#: ../calendar/libedata-cal/e-data-cal.c:1253
 msgid "Could not discard alarm: "
 msgstr "Kan ikke forkaste alarm: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1278
+#: ../calendar/libedata-cal/e-data-cal.c:1277
 msgid "Could not get calendar view path: "
 msgstr "Kunne ikke hente sti for kalendervisning: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1303
+#: ../calendar/libedata-cal/e-data-cal.c:1302
 msgid "Could not retrieve calendar time zone: "
 msgstr "Kunne ikke hente tidssone for kalender: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1325
+#: ../calendar/libedata-cal/e-data-cal.c:1324
 msgid "Could not add calendar time zone: "
 msgstr "Kunne ikke legge til tidssone for kalender: "
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:366
+#: ../calendar/libedata-cal/e-data-cal-factory.c:379
 #, c-format
 msgid "Invalid call"
 msgstr "Ugyldig kall"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:404
+#: ../calendar/libedata-cal/e-data-cal-factory.c:420
 #, c-format
 msgid "Invalid URI"
 msgstr "Ugyldig URI"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:422
+#: ../calendar/libedata-cal/e-data-cal-factory.c:438
 #, c-format
 msgid "No backend factory for '%s' of '%s'"
 msgstr "Ingen fabrikk for motor for Â%s for Â%sÂ"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:472
+#: ../calendar/libedata-cal/e-data-cal-factory.c:481
 #, c-format
 msgid "Could not instantiate backend"
 msgstr "Kunne ikke starte motor"
@@ -1668,16 +1662,6 @@ 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-data-wrapper.c:143
-#, c-format
-msgid "No stream available"
-msgstr "Ingen strÃm tilgjengelig"
-
-#: ../camel/camel-db.c:471
-#, c-format
-msgid "Insufficient memory"
-msgstr "Ikke nok minne"
-
 #: ../camel/camel-disco-diary.c:195
 #, c-format
 msgid ""
@@ -1719,10 +1703,10 @@ msgid "Copy folder content locally for offline operation"
 msgstr "Kopier mappeinnhold lokalt for frakoblet operasjon"
 
 #: ../camel/camel-disco-store.c:436
-#: ../camel/providers/imap/camel-imap-store.c:1192
-#: ../camel/providers/imap/camel-imap-store.c:1844
-#: ../camel/providers/imap/camel-imap-store.c:2327
-#: ../camel/providers/imap/camel-imap-store.c:3147
+#: ../camel/providers/imap/camel-imap-store.c:1180
+#: ../camel/providers/imap/camel-imap-store.c:1832
+#: ../camel/providers/imap/camel-imap-store.c:2315
+#: ../camel/providers/imap/camel-imap-store.c:3136
 #: ../camel/providers/imapx/camel-imapx-folder.c:298
 #: ../camel/providers/imapx/camel-imapx-folder.c:331
 #: ../camel/providers/imapx/camel-imapx-folder.c:385
@@ -1743,130 +1727,85 @@ msgstr "Du mà arbeide tilknyttet for à fullfÃre denne operasjonen"
 msgid "Canceled"
 msgstr "Avbrutt"
 
-#: ../camel/camel-filter-driver.c:818 ../camel/camel-filter-search.c:608
+#: ../camel/camel-filter-driver.c:818 ../camel/camel-filter-search.c:628
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "Kunne ikke opprette underprosess Â%sÂ: %s"
 
-#: ../camel/camel-filter-driver.c:865
+#: ../camel/camel-filter-driver.c:866
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Ugyldig meldingsstrÃm mottatt fra %s: %s"
 
-#: ../camel/camel-filter-driver.c:1052 ../camel/camel-filter-driver.c:1061
+#: ../camel/camel-filter-driver.c:1053 ../camel/camel-filter-driver.c:1062
 msgid "Syncing folders"
 msgstr "Synkroniserer mapper"
 
-#: ../camel/camel-filter-driver.c:1149 ../camel/camel-filter-driver.c:1593
+#: ../camel/camel-filter-driver.c:1150 ../camel/camel-filter-driver.c:1594
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Feil under lesing av filter: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1160 ../camel/camel-filter-driver.c:1604
+#: ../camel/camel-filter-driver.c:1161 ../camel/camel-filter-driver.c:1605
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Feil under kjÃring av filter: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1257
+#: ../camel/camel-filter-driver.c:1258
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "Kunne ikke Ãpne spool-mappen"
 
-#: ../camel/camel-filter-driver.c:1268
+#: ../camel/camel-filter-driver.c:1269
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "Kan ikke prosessere spool-mappen"
 
-#: ../camel/camel-filter-driver.c:1286
+#: ../camel/camel-filter-driver.c:1287
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Henter melding %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1293 ../camel/camel-filter-driver.c:1315
+#: ../camel/camel-filter-driver.c:1294 ../camel/camel-filter-driver.c:1316
 #, c-format
 msgid "Failed on message %d"
 msgstr "Feilet pà melding %d"
 
-#: ../camel/camel-filter-driver.c:1330 ../camel/camel-filter-driver.c:1431
+#: ../camel/camel-filter-driver.c:1331 ../camel/camel-filter-driver.c:1432
 msgid "Syncing folder"
 msgstr "Synkroniserer mappe"
 
-#: ../camel/camel-filter-driver.c:1335 ../camel/camel-filter-driver.c:1437
+#: ../camel/camel-filter-driver.c:1336 ../camel/camel-filter-driver.c:1438
 msgid "Complete"
 msgstr "FullfÃrt"
 
-#: ../camel/camel-filter-driver.c:1395
+#: ../camel/camel-filter-driver.c:1396
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Henter melding %d av %d"
 
-#: ../camel/camel-filter-driver.c:1413
+#: ../camel/camel-filter-driver.c:1414
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Feilet pà melding %d av %d"
 
-#: ../camel/camel-filter-search.c:135
+#: ../camel/camel-filter-search.c:137
 msgid "Failed to retrieve message"
 msgstr "Feil under henting av melding"
 
-#: ../camel/camel-filter-search.c:401
+#: ../camel/camel-filter-search.c:403
 msgid "Invalid arguments to (system-flag)"
 msgstr "Ugyldige argumenter til (system-flag)"
 
-#: ../camel/camel-filter-search.c:416
+#: ../camel/camel-filter-search.c:418
 msgid "Invalid arguments to (user-tag)"
 msgstr "Ugyldige argumenter til (user-tag)"
 
-#: ../camel/camel-filter-search.c:770 ../camel/camel-filter-search.c:779
+#: ../camel/camel-filter-search.c:790 ../camel/camel-filter-search.c:799
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Feil under lagring av filtersÃk: %s: %s"
 
-#: ../camel/camel-folder-search.c:342 ../camel/camel-folder-search.c:453
-#: ../camel/camel-folder-search.c:624
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Kan ikke tolke uttrykket: %s:\n"
-"%s"
-
-#: ../camel/camel-folder-search.c:354 ../camel/camel-folder-search.c:465
-#: ../camel/camel-folder-search.c:636
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Feil under kjÃring av sÃkeuttrykket %s:\n"
-"%s"
-
-#: ../camel/camel-folder-search.c:840 ../camel/camel-folder-search.c:882
-#, c-format
-msgid "(%s) requires a single bool result"
-msgstr "(%s) krever et enkelt bolsk resultat"
-
-#: ../camel/camel-folder-search.c:935
-#, c-format
-msgid "(%s) not allowed inside %s"
-msgstr "(%s) tillates ikke inne i %s"
-
-#: ../camel/camel-folder-search.c:941 ../camel/camel-folder-search.c:948
-#, c-format
-msgid "(%s) requires a match type string"
-msgstr "(%s) krever en streng for trefftype"
-
-#: ../camel/camel-folder-search.c:975
-#, c-format
-msgid "(%s) expects an array result"
-msgstr "(%s) forventer resultat pà tabellform"
-
-#: ../camel/camel-folder-search.c:984
-#, c-format
-msgid "(%s) requires the folder set"
-msgstr "(%s) krever et mappesett"
-
 #: ../camel/camel-folder.c:236
 #, c-format
 msgid "Learning new spam message in '%s'"
@@ -1912,6 +1851,51 @@ msgstr "Henter melding Â%s i %s"
 msgid "Retrieving quota information for '%s'"
 msgstr "Henter kvoteinformasjon for Â%sÂ"
 
+#: ../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"
+"%s"
+msgstr ""
+"Kan ikke tolke uttrykket: %s:\n"
+"%s"
+
+#: ../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"
+"%s"
+msgstr ""
+"Feil under kjÃring av sÃkeuttrykket %s:\n"
+"%s"
+
+#: ../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:938
+#, c-format
+msgid "(%s) not allowed inside %s"
+msgstr "(%s) tillates ikke inne i %s"
+
+#: ../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:978
+#, c-format
+msgid "(%s) expects an array result"
+msgstr "(%s) forventer resultat pà tabellform"
+
+#: ../camel/camel-folder-search.c:987
+#, c-format
+msgid "(%s) requires the folder set"
+msgstr "(%s) krever et mappesett"
+
 #: ../camel/camel-gpg-context.c:642 ../camel/camel-gpg-context.c:647
 #: ../camel/camel-gpg-context.c:1272
 #, c-format
@@ -1919,8 +1903,7 @@ msgid "Failed to execute gpg: %s"
 msgstr "Feil ved kjÃring av gpg: %s"
 
 #: ../camel/camel-gpg-context.c:647
-#: ../camel/providers/smtp/camel-smtp-transport.c:750
-#: ../camel/providers/smtp/camel-smtp-transport.c:805
+#: ../camel/providers/smtp/camel-smtp-transport.c:798
 msgid "Unknown"
 msgstr "Ukjent"
 
@@ -1970,15 +1953,11 @@ msgstr "Uventet forespÃrsel fra GnuPG for Â%sÂ"
 
 #: ../camel/camel-gpg-context.c:828 ../camel/camel-net-utils.c:515
 #: ../camel/camel-tcp-stream-raw.c:255
-#: ../camel/providers/imapx/camel-imapx-server.c:5011
-#: ../camel/providers/imapx/camel-imapx-server.c:5028
+#: ../camel/providers/imapx/camel-imapx-server.c:5025
+#: ../camel/providers/imapx/camel-imapx-server.c:5042
 #: ../camel/providers/imapx/camel-imapx-store.c:179
 #: ../camel/providers/nntp/camel-nntp-summary.c:409
-#: ../camel/providers/pop3/camel-pop3-folder.c:366
-#: ../camel/providers/pop3/camel-pop3-folder.c:431
-#: ../camel/providers/pop3/camel-pop3-folder.c:506
-#: ../camel/providers/pop3/camel-pop3-store.c:505
-#: ../libedataserverui/e-book-auth-util.c:229
+#: ../libedataserverui/e-book-auth-util.c:227
 #, c-format
 msgid "Cancelled"
 msgstr "Avbrutt"
@@ -2002,67 +1981,47 @@ msgstr "Kan ikke kryptere: Ingen gyldige mottakere spesifisert."
 msgid "Could not generate signing data: "
 msgstr "Kan ikke generere signeringsdata: "
 
-#: ../camel/camel-gpg-context.c:1582 ../camel/camel-gpg-context.c:1782
-#: ../camel/camel-gpg-context.c:1892 ../camel/camel-gpg-context.c:2038
-#: ../camel/camel-gpg-context.c:2137 ../camel/camel-gpg-context.c:2185
+#: ../camel/camel-gpg-context.c:1584 ../camel/camel-gpg-context.c:1788
+#: ../camel/camel-gpg-context.c:1898 ../camel/camel-gpg-context.c:2045
+#: ../camel/camel-gpg-context.c:2145 ../camel/camel-gpg-context.c:2193
 msgid "Failed to execute gpg."
 msgstr "Feil ved kjÃring av gpg."
 
-#: ../camel/camel-gpg-context.c:1662 ../camel/camel-gpg-context.c:1670
-#: ../camel/camel-gpg-context.c:1678 ../camel/camel-gpg-context.c:1697
-#: ../camel/camel-smime-context.c:948 ../camel/camel-smime-context.c:962
-#: ../camel/camel-smime-context.c:971
+#: ../camel/camel-gpg-context.c:1663 ../camel/camel-gpg-context.c:1671
+#: ../camel/camel-gpg-context.c:1679 ../camel/camel-gpg-context.c:1699
+#: ../camel/camel-smime-context.c:950 ../camel/camel-smime-context.c:964
+#: ../camel/camel-smime-context.c:973
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Kunne ikke verifisere meldingens signatur: Ugyldig meldingsformat"
 
-#: ../camel/camel-gpg-context.c:1737
+#: ../camel/camel-gpg-context.c:1741
 msgid "Cannot verify message signature: "
 msgstr "Kunne ikke verifisere meldingens signatur: "
 
-#: ../camel/camel-gpg-context.c:1858
+#: ../camel/camel-gpg-context.c:1864
 msgid "Could not generate encrypting data: "
 msgstr "Kunne ikke generere krypteringsdata: "
 
-#: ../camel/camel-gpg-context.c:1911
+#: ../camel/camel-gpg-context.c:1917
 msgid "This is a digitally encrypted message part"
 msgstr "Dette er en digitalt kryptert meldingsdel"
 
-#: ../camel/camel-gpg-context.c:1969 ../camel/camel-gpg-context.c:1978
-#: ../camel/camel-gpg-context.c:2001
+#: ../camel/camel-gpg-context.c:1975 ../camel/camel-gpg-context.c:1984
+#: ../camel/camel-gpg-context.c:2007
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "Kan ikke dekryptere e-post: Ikke korrekt e-postformat"
 
-#: ../camel/camel-gpg-context.c:1989
+#: ../camel/camel-gpg-context.c:1995
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Feil under dekryptering av MIME-del: protokollfeil"
 
-#: ../camel/camel-gpg-context.c:2078 ../camel/camel-smime-context.c:1255
+#: ../camel/camel-gpg-context.c:2086 ../camel/camel-smime-context.c:1261
 msgid "Encrypted content"
 msgstr "Kryptert innhold"
 
-#: ../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:130
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Kan ikke kjÃre fork for lÃshjelper: %s"
-
-#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "Kunne ikke lÃse Â%sÂ: protokollfeil med lÃshjelper"
-
-#: ../camel/camel-lock-client.c:227
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Kunne ikke lÃse Â%sÂ"
-
 #: ../camel/camel-lock.c:102
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -2083,6 +2042,26 @@ 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-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:130
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Kan ikke kjÃre fork for lÃshjelper: %s"
+
+#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "Kunne ikke lÃse Â%sÂ: protokollfeil med lÃshjelper"
+
+#: ../camel/camel-lock-client.c:227
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Kunne ikke lÃse Â%sÂ"
+
 #: ../camel/camel-movemail.c:105
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -2137,17 +2116,17 @@ msgstr "Feil under skriving av midlertidig fil: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Feil under kopiering midlertidig meldingsfil: %s"
 
-#: ../camel/camel-multipart-signed.c:327
+#: ../camel/camel-multipart-signed.c:296
 #, c-format
 msgid "No content available"
 msgstr "Ikke noe innhold tilgjengelig"
 
-#: ../camel/camel-multipart-signed.c:335
+#: ../camel/camel-multipart-signed.c:304
 #, c-format
 msgid "No signature available"
 msgstr "Ingen signatur tilgjengelig"
 
-#: ../camel/camel-multipart-signed.c:663
+#: ../camel/camel-multipart-signed.c:688
 #, c-format
 msgid "parse error"
 msgstr "lesefeil"
@@ -2382,7 +2361,7 @@ msgstr "Refererte akkreditiver har utlÃpt."
 
 #: ../camel/camel-sasl-gssapi.c:170 ../camel/camel-sasl-gssapi.c:312
 #: ../camel/camel-sasl-gssapi.c:356 ../camel/camel-sasl-gssapi.c:373
-#: ../camel/providers/smtp/camel-smtp-transport.c:1277
+#: ../camel/providers/smtp/camel-smtp-transport.c:1267
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "Ugyldig svar pà autentisering fra tjener."
@@ -2469,12 +2448,12 @@ msgstr "URL Â%s mà inneholde en sti"
 msgid "Invalid GType registered for protocol '%s'"
 msgstr "Ugyldig GType registrert for protokoll Â%sÂ"
 
-#: ../camel/camel-session.c:856
+#: ../camel/camel-session.c:853
 #, 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:344 ../camel/camel-smime-context.c:1048
+#: ../camel/camel-smime-context.c:344 ../camel/camel-smime-context.c:1050
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "Kan ikke finne sertifikat for Â%sÂ"
@@ -2610,7 +2589,7 @@ msgstr "Kan ikke finne signatursammendrag"
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Signeringspart: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:835 ../camel/camel-smime-context.c:1121
+#: ../camel/camel-smime-context.c:835 ../camel/camel-smime-context.c:1123
 msgid "Cannot create encoder context"
 msgstr "Kan ikke opprette kontekst for koding"
 
@@ -2618,51 +2597,51 @@ msgstr "Kan ikke opprette kontekst for koding"
 msgid "Failed to add data to CMS encoder"
 msgstr "Kunne ikke legge til data i CMS-koder"
 
-#: ../camel/camel-smime-context.c:846 ../camel/camel-smime-context.c:1138
+#: ../camel/camel-smime-context.c:846 ../camel/camel-smime-context.c:1140
 msgid "Failed to encode data"
 msgstr "Kunne ikke kode data"
 
-#: ../camel/camel-smime-context.c:987 ../camel/camel-smime-context.c:1233
+#: ../camel/camel-smime-context.c:989 ../camel/camel-smime-context.c:1236
 msgid "Decoder failed"
 msgstr "Dekoder feilet"
 
-#: ../camel/camel-smime-context.c:1056
+#: ../camel/camel-smime-context.c:1058
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "Kan ikke finne felles krypteringsalgoritme"
 
-#: ../camel/camel-smime-context.c:1064
+#: ../camel/camel-smime-context.c:1066
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Kan ikke allokere plass for krypteringsnÃkkel"
 
-#: ../camel/camel-smime-context.c:1075
+#: ../camel/camel-smime-context.c:1077
 msgid "Cannot create CMS Message"
 msgstr "Kan ikke opprette CMS-melding"
 
-#: ../camel/camel-smime-context.c:1081
+#: ../camel/camel-smime-context.c:1083
 msgid "Cannot create CMS Enveloped data"
 msgstr "Kan ikke opprette CMS-innpakkede data"
 
-#: ../camel/camel-smime-context.c:1087
+#: ../camel/camel-smime-context.c:1089
 msgid "Cannot attach CMS Enveloped data"
 msgstr "Kan ikke legge ved CMS-innpakkede data"
 
-#: ../camel/camel-smime-context.c:1093
+#: ../camel/camel-smime-context.c:1095
 msgid "Cannot attach CMS data object"
 msgstr "Kan ikke legge ved dataobjekt for CMS"
 
-#: ../camel/camel-smime-context.c:1102
+#: ../camel/camel-smime-context.c:1104
 msgid "Cannot create CMS Recipient information"
 msgstr "Kan ikke opprette mottakerinformasjon for CMS"
 
-#: ../camel/camel-smime-context.c:1107
+#: ../camel/camel-smime-context.c:1109
 msgid "Cannot add CMS Recipient information"
 msgstr "Kan ikke legge til mottakerinformasjon for CMS"
 
-#: ../camel/camel-smime-context.c:1132
+#: ../camel/camel-smime-context.c:1134
 msgid "Failed to add data to encoder"
 msgstr "Klarte ikke à legge til data for koder"
 
-#: ../camel/camel-smime-context.c:1240
+#: ../camel/camel-smime-context.c:1243
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME dekryptering: Fant ikke kryptert innhold"
 
@@ -2715,6 +2694,16 @@ msgstr "Kan ikke slette mappe: %s: Ugyldig operasjon"
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kan ikke endre navn pà mappe: %s: Ugyldig operasjon"
 
+#: ../camel/camel-stream-process.c:265
+#, c-format
+msgid "Connection cancelled"
+msgstr "Tilkobling avbrutt"
+
+#: ../camel/camel-stream-process.c:270
+#, c-format
+msgid "Could not connect with command \"%s\": %s"
+msgstr "Kunne ikke koble til med kommando Â%sÂ: %s"
+
 #: ../camel/camel-tcp-stream-raw.c:749 ../camel/camel-tcp-stream-raw.c:760
 #, c-format
 msgid "The proxy host does not support SOCKS4"
@@ -2871,17 +2860,17 @@ msgstr ""
 msgid "Could not parse URL '%s'"
 msgstr "Kunne ikke tolke URL Â%sÂ"
 
-#: ../camel/camel-vee-folder.c:1280 ../camel/camel-vee-folder.c:1443
+#: ../camel/camel-vee-folder.c:1279 ../camel/camel-vee-folder.c:1442
 #, 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-folder.c:1316
+#: ../camel/camel-vee-folder.c:1315
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Ingen slik melding %s i %s"
 
-#: ../camel/camel-vee-folder.c:1384
+#: ../camel/camel-vee-folder.c:1383
 #, c-format
 msgid "Error storing '%s': "
 msgstr "Feil ved lagring av Â%sÂ: "
@@ -2909,29 +2898,24 @@ msgstr "Kan ikke kopiere meldinger til papirkurvmappen"
 msgid "Cannot copy messages to the Junk folder"
 msgstr "Kan ikke kopiere meldinger til sÃppelmappen"
 
-#: ../camel/providers/imap/camel-imap-command.c:197
-#: ../camel/providers/imap/camel-imap-command.c:301
+#: ../camel/providers/imap/camel-imap-command.c:198
+#: ../camel/providers/imap/camel-imap-command.c:293
 #, c-format
 msgid "No output stream"
 msgstr "Ingen utdatastrÃm"
 
-#: ../camel/providers/imap/camel-imap-command.c:205
-#: ../camel/providers/imap/camel-imap-command.c:309
+#: ../camel/providers/imap/camel-imap-command.c:206
+#: ../camel/providers/imap/camel-imap-command.c:301
 #, c-format
 msgid "No input stream"
 msgstr "Ingen inndatastrÃm"
 
-#: ../camel/providers/imap/camel-imap-command.c:255
-#, c-format
-msgid "Operation cancelled"
-msgstr "Operasjon avbrutt"
-
-#: ../camel/providers/imap/camel-imap-command.c:373
+#: ../camel/providers/imap/camel-imap-command.c:365
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Tjener koblet fra uventet: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:403
+#: ../camel/providers/imap/camel-imap-command.c:395
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -2940,92 +2924,92 @@ msgstr ""
 "Melding fra IMAP-tjener %s %s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:479
+#: ../camel/providers/imap/camel-imap-command.c:471
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Uventet svar fra IMAP-tjener: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:491
+#: ../camel/providers/imap/camel-imap-command.c:483
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-kommando feilet: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:571
+#: ../camel/providers/imap/camel-imap-command.c:563
 #, c-format
 msgid "Server response ended too soon."
 msgstr "Svar fra tjener ble avsluttet for tidlig."
 
-#: ../camel/providers/imap/camel-imap-command.c:782
+#: ../camel/providers/imap/camel-imap-command.c:774
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Svar fra IMAP-tjener inneholdt ikke %s-informasjon"
 
-#: ../camel/providers/imap/camel-imap-command.c:820
+#: ../camel/providers/imap/camel-imap-command.c:812
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Uventet svar ÂOKÂ fra IMAP-tjener: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:295
+#: ../camel/providers/imap/camel-imap-folder.c:293
 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:372
+#: ../camel/providers/imap/camel-imap-folder.c:368
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kan ikke opprette katalog %s: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:395
+#: ../camel/providers/imap/camel-imap-folder.c:391
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Kunne ikke laste sammendrag for %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:999
-#: ../camel/providers/imapx/camel-imapx-server.c:4014
+#: ../camel/providers/imap/camel-imap-folder.c:995
+#: ../camel/providers/imapx/camel-imapx-server.c:4028
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "SÃker etter endrede meldinger i %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3379
+#: ../camel/providers/imap/camel-imap-folder.c:3380
 msgid "Unable to retrieve message: "
 msgstr "Kan ikke hente melding: "
 
-#: ../camel/providers/imap/camel-imap-folder.c:3414
-#: ../camel/providers/imapx/camel-imapx-server.c:5344
+#: ../camel/providers/imap/camel-imap-folder.c:3415
+#: ../camel/providers/imapx/camel-imapx-server.c:5358
 #, 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:3415
-#: ../camel/providers/imapx/camel-imapx-server.c:5345
+#: ../camel/providers/imap/camel-imap-folder.c:3416
+#: ../camel/providers/imapx/camel-imapx-server.c:5359
 msgid "No such message available."
 msgstr "Ingen slik melding tilgjengelig."
 
-#: ../camel/providers/imap/camel-imap-folder.c:3490
-#: ../camel/providers/imap/camel-imap-folder.c:4387
-#: ../camel/providers/nntp/camel-nntp-folder.c:402
+#: ../camel/providers/imap/camel-imap-folder.c:3491
+#: ../camel/providers/imap/camel-imap-folder.c:4391
+#: ../camel/providers/nntp/camel-nntp-folder.c:407
 #, c-format
 msgid "This message is not currently available"
 msgstr "Denne meldingen er ikke tilgjengelig"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3974
-#: ../camel/providers/imap/camel-imap-folder.c:4056
-#: ../camel/providers/imapx/camel-imapx-server.c:3970
-#: ../camel/providers/imapx/camel-imapx-server.c:4112
+#: ../camel/providers/imap/camel-imap-folder.c:3975
+#: ../camel/providers/imap/camel-imap-folder.c:4058
+#: ../camel/providers/imapx/camel-imapx-server.c:3984
+#: ../camel/providers/imapx/camel-imapx-server.c:4126
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "Henter sammendragsinformasjon for nye meldinger i %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4188
+#: ../camel/providers/imap/camel-imap-folder.c:4192
 #, 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:4198
+#: ../camel/providers/imap/camel-imap-folder.c:4202
 #, 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:4427
+#: ../camel/providers/imap/camel-imap-folder.c:4431
 #, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "Kunne ikke finne meldingskropp i FETCH-svar."
@@ -3045,7 +3029,7 @@ msgstr "Feil under mellomlagring av melding %s: %s"
 msgid "Failed to cache message %s: "
 msgstr "Feil under mellomlagring av melding %s: "
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:529
+#: ../camel/providers/imap/camel-imap-message-cache.c:531
 #, c-format
 msgid "Failed to cache %s: "
 msgstr "Feil ved mellomlagring av %s: "
@@ -3160,91 +3144,78 @@ msgstr ""
 "passord."
 
 #: ../camel/providers/imap/camel-imap-store.c:255
-#: ../camel/providers/nntp/camel-nntp-store.c:360
-#: ../camel/providers/pop3/camel-pop3-store.c:139
+#: ../camel/providers/nntp/camel-nntp-store.c:363
+#: ../camel/providers/pop3/camel-pop3-store.c:138
 #: ../camel/providers/smtp/camel-smtp-transport.c:155
 #, c-format
 msgid "Could not connect to %s: %s"
 msgstr "Kunne ikke koble til %s: %s"
 
 #: ../camel/providers/imap/camel-imap-store.c:256
-#: ../camel/providers/nntp/camel-nntp-store.c:361
-#: ../camel/providers/pop3/camel-pop3-store.c:140
+#: ../camel/providers/nntp/camel-nntp-store.c:364
+#: ../camel/providers/pop3/camel-pop3-store.c:139
 #: ../camel/providers/smtp/camel-smtp-transport.c:156
 msgid "SSL unavailable"
 msgstr "SSL er ikke tilgjengelig"
 
 #: ../camel/providers/imap/camel-imap-store.c:275
-#: ../camel/providers/nntp/camel-nntp-store.c:379
+#: ../camel/providers/nntp/camel-nntp-store.c:382
 #, c-format
 msgid "Could not connect to %s: "
 msgstr "Kunne ikke koble til %s: "
 
 #: ../camel/providers/imap/camel-imap-store.c:381
-#: ../camel/providers/imap/camel-imap-store.c:401
 #: ../camel/providers/imap/camel-imap-store.c:408
 #: ../camel/providers/imap/camel-imap-store.c:435
-#: ../camel/providers/imapx/camel-imapx-server.c:2990
-#: ../camel/providers/imapx/camel-imapx-server.c:3030
+#: ../camel/providers/imapx/camel-imapx-server.c:3008
 #, 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:382
-#: ../camel/providers/imapx/camel-imapx-server.c:2991
+#: ../camel/providers/imapx/camel-imapx-server.c:3009
 #: ../camel/providers/smtp/camel-smtp-transport.c:241
 msgid "STARTTLS not supported"
 msgstr "STARTTLS er ikke stÃttet"
 
-#: ../camel/providers/imap/camel-imap-store.c:402
-#: ../camel/providers/imapx/camel-imapx-server.c:3031
-msgid "SSL negotiations failed"
-msgstr "SSL-forhandling feilet"
+#: ../camel/providers/imap/camel-imap-store.c:401
+#: ../camel/providers/imapx/camel-imapx-server.c:3047
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: "
+msgstr "Klarte ikke à koble til IMAP-tjener %s i sikker modus: "
 
 #: ../camel/providers/imap/camel-imap-store.c:409
-#: ../camel/providers/smtp/camel-smtp-transport.c:288
+#: ../camel/providers/smtp/camel-smtp-transport.c:287
 msgid "SSL is not available in this build"
 msgstr "SSL er ikke stÃttet i denne versjonen"
 
-#: ../camel/providers/imap/camel-imap-store.c:563
-#: ../camel/providers/imapx/camel-imapx-server.c:2818
-#, c-format
-msgid "Connection cancelled"
-msgstr "Tilkobling avbrutt"
-
-#: ../camel/providers/imap/camel-imap-store.c:568
-#: ../camel/providers/imapx/camel-imapx-server.c:2823
-#, c-format
-msgid "Could not connect with command \"%s\": %s"
-msgstr "Kunne ikke koble til med kommando Â%sÂ: %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:769
-#: ../camel/providers/imapx/camel-imapx-server.c:3115
+#: ../camel/providers/imap/camel-imap-store.c:757
+#: ../camel/providers/imapx/camel-imapx-server.c:3131
 #, 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:780
-#: ../camel/providers/imapx/camel-imapx-server.c:3127
-#: ../camel/providers/smtp/camel-smtp-transport.c:434
+#: ../camel/providers/imap/camel-imap-store.c:768
+#: ../camel/providers/imapx/camel-imapx-server.c:3143
+#: ../camel/providers/smtp/camel-smtp-transport.c:433
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ingen stÃtte for autentiseringstype %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:791
-#: ../camel/providers/smtp/camel-smtp-transport.c:447
+#: ../camel/providers/imap/camel-imap-store.c:779
+#: ../camel/providers/smtp/camel-smtp-transport.c:446
 #, c-format
 msgid "Error creating SASL authentication object."
 msgstr "Feil under oppretting av SASL-autentiseringsobjekt."
 
-#: ../camel/providers/imap/camel-imap-store.c:839
-#: ../camel/providers/imapx/camel-imapx-server.c:3173
+#: ../camel/providers/imap/camel-imap-store.c:827
+#: ../camel/providers/imapx/camel-imapx-server.c:3187
 #, c-format
 msgid "You did not enter a password."
 msgstr "Du skrev ikke inn et passord."
 
-#: ../camel/providers/imap/camel-imap-store.c:880
-#: ../camel/providers/imapx/camel-imapx-server.c:3218
+#: ../camel/providers/imap/camel-imap-store.c:868
+#: ../camel/providers/imapx/camel-imapx-server.c:3232
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3255,21 +3226,21 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:940
+#: ../camel/providers/imap/camel-imap-store.c:928
 #: ../camel/providers/imapx/camel-imapx-store.c:162
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP-tjener %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:943
+#: ../camel/providers/imap/camel-imap-store.c:931
 #: ../camel/providers/imapx/camel-imapx-store.c:165
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP-tjeneste for %s pà %s"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1414
-#: ../camel/providers/imap/camel-imap-store.c:2498
+#: ../camel/providers/imap/camel-imap-store.c:1402
+#: ../camel/providers/imap/camel-imap-store.c:2486
 #: ../camel/providers/imapx/camel-imapx-store.c:353
 #: ../camel/providers/imapx/camel-imapx-store.c:772
 #: ../camel/providers/local/camel-maildir-folder.c:434
@@ -3277,52 +3248,52 @@ msgstr "IMAP-tjeneste for %s pà %s"
 #: ../camel/providers/local/camel-maildir-store.c:619
 #: ../camel/providers/local/camel-maildir-store.c:625
 #: ../camel/providers/local/camel-maildir-store.c:705
-#: ../camel/providers/local/camel-spool-store.c:293
+#: ../camel/providers/local/camel-spool-store.c:321
 msgid "Inbox"
 msgstr "Innboks"
 
-#: ../camel/providers/imap/camel-imap-store.c:1881
-#: ../camel/providers/imap/camel-imap-store.c:2083
+#: ../camel/providers/imap/camel-imap-store.c:1869
+#: ../camel/providers/imap/camel-imap-store.c:2071
 #: ../camel/providers/imapx/camel-imapx-store.c:329
 #, c-format
 msgid "No such folder %s"
 msgstr "Mappen %s eksisterer ikke"
 
-#: ../camel/providers/imap/camel-imap-store.c:1895
-#: ../camel/providers/imap/camel-imap-store.c:2342
+#: ../camel/providers/imap/camel-imap-store.c:1883
+#: ../camel/providers/imap/camel-imap-store.c:2330
 #: ../camel/providers/imapx/camel-imapx-store.c:1297
 #, 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:1959
-#: ../camel/providers/imap/camel-imap-store.c:2406
+#: ../camel/providers/imap/camel-imap-store.c:1947
+#: ../camel/providers/imap/camel-imap-store.c:2394
 #: ../camel/providers/imapx/camel-imapx-store.c:1318
 #, c-format
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Opphavsmappen tillates ikke à ha undermapper"
 
-#: ../camel/providers/imap/camel-imap-store.c:2012
+#: ../camel/providers/imap/camel-imap-store.c:2000
 #: ../camel/providers/local/camel-maildir-store.c:244
-#: ../camel/providers/local/camel-mbox-store.c:409
-#: ../camel/providers/local/camel-mh-store.c:494
+#: ../camel/providers/local/camel-mbox-store.c:416
+#: ../camel/providers/local/camel-mh-store.c:566
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "Kan ikke opprette mappe Â%sÂ: mappen eksisterer."
 
-#: ../camel/providers/imap/camel-imap-store.c:2355
+#: ../camel/providers/imap/camel-imap-store.c:2343
 #: ../camel/providers/imapx/camel-imapx-store.c:1308
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ukjent opphavsmappe: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:3190
+#: ../camel/providers/imap/camel-imap-store.c:3179
 #, c-format
 msgid "Server unexpectedly disconnected"
 msgstr "Tjener koblet fra uventet"
 
-#: ../camel/providers/imap/camel-imap-store.c:3193
+#: ../camel/providers/imap/camel-imap-store.c:3182
 msgid "Server unexpectedly disconnected: "
 msgstr "Tjener koblet fra uventet: "
 
@@ -3364,31 +3335,31 @@ msgstr "Forvalgt port for IMAP"
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:1461
+#: ../camel/providers/imapx/camel-imapx-server.c:1488
 msgid "Error writing to cache stream: "
 msgstr "Feil under skriving til mellomlagerstrÃm: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2144
+#: ../camel/providers/imapx/camel-imapx-server.c:2172
 #, c-format
 msgid "Not authenticated"
 msgstr "Ikke autentisert"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2913
+#: ../camel/providers/imapx/camel-imapx-server.c:2931
 #, c-format
 msgid "Could not connect to %s (port %s): "
 msgstr "Kunne ikke koble til %s (port %s): "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3400
+#: ../camel/providers/imapx/camel-imapx-server.c:3414
 msgid "Closing tmp stream failed: "
 msgstr "Feil ved lukking av midlertidig strÃm: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5490
-#: ../camel/providers/imapx/camel-imapx-server.c:5505
+#: ../camel/providers/imapx/camel-imapx-server.c:5504
+#: ../camel/providers/imapx/camel-imapx-server.c:5519
 msgid "Cannot create spool file: "
 msgstr "Kan ikke spool-fil: "
 
 #: ../camel/providers/imapx/camel-imapx-store.c:1093
-#: ../camel/providers/nntp/camel-nntp-store.c:1686
+#: ../camel/providers/nntp/camel-nntp-store.c:1705
 #, c-format
 msgid "No such folder: %s"
 msgstr "Ingen slik mappe: %s"
@@ -3490,60 +3461,60 @@ msgstr ""
 msgid "Standard Unix mbox spool directory"
 msgstr "Standard Unix mbox ÂspoolÂ-katalog"
 
-#: ../camel/providers/local/camel-local-store.c:177
-#: ../camel/providers/local/camel-local-store.c:322
+#: ../camel/providers/local/camel-local-store.c:79
+#, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr "Kunne ikke endre navn pà mappe %s til %s: %s"
+
+#: ../camel/providers/local/camel-local-store.c:156
+#, c-format
+msgid "Local mail file %s"
+msgstr "Lokal e-post-fil %s"
+
+#: ../camel/providers/local/camel-local-store.c:187
+#: ../camel/providers/local/camel-local-store.c:329
 #: ../camel/providers/local/camel-maildir-store.c:92
-#: ../camel/providers/local/camel-mbox-store.c:519
-#: ../camel/providers/local/camel-spool-store.c:507
+#: ../camel/providers/local/camel-mbox-store.c:534
+#: ../camel/providers/local/camel-spool-store.c:567
 #, 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:186
+#: ../camel/providers/local/camel-local-store.c:196
 #, 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:197
 #: ../camel/providers/local/camel-local-store.c:207
-#: ../camel/providers/local/camel-local-store.c:335
+#: ../camel/providers/local/camel-local-store.c:217
+#: ../camel/providers/local/camel-local-store.c:342
 #: ../camel/providers/local/camel-maildir-store.c:124
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Finner ikke mappe: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:223
+#: ../camel/providers/local/camel-local-store.c:249
 #, c-format
 msgid "Local stores do not have an inbox"
 msgstr "Lokalt lager har ikke en innboks"
 
-#: ../camel/providers/local/camel-local-store.c:284
-#, c-format
-msgid "Local mail file %s"
-msgstr "Lokal e-post-fil %s"
-
-#: ../camel/providers/local/camel-local-store.c:396
-#, 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:470
-#, c-format
-msgid "Could not rename '%s': %s"
-msgstr "Kunne ikke endre navn pà Â%sÂ: %s"
-
-#: ../camel/providers/local/camel-local-store.c:501
-#: ../camel/providers/local/camel-mbox-store.c:688
+#: ../camel/providers/local/camel-local-store.c:387
+#: ../camel/providers/local/camel-mbox-store.c:708
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "Kunne ikke slette indeksfil for mappe Â%sÂ: %s"
 
-#: ../camel/providers/local/camel-local-store.c:529
-#: ../camel/providers/local/camel-mbox-store.c:717
+#: ../camel/providers/local/camel-local-store.c:415
+#: ../camel/providers/local/camel-mbox-store.c:738
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "Kunne ikke slette metadatafil for mappe Â%sÂ: %s"
 
+#: ../camel/providers/local/camel-local-store.c:501
+#, c-format
+msgid "Could not rename '%s': %s"
+msgstr "Kunne ikke endre navn pà Â%sÂ: %s"
+
 #: ../camel/providers/local/camel-local-summary.c:548
 #, c-format
 msgid "Unable to add message to summary: unknown reason"
@@ -3589,22 +3560,22 @@ msgstr "Mappen %s eksisterer allerede"
 
 #: ../camel/providers/local/camel-maildir-store.c:191
 #: ../camel/providers/local/camel-maildir-store.c:222
-#: ../camel/providers/local/camel-mbox-store.c:377
-#: ../camel/providers/local/camel-mbox-store.c:391
+#: ../camel/providers/local/camel-mbox-store.c:384
+#: ../camel/providers/local/camel-mbox-store.c:398
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "Kan ikke opprette mappe Â%sÂ: %s"
 
 #: ../camel/providers/local/camel-maildir-store.c:206
-#: ../camel/providers/local/camel-mbox-store.c:343
-#: ../camel/providers/local/camel-mh-store.c:454
+#: ../camel/providers/local/camel-mbox-store.c:350
+#: ../camel/providers/local/camel-mh-store.c:521
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "Finner ikke mappe Â%sÂ: %s"
 
 #: ../camel/providers/local/camel-maildir-store.c:212
-#: ../camel/providers/local/camel-mbox-store.c:353
-#: ../camel/providers/local/camel-mh-store.c:463
+#: ../camel/providers/local/camel-mbox-store.c:360
+#: ../camel/providers/local/camel-mh-store.c:530
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "Finner ikke mappe Â%sÂ: mappen eksisterer ikke."
@@ -3616,7 +3587,7 @@ msgstr "Kan ikke hente mappe Â%sÂ: ikke en maildir katalog."
 
 #: ../camel/providers/local/camel-maildir-store.c:293
 #: ../camel/providers/local/camel-maildir-store.c:333
-#: ../camel/providers/local/camel-mh-store.c:572
+#: ../camel/providers/local/camel-mh-store.c:656
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "Kunne ikke slette mappe Â%sÂ: %s"
@@ -3627,8 +3598,8 @@ msgstr "ikke en maildir katalog"
 
 #: ../camel/providers/local/camel-maildir-store.c:510
 #: ../camel/providers/local/camel-maildir-store.c:874
-#: ../camel/providers/local/camel-spool-store.c:144
-#: ../camel/providers/local/camel-spool-store.c:160
+#: ../camel/providers/local/camel-spool-store.c:157
+#: ../camel/providers/local/camel-spool-store.c:176
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "Kunne ikke sÃke i mappe Â%sÂ: %s"
@@ -3680,34 +3651,34 @@ msgstr "Mappen ser ut til à ha blitt korrupt og kan ikke repareres."
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Kan ikke opprette mappelÃs pÃ: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:365
-#: ../camel/providers/local/camel-mbox-store.c:527
+#: ../camel/providers/local/camel-mbox-store.c:372
+#: ../camel/providers/local/camel-mbox-store.c:542
 #, c-format
 msgid "Cannot create a folder by this name."
 msgstr "Kan ikke opprette en mappe med dette navnet."
 
-#: ../camel/providers/local/camel-mbox-store.c:402
+#: ../camel/providers/local/camel-mbox-store.c:409
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "Kan ikke hente mappe Â%sÂ: ikke en vanlig fil."
 
-#: ../camel/providers/local/camel-mbox-store.c:543
+#: ../camel/providers/local/camel-mbox-store.c:558
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "Kan ikke opprette katalog Â%sÂ: %s."
 
-#: ../camel/providers/local/camel-mbox-store.c:559
+#: ../camel/providers/local/camel-mbox-store.c:574
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Kan ikke opprette mappe: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:561
+#: ../camel/providers/local/camel-mbox-store.c:576
 msgid "Folder already exists"
 msgstr "Mappen eksisterer allerede"
 
-#: ../camel/providers/local/camel-mbox-store.c:602
-#: ../camel/providers/local/camel-mbox-store.c:615
-#: ../camel/providers/local/camel-mbox-store.c:644
+#: ../camel/providers/local/camel-mbox-store.c:619
+#: ../camel/providers/local/camel-mbox-store.c:632
+#: ../camel/providers/local/camel-mbox-store.c:661
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3716,33 +3687,33 @@ msgstr ""
 "Kunne ikke slette mappen Â%sÂ\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:625
+#: ../camel/providers/local/camel-mbox-store.c:642
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "Â%s er ikke en vanlig fil."
 
-#: ../camel/providers/local/camel-mbox-store.c:634
+#: ../camel/providers/local/camel-mbox-store.c:651
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "Mappen Â%s er ikke tom. Ikke slettet."
 
-#: ../camel/providers/local/camel-mbox-store.c:660
-#: ../camel/providers/local/camel-mbox-store.c:674
+#: ../camel/providers/local/camel-mbox-store.c:678
+#: ../camel/providers/local/camel-mbox-store.c:693
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "Kunne ikke slette sammendragsfil for mappe Â%sÂ: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:753
+#: ../camel/providers/local/camel-mbox-store.c:775
 #, c-format
 msgid "The new folder name is illegal."
 msgstr "Det nye mappenavnet er ugyldig."
 
-#: ../camel/providers/local/camel-mbox-store.c:768
+#: ../camel/providers/local/camel-mbox-store.c:791
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "Kunne ikke endre navn pà Â%sÂ: Â%sÂ: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:851
+#: ../camel/providers/local/camel-mbox-store.c:874
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Kunne ikke endre navn pà Â%s til %s: %s"
@@ -3835,12 +3806,12 @@ msgstr "Skriving til midlertidig postboks feilet: %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:473
+#: ../camel/providers/local/camel-mh-store.c:541
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "Kunne ikke opprette mappe Â%sÂ: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:487
+#: ../camel/providers/local/camel-mh-store.c:558
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "Kan ikke hente mappe Â%sÂ: ikke en katalog."
@@ -3850,22 +3821,22 @@ msgstr "Kan ikke hente mappe Â%sÂ: ikke en katalog."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Kan ikke Ãpne MH-katalogsti: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:314
+#: ../camel/providers/local/camel-spool-store.c:343
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Spool e-post-fil %s"
 
-#: ../camel/providers/local/camel-spool-store.c:315
+#: ../camel/providers/local/camel-spool-store.c:346
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "Tre av spool-mapper %s"
 
-#: ../camel/providers/local/camel-spool-store.c:352
+#: ../camel/providers/local/camel-spool-store.c:387
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "Mappen Â%s/%s eksisterer ikke."
 
-#: ../camel/providers/local/camel-spool-store.c:364
+#: ../camel/providers/local/camel-spool-store.c:401
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -3874,12 +3845,12 @@ msgstr ""
 "Kan ikke Ãpne mappe Â%sÂ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:370
+#: ../camel/providers/local/camel-spool-store.c:407
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "Mappen Â%s eksisterer ikke."
 
-#: ../camel/providers/local/camel-spool-store.c:377
+#: ../camel/providers/local/camel-spool-store.c:414
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -3888,32 +3859,32 @@ msgstr ""
 "Kunne ikke opprette mappe Â%sÂ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:387
+#: ../camel/providers/local/camel-spool-store.c:426
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "Â%s er ikke en postboks-fil."
 
-#: ../camel/providers/local/camel-spool-store.c:423
+#: ../camel/providers/local/camel-spool-store.c:474
 #, c-format
 msgid "Store does not support an INBOX"
 msgstr "Lager stÃtter ikke en INNBOKS"
 
-#: ../camel/providers/local/camel-spool-store.c:437
+#: ../camel/providers/local/camel-spool-store.c:488
 #, c-format
 msgid "Spool folders cannot be deleted"
 msgstr "Spoolmapper kan ikke vÃre slettes"
 
-#: ../camel/providers/local/camel-spool-store.c:452
+#: ../camel/providers/local/camel-spool-store.c:503
 #, 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:516
+#: ../camel/providers/local/camel-spool-store.c:576
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "Spool Â%s kan ikke Ãpnes: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:530
+#: ../camel/providers/local/camel-spool-store.c:592
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "Spool Â%s er ikke en vanlig fil eller katalog"
@@ -3941,47 +3912,47 @@ 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:195
-#: ../camel/providers/nntp/camel-nntp-folder.c:274
-#: ../camel/providers/nntp/camel-nntp-folder.c:388
+#: ../camel/providers/nntp/camel-nntp-folder.c:194
+#: ../camel/providers/nntp/camel-nntp-folder.c:279
+#: ../camel/providers/nntp/camel-nntp-folder.c:393
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "Intern feil: UID har ugyldig format: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:236
-#: ../camel/providers/nntp/camel-nntp-folder.c:240
-#: ../camel/providers/pop3/camel-pop3-folder.c:371
-#: ../camel/providers/pop3/camel-pop3-folder.c:436
-#: ../camel/providers/pop3/camel-pop3-folder.c:448
-#: ../camel/providers/pop3/camel-pop3-folder.c:697
+#: ../camel/providers/nntp/camel-nntp-folder.c:241
+#: ../camel/providers/nntp/camel-nntp-folder.c:245
+#: ../camel/providers/pop3/camel-pop3-folder.c:429
+#: ../camel/providers/pop3/camel-pop3-folder.c:681
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Kan ikke hente melding %s: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:246
-#: ../camel/providers/nntp/camel-nntp-folder.c:413
-#: ../camel/providers/pop3/camel-pop3-folder.c:457
+#: ../camel/providers/nntp/camel-nntp-folder.c:251
+#: ../camel/providers/nntp/camel-nntp-folder.c:418
+#: ../camel/providers/pop3/camel-pop3-folder.c:366
+#: ../camel/providers/pop3/camel-pop3-folder.c:418
+#: ../camel/providers/pop3/camel-pop3-folder.c:438
 #, c-format
 msgid "Cannot get message %s: "
 msgstr "Kan ikke hente melding %s: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:472
-#: ../camel/providers/nntp/camel-nntp-folder.c:478
-#: ../camel/providers/nntp/camel-nntp-folder.c:525
+#: ../camel/providers/nntp/camel-nntp-folder.c:477
+#: ../camel/providers/nntp/camel-nntp-folder.c:483
+#: ../camel/providers/nntp/camel-nntp-folder.c:530
 #, c-format
 msgid "Posting failed: %s"
 msgstr "Posting feilet: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:520
+#: ../camel/providers/nntp/camel-nntp-folder.c:525
 msgid "Posting failed: "
 msgstr "Posting feilet: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:549
+#: ../camel/providers/nntp/camel-nntp-folder.c:554
 #, c-format
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "Du kan ikke poste NNTP-meldinger mens du arbeider frakoblet!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:569
+#: ../camel/providers/nntp/camel-nntp-folder.c:574
 #, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Du kan ikke kopiere meldinger fra en NNTP-mappe!"
@@ -4022,32 +3993,32 @@ msgstr ""
 "Dette alternativet vil autentisere mot NNTP-tjeneren ved bruk av klartekst "
 "passord."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:86
+#: ../camel/providers/nntp/camel-nntp-store.c:85
 #, c-format
 msgid "Authentication requested but no username provided"
 msgstr "Autentisering forespurt men brukernavn ble ikke oppgitt"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:98
+#: ../camel/providers/nntp/camel-nntp-store.c:97
 #, c-format
 msgid "Cannot authenticate to server: %s"
 msgstr "Kan ikke autentisere mot tjener: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:392
+#: ../camel/providers/nntp/camel-nntp-store.c:395
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "Kan ikke lese hilsen fra %s: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:405
+#: ../camel/providers/nntp/camel-nntp-store.c:408
 #, 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:605
+#: ../camel/providers/nntp/camel-nntp-store.c:608
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET News via %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1112
+#: ../camel/providers/nntp/camel-nntp-store.c:1115
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4058,7 +4029,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1227
+#: ../camel/providers/nntp/camel-nntp-store.c:1230
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4069,7 +4040,7 @@ msgstr ""
 "\n"
 "Nyhetsgruppen finnes ikke. Valgt oppfÃring er sannsynligvis en opphavsmappe."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1269
+#: ../camel/providers/nntp/camel-nntp-store.c:1272
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4080,27 +4051,27 @@ msgstr ""
 "\n"
 "nyhetsgruppen eksisterer ikke!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1302
+#: ../camel/providers/nntp/camel-nntp-store.c:1305
 #, 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:1318
+#: ../camel/providers/nntp/camel-nntp-store.c:1321
 #, 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:1335
+#: ../camel/providers/nntp/camel-nntp-store.c:1338
 #, 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:1555
+#: ../camel/providers/nntp/camel-nntp-store.c:1574
 msgid "NNTP Command failed: "
 msgstr "NNTP-kommando feilet: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1629
+#: ../camel/providers/nntp/camel-nntp-store.c:1648
 #, c-format
 msgid "Not connected."
 msgstr "Ingen tilkoblet."
@@ -4126,35 +4097,34 @@ msgstr "Uventet svar fra head: %s"
 msgid "Operation failed: %s"
 msgstr "Operasjonen feilet: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:277
-#: ../camel/providers/pop3/camel-pop3-folder.c:336
+#: ../camel/providers/pop3/camel-pop3-folder.c:283
+#: ../camel/providers/pop3/camel-pop3-folder.c:342
 #, c-format
 msgid "No message with UID %s"
 msgstr "Ingen melding med UID %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:344
+#: ../camel/providers/pop3/camel-pop3-folder.c:350
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Henter POP-melding %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:449
+#: ../camel/providers/pop3/camel-pop3-folder.c:430
 msgid "Unknown reason"
 msgstr "Ukjent Ãrsak"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:488
+#: ../camel/providers/pop3/camel-pop3-folder.c:470
 msgid "Retrieving POP summary"
 msgstr "Henter POP-sammendrag"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:511
-#, c-format
-msgid "Cannot get POP summary: %s"
-msgstr "Kan ikke hente POP-sammendrag: %s"
+#: ../camel/providers/pop3/camel-pop3-folder.c:485
+msgid "Cannot get POP summary: "
+msgstr "Kan ikke hente POP-sammendrag: "
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:563
+#: ../camel/providers/pop3/camel-pop3-folder.c:542
 msgid "Expunging old messages"
 msgstr "Fjerner gamle meldinger"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:577
+#: ../camel/providers/pop3/camel-pop3-folder.c:556
 msgid "Expunging deleted messages"
 msgstr "Fjerner slettede meldinger"
 
@@ -4216,42 +4186,42 @@ 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:98
+#: ../camel/providers/pop3/camel-pop3-store.c:97
 msgid ": "
 msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:184
+#: ../camel/providers/pop3/camel-pop3-store.c:183
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
-msgstr "Kunne ikke lese en gyldig hilsen fra POP-tjener %s"
+msgstr "Klarte ikke à lese en gyldig hilsen fra POP-tjener %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:202
-#: ../camel/providers/pop3/camel-pop3-store.c:233
+#: ../camel/providers/pop3/camel-pop3-store.c:201
 #: ../camel/providers/pop3/camel-pop3-store.c:240
 #, 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"
+msgstr "Klarte ikke à koble til POP-tjener %s i sikker modus: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:203
+#: ../camel/providers/pop3/camel-pop3-store.c:202
 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:221
+#: ../camel/providers/pop3/camel-pop3-store.c:220
 #, 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"
+msgstr "Klarte ikke à koble til POP-tjener %s i sikker modus%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:234
-msgid "TLS negotiations failed"
-msgstr "TLS-forhandling feilet"
+#: ../camel/providers/pop3/camel-pop3-store.c:233
+#, c-format
+msgid "Failed to connect to POP server %s in secure mode: "
+msgstr "Klarte ikke à koble til POP-tjener %s i sikker modus: "
 
 #: ../camel/providers/pop3/camel-pop3-store.c:241
 msgid "TLS is not available in this build"
 msgstr "TLS er ikke stÃttet i denne versjonen"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:328
-#: ../camel/providers/pop3/camel-pop3-store.c:490
+#: ../camel/providers/pop3/camel-pop3-store.c:329
+#: ../camel/providers/pop3/camel-pop3-store.c:502
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -4261,22 +4231,22 @@ msgstr ""
 "autentiseringsmekanisme."
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:351
+#: ../camel/providers/pop3/camel-pop3-store.c:357
 #, 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:367
+#: ../camel/providers/pop3/camel-pop3-store.c:374
 #, 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:384
+#: ../camel/providers/pop3/camel-pop3-store.c:396
 #, c-format
 msgid "Failed to authenticate on POP server %s: "
 msgstr "Klarte ikke à autentisere mot POP-tjener %s: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:456
+#: ../camel/providers/pop3/camel-pop3-store.c:468
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4285,17 +4255,17 @@ msgstr ""
 "Kan ikke koble til POP-tjener %s:\\tUgyldig APOP-ID mottatt. Mulig "
 "identitetstyveri. Kontakt din administrator."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:510
+#: ../camel/providers/pop3/camel-pop3-store.c:515
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
-"Error sending password: %s"
+"Error sending password: "
 msgstr ""
 "Kunne ikke koble til POP-tjener %s.\n"
-"Feil ved oversending av passord: %s"
+"Feil ved oversending av passord: "
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:523
+#: ../camel/providers/pop3/camel-pop3-store.c:525
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4305,7 +4275,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:535
+#: ../camel/providers/pop3/camel-pop3-store.c:537
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4314,27 +4284,27 @@ msgstr ""
 "Kunne ikke koble til POP-tjener %s.\n"
 "Feil ved oversending av passord%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:578
+#: ../camel/providers/pop3/camel-pop3-store.c:580
 #, c-format
 msgid "POP3 server %s"
 msgstr "POP3-tjener %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:581
+#: ../camel/providers/pop3/camel-pop3-store.c:583
 #, c-format
 msgid "POP3 server for %s on %s"
 msgstr "POP3-tjener for %s pà %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:711
+#: ../camel/providers/pop3/camel-pop3-store.c:714
 #, 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:738
+#: ../camel/providers/pop3/camel-pop3-store.c:741
 #, c-format
 msgid "No such folder '%s'."
 msgstr "Ingen slik mappe Â%sÂ."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:755
+#: ../camel/providers/pop3/camel-pop3-store.c:758
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "POP3-lagre har ingen mappehierarki"
@@ -4419,11 +4389,10 @@ msgid "Welcome response error: "
 msgstr "Feil i velkommen-svar: "
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:280
-#: ../camel/providers/smtp/camel-smtp-transport.c:287
+#: ../camel/providers/smtp/camel-smtp-transport.c:286
 #, 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"
+msgstr "Klarte ikke à koble til SMTP-tjener %s i sikker modus: %s"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:249
 #: ../camel/providers/smtp/camel-smtp-transport.c:262
@@ -4431,22 +4400,27 @@ msgstr "Kunne ikke koble til SMTP-tjener %s i sikker modus: %s"
 msgid "STARTTLS command failed: "
 msgstr "STARTTLS-kommando feilet: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:367
+#: ../camel/providers/smtp/camel-smtp-transport.c:279
+#, c-format
+msgid "Failed to connect to SMTP server %s in secure mode: "
+msgstr "Klarte ikke à koble til SMTP-tjener %s i sikker modus: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:366
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-tjener %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:371
+#: ../camel/providers/smtp/camel-smtp-transport.c:370
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP e-postlevering via %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:422
+#: ../camel/providers/smtp/camel-smtp-transport.c:421
 #, 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:524
+#: ../camel/providers/smtp/camel-smtp-transport.c:523
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4457,181 +4431,181 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:640
+#: ../camel/providers/smtp/camel-smtp-transport.c:639
 #, 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:647
+#: ../camel/providers/smtp/camel-smtp-transport.c:646
 #, 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:651
+#: ../camel/providers/smtp/camel-smtp-transport.c:650
 msgid "Sending message"
 msgstr "Sender melding"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:676
+#: ../camel/providers/smtp/camel-smtp-transport.c:675
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan ikke sende melding: ingen mottakere definert."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:689
+#: ../camel/providers/smtp/camel-smtp-transport.c:688
 #, 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:752
+#: ../camel/providers/smtp/camel-smtp-transport.c:745
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaksfeil, kommando ikke gjenkjent"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:754
+#: ../camel/providers/smtp/camel-smtp-transport.c:747
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaksfeil i parametere eller argumenter"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:756
+#: ../camel/providers/smtp/camel-smtp-transport.c:749
 msgid "Command not implemented"
 msgstr "Kommando ikke implementert"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:758
+#: ../camel/providers/smtp/camel-smtp-transport.c:751
 msgid "Command parameter not implemented"
 msgstr "Kommandoparameter ikke implementert"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:760
+#: ../camel/providers/smtp/camel-smtp-transport.c:753
 msgid "System status, or system help reply"
 msgstr "Systemstatus, eller svar pà systemhjelp"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:762
+#: ../camel/providers/smtp/camel-smtp-transport.c:755
 msgid "Help message"
 msgstr "Hjelp-melding"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:764
+#: ../camel/providers/smtp/camel-smtp-transport.c:757
 msgid "Service ready"
 msgstr "Tjeneste klar"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:766
+#: ../camel/providers/smtp/camel-smtp-transport.c:759
 msgid "Service closing transmission channel"
 msgstr "Tjenesten lukker sendekanalen"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:768
+#: ../camel/providers/smtp/camel-smtp-transport.c:761
 msgid "Service not available, closing transmission channel"
 msgstr "Tjenesten er ikke tilgjengelig, lukker sendekanalen"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:770
+#: ../camel/providers/smtp/camel-smtp-transport.c:763
 msgid "Requested mail action okay, completed"
 msgstr "Forespurt e-post handling er ok, fullfÃrt"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:772
+#: ../camel/providers/smtp/camel-smtp-transport.c:765
 msgid "User not local; will forward to <forward-path>"
 msgstr "Ikke lokal bruker; videresender til <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:774
+#: ../camel/providers/smtp/camel-smtp-transport.c:767
 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:776
+#: ../camel/providers/smtp/camel-smtp-transport.c:769
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Forespurt handling ikke utfÃrt: postboks ikke tilgjengelig"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:778
+#: ../camel/providers/smtp/camel-smtp-transport.c:771
 msgid "Requested action aborted: error in processing"
 msgstr "Forespurt handling avbrutt: feil i prosessering"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:780
+#: ../camel/providers/smtp/camel-smtp-transport.c:773
 msgid "User not local; please try <forward-path>"
 msgstr "Ikke lokal bruker; vennligst prÃv <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:782
+#: ../camel/providers/smtp/camel-smtp-transport.c:775
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Forespurt handling ikke utfÃrt: utilstrekkelig lagringsplass"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:784
+#: ../camel/providers/smtp/camel-smtp-transport.c:777
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Forespurt e-post handling avbrutt: lagringsallokering oversteget"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:786
+#: ../camel/providers/smtp/camel-smtp-transport.c:779
 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:788
+#: ../camel/providers/smtp/camel-smtp-transport.c:781
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Start e-post input; slutt med <CRLF>.<CRLF>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:790
+#: ../camel/providers/smtp/camel-smtp-transport.c:783
 msgid "Transaction failed"
 msgstr "Transaksjonen feilet"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:794
+#: ../camel/providers/smtp/camel-smtp-transport.c:787
 msgid "A password transition is needed"
 msgstr "PassordoverfÃring kreves"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:796
+#: ../camel/providers/smtp/camel-smtp-transport.c:789
 msgid "Authentication mechanism is too weak"
 msgstr "Autentiseringsmekanismen er for svak"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:798
+#: ../camel/providers/smtp/camel-smtp-transport.c:791
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Kryptering kreves for forespurt autentiseringsmekanisme."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:800
+#: ../camel/providers/smtp/camel-smtp-transport.c:793
 msgid "Temporary authentication failure"
 msgstr "Midlertidig autentiseringsfeil"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1057
+#: ../camel/providers/smtp/camel-smtp-transport.c:1043
 msgid "SMTP Greeting"
 msgstr "SMTP-velkomst"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1084
-#: ../camel/providers/smtp/camel-smtp-transport.c:1101
-#: ../camel/providers/smtp/camel-smtp-transport.c:1109
+#: ../camel/providers/smtp/camel-smtp-transport.c:1070
+#: ../camel/providers/smtp/camel-smtp-transport.c:1087
+#: ../camel/providers/smtp/camel-smtp-transport.c:1095
 msgid "HELO command failed: "
 msgstr "HELO-kommando feilet: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1178
+#: ../camel/providers/smtp/camel-smtp-transport.c:1164
 msgid "SMTP Authentication"
 msgstr "SMTP-autentisering"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1197
-#: ../camel/providers/smtp/camel-smtp-transport.c:1208
-#: ../camel/providers/smtp/camel-smtp-transport.c:1217
+#: ../camel/providers/smtp/camel-smtp-transport.c:1183
+#: ../camel/providers/smtp/camel-smtp-transport.c:1194
+#: ../camel/providers/smtp/camel-smtp-transport.c:1207
 msgid "AUTH command failed: "
 msgstr "AUTH-kommando feilet: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1325
-#: ../camel/providers/smtp/camel-smtp-transport.c:1339
-#: ../camel/providers/smtp/camel-smtp-transport.c:1348
+#: ../camel/providers/smtp/camel-smtp-transport.c:1315
+#: ../camel/providers/smtp/camel-smtp-transport.c:1329
+#: ../camel/providers/smtp/camel-smtp-transport.c:1338
 msgid "MAIL FROM command failed: "
 msgstr "MAIL FROM-kommando feilet: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1375
+#: ../camel/providers/smtp/camel-smtp-transport.c:1365
 msgid "RCPT TO command failed: "
 msgstr "RCPT TO-kommando feilet: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1391
-#: ../camel/providers/smtp/camel-smtp-transport.c:1400
+#: ../camel/providers/smtp/camel-smtp-transport.c:1381
+#: ../camel/providers/smtp/camel-smtp-transport.c:1390
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "RCPT TO <%s> feilet: "
 
+#: ../camel/providers/smtp/camel-smtp-transport.c:1432
 #: ../camel/providers/smtp/camel-smtp-transport.c:1442
 #: ../camel/providers/smtp/camel-smtp-transport.c:1452
-#: ../camel/providers/smtp/camel-smtp-transport.c:1462
-#: ../camel/providers/smtp/camel-smtp-transport.c:1521
-#: ../camel/providers/smtp/camel-smtp-transport.c:1540
-#: ../camel/providers/smtp/camel-smtp-transport.c:1553
-#: ../camel/providers/smtp/camel-smtp-transport.c:1561
+#: ../camel/providers/smtp/camel-smtp-transport.c:1511
+#: ../camel/providers/smtp/camel-smtp-transport.c:1530
+#: ../camel/providers/smtp/camel-smtp-transport.c:1543
+#: ../camel/providers/smtp/camel-smtp-transport.c:1551
 msgid "DATA command failed: "
 msgstr "DATA-kommando feilet: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1586
-#: ../camel/providers/smtp/camel-smtp-transport.c:1600
-#: ../camel/providers/smtp/camel-smtp-transport.c:1608
+#: ../camel/providers/smtp/camel-smtp-transport.c:1576
+#: ../camel/providers/smtp/camel-smtp-transport.c:1590
+#: ../camel/providers/smtp/camel-smtp-transport.c:1598
 msgid "RSET command failed: "
 msgstr "RSET-kommando feilet: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1633
-#: ../camel/providers/smtp/camel-smtp-transport.c:1647
-#: ../camel/providers/smtp/camel-smtp-transport.c:1654
+#: ../camel/providers/smtp/camel-smtp-transport.c:1623
+#: ../camel/providers/smtp/camel-smtp-transport.c:1637
+#: ../camel/providers/smtp/camel-smtp-transport.c:1644
 msgid "QUIT command failed: "
 msgstr "QUIT-kommando feilet: "
 
@@ -4747,41 +4721,46 @@ msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "Venter"
 
-#: ../libedataserver/e-client.c:108
+#: ../libedataserver/e-client.c:106
 msgctxt "ClientError"
 msgid "Invalid argument"
 msgstr "Ugyldig argument"
 
-#: ../libedataserver/e-client.c:110
+#: ../libedataserver/e-client.c:108
 msgctxt "ClientError"
 msgid "Backend is busy"
 msgstr "Motoren er opptatt"
 
-#: ../libedataserver/e-client.c:112
+#: ../libedataserver/e-client.c:110
 msgctxt "ClientError"
 msgid "Source not loaded"
 msgstr "Kilde ble ikke lastet"
 
-#: ../libedataserver/e-client.c:114
+#: ../libedataserver/e-client.c:112
 msgctxt "ClientError"
 msgid "Source already loaded"
 msgstr "Kilden er allerede lastet"
 
-#: ../libedataserver/e-client.c:116
+#: ../libedataserver/e-client.c:114
 msgctxt "ClientError"
 msgid "Authentication failed"
 msgstr "Autentisering feilet"
 
-#: ../libedataserver/e-client.c:118
+#: ../libedataserver/e-client.c:116
 msgctxt "ClientError"
 msgid "Authentication required"
 msgstr "Autentisering kreves"
 
-#: ../libedataserver/e-client.c:120
+#: ../libedataserver/e-client.c:118
 msgctxt "ClientError"
 msgid "Repository offline"
 msgstr "Lageret er frakoblet"
 
+#: ../libedataserver/e-client.c:120
+msgctxt "ClientError"
+msgid "Offline unavailable"
+msgstr "Frakoblet modus er ikke tilgjengelig"
+
 #: ../libedataserver/e-client.c:122
 msgctxt "ClientError"
 msgid "Permission denied"
@@ -4804,15 +4783,45 @@ msgstr "Ikke stÃttet"
 
 #: ../libedataserver/e-client.c:130
 msgctxt "ClientError"
+msgid "Unsupported authentication method"
+msgstr "Ikke stÃttet autentiseringsmetode"
+
+#: ../libedataserver/e-client.c:132
+msgctxt "ClientError"
+msgid "TLS not available"
+msgstr "TLS er ikke tilgjengelig"
+
+#: ../libedataserver/e-client.c:134
+msgctxt "ClientError"
+msgid "Search size limit exceeded"
+msgstr "SÃkets stÃrrelsesgrense oversteget"
+
+#: ../libedataserver/e-client.c:136
+msgctxt "ClientError"
+msgid "Search time limit exceeded"
+msgstr "Tidsbegrensning for sÃk oversteget"
+
+#: ../libedataserver/e-client.c:138
+msgctxt "ClientError"
+msgid "Invalid query"
+msgstr "Ugyldig spÃrring"
+
+#: ../libedataserver/e-client.c:140
+msgctxt "ClientError"
+msgid "Query refused"
+msgstr "SpÃrring nektet"
+
+#: ../libedataserver/e-client.c:142
+msgctxt "ClientError"
 msgid "D-Bus error"
 msgstr "D-Bus-feil"
 
-#: ../libedataserver/e-client.c:132
+#: ../libedataserver/e-client.c:144
 msgctxt "ClientError"
 msgid "Other error"
 msgstr "Annen feil"
 
-#: ../libedataserver/e-client.c:135
+#: ../libedataserver/e-client.c:147
 msgctxt "ClientError"
 msgid "Unknown error"
 msgstr "Ukjent feil"
@@ -4945,13 +4954,13 @@ msgstr "%H.%M"
 msgid "%I %p"
 msgstr "%H"
 
-#: ../libedataserverui/e-book-auth-util.c:93
-#: ../libedataserverui/e-book-auth-util.c:673
+#: ../libedataserverui/e-book-auth-util.c:98
+#: ../libedataserverui/e-book-auth-util.c:661
 msgid "Accessing LDAP Server anonymously"
 msgstr "Kobler til LDAP-tjener anonymt"
 
-#: ../libedataserverui/e-book-auth-util.c:199
-#: ../libedataserverui/e-book-auth-util.c:435
+#: ../libedataserverui/e-book-auth-util.c:197
+#: ../libedataserverui/e-book-auth-util.c:422
 msgid "Failed to authenticate.\n"
 msgstr "Kunne ikke autentisere.\n"
 
@@ -5005,7 +5014,7 @@ msgstr ""
 "Det finnes allerede en kategori med navn Â%s i konfigurasjonen. Vennligst "
 "bruk et annet navn"
 
-#: ../libedataserverui/e-client-utils.c:660
+#: ../libedataserverui/e-client-utils.c:756
 #, c-format
 msgid ""
 "Enter password for %s (user %s)\n"
@@ -5014,88 +5023,88 @@ msgstr ""
 "Oppgi passord for %s (bruker %s)\n"
 "Ãrsak: %s"
 
-#: ../libedataserverui/e-client-utils.c:748
+#: ../libedataserverui/e-client-utils.c:850
 msgid "Enter Passphrase"
 msgstr "Oppgi passordfrase"
 
-#: ../libedataserverui/e-client-utils.c:750
+#: ../libedataserverui/e-client-utils.c:852
 msgid "Enter Password"
 msgstr "Oppgi passord"
 
-#: ../libedataserverui/e-name-selector-dialog.c:177
+#: ../libedataserverui/e-name-selector-dialog.c:184
 msgid "Show Contacts"
 msgstr "Vis kontakter"
 
-#: ../libedataserverui/e-name-selector-dialog.c:199
+#: ../libedataserverui/e-name-selector-dialog.c:206
 msgid "Address B_ook:"
 msgstr "Adresseb_ok:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:207
+#: ../libedataserverui/e-name-selector-dialog.c:214
 msgid "Cate_gory:"
 msgstr "Kate_gori"
 
-#: ../libedataserverui/e-name-selector-dialog.c:225
+#: ../libedataserverui/e-name-selector-dialog.c:232
 msgid "_Search:"
 msgstr "_SÃk:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:243
-#: ../libedataserverui/e-name-selector-dialog.c:978
+#: ../libedataserverui/e-name-selector-dialog.c:250
+#: ../libedataserverui/e-name-selector-dialog.c:1011
 msgid "Any Category"
 msgstr "Hvilken som helst kategori"
 
-#: ../libedataserverui/e-name-selector-dialog.c:245
+#: ../libedataserverui/e-name-selector-dialog.c:252
 msgid "Co_ntacts"
 msgstr "Ko_ntakter"
 
-#: ../libedataserverui/e-name-selector-dialog.c:290
+#: ../libedataserverui/e-name-selector-dialog.c:307
 msgid "Search"
 msgstr "SÃk"
 
-#: ../libedataserverui/e-name-selector-dialog.c:293
+#: ../libedataserverui/e-name-selector-dialog.c:310
 msgid "Address Book"
 msgstr "Adressebok"
 
-#: ../libedataserverui/e-name-selector-dialog.c:296
+#: ../libedataserverui/e-name-selector-dialog.c:313
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: ../libedataserverui/e-name-selector-dialog.c:413
+#: ../libedataserverui/e-name-selector-dialog.c:430
 msgid "Select Contacts from Address Book"
 msgstr "Velg kontakter fra adresseboken"
 
-#: ../libedataserverui/e-name-selector-dialog.c:748
+#: ../libedataserverui/e-name-selector-dialog.c:766
 msgid "_Add"
 msgstr "_Legg til"
 
-#: ../libedataserverui/e-name-selector-dialog.c:752
+#: ../libedataserverui/e-name-selector-dialog.c:770
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: ../libedataserverui/e-name-selector-dialog.c:892
+#: ../libedataserverui/e-name-selector-dialog.c:930
 #, c-format
 msgid "Error loading address book: %s"
 msgstr "Feil under lasting av adressebok: %s"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2662
+#: ../libedataserverui/e-name-selector-entry.c:2704
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "Ut_vid %s i oppfÃringen"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2677
+#: ../libedataserverui/e-name-selector-entry.c:2719
 #, c-format
 msgid "Cop_y %s"
 msgstr "Ko_pier %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2687
+#: ../libedataserverui/e-name-selector-entry.c:2729
 #, c-format
 msgid "C_ut %s"
 msgstr "Klipp _ut %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2704
+#: ../libedataserverui/e-name-selector-entry.c:2746
 #, c-format
 msgid "_Edit %s"
 msgstr "_Rediger %s"
@@ -5105,32 +5114,31 @@ msgstr "_Rediger %s"
 msgid "_Delete %s"
 msgstr "_Slett %s"
 
-#: ../libedataserverui/e-passwords.c:127
-#, c-format
+#: ../libedataserverui/e-passwords.c:126
 msgid "Keyring key is unusable: no user or host name"
 msgstr "NÃkkelringen kan ikke brukes: ingen bruker eller vertsnavn"
 
-#: ../libedataserverui/e-passwords.c:701
+#: ../libedataserverui/e-passwords.c:699
 #: ../libedataserverui/e-passwords-win32.c:612
 msgid "You have the Caps Lock key on."
 msgstr "Du har CAPS-lock pÃ."
 
-#: ../libedataserverui/e-passwords.c:821
+#: ../libedataserverui/e-passwords.c:819
 #: ../libedataserverui/e-passwords-win32.c:735
 msgid "_Remember this passphrase"
 msgstr "Husk dette passo_rdet"
 
-#: ../libedataserverui/e-passwords.c:822
+#: ../libedataserverui/e-passwords.c:820
 #: ../libedataserverui/e-passwords-win32.c:736
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "Husk dette passo_rdet for resten av denne Ãkten"
 
-#: ../libedataserverui/e-passwords.c:827
+#: ../libedataserverui/e-passwords.c:825
 #: ../libedataserverui/e-passwords-win32.c:741
 msgid "_Remember this password"
 msgstr "Husk dette passo_rdet"
 
-#: ../libedataserverui/e-passwords.c:828
+#: ../libedataserverui/e-passwords.c:826
 #: ../libedataserverui/e-passwords-win32.c:742
 msgid "_Remember this password for the remainder of this session"
 msgstr "Husk dette passo_rdet for resten av denne Ãkten"



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