Update Update
authorKjartan Maraas <kmaraas@gnome.org>
Fri, 28 Jan 2005 15:56:17 +0000 (15:56 +0000)
committerKjartan Maraas <kmaraas@src.gnome.org>
Fri, 28 Jan 2005 15:56:17 +0000 (15:56 +0000)
2005-01-28  Kjartan Maraas  <kmaraas@gnome.org>

* nb.po: Update
* no.po: Update

po/ChangeLog
po/nb.po
po/no.po

index 7e96ec2..4e0a077 100644 (file)
@@ -1,3 +1,8 @@
+2005-01-28  Kjartan Maraas  <kmaraas@gnome.org>
+
+       * nb.po: Update
+       * no.po: Update
+
 2005-01-26  Duarte Loreto <happyguy_pt@hotmail.com>
 
        * pt.po: Updated Portuguese translation.
index e84dc57..5bd1373 100644 (file)
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-19 00:25+0100\n"
-"PO-Revision-Date: 2005-01-19 00:36+0100\n"
+"POT-Creation-Date: 2005-01-28 16:50+0100\n"
+"PO-Revision-Date: 2005-01-28 16:55+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@@ -109,12 +109,14 @@ msgid "CORBA exception making \"%s\" call"
 msgstr "CORBA-unntak ved kall til «%s»"
 
 #: addressbook/libebook/e-book.c:2390
-msgid "e_book_cancel: there is no current operation"
-msgstr "e_book_cancel: ingen aktiv e-operasjon"
+#, c-format
+msgid "%s: there is no current operation"
+msgstr "%s: ingen aktiv operasjon"
 
 #: addressbook/libebook/e-book.c:2425
-msgid "e_book_cancel: couldn't cancel"
-msgstr "e_book_cancel: kunne ikke avbryte"
+#, c-format
+msgid "%s: couldn't cancel"
+msgstr "%s: kunne ikke avbryte"
 
 #: addressbook/libebook/e-book.c:2454 addressbook/libebook/e-book.c:2458
 #, c-format
@@ -122,21 +124,24 @@ msgid "\"%s\" on book after \"%s\""
 msgstr "«%s» i bok etter «%s»"
 
 #: addressbook/libebook/e-book.c:2524
-msgid "e_book_open: cancelled"
-msgstr "e_book_open: avbrutt"
+#, c-format
+msgid "%s: cancelled"
+msgstr "%s: avbrutt"
 
 #: addressbook/libebook/e-book.c:3066
-msgid "e_book_load_uri: Invalid source."
-msgstr "e_book_load_uri: Ugyldig kilde."
+#, c-format
+msgid "%s: Invalid source."
+msgstr "%s: Ugyldig kilde."
 
 #: addressbook/libebook/e-book.c:3074
 #, c-format
-msgid "e_book_load_uri: no factories available for uri `%s'"
-msgstr "e_book_load_uri: ingen fabrikker tilgjengelig for uri «%s»"
+msgid "%s: no factories available for uri `%s'"
+msgstr "%s: ingen fabrikker tilgjengelig for uri «%s»"
 
 #: addressbook/libebook/e-book.c:3086
-msgid "e_book_load_uri: Could not create EBookListener"
-msgstr "e_book_load_uri: Kunne ikke opprette EBookListener"
+#, c-format
+msgid "%s: Could not create EBookListener"
+msgstr "%s: Kunne ikke opprette EBookListener"
 
 #: addressbook/libebook/e-book.c:3138
 #, c-format
@@ -144,14 +149,14 @@ msgid "e_book_new: no factories available for uri `%s'"
 msgstr "e_book_new: ingen fabrikker tilgjengelig for uri «%s»"
 
 #: addressbook/libebook/e-book.c:3332
-msgid "e_book_get_self: there was no self contact uid stored in gconf"
-msgstr "e_book_get_self: ingen uid lagret i gconf for selvkontakt"
+#, c-format
+msgid "%s: there was no self contact uid stored in gconf"
+msgstr "%s: ingen uid lagret i gconf for egen kontakt"
 
 #: addressbook/libebook/e-book.c:3443
 #, c-format
-msgid ""
-"e_book_set_default_source: there was no source for uid `%s' stored in gconf."
-msgstr "e_book_set_default_source: ingen kilde lagret i gconf for uid «%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-contact.c:102
 msgid "Unique ID"
@@ -554,7 +559,7 @@ msgid "Category List"
 msgstr "Kategoriliste"
 
 #: addressbook/libebook/e-contact.c:224
-#: libedataserverui/e-categories-dialog.c:369
+#: libedataserverui/e-categories-dialog.c:370
 msgid "Categories"
 msgstr "Kategorier"
 
@@ -615,41 +620,42 @@ msgstr "Fødselsdag: %s"
 msgid "Anniversary: %s"
 msgstr "Bryllupsdag: %s"
 
-#: calendar/backends/file/e-cal-backend-file.c:182
+#: calendar/backends/file/e-cal-backend-file.c:192
 msgid "Can't save calendar data: Malformed URI."
 msgstr "Kan ikke lagre kalenderdata: Feil i URI."
 
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:484
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:496
 msgid "Invalid server URI"
 msgstr "Ugyldig URI for tjener"
 
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:531
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:534
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:543
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:546
 #: camel/providers/groupwise/camel-gw-listener.c:405
 #: camel/providers/groupwise/camel-gw-listener.c:435
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:541
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:784
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:553
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:796
 #: calendar/backends/http/e-cal-backend-http.c:484
 msgid "Could not create cache file"
 msgstr "Kunne ikke opprette bufferfil"
 
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:551
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:563
 msgid "Could not create thread for populating cache"
 msgstr "Kunne ikke opprette tråd for å populere buffer"
 
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:557
-#: calendar/libecal/e-cal.c:4560
-#: camel/providers/groupwise/camel-groupwise-folder.c:533
-#: camel/providers/groupwise/camel-groupwise-store.c:507
-#: camel/providers/groupwise/camel-groupwise-store.c:644
-#: camel/providers/groupwise/camel-groupwise-store.c:805
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:569
+#: calendar/libecal/e-cal.c:4507
+#: camel/providers/groupwise/camel-groupwise-folder.c:598
+#: camel/providers/groupwise/camel-groupwise-store.c:516
+#: camel/providers/groupwise/camel-groupwise-store.c:597
+#: camel/providers/groupwise/camel-groupwise-store.c:751
+#: camel/providers/groupwise/camel-groupwise-store.c:915
 msgid "Authentication failed"
 msgstr "Autentisering feilet"
 
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:776
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:788
 msgid "Repository is Offline"
 msgstr "Lageret er frakoblet"
 
@@ -811,87 +817,87 @@ msgid "Undefined"
 msgstr "Udefinert"
 
 #. actually ask the client for authentication
-#: calendar/libecal/e-cal.c:1590
+#: calendar/libecal/e-cal.c:1535
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Oppgi passord for %s (bruker %s)"
 
-#: calendar/libecal/e-cal.c:4532
+#: calendar/libecal/e-cal.c:4479
 msgid "Invalid argument"
 msgstr "Ugyldig argument"
 
-#: calendar/libecal/e-cal.c:4534
+#: calendar/libecal/e-cal.c:4481
 msgid "Backend is busy"
 msgstr "Motoren er opptatt"
 
-#: calendar/libecal/e-cal.c:4536
+#: calendar/libecal/e-cal.c:4483
 msgid "Repository is offline"
 msgstr "Lageret er frakoblet"
 
-#: calendar/libecal/e-cal.c:4538
+#: calendar/libecal/e-cal.c:4485
 msgid "No such calendar"
 msgstr "Ingen slik kalender"
 
-#: calendar/libecal/e-cal.c:4540 servers/groupwise/e-gw-connection.c:158
+#: calendar/libecal/e-cal.c:4487 servers/groupwise/e-gw-connection.c:160
 msgid "Object not found"
 msgstr "Objektet ble ikke funnet"
 
-#: calendar/libecal/e-cal.c:4542 servers/groupwise/e-gw-connection.c:154
+#: calendar/libecal/e-cal.c:4489 servers/groupwise/e-gw-connection.c:154
 msgid "Invalid object"
 msgstr "Ugyldig objekt"
 
-#: calendar/libecal/e-cal.c:4544
+#: calendar/libecal/e-cal.c:4491
 msgid "URI not loaded"
 msgstr "URI ble ikke lastet"
 
-#: calendar/libecal/e-cal.c:4546
+#: calendar/libecal/e-cal.c:4493
 msgid "URI already loaded"
 msgstr "URI allerede lastet"
 
-#: calendar/libecal/e-cal.c:4548
+#: calendar/libecal/e-cal.c:4495
 msgid "Permission denied"
 msgstr "Tilgang nektet"
 
-#: calendar/libecal/e-cal.c:4550 servers/groupwise/e-gw-connection.c:160
+#: calendar/libecal/e-cal.c:4497 servers/groupwise/e-gw-connection.c:162
 msgid "Unknown User"
 msgstr "Ukjent bruker"
 
-#: calendar/libecal/e-cal.c:4552
+#: calendar/libecal/e-cal.c:4499
 msgid "Object ID already exists"
 msgstr "Objekt-ID eksisterer allerede"
 
-#: calendar/libecal/e-cal.c:4554
+#: calendar/libecal/e-cal.c:4501
 msgid "Protocol not supported"
 msgstr "Protokollen er ikke støttet"
 
-#: calendar/libecal/e-cal.c:4556
+#: calendar/libecal/e-cal.c:4503
 msgid "Operation has been cancelled"
 msgstr "Operasjonen ble avbrutt"
 
-#: calendar/libecal/e-cal.c:4558
+#: calendar/libecal/e-cal.c:4505
 msgid "Could not cancel operation"
 msgstr "Kunne ikke avbryte operasjon"
 
-#: calendar/libecal/e-cal.c:4562
+#: calendar/libecal/e-cal.c:4509
 #: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication required"
 msgstr "Autentisering kreves"
 
-#: calendar/libecal/e-cal.c:4564
+#: calendar/libecal/e-cal.c:4511
 msgid "A CORBA exception has occurred"
 msgstr "Et CORBA-unntak har oppstått"
 
-#: calendar/libecal/e-cal.c:4566 camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-command.c:401
-#: camel/providers/imap4/camel-imap4-store.c:294
+#: calendar/libecal/e-cal.c:4513 camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-command.c:404
+#: camel/providers/imap4/camel-imap4-store.c:297
 #: camel/providers/pop3/camel-pop3-store.c:535
 #: camel/providers/pop3/camel-pop3-store.c:542
 #: camel/providers/pop3/camel-pop3-store.c:548
-#: servers/groupwise/e-gw-connection.c:166
+#: servers/groupwise/e-gw-connection.c:168
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
-#: calendar/libecal/e-cal.c:4568
+#: calendar/libecal/e-cal.c:4515
 msgid "No error"
 msgstr "Ingen feil"
 
@@ -1058,11 +1064,11 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "Re-synkroniserer med tjener"
 
-#: camel/camel-disco-folder.c:42 camel/camel-offline-folder.c:50
+#: camel/camel-disco-folder.c:42 camel/camel-offline-folder.c:51
 msgid "Copy folder content locally for offline operation"
 msgstr "Kopier mappeinnhold lokalt for frakoblet operasjon"
 
-#: camel/camel-disco-folder.c:104 camel/camel-offline-folder.c:107
+#: camel/camel-disco-folder.c:104 camel/camel-offline-folder.c:110
 msgid "Downloading new messages for offline mode"
 msgstr "Laster ned nye meldinger for frakoblet modus"
 
@@ -1246,7 +1252,7 @@ msgstr "Oppdaterer data om gyldige meldinger"
 msgid "Filtering new message(s)"
 msgstr "Filtrerer ny(e) melding(er)"
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:733
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1257,15 +1263,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:749
+#: camel/camel-gpg-context.c:747
 msgid "Failed to parse gpg userid hint."
 msgstr "Feil under tolking av hint for gpg brukerid."
 
-#: camel/camel-gpg-context.c:773
+#: camel/camel-gpg-context.c:771
 msgid "Failed to parse gpg passphrase request."
 msgstr "Kunne ikke tolke forespørsel på gpg-passordfrase."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:785
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1274,26 +1280,26 @@ msgstr ""
 "Du trenger et passord for å låse opp nøkkelen for\n"
 "bruker «%s»"
 
-#: camel/camel-gpg-context.c:804 camel/camel-gpg-context.c:1314
-#: camel/camel-gpg-context.c:1498 camel/camel-gpg-context.c:1589
-#: camel/camel-gpg-context.c:1701 camel/providers/nntp/camel-nntp-store.c:1274
+#: camel/camel-gpg-context.c:802 camel/camel-gpg-context.c:1312
+#: camel/camel-gpg-context.c:1496 camel/camel-gpg-context.c:1587
+#: camel/camel-gpg-context.c:1699 camel/providers/nntp/camel-nntp-store.c:1274
 msgid "Cancelled."
 msgstr "Avbrutt."
 
-#: camel/camel-gpg-context.c:822
+#: camel/camel-gpg-context.c:820
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Feil ved åpning av hemmelig nøkkel: 3 ugyldige passord oppgitt."
 
-#: camel/camel-gpg-context.c:828
+#: camel/camel-gpg-context.c:826
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Uventet svar fra GnuPG: %s"
 
