Updated Norwegian (bokmål) translation.

2001-04-04  Kjartan Maraas  <kmaraas@gnome.org>

	* no.po: Updated Norwegian (bokmål) translation.

svn path=/trunk/; revision=9189

3 files changed, 1748 insertions, 1499 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 711b5b6791..cf2b83451e 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-04  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* no.po: Updated Norwegian (bokmål) translation.
+	
 2001-04-04  Fatih Demir <kabalak@gtranslator.org>
 
 	* tr.po: Committed updated Turkish translation
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7169e659b8..197806de9a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -153,6 +153,7 @@ mail/GNOME_Evolution_Mail.oaf.in
 mail/local-config.glade
 mail/mail-accounts.c
 mail/mail-account-editor.c
+mail/mail-account-gui.c
 mail/mail-autofilter.c
 mail/mail-callbacks.c
 mail/mail-config.c
diff --git a/po/no.po b/po/no.po
index 8343776f9c..558bbb386f 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,19 +5,19 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.8\n"
-"POT-Creation-Date: 2001-03-20 18:06-0500\n"
-"PO-Revision-Date: 2001-03-20 18:09-05:00\n"
+"POT-Creation-Date: 2001-04-04 22:57-0400\n"
+"PO-Revision-Date: 2001-04-04 23:01-04:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3255
+#: addressbook/backend/ebook/e-card.c:3269
 msgid "Card: "
 msgstr "Kort: "
 
-#: addressbook/backend/ebook/e-card.c:3257
+#: addressbook/backend/ebook/e-card.c:3271
 msgid ""
 "\n"
 "Name: "
@@ -25,7 +25,7 @@ msgstr ""
 "\n"
 "Navn:"
 
-#: addressbook/backend/ebook/e-card.c:3258
+#: addressbook/backend/ebook/e-card.c:3272
 msgid ""
 "\n"
 "  Prefix:     "
@@ -33,7 +33,7 @@ msgstr ""
 "\n"
 "Prefiks:    "
 
-#: addressbook/backend/ebook/e-card.c:3259
+#: addressbook/backend/ebook/e-card.c:3273
 msgid ""
 "\n"
 "  Given:      "
@@ -41,7 +41,7 @@ msgstr ""
 "\n"
 "Oppgitt:     "
 
-#: addressbook/backend/ebook/e-card.c:3260
+#: addressbook/backend/ebook/e-card.c:3274
 msgid ""
 "\n"
 "  Additional: "
@@ -49,7 +49,7 @@ msgstr ""
 "\n"
 "Tillegg: "
 
-#: addressbook/backend/ebook/e-card.c:3261
+#: addressbook/backend/ebook/e-card.c:3275
 msgid ""
 "\n"
 "  Family:     "
@@ -57,7 +57,7 @@ msgstr ""
 "\n"
 "Familie:    "
 
-#: addressbook/backend/ebook/e-card.c:3262
+#: addressbook/backend/ebook/e-card.c:3276
 msgid ""
 "\n"
 "  Suffix:     "
@@ -65,7 +65,7 @@ msgstr ""
 "\n"
 "Suffiks:    "
 
-#: addressbook/backend/ebook/e-card.c:3276
+#: addressbook/backend/ebook/e-card.c:3290
 msgid ""
 "\n"
 "Birth Date: "
@@ -73,7 +73,7 @@ msgstr ""
 "\n"
 "Fødselsdato: "
 
-#: addressbook/backend/ebook/e-card.c:3287
+#: addressbook/backend/ebook/e-card.c:3301
 msgid ""
 "\n"
 "Address:"
@@ -81,7 +81,7 @@ msgstr ""
 "\n"
 "Adresse:"
 
-#: addressbook/backend/ebook/e-card.c:3289
+#: addressbook/backend/ebook/e-card.c:3303
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -89,7 +89,7 @@ msgstr ""
 "\n"
 "Postboks:  "
 
-#: addressbook/backend/ebook/e-card.c:3290
+#: addressbook/backend/ebook/e-card.c:3304
 msgid ""
 "\n"
 "  Ext:         "
@@ -97,7 +97,7 @@ msgstr ""
 "\n"
 "Linje:         "
 
-#: addressbook/backend/ebook/e-card.c:3291
+#: addressbook/backend/ebook/e-card.c:3305
 msgid ""
 "\n"
 "  Street:      "
@@ -105,7 +105,7 @@ msgstr ""
 "\n"
 "Gate:     "
 
-#: addressbook/backend/ebook/e-card.c:3292
+#: addressbook/backend/ebook/e-card.c:3306
 msgid ""
 "\n"
 "  City:        "
@@ -113,7 +113,7 @@ msgstr ""
 "\n"
 "By:          "
 
-#: addressbook/backend/ebook/e-card.c:3293
+#: addressbook/backend/ebook/e-card.c:3307
 msgid ""
 "\n"
 "  Region:      "
@@ -121,7 +121,7 @@ msgstr ""
 "\n"
 "Region:     "
 
-#: addressbook/backend/ebook/e-card.c:3294
+#: addressbook/backend/ebook/e-card.c:3308
 msgid ""
 "\n"
 "  Postal Code: "
@@ -129,7 +129,7 @@ msgstr ""
 "\n"
 "Postnummer: "
 
-#: addressbook/backend/ebook/e-card.c:3295
+#: addressbook/backend/ebook/e-card.c:3309
 msgid ""
 "\n"
 "  Country:     "
@@ -137,7 +137,7 @@ msgstr ""
 "\n"
 "Land:    "
 
-#: addressbook/backend/ebook/e-card.c:3308
+#: addressbook/backend/ebook/e-card.c:3322
 msgid ""
 "\n"
 "Delivery Label: "
@@ -145,7 +145,7 @@ msgstr ""
 "\n"
 "Leveringsetikett: "
 
-#: addressbook/backend/ebook/e-card.c:3320
+#: addressbook/backend/ebook/e-card.c:3334
 msgid ""
 "\n"
 "Telephones:\n"
@@ -153,7 +153,7 @@ msgstr ""
 "\n"
 "Telefoner:\n"
 
-#: addressbook/backend/ebook/e-card.c:3323
+#: addressbook/backend/ebook/e-card.c:3337
 msgid ""
 "\n"
 "Telephone:"
@@ -161,7 +161,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3347
+#: addressbook/backend/ebook/e-card.c:3361
 msgid ""
 "\n"
 "E-mail:\n"
@@ -169,7 +169,7 @@ msgstr ""
 "\n"
 "E-post:\n"
 
-#: addressbook/backend/ebook/e-card.c:3350
+#: addressbook/backend/ebook/e-card.c:3364
 msgid ""
 "\n"
 "E-mail:"
@@ -177,7 +177,7 @@ msgstr ""
 "\n"
 "E-post:"
 
-#: addressbook/backend/ebook/e-card.c:3369
+#: addressbook/backend/ebook/e-card.c:3383
 msgid ""
 "\n"
 "Mailer: "
@@ -185,7 +185,7 @@ msgstr ""
 "\n"
 "E-post program: "
 
-#: addressbook/backend/ebook/e-card.c:3375
+#: addressbook/backend/ebook/e-card.c:3389
 msgid ""
 "\n"
 "Time Zone: "
@@ -193,7 +193,7 @@ msgstr ""
 "\n"
 "Tidssone: "
 
-#: addressbook/backend/ebook/e-card.c:3383
+#: addressbook/backend/ebook/e-card.c:3397
 msgid ""
 "\n"
 "Geo Location: "
@@ -201,7 +201,7 @@ msgstr ""
 "\n"
 "Geografisk lokasjon: "
 
-#: addressbook/backend/ebook/e-card.c:3387
+#: addressbook/backend/ebook/e-card.c:3401
 msgid ""
 "\n"
 "Business Role: "
@@ -209,7 +209,7 @@ msgstr ""
 "\n"
 "Stilling: "
 
-#: addressbook/backend/ebook/e-card.c:3399
+#: addressbook/backend/ebook/e-card.c:3413
 msgid ""
 "\n"
 "Org: "
@@ -217,7 +217,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3400
+#: addressbook/backend/ebook/e-card.c:3414
 msgid ""
 "\n"
 "  Name:  "
@@ -225,7 +225,7 @@ msgstr ""
 "\n"
 "Navn:  "
 
-#: addressbook/backend/ebook/e-card.c:3401
+#: addressbook/backend/ebook/e-card.c:3415
 msgid ""
 "\n"
 "  Unit:  "
@@ -233,7 +233,7 @@ msgstr ""
 "\n"
 "Enhet:  "
 
-#: addressbook/backend/ebook/e-card.c:3402
+#: addressbook/backend/ebook/e-card.c:3416
 msgid ""
 "\n"
 "  Unit2: "
@@ -241,7 +241,7 @@ msgstr ""
 "\n"
 "Enhet2: "
 
-#: addressbook/backend/ebook/e-card.c:3403
+#: addressbook/backend/ebook/e-card.c:3417
 msgid ""
 "\n"
 "  Unit3: "
@@ -249,7 +249,7 @@ msgstr ""
 "\n"
 "Enhet3: "
 
-#: addressbook/backend/ebook/e-card.c:3404
+#: addressbook/backend/ebook/e-card.c:3418
 msgid ""
 "\n"
 "  Unit4: "
@@ -257,7 +257,7 @@ msgstr ""
 "\n"
 "Enhet4: "
 
-#: addressbook/backend/ebook/e-card.c:3408
+#: addressbook/backend/ebook/e-card.c:3422
 msgid ""
 "\n"
 "Categories: "
@@ -265,7 +265,7 @@ msgstr ""
 "\n"
 "Kategorier: "
 
-#: addressbook/backend/ebook/e-card.c:3409
+#: addressbook/backend/ebook/e-card.c:3423
 msgid ""
 "\n"
 "Comment: "
@@ -283,7 +283,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3422
+#: addressbook/backend/ebook/e-card.c:3436
 msgid ""
 "\n"
 "Unique String: "
@@ -291,7 +291,7 @@ msgstr ""
 "\n"
 "Unik streng: "
 
-#: addressbook/backend/ebook/e-card.c:3425
+#: addressbook/backend/ebook/e-card.c:3439
 msgid ""
 "\n"
 "Public Key: "
@@ -307,15 +307,15 @@ msgstr "Factory for import av GnomeCard-filer til Evolution."
 msgid "Imports GnomeCard files into Evolution."
 msgstr "Importerer GnomeCard-filer til Evolution."
 
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:15
-#: addressbook/backend/ebook/load-pine-addressbook.c:16
-#: addressbook/backend/ebook/test-client-list.c:22
-#: addressbook/backend/ebook/test-client.c:28
+#: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
+#: addressbook/backend/ebook/load-pine-addressbook.c:22
+#: addressbook/backend/ebook/test-client-list.c:23
+#: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1089
-#: addressbook/gui/component/addressbook-factory.c:42
+#: addressbook/gui/component/addressbook-factory.c:43
 #: calendar/conduits/calendar/calendar-conduit.c:1151
 #: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:72 calendar/gui/main.c:54
+#: calendar/gui/alarm-notify/notify-main.c:72 calendar/gui/main.c:57
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initialisere Bonobo"
 
@@ -348,7 +348,7 @@ msgstr "Kunne ikke lese pilotens adresseapplikasjonsblokk"
 #: addressbook/gui/component/addressbook-config.glade.h:1
 #: calendar/gui/e-meeting-dialog.glade.h:1
 #: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:7
 msgid "Add"
 msgstr "Legg til"
 
@@ -389,7 +389,6 @@ msgstr "Lagre som:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:10
 #: executive-summary/component/executive-summary-config.glade.h:3
-#: mail/mail-config.glade.h:27
 msgid "General"
 msgstr "Generelt"
 
@@ -406,7 +405,7 @@ msgid "Phone Types"
 msgstr "Telefontyper"
 
 #: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/contact-editor/e-contact-editor.c:1283
 msgid "Primary Email"
 msgstr "Primær e-post"
 
@@ -419,7 +418,7 @@ msgid "Web page address:"
 msgstr "Hjemmeside-adresse:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:74
 msgid "_Add"
 msgstr "_Legg til"
 
@@ -444,8 +443,8 @@ msgid "_Company:"
 msgstr "_Firma:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:80 ui/evolution-event-editor.xml.h:57
-#: ui/evolution-mail.xml.h:57 ui/evolution-task-editor-dialog.xml.h:69
+#: mail/mail-config.glade.h:75 ui/evolution-event-editor.xml.h:57
+#: ui/evolution-mail.xml.h:60 ui/evolution-task-editor-dialog.xml.h:69
 msgid "_Delete"
 msgstr "_Slett"
 
@@ -497,126 +496,126 @@ msgstr "De_tte er postadressen"
 msgid "Delete Contact?"
 msgstr "Slett kontakt?"
 
-#: addressbook/contact-editor/e-contact-editor.c:592
+#: addressbook/contact-editor/e-contact-editor.c:602
 msgid "This contact belongs to these categories:"
 msgstr "Denne kontakten hører til disse kategoriene:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1231
-#: addressbook/gui/widgets/e-addressbook-view.c:626
+#: addressbook/contact-editor/e-contact-editor.c:1241
+#: addressbook/gui/widgets/e-addressbook-view.c:631
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/contact-editor/e-contact-editor.c:1232
-#: addressbook/contact-editor/e-contact-editor.c:1299
-#: addressbook/gui/widgets/e-addressbook-view.c:606
+#: addressbook/contact-editor/e-contact-editor.c:1242
+#: addressbook/contact-editor/e-contact-editor.c:1309
+#: addressbook/gui/widgets/e-addressbook-view.c:611
 msgid "Business"
 msgstr "Arbeid"
 
-#: addressbook/contact-editor/e-contact-editor.c:1233
-#: addressbook/gui/widgets/e-addressbook-view.c:613
+#: addressbook/contact-editor/e-contact-editor.c:1243
+#: addressbook/gui/widgets/e-addressbook-view.c:618
 msgid "Business 2"
 msgstr "Arbeid 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1234
-#: addressbook/gui/widgets/e-addressbook-view.c:611
+#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/widgets/e-addressbook-view.c:616
 msgid "Business Fax"
 msgstr "Faks på arbeid"
 
-#: addressbook/contact-editor/e-contact-editor.c:1235
+#: addressbook/contact-editor/e-contact-editor.c:1245
 msgid "Callback"
 msgstr "Tilbakering"
 
-#: addressbook/contact-editor/e-contact-editor.c:1236
-#: addressbook/gui/widgets/e-addressbook-view.c:610
+#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/gui/widgets/e-addressbook-view.c:615
 msgid "Car"
 msgstr "Bil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1237
+#: addressbook/contact-editor/e-contact-editor.c:1247
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/contact-editor/e-contact-editor.c:1238
-#: addressbook/contact-editor/e-contact-editor.c:1300
-#: addressbook/gui/widgets/e-addressbook-view.c:607
+#: addressbook/contact-editor/e-contact-editor.c:1248
+#: addressbook/contact-editor/e-contact-editor.c:1310
+#: addressbook/gui/widgets/e-addressbook-view.c:612
 msgid "Home"
 msgstr "Hjemme"
 
-#: addressbook/contact-editor/e-contact-editor.c:1239
-#: addressbook/gui/widgets/e-addressbook-view.c:614
+#: addressbook/contact-editor/e-contact-editor.c:1249
+#: addressbook/gui/widgets/e-addressbook-view.c:619
 msgid "Home 2"
 msgstr "Hjemme 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1240
-#: addressbook/gui/widgets/e-addressbook-view.c:612
+#: addressbook/contact-editor/e-contact-editor.c:1250
+#: addressbook/gui/widgets/e-addressbook-view.c:617
 msgid "Home Fax"
 msgstr "Faks hjemme"
 
-#: addressbook/contact-editor/e-contact-editor.c:1241
-#: addressbook/gui/widgets/e-addressbook-view.c:615
+#: addressbook/contact-editor/e-contact-editor.c:1251
+#: addressbook/gui/widgets/e-addressbook-view.c:620
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/gui/widgets/e-addressbook-view.c:609
+#: addressbook/contact-editor/e-contact-editor.c:1252
+#: addressbook/gui/widgets/e-addressbook-view.c:614
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/contact-editor/e-contact-editor.c:1301
-#: addressbook/gui/widgets/e-addressbook-view.c:616
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:46
+#: addressbook/contact-editor/e-contact-editor.c:1253
+#: addressbook/contact-editor/e-contact-editor.c:1311
+#: addressbook/gui/widgets/e-addressbook-view.c:621
+#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:40
 msgid "Other"
 msgstr "Annet"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/contact-editor/e-contact-editor.c:1254
 msgid "Other Fax"
 msgstr "Annen faks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:617
+#: addressbook/contact-editor/e-contact-editor.c:1255
+#: addressbook/gui/widgets/e-addressbook-view.c:622
 msgid "Pager"
 msgstr "Personsøker"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
-#: addressbook/gui/widgets/e-addressbook-view.c:605
+#: addressbook/contact-editor/e-contact-editor.c:1256
+#: addressbook/gui/widgets/e-addressbook-view.c:610
 msgid "Primary"
 msgstr "Primær"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/contact-editor/e-contact-editor.c:1257
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
+#: addressbook/contact-editor/e-contact-editor.c:1258
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
+#: addressbook/contact-editor/e-contact-editor.c:1259
 msgid "TTY/TDD"
 msgstr "TTY/TTD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1274
-#: addressbook/gui/widgets/e-addressbook-view.c:618
+#: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/gui/widgets/e-addressbook-view.c:623
 msgid "Email 2"
 msgstr "E-post 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1275
-#: addressbook/gui/widgets/e-addressbook-view.c:619
+#: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/widgets/e-addressbook-view.c:624
 msgid "Email 3"
 msgstr "E-post 3"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:220
+#: addressbook/contact-editor/e-contact-quick-add.c:223
 msgid "Contact Quick-Add"
 msgstr "Hurtigkontakt"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:222
+#: addressbook/contact-editor/e-contact-quick-add.c:225
 msgid "Edit Full"
 msgstr "Rediger alt"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:259
+#: addressbook/contact-editor/e-contact-quick-add.c:262
 msgid "Full Name"
 msgstr "Fullt navn"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:265
+#: addressbook/contact-editor/e-contact-quick-add.c:268
 msgid "E-mail"
 msgstr "E-post"
 
@@ -732,25 +731,25 @@ msgstr "_Suffiks:"
 msgid "_Title:"
 msgstr "_Tittel:"
 
-#: addressbook/gui/component/addressbook.c:240
+#: addressbook/gui/component/addressbook.c:241
 msgid "As _Minicards"
 msgstr "Som _minikort"
 
-#: addressbook/gui/component/addressbook.c:246
+#: addressbook/gui/component/addressbook.c:247
 #: ui/evolution-addressbook.xml.h:1
 msgid "As _Table"
 msgstr "Som _tabell"
 
-#: addressbook/gui/component/addressbook.c:415
+#: addressbook/gui/component/addressbook.c:399
 #, c-format
 msgid "Enter password for %s"
 msgstr "Skriv inn passord for %s"
 
-#: addressbook/gui/component/addressbook.c:443
+#: addressbook/gui/component/addressbook.c:427
 msgid "Unable to open addressbook"
 msgstr "Kunne ikke åpne adresseboken"
 
-#: addressbook/gui/component/addressbook.c:448
+#: addressbook/gui/component/addressbook.c:432
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -771,31 +770,31 @@ msgstr ""
 "installere OpenLDAP, deretter må du kompilere og\n"
 "installere Evolution på nytt.\n"
 
-#: addressbook/gui/component/addressbook.c:571
+#: addressbook/gui/component/addressbook.c:555
 msgid "Show All"
 msgstr "Vis alle"
 
-#: addressbook/gui/component/addressbook.c:573
+#: addressbook/gui/component/addressbook.c:557
 msgid "Advanced..."
 msgstr "Avansert..."
 
-#: addressbook/gui/component/addressbook.c:603
+#: addressbook/gui/component/addressbook.c:587
 msgid "Any field contains"
 msgstr "Et felt inneholder"
 
-#: addressbook/gui/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:588
 msgid "Name contains"
 msgstr "Navn inneholder"
 
-#: addressbook/gui/component/addressbook.c:605
+#: addressbook/gui/component/addressbook.c:589
 msgid "Email contains"
 msgstr "E-post inneholder"
 
-#: addressbook/gui/component/addressbook.c:748
+#: addressbook/gui/component/addressbook.c:732
 msgid "The URI that the Folder Browser will display"
 msgstr "URIen som mappeutforskeren vil vise"
 
-#: addressbook/gui/component/addressbook-storage.c:95
+#: addressbook/gui/component/addressbook-storage.c:98
 msgid "Other Contacts"
 msgstr "Andre kontakter"
 
@@ -816,9 +815,9 @@ msgid "None (anonymous mode)"
 msgstr "Ingen (anonym modus)"
 
 #: addressbook/gui/component/addressbook-config.c:165
-#: camel/providers/imap/camel-imap-store.c:262
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:145
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
 msgid "Password"
 msgstr "Passord"
 
@@ -855,6 +854,7 @@ msgid "FIXME Bind DN Help text here"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:356
+#: mail/mail-config.glade.h:50
 msgid "Remember this password"
 msgstr "Husk dette passordet"
 
@@ -888,12 +888,11 @@ msgid "Search Scope:"
 msgstr "Søkeområde:"
 
 #: addressbook/gui/component/addressbook-config.c:489
-#: mail/mail-config.glade.h:8
 msgid "Authentication:"
 msgstr "Autentisering:"
 
 #: addressbook/gui/component/addressbook-config.c:507
-#: mail/mail-config-druid.c:519 mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:44
 msgid "Path:"
 msgstr "Sti:"
 
@@ -920,7 +919,7 @@ msgid ""
 msgstr "Velg type adressebok du har, og skriv inn relevant informasjon om den."
 
 #: addressbook/gui/component/addressbook-config.c:671
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:35
 msgid "Name:"
 msgstr "Navn:"
 
@@ -945,8 +944,8 @@ msgstr "Adressebok-kilder"
 #: addressbook/gui/component/addressbook-config.glade.h:3
 #: calendar/gui/e-meeting-dialog.glade.h:8
 #: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/folder-browser.c:574
-#: mail/mail-config.glade.h:20 mail/mail-view.c:153
+#: filter/libfilter-i18n.h:8 mail/folder-browser.c:577
+#: mail/mail-config.glade.h:19 mail/mail-view.c:156
 #: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
 #: ui/evolution-mail.xml.h:6 ui/evolution-task-editor-dialog.xml.h:18
 msgid "Delete"
@@ -954,12 +953,12 @@ msgstr "Slett"
 
 #: addressbook/gui/component/addressbook-config.glade.h:4
 #: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:23
 msgid "Edit"
 msgstr "Redigér"
 
 #: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:603
+#: addressbook/gui/widgets/e-addressbook-view.c:608
 msgid "Name"
 msgstr "Navn"
 
@@ -967,57 +966,65 @@ msgstr "Navn"
 msgid "URI"
 msgstr "URI"
 
-#: addressbook/gui/component/e-address-widget.c:366
+#: addressbook/gui/component/e-address-widget.c:365
 msgid "Disable Queries"
 msgstr "Deaktiver spørringer"
 
-#: addressbook/gui/component/e-address-widget.c:366
+#: addressbook/gui/component/e-address-widget.c:365
 msgid "Enable Queries (Dangerous!)"
 msgstr "Aktiver spørringer (Farlig!)"
 
-#: addressbook/gui/component/e-address-widget.c:389
-#: addressbook/gui/component/select-names/e-select-names-popup.c:209
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:210
 msgid "Edit Contact Info"
 msgstr "Rediger kontaktinfo"
 
-#: addressbook/gui/component/e-address-widget.c:425
-#: addressbook/gui/component/select-names/e-select-names-popup.c:268
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:269
 msgid "Add to Contacts"
 msgstr "Legg til i kontakter"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for displaying an address."
+msgid "A Bonobo control for an address popup."
 msgstr "En Bonobo-kontroll for visning av en adresse."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr "En Bonobo-kontroll for visning av en adresse."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
 msgid "A sample Bonobo control which displays an addressbook."
 msgstr "Eksempel på Bonobo-kontroll som viser en adressebok."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "Kontroll som viser et minikort for Evolutions adressebok."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Evolution adressebok minikort visning"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Evolution component for handling contacts."
 msgstr "Evolution komponent for håndtering av kontakter."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Factory for minikort kontroll for adressebok"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Factory for the Addressbook's address displayer"
 msgstr "Factory for adressebokens adressevisning"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
+msgstr "Factory for adressebokens adressevisning"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Evolution addressbook component."
 msgstr "Factory for Evolution adressebok-komponent."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the sample Addressbook control"
 msgstr "Factory for eksempelkontroll for adressebok"
 
@@ -1029,13 +1036,14 @@ msgstr "Evolution adressebok-komponent"
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Factory for adressebokens grensesnitt for navnevalg"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:130
-#: composer/e-msg-composer-attachment-bar.c:465 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
+#: addressbook/gui/component/select-names/e-select-names-popup.c:131
+#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:402
+#: filter/filter-rule.c:547 filter/filter.glade.h:9
+#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
 msgid "Remove"
 msgstr "Fjern"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:145