-#: camel/camel-gpg-context.c:880
+#: camel/camel-gpg-context.c:878
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Kan ikke kryptere: Ingen gyldige mottakere spesifisert."
 
-#: camel/camel-gpg-context.c:1157
+#: camel/camel-gpg-context.c:1155
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -1304,74 +1310,74 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1162
+#: camel/camel-gpg-context.c:1160
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Feil under bruk av GPG på %s: %s\n"
 
-#: camel/camel-gpg-context.c:1275 camel/camel-smime-context.c:389
+#: camel/camel-gpg-context.c:1273 camel/camel-smime-context.c:389
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Kan ikke generere signeringsdata: %s"
 
-#: camel/camel-gpg-context.c:1307 camel/camel-gpg-context.c:1766
-#: camel/camel-gpg-context.c:1817
+#: camel/camel-gpg-context.c:1305 camel/camel-gpg-context.c:1764
+#: camel/camel-gpg-context.c:1815
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Feil ved kjøring av gpg: %s"
 
-#: camel/camel-gpg-context.c:1331 camel/camel-gpg-context.c:1491
-#: camel/camel-gpg-context.c:1582 camel/camel-gpg-context.c:1605
-#: camel/camel-gpg-context.c:1694 camel/camel-gpg-context.c:1718
-#: camel/camel-gpg-context.c:1788 camel/camel-gpg-context.c:1839
+#: camel/camel-gpg-context.c:1329 camel/camel-gpg-context.c:1489
+#: camel/camel-gpg-context.c:1580 camel/camel-gpg-context.c:1603
+#: camel/camel-gpg-context.c:1692 camel/camel-gpg-context.c:1716
+#: camel/camel-gpg-context.c:1786 camel/camel-gpg-context.c:1837
 msgid "Failed to execute gpg."
 msgstr "Feil ved kjøring av gpg."
 
-#: camel/camel-gpg-context.c:1350
+#: camel/camel-gpg-context.c:1348
 msgid "This is a digitally signed message part"
 msgstr "Dette er en digitalt signert meldingsdel"
 
-#: camel/camel-gpg-context.c:1431 camel/camel-gpg-context.c:1437
-#: camel/camel-gpg-context.c:1443 camel/camel-smime-context.c:692
+#: camel/camel-gpg-context.c:1429 camel/camel-gpg-context.c:1435
+#: camel/camel-gpg-context.c:1441 camel/camel-smime-context.c:692
 #: camel/camel-smime-context.c:703 camel/camel-smime-context.c:710
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Kunne ikke verifisere meldingens signatur: Ugyldig meldingsformat"
 
-#: camel/camel-gpg-context.c:1477
+#: camel/camel-gpg-context.c:1475
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Kunne ikke verifisere meldingens signatur: kunne ikke opprette midlertidig "
 "fil: %s"
 
-#: camel/camel-gpg-context.c:1565
+#: camel/camel-gpg-context.c:1563
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Kunne ikke generere krypteringsdata: %s"
 
-#: camel/camel-gpg-context.c:1623
+#: camel/camel-gpg-context.c:1621
 msgid "This is a digitally encrypted message part"
 msgstr "Dette er en digitalt kryptert meldingsdel"
 
-#: camel/camel-gpg-context.c:1674
+#: camel/camel-gpg-context.c:1672
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Feil under dekryptering av MIME-del: protokollfeil"
 
-#: camel/camel-gpg-context.c:1725 camel/camel-smime-context.c:966
+#: camel/camel-gpg-context.c:1723 camel/camel-smime-context.c:966
 msgid "Encrypted content"
 msgstr "Kryptert innhold"
 
-#: camel/camel-gpg-context.c:1744
+#: camel/camel-gpg-context.c:1742
 msgid "Unable to parse message content"
 msgstr "Kunne ikke lese meldingsinnhold"
 
-#: camel/camel-gpg-context.c:1767 camel/camel-gpg-context.c:1818
+#: camel/camel-gpg-context.c:1765 camel/camel-gpg-context.c:1816
 #: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1465
-#: camel/providers/imap4/camel-imap4-engine.c:1504
-#: camel/providers/imap4/camel-imap4-engine.c:1549
-#: camel/providers/imap4/camel-imap4-engine.c:1605
-#: camel/providers/imap4/camel-imap4-store.c:1250
+#: camel/providers/imap4/camel-imap4-engine.c:1470
+#: camel/providers/imap4/camel-imap4-engine.c:1509
+#: camel/providers/imap4/camel-imap4-engine.c:1554
+#: camel/providers/imap4/camel-imap4-engine.c:1610
+#: camel/providers/imap4/camel-imap4-store.c:1307
 #: camel/providers/imap4/camel-imap4-utils.c:575
 #: camel/providers/smtp/camel-smtp-transport.c:163
 #: camel/providers/smtp/camel-smtp-transport.c:218
@@ -1513,12 +1519,12 @@ msgstr "Navneoppslag feilet"
 msgid "Name lookup failed: %s"
 msgstr "Navneoppslag feilet: %s"
 
-#: camel/camel-offline-folder.c:250
+#: camel/camel-offline-folder.c:253
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "Synkroniserer meldinger i mappe «%s» til disk"
 
-#: camel/camel-offline-journal.c:140 camel/camel-offline-journal.c:163
+#: camel/camel-offline-journal.c:141 camel/camel-offline-journal.c:164
 #, c-format
 msgid "Cannot write offline journal for folder `%s': %s"
 msgstr "Kan ikke skrive journal for frakoblet tilstand for mappe «%s»: %s"
@@ -2306,8 +2312,8 @@ 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/groupwise/camel-groupwise-folder.c:104
-#: camel/providers/imap/camel-imap-folder.c:1979
+#: camel/providers/groupwise/camel-groupwise-folder.c:108
+#: camel/providers/imap/camel-imap-folder.c:1980
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2316,16 +2322,16 @@ msgstr ""
 "Kan ikke hente melding: %s\n"
 "  %s"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:104
-#: camel/providers/imap/camel-imap-folder.c:1979
+#: camel/providers/groupwise/camel-groupwise-folder.c:108
+#: camel/providers/imap/camel-imap-folder.c:1980
 #: camel/providers/local/camel-maildir-folder.c:245
 #: camel/providers/local/camel-mbox-folder.c:403
 #: camel/providers/local/camel-mh-folder.c:203
 msgid "No such message"
 msgstr "Ingen slik melding"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:120
-#: camel/providers/imap4/camel-imap4-folder.c:696
+#: camel/providers/groupwise/camel-groupwise-folder.c:123
+#: camel/providers/imap4/camel-imap4-folder.c:788
 #: camel/providers/nntp/camel-nntp-folder.c:157
 #: camel/providers/nntp/camel-nntp-folder.c:233
 #: camel/providers/nntp/camel-nntp-folder.c:372
@@ -2336,8 +2342,8 @@ msgstr "Ingen slik melding"
 msgid "User cancelled"
 msgstr "Bruker avbrøt"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:125
-#: camel/providers/imap4/camel-imap4-folder.c:701
+#: camel/providers/groupwise/camel-groupwise-folder.c:128
+#: camel/providers/imap4/camel-imap4-folder.c:793
 #: camel/providers/nntp/camel-nntp-folder.c:148
 #: camel/providers/nntp/camel-nntp-folder.c:150
 #: camel/providers/nntp/camel-nntp-folder.c:159
@@ -2350,43 +2356,42 @@ msgstr "Bruker avbrøt"
 msgid "Cannot get message %s: %s"
 msgstr "Kan ikke hente melding %s: %s"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:145
-#: camel/providers/imap4/camel-imap4-folder.c:719
+#: camel/providers/groupwise/camel-groupwise-folder.c:148
+#: camel/providers/imap4/camel-imap4-folder.c:811
 msgid "This message is not available in offline mode."
 msgstr "Denne meldingen er ikke tilgjengelig i frakoblet modus."
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:171
-#: camel/providers/groupwise/camel-groupwise-folder.c:272
+#: camel/providers/groupwise/camel-groupwise-folder.c:176
 msgid "Could not get message"
 msgstr "Kunne ikke hente melding"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:471
+#: camel/providers/groupwise/camel-groupwise-folder.c:516
 #: camel/providers/imap/camel-imap-folder.c:245
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Kunne ikke laste sammendrag for %s"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:685
+#: camel/providers/groupwise/camel-groupwise-folder.c:765
 #, c-format
 msgid "Cannot create message: %s"
 msgstr "Kan ikke opprette melding: %s"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:697
+#: camel/providers/groupwise/camel-groupwise-folder.c:777
 #, c-format
 msgid "Cannot append message to folder `%s': %s"
 msgstr "Kan ikke legge til melding i mappe «%s»: %s"
 
-#: camel/providers/groupwise/camel-groupwise-journal.c:240
+#: camel/providers/groupwise/camel-groupwise-journal.c:283
 #, c-format
 msgid "Cannot get folder container %s"
 msgstr "Kan ikke finne mappekontainer %s"
 
-#: camel/providers/groupwise/camel-groupwise-journal.c:328
+#: camel/providers/groupwise/camel-groupwise-journal.c:347
 #: camel/providers/imap4/camel-imap4-journal.c:320
 msgid "Cannot append message in offline mode: cache unavailable"
 msgstr "Kan ikke legge til melding i frakoblet modus: buffer ikke tilgjengelig"
 
-#: camel/providers/groupwise/camel-groupwise-journal.c:344
+#: camel/providers/groupwise/camel-groupwise-journal.c:363
 #: camel/providers/imap4/camel-imap4-journal.c:336
 #, c-format
 msgid "Cannot append message in offline mode: %s"
@@ -2453,69 +2458,68 @@ msgstr "Passord"
 #: camel/providers/groupwise/camel-groupwise-provider.c:104
 msgid ""
 "This option will connect to the GroupWise server using a plaintext password."
-msgstr "Dette valget vil la deg koble til en GroupWise-tjener med klartekst-passord."
+msgstr ""
+"Dette valget vil la deg koble til en GroupWise-tjener med klartekst-passord."
 
-#: camel/providers/groupwise/camel-groupwise-store.c:267
+#: camel/providers/groupwise/camel-groupwise-store.c:270
 msgid "Host or user not availbale in url"
 msgstr "Vert eller bruker ikke tilgjengelig i URL"
 
-#: camel/providers/groupwise/camel-groupwise-store.c:359
+#: camel/providers/groupwise/camel-groupwise-store.c:362
 #, c-format
 msgid "%sPlease enter the Groupwise password for %s@%s"
 msgstr "%sVennligst skriv inn GroupWise-passord for %s@%s"
 
-#: camel/providers/groupwise/camel-groupwise-store.c:373
+#: camel/providers/groupwise/camel-groupwise-store.c:376
 #: camel/providers/imap/camel-imap-store.c:1301
 msgid "You didn't enter a password."
 msgstr "Du skrev ikke inn et passord."
 
-#: camel/providers/groupwise/camel-groupwise-store.c:387
+#: camel/providers/groupwise/camel-groupwise-store.c:390
 msgid "Unable to authenticate to GroupWise server."
 msgstr "Kunne ikke autentisere mot GroupWise-tjener."
 
-#: camel/providers/groupwise/camel-groupwise-store.c:483
+#: camel/providers/groupwise/camel-groupwise-store.c:491
 #: camel/providers/imap/camel-imap-store.c:1852
 #: camel/providers/imap/camel-imap-store.c:2042
 #, c-format
 msgid "No such folder %s"
 msgstr "Mappen %s eksisterer ikke"
 
-#: camel/providers/groupwise/camel-groupwise-store.c:503
-#: camel/providers/imap/camel-imap-folder.c:2287
-#: camel/providers/imap/camel-imap-folder.c:2357
+#: camel/providers/groupwise/camel-groupwise-store.c:541
+#: camel/providers/groupwise/camel-groupwise-store.c:587
+#: camel/providers/imap/camel-imap-folder.c:2288
+#: camel/providers/imap/camel-imap-folder.c:2358
 msgid "Fetching summary information for new messages"
 msgstr "Henter sammendragsinformasjon for nye meldinger"
 
-#: camel/providers/groupwise/camel-groupwise-store.c:614
+#: camel/providers/groupwise/camel-groupwise-store.c:721
 msgid "Cannot get folder info in offline mode."
 msgstr "Kan ikke hente mappeinformasjon i frakoblet modus."
 
-#: camel/providers/groupwise/camel-groupwise-store.c:786
-#, fuzzy
+#: camel/providers/groupwise/camel-groupwise-store.c:896
 msgid "Cannot create GroupWise folders in offline mode."
-msgstr "Kan ikke opprette en mappe med dette navnet."
+msgstr "Kan ikke opprette GroupWise-mapper i frakoblet modus."
 
-#: camel/providers/groupwise/camel-groupwise-store.c:835
-#, fuzzy
+#: camel/providers/groupwise/camel-groupwise-store.c:945
 msgid "Cannot delete GroupWise folders in offline mode."
-msgstr "Kan ikke slette mappe «%s»: Spesiell mappe"
+msgstr "Kan ikke slette GroupWise-mapper i frakoblet modus."
 
-#: camel/providers/groupwise/camel-groupwise-store.c:878
-#, fuzzy
+#: camel/providers/groupwise/camel-groupwise-store.c:988
 msgid "Cannot rename GroupWise folders in offline mode."