+#: addressbook/gui/component/select-names/e-select-names-popup.c:146
 msgid "Remove All"
 msgstr "Fjern alle"
 
@@ -1055,7 +1063,7 @@ msgstr "Velg navn"
 msgid "Select name from:"
 msgstr "Velg navn fra:"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:152
+#: addressbook/gui/search/e-addressbook-search-dialog.c:158
 msgid "Search"
 msgstr "Søk"
 
@@ -1167,64 +1175,64 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
-#: addressbook/gui/widgets/e-minicard.c:449
+#: addressbook/gui/widgets/e-addressbook-view.c:511
+#: addressbook/gui/widgets/e-minicard.c:454
 msgid "Save as VCard"
 msgstr "Lagre som VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:602
+#: addressbook/gui/widgets/e-addressbook-view.c:607
 msgid "* Click here to add a contact *"
 msgstr "* Klikk her for å legge til en kontakt *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: addressbook/gui/widgets/e-addressbook-view.c:609
 msgid "Email"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:608
+#: addressbook/gui/widgets/e-addressbook-view.c:613
 msgid "Organization"
 msgstr "Organisasjon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:620
+#: addressbook/gui/widgets/e-addressbook-view.c:625
 msgid "Web Site"
 msgstr "Nettside"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:621
+#: addressbook/gui/widgets/e-addressbook-view.c:626
 msgid "Department"
 msgstr "Avdeling"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:622
+#: addressbook/gui/widgets/e-addressbook-view.c:627
 msgid "Office"
 msgstr "Kontor"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:623
+#: addressbook/gui/widgets/e-addressbook-view.c:628
 msgid "Title"
 msgstr "Tittel"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:629
 msgid "Profession"
 msgstr "Yrke"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:625
+#: addressbook/gui/widgets/e-addressbook-view.c:630
 msgid "Manager"
 msgstr "Leder"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:627
+#: addressbook/gui/widgets/e-addressbook-view.c:632
 msgid "Nickname"
 msgstr "Kallenavn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:628
+#: addressbook/gui/widgets/e-addressbook-view.c:633
 msgid "Spouse"
 msgstr "Ektefelle"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:629
+#: addressbook/gui/widgets/e-addressbook-view.c:634
 msgid "Note"
 msgstr "Kommentar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:630
+#: addressbook/gui/widgets/e-addressbook-view.c:635
 msgid "Free-busy URL"
 msgstr "Fri-ledig URL"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:631
+#: addressbook/gui/widgets/e-addressbook-view.c:636
 msgid "Click here to add a contact"
 msgstr "Klikk her for å legge til en kontakt"
 
@@ -1232,7 +1240,7 @@ msgstr "Klikk her for å legge til en kontakt"
 msgid "Save in addressbook"
 msgstr "Lagre i adressebok"
 
-#: addressbook/gui/widgets/e-minicard-view.c:146
+#: addressbook/gui/widgets/e-minicard-view.c:149
 msgid ""
 "\n"
 "\n"
@@ -1430,126 +1438,127 @@ msgstr "Kunne ikke lese pilotens kalender-applikasjonsblokk"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikke lese pilotens applikasjonsblokk for oppgaveliste"
 
-#: calendar/gui/calendar-commands.c:258
+#: calendar/gui/calendar-commands.c:266
 msgid "File not found"
 msgstr "Fil ikke funnet"
 
-#: calendar/gui/calendar-commands.c:282
+#: calendar/gui/calendar-commands.c:290
 msgid "Open calendar"
 msgstr "Åpne kalender"
 
-#: calendar/gui/calendar-commands.c:324
+#: calendar/gui/calendar-commands.c:332
 msgid "Save calendar"
 msgstr "Lagre kalender"
 
-#: calendar/gui/calendar-commands.c:478
+#: calendar/gui/calendar-commands.c:468
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Kunne ikke opprette kalendervisning. Vennligst sjekk din ORBit og OAF "
 "konfigurasjon."
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:901
-#: calendar/gui/e-calendar-table.c:328
+#: calendar/gui/calendar-model.c:367 calendar/gui/calendar-model.c:902
+#: calendar/gui/e-calendar-table.c:330
 msgid "Public"
 msgstr "Offentlig"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/calendar-model.c:903
-#: calendar/gui/e-calendar-table.c:329
+#: calendar/gui/calendar-model.c:370 calendar/gui/calendar-model.c:904
+#: calendar/gui/e-calendar-table.c:331
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:372 calendar/gui/calendar-model.c:905
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:373 calendar/gui/calendar-model.c:906
+#: calendar/gui/e-calendar-table.c:332
 msgid "Confidential"
 msgstr "Konfidensiell"
 
-#: calendar/gui/calendar-model.c:375 calendar/gui/event-editor.c:1590
-#: calendar/gui/event-editor.c:1617
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: calendar/gui/calendar-model.c:376 calendar/gui/event-editor.c:1594
+#: calendar/gui/event-editor.c:1621
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: calendar/gui/calendar-model.c:463
+#: calendar/gui/calendar-model.c:464
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:463
+#: calendar/gui/calendar-model.c:464
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:465
+#: calendar/gui/calendar-model.c:466
 msgid "E"
 msgstr "Ø"
 
-#: calendar/gui/calendar-model.c:465
+#: calendar/gui/calendar-model.c:466
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:503 calendar/gui/calendar-model.c:1069
+#: calendar/gui/calendar-model.c:504 calendar/gui/calendar-model.c:1070
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:350 mail/message-list.c:625
+#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:629
 msgid "High"
 msgstr "Høy"
 
-#: calendar/gui/calendar-model.c:505 calendar/gui/calendar-model.c:1071
-#: calendar/gui/calendar-model.c:1596
+#: calendar/gui/calendar-model.c:506 calendar/gui/calendar-model.c:1072
+#: calendar/gui/calendar-model.c:1597
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:351 mail/message-list.c:624
+#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:628
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:507 calendar/gui/calendar-model.c:1073
+#: calendar/gui/calendar-model.c:508 calendar/gui/calendar-model.c:1074
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:623
+#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:627
 msgid "Low"
 msgstr "Lav"
 
-#: calendar/gui/calendar-model.c:543 calendar/gui/calendar-model.c:1125
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/calendar-model.c:544 calendar/gui/calendar-model.c:1126
+#: calendar/gui/e-calendar-table.c:406
 msgid "Transparent"
 msgstr "Gjennomsiktig"
 
-#: calendar/gui/calendar-model.c:546 calendar/gui/calendar-model.c:1127
-#: calendar/gui/e-calendar-table.c:403
+#: calendar/gui/calendar-model.c:547 calendar/gui/calendar-model.c:1128
+#: calendar/gui/e-calendar-table.c:405
 msgid "Opaque"
 msgstr "Ugjennomsiktig"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1179
+#: calendar/gui/calendar-model.c:642 calendar/gui/calendar-model.c:1180
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:424
+#: calendar/gui/e-calendar-table.c:426
 msgid "Not Started"
 msgstr "Ikke startet"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1181
+#: calendar/gui/calendar-model.c:645 calendar/gui/calendar-model.c:1182
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:427
 msgid "In Progress"
 msgstr "Under arbeid"
 
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1183
+#: calendar/gui/calendar-model.c:648 calendar/gui/calendar-model.c:1184
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:428
 msgid "Completed"
 msgstr "Fullført"
 
-#: calendar/gui/calendar-model.c:650 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:651 calendar/gui/calendar-model.c:1186
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:544
+#: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Avbrutt"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:798 e-util/e-time-utils.c:278
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d.%m.%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:800 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:801 e-util/e-time-utils.c:287
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d.%m.%Y %H:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:805
+#: calendar/gui/calendar-model.c:806
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1560,7 +1569,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:885
+#: calendar/gui/calendar-model.c:886
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
@@ -1568,18 +1577,17 @@ msgstr ""
 "'Ingen'"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:899 calendar/gui/calendar-model.c:1123
-#: calendar/gui/calendar-model.c:1177 calendar/gui/e-calendar-table.c:327
-#: calendar/gui/e-calendar-table.c:402 mail/mail-account-editor.c:773
-#: mail/mail-account-editor.c:775 mail/mail-account-editor.c:866
-#: mail/mail-accounts.c:117 mail/mail-config-druid.c:1092
-#: mail/mail-config.glade.h:43 shell/e-shell-view.c:1119
-#: widgets/misc/e-cell-date-edit.c:231 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
+#: calendar/gui/calendar-model.c:900 calendar/gui/calendar-model.c:1124
+#: calendar/gui/calendar-model.c:1178 calendar/gui/e-calendar-table.c:329
+#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:968
+#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
+#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1124
+#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:430
+#: widgets/misc/e-dateedit.c:1339 widgets/misc/e-dateedit.c:1454
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/calendar-model.c:973
+#: calendar/gui/calendar-model.c:974
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1589,40 +1597,40 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1013
+#: calendar/gui/calendar-model.c:1014
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Prosentverdien må være mellom 0 og 100, inklusive"
 
-#: calendar/gui/calendar-model.c:1054
+#: calendar/gui/calendar-model.c:1055
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr "Prioriteten må være en av 'Høy', 'Normal', 'Lav' eller 'Udefinert'."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1067
+#: calendar/gui/calendar-model.c:1068
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:355
 msgid "Undefined"
 msgstr "Udefinert"
 
-#: calendar/gui/calendar-model.c:1108
+#: calendar/gui/calendar-model.c:1109
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 "Gjennomsiktigheten må være en av 'Gjennomsiktig', 'Ugjennomsiktig' eller "
 "\"Ingen'."
 
-#: calendar/gui/calendar-model.c:1598
+#: calendar/gui/calendar-model.c:1599
 msgid "Recurring"
 msgstr "Gjeninntreffer"
 
-#: calendar/gui/calendar-model.c:1600
+#: calendar/gui/calendar-model.c:1601
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: calendar/gui/calendar-model.c:1606
+#: calendar/gui/calendar-model.c:1607
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1606
+#: calendar/gui/calendar-model.c:1607
 msgid "No"
 msgstr "Nei"
 
@@ -1658,7 +1666,7 @@ msgstr "Vis oppgaver"
 msgid "Loading Calendar"
 msgstr "Laster kalender"
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/control-factory.c:126
 msgid "The URI that the calendar will display"
 msgstr "URIen som kalenderen skal vise"
 
@@ -1687,7 +1695,7 @@ msgstr "Alarm-tjeneste"
 msgid "Factory for the alarm notification service"
 msgstr "Factory for alarm-tjenesten"
 
-#: calendar/gui/alarm-notify/notify-main.c:67 calendar/gui/main.c:49
+#: calendar/gui/alarm-notify/notify-main.c:67 calendar/gui/main.c:52
 msgid "Could not initialize GNOME"
 msgstr "Kunne ikke initiere GNOME"
 
@@ -1695,15 +1703,15 @@ msgstr "Kunne ikke initiere GNOME"
 msgid "Could not create the alarm notify service factory"
 msgstr "Kunne ikke opprette factory for alarm-tjenesten"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:183
+#: calendar/gui/dialogs/alarm-notify-dialog.c:189
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Alarm på %A %b %d %Y %H:%M"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:190
+#: calendar/gui/dialogs/alarm-notify-dialog.c:196
 msgid "Notification about your appointment on %A %b %d %Y %H:%M"
 msgstr "Melding om din avtale på %A %b %d %Y %H:%M"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:201
+#: calendar/gui/dialogs/alarm-notify-dialog.c:207
 msgid "No summary available."
 msgstr "Ingen sammendrag tilgjengelig."
 
@@ -1792,7 +1800,7 @@ msgid "Display options"
 msgstr "Vis alternativer"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:162
 msgid "Due Date"
 msgstr "Ferdig-dato"
 
@@ -1813,7 +1821,7 @@ msgid "Fri"
 msgstr "Fre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/event-editor.c:483
 msgid "Friday"
 msgstr "Fredag"
 
@@ -1842,7 +1850,7 @@ msgid "Mon"
 msgstr "Man"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:475
+#: calendar/gui/event-editor.c:479
 msgid "Monday"
 msgstr "Mandag"
 
@@ -1855,11 +1863,12 @@ msgid "Overdue Items:"
 msgstr "Utgåtte oppføringer:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: mail/mail-config.glade.h:45
 msgid "Pick a color"
 msgstr "Velg en farge"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:163
+#: calendar/gui/e-calendar-table.c:165
 msgid "Priority"
 msgstr "Prioritet"
 
@@ -1877,7 +1886,7 @@ msgid "Sat"
 msgstr "Lør"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/event-editor.c:484
 msgid "Saturday"
 msgstr "Lørdag"
 
@@ -1902,7 +1911,7 @@ msgid "Sun"
 msgstr "Søn"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/event-editor.c:485
 msgid "Sunday"
 msgstr "Søndag"
 
@@ -1915,7 +1924,7 @@ msgid "Thu"
 msgstr "Tor"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/event-editor.c:482
 msgid "Thursday"
 msgstr "Torsdag"
 
@@ -1936,7 +1945,7 @@ msgid "Tue"
 msgstr "Tir"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:476
+#: calendar/gui/event-editor.c:480
 msgid "Tuesday"
 msgstr "Tirsdag"
 
@@ -1949,7 +1958,7 @@ msgid "Wed"
 msgstr "Ons"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/event-editor.c:481
 msgid "Wednesday"
 msgstr "Onsdag"
 
@@ -1962,7 +1971,7 @@ msgid "minutes before they occur."
 msgstr "minutter i forveien."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:78
 msgid "seconds."
 msgstr "sekunder"
 
@@ -2003,7 +2012,7 @@ msgid "% Comp_lete:"
 msgstr "% ferdi_g:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:156
+#: calendar/gui/e-calendar-table.c:158
 #: calendar/gui/event-editor-dialog.glade.h:6
 msgid "Classification"
 msgstr "Klassifisering"
@@ -2070,300 +2079,299 @@ msgstr "_Prioritet:"
 msgid "_Status:"
 msgstr "_Status:"
 
-#: calendar/gui/dialogs/task-editor.c:689
+#: calendar/gui/dialogs/task-editor.c:697
 msgid "Edit Task"
 msgstr "Redigér oppgave"
 
-#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:377
+#: calendar/gui/dialogs/task-editor.c:703 calendar/gui/event-editor.c:381
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:383
+#: calendar/gui/dialogs/task-editor.c:709 calendar/gui/event-editor.c:387
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:386
+#: calendar/gui/dialogs/task-editor.c:712 calendar/gui/event-editor.c:390
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgave - %s"
 
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:389
+#: calendar/gui/dialogs/task-editor.c:715 calendar/gui/event-editor.c:393
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaloppføring - %s"
 
-#: calendar/gui/e-calendar-table.c:155
+#: calendar/gui/e-calendar-table.c:157
 msgid "Categories"
 msgstr "Kategorier"
 
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:159
 msgid "Completion Date"
 msgstr "Fullført dato"
 
-#: calendar/gui/e-calendar-table.c:158
+#: calendar/gui/e-calendar-table.c:160
 msgid "End Date"
 msgstr "Sluttdato"
 
-#: calendar/gui/e-calendar-table.c:159
+#: calendar/gui/e-calendar-table.c:161
 msgid "Start Date"
 msgstr "Startdato"
 
-#: calendar/gui/e-calendar-table.c:161
+#: calendar/gui/e-calendar-table.c:163
 msgid "Geographical Position"
 msgstr "Geografisk plassering"
 
-#: calendar/gui/e-calendar-table.c:162
+#: calendar/gui/e-calendar-table.c:164
 msgid "Percent complete"
 msgstr "Prosent fullført"
 
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:166
 msgid "Summary"
 msgstr "Sammendrag"
 
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.c:167
 msgid "Transparency"
 msgstr "Gjennomsiktighet"
 
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/e-calendar-table.c:168
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-calendar-table.c:167
+#: calendar/gui/e-calendar-table.c:169
 msgid "Alarms"
 msgstr "Alarmer"
 
-#: calendar/gui/e-calendar-table.c:168
+#: calendar/gui/e-calendar-table.c:170
 msgid "Click here to add a task"
 msgstr "Klikk her for å legge til en oppgave"
 
-#: calendar/gui/e-calendar-table.c:372
+#: calendar/gui/e-calendar-table.c:374
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:373
+#: calendar/gui/e-calendar-table.c:375
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/e-calendar-table.c:376
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:377
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:378
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:379
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:380
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:381
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:382
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:383
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:384
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:549
+#: calendar/gui/e-calendar-table.c:551
 msgid "Mark Complete"
 msgstr "Merk som fullført"
 
-#: calendar/gui/e-calendar-table.c:550
+#: calendar/gui/e-calendar-table.c:552
 msgid "Mark the task complete"
 msgstr "Merk oppgaven som fullført"
 
-#: calendar/gui/e-calendar-table.c:555
+#: calendar/gui/e-calendar-table.c:557
 msgid "Edit this task..."
 msgstr "Redigér denne oppgaven..."
 
-#: calendar/gui/e-calendar-table.c:556
+#: calendar/gui/e-calendar-table.c:558
 msgid "Edit the task"
 msgstr "Redigér oppgaven"
 
-#: calendar/gui/e-calendar-table.c:558
+#: calendar/gui/e-calendar-table.c:560
 #: ui/evolution-task-editor-dialog.xml.h:19
 msgid "Delete this task"
 msgstr "Slett denne oppgaven"
 
-#: calendar/gui/e-calendar-table.c:559
+#: calendar/gui/e-calendar-table.c:561
 msgid "Delete the task"
 msgstr "Slett oppgaven"
 
-#: calendar/gui/e-day-view-time-item.c:516
+#: calendar/gui/e-day-view-time-item.c:519
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minutters oppdeling"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1281
-#: calendar/gui/e-week-view-main-item.c:321
+#: calendar/gui/e-day-view-top-item.c:274 calendar/gui/e-day-view.c:1290
+#: calendar/gui/e-week-view-main-item.c:325
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1295
-#: calendar/gui/e-week-view-main-item.c:330
+#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1304
+#: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1308
-#: calendar/gui/e-week-view-main-item.c:344
+#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1317
+#: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:563 calendar/gui/e-week-view.c:297
-#: calendar/gui/print.c:613
+#: calendar/gui/e-day-view.c:572 calendar/gui/e-week-view.c:303
+#: calendar/gui/print.c:617
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:566 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:612
+#: calendar/gui/e-day-view.c:575 calendar/gui/e-week-view.c:306
+#: calendar/gui/print.c:616
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3027 ui/evolution-calendar.xml.h:16
+#: calendar/gui/e-day-view.c:3036 ui/evolution-calendar.xml.h:16
 msgid "New Appointment"
 msgstr "Ny avtale"
 
-#: calendar/gui/e-day-view.c:3029 calendar/gui/e-week-view.c:3237
+#: calendar/gui/e-day-view.c:3038 calendar/gui/e-week-view.c:3243
 msgid "New All Day Event"
 msgstr "Ny avtale som varer hele dagen"
 
-#: calendar/gui/e-day-view.c:3034 calendar/gui/e-week-view.c:3242
+#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3248
 msgid "Go to Today"
 msgstr "Gå til idag"
 
-#: calendar/gui/e-day-view.c:3036 calendar/gui/e-week-view.c:3244
+#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3250
 msgid "Go to Date..."
 msgstr "Gå til dato..."
 
-#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3250
-#: mail/folder-browser.c:543 ui/evolution-calendar.xml.h:19
+#: calendar/gui/e-day-view.c:3052 calendar/gui/e-week-view.c:3256
+#: mail/folder-browser.c:546 ui/evolution-calendar.xml.h:19
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Åpne"
 
-#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3252
+#: calendar/gui/e-day-view.c:3054 calendar/gui/e-week-view.c:3258
 msgid "Delete this Appointment"
 msgstr "Slett denne avtalen"
 
-#: calendar/gui/e-day-view.c:3047 calendar/gui/e-week-view.c:3254
+#: calendar/gui/e-day-view.c:3056 calendar/gui/e-week-view.c:3260
 #: ui/evolution-event-editor.xml.h:45
 msgid "Schedule Meeting"
 msgstr "Sett opp møte"
 
-#: calendar/gui/e-day-view.c:3056 calendar/gui/e-week-view.c:3267
+#: calendar/gui/e-day-view.c:3065 calendar/gui/e-week-view.c:3273
 msgid "Make this Occurrence Movable"
 msgstr "Gjør denne avtalen flyttbar"
 
-#: calendar/gui/e-day-view.c:3058 calendar/gui/e-week-view.c:3269
+#: calendar/gui/e-day-view.c:3067 calendar/gui/e-week-view.c:3275
 msgid "Delete this Occurrence"
 msgstr "Slett denne oppføringen"
 
-#: calendar/gui/e-day-view.c:3060
+#: calendar/gui/e-day-view.c:3069
 msgid "Delete all Occurrences"
 msgstr "Slett alle oppføringer"
 
-#: calendar/gui/e-itip-control.c:160
+#: calendar/gui/e-itip-control.c:161
 msgid "I couldn't update your calendar file!\n"
 msgstr "Kunne ikke oppdatere din kalenderfil!\n"
 
-#: calendar/gui/e-itip-control.c:166 calendar/gui/e-itip-control.c:509
+#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
 msgid "Component successfully updated."
 msgstr "Oppdatering av komponent fullført."
 
-#: calendar/gui/e-itip-control.c:172
+#: calendar/gui/e-itip-control.c:173
 msgid "There was an error loading the calendar file."
 msgstr "Det oppsto en feil under lasting av kalenderfilen."
 
-#: calendar/gui/e-itip-control.c:196
+#: calendar/gui/e-itip-control.c:197
 msgid "I couldn't open your calendar file!\n"
 msgstr "Kunne ikke åpne din kalenderfil!\n"
 
-#: calendar/gui/e-itip-control.c:457 calendar/gui/e-itip-control.c:528
+#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
 msgid "I couldn't load your calendar file!\n"
 msgstr "Kunne ikke laste din kalenderfil!\n"
 
-#: calendar/gui/e-itip-control.c:469
+#: calendar/gui/e-itip-control.c:470
 msgid "I couldn't read your calendar file!\n"
 msgstr "Kunne ikke lese din kalenderfil!\n"
 
-#: calendar/gui/e-itip-control.c:482
+#: calendar/gui/e-itip-control.c:483
 msgid "This is a reply from someone who was uninvited!"
 msgstr "Dette er et svar fra noen som ikke er invitert!"
 
-#: calendar/gui/e-itip-control.c:498
+#: calendar/gui/e-itip-control.c:499
 msgid "I couldn't update your calendar store."
 msgstr "Kunne ikke oppdatere ditt kalenderlager."
 
-#: calendar/gui/e-itip-control.c:539
+#: calendar/gui/e-itip-control.c:540
 msgid "I couldn't delete the calendar component!\n"
 msgstr "Kunne ikke slette kalenderkomponenten!\n"
 
-#: calendar/gui/e-itip-control.c:549
+#: calendar/gui/e-itip-control.c:550
 msgid "Component successfully deleted."
 msgstr "Sletting av komponent fullført."
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:694
 msgid "I don't recognize this type of calendar component."
 msgstr "Kan ikke kjenne igjen denne typen kalenderkomponent."
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:780
 msgid "Add to Calendar"
 msgstr "Legg til i kalenderen"
 
-#: calendar/gui/e-itip-control.c:813
-msgid "Accept"
-msgstr "Akseptér"
-
 #: calendar/gui/e-itip-control.c:814
-msgid "Decline"
-msgstr "Avslå"
+msgid " Accept "
+msgstr " Godta "
 
 #: calendar/gui/e-itip-control.c:815
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "Tentativ"
+msgid " Decline "
+msgstr " Avslå "
+
+#: calendar/gui/e-itip-control.c:816
+msgid " Tentative "
+msgstr " Tentativ "
 
-#: calendar/gui/e-itip-control.c:859
+#: calendar/gui/e-itip-control.c:860
 msgid "Update Calendar"
 msgstr "Oppdatér kalender"
 
-#: calendar/gui/e-itip-control.c:882
+#: calendar/gui/e-itip-control.c:883
 msgid "Cancel Meeting"
 msgstr "Alys møte"
 
@@ -2380,7 +2388,7 @@ msgstr "--til--"
 msgid "Calendar Message"
 msgstr "Kalendermelding"
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:600
+#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:613
 msgid "Date:"
 msgstr "Dato:"
 
@@ -2392,9 +2400,9 @@ msgstr "Laster kalender..."
 msgid "Organizer:"
 msgstr "Organisator:"
 
-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:43
-msgid "Sender"
-msgstr "Avsender"
+#: calendar/gui/e-itip-control.glade.h:10
+msgid "Server Message:"
+msgstr "Tjenermelding:"
 
 #: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
@@ -2486,26 +2494,26 @@ msgstr ""
 "Sett av\n"
 "tid"
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:48
-#: mail/message-list.c:1013
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:30
+#: mail/message-list.c:1017
 msgid "Status"
 msgstr "Status"
 
-#: calendar/gui/e-tasks.c:148 calendar/gui/e-tasks.c:468
-#: calendar/gui/e-tasks.c:501
+#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
+#: calendar/gui/e-tasks.c:502
 msgid "All"
 msgstr "Alle"
 
-#: calendar/gui/e-tasks.c:154
+#: calendar/gui/e-tasks.c:155
 msgid "Category:"
 msgstr "Kategori:"
 
-#: calendar/gui/e-tasks.c:297
+#: calendar/gui/e-tasks.c:298
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kunne ikke laste oppgavene i `%s'"
 
-#: calendar/gui/e-tasks.c:309
+#: calendar/gui/e-tasks.c:310
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden som er nødvendig for å laste `%s' er ikke støttet"
@@ -2513,15 +2521,15 @@ msgstr "Metoden som er nødvendig for å laste `%s' er ikke støttet"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:338
+#: calendar/gui/e-week-view-main-item.c:342
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/e-week-view.c:3235 calendar/gui/e-week-view.c:3258
+#: calendar/gui/e-week-view.c:3241 calendar/gui/e-week-view.c:3264
 msgid "New Appointment..."
 msgstr "Ny avtale..."
 
-#: calendar/gui/e-week-view.c:3271
+#: calendar/gui/e-week-view.c:3277
 msgid "Delete All Occurrences"
 msgstr "Slett alle oppføringer"
 
@@ -2558,7 +2566,7 @@ msgid "No recurrence"
 msgstr "Ingen gjeninntreffelse"
 
 #: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1577
+#: calendar/gui/event-editor.c:1581
 msgid "Play a sound"
 msgstr "Spill en lyd"
 
@@ -2579,12 +2587,12 @@ msgid "Reminder"
 msgstr "Påminnelse"
 
 #: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1586
+#: calendar/gui/event-editor.c:1590
 msgid "Run a program"
 msgstr "Kjør et program"
 
 #: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1583
+#: calendar/gui/event-editor.c:1587
 msgid "Send an email"
 msgstr "Send en melding"
 
@@ -2593,7 +2601,7 @@ msgid "Settings..."
 msgstr "Innstillinger..."
 
 #: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1580
+#: calendar/gui/event-editor.c:1584
 msgid "Show a dialog"
 msgstr "Vis en dialog"
 
@@ -2613,12 +2621,11 @@ msgstr "_Start-tid:"
 msgid "_Starting date:"
 msgstr "_Start dato:"
 
-#. Automatically generated. Do not edit.
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:33
 msgid "after"
 msgstr "etter"
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:34
 msgid "before"
 msgstr "før"
 
@@ -2642,7 +2649,7 @@ msgstr "for alltid"
 msgid "hour(s)"
 msgstr "time(r)"
 
-#: calendar/gui/event-editor-dialog.glade.h:40
+#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
 msgid "minute(s)"
 msgstr "minutt(er)"
 
@@ -2666,98 +2673,98 @@ msgstr "uke(r)"
 msgid "year(s)"
 msgstr "år"
 
-#: calendar/gui/event-editor.c:371
+#: calendar/gui/event-editor.c:375
 msgid "Edit Appointment"
 msgstr "Rediger avtale"
 
-#: calendar/gui/event-editor.c:449
+#: calendar/gui/event-editor.c:453
 msgid "on"
 msgstr "på"
 
-#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:72
+#: calendar/gui/event-editor.c:478 filter/filter-datespec.c:81
 msgid "day"
 msgstr "dag"
 
-#: calendar/gui/event-editor.c:601
+#: calendar/gui/event-editor.c:605
 msgid "on the"
 msgstr "den"
 
-#: calendar/gui/event-editor.c:608
+#: calendar/gui/event-editor.c:612
 msgid "th"
 msgstr "de"
 
-#: calendar/gui/event-editor.c:754
+#: calendar/gui/event-editor.c:758
 msgid "occurrences"
 msgstr "gjentakelser"
 
-#: calendar/gui/event-editor.c:871
+#: calendar/gui/event-editor.c:875
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Denne avtalen har gjeninntreffelser som ikke kan redigeres av Evolution."
 
-#: calendar/gui/event-editor.c:1532
+#: calendar/gui/event-editor.c:1536
 #, c-format
 msgid " %d days"
 msgstr " %d dager"
 
-#: calendar/gui/event-editor.c:1534
+#: calendar/gui/event-editor.c:1538
 msgid " 1 day"
 msgstr " 1 dag"
 
-#: calendar/gui/event-editor.c:1537
+#: calendar/gui/event-editor.c:1541
 #, c-format
 msgid " %d weeks"
 msgstr " %d uker"
 
-#: calendar/gui/event-editor.c:1539
+#: calendar/gui/event-editor.c:1543
 msgid " 1 week"
 msgstr " 1 uke"
 
-#: calendar/gui/event-editor.c:1542
+#: calendar/gui/event-editor.c:1546
 #, c-format
 msgid " %d hours"
 msgstr " %d timer"
 
-#: calendar/gui/event-editor.c:1544
+#: calendar/gui/event-editor.c:1548
 msgid " 1 hour"
 msgstr " 1 time"
 
-#: calendar/gui/event-editor.c:1547
+#: calendar/gui/event-editor.c:1551
 #, c-format
 msgid " %d minutes"
 msgstr " %d minutter"
 
-#: calendar/gui/event-editor.c:1549
+#: calendar/gui/event-editor.c:1553
 msgid " 1 minute"
 msgstr " 1 minutt"
 
-#: calendar/gui/event-editor.c:1552
+#: calendar/gui/event-editor.c:1556
 #, c-format
 msgid " %d seconds"
 msgstr " %d  sekunder"
 
-#: calendar/gui/event-editor.c:1554
+#: calendar/gui/event-editor.c:1558
 msgid " 1 second"
 msgstr " 1 sekund"
 
-#: calendar/gui/event-editor.c:1601
+#: calendar/gui/event-editor.c:1605
 msgid " before start of appointment"
 msgstr " før avtalen starter"
 
-#: calendar/gui/event-editor.c:1603
+#: calendar/gui/event-editor.c:1607
 msgid " after start of appointment"
 msgstr " etter avtalens start"
 
-#: calendar/gui/event-editor.c:1611
+#: calendar/gui/event-editor.c:1615
 msgid " before end of appointment"
 msgstr " før avtalens slutt"
 
-#: calendar/gui/event-editor.c:1613
+#: calendar/gui/event-editor.c:1617
 msgid " after end of appointment"
 msgstr " etter avtalens slutt"
 
-#: calendar/gui/event-editor.c:3113 calendar/gui/print.c:1093
-#: calendar/gui/print.c:1095 calendar/gui/print.c:1096
+#: calendar/gui/event-editor.c:3125 calendar/gui/print.c:1097
+#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
@@ -2793,12 +2800,12 @@ msgstr "Factory for kalenderens iTip visningskontroll"
 msgid "Factory for the sample Calendar control"
 msgstr "Factory for eksempelkontroll for kalender"
 
-#: calendar/gui/gnome-cal.c:695
+#: calendar/gui/gnome-cal.c:700
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kunne ikke åpne mappen i `%s'"
 
-#: calendar/gui/gnome-cal.c:706
+#: calendar/gui/gnome-cal.c:711
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoden som er nødvendig for å åpne `%s' er ikke støttet"
@@ -2859,197 +2866,197 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:306
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Su"
 msgstr "Søn"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Mo"
 msgstr "Man"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Tu"
 msgstr "Tir"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "We"
 msgstr "Ons"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Th"
 msgstr "Tor"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Fr"
 msgstr "Fre"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Sa"
 msgstr "Lør"
 
-#: calendar/gui/print.c:944
+#: calendar/gui/print.c:948
 msgid "Tasks"
 msgstr "Oppgaver"
 
 #. Day
-#: calendar/gui/print.c:1074
+#: calendar/gui/print.c:1078
 msgid "Current day (%a %b %d %Y)"
 msgstr "I dag (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1088 calendar/gui/print.c:1092
+#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1089
+#: calendar/gui/print.c:1093
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1100
+#: calendar/gui/print.c:1104
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr "Denne uken (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1108
+#: calendar/gui/print.c:1112
 msgid "Current month (%b %Y)"
 msgstr "Denne måneden (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1115
+#: calendar/gui/print.c:1119
 msgid "Current year (%Y)"
 msgstr "Dette året (%Y)"
 
-#: calendar/gui/print.c:1152
+#: calendar/gui/print.c:1156
 msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
-#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1336
+#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1341
 #: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:30
 msgid "Print Preview"
 msgstr "Forhåndsvisning av utskrift"
 
@@ -3099,12 +3106,55 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "SMTWTFS"
 
-#: camel/camel-filter-driver.c:850
+#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+msgid "Syncing folders"
+msgstr "Synkroniserer mapper"
+
+#: camel/camel-filter-driver.c:643
+msgid "Unable to open spool folder"
+msgstr "Kunne ikke åpne spool-mappen"
+
+#: camel/camel-filter-driver.c:652
+msgid "Unable to process spool folder"
+msgstr "Kan ikke prosessere spool-mappen"
+
+#: camel/camel-filter-driver.c:666
+msgid "Getting message %d (%d%%)"
+msgstr "Henter melding %d (%d%%)"
+
+#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
+#, c-format
+msgid "Failed message %d"
+msgstr "Feilet melding %d"
+
+#: camel/camel-filter-driver.c:671
+msgid "Cannot open message"
+msgstr "Kan ikke åpne melding"
+
+#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+msgid "Syncing folder"
+msgstr "Synkroniserer mappe"
+
+#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
+msgid "Complete"
+msgstr "Fullført"
+
+#: camel/camel-filter-driver.c:748
+#, c-format
+msgid "Getting message %d of %d"
+msgstr "Henter melding %d av %d"
+
+#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#, c-format
+msgid "Failed at message %d of %d"
+msgstr "Feilet på melding %d av %d"
+
+#: camel/camel-filter-driver.c:866
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Feil under lesing av filter: %s: %s"
 
-#: camel/camel-filter-driver.c:855
+#: camel/camel-filter-driver.c:871
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Feil under kjøring av filter: %s: %s"
@@ -3141,135 +3191,153 @@ msgstr "(treff-alle) krever et enkelt bolsk resultat"
 msgid "Performing query on unknown header: %s"
 msgstr "Utfører spørring på ukjent header: %s"
 
-#: camel/camel-folder-search.c:667 camel/camel-folder-search.c:704
+#: camel/camel-folder-search.c:669 camel/camel-folder-search.c:713
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Ugyldig type i kropp-inneholder, forventer streng"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
+#: camel/camel-lock.c:92 camel/camel-lock.c:111 camel/camel-movemail.c:138
+#: camel/camel-movemail.c:185
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Kunne ikke opprette låsfil for %s: %s"
 
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
+#: camel/camel-lock.c:151 camel/camel-movemail.c:219
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr "Tidsavbrudd under venting på låsfil for %s. Prøv igjen senere."
 
-#: camel/camel-lock.c:199
+#: camel/camel-lock.c:201
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Feil under låsing ved bruk av fcntl(2): %s"
 
-#: camel/camel-lock.c:253
+#: camel/camel-lock.c:255
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Feil under låsing ved bruk av flock(2): %s"
 
-#: camel/camel-movemail.c:99
+#: camel/camel-movemail.c:101
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Kunne ikke sjekke e-post fil %s: %s"
 
-#: camel/camel-movemail.c:146
+#: camel/camel-movemail.c:148
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Kunne ikke åpne postfil %s: %s"
 
-#: camel/camel-movemail.c:156
+#: camel/camel-movemail.c:158
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Kunne ikke åpne midlertidig postfil %s: %s"
 
-#: camel/camel-movemail.c:197
+#: camel/camel-movemail.c:199
 #, c-format
 msgid "Could not test lock file for %s: %s"
 msgstr "Kunne ikke sjekke låsfil for %s: %s"
 
-#: camel/camel-movemail.c:243
+#: camel/camel-movemail.c:245
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Feil under lesing av postfil: %s"
 
-#: camel/camel-movemail.c:254
+#: camel/camel-movemail.c:256
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Feil under skriving av midlertidig fil: %s"
 
-#: camel/camel-movemail.c:272
+#: camel/camel-movemail.c:274
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Kunne ikke lagre post i midlertidig fil %s: %s"
 
-#: camel/camel-movemail.c:304
+#: camel/camel-movemail.c:306
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Kunne ikke opprette rør: %s"
 
-#: camel/camel-movemail.c:316
+#: camel/camel-movemail.c:318
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Kunne ikke kjøre fork: %s"
 
-#: camel/camel-movemail.c:354
+#: camel/camel-movemail.c:356
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail-programmet feilet: %s"
 
-#: camel/camel-movemail.c:355
+#: camel/camel-movemail.c:357
 msgid "(Unknown error)"
 msgstr "(Ukjent feil)"
 
-#: camel/camel-provider.c:137
+#: camel/camel-movemail.c:587
+#, c-format
+msgid "Error copying mail temp file: %s"
+msgstr "Feil under kopiering midlertidig meldingsfil: %s"
+
+#: camel/camel-provider.c:131
+#, c-format
+msgid "Could not load %s: Module loading not supported on this system."
+msgstr "Kunne ikke laste %s: Modullasting er ikke støttet på dette systemet."
+
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Kunne ikke laste %s: %s"
 
-#: camel/camel-provider.c:145
+#: camel/camel-provider.c:148
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Kunne ikke laste %s: Ingen initieringskode i modulen."
 
-#: camel/camel-remote-store.c:181
+#: camel/camel-remote-store.c:189
 #, c-format
 msgid "%s server %s"
 msgstr "%s-tjener %s"
 
-#: camel/camel-remote-store.c:185
+#: camel/camel-remote-store.c:193
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s-tjeneste for %s på %s"
 
-#: camel/camel-remote-store.c:232
+#: camel/camel-remote-store.c:243
 msgid "Connection cancelled"
 msgstr "Tilkobling avbrutt"
 
-#: camel/camel-remote-store.c:235
-#: camel/providers/smtp/camel-smtp-transport.c:245
+#: camel/camel-remote-store.c:246
+#: camel/providers/smtp/camel-smtp-transport.c:261
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Kunne ikke koble til %s (port %d): %s"
 
-#: camel/camel-remote-store.c:236
+#: camel/camel-remote-store.c:247
 msgid "(unknown host)"
 msgstr "(ukjent vert)"
 
-#: camel/camel-remote-store.c:317 camel/camel-remote-store.c:379
-#: camel/camel-remote-store.c:450
-#: camel/providers/imap/camel-imap-command.c:289
+#: camel/camel-remote-store.c:328 camel/camel-remote-store.c:390
+#: camel/camel-remote-store.c:461
+#: camel/providers/imap/camel-imap-command.c:264
 msgid "Operation cancelled"
 msgstr "Opreasjon avbrutt"
 
-#: camel/camel-remote-store.c:456
+#: camel/camel-remote-store.c:467
 msgid "Server unexpectedly disconnected"
 msgstr "Tjener koblet fra uventet."
 
-#: camel/camel-sasl-anonymous.c:97 camel/camel-sasl-plain.c:84
+#: camel/camel-sasl-anonymous.c:33
+msgid "Anonymous"
+msgstr "Anonym"
+
+#: camel/camel-sasl-anonymous.c:35
+msgid "This option will connect to the server using an anonymous login."
+msgstr "Dette valget vil koble til tjeneren med anonym pålogging."
+
+#: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
 msgid "Authentication failed."
 msgstr "Autentisering feilet."
 
-#: camel/camel-sasl-anonymous.c:106
+#: camel/camel-sasl-anonymous.c:119
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -3278,7 +3346,7 @@ msgstr ""
 "Ugyldig informasjon i sporing av e-postadresse:\n"
 "%s"
 
-#: camel/camel-sasl-anonymous.c:118
+#: camel/camel-sasl-anonymous.c:131
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -3287,7 +3355,7 @@ msgstr ""
 "Ugyldig ugjennomsiktig sporingsinformasjon:\n"
 "%s"
 
-#: camel/camel-sasl-anonymous.c:130
+#: camel/camel-sasl-anonymous.c:143
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -3296,11 +3364,11 @@ msgstr ""
 "Ugyldig sporingsinformasjon:\n"
 "%s"
 
-#: camel/camel-sasl-cram-md5.c:32 mail/mail-config.glade.h:10
+#: camel/camel-sasl-cram-md5.c:35
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: camel/camel-sasl-cram-md5.c:34
+#: camel/camel-sasl-cram-md5.c:37
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -3308,11 +3376,11 @@ msgstr ""
 "Dette alternativet kobler til tjeneren med bruk av CRAM-MD5-passord, hvis "
 "tjeneren støtter det."
 
-#: camel/camel-sasl-digest-md5.c:37 mail/mail-config.glade.h:18
+#: camel/camel-sasl-digest-md5.c:42
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:39
+#: camel/camel-sasl-digest-md5.c:44
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -3320,41 +3388,41 @@ msgstr ""
 "Dette alternativet kobler til tjeneren med bruk av DIGEST-MD5-passord, hvis "
 "tjeneren støtter det."
 
-#: camel/camel-sasl-digest-md5.c:761
+#: camel/camel-sasl-digest-md5.c:802
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr "Spørring fra tjener for lang (>2048 oktetter)\n"
 
-#: camel/camel-sasl-digest-md5.c:770
+#: camel/camel-sasl-digest-md5.c:811
 msgid "Server challenge invalid\n"
 msgstr "Ugyldig spørring fra tjener\n"
 
-#: camel/camel-sasl-digest-md5.c:776
+#: camel/camel-sasl-digest-md5.c:817
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr ""
 "Spørring fra tjener inneholdt ugyldig tegn for \"Kvalitet for beskyttelse\"\n"
 
-#: camel/camel-sasl-digest-md5.c:798
+#: camel/camel-sasl-digest-md5.c:839
 msgid "Server response did not contain authorization data\n"
 msgstr "Svar fra tjener inneholdt ikke autorisasjonsdata\n"
 
-#: camel/camel-sasl-digest-md5.c:816
+#: camel/camel-sasl-digest-md5.c:857
 msgid "Server response contained incomplete authorization data\n"
 msgstr "Svar fra tjener inneholdt ukomplette autorisasjonsdata\n"
 
-#: camel/camel-sasl-digest-md5.c:826
+#: camel/camel-sasl-digest-md5.c:867
 msgid "Server response does not match\n"
 msgstr "Svar fra tjener er ikke likt\n"
 
-#: camel/camel-sasl-kerberos4.c:38
+#: camel/camel-sasl-kerberos4.c:40
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/camel-sasl-kerberos4.c:40
+#: camel/camel-sasl-kerberos4.c:42
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
 "Dette alternativet kobler til tjeneren med bruk av Kerberos 4-autentisering."
 
-#: camel/camel-sasl-kerberos4.c:158
+#: camel/camel-sasl-kerberos4.c:161
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -3363,67 +3431,69 @@ msgstr ""
 "Fikk ikke Kerberos \"ticket\":\n"
 "%s"
 
-#: camel/camel-sasl-kerberos4.c:215
-#: camel/providers/imap/camel-imap-store.c:382
+#: camel/camel-sasl-kerberos4.c:218
+#: camel/providers/imap/camel-imap-store.c:417
 msgid "Bad authentication response from server."
 msgstr "Ugyldig svar på autentisering fra tjener."
 
-#: camel/camel-sasl-plain.c:29
-msgid "PLAIN"
-msgstr "PLAIN"
-
-#: camel/camel-sasl-plain.c:31
-msgid ""
-"This option will connect to the server using a the PLAIN SASL mechanism if "
-"the server supports it."
-msgstr ""
-"Dette alternativet kobler til tjeneren med bruk av PLAIN SASL-mekanismen "
-"hvis tjeneren støtter det."
+#: camel/camel-sasl-plain.c:34
+msgid "This option will connect to the server using a simple password."
+msgstr "Dette valget vil koble til tjeneren ved bruk av et passord."
 
 #: camel/camel-search-private.c:110
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Kompilering av regulært uttrykk feilet: %s: %s"
 
-#: camel/camel-service.c:142
+#: camel/camel-service.c:152
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' må inneholde et brukernavn"
 
-#: camel/camel-service.c:151
+#: camel/camel-service.c:160
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' må inneholde et vertsnavn"
 
-#: camel/camel-service.c:160
+#: camel/camel-service.c:168
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' må inneholde en sti"
 
-#: camel/camel-service.c:512
+#: camel/camel-service.c:548
 #, c-format
-msgid "No such host %s."
-msgstr "Ingen vert %s."
+msgid "Resolving: %s"
+msgstr "Finner: \"%s\""
 
-#: camel/camel-service.c:515
+#: camel/camel-service.c:575
 #, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr "Midlertidig ute av stand til å slå opp vertsnavn %s."
+msgid "Failure in name lookup: %s"
+msgstr "Feil i navneoppslag: %s"
 
-#: camel/camel-session.c:54
+#: camel/camel-service.c:600
+#, c-format
+msgid "Host lookup failed: %s: host not found"
+msgstr "Vertsoppslag feilet: %s: vert ikke funnet"
+
+#: camel/camel-service.c:602
+#, c-format
+msgid "Host lookup failed: %s: unknown reason"
+msgstr "Vertsoppslag feilet: %s: ukjent årsak"
+
+#: camel/camel-session.c:57
 msgid "Virtual folder email provider"
 msgstr "E-post-tilbyder for virtuelle mapper"
 
-#: camel/camel-session.c:56
+#: camel/camel-session.c:59
 msgid "For reading mail as a query of another set of folders"
 msgstr "For lesing av e-post som en spørring på et annet sett med mapper"
 
-#: camel/camel-session.c:322
+#: camel/camel-session.c:274 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Ingen tilbyder tilgjengelig for protokoll `%s'"
 
-#: camel/camel-session.c:417
+#: camel/camel-session.c:462
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3433,118 +3503,133 @@ msgstr ""
 "%s"
 
 #. Fill in the new fields
-#: camel/camel-store.c:382 mail/mail-ops.c:941 mail/mail-ops.c:948
-#: mail/mail-ops.c:966 mail/mail-ops.c:967
+#: camel/camel-store.c:380 mail/mail-ops.c:995 mail/mail-ops.c:1002
+#: mail/mail-ops.c:1020 mail/mail-ops.c:1021
 msgid "Trash"
 msgstr "Søppel"
 
-#: camel/camel-url.c:78
-#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr "URL-streng `%s' inneholder ikke protokoll"
-
-#: camel/camel-url.c:93
-#, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr "URL-streng `%s' inneholder en ugyldig protokoll"
-
-#: camel/camel-url.c:153
+#: camel/camel-url.c:288
 #, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr "Portnummer i URL `%s' er ikke-numerisk"
+msgid "Could not parse URL `%s'"
+msgstr "Kunne ikke tolke URL `%s'"
 
-#: camel/camel-vee-folder.c:964
+#: camel/camel-vee-folder.c:545
 #, c-format
 msgid "No such message: %s"
 msgstr "Ingen slik melding: %s"
 
-#: camel/providers/imap/camel-imap-command.c:234
+#: camel/providers/imap/camel-imap-command.c:209
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Uventet svar fra IMAP-tjener: %s"
 
-#: camel/providers/imap/camel-imap-command.c:242
+#: camel/providers/imap/camel-imap-command.c:217
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-kommando feilet: %s"
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:451
+#: camel/providers/imap/camel-imap-command.c:218 shell/e-storage.c:481
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
-#: camel/providers/imap/camel-imap-command.c:297
+#: camel/providers/imap/camel-imap-command.c:272
 msgid "Server response ended too soon."
 msgstr "Svar fra tjener ble avsluttet for tidlig."
 
-#: camel/providers/imap/camel-imap-command.c:433
+#: camel/providers/imap/camel-imap-command.c:456
 #, 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:469
+#: camel/providers/imap/camel-imap-command.c:490
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Uventet svar 'OK' fra IMAP-tjener: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:205
+#: camel/providers/imap/camel-imap-folder.c:172
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Kunne ikke laste sammendrag for %s"
 
-#: camel/providers/imap/camel-imap-folder.c:349
+#: camel/providers/imap/camel-imap-folder.c:351
 msgid "Scanning IMAP folder"
 msgstr "Skanner IMAP-mappe"
 
-#: camel/providers/imap/camel-imap-folder.c:959
-#: camel/providers/imap/camel-imap-folder.c:1154
+#: camel/providers/imap/camel-imap-folder.c:986
+#: camel/providers/imap/camel-imap-folder.c:1197
+msgid "This message is not currently available"
+msgstr "Denne meldingen er ikke tilgjengelig"
+
+#: camel/providers/imap/camel-imap-folder.c:1016
+#: camel/providers/imap/camel-imap-folder.c:1231
 msgid "Could not find message body in FETCH response."
 msgstr "Kunne ikke finne meldingskropp i FETCH-svar."
 