-msgstr "Du kan ikke endre navn på en mappe på en nyhetstjener."
+msgstr "Du kan ikke endre navn på GroupWise-mapper i frakoblet modus."
 
-#: camel/providers/groupwise/camel-groupwise-store.c:884
-#, fuzzy, c-format
+#: camel/providers/groupwise/camel-groupwise-store.c:994
+#, c-format
 msgid "Cannot rename Groupwise folder `%s' to `%s'"
-msgstr "Kan ikke endre navn på mappe «%s» til «%s»: Ugyldig kommando"
+msgstr "Kan ikke endre navn på GroupWise-mappe «%s» til «%s»"
 
-#: camel/providers/groupwise/camel-groupwise-store.c:916
+#: camel/providers/groupwise/camel-groupwise-store.c:1026
 #, c-format
 msgid "GroupWise server %s"
 msgstr "GroupWise-tjener %s"
 
-#: camel/providers/groupwise/camel-groupwise-store.c:918
+#: camel/providers/groupwise/camel-groupwise-store.c:1028
 #, c-format
 msgid "GroupWise service for %s on %s"
 msgstr "GroupWise-tjeneste for %s på %s"
@@ -2553,7 +2557,7 @@ msgstr "Kunne ikke autentisere.\n"
 
 #: camel/providers/imap/camel-imap-command.c:219
 #: camel/providers/imap/camel-imap-command.c:258
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:463
 #: camel/providers/imap/camel-imap-store.c:3209
 msgid "Operation cancelled"
 msgstr "Operasjon avbrutt"
@@ -2565,7 +2569,8 @@ msgid "Server unexpectedly disconnected: %s"
 msgstr "Tjener koblet fra uventet: %s"
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:321
+#. we might get a ']' from a BAD response since we +12, but who cares?
+#: camel/providers/imap/camel-imap-command.c:324
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
@@ -2574,26 +2579,26 @@ msgstr ""
 "Melding fra IMAP-tjener %s@%s:\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-command.c:390
+#: camel/providers/imap/camel-imap-command.c:393
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Uventet svar fra IMAP-tjener: %s"
 
-#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap/camel-imap-command.c:403
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-kommando feilet: %s"
 
-#: camel/providers/imap/camel-imap-command.c:470
+#: camel/providers/imap/camel-imap-command.c:473
 msgid "Server response ended too soon."
 msgstr "Svar fra tjener ble avsluttet for tidlig."
 
-#: camel/providers/imap/camel-imap-command.c:675
+#: camel/providers/imap/camel-imap-command.c:678
 #, 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:711
+#: camel/providers/imap/camel-imap-command.c:714
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Uventet svar «OK» fra IMAP-tjener: %s"
@@ -2609,38 +2614,38 @@ msgstr "Mappen ble ødelagt og laget på nytt på tjeneren."
 
 #. Check UIDs and flags of all messages we already know of.
 #: camel/providers/imap/camel-imap-folder.c:573
-#: camel/providers/imap4/camel-imap4-summary.c:1272
+#: camel/providers/imap4/camel-imap4-summary.c:1472
 msgid "Scanning for changed messages"
 msgstr "Søker etter endrede meldinger"
 
-#: camel/providers/imap/camel-imap-folder.c:1939
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Kan ikke hente melding: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2021
-#: camel/providers/imap/camel-imap-folder.c:2623
+#: camel/providers/imap/camel-imap-folder.c:2022
+#: camel/providers/imap/camel-imap-folder.c:2624
 #: camel/providers/nntp/camel-nntp-folder.c:221
 msgid "This message is not currently available"
 msgstr "Denne meldingen er ikke tilgjengelig"
 
-#: camel/providers/imap/camel-imap-folder.c:2464
+#: camel/providers/imap/camel-imap-folder.c:2465
 #, 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:2472
+#: camel/providers/imap/camel-imap-folder.c:2473
 #, 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:2485
+#: camel/providers/imap/camel-imap-folder.c:2486
 #, c-format
 msgid ""
 "Unexpected server response: Identical UIDs provided for messages %d and %d"
 msgstr "Uferdig svar fra tjener: identiske UIDer oppgitt for melding %d og %d"
 
-#: camel/providers/imap/camel-imap-folder.c:2661
+#: camel/providers/imap/camel-imap-folder.c:2662
 msgid "Could not find message body in FETCH response."
 msgstr "Kunne ikke finne meldingskropp i FETCH-svar."
 
@@ -2721,11 +2726,11 @@ msgstr "Se kun etter søppelinnhold i nye meldin_ger i innboks"
 
 #: camel/providers/imap/camel-imap-provider.c:72
 #: camel/providers/imap4/camel-imap4-provider.c:57
-#, fuzzy
 msgid "Automatically synchroni_ze remote mail locally"
-msgstr "Synkroniser eksterne meldinger med lokale meldinger automatisk"
+msgstr "S_ynkroniser eksterne meldinger med lokale meldinger automatisk"
 
 #: camel/providers/imap/camel-imap-provider.c:79
+#: camel/providers/imap4/camel-imap4-provider.c:64
 msgid "IMAP"
 msgstr "IMAP"
 
@@ -2740,21 +2745,21 @@ msgstr ""
 "passord."
 
 #: camel/providers/imap/camel-imap-store.c:421
-#: camel/providers/imap4/camel-imap4-store.c:206
+#: camel/providers/imap4/camel-imap4-store.c:209
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP-tjener %s"
 
 #: camel/providers/imap/camel-imap-store.c:423
-#: camel/providers/imap4/camel-imap4-store.c:208
+#: camel/providers/imap4/camel-imap4-store.c:211
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP-tjeneste for %s på %s"
 
 #: camel/providers/imap/camel-imap-store.c:535
 #: camel/providers/imap/camel-imap-store.c:550
-#: camel/providers/imap4/camel-imap4-store.c:240
-#: camel/providers/imap4/camel-imap4-store.c:255
+#: camel/providers/imap4/camel-imap4-store.c:243
+#: camel/providers/imap4/camel-imap4-store.c:258
 #: camel/providers/nntp/camel-nntp-store.c:200
 #: camel/providers/nntp/camel-nntp-store.c:215
 #: camel/providers/pop3/camel-pop3-store.c:169
@@ -2766,7 +2771,7 @@ msgid "Could not connect to %s: %s"
 msgstr "Kunne ikke koble til %s: %s"
 
 #: camel/providers/imap/camel-imap-store.c:536
-#: camel/providers/imap4/camel-imap4-store.c:241
+#: camel/providers/imap4/camel-imap4-store.c:244
 #: camel/providers/nntp/camel-nntp-store.c:201
 #: camel/providers/pop3/camel-pop3-store.c:170
 #: camel/providers/smtp/camel-smtp-transport.c:258
@@ -2775,7 +2780,7 @@ msgstr "SSL er ikke tilgjengelig"
 
 #: camel/providers/imap/camel-imap-store.c:547
 #: camel/providers/imap/camel-imap-store.c:817
-#: camel/providers/imap4/camel-imap4-store.c:252
+#: camel/providers/imap4/camel-imap4-store.c:255
 #: camel/providers/nntp/camel-nntp-store.c:212
 #: camel/providers/nntp/camel-nntp-store.c:231
 #: camel/providers/pop3/camel-pop3-store.c:181
@@ -2786,9 +2791,9 @@ msgstr "Tilkobling avbrutt"
 #: camel/providers/imap/camel-imap-store.c:655
 #: camel/providers/imap/camel-imap-store.c:677
 #: camel/providers/imap/camel-imap-store.c:683
-#: camel/providers/imap4/camel-imap4-store.c:280
-#: camel/providers/imap4/camel-imap4-store.c:293
-#: camel/providers/imap4/camel-imap4-store.c:309
+#: camel/providers/imap4/camel-imap4-store.c:283
+#: camel/providers/imap4/camel-imap4-store.c:296
+#: camel/providers/imap4/camel-imap4-store.c:312
 #, 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"
@@ -2799,13 +2804,13 @@ msgid "STARTTLS not supported"
 msgstr "STARTTLS er ikke støttet"
 
 #: camel/providers/imap/camel-imap-store.c:678
-#: camel/providers/imap4/camel-imap4-store.c:281
+#: camel/providers/imap4/camel-imap4-store.c:284
 #: camel/providers/pop3/camel-pop3-store.c:246
 msgid "SSL negotiations failed"
 msgstr "SSL-forhandling feilet"
 
 #: camel/providers/imap/camel-imap-store.c:684
-#: camel/providers/imap4/camel-imap4-store.c:310
+#: camel/providers/imap4/camel-imap4-store.c:313
 #: camel/providers/pop3/camel-pop3-store.c:252
 #: camel/providers/smtp/camel-smtp-transport.c:365
 msgid "SSL is not available in this build"
@@ -2845,7 +2850,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-store.c:1870
 #: camel/providers/imap/camel-imap-store.c:2248
-#: camel/providers/imap4/camel-imap4-store.c:770
+#: camel/providers/imap4/camel-imap4-store.c:773
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -2869,13 +2874,13 @@ msgstr "Kan ikke opprette mappe «%s»: mappen eksisterer."
 msgid "Unknown parent folder: %s"
 msgstr "Ukjent opphavsmappe: %s"
 
-#: camel/providers/imap4/camel-imap4-command.c:551
-#: camel/providers/imap4/camel-imap4-command.c:558
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
 #, c-format
 msgid "Failed sending command to IMAP server %s: %s"
 msgstr "Feil under sending av kommando til IMAP-tjener %s: %s"
 
-#: camel/providers/imap4/camel-imap4-command.c:661
+#: camel/providers/imap4/camel-imap4-command.c:660
 #, c-format
 msgid "Unexpected response from IMAP4 server %s: %s"
 msgstr "Uventet svar fra IMAP4-tjener %s: %s"
@@ -2895,85 +2900,86 @@ msgstr "Kan ikke velge mappe «%s»: Ugyldig navn på postboks"
 msgid "Cannot select folder `%s': Bad command"
 msgstr "Kan ikke velge mappe «%s»: Ugyldig kommando"
 
-#: camel/providers/imap4/camel-imap4-engine.c:1464
-#: camel/providers/imap4/camel-imap4-engine.c:1503
-#: camel/providers/imap4/camel-imap4-engine.c:1548
-#: camel/providers/imap4/camel-imap4-engine.c:1604
+#: camel/providers/imap4/camel-imap4-engine.c:1469
+#: camel/providers/imap4/camel-imap4-engine.c:1508
+#: camel/providers/imap4/camel-imap4-engine.c:1553
+#: camel/providers/imap4/camel-imap4-engine.c:1609
 #, c-format
 msgid "IMAP4 server %s unexpectedly disconnected: %s"
 msgstr "IMAP4-tjener %s koblet fra uventet: %s"
 
-#: camel/providers/imap4/camel-imap4-folder.c:306
+#: camel/providers/imap4/camel-imap4-folder.c:85
+msgid ""
+"Enable Mailing-List detection required for some filter and vFolder rules"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:398
 #, c-format
 msgid "Cannot access folder `%s': %s"
 msgstr "Kan ikke aksessere mappe «%s»: %s"
 
-#: camel/providers/imap4/camel-imap4-folder.c:365
+#: camel/providers/imap4/camel-imap4-folder.c:457
 #, c-format
 msgid "Cannot sync flags to folder `%s': Unknown"
 msgstr "Kan ikke synkronisere flagg til mappe «%s»: Ukjent"
 
-#: camel/providers/imap4/camel-imap4-folder.c:371
+#: camel/providers/imap4/camel-imap4-folder.c:463
 #, c-format
 msgid "Cannot sync flags to folder `%s': Bad command"
 msgstr "Kan ikke synkronisere flagg til mappe «%s»: Ugyldig kommando"
 
-#: camel/providers/imap4/camel-imap4-folder.c:512
+#: camel/providers/imap4/camel-imap4-folder.c:604
 #, c-format
 msgid "Cannot expunge folder `%s': Unknown"
 msgstr "Kan ikke tømme mappe «%s»: Ukjent"
 
-#: camel/providers/imap4/camel-imap4-folder.c:517
+#: camel/providers/imap4/camel-imap4-folder.c:609
 #, c-format
 msgid "Cannot expunge folder `%s': Bad command"
 msgstr "Kan ikke tømme mappe «%s»: Ugyldig kommando"
 
-#: camel/providers/imap4/camel-imap4-folder.c:773
+#: camel/providers/imap4/camel-imap4-folder.c:865
 #, c-format
 msgid "Cannot get message %s from folder `%s': No such message"
 msgstr "Kan ikke hente melding %s fra mappe «%s»: Meldingen finnes ikke"
 
-#: camel/providers/imap4/camel-imap4-folder.c:778
+#: camel/providers/imap4/camel-imap4-folder.c:870
 #, c-format
 msgid "Cannot get message %s from folder `%s': Bad command"
 msgstr "Kan ikke hente melding: %s fra mappe «%s»: Ugyldig kommando"
 
-#: camel/providers/imap4/camel-imap4-folder.c:911
+#: camel/providers/imap4/camel-imap4-folder.c:1003
 #, c-format
 msgid "Cannot append message to folder `%s': Unknown error"
 msgstr "Kan ikke legge til melding i mappe «%s»: Ukjent feil"
 