-#: camel/providers/imap/camel-imap-provider.c:39
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+msgid "Checking for new mail"
+msgstr "Ser etter nye meldinger"
+
+#: camel/providers/imap/camel-imap-provider.c:45
+msgid "Check for new messages in all folders"
+msgstr "Se etter nye meldinger i alle mapper"
+
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:479
+msgid "Folders"
+msgstr "Mapper"
+
+#: camel/providers/imap/camel-imap-provider.c:50
+msgid "Show only subscribed folders"
+msgstr "Vis kun abonnerte mapper"
+
+#: camel/providers/imap/camel-imap-provider.c:52
+msgid "Override server-supplied folder namespace"
+msgstr "Overstyr tjeners navneområde for mapper"
+
+#: camel/providers/imap/camel-imap-provider.c:54
+msgid "Namespace"
+msgstr "Navneområde"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Apply filters to new messages in INBOX on this server"
+msgstr "Bruk filtre for nye meldinger i INNBOKS på denne tjeneren"
+
+#: camel/providers/imap/camel-imap-provider.c:63
 msgid "IMAPv4"
 msgstr "IMAPv4"
 
-#: camel/providers/imap/camel-imap-provider.c:41
+#: camel/providers/imap/camel-imap-provider.c:65
 msgid "For reading and storing mail on IMAP servers."
 msgstr "For lesing og lagring av e-post på IMAP-tjenere."
 
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Secure IMAPv4"
-msgstr "Sikker IMAPv4"
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "For reading and storing mail on IMAP servers over an SSL connection."
-msgstr ""
-"For lesing og lagring av e-post på IMAP-tjenere over en SSL-forbindelse."
-
-#: camel/providers/imap/camel-imap-store.c:264
+#: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Dette valget vil la deg koble til en IMAP-tjener ved å bruke et "
 "klartekst-passord."
 
-#: camel/providers/imap/camel-imap-store.c:416
+#: camel/providers/imap/camel-imap-store.c:440
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP-tjener %s støtter ikke etterspurt autentiseringstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:427
+#: camel/providers/imap/camel-imap-store.c:450
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ingen støtte for autentiseringstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:455
+#: camel/providers/imap/camel-imap-store.c:475
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sVennligst skriv inn IMAP-passord for %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:470
-#: camel/providers/smtp/camel-smtp-transport.c:376
+#: camel/providers/imap/camel-imap-store.c:490
+#: camel/providers/smtp/camel-smtp-transport.c:403
 msgid "You didn't enter a password."
 msgstr "Du skrev ikke inn et passord."
 
-#: camel/providers/imap/camel-imap-store.c:499
-#: camel/providers/smtp/camel-smtp-transport.c:384
+#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/smtp/camel-smtp-transport.c:411
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3555,89 +3640,98 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:769
+#: camel/providers/imap/camel-imap-store.c:858
+#, c-format
+msgid "%s is not a selectable folder"
+msgstr "%s er ikke en valgbar mappe"
+
+#: camel/providers/imap/camel-imap-store.c:872
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kan ikke opprette katalog %s: %s"
 
-#: camel/providers/local/camel-local-provider.c:36
+#: camel/providers/imap/camel-imap-store.c:1373
+msgid "You must be working online to complete this operation"
+msgstr "Du må arbeide tilknyttet for å fullføre denne operasjonen"
+
+#: camel/providers/local/camel-local-provider.c:39
 msgid "MH-format mail directories"
 msgstr "E-postkataloger i MH-format"
 
-#: camel/providers/local/camel-local-provider.c:37
+#: camel/providers/local/camel-local-provider.c:40
 msgid "For storing local mail in MH-like mail directories"
 msgstr "For lagring av lokal e-post i MH-lignende meldingskataloger "
 
-#: camel/providers/local/camel-local-provider.c:47
+#: camel/providers/local/camel-local-provider.c:49
 msgid "Standard Unix mailbox file"
 msgstr "Standard Unix postboksfil"
 
-#: camel/providers/local/camel-local-provider.c:48
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in standard mbox format"
 msgstr "For lagring av lokal e-post i standard mbox format"
 
-#: camel/providers/local/camel-local-provider.c:58
+#: camel/providers/local/camel-local-provider.c:59
 msgid "Qmail maildir-format mail files"
 msgstr "Qmail e-post filer i maildir-format"
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "For storing local mail in qmail maildir directories"
 msgstr "For lagring av lokal e-post i qmail meldingskataloger"
 
-#: camel/providers/local/camel-local-store.c:128
+#: camel/providers/local/camel-local-store.c:129
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Lagerrot %s er ikke en absolutt sti"
 
-#: camel/providers/local/camel-local-store.c:135
+#: camel/providers/local/camel-local-store.c:136
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Lagerrot %s er ikke en vanlig katalog"
 
-#: camel/providers/local/camel-local-store.c:143
-#: camel/providers/local/camel-local-store.c:159
+#: camel/providers/local/camel-local-store.c:144
+#: camel/providers/local/camel-local-store.c:160
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Finner ikke mappe: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:175
 msgid "Local stores do not have an inbox"
 msgstr "Lokalt lager har ikke en innboks"
 
-#: camel/providers/local/camel-local-store.c:184
+#: camel/providers/local/camel-local-store.c:185
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokal e-post-fil %s"
 
-#: camel/providers/local/camel-local-store.c:240
+#: camel/providers/local/camel-local-store.c:241
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Kunne ikke endre navn på mappe %s til %s: %s"
 
-#: camel/providers/local/camel-local-store.c:282
+#: camel/providers/local/camel-local-store.c:283
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Kunne ikke slette sammendragsfil for mappe `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:292
+#: camel/providers/local/camel-local-store.c:293
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Kunne ikke slette indeksfil for mappe `%s': %s"
 
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
+#: camel/providers/local/camel-maildir-folder.c:150
+#: camel/providers/local/camel-maildir-folder.c:158
+#: camel/providers/local/camel-maildir-folder.c:169
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Kan ikke legge til melding i maildir mappe: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:197
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-maildir-folder.c:217
+#: camel/providers/local/camel-mbox-folder.c:319
+#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-mh-folder.c:194
+#: camel/providers/local/camel-mh-folder.c:202
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -3646,19 +3740,19 @@ msgstr ""
 "Kan ikke hente melding: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
+#: camel/providers/local/camel-maildir-folder.c:197
+#: camel/providers/local/camel-mbox-folder.c:319
+#: camel/providers/local/camel-mh-folder.c:185
 msgid "No such message"
 msgstr "Ingen slik melding"
 
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:218
+#: camel/providers/local/camel-mh-folder.c:203
 msgid "Invalid message contents"
 msgstr "Ugyldig meldingsinnhold"
 
-#: camel/providers/local/camel-maildir-store.c:94
-#: camel/providers/local/camel-mh-store.c:88
+#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -3667,15 +3761,15 @@ msgstr ""
 "Kan ikke åpne mappe `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:98
-#: camel/providers/local/camel-mbox-store.c:99
-#: camel/providers/local/camel-mh-store.c:95
+#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Mappen `%s' eksisterer ikke."
 
-#: camel/providers/local/camel-maildir-store.c:105
-#: camel/providers/local/camel-mh-store.c:101
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -3684,35 +3778,40 @@ msgstr ""
 "Kunne ikke opprette mappe `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:120
+#: camel/providers/local/camel-maildir-store.c:122
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' er ikke en maildir katalog."
 
-#: camel/providers/local/camel-maildir-store.c:149
-#: camel/providers/local/camel-maildir-store.c:186
-#: camel/providers/local/camel-mh-store.c:125
+#: camel/providers/local/camel-maildir-store.c:151
+#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kunne ikke slette mappe `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:150
+#: camel/providers/local/camel-maildir-store.c:152
 msgid "not a maildir directory"
 msgstr "ikke en maildir katalog"
 
-#: camel/providers/local/camel-mbox-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:152
+#, c-format
+msgid "Cannot create folder lock on %s: %s"
+msgstr "Kan ikke opprette mappelås på: %s: %s"
+
+#: camel/providers/local/camel-mbox-folder.c:203
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Kan ikke åpne postboks: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:257
+#: camel/providers/local/camel-mbox-folder.c:259
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Kan ikke legge til melding i mbox-filen: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
+#: camel/providers/local/camel-mbox-folder.c:335
+#: camel/providers/local/camel-mbox-folder.c:367
+#: camel/providers/local/camel-mbox-folder.c:380
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -3721,15 +3820,15 @@ msgstr ""
 "Kan ikke hente melding: %s fra mappe %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:368
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Mappen ser ut til å ha blitt korrupt og kan ikke repareres."
 
-#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:381
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Oppbygging av melding feilet: Korrupt postboks?"
 
-#: camel/providers/local/camel-mbox-store.c:92
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -3738,7 +3837,7 @@ msgstr ""
 "Kunne ikke åpne fil `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:108
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -3747,14 +3846,14 @@ msgstr ""
 "Kunne ikke opprette fil `%s'\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:117
-#: camel/providers/local/camel-mbox-store.c:144
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' er ikke en vanlig fil."
 
-#: camel/providers/local/camel-mbox-store.c:136
-#: camel/providers/local/camel-mbox-store.c:159
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -3763,7 +3862,7 @@ msgstr ""
 "Kunne ikke slette mappen `%s'\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:151
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "MAppen `%s' er ikke tom. Ikke slettet."
@@ -3790,7 +3889,7 @@ msgid "Cannot summarise folder: %s: %s"
 msgstr "Kan ikke lage sammendrag for mappe: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:497
-#: camel/providers/local/camel-mbox-summary.c:698 mail/mail-ops.c:1327
+#: camel/providers/local/camel-mbox-summary.c:698 mail/mail-ops.c:1383
 msgid "Synchronising folder"
 msgstr "Synkroniserer mappe"
 
@@ -3843,31 +3942,31 @@ msgstr "Kunne ikke endre navn på mappe: %s"
 msgid "Unknown error: %s"
 msgstr "Ukjent feil: %s"
 
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
+#: camel/providers/local/camel-mh-folder.c:149
+#: camel/providers/local/camel-mh-folder.c:157
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Kan ikke legge til melding i mh-mappe: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:108
+#: camel/providers/local/camel-mh-store.c:110
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' er ikke en katalog."
 
-#: camel/providers/nntp/camel-nntp-auth.c:44
+#: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Vennligst skriv inn NNTP-passord for %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:65
+#: camel/providers/nntp/camel-nntp-auth.c:66
 msgid "Server rejected username"
 msgstr "Tjeneren godtok ikke brukernavn"
 
-#: camel/providers/nntp/camel-nntp-auth.c:71
+#: camel/providers/nntp/camel-nntp-auth.c:72
 msgid "Failed to send username to server"
 msgstr "Feil under sending av brukernavn til tjener"
 
-#: camel/providers/nntp/camel-nntp-auth.c:80
+#: camel/providers/nntp/camel-nntp-auth.c:81
 msgid "Server rejected username/password"
 msgstr "Tjeneren godtok ikke brukernavn/passord"
 
@@ -3891,11 +3990,11 @@ msgstr "Kunne ikke laste gruppelistefil for %s: %s"
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Kunne ikke lagre gruppelistefil for %s: %s"
 
-#: camel/providers/nntp/camel-nntp-provider.c:38
+#: camel/providers/nntp/camel-nntp-provider.c:42
 msgid "USENET news"
 msgstr "USENET news"
 
-#: camel/providers/nntp/camel-nntp-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:44
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 "Dette er en tilbyder for lesing av og posting av innlegg til USENET "
@@ -3933,26 +4032,39 @@ msgstr "Henter POP-sammendrag"
 msgid "Could not open folder: message listing was incomplete."
 msgstr "Kunne ikke åpne mappe: meldingslisten var ikke komplett."
 
-#: camel/providers/pop3/camel-pop3-folder.c:286
+#: camel/providers/pop3/camel-pop3-folder.c:285
 #, c-format
 msgid "No message with uid %s"
 msgstr "Ingen melding med uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:290
+#: camel/providers/pop3/camel-pop3-folder.c:289
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Henter POP-melding %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:308
+#: camel/providers/pop3/camel-pop3-folder.c:307
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Kunne ikke hente melding fra POP-tjener %s: %s"
 
-#: camel/providers/pop3/camel-pop3-provider.c:34
+#: camel/providers/pop3/camel-pop3-provider.c:37
+msgid "Message storage"
+msgstr "Meldingslager"
+
+#: camel/providers/pop3/camel-pop3-provider.c:39
+msgid "Leave messages on server"
+msgstr "Behold meldinger på tjeneren"
+
+#: camel/providers/pop3/camel-pop3-provider.c:41
+#, c-format
+msgid "Delete after %s day(s)"
+msgstr "Slett etter %s dag(er)"
+
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:36
+#: camel/providers/pop3/camel-pop3-provider.c:50
 msgid ""
 "For connecting to POP servers. The POP protocol can also be used to retrieve "
 "mail from certain web mail providers and proprietary email systems."
@@ -3961,21 +4073,7 @@ msgstr ""
 "e-post fra enkelte e-posttilbydere via web i tillegg til proprietære "
 "e-postsystemer."
 
-#: camel/providers/pop3/camel-pop3-provider.c:54
-msgid "Secure POP"
-msgstr "Sikker POP"
-
-#: camel/providers/pop3/camel-pop3-provider.c:56
-msgid ""
-"For connecting to POP servers over an SSL connection. The POP protocol can "
-"also be used to retrieve mail from certain web mail providers and "
-"proprietary email systems."
-msgstr ""
-"For tilkobling til POP-tjenere over en SSL-forbindelse. POP-protokollen kan "
-"også brukes for å hente e-post fra enkelte e-posttilbydere via web i tillegg "
-"til proprietære e-postsystemer."
-
-#: camel/providers/pop3/camel-pop3-store.c:147
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -3984,7 +4082,7 @@ msgstr ""
 "klartekst. Dette er det eneste alternativet som er støttet av mange "
 "POP-tjenere."
 
-#: camel/providers/pop3/camel-pop3-store.c:157
+#: camel/providers/pop3/camel-pop3-provider.c:79
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -3994,29 +4092,29 @@ msgstr ""
 "passord via APOP-protokollen. Dette vil kanskje ikke virke for alle brukere "
 "selv på tjenere som hevder å støtte det."
 
-#: camel/providers/pop3/camel-pop3-store.c:169
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Dette lar deg koble til POP-tjeneren ved å bruke Kerberos 4 som "
 "autentisering."
 
-#: camel/providers/pop3/camel-pop3-store.c:214
+#: camel/providers/pop3/camel-pop3-store.c:207
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Kunne ikke autentisere mot KPOP-tjener: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:331
+#: camel/providers/pop3/camel-pop3-store.c:319
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Kunne ikke koble til POP-tjener på %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:378
+#: camel/providers/pop3/camel-pop3-store.c:358
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sVennligst skriv inn POP3-passord for %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:397
+#: camel/providers/pop3/camel-pop3-store.c:377
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4025,12 +4123,12 @@ msgstr ""
 "Kunne ikke koble til POP-tjener.\n"
 "Feil under oversending av brukernavn: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:400
-#: camel/providers/pop3/camel-pop3-store.c:437
+#: camel/providers/pop3/camel-pop3-store.c:380
+#: camel/providers/pop3/camel-pop3-store.c:417
 msgid "(Unknown)"
 msgstr "(Ukjent)"
 
-#: camel/providers/pop3/camel-pop3-store.c:427
+#: camel/providers/pop3/camel-pop3-store.c:407
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -4038,7 +4136,7 @@ msgstr ""
 "Kunne ikke koble til POP-tjeneren.\n"
 "Ingen støtte for forespurt autentiseringsmekanisme."
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:415
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4047,17 +4145,17 @@ msgstr ""
 "Kunne ikke koble til POP-tjener.\n"
 "Feil ved oversending av passord: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:544
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ingen slik mappe `%s'."
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:61
+#: camel/providers/sendmail/camel-sendmail-provider.c:37
+#: mail/mail-config.glade.h:57
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: camel/providers/sendmail/camel-sendmail-provider.c:39
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
@@ -4065,341 +4163,326 @@ msgstr ""
 "For levering av e-post ved å videresende den til \"sendmail\"-programmet på "
 "det lokale systemet."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
+#: camel/providers/sendmail/camel-sendmail-transport.c:107
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Kunne ikke opprette rør til sendmail: %s: melding ikke sendt"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
+#: camel/providers/sendmail/camel-sendmail-transport.c:124
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Kunne ikke kjøre fork på sendmail: %s: melding ikke sendt"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
+#: camel/providers/sendmail/camel-sendmail-transport.c:150
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Kunne ikke sende meldingen: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
+#: camel/providers/sendmail/camel-sendmail-transport.c:163
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail avsluttet med signal %s: melding ikke sendt."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
+#: camel/providers/sendmail/camel-sendmail-transport.c:170
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Kunne ikke kjøre %s: melding ikke sendt."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
+#: camel/providers/sendmail/camel-sendmail-transport.c:175
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail avsluttet med status %d: melding ikke sendt."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:192
+#: camel/providers/sendmail/camel-sendmail-transport.c:194
 msgid "Could not find 'From' address in message"
 msgstr "Kunne ikke finne 'Fra'-adresse i melding"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:245
+#: camel/providers/sendmail/camel-sendmail-transport.c:247
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:249
 msgid "Mail delivery via the sendmail program"
 msgstr "Levering av e-post via sendmail programmet"
 
-#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:55
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:36
+#: camel/providers/smtp/camel-smtp-provider.c:40
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "For levering av e-post via en ekstern e-posttjener med SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-provider.c:53
-msgid "Secure SMTP"
-msgstr "Sikker SMTP"
-
-#: camel/providers/smtp/camel-smtp-provider.c:55
-msgid ""
-"For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
-"connection.\n"
-msgstr ""
-"For levering av e-post via en ekstern e-posttjener med SMTP over en "
-"SSL-forbindelse.\n"
-
-#: camel/providers/smtp/camel-smtp-transport.c:148
+#: camel/providers/smtp/camel-smtp-transport.c:165
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaksfeil, kommando ikke gjenkjent"
 
-#: camel/providers/smtp/camel-smtp-transport.c:150
+#: camel/providers/smtp/camel-smtp-transport.c:167
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaksfeil i parametere eller argumenter"
 
-#: camel/providers/smtp/camel-smtp-transport.c:152
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Command not implemented"
 msgstr "Kommando ikke implementert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:154
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Command parameter not implemented"
 msgstr "Kommandoparameter ikke implementert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:156
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "System status, or system help reply"
 msgstr "Systemstatus, eller svar på systemhjelp"
 
-#: camel/providers/smtp/camel-smtp-transport.c:158
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Help message"
 msgstr "Hjelp-melding"
 
-#: camel/providers/smtp/camel-smtp-transport.c:160
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Service ready"
 msgstr "Tjeneste klar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:162
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Service closing transmission channel"
 msgstr "Tjenesten lukker sendekanalen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:164
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service not available, closing transmission channel"
 msgstr "Tjenesten er ikke tilgjengelig, lukker sendekanalen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:166
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Requested mail action okay, completed"
 msgstr "Forespurt e-post handling er ok, fullført"
 
-#: camel/providers/smtp/camel-smtp-transport.c:168
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "User not local; will forward to <forward-path>"
 msgstr "Ikke lokal bruker; videresender til <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Forespurt e-post handling er ikke utført: postboks ikke tilgjengelig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Forespurt handling ikke utført: postboks ikke tilgjengelig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested action aborted: error in processing"
 msgstr "Forespurt handling avbrutt: feil i prosessering"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "User not local; please try <forward-path>"
 msgstr "Ikke lokal bruker; vennligst prøv <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Forespurt handling ikke utført: utilstrekkelig lagringsplass"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Forespurt e-post handling avbrutt: lagringsallokering oversteget"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Forespurt handling ikke utført: postboksnavn ikke tillatt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Start e-post input; slutt med <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Transaction failed"
 msgstr "Transaksjonen feilet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "A password transition is needed"
 msgstr "Passordoverføring kreves"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Authentication mechanism is too weak"
 msgstr "Autentiseringsmekanismen er for svak"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Kryptering kreves for forespurt autentiseringsmekanisme."
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Temporary authentication failure"
 msgstr "Midlertidig autentiseringsfeil"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication required"
 msgstr "Autentisering kreves"
 
-#: camel/providers/smtp/camel-smtp-transport.c:289
+#: camel/providers/smtp/camel-smtp-transport.c:305
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Feil ved Welcome-svar: %s: mulig ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:361
+#: camel/providers/smtp/camel-smtp-transport.c:348
+#, c-format
+msgid "SMTP server %s does not support requested authentication type %s"
+msgstr "SMTP-tjener %s støtter ikke etterspurt autentiseringstype %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:388
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sVennligst skriv inn SMTP-passord for %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:469
-msgid "No authentication required"
-msgstr "Ingen autentisering nødvendig"
-
-#: camel/providers/smtp/camel-smtp-transport.c:471
-msgid ""
-"This option will connect to the SMTP server without using any kind of "
-"authentication. This should be fine for connecting to most SMTP servers."
-msgstr ""
-"Dette alternativet lar deg koble til SMTP-tjeneren uten bruk av "
-"autentisering. Dette bør fungere for de fleste SMTP-tjenerene."
-
-#: camel/providers/smtp/camel-smtp-transport.c:514
+#: camel/providers/smtp/camel-smtp-transport.c:527
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-tjener %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:516
+#: camel/providers/smtp/camel-smtp-transport.c:529
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP e-postlevering via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:541
+#: camel/providers/smtp/camel-smtp-transport.c:554
 msgid "Cannot send message: sender address not defined."
 msgstr "Kan ikke sende melding: senderadresse ikke definert."
 
-#: camel/providers/smtp/camel-smtp-transport.c:548
+#: camel/providers/smtp/camel-smtp-transport.c:561
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan ikke sende melding: senderadresse ikke gyldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:562
+#: camel/providers/smtp/camel-smtp-transport.c:575
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan ikke sende melding: ingen mottakere definert."
 
-#: camel/providers/smtp/camel-smtp-transport.c:656
+#: camel/providers/smtp/camel-smtp-transport.c:669
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Tidsavbrudd for HELO-forespørsel: %s: ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:675
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Feil ved HELO-svar: %s: ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:710
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:721
+msgid "Error creating SASL authentication object."
+msgstr "Feil under oppretting av SASL-autentiseringsobjekt."
+
+#: camel/providers/smtp/camel-smtp-transport.c:736
+#: camel/providers/smtp/camel-smtp-transport.c:748
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Tidsavbrudd for AUTH-forespørsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:780
+#: camel/providers/smtp/camel-smtp-transport.c:798
 msgid "Bad authentication response from server.\n"
 msgstr "Ugyldig svar på autentisering fra tjener.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:805
+#: camel/providers/smtp/camel-smtp-transport.c:824
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Tidsavbrudd for \"MAIL FROM\"-forespørsel: %s: melding ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:824
+#: camel/providers/smtp/camel-smtp-transport.c:843
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "Feil ved \"MAIL FROM\"-forespørsel: %s: melding ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:849
+#: camel/providers/smtp/camel-smtp-transport.c:868
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Tidsavbrudd for \"RCPT TO\"-forespørsel: %s: melding ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:868
+#: camel/providers/smtp/camel-smtp-transport.c:887
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Feil ved \"RCPT TO\"-svar: %s: melding ikke sendt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:899
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Tidsavbrudd for DATA-forespørsel: %s: melding ikke sendt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Feil ved DATA-svar: %s: melding ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:933
-#: camel/providers/smtp/camel-smtp-transport.c:951
+#: camel/providers/smtp/camel-smtp-transport.c:952
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Tidsavbrudd for DATA-send: meldingsterminering: %s: melding ikke sendt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:989
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "Feil ved DATA-svar: meldingsterminering: %s: melding ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:994
+#: camel/providers/smtp/camel-smtp-transport.c:1013
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Tidsavbrudd for RSET-forespørsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1013
+#: camel/providers/smtp/camel-smtp-transport.c:1032
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Feil ved RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1036
+#: camel/providers/smtp/camel-smtp-transport.c:1055
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Tidsavbrudd for QUIT-forespørsel: %s: ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1055
+#: camel/providers/smtp/camel-smtp-transport.c:1074
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Feil ved QUIT-svar: %s: ikke-fatal"
 
-#: composer/e-msg-composer-attachment-bar.c:92
+#: composer/e-msg-composer-attachment-bar.c:95
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:94
+#: composer/e-msg-composer-attachment-bar.c:97
 #, c-format
 msgid "%u bytes"
 msgstr "%u bytes"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:105
+#: composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:112
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:329 mail/mail-display.c:113
+#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
 msgid "attachment"
 msgstr "vedlegg"
 
-#: composer/e-msg-composer-attachment-bar.c:418
+#: composer/e-msg-composer-attachment-bar.c:421
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Legg ved en fil"
 
-#: composer/e-msg-composer-attachment-bar.c:466
+#: composer/e-msg-composer-attachment-bar.c:469
 msgid "Remove selected items from the attachment list"
 msgstr "Fjern valgte oppføringer fra vedleggslisten"
 
-#: composer/e-msg-composer-attachment-bar.c:497
+#: composer/e-msg-composer-attachment-bar.c:500
 msgid "Add attachment..."
 msgstr "Legg til vedlegg..."
 
-#: composer/e-msg-composer-attachment-bar.c:498
+#: composer/e-msg-composer-attachment-bar.c:501
 msgid "Attach a file to the message"
 msgstr "Legg en fil ved meldingen"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1013
+#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1017
 msgid "Attachment"
 msgstr "Vedlegg"
 
@@ -4423,52 +4506,52 @@ msgstr "MIME-type:"
 msgid "Send as:"
 msgstr "Send som:"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:317
 msgid "Click here for the address book"
 msgstr "Klikk her for å få opp adresseboken"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:698
+#: composer/e-msg-composer-hdrs.c:348 mail/mail-format.c:709
 msgid "From:"
 msgstr "Fra:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:700
+#: composer/e-msg-composer-hdrs.c:354 mail/mail-format.c:711
 msgid "Reply-To:"
 msgstr "Svar-til:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:620
+#: composer/e-msg-composer-hdrs.c:365 mail/mail-format.c:633
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:702
+#: composer/e-msg-composer-hdrs.c:379 mail/mail-format.c:713
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:377
+#: composer/e-msg-composer-hdrs.c:380
 msgid "Enter the recipients of the message"
 msgstr "Skriv inn mottakerene for meldingen"
 
-#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:704
+#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:715
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:381
+#: composer/e-msg-composer-hdrs.c:384
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Skriv inn adressene som skal motta en kopi av meldingen"
 
-#: composer/e-msg-composer-hdrs.c:384
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:385
+#: composer/e-msg-composer-hdrs.c:388
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4476,7 +4559,7 @@ msgstr ""
 "Skriv inn adressene som skal motta en kopi av meldingen uten å komme til "
 "syne i mottakerlisten for meldingen."
 
-#: composer/e-msg-composer.c:521
+#: composer/e-msg-composer.c:528
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -4485,26 +4568,34 @@ msgstr ""
 "Kunne ikke åpne signaturfilen %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:709
+#: composer/e-msg-composer.c:716
 msgid "Save as..."
 msgstr "Lagre som..."
 
-#: composer/e-msg-composer.c:720
+#: composer/e-msg-composer.c:727
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Feil under lagring av fil: %s"
 
-#: composer/e-msg-composer.c:740
+#: composer/e-msg-composer.c:747
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Feil under lasting av fil: %s"
 
-#: composer/e-msg-composer.c:821 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:192
+#: composer/e-msg-composer.c:819
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
+"Kunne ikke åpne skisse-mappen for denne kontoen.\n"
+"Vil du bruke standard skisse-mappe?"
+
+#: composer/e-msg-composer.c:877 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:206
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:827
+#: composer/e-msg-composer.c:883
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4514,27 +4605,27 @@ msgstr ""
 "\n"
 "Vil du lagre endringene?"
 
-#: composer/e-msg-composer.c:852
+#: composer/e-msg-composer.c:908
 msgid "Open file"
 msgstr "Åpne fil"
 
-#: composer/e-msg-composer.c:978
+#: composer/e-msg-composer.c:1034
 msgid "That file does not exist."
 msgstr "Filen eksisterer ikke."
 
-#: composer/e-msg-composer.c:988
+#: composer/e-msg-composer.c:1044
 msgid "That is not a regular file."
 msgstr "Er ikke en vanlig fil."
 
-#: composer/e-msg-composer.c:998
+#: composer/e-msg-composer.c:1054
 msgid "That file exists but is not readable."
 msgstr "Filen eksisterer men er ikke lesbar."
 
-#: composer/e-msg-composer.c:1008
+#: composer/e-msg-composer.c:1064
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Filen ser ut til å være tilgjengelig men open(2) feilet."
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1086
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4542,19 +4633,19 @@ msgstr ""
 "File en meget stor (mer enn 100K).\n"
 "Er du sikker på at du vil sette den inn?"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1107
 msgid "An error occurred while reading the file."
 msgstr "En feil oppsto under lesing fra filen."
 
-#: composer/e-msg-composer.c:1352 composer/e-msg-composer.c:1684
+#: composer/e-msg-composer.c:1408 composer/e-msg-composer.c:1740
 msgid "Compose a message"
 msgstr "Skriv en melding"
 
-#: composer/e-msg-composer.c:1768
+#: composer/e-msg-composer.c:1829
 msgid "Could not create composer window."
 msgstr "Kan ikke opprette komponeringsvinduet."
 
-#: composer/evolution-composer.c:353
+#: composer/evolution-composer.c:355
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -4562,7 +4653,7 @@ msgstr ""
 "Kunne ikke opprette skrivevindu fordi du ikke har satt\n"
 "opp en identitet i e-post-komponenten."
 
-#: composer/evolution-composer.c:368
+#: composer/evolution-composer.c:370
 msgid "Cannot initialize Evolution's composer."
 msgstr "Kan ikke initiere Evolutions composer."
 
@@ -4580,8 +4671,8 @@ msgstr "kalenderinformasjon"
 
 #. strptime format for a date.
 #: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
+#: widgets/misc/e-dateedit.c:1282 widgets/misc/e-dateedit.c:1463
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
@@ -4609,8 +4700,8 @@ msgstr "%H:%M%n"
 
 #. strftime format of a weekday and a date.
 #: e-util/e-time-utils.c:269
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2503
 msgid "%a %m/%d/%Y"
 msgstr "%a %d.%m.%Y"
 
@@ -4628,8 +4719,8 @@ msgstr "%a %m/%d/%Y %I:%M %p"
 
 #. strftime format of a time in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1248
-#: widgets/misc/e-dateedit.c:1307 widgets/misc/e-dateedit.c:1486
+#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1257
+#: widgets/misc/e-dateedit.c:1316 widgets/misc/e-dateedit.c:1495
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -4640,8 +4731,8 @@ msgstr "%H:%M:%S"
 
 #. strftime format of a time in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1251
-#: widgets/misc/e-dateedit.c:1310 widgets/misc/e-dateedit.c:1489
+#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1260
+#: widgets/misc/e-dateedit.c:1319 widgets/misc/e-dateedit.c:1498
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -4794,87 +4885,87 @@ msgstr "Test bonobo-tjeneste"
 msgid "Test service"
 msgstr "Test-tjeneste"
 
-#: executive-summary/test-service/rdf-summary.c:509
-#: executive-summary/test-service/rdf-summary.c:546
-#: executive-summary/test-service/rdf-summary.c:591
+#: executive-summary/test-service/rdf-summary.c:512
+#: executive-summary/test-service/rdf-summary.c:549
+#: executive-summary/test-service/rdf-summary.c:594
 #: widgets/misc/e-messagebox.c:166
 msgid "Error"
 msgstr "Feil"
 
-#: executive-summary/test-service/rdf-summary.c:765
+#: executive-summary/test-service/rdf-summary.c:768
 msgid "Update automatically"
 msgstr "Oppdater automatisk"
 
-#: executive-summary/test-service/rdf-summary.c:775
+#: executive-summary/test-service/rdf-summary.c:778
 msgid "Update now"
 msgstr "Oppdater nå"
 
-#: executive-summary/test-service/rdf-summary.c:785
+#: executive-summary/test-service/rdf-summary.c:788
 msgid "Update every "
 msgstr "Oppdater hver(t) "
 
-#: executive-summary/test-service/rdf-summary.c:793
-#: filter/filter-datespec.c:74
+#: executive-summary/test-service/rdf-summary.c:796
+#: filter/filter-datespec.c:83
 msgid "minutes"
 msgstr "minutter"
 
-#: filter/filter-datespec.c:69
+#: filter/filter-datespec.c:78
 msgid "year"
 msgstr "år"
 
-#: filter/filter-datespec.c:69
+#: filter/filter-datespec.c:78
 msgid "years"
 msgstr "år"
 
-#: filter/filter-datespec.c:70
+#: filter/filter-datespec.c:79
 msgid "month"
 msgstr "måned"
 
-#: filter/filter-datespec.c:70
+#: filter/filter-datespec.c:79
 msgid "months"
 msgstr "måneder"
 
-#: filter/filter-datespec.c:71
+#: filter/filter-datespec.c:80
 msgid "week"
 msgstr "uke"
 
-#: filter/filter-datespec.c:71
+#: filter/filter-datespec.c:80
 msgid "weeks"
 msgstr "uker"
 
-#: filter/filter-datespec.c:72
+#: filter/filter-datespec.c:81
 msgid "days"
 msgstr "dager"
 
-#: filter/filter-datespec.c:73
+#: filter/filter-datespec.c:82
 msgid "hour"
 msgstr "time"
 
-#: filter/filter-datespec.c:73
+#: filter/filter-datespec.c:82
 msgid "hours"
 msgstr "timer"
 
-#: filter/filter-datespec.c:74
+#: filter/filter-datespec.c:83
 msgid "minute"
 msgstr "minutt"
 
-#: filter/filter-datespec.c:75
+#: filter/filter-datespec.c:84
 msgid "second"
 msgstr "sekund"
 
-#: filter/filter-datespec.c:75
+#: filter/filter-datespec.c:84
 msgid "seconds"
 msgstr " sekunder"
 
-#: filter/filter-datespec.c:190
+#: filter/filter-datespec.c:199
 msgid "Oops. You have forgotten to choose a date."
 msgstr "Du har glemt å velge en dato."
 
-#: filter/filter-datespec.c:192
+#: filter/filter-datespec.c:201
 msgid "Oops. You have chosen an invalid date."
 msgstr "Du har valgt en ugyldig dato."
 
-#: filter/filter-datespec.c:266
+#: filter/filter-datespec.c:275
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
@@ -4884,7 +4975,7 @@ msgstr ""
 "når filteret kjøres eller tiden når vfolderen\n"
 "åpnes."
 
-#: filter/filter-datespec.c:289
+#: filter/filter-datespec.c:298
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -4892,7 +4983,7 @@ msgstr ""
 "Meldingens dato vil bli sammenlignet med\n"
 "tiden du spesifiserer her."
 
-#: filter/filter-datespec.c:329
+#: filter/filter-datespec.c:338
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -4903,48 +4994,44 @@ msgstr ""
 "for eksempel \"for en uke siden\"."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:364
+#: filter/filter-datespec.c:373
 msgid "the current time"
 msgstr "tiden nå"
 
-#: filter/filter-datespec.c:364
+#: filter/filter-datespec.c:373
 msgid "a time you specify"
 msgstr "en tid du spesifiserer"
 
-#: filter/filter-datespec.c:365
+#: filter/filter-datespec.c:374
 msgid "a time relative to the current time"
 msgstr "en tid relativ til tiden nå"
 
 #. The label
-#: filter/filter-datespec.c:423
+#: filter/filter-datespec.c:432
 msgid "Compare against"
 msgstr "Sammenligne med"
 
-#: filter/filter-datespec.c:540 filter/filter-datespec.c:700
+#: filter/filter-datespec.c:549 filter/filter-datespec.c:709
 msgid "now"
 msgstr "nå"
 
-#: filter/filter-datespec.c:697
+#: filter/filter-datespec.c:706
 msgid "<click here to select a date>"
 msgstr "<klikk her for å velge en dato>"
 
-#: filter/filter-editor.c:127 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:6
 msgid "Filter Rules"
 msgstr "Filterregler"
 
 #. and now for the action area
-#: filter/filter-filter.c:428
+#: filter/filter-filter.c:453
 msgid "Then"
 msgstr "Så"
 
-#: filter/filter-filter.c:441
+#: filter/filter-filter.c:467
 msgid "Add action"
 msgstr "Legg til handling"
 
-#: filter/filter-filter.c:447
-msgid "Remove action"
-msgstr "Fjern handling"
-
 #: filter/filter-folder.c:147
 msgid ""
 "Oops, you forgot to choose a folder.\n"
@@ -4953,7 +5040,8 @@ msgstr ""
 "Du glemte å velge en meppe.\n"
 "Vennligst gå tilbake og spesifisér en gyldig mappe for levering av e-post."
 
-#: filter/filter-folder.c:222 filter/vfolder-rule.c:280
+#: filter/filter-folder.c:222 filter/vfolder-rule.c:285
+#: mail/mail-account-gui.c:678
 msgid "Select Folder"
 msgstr "Velg mappe"
 
@@ -4965,7 +5053,7 @@ msgstr "Skriv inn URI for mappen"
 msgid "<click here to select a folder>"
 msgstr "<klikk her for å velge en mappe>"
 
-#: filter/filter-input.c:189
+#: filter/filter-input.c:194
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -4974,42 +5062,38 @@ msgstr ""
 "Feil i regulært uttrykk '%s':\n"
 "%s"
 
-#: filter/filter-part.c:469
+#: filter/filter-part.c:475
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:601
+#: filter/filter-rule.c:624
 msgid "Rule name: "
 msgstr "Regelnavn: "
 
-#: filter/filter-rule.c:605
+#: filter/filter-rule.c:628
 msgid "Untitled"
 msgstr "Uten navn"
 
-#: filter/filter-rule.c:621
+#: filter/filter-rule.c:644
 msgid "If"
 msgstr "Hvis"
 
-#: filter/filter-rule.c:638
+#: filter/filter-rule.c:662
 msgid "Execute actions"
 msgstr "Utfør handlinger"
 
-#: filter/filter-rule.c:642
+#: filter/filter-rule.c:666
 msgid "if all criteria are met"
 msgstr "hvis alle kriterier er møtt"
 
-#: filter/filter-rule.c:647
+#: filter/filter-rule.c:671
 msgid "if any criteria are met"
 msgstr "hvis et kriterie er møtt"
 
-#: filter/filter-rule.c:658
+#: filter/filter-rule.c:682
 msgid "Add criterion"
 msgstr "Legg til kriterie"
 
-#: filter/filter-rule.c:664
-msgid "Remove criterion"
-msgstr "Fjern kriterie"
-
 #: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr "Redigér filtre"
@@ -5026,7 +5110,7 @@ msgstr "Innkommende"
 msgid "Outgoing"
 msgstr "Utgående"
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:127
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Virtuelle mapper"
 
@@ -5050,183 +5134,188 @@ msgstr "med alle lokaleog aktive eksterne mapper"
 msgid "with all local folders"
 msgstr "med alle lokale mapper"
 
-#: filter/libfilter-i18n.h:3
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
 msgid "Assign Colour"
 msgstr "Gi farge"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Gi poeng"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 msgid "Attachments"
 msgstr "Vedlegg"
 
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "inneholder"
-
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Copy to Folder"
 msgstr "Kopiér til mappe"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date received"
 msgstr "Dato mottatt"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:7
 msgid "Date sent"
 msgstr "Dato sendt"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:9
 msgid "Deleted"
 msgstr "Slettet"
 
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "inneholder ikke"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "slutter ikke med"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "eksisterer ikke"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not sound like"
-msgstr "ligner ikke"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not start with"
-msgstr "starter ikke med"
-
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:10
 msgid "Do Not Exist"
 msgstr "Eksisterer ikke"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:11
 msgid "Draft"
 msgstr "Skisse"
 
-#: filter/libfilter-i18n.h:20
-msgid "ends with"
-msgstr "slutter med"
-
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:12
 msgid "Exist"
 msgstr "Eksisterer"
 
-#: filter/libfilter-i18n.h:22
-msgid "exists"
-msgstr "eksisterer"
-
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:13
 msgid "Expression"
 msgstr "Uttrykk"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:14
 msgid "Forward to Address"
 msgstr "Videresend til adresse"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:15
 msgid "Important"
 msgstr "Viktig"
 
-#: filter/libfilter-i18n.h:26
-msgid "is"
-msgstr "er"
-
-#: filter/libfilter-i18n.h:27
-msgid "is greater than"
-msgstr "er større enn"
-
-#: filter/libfilter-i18n.h:28
-msgid "is less than"
-msgstr "er mindre enn"
-
-#: filter/libfilter-i18n.h:29
-msgid "is not"
-msgstr "er ikke"
-
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:16
 msgid "Mailing list"
 msgstr "E-postliste"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:17
 msgid "Message Body"
 msgstr "Meldingskropp"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:18
 msgid "Message Header"
 msgstr "Meldingshode"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:19
 msgid "Message was received"
 msgstr "Meldingen ble mottatt"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:20
 msgid "Message was sent"
 msgstr "Meldingen ble sendt"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:21
 msgid "Move to Folder"
 msgstr "Flytt til mappe"
 
-#: filter/libfilter-i18n.h:36
-msgid "on or after"
-msgstr "på eller etter"
-
-#: filter/libfilter-i18n.h:37
-msgid "on or before"
-msgstr "på eller før"
-
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:22
 msgid "Read"
 msgstr "Les"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:23
 msgid "Recipients"
 msgstr "Mottakere"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:24
 msgid "Regex Match"
 msgstr "Treff på vanlig uttrykk"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:25
 msgid "Replied to"
 msgstr "Svart til"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:195 filter/score-rule.c:197
-#: mail/message-list.c:1013
+#: filter/libfilter-i18n.h:26 filter/score-rule.c:203 filter/score-rule.c:205
+#: mail/message-list.c:1017
 msgid "Score"
 msgstr "Poenggi"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:27
+msgid "Sender"
+msgstr "Avsender"
+
+#: filter/libfilter-i18n.h:28
 msgid "Set Status"
 msgstr "Sett status"
 
-#: filter/libfilter-i18n.h:45
-msgid "sounds like"
-msgstr "lyder som"
-
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:29
 msgid "Specific header"
 msgstr "Spesifikk header"
 
-#: filter/libfilter-i18n.h:47
-msgid "starts with"
-msgstr "starter med"
-
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:31
 msgid "Stop Processing"
 msgstr "Stopp behandling"
 
-#: filter/libfilter-i18n.h:50 mail/message-list.c:1014
+#: filter/libfilter-i18n.h:32 mail/message-list.c:1018
 msgid "Subject"
 msgstr "Emne"
 
+#: filter/libfilter-i18n.h:35
+msgid "contains"
+msgstr "inneholder"
+
+#: filter/libfilter-i18n.h:36
+msgid "does not contain"
+msgstr "inneholder ikke"
+
+#: filter/libfilter-i18n.h:37
+msgid "does not end with"
+msgstr "slutter ikke med"
+
+#: filter/libfilter-i18n.h:38
+msgid "does not exist"
+msgstr "eksisterer ikke"
+
+#: filter/libfilter-i18n.h:39
+msgid "does not sound like"
+msgstr "ligner ikke"
+
+#: filter/libfilter-i18n.h:40
+msgid "does not start with"
+msgstr "starter ikke med"
+
+#: filter/libfilter-i18n.h:41
+msgid "ends with"
+msgstr "slutter med"
+
+#: filter/libfilter-i18n.h:42
+msgid "exists"
+msgstr "eksisterer"
+
+#: filter/libfilter-i18n.h:43
+msgid "is greater than"
+msgstr "er større enn"
+
+#: filter/libfilter-i18n.h:44
+msgid "is less than"
+msgstr "er mindre enn"
+
+#: filter/libfilter-i18n.h:45
+msgid "is not"
+msgstr "er ikke"
+
+#: filter/libfilter-i18n.h:46
+msgid "is"
+msgstr "er"
+
+#: filter/libfilter-i18n.h:47
+msgid "on or after"
+msgstr "på eller etter"
+
+#: filter/libfilter-i18n.h:48
+msgid "on or before"
+msgstr "på eller før"
+
+#: filter/libfilter-i18n.h:49
+msgid "sounds like"
+msgstr "lyder som"
+
+#: filter/libfilter-i18n.h:50
+msgid "starts with"
+msgstr "starter med"
+
 #: filter/libfilter-i18n.h:51
 msgid "was after"
 msgstr "var etter"
@@ -5235,111 +5324,111 @@ msgstr "var etter"
 msgid "was before"
 msgstr "var før"
 
-#: filter/score-editor.c:127
+#: filter/score-editor.c:130
 msgid "Score Rules"
 msgstr "Poengregler"
 
-#: mail/component-factory.c:319
+#: mail/component-factory.c:332
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikke initiere Evolutions e-postkomponent."
 
-#: mail/component-factory.c:392
+#: mail/component-factory.c:405
 msgid "Cannot register storage with shell"
 msgstr "Kan ikke registrere lagring i skallet"
 
-#: mail/folder-browser-factory.c:242
+#: mail/folder-browser-factory.c:208
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Egenskaper for \"%s\""
 
-#: mail/folder-browser-factory.c:244 ui/evolution-event-editor.xml.h:39
+#: mail/folder-browser-factory.c:210 ui/evolution-event-editor.xml.h:39
 #: ui/evolution-task-editor-dialog.xml.h:42
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: mail/folder-browser.c:219
+#: mail/folder-browser.c:222
 msgid "Store search as vFolder"
 msgstr "Lagre søk som vMappe"
 
-#: mail/folder-browser.c:510
+#: mail/folder-browser.c:513
 msgid "VFolder on Subject"
 msgstr "VFolder for emne"
 
-#: mail/folder-browser.c:513
+#: mail/folder-browser.c:516
 msgid "VFolder on Sender"
 msgstr "VFolder for sender"
 
-#: mail/folder-browser.c:516
+#: mail/folder-browser.c:519
 msgid "VFolder on Recipients"
 msgstr "VFolder for mottakere"
 
-#: mail/folder-browser.c:519 mail/folder-browser.c:710
+#: mail/folder-browser.c:522 mail/folder-browser.c:713
 msgid "VFolder on Mailing List"
 msgstr "VFolder på e-postliste"
 
-#: mail/folder-browser.c:525
+#: mail/folder-browser.c:528
 msgid "Filter on Subject"
 msgstr "Filtrér etter emne"
 
-#: mail/folder-browser.c:528
+#: mail/folder-browser.c:531
 msgid "Filter on Sender"
 msgstr "Filtrér etter sender"
 
-#: mail/folder-browser.c:531
+#: mail/folder-browser.c:534
 msgid "Filter on Recipients"
 msgstr "Filtrér etter mottaker"
 
-#: mail/folder-browser.c:534 mail/folder-browser.c:709
+#: mail/folder-browser.c:537 mail/folder-browser.c:712
 msgid "Filter on Mailing List"
 msgstr "Filtrér etter e-postliste"
 
-#: mail/folder-browser.c:545
+#: mail/folder-browser.c:548
 msgid "Resend"
 msgstr "Send på nytt"
 
-#: mail/folder-browser.c:547
+#: mail/folder-browser.c:550
 msgid "Save As..."
 msgstr "Lagre som..."
 
-#: mail/folder-browser.c:549 mail/mail-view.c:151
+#: mail/folder-browser.c:552 mail/mail-view.c:154
 #: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:28 ui/evolution-tasks.xml.h:4
+#: ui/evolution-mail.xml.h:29 ui/evolution-tasks.xml.h:4
 msgid "Print"
 msgstr "Skriv ut"
 
-#: mail/folder-browser.c:554
+#: mail/folder-browser.c:557
 msgid "Reply to Sender"
 msgstr "Svar til sender"
 
-#: mail/folder-browser.c:556 mail/mail-view.c:144 ui/evolution-mail.xml.h:35
+#: mail/folder-browser.c:559 mail/mail-view.c:147 ui/evolution-mail.xml.h:36
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: mail/folder-browser.c:558 mail/mail-view.c:147 ui/evolution-mail.xml.h:14
+#: mail/folder-browser.c:561 mail/mail-view.c:150 ui/evolution-mail.xml.h:14
 msgid "Forward"
 msgstr "Videresend"
 
-#: mail/folder-browser.c:560
+#: mail/folder-browser.c:563
 msgid "Forward inline"
 msgstr "Videresend \"inline\""
 
-#: mail/folder-browser.c:563
+#: mail/folder-browser.c:566
 msgid "Mark as Read"
 msgstr "Markér som lest"
 
-#: mail/folder-browser.c:565
+#: mail/folder-browser.c:568
 msgid "Mark as Unread"
 msgstr "Merk som ulest"
 
-#: mail/folder-browser.c:570
+#: mail/folder-browser.c:573
 msgid "Move to Folder..."
 msgstr "Flytt til mappe..."
 
-#: mail/folder-browser.c:572
+#: mail/folder-browser.c:575
 msgid "Copy to Folder..."
 msgstr "Kopiér til mappe..."
 
-#: mail/folder-browser.c:576
+#: mail/folder-browser.c:579
 msgid "Undelete"
 msgstr "Angre slett"
 
@@ -5347,20 +5436,20 @@ msgstr "Angre slett"
 #. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
 #. { "",                               NULL,
 #. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:586
+#: mail/folder-browser.c:589
 msgid "Apply Filters"
 msgstr "Påfør filtre"
 
-#: mail/folder-browser.c:590
+#: mail/folder-browser.c:593
 msgid "Create Rule From Message"
 msgstr "Lage regel fra melding"
 
-#: mail/folder-browser.c:712
+#: mail/folder-browser.c:715
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrér etter e-postliste (%s)"
 
-#: mail/folder-browser.c:713
+#: mail/folder-browser.c:716
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VFolder på e-postliste (%s)"
@@ -5431,65 +5520,65 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-accounts.c:118
+#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
 msgid " (default)"
 msgstr " (forvalgt)"
 
-#: mail/mail-accounts.c:226 mail/mail-accounts.c:230
+#: mail/mail-accounts.c:197
+msgid "Disable"
+msgstr "Deaktiver"
+
+#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+msgid "Enable"
+msgstr "Aktiver"
+
+#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
 msgid "Are you sure you want to delete this account?"
 msgstr "Er du sikker på at du vil slette denne kontoen?"
 
-#: mail/mail-accounts.c:336 mail/mail-accounts.c:340
+#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
 msgid "Are you sure you want to delete this news account?"
 msgstr "Er du sikker på at du vil slette denne diskusjonsgruppekontoen?"
 
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:425
+#: mail/mail-accounts.c:536
 msgid "Evolution Account Manager"
 msgstr "Kontohåndtering for Evolution"
 
-#: mail/mail-account-editor.c:304
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
-msgstr ""
-"En eller flere av dine tjenere er ikke korrekt konfigurert.\n"
-"Vil du lagre likevel?"
+#: mail/mail-account-editor.c:105
+msgid "You have not filled in all of the required information."
+msgstr "Du har ikke fylt ut all nødvendig informasjon."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:723
+#: mail/mail-account-editor.c:173
 msgid "Evolution Account Editor"
 msgstr "Kontoredigering for Evolution"
 
-#: mail/mail-account-editor.c:744
-msgid "Unspecified"
-msgstr "Uspesifisert"
-
-#: mail/mail-autofilter.c:69
+#: mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "Send til %s"
 
-#: mail/mail-autofilter.c:212
+#: mail/mail-autofilter.c:213
 #, c-format
 msgid "Subject is %s"
 msgstr "Emne er %s"
 
-#: mail/mail-autofilter.c:228
+#: mail/mail-autofilter.c:229
 #, c-format
 msgid "Mail from %s"
 msgstr "E-post fra %s"
 
-#: mail/mail-autofilter.c:284
+#: mail/mail-autofilter.c:285
 #, c-format
 msgid "%s mailing list"
 msgstr "%s e-postliste"
 
-#: mail/mail-autofilter.c:334 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:357
 msgid "Add Filter Rule"
 msgstr "Legg til filterregel"
 
-#: mail/mail-callbacks.c:87
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5501,7 +5590,7 @@ msgstr ""
 "motta eller skrive meldinger.\n"
 "Vil du konfigurere den nå?"
 
-#: mail/mail-callbacks.c:140
+#: mail/mail-callbacks.c:146
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5509,7 +5598,7 @@ msgstr ""
 "Du må konfigurere en identitet\n"
 "før du kan skrive e-post."
 
-#: mail/mail-callbacks.c:152
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -5517,11 +5606,11 @@ msgstr ""
 "Du må konfigurere en e-post-transport\n"
 "før du kan skrive e-post."
 
-#: mail/mail-callbacks.c:196
+#: mail/mail-callbacks.c:202
 msgid "You have not set a mail transport method"
 msgstr "Du har ikke satt en transportmetode for e-post"
 
-#: mail/mail-callbacks.c:229
+#: mail/mail-callbacks.c:235
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -5529,32 +5618,32 @@ msgstr ""
 "Denne meldingen har ikke emne.\n"
 "Send likevel?"
 
-#: mail/mail-callbacks.c:298
-msgid "You must configure an account before you can send this email."
-msgstr "Du må konfigurere en konto før du kan sender denne meldingen."
-
-#: mail/mail-callbacks.c:320
+#: mail/mail-callbacks.c:308
 msgid "You must specify recipients in order to send this message."
 msgstr "Du må spesifisere mottakere for å kunne sende denne meldingen."
 
-#: mail/mail-callbacks.c:585
+#: mail/mail-callbacks.c:351
+msgid "You must configure an account before you can send this email."
+msgstr "Du må konfigurere en konto før du kan sender denne meldingen."
+
+#: mail/mail-callbacks.c:591
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "Den %s, skrev %s:\n"
 
-#: mail/mail-callbacks.c:767
+#: mail/mail-callbacks.c:773
 msgid "Forwarded message:\n"
 msgstr "Videresendt melding:\n"
 
-#: mail/mail-callbacks.c:870
+#: mail/mail-callbacks.c:876
 msgid "Move message(s) to"
 msgstr "Flytt melding(er) til"
 
-#: mail/mail-callbacks.c:872
+#: mail/mail-callbacks.c:878
 msgid "Copy message(s) to"
 msgstr "Kopiér melding(er) til"
 
-#: mail/mail-callbacks.c:1013
+#: mail/mail-callbacks.c:1019
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -5562,7 +5651,7 @@ msgstr ""
 "Du kan kun redigere meldinger lagret\n"
 "i Skisser-katalogen."
 
-#: mail/mail-callbacks.c:1050
+#: mail/mail-callbacks.c:1056
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -5570,11 +5659,11 @@ msgstr ""
 "Du kan kun sende meldinger på nytt\n"
 "som er lagret i sendt-katalogen."
 
-#: mail/mail-callbacks.c:1083 mail/mail-display.c:83
+#: mail/mail-callbacks.c:1089 mail/mail-display.c:90
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
-#: mail/mail-callbacks.c:1087 mail/mail-display.c:87
+#: mail/mail-callbacks.c:1093 mail/mail-display.c:94
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -5582,15 +5671,15 @@ msgstr ""
 "En fil med samme navn eksisterer allerede.\n"
 "Overskriv den?"
 
-#: mail/mail-callbacks.c:1131
+#: mail/mail-callbacks.c:1137
 msgid "Save Message As..."
 msgstr "Lagre melding som..."
 
-#: mail/mail-callbacks.c:1133
+#: mail/mail-callbacks.c:1139
 msgid "Save Messages As..."
 msgstr "Lagre meldinger som..."
 
-#: mail/mail-callbacks.c:1247
+#: mail/mail-callbacks.c:1252
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -5599,45 +5688,53 @@ msgstr ""
 "Feil under lasting av filter-informasjon:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1296
+#: mail/mail-callbacks.c:1301
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/mail-callbacks.c:1343
+#: mail/mail-callbacks.c:1348
 msgid "Printing of message failed"
 msgstr "Feil under utskrift av melding"
 
+#: mail/mail-config.c:1016 mail/mail-config.c:1019
+msgid "Connecting to server..."
+msgstr "Kobler til tjener..."
+
 #: mail/mail-config.glade.h:1
+msgid " Check for supported types "
+msgstr "Søk etter støttede typer..."
+
+#: mail/mail-config.glade.h:2
+msgid " color"
+msgstr " farge"
+
+#: mail/mail-config.glade.h:3
 msgid "Account"
 msgstr "Konto"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:4
 msgid "Account Information"
 msgstr "Kontoinformasjon"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:5
 msgid "Account Management"
 msgstr "Håndtering av konti"
 
-#: mail/mail-config.glade.h:5
-msgid "Advanced"
-msgstr "Avansert"
-
 #: mail/mail-config.glade.h:6
+msgid "Accounts"
+msgstr "Kontoer"
+
+#: mail/mail-config.glade.h:8
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: mail/mail-config.glade.h:7
-msgid "Authentication Type:"
-msgstr "Autentiseringstype:"
-
 #: mail/mail-config.glade.h:9
-msgid "Automatically check mail every"
-msgstr "Sjekk etter meldinger hver(t)"
+msgid "Authentication Type: "
+msgstr "Autentiseringstype: "
 
-#: mail/mail-config.glade.h:11
-msgid "Check settings"
-msgstr "Sjekk innstillinger"
+#: mail/mail-config.glade.h:10
+msgid "Automatically check for new mail every"
+msgstr "Sjekk etter meldinger automatisk hver(t)"
 
 #: mail/mail-config.glade.h:12
 msgid ""
@@ -5655,199 +5752,163 @@ msgstr ""
 "\n"
 "Klikk \"Fullfør\" for å lagre dine innstillinger"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "De_fault"
 msgstr "_Forvalgt"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Done"
 msgstr "Ferdig"
 
-#: mail/mail-config.glade.h:23
-msgid "Email Address:"
-msgstr "E-post adresse:"
+#: mail/mail-config.glade.h:21
+msgid "Drafts"
+msgstr "Skisser"
+
+#: mail/mail-config.glade.h:22
+msgid "Drafts folder:"
+msgstr "Skissemappe:"
 
 #: mail/mail-config.glade.h:24
-msgid "Email address:"
+msgid "Email Address:"
 msgstr "E-post adresse:"
 
-#: mail/mail-config.glade.h:25
-msgid "Evolution Mail Configuration"
-msgstr "Evolution e-post-konfigurasjon"
-
 #: mail/mail-config.glade.h:26
 msgid "Full Name:"
 msgstr "Fullt navn:"
 
+#: mail/mail-config.glade.h:27
+msgid "Highlight citations with "
+msgstr "Merk sitering med "
+
 #: mail/mail-config.glade.h:29
-msgid "Hostname:"
-msgstr "Vertsnavn:"
+msgid "IMAPv4 "
+msgstr "IMAPv4"
 
 #: mail/mail-config.glade.h:30
-msgid "IMAP"
-msgstr "IMAP"
-
-#: mail/mail-config.glade.h:31
 msgid "Identity"
 msgstr "Identitet"
 
-#: mail/mail-config.glade.h:32
-msgid "Include this account when receiving mail"
-msgstr "Ta med denne kontoen når du mottar e-post"
-
-#: mail/mail-config.glade.h:33
-msgid "Keep mail on server"
-msgstr "Behold e-post på tjener"
-
-#: mail/mail-config.glade.h:34
-msgid "Kerberos"
-msgstr "Kerberos"
-
-#: mail/mail-config.glade.h:35
-msgid "Mail"
-msgstr "E-post"
-
-#: mail/mail-config.glade.h:36
-msgid "Mail Account"
-msgstr "E-post konto"
+#: mail/mail-config.glade.h:31
+msgid "Kerberos "
+msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:32
 msgid "Mail Configuration"
 msgstr "E-post-konfigurasjon"
 
-#: mail/mail-config.glade.h:38
-msgid "Mail Configuration Druid"
-msgstr "E-post-konfigurasjonsdruide"
-
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:33
 msgid "Make this my default account"
 msgstr "Bruk denne som standard konto"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:34
 msgid "Mark messages as \"Read\" after:"
 msgstr "Merk melding som \"Lest\" etter:"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:36
 msgid "News"
 msgstr "News"
 
-#: mail/mail-config.glade.h:44
-msgid "Optional"
-msgstr "Valgfri"
+#: mail/mail-config.glade.h:38
+msgid "Optional Information"
+msgstr "Tilleggsinformasjon"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:39
 msgid "Organization:"
 msgstr "Organisasjon:"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:41
 msgid "PGP binary path:"
 msgstr "Sti til PGP-binærfil:"
 
-#: mail/mail-config.glade.h:48
-msgid "Password:"
-msgstr "Passord:"
-
-#: mail/mail-config.glade.h:50
-msgid "Plain Text"
-msgstr "Vanlig tekst"
+#: mail/mail-config.glade.h:46
+msgid "Qmail maildir "
+msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:47
 msgid "Receiving Email"
 msgstr "Mottar e-post"
 
-#: mail/mail-config.glade.h:52
-msgid "Remember my password"
-msgstr "Husk mitt passord"
+#: mail/mail-config.glade.h:48
+msgid "Receiving Mail"
+msgstr "Mottar e-post"
+
+#: mail/mail-config.glade.h:49
+msgid "Receiving Options"
+msgstr "Mottar alternativer"
+
+#: mail/mail-config.glade.h:51
+msgid "Required Information"
+msgstr "Nødvendig informasjon"
 
 #: mail/mail-config.glade.h:53
-msgid "Reply address:"
-msgstr "Svaradresse:"
+msgid "Select PGP binary"
+msgstr "Velg PGP-binærfil"
 
 #: mail/mail-config.glade.h:54
-msgid "Required"
-msgstr "Nødvendige"
+msgid "Send mail in HTML format by default."
+msgstr "Send meldinger i HTML-format som standard"
 
-#: mail/mail-config.glade.h:56
-msgid "Save password"
-msgstr "Lagre passord"
+#: mail/mail-config.glade.h:55
+msgid "Sending Email"
+msgstr "Sender e-post"
 
-#: mail/mail-config.glade.h:57
-msgid "Select PGP binary"
-msgstr "Velg PGP-binærfil"
+#: mail/mail-config.glade.h:56
+msgid "Sending Mail"
+msgstr "Sender e-post"
 
 #: mail/mail-config.glade.h:58
-msgid "Select signature file"
-msgstr "Velg signaturfil"
+msgid "Sent"
+msgstr "Sendt"
 
 #: mail/mail-config.glade.h:59
-msgid "Send mail in HTML format by default."
-msgstr "Send meldinger i HTML-format som standard"
+msgid "Sent and Draft Messages"
+msgstr "Sendte meldinger og skisser"
 
 #: mail/mail-config.glade.h:60
-msgid "Sending Email"
-msgstr "Sender e-post"
+msgid "Sent messages folder:"
+msgstr "Mappe for sendte meldinger:"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:61
 msgid "Server Configuration"
 msgstr "Tjenerkonfigurasjon"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:62
 msgid "Server Type: "
 msgstr "Tjenertype: "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Server requires authentication"
 msgstr "Tjener krever autentisering"
 
-#: mail/mail-config.glade.h:65
-msgid "Server type:"
-msgstr "Tjenertype:"
-
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "Signature file:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:67
-msgid "Signature:"
-msgstr "Signatur:"
-
-#: mail/mail-config.glade.h:68
-msgid "Source"
-msgstr "Kilde"
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:65
 msgid "Sources"
 msgstr "Kilder"
 
-#: mail/mail-config.glade.h:70
-msgid "Transport"
-msgstr "Transport"
+#: mail/mail-config.glade.h:66
+msgid "Special Folders"
+msgstr "Spesielle mapper"
 
-#: mail/mail-config.glade.h:71
-msgid "Transport Authentication"
-msgstr "Autentisering for transport"
+#: mail/mail-config.glade.h:67
+msgid "Standard Unix mbox"
+msgstr "Standard Unix mbox"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:68
 msgid "Type"
 msgstr "Type"
 
-#: mail/mail-config.glade.h:73
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-"Skriv inn et referansenavn for disse tjenerene. For eksempel: \"Arbeid\" "
-"eller \"Hjemme\"."
-
-#: mail/mail-config.glade.h:74
-msgid "User Information"
-msgstr "Brukerinformasjon"
+#: mail/mail-config.glade.h:69
+msgid "Use secure connection (SSL)"
+msgstr "Bruk sikker forbindelse (SSL)"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:70
 msgid "Username:"
 msgstr "Brukernavn:"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:71
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -5857,173 +5918,207 @@ msgstr ""
 "\n"
 "Klikk \"Neste\" for å begynne."
 
-#: mail/mail-config.glade.h:81 ui/evolution-event-editor.xml.h:58
+#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
 #: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:29
 msgid "_Edit"
 msgstr "R_edigér"
 
-#: mail/mail-config.glade.h:82
-msgid "minutes."
-msgstr "minutter."
+#: mail/mail-config-druid.c:99
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+"Vennligst skriv inn ditt navn og din e-post adresse under. De \"valgfrie\" "
+"feltene under må ikke nødvendigvis fylles ut, hvis du ikke ønsker å "
+"inkludere denne informasjonen i e-post du sender."
 
-#: mail/mail-config-druid.c:423
-#, c-format
+#: mail/mail-config-druid.c:101
 msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
+"Please enter information about your incoming mail server below. If you don't "
+"know what kind of server you use, contact your system administrator or "
+"Internet Service Provider."
 msgstr ""
-"Feil under verifisering av konfigurasjon av innkommende\n"
-"post. Du vil kunne oppleve problemer ved henting av e-post fra %s"
+"Vennligst skriv inn informasjon om din tjener for innkommende e-post under. "
+"Hvis du ikke vet hvilken type tjener du bruker, kontakt din "
+"systemadministrator eller Internett tjenestetilbyder."
 
-#: mail/mail-config-druid.c:517
-msgid "Namespace:"
-msgstr "Navneområde:"
+#: mail/mail-config-druid.c:105
+msgid ""
+"Please enter information about your outgoing mail protocol below. If you "
+"don't know which protocol you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+"Vennligst skriv inn informasjon om protokoll for utgående e-post under. Hvis "
+"du ikke vet hvilken protokoll du bruker, kontakt din systemadministrator "
+"eller Internett tjenestetilbyder."
 
-#: mail/mail-config-druid.c:710
-#, c-format
+#: mail/mail-config-druid.c:107
 msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
-"Feil under verifisering av konfigurasjon av utgående e-post.\n"
-"Du vil kunne oppleve problemer ved sending av e-post gjennom %s"
+"Du er nesten ferdig med konfigurasjonsprosessen. Verdiene for identitet, "
+"inkommende e-post-tjener og metode for utgående e-post-transport du har "
+"oppgitt vil grupperes sammen til en Evolution e-post-konto. Vennligst oppgi "
+"et navn for denne kontoen i feltet under. Dette navnet blir kun brukt for "
+"visning på skjermen."
 
 #. set window title
-#: mail/mail-config-druid.c:1217
+#: mail/mail-config-druid.c:445
 msgid "Evolution Account Wizard"
 msgstr "Evolution kontoveiviser"
 
-#: mail/mail-display.c:189
+#: mail/mail-display.c:194
 msgid "Save Attachment"
 msgstr "Lagre vedlegg"
 
-#: mail/mail-display.c:229
+#: mail/mail-display.c:234
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kunne ikke opprette midlertidig katalog: %s"
 
-#: mail/mail-display.c:290
+#: mail/mail-display.c:295
 msgid "Save to Disk..."
 msgstr "Lagre til disk..."
 
-#: mail/mail-display.c:292
+#: mail/mail-display.c:297
 #, c-format
 msgid "Open in %s..."
 msgstr "Åpne i %s..."
 
-#: mail/mail-display.c:294
+#: mail/mail-display.c:299
 msgid "View Inline"
 msgstr "Vis \"inline\""
 
-#: mail/mail-display.c:323
+#: mail/mail-display.c:334
 msgid "External Viewer"
 msgstr "Ekstern visning"
 
-#: mail/mail-display.c:346
+#: mail/mail-display.c:357
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Vis \"inline\" (via %s)"
 
-#: mail/mail-display.c:350
+#: mail/mail-display.c:361
 msgid "Hide"
 msgstr "Skjul"
 
-#: mail/mail-format.c:508
+#: mail/mail-display.c:1100
+msgid "Open link in browser"
+msgstr "Åpne lenke i nettleser"
+
+#: mail/mail-display.c:1102
+msgid "Save as (FIXME)"
+msgstr "Lagre som"
+
+#: mail/mail-display.c:1104
+msgid "Copy location (FIXME)"
+msgstr "Kopier lokasjon"
+
+#: mail/mail-format.c:512
 #, c-format
 msgid "%s attachment"
 msgstr "%s-vedlegg"
 
-#: mail/mail-format.c:725
+#: mail/mail-format.c:554
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
+
+#: mail/mail-format.c:736
 msgid "Loading message content"
 msgstr "Laster meldingsinnhold"
 
-#: mail/mail-format.c:1014
+#: mail/mail-format.c:1025
 msgid "Encrypted message not displayed"
 msgstr "Kryptert melding ikke vist"
 
-#: mail/mail-format.c:1020
+#: mail/mail-format.c:1031
 msgid "Encrypted message"
 msgstr "Kryptert melding"
 
-#: mail/mail-format.c:1021
+#: mail/mail-format.c:1032
 msgid "Click icon to decrypt."
 msgstr "Klikk på ikonet for å dekryptere."
 
-#: mail/mail-format.c:1090 mail/mail-format.c:1477
+#: mail/mail-format.c:1101 mail/mail-format.c:1488
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Denne meldingen er digitalt signert og er funnet autentisk."
 
-#: mail/mail-format.c:1098 mail/mail-format.c:1485
+#: mail/mail-format.c:1109 mail/mail-format.c:1496
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "Denne meldingen er digitalt signert, men kan ikke finnes autentisk."
 
-#: mail/mail-format.c:1698
+#: mail/mail-format.c:1709
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peker til FTP-tjener (%s)"
 
-#: mail/mail-format.c:1710
+#: mail/mail-format.c:1721
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Peker til lokal fil (%s) gyldig på nettsted \"%s\""
 
-#: mail/mail-format.c:1714
+#: mail/mail-format.c:1725
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peker til lokal fil (%s)"
 
-#: mail/mail-format.c:1748
+#: mail/mail-format.c:1759
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peker til ukjent ekstern data (\"%s\"-type)"
 
-#: mail/mail-format.c:1753
+#: mail/mail-format.c:1764
 msgid "Malformed external-body part."
 msgstr "Feilutformet del for ekstern-kropp."
 
-#: mail/mail-local.c:334
+#: mail/mail-local.c:337
 #, c-format
 msgid "No such folder %s"
 msgstr "Mappen %s eksisterer ikke"
 
-#: mail/mail-local.c:507
+#: mail/mail-local.c:509
 #, c-format
 msgid "Opening '%s'"
 msgstr "Åpner '%s'"
 
-#: mail/mail-local.c:785
+#: mail/mail-local.c:787
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Endrer mappe \"%s\" til \"%s\"-format"
 
-#: mail/mail-local.c:789
+#: mail/mail-local.c:791
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Endre mappe \"%s\" til \"%s\"-format"
 
-#: mail/mail-local.c:813
+#: mail/mail-local.c:815
 msgid "Reconfiguring folder"
 msgstr "Omkonfigurerer mappe"
 
 #. first, 'close' the old folder
-#: mail/mail-local.c:842
+#: mail/mail-local.c:844
 msgid "Closing current folder"
 msgstr "Lukker aktiv mappe"
 
-#: mail/mail-local.c:874
+#: mail/mail-local.c:876
 msgid "Renaming old folder and opening"
 msgstr "Endrer navn på gammel mappe og gjenåpner"
 
-#: mail/mail-local.c:892
+#: mail/mail-local.c:894
 msgid "Creating new folder"
 msgstr "Oppretter en ny mappe"
 
-#: mail/mail-local.c:906
+#: mail/mail-local.c:908
 msgid "Copying messages"
 msgstr "Kopierer meldinger"
 
-#: mail/mail-local.c:927
+#: mail/mail-local.c:925
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6032,7 +6127,7 @@ msgstr ""
 "Kan ikke lagre metainformasjon for mappe; du vil sannsynligvis\n"
 "ikke kunne åpne denne mappen igjen: %s"
 
-#: mail/mail-local.c:966
+#: mail/mail-local.c:964
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6040,7 +6135,7 @@ msgstr ""
 "Hvis du ikke kan åpne denne postboksen igjen må\n"
 "du reparere den manuelt."
 
-#: mail/mail-mt.c:181
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6049,7 +6144,7 @@ msgstr ""
 "Feil under '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:183
+#: mail/mail-mt.c:192
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6058,96 +6153,105 @@ msgstr ""
 "Feil under utføring av operasjon:\n"
 "%s"
 
-#: mail/mail-mt.c:506 mail/mail-mt.c:535 mail/mail-mt.c:882
+#: mail/mail-mt.c:515 mail/mail-mt.c:544 mail/mail-mt.c:891
 msgid "Working"
 msgstr "Arbeider"
 
-#: mail/mail-mt.c:670 mail/session.c:95
+#: mail/mail-mt.c:679 mail/session.c:98
 msgid "Do you accept?"
 msgstr "Aksepterer du?"
 
-#: mail/mail-mt.c:864
+#: mail/mail-mt.c:873
 msgid "Evolution progress"
 msgstr "Evolution fremgang"
 
-#: mail/mail-ops.c:518
+#: mail/mail-ops.c:588
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender \"%s\""
 
-#: mail/mail-ops.c:520
+#: mail/mail-ops.c:590
 msgid "Sending message"
 msgstr "Sender melding"
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:705
+#, c-format
+msgid "Sending message %d of %d"
+msgstr "Sender melding %d av %d"
+
+#: mail/mail-ops.c:724
+#, c-format
+msgid "Failed on message %d of %d"
+msgstr "Feilet på melding %d av %d"
+
+#: mail/mail-ops.c:726 mail/mail-send-recv.c:475
+msgid "Complete."
+msgstr "Fullført."
+
+#: mail/mail-ops.c:812
 msgid "Saving message to folder"
 msgstr "Lagrer melding til mappe"
 
-#: mail/mail-ops.c:824
+#: mail/mail-ops.c:885
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flytter melding(er) til %s"
 
-#: mail/mail-ops.c:824
+#: mail/mail-ops.c:885
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer meldinger til %s"
 
-#: mail/mail-ops.c:841
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "Flytter"
 
-#: mail/mail-ops.c:844
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "Kopiérer"
 
-#: mail/mail-ops.c:855
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr "%s melding %d av %d (uid \"%s\")"
-
-#: mail/mail-ops.c:926
+#: mail/mail-ops.c:979
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i \"%s\""
 
-#: mail/mail-ops.c:1084
+#: mail/mail-ops.c:1140
 msgid "Forwarded messages"
 msgstr "Videresendte meldinger"
 
-#: mail/mail-ops.c:1125 mail/mail-ops.c:1263
+#: mail/mail-ops.c:1181 mail/mail-ops.c:1319
 #, c-format
 msgid "Opening folder %s"
 msgstr "Åpner mappe %s"
 
-#: mail/mail-ops.c:1192
+#: mail/mail-ops.c:1248
 #, c-format
 msgid "Opening store %s"
 msgstr "Åpner lager %s"
 
-#: mail/mail-ops.c:1379
+#: mail/mail-ops.c:1435
 msgid "Expunging folder"
 msgstr "Tømmer mappe"
 
-#: mail/mail-ops.c:1428
+#: mail/mail-ops.c:1484
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Henter melding %s"
 
-#: mail/mail-ops.c:1495
+#: mail/mail-ops.c:1551
 msgid "Retrieving messages"
 msgstr "Henter meldinger"
 
-#: mail/mail-ops.c:1505
+#: mail/mail-ops.c:1561
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Henter melding nummer %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1579
+#: mail/mail-ops.c:1635
 msgid "Saving messages"
 msgstr "Lagrer meldinger"
 
-#: mail/mail-ops.c:1658
+#: mail/mail-ops.c:1714
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6156,12 +6260,12 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1671
+#: mail/mail-ops.c:1727
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Lagrer melding %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1685
+#: mail/mail-ops.c:1741
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6170,11 +6274,11 @@ msgstr ""
 "Feil under lagring av av meldinger til: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1759
+#: mail/mail-ops.c:1815
 msgid "Saving attachment"
 msgstr "Lagrer vedlegg"
 
-#: mail/mail-ops.c:1774
+#: mail/mail-ops.c:1830
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6183,75 +6287,71 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1802
+#: mail/mail-ops.c:1858
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: mail/mail-search-dialogue.c:109
+#: mail/mail-search-dialogue.c:113
 msgid "_Search"
 msgstr "_Søk"
 
-#: mail/mail-send-recv.c:136
+#: mail/mail-send-recv.c:138
 msgid "Cancelling ..."
 msgstr "Avbryter..."
 
-#: mail/mail-send-recv.c:231
+#: mail/mail-send-recv.c:233
 msgid "Send & Receive mail"
 msgstr "Send & motta e-post"
 
-#: mail/mail-send-recv.c:234
+#: mail/mail-send-recv.c:236
 msgid "Receiving"
 msgstr "Mottar"
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:285
 msgid "Updating ..."
 msgstr "Oppdaterer..."
 
-#: mail/mail-send-recv.c:285 mail/mail-send-recv.c:331
+#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
 msgid "Waiting ..."
 msgstr "Venter..."
 
-#: mail/mail-send-recv.c:304
+#: mail/mail-send-recv.c:306
 msgid "Sending"
 msgstr "Sender"
 
-#: mail/mail-send-recv.c:469
+#: mail/mail-send-recv.c:471
 msgid "Cancelled."
 msgstr "Avbrutt"
 
-#: mail/mail-send-recv.c:473
-msgid "Complete."
-msgstr "Fullført."
-
 #: mail/mail-summary.c:109
 msgid "Incomplete message written on pipe!"
 msgstr "Uferdig melding skrevet på rør!"
 
-#: mail/mail-tools.c:138
+#: mail/mail-tools.c:141
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Kunne ikke opprette midlertidig mbox `%s': %s"
 