-#: camel/providers/imap4/camel-imap4-folder.c:940
+#: camel/providers/imap4/camel-imap4-folder.c:1032
 #, c-format
 msgid "Cannot append message to folder `%s': Bad command"
 msgstr "Kan ikke legge til melding i mappe «%s»: Ugyldig kommando"
 
-#: camel/providers/imap4/camel-imap4-folder.c:1048
+#: camel/providers/imap4/camel-imap4-folder.c:1140
 #, c-format
 msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
 msgstr "Kan ikke flytte meldinger fra mappe «%s» til mappe «%s»: Ukjent"
 
-#: camel/providers/imap4/camel-imap4-folder.c:1052
+#: camel/providers/imap4/camel-imap4-folder.c:1144
 #, c-format
 msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
 msgstr "Kan ikke kopiere meldinger fra mappe «%s» til mappe «%s»: Ukjent"
 
-#: camel/providers/imap4/camel-imap4-folder.c:1060
+#: camel/providers/imap4/camel-imap4-folder.c:1152
 #, c-format
 msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
 msgstr ""
 "Kan ikke flytte meldinger fra mappe «%s» til mappe «%s»: Ugyldig kommando"
 
-#: camel/providers/imap4/camel-imap4-folder.c:1064
+#: camel/providers/imap4/camel-imap4-folder.c:1156
 #, c-format
 msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
 msgstr ""
 "Kan ikke kopiere meldinger fra mappe «%s» til mappe «%s»: Ugyldig kommando"
 
-#: camel/providers/imap4/camel-imap4-provider.c:64
-msgid "IMAPv4rev1"
-msgstr "IMAPv4rev1"
-
 #: camel/providers/imap4/camel-imap4-provider.c:66
 msgid "For reading and storing mail on IMAPv4rev1 servers."
 msgstr "For lesing og lagring av e-post på IMAPv4rev1-tjenere."
@@ -2985,7 +2991,7 @@ msgstr ""
 "Dette valget vil la deg koble til en IMAPv4rev1-tjener ved å bruke et "
 "klartekst-passord."
 
-#: camel/providers/imap4/camel-imap4-store.c:391
+#: camel/providers/imap4/camel-imap4-store.c:394
 #, c-format
 msgid ""
 "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
@@ -2993,113 +2999,113 @@ msgstr ""
 "Kunne ikke autentisere mot IMAP-tjener %s med bruk av "
 "autentiseringsmekanismen %s"
 
-#: camel/providers/imap4/camel-imap4-store.c:436
+#: camel/providers/imap4/camel-imap4-store.c:439
 #, c-format
 msgid "%sPlease enter the IMAP password for %s on host %s"
 msgstr "%sVennligst skriv inn IMAP-passord for %s på vert %s"
 
-#: camel/providers/imap4/camel-imap4-store.c:506
+#: camel/providers/imap4/camel-imap4-store.c:509
 #, c-format
 msgid "Cannot authenticate to IMAP server %s using %s"
 msgstr "Kan ikke autentisere mot IMAP-tjener %s med bruk av %s"
 
-#: camel/providers/imap4/camel-imap4-store.c:668
-#: camel/providers/imap4/camel-imap4-store.c:780
+#: camel/providers/imap4/camel-imap4-store.c:671
+#: camel/providers/imap4/camel-imap4-store.c:783
 msgid "Cannot create IMAP folders in offline mode."
 msgstr "Kan ikke opprette IMAP-mapper i frakoblet modus."
 
-#: camel/providers/imap4/camel-imap4-store.c:707
+#: camel/providers/imap4/camel-imap4-store.c:710
 #, c-format
 msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Finner ikke mappe «%s» på IMAP-tjener %s: Ukjent"
 
-#: camel/providers/imap4/camel-imap4-store.c:828
+#: camel/providers/imap4/camel-imap4-store.c:831
 #, c-format
 msgid "Cannot create folder `%s': Invalid mailbox name"
 msgstr "Kan ikke opprette mappe «%s»: Ugyldig navn på postboks"
 
-#: camel/providers/imap4/camel-imap4-store.c:834
+#: camel/providers/imap4/camel-imap4-store.c:837
 #, c-format
 msgid "Cannot create folder `%s': Bad command"
 msgstr "Kan ikke opprette mappe «%s»: Ugyldig kommando"
 
-#: camel/providers/imap4/camel-imap4-store.c:865
+#: camel/providers/imap4/camel-imap4-store.c:868
 #, c-format
 msgid "Cannot delete folder `%s': Special folder"
 msgstr "Kan ikke slette mappe «%s»: Spesiell mappe"
 
-#: camel/providers/imap4/camel-imap4-store.c:872
+#: camel/providers/imap4/camel-imap4-store.c:875
 msgid "Cannot delete IMAP folders in offline mode."
 msgstr "Kan ikke slette IMAP-mapper i frakoblet modus."
 
-#: camel/providers/imap4/camel-imap4-store.c:931
+#: camel/providers/imap4/camel-imap4-store.c:934
 #, c-format
 msgid "Cannot delete folder `%s': Invalid mailbox name"
 msgstr "Kan ikke slette mappe «%s»: Ugyldig navn på postboks"
 
-#: camel/providers/imap4/camel-imap4-store.c:936
+#: camel/providers/imap4/camel-imap4-store.c:939
 #, c-format
 msgid "Cannot delete folder `%s': Bad command"
 msgstr "Kan ikke slette mappe «%s»: Ugyldig kommando"
 
-#: camel/providers/imap4/camel-imap4-store.c:956
+#: camel/providers/imap4/camel-imap4-store.c:959
 #, c-format
 msgid "Cannot rename folder `%s' to `%s': Special folder"
 msgstr "Kan ikke endre navn på mappe «%s» til «%s»: Spesiell mappe"
 
-#: camel/providers/imap4/camel-imap4-store.c:963
+#: camel/providers/imap4/camel-imap4-store.c:966
 msgid "Cannot rename IMAP folders in offline mode."
 msgstr "Du kan ikke endre navn på IMAP-mapper i frakoblet modus."
 
-#: camel/providers/imap4/camel-imap4-store.c:994
+#: camel/providers/imap4/camel-imap4-store.c:997
 #, c-format
 msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
 msgstr "Kan ikke endre navn på mappe «%s» til «%s»: Ugyldig navn på postboks"
 
-#: camel/providers/imap4/camel-imap4-store.c:999
+#: camel/providers/imap4/camel-imap4-store.c:1002
 #, c-format
 msgid "Cannot rename folder `%s' to `%s': Bad command"
 msgstr "Kan ikke endre navn på mappe «%s» til «%s»: Ugyldig kommando"
 
-#: camel/providers/imap4/camel-imap4-store.c:1248
+#: camel/providers/imap4/camel-imap4-store.c:1305
 #, c-format
 msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
 msgstr ""
 "Kan ikke hente informasjon om %s for mønster «%s» på IMAP-tjener %s: %s"
 
-#: camel/providers/imap4/camel-imap4-store.c:1250
+#: camel/providers/imap4/camel-imap4-store.c:1307
 msgid "Bad command"
 msgstr "Ugyldig kommando"
 
-#: camel/providers/imap4/camel-imap4-store.c:1288
+#: camel/providers/imap4/camel-imap4-store.c:1345
 msgid "Cannot subscribe to IMAP folders in offline mode."
 msgstr "Kan ikke abonnere på IMAP-mapper i frakoblet modus."
 
-#: camel/providers/imap4/camel-imap4-store.c:1333
+#: camel/providers/imap4/camel-imap4-store.c:1390
 #, c-format
 msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
 msgstr "Kan ikke abonnere på mappe «%s»: Ugyldig navn på postboks"
 
-#: camel/providers/imap4/camel-imap4-store.c:1338
+#: camel/providers/imap4/camel-imap4-store.c:1395
 #, c-format
 msgid "Cannot subscribe to folder `%s': Bad command"
 msgstr "Kan ikke abonnere på mappe «%s»: Ugyldig kommando"
 
-#: camel/providers/imap4/camel-imap4-store.c:1360
+#: camel/providers/imap4/camel-imap4-store.c:1417
 msgid "Cannot unsubscribe from IMAP folders in offline mode."
 msgstr "Kan ikke fjerne abonnement på IMAP-mapper i frakoblet modus."
 
-#: camel/providers/imap4/camel-imap4-store.c:1405
+#: camel/providers/imap4/camel-imap4-store.c:1462
 #, c-format
 msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
 msgstr "Kan ikke avslutte abonnement på mappe «%s»: Ugyldig navn på postboks"
 
-#: camel/providers/imap4/camel-imap4-store.c:1410
+#: camel/providers/imap4/camel-imap4-store.c:1467
 #, c-format
 msgid "Cannot unsubscribe from folder `%s': Bad command"
 msgstr "Kan ikke avslutte abonnement på mappe «%s»: Ugyldig kommando"
 
-#: camel/providers/imap4/camel-imap4-summary.c:1297
+#: camel/providers/imap4/camel-imap4-summary.c:1497
 #, fuzzy
 msgid "Fetching envelopes for new messages"
 msgstr "Ser etter nye meldinger"
@@ -3974,7 +3980,7 @@ msgstr ""
 "Kunne ikke koble til POP-tjener %s.\n"
 "Feil ved oversending av brukernavn: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:644
+#: camel/providers/pop3/camel-pop3-store.c:645
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ingen slik mappe «%s»."
@@ -4295,18 +4301,18 @@ msgstr "QUIT-kommando feilet: %s"
 msgid "QUIT command failed"
 msgstr "QUIT-kommando feilet"
 
-#: libedataserverui/e-categories-dialog.c:90
+#: libedataserverui/e-categories-dialog.c:91
 msgid "Category Icon"
 msgstr "Ikon for kategori"
 
-#: libedataserverui/e-categories-dialog.c:236
+#: libedataserverui/e-categories-dialog.c:237
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
-msgstr ""
+msgstr "Det finnes allerede en kategori med navn «%s» i konfigurasjonen. Vennligst bruk et annet navn"
 
-#: libedataserverui/e-categories-dialog.c:391
+#: libedataserverui/e-categories-dialog.c:395
 msgid "Category"
 msgstr "Kategori"
 
@@ -4327,9 +4333,8 @@ msgid "Category _Name"
 msgstr "Navn på _kategori"
 
 #: libedataserverui/e-categories-dialog.glade.h:5
-#, fuzzy
 msgid "Item(s) belong to these _categories:"
-msgstr "Denne kontakten hører til disse kategoriene:"
+msgstr "Oppføring(er) hører til disse kategoriene:"
 
 #: libedataserverui/e-categories-dialog.glade.h:6
 msgid "_Available Categories:"
@@ -4343,27 +4348,43 @@ msgstr "R_ediger"
 msgid "categories"
 msgstr "kategorier"
 
-#: libedataserverui/e-name-selector-dialog.c:184
+#: libedataserverui/e-name-selector-dialog.c:197
 msgid "Select Contacts from Address Book"
 msgstr "Velg kontakter fra adresseboken"
 
 #: libedataserverui/e-name-selector-dialog.glade.h:1
-msgid "*"
-msgstr "*"
+msgid "\t\t\t\t\t\t"
+msgstr "\t\t\t\t\t\t"
 
 #: libedataserverui/e-name-selector-dialog.glade.h:2
-msgid "<b>Contacts</b>"
-msgstr "<b>Kontakter:</b> "
+msgid "*"
+msgstr "*"
 
 #: libedataserverui/e-name-selector-dialog.glade.h:3
 msgid "<b>Show Contacts</b>"
 msgstr "<b>Vis kontakter</b>"
 
 #: libedataserverui/e-name-selector-dialog.glade.h:4
+msgid "<b>_Contacts</b>"
+msgstr "<b>_Kontakter</b> "
+
+#: libedataserverui/e-name-selector-dialog.glade.h:5
+msgid "Address Book"
+msgstr "Adressebok"
+
+#: libedataserverui/e-name-selector-dialog.glade.h:6
 msgid "Address _Book:"
 msgstr "Adresse_bok:"
 
-#: libedataserverui/e-name-selector-dialog.glade.h:5
+#: libedataserverui/e-name-selector-dialog.glade.h:7
+msgid "Contacts"
+msgstr "Kontakter"
+
+#: libedataserverui/e-name-selector-dialog.glade.h:8
+msgid "Search"
+msgstr "Søk"
+
+#: libedataserverui/e-name-selector-dialog.glade.h:9
 msgid "_Search:"
 msgstr "_Søk:"
 
@@ -4384,7 +4405,11 @@ msgstr "Ugyldig tilkobling"
 msgid "Invalid response from server"
 msgstr "Ugyldig svar fra tjener"
 
-#: servers/groupwise/e-gw-connection.c:162
+#: servers/groupwise/e-gw-connection.c:158
+msgid "No response from the server"
+msgstr "Ingen svar fra tjener"
+
+#: servers/groupwise/e-gw-connection.c:164
 msgid "Bad parameter"
 msgstr "Ugyldig parameter"
 
@@ -4401,12 +4426,3 @@ msgstr "Evolution kalender- og webcalmotor"
 #, c-format
 msgid "Multiple segmentation faults occurred; can't display error dialog\n"
 msgstr "Flere minnesegmenteringsfeil oppsto; kan ikke vise feilinformasjon\n"