-#: mail/mail-tools.c:185
+#: mail/mail-tools.c:188
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (videresendt melding)"
 
-#: mail/mail-tools.c:195
+#: mail/mail-tools.c:198
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (uten emne)"
 
-#: mail/mail-tools.c:212
+#: mail/mail-tools.c:215
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Videresendt melding - %s"
 
-#: mail/mail-tools.c:214
+#: mail/mail-tools.c:217
 msgid "Forwarded message (no subject)"
 msgstr "Videresendt melding (uten emne)"
 
-#: mail/mail-tools.c:411
+#: mail/mail-tools.c:414
 #, c-format
 msgid ""
 "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
@@ -6270,111 +6370,111 @@ msgstr "Ny VFolder"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:34
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:35
 msgid "Reply"
 msgstr "Svar"
 
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:38
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:39
 msgid "Reply to the sender of this message"
 msgstr "Svar til avsender av denne meldingen"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:37
+#: mail/mail-view.c:147 ui/evolution-mail.xml.h:38
 msgid "Reply to all recipients of this message"
 msgstr "Svar til alle mottakere av denne meldingen"
 
-#: mail/mail-view.c:147 ui/evolution-mail.xml.h:16
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:16
 msgid "Forward this message"
 msgstr "Videresend denne meldingen"
 
-#: mail/mail-view.c:151 ui/evolution-mail.xml.h:31
+#: mail/mail-view.c:154 ui/evolution-mail.xml.h:32
 msgid "Print the selected message"
 msgstr "Skriv ut den valgte meldingen"
 
-#: mail/mail-view.c:153 ui/evolution-mail.xml.h:7
+#: mail/mail-view.c:156 ui/evolution-mail.xml.h:7
 msgid "Delete this message"
 msgstr "Slett denne meldingen"
 
-#: mail/message-list.c:613
+#: mail/message-list.c:617
 msgid "Unseen"
 msgstr "Ulest"
 
-#: mail/message-list.c:614
+#: mail/message-list.c:618
 msgid "Seen"
 msgstr "Lest"
 
-#: mail/message-list.c:615
+#: mail/message-list.c:619
 msgid "Answered"
 msgstr "Besvart"
 
-#: mail/message-list.c:616
+#: mail/message-list.c:620
 msgid "Multiple Unseen Messages"
 msgstr "Flere uleste meldinger"
 
-#: mail/message-list.c:617
+#: mail/message-list.c:621
 msgid "Multiple Messages"
 msgstr "Flere meldinger"
 
-#: mail/message-list.c:621
+#: mail/message-list.c:625
 msgid "Lowest"
 msgstr "Lavest"
 
-#: mail/message-list.c:622
+#: mail/message-list.c:626
 msgid "Lower"
 msgstr "Lavere"
 
-#: mail/message-list.c:626
+#: mail/message-list.c:630
 msgid "Higher"
 msgstr "Høyere"
 
-#: mail/message-list.c:627
+#: mail/message-list.c:631
 msgid "Highest"
 msgstr "Høyest"
 
-#: mail/message-list.c:877
+#: mail/message-list.c:881
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:884
+#: mail/message-list.c:888
 msgid "Today %l:%M %p"
 msgstr "Idag %l:%M %p"
 
-#: mail/message-list.c:893
+#: mail/message-list.c:897
 msgid "Yesterday %l:%M %p"
 msgstr "I går %l:%M %p"
 
-#: mail/message-list.c:905
+#: mail/message-list.c:909
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:919
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:1013
+#: mail/message-list.c:1017
 msgid "Flagged"
 msgstr "Merket"
 
-#: mail/message-list.c:1014
+#: mail/message-list.c:1018
 msgid "From"
 msgstr "Fra"
 
-#: mail/message-list.c:1014
+#: mail/message-list.c:1018
 msgid "Date"
 msgstr "Dato"
 
-#: mail/message-list.c:1014
+#: mail/message-list.c:1018
 msgid "Received"
 msgstr "Mottatt"
 
-#: mail/message-list.c:1015
+#: mail/message-list.c:1019
 msgid "To"
 msgstr "Til"
 
-#: mail/message-list.c:1015
+#: mail/message-list.c:1019
 msgid "Size"
 msgstr "Størrelse"
 
@@ -6388,58 +6488,63 @@ msgstr "Vennligst skriv inn din %s passphrase for %s"
 msgid "Please enter your %s passphrase"
 msgstr "Vennligst skriv inn din %s passphrase"
 
-#: mail/openpgp-utils.c:455 mail/openpgp-utils.c:561 mail/openpgp-utils.c:763
-#: mail/openpgp-utils.c:916 mail/openpgp-utils.c:1074
+#: mail/openpgp-utils.c:455 mail/openpgp-utils.c:562 mail/openpgp-utils.c:766
+#: mail/openpgp-utils.c:920 mail/openpgp-utils.c:1079
 msgid "No GPG/PGP program available."
 msgstr "Ingen GPG/PGP-program tilgjengelig."
 
-#: mail/openpgp-utils.c:462 mail/openpgp-utils.c:570 mail/openpgp-utils.c:770
-#: mail/openpgp-utils.c:923
+#: mail/openpgp-utils.c:462 mail/openpgp-utils.c:571 mail/openpgp-utils.c:773
+#: mail/openpgp-utils.c:927
 msgid "No password provided."
 msgstr "Ingen passord gitt."
 
-#: mail/openpgp-utils.c:470 mail/openpgp-utils.c:577 mail/openpgp-utils.c:776
-#: mail/openpgp-utils.c:931 mail/openpgp-utils.c:1080
+#: mail/openpgp-utils.c:470 mail/openpgp-utils.c:578 mail/openpgp-utils.c:779
+#: mail/openpgp-utils.c:935 mail/openpgp-utils.c:1085
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Kunne ikke opprette rør til GPG/PGP: %s"
 
-#: mail/openpgp-utils.c:591
+#: mail/openpgp-utils.c:592
 msgid "No recipients specified"
 msgstr "Ingen mottakere spesifisert"
 
-#: mail/openpgp-utils.c:1091
+#: mail/openpgp-utils.c:1096
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Kunne ikke opprette midlertidig fil: %s"
 
-#: mail/subscribe-dialog.c:73 shell/e-storage-set-view.c:44
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:45
 msgid "Folder"
 msgstr "Mappe"
 
-#: mail/subscribe-dialog.c:74
+#: mail/subscribe-dialog.c:77
 msgid "Store"
 msgstr "Lager"
 
-#: mail/subscribe-dialog.c:156
+#: mail/subscribe-dialog.c:138
 msgid "Display folders starting with:"
 msgstr "Vis mapper som som starter med:"
 
-#: mail/subscribe-dialog.c:186
+#: mail/subscribe-dialog.c:168
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr "Henter lager for \"%s\""
 
-#: mail/subscribe-dialog.c:289
+#: mail/subscribe-dialog.c:271
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Abonnerer på mappe \"%s\""
 
-#: mail/subscribe-dialog.c:291
+#: mail/subscribe-dialog.c:273
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Fjerner abonnement på mappe \"%s\""
 
+#. Construct the app
+#: mail/subscribe-dialog.c:873
+msgid "Manage Subscriptions"
+msgstr "Håndter abonnement"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Mappenavn:"
@@ -6452,9 +6557,23 @@ msgstr "Mappetype:"
 msgid "Specify where to create the folder:"
 msgstr "Spesifiser hvor mappen skal opprettes:"
 
+#: shell/importer/importer.c:87
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+"Velg filen du ønsker å importere til Evolution og velg hvilken type fil det "
+"er fra listen.\n"
+"\n"
+"Du kan velge \"Automatisk\" hvis du ikke vet, så vil Evolution prøve å finne "
+"ut hvilken type det er for deg."
+
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/importer/importer.c:157
+#: shell/importer/importer.c:182
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -6465,7 +6584,7 @@ msgstr ""
 "Importerer ikke klar.\n"
 "Venter 5 sekunder før nytt forsøk."
 
-#: shell/importer/importer.c:175 shell/importer/importer.c:202
+#: shell/importer/importer.c:202 shell/importer/importer.c:233
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -6474,7 +6593,7 @@ msgstr ""
 "Importerer %s\n"
 "Importerer oppføring %d."
 
-#: shell/importer/importer.c:309
+#: shell/importer/importer.c:341
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -6483,11 +6602,11 @@ msgstr ""
 "Ingen importerer som kan håndtere\n"
 "%s"
 
-#: shell/importer/importer.c:319
+#: shell/importer/importer.c:351
 msgid "Importing"
 msgstr "Importerer"
 
-#: shell/importer/importer.c:327
+#: shell/importer/importer.c:359
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -6496,12 +6615,17 @@ msgstr ""
 "Importerer %s.\n"
 "Starter %s"
 
-#: shell/importer/importer.c:342
+#: shell/importer/importer.c:372
+#, c-format
+msgid "Error starting %s"
+msgstr "Feil under start av %s"
+
+#: shell/importer/importer.c:387
 #, c-format
 msgid "Error loading %s"
 msgstr "Feil under lasting av %s"
 
-#: shell/importer/importer.c:357
+#: shell/importer/importer.c:402
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -6510,40 +6634,26 @@ msgstr ""
 "Importerer %s\n"
 "Importerer oppføring 1."
 
-#: shell/importer/importer.c:428
+#: shell/importer/importer.c:473
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: shell/importer/importer.c:478
+#: shell/importer/importer.c:523
 msgid "Filename:"
 msgstr "Filnavn:"
 
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:483
+#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
 msgid "Select a file"
 msgstr "Velg en fil"
 
-#: shell/importer/importer.c:493
+#: shell/importer/importer.c:538
 msgid "File type:"
 msgstr "Filtype:"
 
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:574
+#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
 msgid "Import"
 msgstr "Importér"
 
-#: shell/importer/importer.c:609
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-"Velg filen du ønsker å importere til Evolution og velg hvilken type fil det "
-"er fra listen.\n"
-"\n"
-"Du kan velge \"Automatisk\" hvis du ikke vet, så vil Evolution prøve å finne "
-"ut hvilken type det er for deg."
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Klikk \"Importer\" for å starte import av filen til Evolution."
@@ -6566,11 +6676,11 @@ msgstr ""
 "Gjennom denne veiviseren vil du ledes gjennom import av\n"
 "eksterne filer til Evolution."
 
-#: shell/e-setup.c:117 shell/e-setup.c:190
+#: shell/e-setup.c:118 shell/e-setup.c:191
 msgid "Evolution installation"
 msgstr "Evolution installasjon"
 
-#: shell/e-setup.c:121
+#: shell/e-setup.c:122
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -6578,29 +6688,29 @@ msgstr ""
 "Denne nye versjonen av Evolution må installere tilleggsfiler i\n"
 "din personlige Evolution-katalog"
 
-#: shell/e-setup.c:122
+#: shell/e-setup.c:123
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Vennligst klikk \"OK\" for å installere filene, eller \"Avbryt\" for å "
 "avslutte."
 
-#: shell/e-setup.c:162
+#: shell/e-setup.c:163
 msgid "Could not update files correctly"
 msgstr "Kunne ikke oppdatere filene."
 
-#: shell/e-setup.c:165 shell/e-setup.c:233
+#: shell/e-setup.c:166 shell/e-setup.c:234
 msgid "Evolution files successfully installed."
 msgstr "Evolutions filer ble installert."
 
-#: shell/e-setup.c:194
+#: shell/e-setup.c:195
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Dette ser ut til å være første gang du kjører Evolution."
 
-#: shell/e-setup.c:195
+#: shell/e-setup.c:196
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr "Vennligst klikk \"OK\" for å installere Evolutions brukerfiler under"
 
-#: shell/e-setup.c:214
+#: shell/e-setup.c:215
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -6611,7 +6721,7 @@ msgstr ""
 "%s\n"
 "Feil: %s"
 
-#: shell/e-setup.c:229
+#: shell/e-setup.c:230
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -6620,7 +6730,7 @@ msgstr ""
 "Kan ikke kopiere filer til\n"
 "`%s'."
 
-#: shell/e-setup.c:254
+#: shell/e-setup.c:255
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -6631,7 +6741,7 @@ msgstr ""
 "Venligst flytt denne for å tillate installasjon\n"
 "av Evolution's brukerfiler."
 
-#: shell/e-setup.c:266
+#: shell/e-setup.c:267
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -6642,7 +6752,7 @@ msgstr ""
 "Evolution-katalogen. Venligst flytt den for å \n"
 "tillate installasjon av Evolution's brukerfiler."
 
-#: shell/e-shell-folder-creation-dialog.c:96
+#: shell/e-shell-folder-creation-dialog.c:99
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -6651,11 +6761,11 @@ msgstr ""
 "Kan ikke opprette spesifisert katalog:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:153
+#: shell/e-shell-folder-creation-dialog.c:156
 msgid "The specified folder name is not valid."
 msgstr "Spesifisert mappe er ikke gyldig."
 
-#: shell/e-shell-folder-creation-dialog.c:245
+#: shell/e-shell-folder-creation-dialog.c:248
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Lag ny mappe"
 
@@ -6667,27 +6777,27 @@ msgstr ""
 "Typen for valgt mappe er ikke gyldig for den\n"
 "forespurte operasjonen."
 
-#: shell/e-shell-folder-selection-dialog.c:318
+#: shell/e-shell-folder-selection-dialog.c:319
 msgid "New..."
 msgstr "Ny..."
 
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
+#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
 msgid "(Untitled)"
 msgstr "(Uten navn)"
 
-#: shell/e-shell-view-menu.c:159
+#: shell/e-shell-view-menu.c:173
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy ble ikke funnet i din $PATH."
 
-#: shell/e-shell-view-menu.c:165
+#: shell/e-shell-view-menu.c:179
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy kunne ikke kjøres."
 
-#: shell/e-shell-view-menu.c:194
+#: shell/e-shell-view-menu.c:208
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:196
+#: shell/e-shell-view-menu.c:210
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -6697,34 +6807,30 @@ msgstr ""
 "for e-post, kalender og kontaktdatabaser for\n"
 "GNOME skrivebordsmiljøet."
 
-#: shell/e-shell-view-menu.c:360
+#: shell/e-shell-view-menu.c:374
 msgid "Go to folder..."
 msgstr "Gå til mappe..."
 
-#: shell/e-shell-view.c:143
+#: shell/e-shell-view.c:148
 msgid "(No folder displayed)"
 msgstr "(Ingen mappe vist)"
 
-#: shell/e-shell-view.c:474
-msgid "Folders"
-msgstr "Mapper"
-
-#: shell/e-shell-view.c:1124
+#: shell/e-shell-view.c:1129
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1126
+#: shell/e-shell-view.c:1131
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution - %s [%s]"
 
-#: shell/e-shell.c:377
+#: shell/e-shell.c:378
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikke sette opp lokal lagring -- %s"
 
-#: shell/e-shell.c:1247
+#: shell/e-shell.c:1248
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -6733,15 +6839,15 @@ msgstr ""
 "Ops! Visningen for `%s' døde uventet. :-(\n"
 "Dette betyr sannsynligvis at komponenten %s har krasjet."
 
-#: shell/e-shortcuts-view.c:123
+#: shell/e-shortcuts-view.c:134
 msgid "Create new shortcut group"
 msgstr "Opprett ny snarveigruppe"
 
-#: shell/e-shortcuts-view.c:126
+#: shell/e-shortcuts-view.c:137
 msgid "Group name:"
 msgstr "Gruppenavn:"
 
-#: shell/e-shortcuts-view.c:249
+#: shell/e-shortcuts-view.c:260
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -6750,73 +6856,73 @@ msgstr ""
 "Vil du virkelig fjerne gruppen\n"
 "`%s' fra snarveilinjen?"
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:265
 msgid "Don't remove"
 msgstr "Ikke fjern"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:276
 msgid "_Small Icons"
 msgstr "_Små ikoner"
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:277
 msgid "Show the shortcuts as small icons"
 msgstr "Vis snarveier som små ikoner"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:279
 msgid "_Large Icons"
 msgstr "Store i_koner"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:280
 msgid "Show the shortcuts as large icons"
 msgstr "Vis snarveier som store ikoner"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:291
 msgid "_New Group..."
 msgstr "_Ny gruppe..."
 
-#: shell/e-shortcuts-view.c:281
+#: shell/e-shortcuts-view.c:292
 msgid "Create a new shortcut group"
 msgstr "Opprett en ny snarveigruppe"
 
-#: shell/e-shortcuts-view.c:283
+#: shell/e-shortcuts-view.c:294
 msgid "_Remove This Group..."
 msgstr "Fje_rn denne gruppen..."
 
-#: shell/e-shortcuts-view.c:284
+#: shell/e-shortcuts-view.c:295
 msgid "Remove this shortcut group"
 msgstr "Fjern denne snarveigruppen"
 
-#: shell/e-shortcuts-view.c:289
+#: shell/e-shortcuts-view.c:300
 msgid "_Hide the Shortcut Bar"
 msgstr "Sk_jul snarveilinjen"
 
-#: shell/e-shortcuts-view.c:290
+#: shell/e-shortcuts-view.c:301
 msgid "Hide the shortcut bar"
 msgstr "Skjul snarveilinjen"
 
-#: shell/e-shortcuts-view.c:374
+#: shell/e-shortcuts-view.c:385
 msgid "Activate"
 msgstr "Aktiver"
 
-#: shell/e-shortcuts-view.c:374
+#: shell/e-shortcuts-view.c:385
 msgid "Activate this shortcut"
 msgstr "Aktiver denne snarveien"
 
-#: shell/e-shortcuts-view.c:377
+#: shell/e-shortcuts-view.c:388
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Fjern denne snarveien fra snarveilinjen"
 
-#: shell/e-shortcuts.c:375
+#: shell/e-shortcuts.c:379
 msgid "Error saving shortcuts."
 msgstr "Feil under lagring av snarveier."
 
-#: shell/e-storage-set-view.c:499 ui/evolution-event-editor.xml.h:76
+#: shell/e-storage-set-view.c:648 ui/evolution-event-editor.xml.h:76
 #: ui/evolution-message-composer.xml.h:53
 #: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:43
 msgid "_View"
 msgstr "_Vis"
 
-#: shell/e-storage-set-view.c:499
+#: shell/e-storage-set-view.c:648
 msgid "View the selected folder"
 msgstr "Vis den valgte mappen"
 
@@ -6824,47 +6930,47 @@ msgstr "Vis den valgte mappen"
 msgid "(No name)"
 msgstr "(Uten navn)"
 
-#: shell/e-storage.c:429
+#: shell/e-storage.c:459
 msgid "No error"
 msgstr "Ingen feil"
 
-#: shell/e-storage.c:431
+#: shell/e-storage.c:461
 msgid "Generic error"
 msgstr "Vanlig feil"
 
-#: shell/e-storage.c:433
+#: shell/e-storage.c:463
 msgid "A folder with the same name already exists"
 msgstr "En mappe med samme navn eksisterer allerede"
 
-#: shell/e-storage.c:435
+#: shell/e-storage.c:465
 msgid "The specified folder type is not valid"
 msgstr "Spesifisert mappetype er ikke gyldig"
 
-#: shell/e-storage.c:437
+#: shell/e-storage.c:467
 msgid "I/O error"
 msgstr "I/U-feil"
 
-#: shell/e-storage.c:439
+#: shell/e-storage.c:469
 msgid "Not enough space to create the folder"
 msgstr "Ikke nok plass til å opprette mappen"
 
-#: shell/e-storage.c:441
+#: shell/e-storage.c:471
 msgid "The specified folder was not found"
 msgstr "Spesifisert mappe ble ikke funnet"
 
-#: shell/e-storage.c:443
+#: shell/e-storage.c:473
 msgid "Function not implemented in this storage"
 msgstr "Funksjonen er ikke implementert i dette lageret"
 
-#: shell/e-storage.c:445
+#: shell/e-storage.c:475
 msgid "Permission denied"
 msgstr "Tilgang nektet"
 
-#: shell/e-storage.c:447
+#: shell/e-storage.c:477
 msgid "Operation not supported"
 msgstr "Operasjonen er ikke støttet"
 
-#: shell/e-storage.c:449
+#: shell/e-storage.c:479
 msgid "The specified type is not supported in this storage"
 msgstr "Spesifisert type er ikke støttet for dette lageret"
 
@@ -6872,7 +6978,7 @@ msgstr "Spesifisert type er ikke støttet for dette lageret"
 msgid "The Evolution shell."
 msgstr "Evolution skallet."
 
-#: shell/main.c:81
+#: shell/main.c:83
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
@@ -6910,7 +7016,7 @@ msgstr ""
 "Vi håper at du nyter resultatene av vårt harde arbeid, og vi venter i\n"
 "spenning på at du tilbyr din hjelp!\n"
 
-#: shell/main.c:106
+#: shell/main.c:108
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -6918,15 +7024,19 @@ msgstr ""
 "Takk\n"
 "Evolution utviklerene\n"
 
-#: shell/main.c:137
+#: shell/main.c:139
 msgid "Cannot initialize the Evolution shell."
 msgstr "Kan ikke initialisere Evolution skallet."
 
-#: shell/main.c:183
-msgid "Disable."
-msgstr "Slå av."
+#: shell/main.c:185
+msgid "Disable splash screen"
+msgstr "Deaktiver splash"
+
+#: shell/main.c:186
+msgid "Send the debugging output of all components to a file."
+msgstr "Send feilsøkingsutskrift for alle komponentene til en fil."
 
-#: shell/main.c:203
+#: shell/main.c:219
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kunne ikke initialisere Bonobo komponentsystemet."
 
@@ -6950,8 +7060,7 @@ msgstr "Finn en kontakt"
 msgid "New contact"
 msgstr "Ny kontakt"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:22
-#: ui/evolution-mail.xml.h:27
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:28
 msgid "Previews the message to be printed"
 msgstr "Viser forhåndsvisning av meldingen som skal skrives ut"
 
@@ -6959,7 +7068,7 @@ msgstr "Viser forhåndsvisning av meldingen som skal skrives ut"
 msgid "Print contacts"
 msgstr "Skriv ut kontakter"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:45
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:48
 msgid "Stop"
 msgstr "Stopp"
 