-
-#~ msgid "Post Office Agent:"
-#~ msgstr "Postkontoragent:"
-
-#~ msgid "Use Secure Connection (SSL)"
-#~ msgstr "Bruk sikker forbindelse (SSL)"
-
-#~ msgid "Evolution Addressbook file and LDAP backend"
-#~ msgstr "Evolution adressebok-komponent for fil og LDAP"
index e84dc57..5bd1373 100644 (file)
--- a/po/no.po
+++ b/po/no.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-19 00:25+0100\n"
-"PO-Revision-Date: 2005-01-19 00:36+0100\n"
+"POT-Creation-Date: 2005-01-28 16:50+0100\n"
+"PO-Revision-Date: 2005-01-28 16:55+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@@ -109,12 +109,14 @@ msgid "CORBA exception making \"%s\" call"
 msgstr "CORBA-unntak ved kall til «%s»"
 
 #: addressbook/libebook/e-book.c:2390
-msgid "e_book_cancel: there is no current operation"
-msgstr "e_book_cancel: ingen aktiv e-operasjon"
+#, c-format
+msgid "%s: there is no current operation"
+msgstr "%s: ingen aktiv operasjon"
 
 #: addressbook/libebook/e-book.c:2425
-msgid "e_book_cancel: couldn't cancel"
-msgstr "e_book_cancel: kunne ikke avbryte"
+#, c-format
+msgid "%s: couldn't cancel"
+msgstr "%s: kunne ikke avbryte"
 
 #: addressbook/libebook/e-book.c:2454 addressbook/libebook/e-book.c:2458
 #, c-format
@@ -122,21 +124,24 @@ msgid "\"%s\" on book after \"%s\""
 msgstr "«%s» i bok etter «%s»"
 
 #: addressbook/libebook/e-book.c:2524
-msgid "e_book_open: cancelled"
-msgstr "e_book_open: avbrutt"
+#, c-format
+msgid "%s: cancelled"
+msgstr "%s: avbrutt"
 
 #: addressbook/libebook/e-book.c:3066
-msgid "e_book_load_uri: Invalid source."
-msgstr "e_book_load_uri: Ugyldig kilde."
+#, c-format
+msgid "%s: Invalid source."
+msgstr "%s: Ugyldig kilde."
 
 #: addressbook/libebook/e-book.c:3074
 #, c-format
-msgid "e_book_load_uri: no factories available for uri `%s'"
-msgstr "e_book_load_uri: ingen fabrikker tilgjengelig for uri «%s»"
+msgid "%s: no factories available for uri `%s'"
+msgstr "%s: ingen fabrikker tilgjengelig for uri «%s»"
 
 #: addressbook/libebook/e-book.c:3086
-msgid "e_book_load_uri: Could not create EBookListener"
-msgstr "e_book_load_uri: Kunne ikke opprette EBookListener"
+#, c-format
+msgid "%s: Could not create EBookListener"
+msgstr "%s: Kunne ikke opprette EBookListener"
 
 #: addressbook/libebook/e-book.c:3138
 #, c-format
@@ -144,14 +149,14 @@ msgid "e_book_new: no factories available for uri `%s'"
 msgstr "e_book_new: ingen fabrikker tilgjengelig for uri «%s»"
 
 #: addressbook/libebook/e-book.c:3332
-msgid "e_book_get_self: there was no self contact uid stored in gconf"
-msgstr "e_book_get_self: ingen uid lagret i gconf for selvkontakt"
+#, c-format
+msgid "%s: there was no self contact uid stored in gconf"
+msgstr "%s: ingen uid lagret i gconf for egen kontakt"
 
 #: addressbook/libebook/e-book.c:3443
 #, c-format
-msgid ""
-"e_book_set_default_source: there was no source for uid `%s' stored in gconf."
-msgstr "e_book_set_default_source: ingen kilde lagret i gconf for uid «%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-contact.c:102
 msgid "Unique ID"
@@ -554,7 +559,7 @@ msgid "Category List"
 msgstr "Kategoriliste"
 
 #: addressbook/libebook/e-contact.c:224
-#: libedataserverui/e-categories-dialog.c:369
+#: libedataserverui/e-categories-dialog.c:370
 msgid "Categories"
 msgstr "Kategorier"
 
@@ -615,41 +620,42 @@ msgstr "Fødselsdag: %s"
 msgid "Anniversary: %s"
 msgstr "Bryllupsdag: %s"
 
-#: calendar/backends/file/e-cal-backend-file.c:182
+#: calendar/backends/file/e-cal-backend-file.c:192
 msgid "Can't save calendar data: Malformed URI."
 msgstr "Kan ikke lagre kalenderdata: Feil i URI."
 
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:484
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:496
 msgid "Invalid server URI"
 msgstr "Ugyldig URI for tjener"
 
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:531
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:534
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:543
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:546
 #: camel/providers/groupwise/camel-gw-listener.c:405
 #: camel/providers/groupwise/camel-gw-listener.c:435
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:541
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:784
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:553
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:796
 #: calendar/backends/http/e-cal-backend-http.c:484
 msgid "Could not create cache file"
 msgstr "Kunne ikke opprette bufferfil"
 
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:551
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:563
 msgid "Could not create thread for populating cache"
 msgstr "Kunne ikke opprette tråd for å populere buffer"
 
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:557
-#: calendar/libecal/e-cal.c:4560
-#: camel/providers/groupwise/camel-groupwise-folder.c:533
-#: camel/providers/groupwise/camel-groupwise-store.c:507
-#: camel/providers/groupwise/camel-groupwise-store.c:644
-#: camel/providers/groupwise/camel-groupwise-store.c:805
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:569
+#: calendar/libecal/e-cal.c:4507
+#: camel/providers/groupwise/camel-groupwise-folder.c:598
+#: camel/providers/groupwise/camel-groupwise-store.c:516
+#: camel/providers/groupwise/camel-groupwise-store.c:597
+#: camel/providers/groupwise/camel-groupwise-store.c:751
+#: camel/providers/groupwise/camel-groupwise-store.c:915
 msgid "Authentication failed"
 msgstr "Autentisering feilet"
 
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:776
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:788
 msgid "Repository is Offline"
 msgstr "Lageret er frakoblet"
 
@@ -811,87 +817,87 @@ msgid "Undefined"
 msgstr "Udefinert"
 
 #. actually ask the client for authentication
-#: calendar/libecal/e-cal.c:1590
+#: calendar/libecal/e-cal.c:1535
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Oppgi passord for %s (bruker %s)"
 
-#: calendar/libecal/e-cal.c:4532
+#: calendar/libecal/e-cal.c:4479
 msgid "Invalid argument"
 msgstr "Ugyldig argument"
 
-#: calendar/libecal/e-cal.c:4534
+#: calendar/libecal/e-cal.c:4481
 msgid "Backend is busy"
 msgstr "Motoren er opptatt"
 
-#: calendar/libecal/e-cal.c:4536
+#: calendar/libecal/e-cal.c:4483
 msgid "Repository is offline"
 msgstr "Lageret er frakoblet"
 
-#: calendar/libecal/e-cal.c:4538
+#: calendar/libecal/e-cal.c:4485
 msgid "No such calendar"
 msgstr "Ingen slik kalender"
 
-#: calendar/libecal/e-cal.c:4540 servers/groupwise/e-gw-connection.c:158
+#: calendar/libecal/e-cal.c:4487 servers/groupwise/e-gw-connection.c:160
 msgid "Object not found"
 msgstr "Objektet ble ikke funnet"
 
-#: calendar/libecal/e-cal.c:4542 servers/groupwise/e-gw-connection.c:154
+#: calendar/libecal/e-cal.c:4489 servers/groupwise/e-gw-connection.c:154
 msgid "Invalid object"
 msgstr "Ugyldig objekt"
 
-#: calendar/libecal/e-cal.c:4544
+#: calendar/libecal/e-cal.c:4491
 msgid "URI not loaded"
 msgstr "URI ble ikke lastet"
 
-#: calendar/libecal/e-cal.c:4546
+#: calendar/libecal/e-cal.c:4493
 msgid "URI already loaded"
 msgstr "URI allerede lastet"
 
-#: calendar/libecal/e-cal.c:4548
+#: calendar/libecal/e-cal.c:4495
 msgid "Permission denied"
 msgstr "Tilgang nektet"
 
-#: calendar/libecal/e-cal.c:4550 servers/groupwise/e-gw-connection.c:160
+#: calendar/libecal/e-cal.c:4497 servers/groupwise/e-gw-connection.c:162
 msgid "Unknown User"
 msgstr "Ukjent bruker"
 
-#: calendar/libecal/e-cal.c:4552
+#: calendar/libecal/e-cal.c:4499
 msgid "Object ID already exists"
 msgstr "Objekt-ID eksisterer allerede"
 
-#: calendar/libecal/e-cal.c:4554
+#: calendar/libecal/e-cal.c:4501
 msgid "Protocol not supported"
 msgstr "Protokollen er ikke støttet"
 
-#: calendar/libecal/e-cal.c:4556
+#: calendar/libecal/e-cal.c:4503
 msgid "Operation has been cancelled"
 msgstr "Operasjonen ble avbrutt"
 
-#: calendar/libecal/e-cal.c:4558
+#: calendar/libecal/e-cal.c:4505
 msgid "Could not cancel operation"
 msgstr "Kunne ikke avbryte operasjon"
 
-#: calendar/libecal/e-cal.c:4562
+#: calendar/libecal/e-cal.c:4509
 #: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication required"
 msgstr "Autentisering kreves"
 
-#: calendar/libecal/e-cal.c:4564
+#: calendar/libecal/e-cal.c:4511
 msgid "A CORBA exception has occurred"
 msgstr "Et CORBA-unntak har oppstått"
 
-#: calendar/libecal/e-cal.c:4566 camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-command.c:401
-#: camel/providers/imap4/camel-imap4-store.c:294
+#: calendar/libecal/e-cal.c:4513 camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-command.c:404
+#: camel/providers/imap4/camel-imap4-store.c:297
 #: camel/providers/pop3/camel-pop3-store.c:535
 #: camel/providers/pop3/camel-pop3-store.c:542
 #: camel/providers/pop3/camel-pop3-store.c:548
-#: servers/groupwise/e-gw-connection.c:166
+#: servers/groupwise/e-gw-connection.c:168
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
-#: calendar/libecal/e-cal.c:4568
+#: calendar/libecal/e-cal.c:4515
 msgid "No error"
 msgstr "Ingen feil"
 
@@ -1058,11 +1064,11 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "Re-synkroniserer med tjener"
 
-#: camel/camel-disco-folder.c:42 camel/camel-offline-folder.c:50
+#: camel/camel-disco-folder.c:42 camel/camel-offline-folder.c:51
 msgid "Copy folder content locally for offline operation"
 msgstr "Kopier mappeinnhold lokalt for frakoblet operasjon"
 
-#: camel/camel-disco-folder.c:104 camel/camel-offline-folder.c:107
+#: camel/camel-disco-folder.c:104 camel/camel-offline-folder.c:110
 msgid "Downloading new messages for offline mode"
 msgstr "Laster ned nye meldinger for frakoblet modus"
 
@@ -1246,7 +1252,7 @@ msgstr "Oppdaterer data om gyldige meldinger"
 msgid "Filtering new message(s)"
 msgstr "Filtrerer ny(e) melding(er)"
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:733
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1257,15 +1263,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:749
+#: camel/camel-gpg-context.c:747
 msgid "Failed to parse gpg userid hint."
 msgstr "Feil under tolking av hint for gpg brukerid."
 
-#: camel/camel-gpg-context.c:773
+#: camel/camel-gpg-context.c:771
 msgid "Failed to parse gpg passphrase request."
 msgstr "Kunne ikke tolke forespørsel på gpg-passordfrase."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:785
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1274,26 +1280,26 @@ msgstr ""
 "Du trenger et passord for å låse opp nøkkelen for\n"
 "bruker «%s»"
 
-#: camel/camel-gpg-context.c:804 camel/camel-gpg-context.c:1314
-#: camel/camel-gpg-context.c:1498 camel/camel-gpg-context.c:1589
-#: camel/camel-gpg-context.c:1701 camel/providers/nntp/camel-nntp-store.c:1274
+#: camel/camel-gpg-context.c:802 camel/camel-gpg-context.c:1312
+#: camel/camel-gpg-context.c:1496 camel/camel-gpg-context.c:1587
+#: camel/camel-gpg-context.c:1699 camel/providers/nntp/camel-nntp-store.c:1274
 msgid "Cancelled."
 msgstr "Avbrutt."
 
-#: camel/camel-gpg-context.c:822
+#: camel/camel-gpg-context.c:820
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Feil ved åpning av hemmelig nøkkel: 3 ugyldige passord oppgitt."
 
-#: camel/camel-gpg-context.c:828
+#: camel/camel-gpg-context.c:826
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Uventet svar fra GnuPG: %s"
 
-#: camel/camel-gpg-context.c:880
+#: camel/camel-gpg-context.c:878
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Kan ikke kryptere: Ingen gyldige mottakere spesifisert."
 
-#: camel/camel-gpg-context.c:1157
+#: camel/camel-gpg-context.c:1155
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -1304,74 +1310,74 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1162
+#: camel/camel-gpg-context.c:1160
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Feil under bruk av GPG på %s: %s\n"
 