@@ -6993,7 +7102,7 @@ msgid "_Search for contacts"
 msgstr "_Søk etter kontakter"
 
 #: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:75
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:78
 #: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:42
 msgid "_Tools"
 msgstr "_Verktøy"
@@ -7071,6 +7180,10 @@ msgstr "Åpne kalender"
 msgid "Prev"
 msgstr "Forrige"
 
+#: ui/evolution-calendar.xml.h:22
+msgid "Previews the calendar to be printed"
+msgstr "Forhåndsviser av kalenderen som skal skrives ut"
+
 #: ui/evolution-calendar.xml.h:25
 msgid "Print calendar"
 msgstr "Skriv ut kalender"
@@ -7103,8 +7216,8 @@ msgstr "Vis 1 uke"
 msgid "Show the working week"
 msgstr "Vis arbeidsuken"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:223
-#: widgets/misc/e-dateedit.c:413
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:226
+#: widgets/misc/e-dateedit.c:422
 msgid "Today"
 msgstr "Idag"
 
@@ -7137,7 +7250,7 @@ msgstr "_Ny"
 msgid "_Open Calendar"
 msgstr "_Åpne kalender"
 
-#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:72
+#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:75
 #: ui/evolution-tasks.xml.h:8
 msgid "_Save As..."
 msgstr "Lagre _som..."
@@ -7168,7 +7281,7 @@ msgid "Print this item"
 msgstr "Skriv ut denne oppføringen"
 
 #: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:32 ui/evolution-task-editor-dialog.xml.h:41
+#: ui/evolution-mail.xml.h:33 ui/evolution-task-editor-dialog.xml.h:41
 msgid "Print..."
 msgstr "Skriv ut..."
 
@@ -7345,7 +7458,7 @@ msgid "Print Setup"
 msgstr "Skriveroppsett"
 
 #: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:237
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr "Lagre"
 
@@ -7444,7 +7557,7 @@ msgstr "_Lim inn"
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:68
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:71
 #: ui/evolution-task-editor-dialog.xml.h:83
 msgid "_Properties..."
 msgstr "Egenska_per..."
@@ -7531,182 +7644,194 @@ msgid "Full _Headers"
 msgstr "Fulle _headere"
 
 #: ui/evolution-mail.xml.h:18
+msgid "Hide Deleted Messages"
+msgstr "Skjul slettede meldinger"
+
+#: ui/evolution-mail.xml.h:19
 msgid "Hide S_elected Messages"
 msgstr "Skjul valgt_e meldinger"
 
-#: ui/evolution-mail.xml.h:19
+#: ui/evolution-mail.xml.h:20
 msgid "Hide _Deleted Messages"
 msgstr "Skjul slette_de meldinger"
 
-#: ui/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:21
 msgid "Hide _Read messages"
 msgstr "Skjul le_ste meldinger"
 
-#: ui/evolution-mail.xml.h:21
+#: ui/evolution-mail.xml.h:22
 msgid "Manage _Subscriptions..."
 msgstr "_Håndter abonnement..."
 
-#: ui/evolution-mail.xml.h:22
+#: ui/evolution-mail.xml.h:23
 msgid "Mar_k as Read"
 msgstr "Mer_k som lest"
 
-#: ui/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:24
 msgid "Mark All as R_ead"
 msgstr "Merk alle som l_est"
 
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:25
 msgid "Mark as U_nread"
 msgstr "Merk som u_lest"
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:26
 msgid "Move"
 msgstr "Flytt"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:27
 msgid "Move message to a new folder"
 msgstr "Flytt meldingen til en ny mappe"
 
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-mail.xml.h:31
 msgid "Print message to the printer"
 msgstr "Skriv ut denne meldingen på skriveren"
 
-#: ui/evolution-mail.xml.h:33
+#: ui/evolution-mail.xml.h:34
 msgid "Redirect (FIXME: implement me)"
 msgstr "Omdiriger"
 
-#: ui/evolution-mail.xml.h:36
+#: ui/evolution-mail.xml.h:37
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail.xml.h:40
 msgid "S_ource"
 msgstr "K_ilde"
 
-#: ui/evolution-mail.xml.h:40 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:41 ui/evolution-subscribe.xml.h:7
 msgid "Select _All"
 msgstr "Velg _alle"
 
-#: ui/evolution-mail.xml.h:41
+#: ui/evolution-mail.xml.h:42
 msgid "Select _Thread"
 msgstr "Velg _tråd"
 
-#: ui/evolution-mail.xml.h:42
-msgid "Send and Receive"
-msgstr "Send og motta"
-
 #: ui/evolution-mail.xml.h:43
+msgid "Send / Receive"
+msgstr "Send / motta"
+
+#: ui/evolution-mail.xml.h:44
+msgid ""
+"Send queued mail\n"
+"    and retrieve new mail"
+msgstr ""
+"Send kølagt e-post\n"
+"    og hent ny e-post"
+
+#: ui/evolution-mail.xml.h:46
 msgid "Send queued mail and retrieve new mail"
 msgstr "Send kølagt e-post og hent ny e-post"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:47
 msgid "Show _All"
 msgstr "Vis _alle"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:49
 msgid "Threaded Message list"
 msgstr "Meldingsliste med tråder"
 
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:50
 msgid "VFolder on Se_nder"
 msgstr "VFolder for se_nder"
 
-#: ui/evolution-mail.xml.h:48
+#: ui/evolution-mail.xml.h:51
 msgid "VFolder on _Recipients"
 msgstr "VFolder for mottake_re"
 
-#: ui/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:52
 msgid "VFolder on _Subject"
 msgstr "VFolder på e_mne"
 
-#: ui/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:53
 msgid "View Raw Message Source"
 msgstr "Vis rå meldingskode"
 
-#: ui/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:54
 msgid "Virtual Folder _Editor..."
 msgstr "R_edigering av virtuelle mapper..."
 
-#: ui/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:55
 msgid "_Apply Filters"
 msgstr "_Påfør filtre"
 
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:56
 msgid "_Attachment"
 msgstr "_Vedlegg"
 
-#: ui/evolution-mail.xml.h:54
+#: ui/evolution-mail.xml.h:57
 msgid "_Compose"
 msgstr "_Skriv"
 
-#: ui/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:58
 msgid "_Copy to Folder..."
 msgstr "_Kopiér til mappe..."
 
-#: ui/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:59
 msgid "_Create Filter From Message"
 msgstr "La_g filter fra melding"
 
-#: ui/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:61
 msgid "_Expunge"
 msgstr "_Tøm"
 
-#: ui/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:62
 msgid "_Filters..."
 msgstr "_Filtre..."
 
-#: ui/evolution-mail.xml.h:60 ui/evolution.xml.h:31
+#: ui/evolution-mail.xml.h:63 ui/evolution.xml.h:31
 msgid "_Folder"
 msgstr "_Mappe"
 
-#: ui/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:64
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: ui/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:65
 msgid "_Inline"
 msgstr "_Inline"
 
-#: ui/evolution-mail.xml.h:63 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:66 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "Re_versér utvalg"
 
-#: ui/evolution-mail.xml.h:64
+#: ui/evolution-mail.xml.h:67
 msgid "_Mail Message"
 msgstr "Send _melding"
 
-#: ui/evolution-mail.xml.h:65
+#: ui/evolution-mail.xml.h:68
 msgid "_Mail Settings..."
 msgstr "Innstillinger for e-post..."
 
-#: ui/evolution-mail.xml.h:66
+#: ui/evolution-mail.xml.h:69
 msgid "_Move to Folder..."
 msgstr "F_lytt til mappe..."
 
-#: ui/evolution-mail.xml.h:67
+#: ui/evolution-mail.xml.h:70
 msgid "_Open Selected Items"
 msgstr "_Åpne valgte oppføringer"
 
-#: ui/evolution-mail.xml.h:69
+#: ui/evolution-mail.xml.h:72
 msgid "_Quoted"
 msgstr "_Sitert"
 
-#: ui/evolution-mail.xml.h:70
+#: ui/evolution-mail.xml.h:73
 msgid "_Reply"
 msgstr "Sva_r"
 
-#: ui/evolution-mail.xml.h:71
+#: ui/evolution-mail.xml.h:74
 msgid "_Resend Messages"
 msgstr "Send meldinge_r på nytt"
 
-#: ui/evolution-mail.xml.h:73
-msgid "_Send and Receive"
-msgstr "_Send og motta"
+#: ui/evolution-mail.xml.h:76
+msgid "_Send / Receive"
+msgstr "_Send / motta"
 
-#: ui/evolution-mail.xml.h:74
+#: ui/evolution-mail.xml.h:77
 msgid "_Threaded"
 msgstr "Med _tråder"
 
-#: ui/evolution-mail.xml.h:76
+#: ui/evolution-mail.xml.h:79
 msgid "_Undelete"
 msgstr "A_ngre slett"
 
@@ -8109,84 +8234,88 @@ msgstr "_Snarveilinje"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2475
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:390
+msgid "Tentative"
+msgstr "Tentativ"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:391
 msgid "Busy"
 msgstr "Opptatt"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Out of Office"
 msgstr "Ute"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "No Information"
 msgstr "Ingen informasjon"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:409
 msgid "_Invite Others..."
 msgstr "_Inviter andre..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:429
 msgid "_Options"
 msgstr "_Alternativer"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:446
 msgid "Show _Only Working Hours"
 msgstr "Vis k_un arbeidstid"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:459
 msgid "Show _Zoomed Out"
 msgstr "Vis _zoomet ut"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:477
 msgid "_Update Free/Busy"
 msgstr "_Oppdater fri/ledig"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:495
 msgid "_<<"
 msgstr "_<<"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:512
 msgid "_Autopick"
 msgstr "_Autovelg"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ">_>"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:543
 msgid "_All People and Resources"
 msgstr "_Alle mennesker og ressurser"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:556
 msgid "All _People and One Resource"
 msgstr "Alle _mennesker og en ressurs"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:569
 msgid "_Required People"
 msgstr "_Nødvendige mennesker"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:582
 msgid "Required People and _One Resource"
 msgstr "Nødvendige mennesker _og en ressurs"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:605
 msgid "Meeting _start time:"
 msgstr "Tid for møtets _start:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:629
 msgid "Meeting _end time:"
 msgstr "Tid for møtets slutt:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:742
 msgid "All Attendees"
 msgstr "Alle deltakere"
 
-#: widgets/menus/gal-view-menus.c:171
+#: widgets/menus/gal-view-menus.c:175
 msgid "_Current View"
 msgstr "_Aktiv visning"
 
@@ -8201,15 +8330,15 @@ msgstr "MTWTFSS"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:215 widgets/misc/e-dateedit.c:407
+#: widgets/misc/e-cell-date-edit.c:218 widgets/misc/e-dateedit.c:416
 msgid "Now"
 msgstr "nå"
 
-#: widgets/misc/e-cell-date-edit.c:239
+#: widgets/misc/e-cell-date-edit.c:242
 msgid "OK"
 msgstr "OK"
 
-#: widgets/misc/e-cell-date-edit.c:720
+#: widgets/misc/e-cell-date-edit.c:723
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Datoen må skrives inn på formatet: %s"
@@ -8218,15 +8347,15 @@ msgstr "Datoen må skrives inn på formatet: %s"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:164
+#: widgets/misc/e-filter-bar.c:166
 msgid "Save Search"
 msgstr "Lagre søk"
 
-#: widgets/misc/e-filter-bar.c:235
+#: widgets/misc/e-filter-bar.c:237
 msgid "Advanced Search"
 msgstr "Avansert søk"
 
-#: widgets/misc/e-filter-bar.c:315
+#: widgets/misc/e-filter-bar.c:317
 msgid "Advanced ..."
 msgstr "Avansert..."
 
@@ -8251,7 +8380,7 @@ msgstr "Melding"
 msgid "Don't show this message again."
 msgstr "Ikke vis denne meldingen igjen."
 
-#: widgets/misc/e-search-bar.c:143
+#: widgets/misc/e-search-bar.c:147
 msgid "Sear_ch"
 msgstr "Sø_k"
 
@@ -8263,18 +8392,209 @@ msgstr "Personlig adressebok-tjener"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Personlig adressebok-tjener; factory"
 
-#: wombat/wombat.c:159
+#: wombat/wombat.c:173
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): kunne ikke initiere GNOME-VFS"
 
-#: wombat/wombat.c:171
+#: wombat/wombat.c:185
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): kunne ikke initiere GNOME"
 
-#: wombat/wombat.c:184
+#: wombat/wombat.c:198
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 
+#~ msgid "No such host %s."
+#~ msgstr "Ingen vert %s."
+
+#~ msgid "Temporarily unable to look up hostname %s."
+#~ msgstr "Midlertidig ute av stand til å slå opp vertsnavn %s."
+
+#~ msgid "Remove action"
+#~ msgstr "Fjern handling"
+
+#~ msgid "Remove criterion"
+#~ msgstr "Fjern kriterie"
+
+#~ msgid "Disable."
+#~ msgstr "Slå av."
+
+#~ msgid "PLAIN"
+#~ msgstr "PLAIN"
+
+#~ msgid ""
+#~ "This option will connect to the server using a the PLAIN SASL mechanism if "
+#~ "the server supports it."
+#~ msgstr ""
+#~ "Dette alternativet kobler til tjeneren med bruk av PLAIN SASL-mekanismen "
+#~ "hvis tjeneren støtter det."
+
+#~ msgid "URL string `%s' contains no protocol"
+#~ msgstr "URL-streng `%s' inneholder ikke protokoll"
+
+#~ msgid "URL string `%s' contains an invalid protocol"
+#~ msgstr "URL-streng `%s' inneholder en ugyldig protokoll"
+
+#~ msgid "Port number in URL `%s' is non-numeric"
+#~ msgstr "Portnummer i URL `%s' er ikke-numerisk"
+
+#~ msgid "Secure IMAPv4"
+#~ msgstr "Sikker IMAPv4"
+
+#~ msgid "For reading and storing mail on IMAP servers over an SSL connection."
+#~ msgstr ""
+#~ "For lesing og lagring av e-post på IMAP-tjenere over en SSL-forbindelse."
+
+#~ msgid "Secure POP"
+#~ msgstr "Sikker POP"
+
+#~ msgid ""
+#~ "For connecting to POP servers over an SSL connection. The POP protocol can "
+#~ "also be used to retrieve mail from certain web mail providers and "
+#~ "proprietary email systems."
+#~ msgstr ""
+#~ "For tilkobling til POP-tjenere over en SSL-forbindelse. POP-protokollen kan "
+#~ "også brukes for å hente e-post fra enkelte e-posttilbydere via web i tillegg "
+#~ "til proprietære e-postsystemer."
+
+#~ msgid "Secure SMTP"
+#~ msgstr "Sikker SMTP"
+
+#~ msgid ""
+#~ "For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
+#~ "connection.\n"
+#~ msgstr ""
+#~ "For levering av e-post via en ekstern e-posttjener med SMTP over en "
+#~ "SSL-forbindelse.\n"
+
+#~ msgid ""
+#~ "One or more of your servers are not configured correctly.\n"
+#~ "Do you wish to save anyway?"
+#~ msgstr ""
+#~ "En eller flere av dine tjenere er ikke korrekt konfigurert.\n"
+#~ "Vil du lagre likevel?"
+
+#~ msgid "Unspecified"
+#~ msgstr "Uspesifisert"
+
+#~ msgid "Advanced"
+#~ msgstr "Avansert"
+
+#~ msgid "Check settings"
+#~ msgstr "Sjekk innstillinger"
+
+#~ msgid "Email address:"
+#~ msgstr "E-post adresse:"
+
+#~ msgid "Evolution Mail Configuration"
+#~ msgstr "Evolution e-post-konfigurasjon"
+
+#~ msgid "Hostname:"
+#~ msgstr "Vertsnavn:"
+
+#~ msgid "IMAP"
+#~ msgstr "IMAP"
+
+#~ msgid "Include this account when receiving mail"
+#~ msgstr "Ta med denne kontoen når du mottar e-post"
+
+#~ msgid "Keep mail on server"
+#~ msgstr "Behold e-post på tjener"
+
+#~ msgid "Kerberos"
+#~ msgstr "Kerberos"
+
+#~ msgid "Mail"
+#~ msgstr "E-post"
+
+#~ msgid "Mail Account"
+#~ msgstr "E-post konto"
+
+#~ msgid "Mail Configuration Druid"
+#~ msgstr "E-post-konfigurasjonsdruide"
+
+#~ msgid "Optional"
+#~ msgstr "Valgfri"
+
+#~ msgid "Password:"
+#~ msgstr "Passord:"
+
+#~ msgid "Plain Text"
+#~ msgstr "Vanlig tekst"
+
+#~ msgid "Remember my password"
+#~ msgstr "Husk mitt passord"
+
+#~ msgid "Reply address:"
+#~ msgstr "Svaradresse:"
+
+#~ msgid "Required"
+#~ msgstr "Nødvendige"
+
+#~ msgid "Save password"
+#~ msgstr "Lagre passord"
+
+#~ msgid "Select signature file"
+#~ msgstr "Velg signaturfil"
+
+#~ msgid "Server type:"
+#~ msgstr "Tjenertype:"
+
+#~ msgid "Signature:"
+#~ msgstr "Signatur:"
+
+#~ msgid "Source"
+#~ msgstr "Kilde"
+
+#~ msgid "Transport"
+#~ msgstr "Transport"
+
+#~ msgid "Transport Authentication"
+#~ msgstr "Autentisering for transport"
+
+#~ msgid ""
+#~ "Type the name by which you would like to refer to these servers. For "
+#~ "example: \"Work\" or \"Home\"."
+#~ msgstr ""
+#~ "Skriv inn et referansenavn for disse tjenerene. For eksempel: \"Arbeid\" "
+#~ "eller \"Hjemme\"."
+
+#~ msgid "minutes."
+#~ msgstr "minutter."
+
+#~ msgid ""
+#~ "Failed to verify the incoming mail configuration.\n"
+#~ "You may experience problems retrieving your mail from %s"
+#~ msgstr ""
+#~ "Feil under verifisering av konfigurasjon av innkommende\n"
+#~ "post. Du vil kunne oppleve problemer ved henting av e-post fra %s"
+
+#~ msgid ""
+#~ "Failed to verify the outgoing mail configuration.\n"
+#~ "You may experience problems sending your mail using %s"
+#~ msgstr ""
+#~ "Feil under verifisering av konfigurasjon av utgående e-post.\n"
+#~ "Du vil kunne oppleve problemer ved sending av e-post gjennom %s"
+
+#~ msgid "Add to addressbook (FIXME)"
+#~ msgstr "Legg til i addressebok"
+
+#~ msgid "Open in addressbook (FIXME)"
+#~ msgstr "Åpne i adressebok"
+
+#~ msgid "%s message %d of %d (uid \"%s\")"
+#~ msgstr "%s melding %d av %d (uid \"%s\")"
+
+#~ msgid "No authentication required"
+#~ msgstr "Ingen autentisering nødvendig"
+
+#~ msgid ""
+#~ "This option will connect to the SMTP server without using any kind of "
+#~ "authentication. This should be fine for connecting to most SMTP servers."
+#~ msgstr ""
+#~ "Dette alternativet lar deg koble til SMTP-tjeneren uten bruk av "
+#~ "autentisering. Dette bør fungere for de fleste SMTP-tjenerene."
+
 #~ msgid "[ %s ]"
 #~ msgstr "[ %s ]"
 
@@ -8293,9 +8613,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "The time is invalid"
 #~ msgstr "Tide er gyldig"
 
-#~ msgid "This server requires a secure connection (SSL)"
-#~ msgstr "Denne tjeneren krever en sikker forbindelse (SSL)"
-
 #~ msgid "Edit Filter Rule"
 #~ msgstr "Redigér filterregel"
 
@@ -8581,22 +8898,12 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Sender contains"
 #~ msgstr "Sender inneholder"
 
-#~ msgid "Connecting to server"
-#~ msgstr "Kobler til tjener"
-
 #~ msgid "Connect to server"
 #~ msgstr "Koble til tjener"
 
 #~ msgid "Registering local folder"
 #~ msgstr "Registrerer lokal mappe"
 
-#~ msgid ""
-#~ "Unable to register folder '%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Kan ikke registrer mappe '%s':\n"
-#~ "%s"
-
 #~ msgid "Appending \"%s\""
 #~ msgstr "Legger til \"%s\""
 
@@ -8660,9 +8967,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Get store for \"%s\""
 #~ msgstr "Hent lager for \"%s\""
 
-#~ msgid "Subscribe to folder \"%s\""
-#~ msgstr "Abonnér på mappe \"%s\""
-
 #~ msgid "Unsubscribe from folder \"%s\""
 #~ msgstr "Slett abonnement på mappe \"%s\""
 
@@ -8717,9 +9021,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "description"
 #~ msgstr "beskrivelse"
 
-#~ msgid "name"
-#~ msgstr "navn"
-
 #~ msgid "Evolution shell factory"
 #~ msgstr "Factory for Evolution skall"
 
@@ -8839,9 +9140,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Retrieving message %d of %d"
 #~ msgstr "Henter melding %d av %d"
 
-#~ msgid "Writing message %d of %d"
-#~ msgstr "Skriver melding %d av %d"
-
 #~ msgid "Saving changes to %s"
 #~ msgstr "Lagrer endringer til %s"
 
@@ -8934,12 +9232,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Server:"
 #~ msgstr "Tjener:"
 
-#~ msgid "Detect supported types..."
-#~ msgstr "Søk etter støttede typer..."
-
-#~ msgid "Don't delete messages from server"
-#~ msgstr "Ikke slett meldinger fra tjeneren"
-
 #~ msgid "Mail source type:"
 #~ msgstr "Type e-post-kilde:"
 
@@ -9001,9 +9293,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Edit News Server"
 #~ msgstr "Redigér news-tjener"
 
-#~ msgid "Testing \"%s\""
-#~ msgstr "Tester \"%s\""
-
 #~ msgid "The connection was successful!"
 #~ msgstr "Tilkoblingen var vellykket!"
 
@@ -9049,15 +9338,9 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Send a message without a subject"
 #~ msgstr "Send en melding uten emne"
 
-#~ msgid "Marking messages in folder \"%s\""
-#~ msgstr "Merker meldinger i mappe \"%s"
-
 #~ msgid "Mark messages in folder \"%s\""
 #~ msgstr "Merk meldinger i mappe \"%s\""
 
-#~ msgid "Marking message %d of %d"
-#~ msgstr "Merker melding %d av %d"
-
 #~ msgid "Scan folders in \"%s\""
 #~ msgstr "Skann foldere i \"%s\""
 
@@ -9310,9 +9593,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Could not create summary"
 #~ msgstr "Kunne ikke opprette sammendrag"
 
-#~ msgid "Cannot get message: %s"
-#~ msgstr "Kan ikke hente melding: %s"
-
 #~ msgid ""
 #~ "For reading mail delivered by the local system, and for storing mail on "
 #~ "local disk."
@@ -9477,9 +9757,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Highlight not yet due items"
 #~ msgstr "Merk oppføringer som ikke har gått ut"
 
-#~ msgid "Highlight items due today"
-#~ msgstr "Merk oppføringer som går ut idag"
-
 #~ msgid "To Do List Properties"
 #~ msgstr "Egenskaper for oppgaveliste"
 
@@ -9527,33 +9804,9 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Edit Mail Configuration Settings"
 #~ msgstr "Redigér innstillinger for e-post-konfigurasjon"
 
-#~ msgid ""
-#~ "Please enter information about your incoming mail server below. If you don't "
-#~ "know what"
-#~ msgstr ""
-#~ "Vennligst skriv inn informasjon om din tjener for innkommende e-post under. "
-#~ "Hvis du ikke vet hva"
-
-#~ msgid ""
-#~ "Please enter information about your outgoing mail protocol below. If you "
-#~ "don't know "
-#~ msgstr ""
-#~ "Vennligst skriv inn informasjon om protokoll for utgående e-post under. Hvis "
-#~ "du ikke vet "
-
-#~ msgid ""
-#~ "Please enter your name and email address below. The &quot;optional&quot; "
-#~ "fields below do not "
-#~ msgstr ""
-#~ "Vennligst skriv inn ditt navn og din e-post adresse under. "
-#~ "&quot;optional&quot; feltene under er ikke"
-
 #~ msgid "Preferred type: "
 #~ msgstr "Foretrukket type: "
 
-#~ msgid "Sending Mail"
-#~ msgstr "Sender e-post"
-
 #~ msgid ""
 #~ "You are almost done with the mail configuration process. The identity, "
 #~ "incoming"
@@ -9571,12 +9824,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Thread message list"
 #~ msgstr "Vis tråder i meldingsliste"
 
-#~ msgid "Drafts"
-#~ msgstr "Skisser"
-
-#~ msgid "Sent"
-#~ msgstr "Sendt"
-
 #~ msgid "_Submit Bug Report"
 #~ msgstr "_Send inn feilrapport"
 
@@ -9610,9 +9857,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Forward Message"
 #~ msgstr "Videresend melding"
 
-#~ msgid "Move Message"
-#~ msgstr "Flytt melding"
-
 #~ msgid "Copy Message"
 #~ msgstr "Kopiér melding"