-#: camel/camel-gpg-context.c:1275 camel/camel-smime-context.c:389
+#: camel/camel-gpg-context.c:1273 camel/camel-smime-context.c:389
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Kan ikke generere signeringsdata: %s"
 
-#: camel/camel-gpg-context.c:1307 camel/camel-gpg-context.c:1766
-#: camel/camel-gpg-context.c:1817
+#: camel/camel-gpg-context.c:1305 camel/camel-gpg-context.c:1764
+#: camel/camel-gpg-context.c:1815
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Feil ved kjøring av gpg: %s"
 
-#: camel/camel-gpg-context.c:1331 camel/camel-gpg-context.c:1491
-#: camel/camel-gpg-context.c:1582 camel/camel-gpg-context.c:1605
-#: camel/camel-gpg-context.c:1694 camel/camel-gpg-context.c:1718
-#: camel/camel-gpg-context.c:1788 camel/camel-gpg-context.c:1839
+#: camel/camel-gpg-context.c:1329 camel/camel-gpg-context.c:1489
+#: camel/camel-gpg-context.c:1580 camel/camel-gpg-context.c:1603
+#: camel/camel-gpg-context.c:1692 camel/camel-gpg-context.c:1716
+#: camel/camel-gpg-context.c:1786 camel/camel-gpg-context.c:1837
 msgid "Failed to execute gpg."
 msgstr "Feil ved kjøring av gpg."
 
-#: camel/camel-gpg-context.c:1350
+#: camel/camel-gpg-context.c:1348
 msgid "This is a digitally signed message part"
 msgstr "Dette er en digitalt signert meldingsdel"
 
-#: camel/camel-gpg-context.c:1431 camel/camel-gpg-context.c:1437
-#: camel/camel-gpg-context.c:1443 camel/camel-smime-context.c:692
+#: camel/camel-gpg-context.c:1429 camel/camel-gpg-context.c:1435
+#: camel/camel-gpg-context.c:1441 camel/camel-smime-context.c:692
 #: camel/camel-smime-context.c:703 camel/camel-smime-context.c:710
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Kunne ikke verifisere meldingens signatur: Ugyldig meldingsformat"
 
-#: camel/camel-gpg-context.c:1477
+#: camel/camel-gpg-context.c:1475
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Kunne ikke verifisere meldingens signatur: kunne ikke opprette midlertidig "
 "fil: %s"
 
-#: camel/camel-gpg-context.c:1565
+#: camel/camel-gpg-context.c:1563
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Kunne ikke generere krypteringsdata: %s"
 
-#: camel/camel-gpg-context.c:1623
+#: camel/camel-gpg-context.c:1621
 msgid "This is a digitally encrypted message part"
 msgstr "Dette er en digitalt kryptert meldingsdel"
 
-#: camel/camel-gpg-context.c:1674
+#: camel/camel-gpg-context.c:1672
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Feil under dekryptering av MIME-del: protokollfeil"
 
-#: camel/camel-gpg-context.c:1725 camel/camel-smime-context.c:966
+#: camel/camel-gpg-context.c:1723 camel/camel-smime-context.c:966
 msgid "Encrypted content"
 msgstr "Kryptert innhold"
 
-#: camel/camel-gpg-context.c:1744
+#: camel/camel-gpg-context.c:1742
 msgid "Unable to parse message content"
 msgstr "Kunne ikke lese meldingsinnhold"
 
-#: camel/camel-gpg-context.c:1767 camel/camel-gpg-context.c:1818
+#: camel/camel-gpg-context.c:1765 camel/camel-gpg-context.c:1816
 #: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1465
-#: camel/providers/imap4/camel-imap4-engine.c:1504
-#: camel/providers/imap4/camel-imap4-engine.c:1549
-#: camel/providers/imap4/camel-imap4-engine.c:1605
-#: camel/providers/imap4/camel-imap4-store.c:1250
+#: camel/providers/imap4/camel-imap4-engine.c:1470
+#: camel/providers/imap4/camel-imap4-engine.c:1509
+#: camel/providers/imap4/camel-imap4-engine.c:1554
+#: camel/providers/imap4/camel-imap4-engine.c:1610
+#: camel/providers/imap4/camel-imap4-store.c:1307
 #: camel/providers/imap4/camel-imap4-utils.c:575
 #: camel/providers/smtp/camel-smtp-transport.c:163
 #: camel/providers/smtp/camel-smtp-transport.c:218
@@ -1513,12 +1519,12 @@ msgstr "Navneoppslag feilet"
 msgid "Name lookup failed: %s"
 msgstr "Navneoppslag feilet: %s"
 
-#: camel/camel-offline-folder.c:250
+#: camel/camel-offline-folder.c:253
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "Synkroniserer meldinger i mappe «%s» til disk"
 
-#: camel/camel-offline-journal.c:140 camel/camel-offline-journal.c:163
+#: camel/camel-offline-journal.c:141 camel/camel-offline-journal.c:164
 #, c-format
 msgid "Cannot write offline journal for folder `%s': %s"
 msgstr "Kan ikke skrive journal for frakoblet tilstand for mappe «%s»: %s"
@@ -2306,8 +2312,8 @@ 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/groupwise/camel-groupwise-folder.c:104
-#: camel/providers/imap/camel-imap-folder.c:1979
+#: camel/providers/groupwise/camel-groupwise-folder.c:108
+#: camel/providers/imap/camel-imap-folder.c:1980
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2316,16 +2322,16 @@ msgstr ""
 "Kan ikke hente melding: %s\n"
 "  %s"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:104
-#: camel/providers/imap/camel-imap-folder.c:1979
+#: camel/providers/groupwise/camel-groupwise-folder.c:108
+#: camel/providers/imap/camel-imap-folder.c:1980
 #: camel/providers/local/camel-maildir-folder.c:245
 #: camel/providers/local/camel-mbox-folder.c:403
 #: camel/providers/local/camel-mh-folder.c:203
 msgid "No such message"
 msgstr "Ingen slik melding"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:120
-#: camel/providers/imap4/camel-imap4-folder.c:696
+#: camel/providers/groupwise/camel-groupwise-folder.c:123
+#: camel/providers/imap4/camel-imap4-folder.c:788
 #: camel/providers/nntp/camel-nntp-folder.c:157
 #: camel/providers/nntp/camel-nntp-folder.c:233
 #: camel/providers/nntp/camel-nntp-folder.c:372
@@ -2336,8 +2342,8 @@ msgstr "Ingen slik melding"
 msgid "User cancelled"
 msgstr "Bruker avbrøt"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:125
-#: camel/providers/imap4/camel-imap4-folder.c:701
+#: camel/providers/groupwise/camel-groupwise-folder.c:128
+#: camel/providers/imap4/camel-imap4-folder.c:793
 #: camel/providers/nntp/camel-nntp-folder.c:148
 #: camel/providers/nntp/camel-nntp-folder.c:150
 #: camel/providers/nntp/camel-nntp-folder.c:159
@@ -2350,43 +2356,42 @@ msgstr "Bruker avbrøt"
 msgid "Cannot get message %s: %s"
 msgstr "Kan ikke hente melding %s: %s"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:145
-#: camel/providers/imap4/camel-imap4-folder.c:719
+#: camel/providers/groupwise/camel-groupwise-folder.c:148
+#: camel/providers/imap4/camel-imap4-folder.c:811
 msgid "This message is not available in offline mode."
 msgstr "Denne meldingen er ikke tilgjengelig i frakoblet modus."
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:171
-#: camel/providers/groupwise/camel-groupwise-folder.c:272
+#: camel/providers/groupwise/camel-groupwise-folder.c:176
 msgid "Could not get message"
 msgstr "Kunne ikke hente melding"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:471
+#: camel/providers/groupwise/camel-groupwise-folder.c:516
 #: camel/providers/imap/camel-imap-folder.c:245
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Kunne ikke laste sammendrag for %s"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:685
+#: camel/providers/groupwise/camel-groupwise-folder.c:765
 #, c-format
 msgid "Cannot create message: %s"
 msgstr "Kan ikke opprette melding: %s"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:697
+#: camel/providers/groupwise/camel-groupwise-folder.c:777
 #, c-format
 msgid "Cannot append message to folder `%s': %s"
 msgstr "Kan ikke legge til melding i mappe «%s»: %s"
 
-#: camel/providers/groupwise/camel-groupwise-journal.c:240
+#: camel/providers/groupwise/camel-groupwise-journal.c:283
 #, c-format
 msgid "Cannot get folder container %s"
 msgstr "Kan ikke finne mappekontainer %s"
 
-#: camel/providers/groupwise/camel-groupwise-journal.c:328
+#: camel/providers/groupwise/camel-groupwise-journal.c:347
 #: camel/providers/imap4/camel-imap4-journal.c:320
 msgid "Cannot append message in offline mode: cache unavailable"
 msgstr "Kan ikke legge til melding i frakoblet modus: buffer ikke tilgjengelig"
 
-#: camel/providers/groupwise/camel-groupwise-journal.c:344
+#: camel/providers/groupwise/camel-groupwise-journal.c:363
 #: camel/providers/imap4/camel-imap4-journal.c:336
 #, c-format
 msgid "Cannot append message in offline mode: %s"
@@ -2453,69 +2458,68 @@ msgstr "Passord"
 #: camel/providers/groupwise/camel-groupwise-provider.c:104
 msgid ""
 "This option will connect to the GroupWise server using a plaintext password."
-msgstr "Dette valget vil la deg koble til en GroupWise-tjener med klartekst-passord."
+msgstr ""
+"Dette valget vil la deg koble til en GroupWise-tjener med klartekst-passord."
 
-#: camel/providers/groupwise/camel-groupwise-store.c:267
+#: camel/providers/groupwise/camel-groupwise-store.c:270
 msgid "Host or user not availbale in url"
 msgstr "Vert eller bruker ikke tilgjengelig i URL"
 
-#: camel/providers/groupwise/camel-groupwise-store.c:359
+#: camel/providers/groupwise/camel-groupwise-store.c:362
 #, c-format
 msgid "%sPlease enter the Groupwise password for %s@%s"
 msgstr "%sVennligst skriv inn GroupWise-passord for %s@%s"
 
-#: camel/providers/groupwise/camel-groupwise-store.c:373
+#: camel/providers/groupwise/camel-groupwise-store.c:376
 #: camel/providers/imap/camel-imap-store.c:1301
 msgid "You didn't enter a password."
 msgstr "Du skrev ikke inn et passord."
 
-#: camel/providers/groupwise/camel-groupwise-store.c:387
+#: camel/providers/groupwise/camel-groupwise-store.c:390
 msgid "Unable to authenticate to GroupWise server."
 msgstr "Kunne ikke autentisere mot GroupWise-tjener."
 
-#: camel/providers/groupwise/camel-groupwise-store.c:483
+#: camel/providers/groupwise/camel-groupwise-store.c:491
 #: camel/providers/imap/camel-imap-store.c:1852
 #: camel/providers/imap/camel-imap-store.c:2042
 #, c-format
 msgid "No such folder %s"
 msgstr "Mappen %s eksisterer ikke"
 
-#: camel/providers/groupwise/camel-groupwise-store.c:503
-#: camel/providers/imap/camel-imap-folder.c:2287
-#: camel/providers/imap/camel-imap-folder.c:2357
+#: camel/providers/groupwise/camel-groupwise-store.c:541
+#: camel/providers/groupwise/camel-groupwise-store.c:587
+#: camel/providers/imap/camel-imap-folder.c:2288
+#: camel/providers/imap/camel-imap-folder.c:2358
 msgid "Fetching summary information for new messages"
 msgstr "Henter sammendragsinformasjon for nye meldinger"
 
-#: camel/providers/groupwise/camel-groupwise-store.c:614
+#: camel/providers/groupwise/camel-groupwise-store.c:721
 msgid "Cannot get folder info in offline mode."
 msgstr "Kan ikke hente mappeinformasjon i frakoblet modus."
 
-#: camel/providers/groupwise/camel-groupwise-store.c:786
-#, fuzzy
+#: camel/providers/groupwise/camel-groupwise-store.c:896
 msgid "Cannot create GroupWise folders in offline mode."
-msgstr "Kan ikke opprette en mappe med dette navnet."
+msgstr "Kan ikke opprette GroupWise-mapper i frakoblet modus."
 
-#: camel/providers/groupwise/camel-groupwise-store.c:835
-#, fuzzy
+#: camel/providers/groupwise/camel-groupwise-store.c:945
 msgid "Cannot delete GroupWise folders in offline mode."
-msgstr "Kan ikke slette mappe «%s»: Spesiell mappe"
+msgstr "Kan ikke slette GroupWise-mapper i frakoblet modus."
 
-#: camel/providers/groupwise/camel-groupwise-store.c:878
-#, fuzzy
+#: camel/providers/groupwise/camel-groupwise-store.c:988
 msgid "Cannot rename GroupWise folders in offline mode."
-msgstr "Du kan ikke endre navn på en mappe på en nyhetstjener."
+msgstr "Du kan ikke endre navn på GroupWise-mapper i frakoblet modus."
 
-#: camel/providers/groupwise/camel-groupwise-store.c:884
-#, fuzzy, c-format
+#: camel/providers/groupwise/camel-groupwise-store.c:994
+#, c-format
 msgid "Cannot rename Groupwise folder `%s' to `%s'"
-msgstr "Kan ikke endre navn på mappe «%s» til «%s»: Ugyldig kommando"
+msgstr "Kan ikke endre navn på GroupWise-mappe «%s» til «%s»"
 
-#: camel/providers/groupwise/camel-groupwise-store.c:916
+#: camel/providers/groupwise/camel-groupwise-store.c:1026
 #, c-format
 msgid "GroupWise server %s"
 msgstr "GroupWise-tjener %s"
 
-#: camel/providers/groupwise/camel-groupwise-store.c:918
+#: camel/providers/groupwise/camel-groupwise-store.c:1028
 #, c-format
 msgid "GroupWise service for %s on %s"
 msgstr "GroupWise-tjeneste for %s på %s"
@@ -2553,7 +2557,7 @@ msgstr "Kunne ikke autentisere.\n"
 
 #: camel/providers/imap/camel-imap-command.c:219
 #: camel/providers/imap/camel-imap-command.c:258
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:463
 #: camel/providers/imap/camel-imap-store.c:3209
 msgid "Operation cancelled"
 msgstr "Operasjon avbrutt"
@@ -2565,7 +2569,8 @@ msgid "Server unexpectedly disconnected: %s"
 msgstr "Tjener koblet fra uventet: %s"
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:321
+#. we might get a ']' from a BAD response since we +12, but who cares?
+#: camel/providers/imap/camel-imap-command.c:324
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
@@ -2574,26 +2579,26 @@ msgstr ""
 "Melding fra IMAP-tjener %s@%s:\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-command.c:390
+#: camel/providers/imap/camel-imap-command.c:393
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Uventet svar fra IMAP-tjener: %s"
 
-#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap/camel-imap-command.c:403
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-kommando feilet: %s"
 
-#: camel/providers/imap/camel-imap-command.c:470
+#: camel/providers/imap/camel-imap-command.c:473
 msgid "Server response ended too soon."
 msgstr "Svar fra tjener ble avsluttet for tidlig."
 
-#: camel/providers/imap/camel-imap-command.c:675
+#: camel/providers/imap/camel-imap-command.c:678
 #, 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:711
+#: camel/providers/imap/camel-imap-command.c:714
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Uventet svar «OK» fra IMAP-tjener: %s"
@@ -2609,38 +2614,38 @@ msgstr "Mappen ble ødelagt og laget på nytt på tjeneren."
 
 #. Check UIDs and flags of all messages we already know of.
 #: camel/providers/imap/camel-imap-folder.c:573
-#: camel/providers/imap4/camel-imap4-summary.c:1272
+#: camel/providers/imap4/camel-imap4-summary.c:1472
 msgid "Scanning for changed messages"
 msgstr "Søker etter endrede meldinger"
 
-#: camel/providers/imap/camel-imap-folder.c:1939
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Kan ikke hente melding: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2021
-#: camel/providers/imap/camel-imap-folder.c:2623
+#: camel/providers/imap/camel-imap-folder.c:2022
+#: camel/providers/imap/camel-imap-folder.c:2624
 #: camel/providers/nntp/camel-nntp-folder.c:221
 msgid "This message is not currently available"
 msgstr "Denne meldingen er ikke tilgjengelig"
 
-#: camel/providers/imap/camel-imap-folder.c:2464
+#: camel/providers/imap/camel-imap-folder.c:2465
 #, 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:2472
+#: camel/providers/imap/camel-imap-folder.c:2473
 #, 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:2485
+#: camel/providers/imap/camel-imap-folder.c:2486
 #, c-format
 msgid ""
 "Unexpected server response: Identical UIDs provided for messages %d and %d"
 msgstr "Uferdig svar fra tjener: identiske UIDer oppgitt for melding %d og %d"
 
-#: camel/providers/imap/camel-imap-folder.c:2661
+#: camel/providers/imap/camel-imap-folder.c:2662
 msgid "Could not find message body in FETCH response."
 msgstr "Kunne ikke finne meldingskropp i FETCH-svar."
 
@@ -2721,11 +2726,11 @@ msgstr "Se kun etter søppelinnhold i nye meldin_ger i innboks"
 
 #: camel/providers/imap/camel-imap-provider.c:72
 #: camel/providers/imap4/camel-imap4-provider.c:57
-#, fuzzy
 msgid "Automatically synchroni_ze remote mail locally"
-msgstr "Synkroniser eksterne meldinger med lokale meldinger automatisk"
+msgstr "S_ynkroniser eksterne meldinger med lokale meldinger automatisk"
 
 #: camel/providers/imap/camel-imap-provider.c:79
+#: camel/providers/imap4/camel-imap4-provider.c:64
 msgid "IMAP"
 msgstr "IMAP"
 
@@ -2740,21 +2745,21 @@ msgstr ""
 "passord."
 
 #: camel/providers/imap/camel-imap-store.c:421
-#: camel/providers/imap4/camel-imap4-store.c:206
+#: camel/providers/imap4/camel-imap4-store.c:209
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP-tjener %s"
 
 #: camel/providers/imap/camel-imap-store.c:423
-#: camel/providers/imap4/camel-imap4-store.c:208
+#: camel/providers/imap4/camel-imap4-store.c:211
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP-tjeneste for %s på %s"
 
 #: camel/providers/imap/camel-imap-store.c:535
 #: camel/providers/imap/camel-imap-store.c:550
-#: camel/providers/imap4/camel-imap4-store.c:240
-#: camel/providers/imap4/camel-imap4-store.c:255
+#: camel/providers/imap4/camel-imap4-store.c:243
+#: camel/providers/imap4/camel-imap4-store.c:258
 #: camel/providers/nntp/camel-nntp-store.c:200
 #: camel/providers/nntp/camel-nntp-store.c:215
 #: camel/providers/pop3/camel-pop3-store.c:169
@@ -2766,7 +2771,7 @@ msgid "Could not connect to %s: %s"
 msgstr "Kunne ikke koble til %s: %s"
 
 #: camel/providers/imap/camel-imap-store.c:536
-#: camel/providers/imap4/camel-imap4-store.c:241
+#: camel/providers/imap4/camel-imap4-store.c:244
 #: camel/providers/nntp/camel-nntp-store.c:201
 #: camel/providers/pop3/camel-pop3-store.c:170
 #: camel/providers/smtp/camel-smtp-transport.c:258
@@ -2775,7 +2780,7 @@ msgstr "SSL er ikke tilgjengelig"
 
 #: camel/providers/imap/camel-imap-store.c:547
 #: camel/providers/imap/camel-imap-store.c:817
-#: camel/providers/imap4/camel-imap4-store.c:252
+#: camel/providers/imap4/camel-imap4-store.c:255
 #: camel/providers/nntp/camel-nntp-store.c:212
 #: camel/providers/nntp/camel-nntp-store.c:231
 #: camel/providers/pop3/camel-pop3-store.c:181
@@ -2786,9 +2791,9 @@ msgstr "Tilkobling avbrutt"
 #: camel/providers/imap/camel-imap-store.c:655
 #: camel/providers/imap/camel-imap-store.c:677
 #: camel/providers/imap/camel-imap-store.c:683
-#: camel/providers/imap4/camel-imap4-store.c:280
-#: camel/providers/imap4/camel-imap4-store.c:293
-#: camel/providers/imap4/camel-imap4-store.c:309
+#: camel/providers/imap4/camel-imap4-store.c:283
+#: camel/providers/imap4/camel-imap4-store.c:296
+#: camel/providers/imap4/camel-imap4-store.c:312
 #, 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"
@@ -2799,13 +2804,13 @@ msgid "STARTTLS not supported"
 msgstr "STARTTLS er ikke støttet"
 
 #: camel/providers/imap/camel-imap-store.c:678
-#: camel/providers/imap4/camel-imap4-store.c:281
+#: camel/providers/imap4/camel-imap4-store.c:284
 #: camel/providers/pop3/camel-pop3-store.c:246
 msgid "SSL negotiations failed"
 msgstr "SSL-forhandling feilet"
 
 #: camel/providers/imap/camel-imap-store.c:684
-#: camel/providers/imap4/camel-imap4-store.c:310
+#: camel/providers/imap4/camel-imap4-store.c:313
 #: camel/providers/pop3/camel-pop3-store.c:252
 #: camel/providers/smtp/camel-smtp-transport.c:365
 msgid "SSL is not available in this build"
@@ -2845,7 +2850,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-store.c:1870
 #: camel/providers/imap/camel-imap-store.c:2248
-#: camel/providers/imap4/camel-imap4-store.c:770
+#: camel/providers/imap4/camel-imap4-store.c:773
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -2869,13 +2874,13 @@ msgstr "Kan ikke opprette mappe «%s»: mappen eksisterer."
 msgid "Unknown parent folder: %s"
 msgstr "Ukjent opphavsmappe: %s"
 
-#: camel/providers/imap4/camel-imap4-command.c:551
-#: camel/providers/imap4/camel-imap4-command.c:558
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
 #, c-format
 msgid "Failed sending command to IMAP server %s: %s"
 msgstr "Feil under sending av kommando til IMAP-tjener %s: %s"
 
-#: camel/providers/imap4/camel-imap4-command.c:661
+#: camel/providers/imap4/camel-imap4-command.c:660
 #, c-format
 msgid "Unexpected response from IMAP4 server %s: %s"
 msgstr "Uventet svar fra IMAP4-tjener %s: %s"
@@ -2895,85 +2900,86 @@ msgstr "Kan ikke velge mappe «%s»: Ugyldig navn på postboks"
 msgid "Cannot select folder `%s': Bad command"
 msgstr "Kan ikke velge mappe «%s»: Ugyldig kommando"
 
-#: camel/providers/imap4/camel-imap4-engine.c:1464
-#: camel/providers/imap4/camel-imap4-engine.c:1503
-#: camel/providers/imap4/camel-imap4-engine.c:1548
-#: camel/providers/imap4/camel-imap4-engine.c:1604
+#: camel/providers/imap4/camel-imap4-engine.c:1469
+#: camel/providers/imap4/camel-imap4-engine.c:1508
+#: camel/providers/imap4/camel-imap4-engine.c:1553
+#: camel/providers/imap4/camel-imap4-engine.c:1609
 #, c-format
 msgid "IMAP4 server %s unexpectedly disconnected: %s"
 msgstr "IMAP4-tjener %s koblet fra uventet: %s"
 
-#: camel/providers/imap4/camel-imap4-folder.c:306
+#: camel/providers/imap4/camel-imap4-folder.c:85
+msgid ""
+"Enable Mailing-List detection required for some filter and vFolder rules"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:398
 #, c-format
 msgid "Cannot access folder `%s': %s"
 msgstr "Kan ikke aksessere mappe «%s»: %s"
 
-#: camel/providers/imap4/camel-imap4-folder.c:365
+#: camel/providers/imap4/camel-imap4-folder.c:457
 #, c-format
 msgid "Cannot sync flags to folder `%s': Unknown"
 msgstr "Kan ikke synkronisere flagg til mappe «%s»: Ukjent"
 
-#: camel/providers/imap4/camel-imap4-folder.c:371
+#: camel/providers/imap4/camel-imap4-folder.c:463
 #, c-format
 msgid "Cannot sync flags to folder `%s': Bad command"
 msgstr "Kan ikke synkronisere flagg til mappe «%s»: Ugyldig kommando"
 
-#: camel/providers/imap4/camel-imap4-folder.c:512
+#: camel/providers/imap4/camel-imap4-folder.c:604
 #, c-format
 msgid "Cannot expunge folder `%s': Unknown"
 msgstr "Kan ikke tømme mappe «%s»: Ukjent"
 
-#: camel/providers/imap4/camel-imap4-folder.c:517
+#: camel/providers/imap4/camel-imap4-folder.c:609
 #, c-format
 msgid "Cannot expunge folder `%s': Bad command"
 msgstr "Kan ikke tømme mappe «%s»: Ugyldig kommando"
 
-#: camel/providers/imap4/camel-imap4-folder.c:773
+#: camel/providers/imap4/camel-imap4-folder.c:865
 #, c-format
 msgid "Cannot get message %s from folder `%s': No such message"
 msgstr "Kan ikke hente melding %s fra mappe «%s»: Meldingen finnes ikke"
 
-#: camel/providers/imap4/camel-imap4-folder.c:778
+#: camel/providers/imap4/camel-imap4-folder.c:870
 #, c-format
 msgid "Cannot get message %s from folder `%s': Bad command"
 msgstr "Kan ikke hente melding: %s fra mappe «%s»: Ugyldig kommando"
 
-#: camel/providers/imap4/camel-imap4-folder.c:911
+#: camel/providers/imap4/camel-imap4-folder.c:1003
 #, c-format
 msgid "Cannot append message to folder `%s': Unknown error"
 msgstr "Kan ikke legge til melding i mappe «%s»: Ukjent feil"
 
-#: camel/providers/imap4/camel-imap4-folder.c:940
+#: camel/providers/imap4/camel-imap4-folder.c:1032
 #, c-format
 msgid "Cannot append message to folder `%s': Bad command"
 msgstr "Kan ikke legge til melding i mappe «%s»: Ugyldig kommando"
 
-#: camel/providers/imap4/camel-imap4-folder.c:1048
+#: camel/providers/imap4/camel-imap4-folder.c:1140
 #, c-format
 msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
 msgstr "Kan ikke flytte meldinger fra mappe «%s» til mappe «%s»: Ukjent"
 
-#: camel/providers/imap4/camel-imap4-folder.c:1052
+#: camel/providers/imap4/camel-imap4-folder.c:1144
 #, c-format
 msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
 msgstr "Kan ikke kopiere meldinger fra mappe «%s» til mappe «%s»: Ukjent"
 
-#: camel/providers/imap4/camel-imap4-folder.c:1060
+#: camel/providers/imap4/camel-imap4-folder.c:1152
 #, c-format
 msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
 msgstr ""
 "Kan ikke flytte meldinger fra mappe «%s» til mappe «%s»: Ugyldig kommando"
 
-#: camel/providers/imap4/camel-imap4-folder.c:1064
+#: camel/providers/imap4/camel-imap4-folder.c:1156
 #, c-format
 msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
 msgstr ""
 "Kan ikke kopiere meldinger fra mappe «%s» til mappe «%s»: Ugyldig kommando"
 
-#: camel/providers/imap4/camel-imap4-provider.c:64
-msgid "IMAPv4rev1"
-msgstr "IMAPv4rev1"
-
 #: camel/providers/imap4/camel-imap4-provider.c:66
 msgid "For reading and storing mail on IMAPv4rev1 servers."
 msgstr "For lesing og lagring av e-post på IMAPv4rev1-tjenere."
@@ -2985,7 +2991,7 @@ msgstr ""
 "Dette valget vil la deg koble til en IMAPv4rev1-tjener ved å bruke et "
 "klartekst-passord."
 
-#: camel/providers/imap4/camel-imap4-store.c:391
+#: camel/providers/imap4/camel-imap4-store.c:394
 #, c-format
 msgid ""
 "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
@@ -2993,113 +2999,113 @@ msgstr ""
 "Kunne ikke autentisere mot IMAP-tjener %s med bruk av "
 "autentiseringsmekanismen %s"
 
-#: camel/providers/imap4/camel-imap4-store.c:436
+#: camel/providers/imap4/camel-imap4-store.c:439
 #, c-format
 msgid "%sPlease enter the IMAP password for %s on host %s"
 msgstr "%sVennligst skriv inn IMAP-passord for %s på vert %s"
 
-#: camel/providers/imap4/camel-imap4-store.c:506
+#: camel/providers/imap4/camel-imap4-store.c:509
 #, c-format
 msgid "Cannot authenticate to IMAP server %s using %s"
 msgstr "Kan ikke autentisere mot IMAP-tjener %s med bruk av %s"
 
-#: camel/providers/imap4/camel-imap4-store.c:668
-#: camel/providers/imap4/camel-imap4-store.c:780
+#: camel/providers/imap4/camel-imap4-store.c:671
+#: camel/providers/imap4/camel-imap4-store.c:783
 msgid "Cannot create IMAP folders in offline mode."
 msgstr "Kan ikke opprette IMAP-mapper i frakoblet modus."
 
-#: camel/providers/imap4/camel-imap4-store.c:707
+#: camel/providers/imap4/camel-imap4-store.c:710
 #, c-format
 msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Finner ikke mappe «%s» på IMAP-tjener %s: Ukjent"
 
-#: camel/providers/imap4/camel-imap4-store.c:828
+#: camel/providers/imap4/camel-imap4-store.c:831
 #, c-format
 msgid "Cannot create folder `%s': Invalid mailbox name"
 msgstr "Kan ikke opprette mappe «%s»: Ugyldig navn på postboks"
 
-#: camel/providers/imap4/camel-imap4-store.c:834
+#: camel/providers/imap4/camel-imap4-store.c:837
 #, c-format
 msgid "Cannot create folder `%s': Bad command"
 msgstr "Kan ikke opprette mappe «%s»: Ugyldig kommando"
 
-#: camel/providers/imap4/camel-imap4-store.c:865
+#: camel/providers/imap4/camel-imap4-store.c:868
 #, c-format
 msgid "Cannot delete folder `%s': Special folder"
 msgstr "Kan ikke slette mappe «%s»: Spesiell mappe"
 
-#: camel/providers/imap4/camel-imap4-store.c:872
+#: camel/providers/imap4/camel-imap4-store.c:875
 msgid "Cannot delete IMAP folders in offline mode."
 msgstr "Kan ikke slette IMAP-mapper i frakoblet modus."
 
-#: camel/providers/imap4/camel-imap4-store.c:931
+#: camel/providers/imap4/camel-imap4-store.c:934
 #, c-format
 msgid "Cannot delete folder `%s': Invalid mailbox name"
 msgstr "Kan ikke slette mappe «%s»: Ugyldig navn på postboks"
 
-#: camel/providers/imap4/camel-imap4-store.c:936
+#: camel/providers/imap4/camel-imap4-store.c:939
 #, c-format
 msgid "Cannot delete folder `%s': Bad command"
 msgstr "Kan ikke slette mappe «%s»: Ugyldig kommando"
 
-#: camel/providers/imap4/camel-imap4-store.c:956
+#: camel/providers/imap4/camel-imap4-store.c:959
 #, c-format
 msgid "Cannot rename folder `%s' to `%s': Special folder"
 msgstr "Kan ikke endre navn på mappe «%s» til «%s»: Spesiell mappe"
 
-#: camel/providers/imap4/camel-imap4-store.c:963
+#: camel/providers/imap4/camel-imap4-store.c:966
 msgid "Cannot rename IMAP folders in offline mode."
 msgstr "Du kan ikke endre navn på IMAP-mapper i frakoblet modus."
 
-#: camel/providers/imap4/camel-imap4-store.c:994
+#: camel/providers/imap4/camel-imap4-store.c:997
 #, c-format
 msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
 msgstr "Kan ikke endre navn på mappe «%s» til «%s»: Ugyldig navn på postboks"
 
-#: camel/providers/imap4/camel-imap4-store.c:999
+#: camel/providers/imap4/camel-imap4-store.c:1002
 #, c-format
 msgid "Cannot rename folder `%s' to `%s': Bad command"
 msgstr "Kan ikke endre navn på mappe «%s» til «%s»: Ugyldig kommando"
 
-#: camel/providers/imap4/camel-imap4-store.c:1248
+#: camel/providers/imap4/camel-imap4-store.c:1305
 #, c-format
 msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
 msgstr ""
 "Kan ikke hente informasjon om %s for mønster «%s» på IMAP-tjener %s: %s"
 
-#: camel/providers/imap4/camel-imap4-store.c:1250
+#: camel/providers/imap4/camel-imap4-store.c:1307
 msgid "Bad command"
 msgstr "Ugyldig kommando"
 
-#: camel/providers/imap4/camel-imap4-store.c:1288
+#: camel/providers/imap4/camel-imap4-store.c:1345
 msgid "Cannot subscribe to IMAP folders in offline mode."
 msgstr "Kan ikke abonnere på IMAP-mapper i frakoblet modus."
 
-#: camel/providers/imap4/camel-imap4-store.c:1333
+#: camel/providers/imap4/camel-imap4-store.c:1390
 #, c-format
 msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
 msgstr "Kan ikke abonnere på mappe «%s»: Ugyldig navn på postboks"
 
-#: camel/providers/imap4/camel-imap4-store.c:1338
+#: camel/providers/imap4/camel-imap4-store.c:1395
 #, c-format
 msgid "Cannot subscribe to folder `%s': Bad command"
 msgstr "Kan ikke abonnere på mappe «%s»: Ugyldig kommando"
 
-#: camel/providers/imap4/camel-imap4-store.c:1360
+#: camel/providers/imap4/camel-imap4-store.c:1417
 msgid "Cannot unsubscribe from IMAP folders in offline mode."
 msgstr "Kan ikke fjerne abonnement på IMAP-mapper i frakoblet modus."
 
-#: camel/providers/imap4/camel-imap4-store.c:1405
+#: camel/providers/imap4/camel-imap4-store.c:1462
 #, c-format
 msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
 msgstr "Kan ikke avslutte abonnement på mappe «%s»: Ugyldig navn på postboks"
 
-#: camel/providers/imap4/camel-imap4-store.c:1410
+#: camel/providers/imap4/camel-imap4-store.c:1467
 #, c-format
 msgid "Cannot unsubscribe from folder `%s': Bad command"
 msgstr "Kan ikke avslutte abonnement på mappe «%s»: Ugyldig kommando"
 
-#: camel/providers/imap4/camel-imap4-summary.c:1297
+#: camel/providers/imap4/camel-imap4-summary.c:1497
 #, fuzzy
 msgid "Fetching envelopes for new messages"
 msgstr "Ser etter nye meldinger"
@@ -3974,7 +3980,7 @@ msgstr ""
 "Kunne ikke koble til POP-tjener %s.\n"
 "Feil ved oversending av brukernavn: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:644
+#: camel/providers/pop3/camel-pop3-store.c:645
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ingen slik mappe «%s»."
@@ -4295,18 +4301,18 @@ msgstr "QUIT-kommando feilet: %s"
 msgid "QUIT command failed"
 msgstr "QUIT-kommando feilet"
 
-#: libedataserverui/e-categories-dialog.c:90
+#: libedataserverui/e-categories-dialog.c:91
 msgid "Category Icon"
 msgstr "Ikon for kategori"
 
-#: libedataserverui/e-categories-dialog.c:236
+#: libedataserverui/e-categories-dialog.c:237
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
-msgstr ""
+msgstr "Det finnes allerede en kategori med navn «%s» i konfigurasjonen. Vennligst bruk et annet navn"
 
-#: libedataserverui/e-categories-dialog.c:391
+#: libedataserverui/e-categories-dialog.c:395
 msgid "Category"
 msgstr "Kategori"
 
@@ -4327,9 +4333,8 @@ msgid "Category _Name"
 msgstr "Navn på _kategori"
 
 #: libedataserverui/e-categories-dialog.glade.h:5
-#, fuzzy
 msgid "Item(s) belong to these _categories:"
-msgstr "Denne kontakten hører til disse kategoriene:"
+msgstr "Oppføring(er) hører til disse kategoriene:"
 
 #: libedataserverui/e-categories-dialog.glade.h:6
 msgid "_Available Categories:"
@@ -4343,27 +4348,43 @@ msgstr "R_ediger"
 msgid "categories"
 msgstr "kategorier"
 
-#: libedataserverui/e-name-selector-dialog.c:184
+#: libedataserverui/e-name-selector-dialog.c:197
 msgid "Select Contacts from Address Book"
 msgstr "Velg kontakter fra adresseboken"
 
 #: libedataserverui/e-name-selector-dialog.glade.h:1
-msgid "*"
-msgstr "*"
+msgid "\t\t\t\t\t\t"
+msgstr "\t\t\t\t\t\t"
 
 #: libedataserverui/e-name-selector-dialog.glade.h:2
-msgid "<b>Contacts</b>"
-msgstr "<b>Kontakter:</b> "
+msgid "*"
+msgstr "*"
 
 #: libedataserverui/e-name-selector-dialog.glade.h:3
 msgid "<b>Show Contacts</b>"
 msgstr "<b>Vis kontakter</b>"
 
 #: libedataserverui/e-name-selector-dialog.glade.h:4
+msgid "<b>_Contacts</b>"
+msgstr "<b>_Kontakter</b> "
+
+#: libedataserverui/e-name-selector-dialog.glade.h:5
+msgid "Address Book"
+msgstr "Adressebok"
+
+#: libedataserverui/e-name-selector-dialog.glade.h:6
 msgid "Address _Book:"
 msgstr "Adresse_bok:"
 
-#: libedataserverui/e-name-selector-dialog.glade.h:5
+#: libedataserverui/e-name-selector-dialog.glade.h:7
+msgid "Contacts"
+msgstr "Kontakter"
+
+#: libedataserverui/e-name-selector-dialog.glade.h:8
+msgid "Search"
+msgstr "Søk"
+
+#: libedataserverui/e-name-selector-dialog.glade.h:9
 msgid "_Search:"
 msgstr "_Søk:"
 
@@ -4384,7 +4405,11 @@ msgstr "Ugyldig tilkobling"
 msgid "Invalid response from server"
 msgstr "Ugyldig svar fra tjener"
 
-#: servers/groupwise/e-gw-connection.c:162
+#: servers/groupwise/e-gw-connection.c:158
+msgid "No response from the server"
+msgstr "Ingen svar fra tjener"
+
+#: servers/groupwise/e-gw-connection.c:164
 msgid "Bad parameter"
 msgstr "Ugyldig parameter"
 
@@ -4401,12 +4426,3 @@ msgstr "Evolution kalender- og webcalmotor"
 #, c-format
 msgid "Multiple segmentation faults occurred; can't display error dialog\n"
 msgstr "Flere minnesegmenteringsfeil oppsto; kan ikke vise feilinformasjon\n"
-
-#~ msgid "Post Office Agent:"
-#~ msgstr "Postkontoragent:"
-
-#~ msgid "Use Secure Connection (SSL)"
-#~ msgstr "Bruk sikker forbindelse (SSL)"
-
-#~ msgid "Evolution Addressbook file and LDAP backend"
-#~ msgstr "Evolution adressebok-komponent for fil og LDAP"