Updated Norwegian translation.

2001-05-15  Kjartan Maraas  <kmaraas@gnome.org>

	* no.po: Updated Norwegian translation.

svn path=/trunk/; revision=9807

1 files changed, 1551 insertions, 1145 deletions

diff --git a/po/no.po b/po/no.po
index 92d8669856..aa2e347070 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-04-24 15:16-0400\n"
-"PO-Revision-Date: 2001-04-24 15:20-04:00\n"
+"POT-Creation-Date: 2001-05-16 00:29+0200\n"
+"PO-Revision-Date: 2001-05-16 00:38+02: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:3209
+#: addressbook/backend/ebook/e-card.c:3314
 msgid "Card: "
 msgstr "Kort: "
 
-#: addressbook/backend/ebook/e-card.c:3211
+#: addressbook/backend/ebook/e-card.c:3316
 msgid ""
 "\n"
 "Name: "
@@ -25,7 +25,7 @@ msgstr ""
 "\n"
 "Navn:"
 
-#: addressbook/backend/ebook/e-card.c:3212
+#: addressbook/backend/ebook/e-card.c:3317
 msgid ""
 "\n"
 "  Prefix:     "
@@ -33,7 +33,7 @@ msgstr ""
 "\n"
 "Prefiks:    "
 
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3318
 msgid ""
 "\n"
 "  Given:      "
@@ -41,7 +41,7 @@ msgstr ""
 "\n"
 "Oppgitt:     "
 
-#: addressbook/backend/ebook/e-card.c:3214
+#: addressbook/backend/ebook/e-card.c:3319
 msgid ""
 "\n"
 "  Additional: "
@@ -49,7 +49,7 @@ msgstr ""
 "\n"
 "Tillegg: "
 
-#: addressbook/backend/ebook/e-card.c:3215
+#: addressbook/backend/ebook/e-card.c:3320
 msgid ""
 "\n"
 "  Family:     "
@@ -57,7 +57,7 @@ msgstr ""
 "\n"
 "Familie:    "
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3321
 msgid ""
 "\n"
 "  Suffix:     "
@@ -65,7 +65,7 @@ msgstr ""
 "\n"
 "Suffiks:    "
 
-#: addressbook/backend/ebook/e-card.c:3230
+#: addressbook/backend/ebook/e-card.c:3335
 msgid ""
 "\n"
 "Birth Date: "
@@ -73,7 +73,7 @@ msgstr ""
 "\n"
 "Fødselsdato: "
 
-#: addressbook/backend/ebook/e-card.c:3241
+#: addressbook/backend/ebook/e-card.c:3346
 msgid ""
 "\n"
 "Address:"
@@ -81,7 +81,7 @@ msgstr ""
 "\n"
 "Adresse:"
 
-#: addressbook/backend/ebook/e-card.c:3243
+#: addressbook/backend/ebook/e-card.c:3348
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -89,7 +89,7 @@ msgstr ""
 "\n"
 "Postboks:  "
 
-#: addressbook/backend/ebook/e-card.c:3244
+#: addressbook/backend/ebook/e-card.c:3349
 msgid ""
 "\n"
 "  Ext:         "
@@ -97,7 +97,7 @@ msgstr ""
 "\n"
 "Linje:         "
 
-#: addressbook/backend/ebook/e-card.c:3245
+#: addressbook/backend/ebook/e-card.c:3350
 msgid ""
 "\n"
 "  Street:      "
@@ -105,7 +105,7 @@ msgstr ""
 "\n"
 "Gate:     "
 
-#: addressbook/backend/ebook/e-card.c:3246
+#: addressbook/backend/ebook/e-card.c:3351
 msgid ""
 "\n"
 "  City:        "
@@ -113,7 +113,7 @@ msgstr ""
 "\n"
 "By:          "
 
-#: addressbook/backend/ebook/e-card.c:3247
+#: addressbook/backend/ebook/e-card.c:3352
 msgid ""
 "\n"
 "  Region:      "
@@ -121,7 +121,7 @@ msgstr ""
 "\n"
 "Region:     "
 
-#: addressbook/backend/ebook/e-card.c:3248
+#: addressbook/backend/ebook/e-card.c:3353
 msgid ""
 "\n"
 "  Postal Code: "
@@ -129,7 +129,7 @@ msgstr ""
 "\n"
 "Postnummer: "
 
-#: addressbook/backend/ebook/e-card.c:3249
+#: addressbook/backend/ebook/e-card.c:3354
 msgid ""
 "\n"
 "  Country:     "
@@ -137,7 +137,7 @@ msgstr ""
 "\n"
 "Land:    "
 
-#: addressbook/backend/ebook/e-card.c:3262
+#: addressbook/backend/ebook/e-card.c:3367
 msgid ""
 "\n"
 "Delivery Label: "
@@ -145,7 +145,7 @@ msgstr ""
 "\n"
 "Leveringsetikett: "
 
-#: addressbook/backend/ebook/e-card.c:3274
+#: addressbook/backend/ebook/e-card.c:3379
 msgid ""
 "\n"
 "Telephones:\n"
@@ -153,7 +153,7 @@ msgstr ""
 "\n"
 "Telefoner:\n"
 
-#: addressbook/backend/ebook/e-card.c:3277
+#: addressbook/backend/ebook/e-card.c:3382
 msgid ""
 "\n"
 "Telephone:"
@@ -161,7 +161,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3301
+#: addressbook/backend/ebook/e-card.c:3406
 msgid ""
 "\n"
 "E-mail:\n"
@@ -169,7 +169,7 @@ msgstr ""
 "\n"
 "E-post:\n"
 
-#: addressbook/backend/ebook/e-card.c:3304
+#: addressbook/backend/ebook/e-card.c:3409
 msgid ""
 "\n"
 "E-mail:"
@@ -177,7 +177,7 @@ msgstr ""
 "\n"
 "E-post:"
 
-#: addressbook/backend/ebook/e-card.c:3323
+#: addressbook/backend/ebook/e-card.c:3428
 msgid ""
 "\n"
 "Mailer: "
@@ -185,7 +185,7 @@ msgstr ""
 "\n"
 "E-post program: "
 
-#: addressbook/backend/ebook/e-card.c:3329
+#: addressbook/backend/ebook/e-card.c:3434
 msgid ""
 "\n"
 "Time Zone: "
@@ -193,7 +193,7 @@ msgstr ""
 "\n"
 "Tidssone: "
 
-#: addressbook/backend/ebook/e-card.c:3337
+#: addressbook/backend/ebook/e-card.c:3442
 msgid ""
 "\n"
 "Geo Location: "
@@ -201,7 +201,7 @@ msgstr ""
 "\n"
 "Geografisk lokasjon: "
 
-#: addressbook/backend/ebook/e-card.c:3341
+#: addressbook/backend/ebook/e-card.c:3446
 msgid ""
 "\n"
 "Business Role: "
@@ -209,7 +209,7 @@ msgstr ""
 "\n"
 "Stilling: "
 
-#: addressbook/backend/ebook/e-card.c:3353
+#: addressbook/backend/ebook/e-card.c:3458
 msgid ""
 "\n"
 "Org: "
@@ -217,7 +217,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3354
+#: addressbook/backend/ebook/e-card.c:3459
 msgid ""
 "\n"
 "  Name:  "
@@ -225,7 +225,7 @@ msgstr ""
 "\n"
 "Navn:  "
 
-#: addressbook/backend/ebook/e-card.c:3355
+#: addressbook/backend/ebook/e-card.c:3460
 msgid ""
 "\n"
 "  Unit:  "
@@ -233,7 +233,7 @@ msgstr ""
 "\n"
 "Enhet:  "
 
-#: addressbook/backend/ebook/e-card.c:3356
+#: addressbook/backend/ebook/e-card.c:3461
 msgid ""
 "\n"
 "  Unit2: "
@@ -241,7 +241,7 @@ msgstr ""
 "\n"
 "Enhet2: "
 
-#: addressbook/backend/ebook/e-card.c:3357
+#: addressbook/backend/ebook/e-card.c:3462
 msgid ""
 "\n"
 "  Unit3: "
@@ -249,7 +249,7 @@ msgstr ""
 "\n"
 "Enhet3: "
 
-#: addressbook/backend/ebook/e-card.c:3358
+#: addressbook/backend/ebook/e-card.c:3463
 msgid ""
 "\n"
 "  Unit4: "
@@ -257,7 +257,7 @@ msgstr ""
 "\n"
 "Enhet4: "
 
-#: addressbook/backend/ebook/e-card.c:3362
+#: addressbook/backend/ebook/e-card.c:3467
 msgid ""
 "\n"
 "Categories: "
@@ -265,7 +265,7 @@ msgstr ""
 "\n"
 "Kategorier: "
 
-#: addressbook/backend/ebook/e-card.c:3363
+#: addressbook/backend/ebook/e-card.c:3468
 msgid ""
 "\n"
 "Comment: "
@@ -283,7 +283,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3376
+#: addressbook/backend/ebook/e-card.c:3481
 msgid ""
 "\n"
 "Unique String: "
@@ -291,7 +291,7 @@ msgstr ""
 "\n"
 "Unik streng: "
 
-#: addressbook/backend/ebook/e-card.c:3379
+#: addressbook/backend/ebook/e-card.c:3484
 msgid ""
 "\n"
 "Public Key: "
@@ -299,27 +299,37 @@ msgstr ""
 "\n"
 "Offentlig nøkkel: "
 
+#: addressbook/backend/ebook/e-card.c:3745
+msgid "Multiple VCards"
+msgstr "Flere VCard"
+
+#: addressbook/backend/ebook/e-card.c:3753
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard for %s"
+
 #: addressbook/backend/ebook/e-destination.c:232
 msgid "???"
 msgstr "???"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr "Factory for import av GnomeCard-filer til Evolution."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+msgid "Factory to import VCard files into Evolution."
+msgstr "Factory for import av VCard-filer til Evolution."
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
-msgstr "Importerer GnomeCard-filer til Evolution."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+msgid "Imports VCard files into Evolution."
+msgstr "Importerer VCard-filer til Evolution."
 
 #: 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:1092
-#: addressbook/gui/component/addressbook-factory.c:43
+#: addressbook/gui/component/addressbook-factory.c:42
 #: calendar/conduits/calendar/calendar-conduit.c:1151
 #: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:99 calendar/gui/main.c:57
+#: calendar/gui/alarm-notify/notify-main.c:98 calendar/gui/main.c:57
+#: executive-summary/test-service/rdf-summary.c:981
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initialisere Bonobo"
 
@@ -422,7 +432,7 @@ msgid "Web page address:"
 msgstr "Hjemmeside-adresse:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:84
 msgid "_Add"
 msgstr "_Legg til"
 
@@ -447,8 +457,9 @@ msgid "_Company:"
 msgstr "_Firma:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:75 ui/evolution-event-editor.xml.h:57
-#: ui/evolution-mail.xml.h:93 ui/evolution-task-editor-dialog.xml.h:69
+#: mail/folder-browser.c:650 mail/mail-config.glade.h:85
+#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:101
+#: ui/evolution-task-editor-dialog.xml.h:69
 msgid "_Delete"
 msgstr "_Slett"
 
@@ -556,7 +567,6 @@ msgstr "Mobil"
 
 #: addressbook/contact-editor/e-contact-editor.c:1254
 #: addressbook/contact-editor/e-contact-editor.c:1312
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:40
 msgid "Other"
 msgstr "Annet"
 
@@ -731,66 +741,67 @@ msgstr "_Suffiks:"
 msgid "_Title:"
 msgstr "_Tittel:"
 
-#: addressbook/gui/component/addressbook.c:241
+#: addressbook/gui/component/addressbook.c:242
 msgid "As _Minicards"
 msgstr "Som _minikort"
 
-#: addressbook/gui/component/addressbook.c:247
+#: addressbook/gui/component/addressbook.c:248
 #: ui/evolution-addressbook.xml.h:1
 msgid "As _Table"
 msgstr "Som _tabell"
 
-#: addressbook/gui/component/addressbook.c:399
+#: addressbook/gui/component/addressbook.c:408
 #, c-format
 msgid "Enter password for %s"
 msgstr "Skriv inn passord for %s"
 
-#: addressbook/gui/component/addressbook.c:427
+#: addressbook/gui/component/addressbook.c:436
 msgid "Unable to open addressbook"
 msgstr "Kunne ikke åpne adresseboken"
 
-#: addressbook/gui/component/addressbook.c:432
+#: addressbook/gui/component/addressbook.c:443
 msgid ""
 "We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"Kunne ikke åpne denne adresseboken. Dette beyr at du\n"
-"har skrevet inn en ugyldig URI, eller at du har forsøkt\n"
-"å aksessere en LDAP-tjener og ikke har støtte for LDAP\n"
-"kompilert inn. Hvis du skrev inn en URI, vær vennlig\n"
-"og sjekk om denne er korrekt, og skriv den inn på nytt.\n"
-"Hvis ikke har du sannsynligvis forsøkt å bruke en LDAP-\n"
-"tjener. Hvis du ønsker å bruke LDAP må du laste ned og\n"
-"installere OpenLDAP, deretter må du kompilere og\n"
-"installere Evolution på nytt.\n"
-
-#: addressbook/gui/component/addressbook.c:555
-msgid "Show All"
-msgstr "Vis alle"
+"means you have entered an incorrect URI, or the LDAP server\n"
+"is down"
+msgstr ""
+"Kunne ikke åpne denne adresseboken. Dette betyr enten\n"
+"at du har skrevet inn en ugyldig URI, eller at LDAP-tjeneren\n"
+"er nede"
 
-#: addressbook/gui/component/addressbook.c:557
-msgid "Advanced..."
-msgstr "Avansert..."
+#: addressbook/gui/component/addressbook.c:448
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+"Denne versjonen av Evolution har ikke LDAP-støtte\n"
+"kompilert inn. Hvis du ønsker å bruke LDAP i Evolution\n"
+"må du kompilere programmet fra kildekoden i CVS etter å\n"
+"ha hentet OpenLDAP fra lenken under.\n"
 
-#: addressbook/gui/component/addressbook.c:587 calendar/gui/gnome-cal.c:236
+#: addressbook/gui/component/addressbook.c:456
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
+msgstr ""
+"Kunne ikke åpne denne adresseboken. Vennligst sjekk at stien\n"
+"eksisterer og at du har rettigheter til å aksessere den."
+
+#: addressbook/gui/component/addressbook.c:616 calendar/gui/gnome-cal.c:233
 msgid "Any field contains"
 msgstr "Et felt inneholder"
 
-#: addressbook/gui/component/addressbook.c:588
+#: addressbook/gui/component/addressbook.c:617
 msgid "Name contains"
 msgstr "Navn inneholder"
 
-#: addressbook/gui/component/addressbook.c:589
+#: addressbook/gui/component/addressbook.c:618
 msgid "Email contains"
 msgstr "E-post inneholder"
 
-#: addressbook/gui/component/addressbook.c:732
+#: addressbook/gui/component/addressbook.c:761
 msgid "The URI that the Folder Browser will display"
 msgstr "URIen som mappeutforskeren vil vise"
 
@@ -813,56 +824,60 @@ msgstr "Ingen (anonym modus)"
 #: addressbook/gui/component/addressbook-config.c:165
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:291
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
 msgid "Password"
 msgstr "Passord"
 
-#: addressbook/gui/component/addressbook-config.c:167
-msgid "SASL"
-msgstr "SASL"
-
-#: addressbook/gui/component/addressbook-config.c:170
+#: addressbook/gui/component/addressbook-config.c:168
 msgid "Unknown auth type"
 msgstr "Ukjent autentiseringstype"
 
-#: addressbook/gui/component/addressbook-config.c:179
+#: addressbook/gui/component/addressbook-config.c:177
 msgid "Base"
 msgstr "Basis"
 
-#: addressbook/gui/component/addressbook-config.c:181
+#: addressbook/gui/component/addressbook-config.c:179
 msgid "One"
 msgstr "En"
 
-#: addressbook/gui/component/addressbook-config.c:183
+#: addressbook/gui/component/addressbook-config.c:181
 msgid "Subtree"
 msgstr "Undertre"
 
-#: addressbook/gui/component/addressbook-config.c:186
+#: addressbook/gui/component/addressbook-config.c:184
 msgid "Unknown scope type"
 msgstr "Ukjent type område"
 
-#: addressbook/gui/component/addressbook-config.c:353
+#: addressbook/gui/component/addressbook-config.c:349
 msgid "Bind DN:"
 msgstr "Bind DN:"
 
-#: addressbook/gui/component/addressbook-config.c:354
+#: addressbook/gui/component/addressbook-config.c:350
 msgid "FIXME Bind DN Help text here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:356
-#: mail/mail-config.glade.h:50
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:60
 msgid "Remember this password"
 msgstr "Husk dette passordet"
 
-#: addressbook/gui/component/addressbook-config.c:406
-#: mail/mail-config.glade.h:28
+#: addressbook/gui/component/addressbook-config.c:401
+#: mail/mail-config.glade.h:33
 msgid "Host:"
 msgstr "Vert:"
 
-#: addressbook/gui/component/addressbook-config.c:407
+#: addressbook/gui/component/addressbook-config.c:402
 msgid "FIXME Host help text here."
 msgstr ""
 
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "Root DN:"
+msgstr "Rot DN:"
+
+#: addressbook/gui/component/addressbook-config.c:405
+msgid "FIXME Root DN help text here."
+msgstr ""
+
 #: addressbook/gui/component/addressbook-config.c:409
 msgid "Port:"
 msgstr "Port:"
@@ -871,65 +886,61 @@ msgstr "Port:"
 msgid "FIXME Port help text here."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:414
-msgid "Root DN:"
-msgstr "Rot DN:"
-
-#: addressbook/gui/component/addressbook-config.c:415
-msgid "FIXME Root DN help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:435
+#: addressbook/gui/component/addressbook-config.c:430
 msgid "Search Scope:"
 msgstr "Søkeområde:"
 
-#: addressbook/gui/component/addressbook-config.c:489
+#: addressbook/gui/component/addressbook-config.c:477
 msgid "Authentication:"
 msgstr "Autentisering:"
 
-#: addressbook/gui/component/addressbook-config.c:507
-#: mail/mail-config.glade.h:44
+#: addressbook/gui/component/addressbook-config.c:499
+msgid "Advanced LDAP Options"
+msgstr "Avanserte LDAP-alternativer"
+
+#: addressbook/gui/component/addressbook-config.c:520
+#: mail/mail-config.glade.h:53
 msgid "Path:"
 msgstr "Sti:"
 
-#: addressbook/gui/component/addressbook-config.c:508
+#: addressbook/gui/component/addressbook-config.c:521
 msgid "FIXME Path Help text here"
 msgstr "Hjelp for stier her?"
 
-#: addressbook/gui/component/addressbook-config.c:513
+#: addressbook/gui/component/addressbook-config.c:526
 msgid "Create path if it doesn't exist."
 msgstr "Opprett sti hvis den ikke eksisterer."
 
-#: addressbook/gui/component/addressbook-config.c:647
+#: addressbook/gui/component/addressbook-config.c:660
 msgid "Edit Addressbook"
-msgstr "Redigér adressebok"
+msgstr "Rediger adressebok"
 
-#: addressbook/gui/component/addressbook-config.c:649
+#: addressbook/gui/component/addressbook-config.c:662
 msgid "Add Addressbook"
 msgstr "Legg til adressebok"
 
-#: addressbook/gui/component/addressbook-config.c:665
+#: addressbook/gui/component/addressbook-config.c:680
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
 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:35
+#: addressbook/gui/component/addressbook-config.c:686
+#: mail/mail-config.glade.h:43
 msgid "Name:"
 msgstr "Navn:"
 
-#: addressbook/gui/component/addressbook-config.c:672
+#: addressbook/gui/component/addressbook-config.c:687
 msgid "FIXME Name help text here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:674
+#: addressbook/gui/component/addressbook-config.c:689
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: addressbook/gui/component/addressbook-config.c:675
+#: addressbook/gui/component/addressbook-config.c:690
 msgid "FIXME Description help text here"
 msgstr ""
 
@@ -939,21 +950,21 @@ msgstr "Adressebok-kilder"
 
 #: addressbook/gui/component/addressbook-config.glade.h:3
 #: addressbook/gui/widgets/e-addressbook-view.c:578
-#: addressbook/gui/widgets/e-minicard.c:673
+#: addressbook/gui/widgets/e-minicard-view-model.c:253
 #: 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:616
-#: mail/mail-config.glade.h:19 mail/message-browser.c:190
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:11 ui/evolution-task-editor-dialog.xml.h:18
+#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:23
+#: mail/message-browser.c:203 ui/evolution-addressbook.xml.h:3
+#: ui/evolution-event-editor.xml.h:17 ui/evolution-mail.xml.h:11
+#: ui/evolution-task-editor-dialog.xml.h:18
 msgid "Delete"
 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:23
+#: mail/mail-config.glade.h:28
 msgid "Edit"
-msgstr "Redigér"
+msgstr "Rediger"
 
 #: addressbook/gui/component/addressbook-config.glade.h:5
 msgid "Name"
@@ -1065,6 +1076,7 @@ msgid "Select name from:"
 msgstr "Velg navn fra:"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: mail/mail-search.c:211
 msgid "Search"
 msgstr "Søk"
 
@@ -1178,31 +1190,31 @@ msgstr "z"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:513
 #: addressbook/gui/widgets/e-addressbook-view.c:573
-#: addressbook/gui/widgets/e-minicard.c:466
-#: addressbook/gui/widgets/e-minicard.c:668
+#: addressbook/gui/widgets/e-minicard-view-model.c:152
+#: addressbook/gui/widgets/e-minicard-view-model.c:248
 msgid "Save as VCard"
 msgstr "Lagre som VCard"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:574
-#: addressbook/gui/widgets/e-minicard.c:669
+#: addressbook/gui/widgets/e-minicard-view-model.c:249
 msgid "Send contact to other"
 msgstr "Send kontakt til andre"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:575
-#: addressbook/gui/widgets/e-minicard.c:670
+#: addressbook/gui/widgets/e-minicard-view-model.c:250
 msgid "Send message to contact"
 msgstr "Send melding til kontakt"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:576
-#: addressbook/gui/widgets/e-minicard.c:671 mail/folder-browser.c:591
-#: mail/message-browser.c:187 ui/evolution-addressbook.xml.h:9
-#: ui/evolution-calendar.xml.h:23 ui/evolution-mail.xml.h:51
+#: addressbook/gui/widgets/e-minicard-view-model.c:251
+#: mail/message-browser.c:200 ui/evolution-addressbook.xml.h:9
+#: ui/evolution-calendar.xml.h:23 ui/evolution-mail.xml.h:59
 #: ui/evolution-tasks.xml.h:4
 msgid "Print"
 msgstr "Skriv ut"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:577
-#: addressbook/gui/widgets/e-minicard.c:672
+#: addressbook/gui/widgets/e-minicard-view-model.c:252
 msgid "Print Envelope"
 msgstr "Skriv ut konvolutt"
 
@@ -1326,7 +1338,7 @@ msgstr "Fri-ledig URL"
 msgid "Save in addressbook"
 msgstr "Lagre i adressebok"
 
-#: addressbook/gui/widgets/e-minicard-view.c:166
+#: addressbook/gui/widgets/e-minicard-view.c:507
 msgid ""
 "\n"
 "\n"
@@ -1557,11 +1569,11 @@ msgid ""
 msgstr ""
 "Det er %s. Unix tiden er %ld akkurat nå. Vi bare tenkte du ville vite det."
 
-#: calendar/gui/alarm-notify/notify-main.c:94 calendar/gui/main.c:52
+#: calendar/gui/alarm-notify/notify-main.c:93 calendar/gui/main.c:52
 msgid "Could not initialize GNOME"
 msgstr "Kunne ikke initiere GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:109
+#: calendar/gui/alarm-notify/notify-main.c:108
 msgid "Could not create the alarm notify service factory"
 msgstr "Kunne ikke opprette factory for alarm-tjenesten"
 
@@ -1584,24 +1596,24 @@ msgstr ""
 "Kunne ikke opprette kalendervisning. Vennligst sjekk din ORBit og OAF "
 "konfigurasjon."
 
-#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:895
+#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:898
 #: calendar/gui/e-calendar-table.c:330
 msgid "Public"
 msgstr "Offentlig"
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:897
+#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:900
 #: calendar/gui/e-calendar-table.c:331
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:899
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:902
 #: calendar/gui/e-calendar-table.c:332
 msgid "Confidential"
 msgstr "Konfidensiell"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1606
-#: calendar/gui/event-editor.c:1633
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1601
+#: calendar/gui/event-editor.c:1628
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Unknown"
 msgstr "Ukjent"
 
@@ -1621,71 +1633,71 @@ msgstr "Ø"
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1063
+#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1066
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:690
+#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:689
 msgid "High"
 msgstr "Høy"
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1065
-#: calendar/gui/calendar-model.c:1569
+#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1068
+#: calendar/gui/calendar-model.c:1574
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:689
+#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:688
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1067
+#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1070
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:688
+#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:687
 msgid "Low"
 msgstr "Lav"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1119
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1122
 #: calendar/gui/e-calendar-table.c:406
 msgid "Transparent"
 msgstr "Gjennomsiktig"
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1121
+#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1124
 #: calendar/gui/e-calendar-table.c:405
 msgid "Opaque"
 msgstr "Ugjennomsiktig"
 
-#: calendar/gui/calendar-model.c:635 calendar/gui/calendar-model.c:1173
+#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1176
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:14
 #: calendar/gui/e-calendar-table.c:426
 msgid "Not Started"
 msgstr "Ikke startet"
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1175
+#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1178
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:11
 #: calendar/gui/e-calendar-table.c:427
 msgid "In Progress"
 msgstr "Under arbeid"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1177
+#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1180
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:6
 #: calendar/gui/e-calendar-table.c:428
 msgid "Completed"
 msgstr "Fullført"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1179
+#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1182
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:550
-#: camel/camel-service.c:586
+#: 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:791 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:794 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:794 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:797 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:799
+#: calendar/gui/calendar-model.c:802
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1696,7 +1708,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:879
+#: calendar/gui/calendar-model.c:882
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
@@ -1704,17 +1716,17 @@ msgstr ""
 "'Ingen'"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:893 calendar/gui/calendar-model.c:1117
-#: calendar/gui/calendar-model.c:1171 calendar/gui/e-calendar-table.c:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:973
+#: calendar/gui/calendar-model.c:896 calendar/gui/calendar-model.c:1120
+#: calendar/gui/calendar-model.c:1174 calendar/gui/e-calendar-table.c:329
+#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:976
 #: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1179
+#: mail/mail-config.glade.h:46 shell/e-shell-view.c:1199
 #: widgets/misc/e-cell-date-edit.c:237 widgets/misc/e-dateedit.c:432
 #: widgets/misc/e-dateedit.c:1341 widgets/misc/e-dateedit.c:1456
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/calendar-model.c:967
+#: calendar/gui/calendar-model.c:970
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1724,40 +1736,40 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1007
+#: calendar/gui/calendar-model.c:1010
 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:1048
+#: calendar/gui/calendar-model.c:1051
 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:1061
+#: calendar/gui/calendar-model.c:1064
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:22
 #: calendar/gui/e-calendar-table.c:355
 msgid "Undefined"
 msgstr "Udefinert"
 
-#: calendar/gui/calendar-model.c:1102
+#: calendar/gui/calendar-model.c:1105
 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:1571
+#: calendar/gui/calendar-model.c:1576
 msgid "Recurring"
 msgstr "Gjeninntreffer"
 
-#: calendar/gui/calendar-model.c:1573
+#: calendar/gui/calendar-model.c:1578
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1584
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1584
 msgid "No"
 msgstr "Nei"
 
@@ -1786,7 +1798,7 @@ msgstr "<b>Feil under lasting av kalender</b>"
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr "<b>Feil under lasting av kalender:<br>Metoden er ikke støttet"
 
-#: calendar/gui/calendar-summary.c:622
+#: calendar/gui/calendar-summary.c:622 mail/mail-config.glade.h:24
 msgid "Display"
 msgstr "Vis"
 
@@ -1892,7 +1904,7 @@ msgstr "Farger"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Compress weekends"
-msgstr "Komprimér helger"
+msgstr "Komprimer helger"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Date navigator options"
@@ -1928,13 +1940,13 @@ msgid "Fri"
 msgstr "Fre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:484
+#: calendar/gui/event-editor.c:479
 msgid "Friday"
 msgstr "Fredag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "Highlight"
-msgstr "Markér"
+msgstr "Marker"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Items Due Today"
@@ -1957,7 +1969,7 @@ msgid "Mon"
 msgstr "Man"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/event-editor.c:475
 msgid "Monday"
 msgstr "Mandag"
 
@@ -1970,7 +1982,7 @@ msgid "Overdue Items:"
 msgstr "Utgåtte oppføringer:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:54
 msgid "Pick a color"
 msgstr "Velg en farge"
 
@@ -1993,7 +2005,7 @@ msgid "Sat"
 msgstr "Lør"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:485
+#: calendar/gui/event-editor.c:480
 msgid "Saturday"
 msgstr "Lørdag"
 
@@ -2018,7 +2030,7 @@ msgid "Sun"
 msgstr "Søn"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:486
+#: calendar/gui/event-editor.c:481
 msgid "Sunday"
 msgstr "Søndag"
 
@@ -2031,7 +2043,7 @@ msgid "Thu"
 msgstr "Tor"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:483
+#: calendar/gui/event-editor.c:478
 msgid "Thursday"
 msgstr "Torsdag"
 
@@ -2052,7 +2064,7 @@ msgid "Tue"
 msgstr "Tir"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/event-editor.c:476
 msgid "Tuesday"
 msgstr "Tirsdag"
 
@@ -2065,7 +2077,7 @@ msgid "Wed"
 msgstr "Ons"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:482
+#: calendar/gui/event-editor.c:477
 msgid "Wednesday"
 msgstr "Onsdag"
 
@@ -2078,7 +2090,7 @@ msgid "minutes before they occur."
 msgstr "minutter i forveien."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:88
 msgid "seconds."
 msgstr "sekunder"
 
@@ -2113,29 +2125,29 @@ msgstr "Er du sikker på at du vil slette denne journaloppføringen uten tittel?"
 msgid "Do you want to save changes?"
 msgstr "Vil du lagre endringene?"
 
-#: calendar/gui/dialogs/task-editor.c:707
+#: calendar/gui/dialogs/task-editor.c:709
 msgid "Edit Task"
-msgstr "Redigér oppgave"
-
-#: calendar/gui/dialogs/task-editor.c:713 calendar/gui/event-editor.c:382
-msgid "No summary"
-msgstr "Ingen sammendrag"
+msgstr "Rediger oppgave"
 
-#: calendar/gui/dialogs/task-editor.c:719 calendar/gui/event-editor.c:388
+#: calendar/gui/dialogs/task-editor.c:714 calendar/gui/event-editor.c:382
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: calendar/gui/dialogs/task-editor.c:722 calendar/gui/event-editor.c:391
+#: calendar/gui/dialogs/task-editor.c:717 calendar/gui/event-editor.c:385
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgave - %s"
 
-#: calendar/gui/dialogs/task-editor.c:725 calendar/gui/event-editor.c:394
+#: calendar/gui/dialogs/task-editor.c:720 calendar/gui/event-editor.c:388
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaloppføring - %s"
 
+#: calendar/gui/dialogs/task-editor.c:734 calendar/gui/event-editor.c:402
+msgid "No summary"
+msgstr "Ingen sammendrag"
+
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:2
 #, no-c-format
 msgid "% Comp_lete:"
@@ -2318,11 +2330,11 @@ msgstr "Merk oppgaven som fullført"
 
 #: calendar/gui/e-calendar-table.c:557
 msgid "Edit this task..."
-msgstr "Redigér denne oppgaven..."
+msgstr "Rediger denne oppgaven..."
 
 #: calendar/gui/e-calendar-table.c:558
 msgid "Edit the task"
-msgstr "Redigér oppgaven"
+msgstr "Rediger oppgaven"
 
 #: calendar/gui/e-calendar-table.c:560
 #: ui/evolution-task-editor-dialog.xml.h:19
@@ -2383,8 +2395,7 @@ msgid "Go to Date..."
 msgstr "Gå til dato..."
 
 #: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
-#: mail/folder-browser.c:585 ui/evolution-calendar.xml.h:19
-#: ui/evolution-message-composer.xml.h:10
+#: ui/evolution-calendar.xml.h:19 ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Åpne"
 
@@ -2476,7 +2487,7 @@ msgstr " Tentativ "
 
 #: calendar/gui/e-itip-control.c:860
 msgid "Update Calendar"
-msgstr "Oppdatér kalender"
+msgstr "Oppdater kalender"
 
 #: calendar/gui/e-itip-control.c:883
 msgid "Cancel Meeting"
@@ -2495,7 +2506,7 @@ msgstr "--til--"
 msgid "Calendar Message"
 msgstr "Kalendermelding"
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:623
+#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:632
 msgid "Date:"
 msgstr "Dato:"
 
@@ -2563,7 +2574,7 @@ msgstr "Valgfri deltaker"
 msgid "Organizer: "
 msgstr "Organisator: "
 
-#: calendar/gui/e-meeting-dialog.glade.h:15
+#: calendar/gui/e-meeting-dialog.glade.h:14
 msgid ""
 "Publish\n"
 "Event"
@@ -2571,11 +2582,11 @@ msgstr ""
 "Publiser\n"
 "hendelse"
 
-#: calendar/gui/e-meeting-dialog.glade.h:17
+#: calendar/gui/e-meeting-dialog.glade.h:16
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/e-meeting-dialog.glade.h:18
+#: calendar/gui/e-meeting-dialog.glade.h:17
 msgid ""
 "Request\n"
 "Meeting"
@@ -2583,17 +2594,17 @@ msgstr ""
 "Forespør\n"
 "møte"
 
-#: calendar/gui/e-meeting-dialog.glade.h:20
+#: calendar/gui/e-meeting-dialog.glade.h:19
 msgid "Required Participant"
 msgstr ""
 "Obligatorisk\n"
 "deltaker"
 
-#: calendar/gui/e-meeting-dialog.glade.h:21
+#: calendar/gui/e-meeting-dialog.glade.h:20
 msgid "Role"
 msgstr "Rolle"
 
-#: calendar/gui/e-meeting-dialog.glade.h:22
+#: calendar/gui/e-meeting-dialog.glade.h:21
 msgid ""
 "Schedule\n"
 "Time"
@@ -2601,8 +2612,8 @@ msgstr ""
 "Sett av\n"
 "tid"
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:49
-#: mail/message-list.c:1082
+#: calendar/gui/e-meeting-dialog.glade.h:23 filter/libfilter-i18n.h:49
+#: mail/message-list.c:1081
 msgid "Status"
 msgstr "Status"
 
@@ -2625,117 +2636,117 @@ msgstr "Kunne ikke laste oppgavene i `%s'"
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden som er nødvendig for å laste `%s' er ikke støttet"
 
-#: calendar/gui/event-editor.c:376
+#: calendar/gui/event-editor.c:377
 msgid "Edit Appointment"
 msgstr "Rediger avtale"
 
-#: calendar/gui/event-editor.c:454
+#: calendar/gui/event-editor.c:449
 msgid "on"
 msgstr "på"
 
-#: calendar/gui/event-editor.c:479 filter/filter-datespec.c:81
+#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:81
 msgid "day"
 msgstr "dag"
 
-#: calendar/gui/event-editor.c:606
+#: calendar/gui/event-editor.c:601
 msgid "on the"
 msgstr "den"
 
-#: calendar/gui/event-editor.c:613
+#: calendar/gui/event-editor.c:608
 msgid "th"
 msgstr "de"
 
-#: calendar/gui/event-editor.c:759
+#: calendar/gui/event-editor.c:754
 msgid "occurrences"
 msgstr "gjentakelser"
 
-#: calendar/gui/event-editor.c:876
+#: calendar/gui/event-editor.c:871
 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:1548
+#: calendar/gui/event-editor.c:1543
 #, c-format
 msgid " %d days"
 msgstr " %d dager"
 
-#: calendar/gui/event-editor.c:1550
+#: calendar/gui/event-editor.c:1545
 msgid " 1 day"
 msgstr " 1 dag"
 
-#: calendar/gui/event-editor.c:1553
+#: calendar/gui/event-editor.c:1548
 #, c-format
 msgid " %d weeks"
 msgstr " %d uker"
 
-#: calendar/gui/event-editor.c:1555
+#: calendar/gui/event-editor.c:1550
 msgid " 1 week"
 msgstr " 1 uke"
 
-#: calendar/gui/event-editor.c:1558
+#: calendar/gui/event-editor.c:1553
 #, c-format
 msgid " %d hours"
 msgstr " %d timer"
 
-#: calendar/gui/event-editor.c:1560
+#: calendar/gui/event-editor.c:1555
 msgid " 1 hour"
 msgstr " 1 time"
 
-#: calendar/gui/event-editor.c:1563
+#: calendar/gui/event-editor.c:1558
 #, c-format
 msgid " %d minutes"
 msgstr " %d minutter"
 
-#: calendar/gui/event-editor.c:1565
+#: calendar/gui/event-editor.c:1560
 msgid " 1 minute"
 msgstr " 1 minutt"
 
-#: calendar/gui/event-editor.c:1568
+#: calendar/gui/event-editor.c:1563
 #, c-format
 msgid " %d seconds"
 msgstr " %d  sekunder"
 
-#: calendar/gui/event-editor.c:1570
+#: calendar/gui/event-editor.c:1565
 msgid " 1 second"
 msgstr " 1 sekund"
 
 #: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1593
+#: calendar/gui/event-editor.c:1588
 msgid "Play a sound"
 msgstr "Spill en lyd"
 
 #: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1596
+#: calendar/gui/event-editor.c:1591
 msgid "Show a dialog"
 msgstr "Vis en dialog"
 
 #: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1599
+#: calendar/gui/event-editor.c:1594
 msgid "Send an email"
 msgstr "Send en melding"
 
 #: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1602
+#: calendar/gui/event-editor.c:1597
 msgid "Run a program"
 msgstr "Kjør et program"
 
-#: calendar/gui/event-editor.c:1617
+#: calendar/gui/event-editor.c:1612
 msgid " before start of appointment"
 msgstr " før avtalen starter"
 
-#: calendar/gui/event-editor.c:1619
+#: calendar/gui/event-editor.c:1614
 msgid " after start of appointment"
 msgstr " etter avtalens start"
 
-#: calendar/gui/event-editor.c:1627
+#: calendar/gui/event-editor.c:1622
 msgid " before end of appointment"
 msgstr " før avtalens slutt"
 
-#: calendar/gui/event-editor.c:1629
+#: calendar/gui/event-editor.c:1624
 msgid " after end of appointment"
 msgstr " etter avtalens slutt"
 
-#: calendar/gui/event-editor.c:3137 calendar/gui/print.c:1097
+#: calendar/gui/event-editor.c:3132 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"
@@ -2837,7 +2848,7 @@ msgstr "for alltid"
 msgid "hour(s)"
 msgstr "time(r)"
 
-#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
+#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:87
 msgid "minute(s)"
 msgstr "minutt(er)"
 
@@ -2876,32 +2887,28 @@ msgstr "Slett alle oppføringer"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/gnome-cal.c:223
-msgid "Show all "
-msgstr "Vis alle "
-
-#: calendar/gui/gnome-cal.c:237
+#: calendar/gui/gnome-cal.c:234
 msgid "Summary contains"
 msgstr "Sammendrag inneholder"
 
-#: calendar/gui/gnome-cal.c:238
+#: calendar/gui/gnome-cal.c:235
 msgid "Description contains"
 msgstr "Beskrivelse inneholder"
 
-#: calendar/gui/gnome-cal.c:239
+#: calendar/gui/gnome-cal.c:236
 msgid "Comment contains"
 msgstr "Kommentar inneholder"
 
-#: calendar/gui/gnome-cal.c:240
+#: calendar/gui/gnome-cal.c:237
 msgid "Has category"
 msgstr "Har kategori"
 
-#: calendar/gui/gnome-cal.c:843
+#: calendar/gui/gnome-cal.c:840
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kunne ikke åpne mappen i `%s'"
 
-#: calendar/gui/gnome-cal.c:854
+#: calendar/gui/gnome-cal.c:851
 #, 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"
@@ -3178,9 +3185,9 @@ msgstr "Dette året (%Y)"
 msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1467
+#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1552
 #: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:61
 msgid "Print Preview"
 msgstr "Forhåndsvisning av utskrift"
 
@@ -3230,6 +3237,99 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "SMTOTFL"
 
+#: calendar/pcs/query.c:218
+#, fuzzy
+msgid "time-now expects 0 arguments"
+msgstr "tid-nå forventer 0 argumenter"
+
+#: calendar/pcs/query.c:242
+#, fuzzy
+msgid "make-time expects 1 argument"
+msgstr "lag-tid forventer 1 argument"
+
+#: calendar/pcs/query.c:247
+#, fuzzy
+msgid "make-time expects argument 1 to be a string"
+msgstr "lag-tid forventer at argument 1 er en streng"
+
+#: calendar/pcs/query.c:255
+msgid "make-time argument 1 must be an ISO 8601 date/time string"
+msgstr ""
+
+#: calendar/pcs/query.c:281
+msgid "time-add-day expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:286
+msgid "time-add-day expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:293
+msgid "time-add-day expects argument 2 to be an integer"
+msgstr ""
+
+#: calendar/pcs/query.c:318
+msgid "time-day-begin expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:323
+msgid "time-day-begin expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:348
+msgid "time-day-end expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:353
+msgid "time-day-end expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:389
+msgid "get-vtype expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:472
+msgid "occur-in-time-range? expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:477
+msgid "occur-in-time-range? expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:484
+msgid "occur-in-time-range? expects argument 2 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:611
+msgid "contains? expects 2 arguments"
+msgstr "inneholder? forventer 2 argumenter"
+
+#: calendar/pcs/query.c:616
+msgid "contains? expects argument 1 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:623
+msgid "contains? expects argument 2 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:640
+msgid ""
+"contains? expects argument 1 to be one of \"any\", \"summary\", "
+"\"description\""
+msgstr ""
+
+#: calendar/pcs/query.c:678
+msgid "has-categories? expects at least 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:684
+msgid "has-categories? expects all arguments to be strings"
+msgstr ""
+
+#: calendar/pcs/query.c:932
+msgid "Evaluation of the search expression did not yield a boolean value"
+msgstr "Evaluering av søkeuttrykket ga ikke en boolsk verdi"
+
 #: camel/camel-cipher-context.c:169
 msgid "Signing is not supported by this cipher"
 msgstr "Signering er ikke støttet av dette cipheret"
@@ -3250,6 +3350,10 @@ msgstr "Kryptering er ikke støttet av dette cipheret"
 msgid "Decryption is not supported by this cipher"
 msgstr "Dekryptering er ikke støttet av dette cipheret"
 
+#: camel/camel-disco-store.c:271
+msgid "You must be working online to complete this operation"
+msgstr "Du må arbeide tilknyttet for å fullføre denne operasjonen"
+
 #: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
 msgid "Syncing folders"
 msgstr "Synkroniserer mapper"
@@ -3420,57 +3524,101 @@ msgstr "(Ukjent feil)"
 msgid "Error copying mail temp file: %s"
 msgstr "Feil under kopiering midlertidig meldingsfil: %s"
 
-#: camel/camel-pgp-context.c:190
+#: camel/camel-pgp-context.c:188
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Vennligst skriv inn din %s passphrase for %s"
 
-#: camel/camel-pgp-context.c:193
+#: camel/camel-pgp-context.c:191
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Vennligst skriv inn din %s passphrase"
 
-#: camel/camel-pgp-context.c:513
+#: camel/camel-pgp-context.c:509
 msgid "No plaintext to sign."
 msgstr "Ingen klartekst å signere."
 
-#: camel/camel-pgp-context.c:520 camel/camel-pgp-context.c:692
-#: camel/camel-pgp-context.c:1060 camel/camel-pgp-context.c:1272
+#: camel/camel-pgp-context.c:516 camel/camel-pgp-context.c:688
+#: camel/camel-pgp-context.c:1055 camel/camel-pgp-context.c:1267
 msgid "No password provided."
 msgstr "Ingen passord gitt."
 
-#: camel/camel-pgp-context.c:526 camel/camel-pgp-context.c:698
-#: camel/camel-pgp-context.c:881 camel/camel-pgp-context.c:1067
-#: camel/camel-pgp-context.c:1279
+#: camel/camel-pgp-context.c:522 camel/camel-pgp-context.c:694
+#: camel/camel-pgp-context.c:877 camel/camel-pgp-context.c:1062
+#: camel/camel-pgp-context.c:1274
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Kunne ikke opprette rør til GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:685
+#: camel/camel-pgp-context.c:681
 msgid "No plaintext to clearsign."
 msgstr "Ingen klartekst å kjøre \"plainsign\" på."
 
-#: camel/camel-pgp-context.c:875
+#: camel/camel-pgp-context.c:871
 msgid "No plaintext to verify."
 msgstr "Ingen klartekst å verifisere."
 
-#: camel/camel-pgp-context.c:892
+#: camel/camel-pgp-context.c:888
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Kunne ikke opprette midlertidig fil: %s"
 
-#: camel/camel-pgp-context.c:1050
+#: camel/camel-pgp-context.c:1045
 msgid "No plaintext to encrypt."
 msgstr "Ingen klartekst å kryptere."
 
-#: camel/camel-pgp-context.c:1076
+#: camel/camel-pgp-context.c:1071
 msgid "No recipients specified"
 msgstr "Ingen mottakere spesifisert"
 
-#: camel/camel-pgp-context.c:1264
+#: camel/camel-pgp-context.c:1259
 msgid "No ciphertext to decrypt."
 msgstr "Ingen ciphertekst å dekryptere."
 
+#: camel/camel-pkcs7-context.c:197 camel/camel-smime-context.c:199
+#, c-format
+msgid "Please enter your password for %s"
+msgstr "Vennligst skriv inn ditt passord for %s"
+
+#: camel/camel-pkcs7-context.c:213 camel/camel-smime-context.c:215
+msgid "Error hashing password."
+msgstr "Feil under hashing av passord."
+
+#: camel/camel-pkcs7-context.c:222 camel/camel-smime-context.c:224
+msgid "Invalid password."
+msgstr "Ugyldig passord"
+
+#: camel/camel-pkcs7-context.c:329 camel/camel-smime-context.c:332
+#, c-format
+msgid "Could not sign: certificate not found for \"%s\"."
+msgstr "Kunne ikke signere: sertifikat ikke funnet for \"%s\"."
+
+#: camel/camel-pkcs7-context.c:378
+#, c-format
+msgid "Could not clearsign: certificate not found for \"%s\"."
+msgstr "Kunne ikke klarsignere: sertifikat ikke funnet for \"%s\"."
+
+#: camel/camel-pkcs7-context.c:567 camel/camel-smime-context.c:531
+msgid "Could not encrypt: failed to create enveloped data."
+msgstr "Kunne ikke kryptere: feil under oppretting av konvolutert data."
+
+#: camel/camel-pkcs7-context.c:590 camel/camel-smime-context.c:538
+msgid "Could not encrypt: failed to create encryption context."
+msgstr "Kunne ikke kryptere: klarte ikke å opprette krypteringskontekst."
+
+#: camel/camel-pkcs7-context.c:620 camel/camel-smime-context.c:573
+#, c-format
+msgid "Could not encrypt data: invalid user key: \"%s\"."
+msgstr "Kunne ikke kryptere data: ugyldig nøkkel for bruker: \"%s\"."
+
+#: camel/camel-pkcs7-context.c:626 camel/camel-smime-context.c:579
+msgid "Could not encrypt: encoding failed."
+msgstr "Kunne ikke kryptere: koding feilet."
+
+#: camel/camel-pkcs7-context.c:677 camel/camel-smime-context.c:630
+msgid "Failed to decrypt: Unknown"
+msgstr "Klarte ikke å dekryptere: Ukjent"
+
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
@@ -3486,37 +3634,37 @@ msgstr "Kunne ikke laste %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Kunne ikke laste %s: Ingen initieringskode i modulen."
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr "%s-tjener %s"
 
-#: camel/camel-remote-store.c:190
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s-tjeneste for %s på %s"
 
-#: camel/camel-remote-store.c:240
+#: camel/camel-remote-store.c:252
 msgid "Connection cancelled"
 msgstr "Tilkobling avbrutt"
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:261
+#: camel/camel-remote-store.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:269
 #, 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:244
+#: camel/camel-remote-store.c:256
 msgid "(unknown host)"
 msgstr "(ukjent vert)"
 
-#: camel/camel-remote-store.c:325 camel/camel-remote-store.c:387
-#: camel/camel-remote-store.c:458
-#: camel/providers/imap/camel-imap-command.c:264
+#: camel/camel-remote-store.c:337 camel/camel-remote-store.c:399
+#: camel/camel-remote-store.c:470
+#: camel/providers/imap/camel-imap-command.c:287
 msgid "Operation cancelled"
 msgstr "Opreasjon avbrutt"
 
-#: camel/camel-remote-store.c:464
+#: camel/camel-remote-store.c:476
 msgid "Server unexpectedly disconnected"
 msgstr "Tjener koblet fra uventet."
 
@@ -3627,7 +3775,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:420
+#: camel/providers/imap/camel-imap-store.c:433
 msgid "Bad authentication response from server."
 msgstr "Ugyldig svar på autentisering fra tjener."
 
@@ -3643,60 +3791,60 @@ msgstr "Dette valget vil koble til tjeneren ved bruk av et passord."
 msgid "Unknown authentication state."
 msgstr "Ukjent autentiseringstilstand."
 
-#: camel/camel-search-private.c:110
+#: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Kompilering av regulært uttrykk feilet: %s: %s"
 
-#: camel/camel-service.c:152
+#: camel/camel-service.c:154
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' må inneholde et brukernavn"
 
-#: camel/camel-service.c:160
+#: camel/camel-service.c:162
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' må inneholde et vertsnavn"
 
-#: camel/camel-service.c:168
+#: camel/camel-service.c:170
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' må inneholde en sti"
 
-#: camel/camel-service.c:554
+#: camel/camel-service.c:548
 #, c-format
 msgid "Resolving: %s"
 msgstr "Finner: \"%s\""
 
-#: camel/camel-service.c:581
+#: camel/camel-service.c:575
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Feil i navneoppslag: %s"
 
-#: camel/camel-service.c:606
+#: 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:608
+#: camel/camel-service.c:602
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Vertsoppslag feilet: %s: ukjent årsak"
 
-#: camel/camel-session.c:56
+#: camel/camel-session.c:68
 msgid "Virtual folder email provider"
 msgstr "E-post-tilbyder for virtuelle mapper"
 
-#: camel/camel-session.c:58
+#: camel/camel-session.c:70
 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:273 camel/camel-session.c:363
+#: camel/camel-session.c:295 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:462
+#: camel/camel-session.c:479
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3705,8 +3853,24 @@ msgstr ""
 "Kan ikke opprette katalog %s:\n"
 "%s"
 
+#: camel/camel-smime-context.c:348
+msgid "Could not sign: failed to create content info."
+msgstr "Kan ikke signere: klarte ikke å opprette innholdsinformasjon."
+
+#: camel/camel-smime-context.c:355
+msgid "Could not sign: failed to create signing context."
+msgstr "Kunne ikke signere: klarte ikke å opprette signeringskontekst."
+
+#: camel/camel-smime-context.c:361
+msgid "Could not sign: failed to create signature."
+msgstr "Kunne ikke signere: klarte ikke å opprette signatur."
+
+#: camel/camel-smime-context.c:388
+msgid "'clearsign' is not supported by S/MIME."
+msgstr "'klarsignering' er ikke støttet av dette S/MIME."
+
 #. Fill in the new fields
-#: camel/camel-store.c:380 mail/mail-ops.c:1007 mail/mail-ops.c:1014
+#: camel/camel-store.c:378 mail/mail-ops.c:1007 mail/mail-ops.c:1014
 #: mail/mail-ops.c:1032 mail/mail-ops.c:1033
 msgid "Trash"
 msgstr "Søppel"
@@ -3731,7 +3895,7 @@ msgstr ""
 "Land: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:428 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -3746,6 +3910,15 @@ msgstr ""
 "\n"
 "Vil du akseptere likevel?"
 
+#: camel/camel-tcp-stream-openssl.c:423
+#, c-format
+msgid ""
+"Issuer: %s\n"
+"Subject: %s"
+msgstr ""
+"Utsteder: %s\n"
+"Emne: %s"
+
 #: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -3756,7 +3929,7 @@ msgstr "Kunne ikke tolke URL `%s'"
 msgid "No such message %s in %s"
 msgstr "Ingen slik melding %s i %s"
 
-#: camel/camel-vee-folder.c:545
+#: camel/camel-vee-folder.c:546
 #, c-format
 msgid "No such message: %s"
 msgstr "Ingen slik melding: %s"
@@ -3765,59 +3938,64 @@ msgstr "Ingen slik melding: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr "Du kan ikke kopiere meldinger fra denne søppel-katalogen."
 
-#: camel/providers/imap/camel-imap-message-cache.c:130
+#: camel/providers/imap/camel-imap-message-cache.c:150
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Kan ikke åpne cache-katalog: %s"
 
-#: camel/providers/imap/camel-imap-command.c:209
+#: camel/providers/imap/camel-imap-command.c:232
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Uventet svar fra IMAP-tjener: %s"
 
-#: camel/providers/imap/camel-imap-command.c:217
+#: camel/providers/imap/camel-imap-command.c:240
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-kommando feilet: %s"
 
-#: camel/providers/imap/camel-imap-command.c:218 shell/e-storage.c:481
+#: camel/providers/imap/camel-imap-command.c:241 shell/e-storage.c:481
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
-#: camel/providers/imap/camel-imap-command.c:272
+#: camel/providers/imap/camel-imap-command.c:295
 msgid "Server response ended too soon."
 msgstr "Svar fra tjener ble avsluttet for tidlig."
 
-#: camel/providers/imap/camel-imap-command.c:456
+#: camel/providers/imap/camel-imap-command.c:487
 #, 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:490
+#: camel/providers/imap/camel-imap-command.c:524
 #, 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:170
+#: camel/providers/imap/camel-imap-folder.c:172
+#, c-format
+msgid "Could not create directory %s: %s"
+msgstr "Kan ikke opprette katalog %s: %s"
+
+#: camel/providers/imap/camel-imap-folder.c:191
 #, 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:364
 msgid "Scanning IMAP folder"
 msgstr "Skanner IMAP-mappe"
 
-#: camel/providers/imap/camel-imap-folder.c:984
-#: camel/providers/imap/camel-imap-folder.c:1195
+#: camel/providers/imap/camel-imap-folder.c:1047
+#: camel/providers/imap/camel-imap-folder.c:1281
 msgid "This message is not currently available"
 msgstr "Denne meldingen er ikke tilgjengelig"
 
-#: camel/providers/imap/camel-imap-folder.c:1014
-#: camel/providers/imap/camel-imap-folder.c:1229
+#: camel/providers/imap/camel-imap-folder.c:1075
+#: camel/providers/imap/camel-imap-folder.c:1314
 msgid "Could not find message body in FETCH response."
 msgstr "Kunne ikke finne meldingskropp i FETCH-svar."
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:13
 msgid "Checking for new mail"
 msgstr "Ser etter nye meldinger"
 
@@ -3825,7 +4003,7 @@ msgstr "Ser etter nye meldinger"
 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:534
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:552
 msgid "Folders"
 msgstr "Mapper"
 
@@ -3859,28 +4037,28 @@ msgstr ""
 "Dette valget vil la deg koble til en IMAP-tjener ved å bruke et "
 "klartekst-passord."
 
-#: camel/providers/imap/camel-imap-store.c:443
+#: camel/providers/imap/camel-imap-store.c:456
 #, 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:453
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/imap/camel-imap-store.c:466
+#: camel/providers/smtp/camel-smtp-transport.c:366
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ingen støtte for autentiseringstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:478
+#: camel/providers/imap/camel-imap-store.c:490
 #, 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:493
-#: camel/providers/smtp/camel-smtp-transport.c:403
+#: camel/providers/imap/camel-imap-store.c:505
+#: camel/providers/smtp/camel-smtp-transport.c:410
 msgid "You didn't enter a password."
 msgstr "Du skrev ikke inn et passord."
 
-#: camel/providers/imap/camel-imap-store.c:521
+#: camel/providers/imap/camel-imap-store.c:531
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3891,19 +4069,10 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:868
-#, c-format
-msgid "%s is not a selectable folder"
-msgstr "%s er ikke en valgbar mappe"
-
-#: camel/providers/imap/camel-imap-store.c:882
+#: camel/providers/imap/camel-imap-store.c:803 mail/mail-local.c:334
 #, c-format
-msgid "Could not create directory %s: %s"
-msgstr "Kan ikke opprette katalog %s: %s"
-
-#: camel/providers/imap/camel-imap-store.c:1385
-msgid "You must be working online to complete this operation"
-msgstr "Du må arbeide tilknyttet for å fullføre denne operasjonen"
+msgid "No such folder %s"
+msgstr "Mappen %s eksisterer ikke"
 
 #: camel/providers/local/camel-local-provider.c:39
 msgid "MH-format mail directories"
@@ -3929,42 +4098,42 @@ msgstr "Qmail e-post filer i maildir-format"
 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:129
+#: camel/providers/local/camel-local-store.c:127
 #, 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:136
+#: camel/providers/local/camel-local-store.c:134
 #, 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:144
-#: camel/providers/local/camel-local-store.c:160
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:158
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Finner ikke mappe: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:175
+#: camel/providers/local/camel-local-store.c:173
 msgid "Local stores do not have an inbox"
 msgstr "Lokalt lager har ikke en innboks"
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokal e-post-fil %s"
 
-#: camel/providers/local/camel-local-store.c:241
+#: camel/providers/local/camel-local-store.c:237
 #, 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:283
+#: camel/providers/local/camel-local-store.c:279
 #, 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:293
+#: camel/providers/local/camel-local-store.c:289
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Kunne ikke slette indeksfil for mappe `%s': %s"
@@ -4130,75 +4299,75 @@ msgstr "MAppen `%s' er ikke tom. Ikke slettet."
 
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:249
 msgid "Summarising folder"
 msgstr "Lager sammendrag for mappe"
 
-#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-mbox-summary.c:254
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr "Kunne ikke åpne mappe: %s: lager sammendrag fra posisjon %ld: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-mbox-summary.c:296
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Fatal feil i lesing av postboksen nær posisjon %ld i mappe %s"
 
-#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-mbox-summary.c:371
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Kan ikke lage sammendrag for mappe: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:501
-#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1395
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1397
 msgid "Synchronising folder"
 msgstr "Synkroniserer mappe"
 
-#: camel/providers/local/camel-mbox-summary.c:506
-#: camel/providers/local/camel-mbox-summary.c:707
+#: camel/providers/local/camel-mbox-summary.c:507
+#: camel/providers/local/camel-mbox-summary.c:708
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "Kan ikke åpne mappe for å lage sammendrag: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:523
+#: camel/providers/local/camel-mbox-summary.c:524
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kan ikke åpne midlertidig postboks: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:556
-#: camel/providers/local/camel-mbox-summary.c:745
-#: camel/providers/local/camel-mbox-summary.c:753
+#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:557
+#: camel/providers/local/camel-mbox-summary.c:746
+#: camel/providers/local/camel-mbox-summary.c:754
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Feil i sammendrag og mappe, selv etter synkronisering"
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Feil under skriving til midlertidig postboks: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:616
+#: camel/providers/local/camel-mbox-summary.c:617
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Skriving til midlertidig postboks feilet: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:634
-#: camel/providers/local/camel-mbox-summary.c:803
+#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:804
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kunne ikke lukke kildemappe %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:643
+#: camel/providers/local/camel-mbox-summary.c:644
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Kunne ikke lukke midlertidig mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:654
+#: camel/providers/local/camel-mbox-summary.c:655
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunne ikke endre navn på mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-mbox-summary.c:879
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ukjent feil: %s"
@@ -4336,7 +4505,7 @@ msgstr "Behold meldinger på tjeneren"
 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
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:51
 msgid "POP"
 msgstr "POP"
 
@@ -4375,27 +4544,27 @@ msgstr ""
 "Dette lar deg koble til POP-tjeneren ved å bruke Kerberos 4 som "
 "autentisering."
 
-#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:199
 #, 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:225
+#: camel/providers/pop3/camel-pop3-store.c:215
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "Kunne ikke koble til tjener: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:329
+#: camel/providers/pop3/camel-pop3-store.c:322
 #, 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:368
+#: camel/providers/pop3/camel-pop3-store.c:361
 #, 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:387
+#: camel/providers/pop3/camel-pop3-store.c:379
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4404,12 +4573,12 @@ msgstr ""
 "Kunne ikke koble til POP-tjener.\n"
 "Feil under oversending av brukernavn: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:390
-#: camel/providers/pop3/camel-pop3-store.c:427
+#: camel/providers/pop3/camel-pop3-store.c:382
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "(Unknown)"
 msgstr "(Ukjent)"
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:409
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -4417,7 +4586,7 @@ msgstr ""
 "Kunne ikke koble til POP-tjeneren.\n"
 "Ingen støtte for forespurt autentiseringsmekanisme."
 
-#: camel/providers/pop3/camel-pop3-store.c:425
+#: camel/providers/pop3/camel-pop3-store.c:417
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4426,13 +4595,13 @@ msgstr ""
 "Kunne ikke koble til POP-tjener.\n"
 "Feil ved oversending av passord: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:493
+#: camel/providers/pop3/camel-pop3-store.c:484
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ingen slik mappe `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:67
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4486,7 +4655,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Levering av e-post via sendmail programmet"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:62
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -4494,122 +4663,122 @@ msgstr "SMTP"
 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-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:168
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaksfeil, kommando ikke gjenkjent"
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaksfeil i parametere eller argumenter"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Command not implemented"
 msgstr "Kommando ikke implementert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command parameter not implemented"
 msgstr "Kommandoparameter ikke implementert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "System status, or system help reply"
 msgstr "Systemstatus, eller svar på systemhjelp"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Help message"
 msgstr "Hjelp-melding"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Service ready"
 msgstr "Tjeneste klar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service closing transmission channel"
 msgstr "Tjenesten lukker sendekanalen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service not available, closing transmission channel"
 msgstr "Tjenesten er ikke tilgjengelig, lukker sendekanalen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Requested mail action okay, completed"
 msgstr "Forespurt e-post handling er ok, fullført"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "User not local; will forward to <forward-path>"
 msgstr "Ikke lokal bruker; videresender til <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:190
 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:189
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Forespurt handling ikke utført: postboks ikke tilgjengelig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action aborted: error in processing"
 msgstr "Forespurt handling avbrutt: feil i prosessering"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "User not local; please try <forward-path>"
 msgstr "Ikke lokal bruker; vennligst prøv <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Forespurt handling ikke utført: utilstrekkelig lagringsplass"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Forespurt e-post handling avbrutt: lagringsallokering oversteget"
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:202
 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:201
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Start e-post input; slutt med <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Transaction failed"
 msgstr "Transaksjonen feilet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "A password transition is needed"
 msgstr "Passordoverføring kreves"
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Authentication mechanism is too weak"
 msgstr "Autentiseringsmekanismen er for svak"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Kryptering kreves for forespurt autentiseringsmekanisme."
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Temporary authentication failure"
 msgstr "Midlertidig autentiseringsfeil"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication required"
 msgstr "Autentisering kreves"
 
-#: camel/providers/smtp/camel-smtp-transport.c:305
+#: camel/providers/smtp/camel-smtp-transport.c:313
 #, 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:348
+#: camel/providers/smtp/camel-smtp-transport.c:356
 #, 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
+#: camel/providers/smtp/camel-smtp-transport.c:395
 #, 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:411
+#: camel/providers/smtp/camel-smtp-transport.c:418
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4620,110 +4789,114 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:527
+#: camel/providers/smtp/camel-smtp-transport.c:534
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-tjener %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP e-postlevering via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:561
 msgid "Cannot send message: sender address not defined."
 msgstr "Kan ikke sende melding: senderadresse ikke definert."
 
-#: camel/providers/smtp/camel-smtp-transport.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:568
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan ikke sende melding: senderadresse ikke gyldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:575
+#: camel/providers/smtp/camel-smtp-transport.c:582
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan ikke sende melding: ingen mottakere definert."
 
-#: camel/providers/smtp/camel-smtp-transport.c:669
+#: camel/providers/smtp/camel-smtp-transport.c:676
 #, 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:688
+#: camel/providers/smtp/camel-smtp-transport.c:695
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Feil ved HELO-svar: %s: ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:721
+#: camel/providers/smtp/camel-smtp-transport.c:728
 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
+#: camel/providers/smtp/camel-smtp-transport.c:743
+#: camel/providers/smtp/camel-smtp-transport.c:755
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Tidsavbrudd for AUTH-forespørsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:798
+#: camel/providers/smtp/camel-smtp-transport.c:764
+msgid "AUTH request failed."
+msgstr "AUTH-forespørsel feilet."
+
+#: camel/providers/smtp/camel-smtp-transport.c:809
 msgid "Bad authentication response from server.\n"
 msgstr "Ugyldig svar på autentisering fra tjener.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:824
+#: camel/providers/smtp/camel-smtp-transport.c:835
 #, 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:843
+#: camel/providers/smtp/camel-smtp-transport.c:854
 #, 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:868
+#: camel/providers/smtp/camel-smtp-transport.c:879
 #, 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:887
+#: camel/providers/smtp/camel-smtp-transport.c:898
 #, 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:918
+#: camel/providers/smtp/camel-smtp-transport.c:929
 #, 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:937
+#: camel/providers/smtp/camel-smtp-transport.c:948
 #, 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:952
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:981
 #, 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:989
+#: camel/providers/smtp/camel-smtp-transport.c:1000
 #, 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:1013
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Tidsavbrudd for RSET-forespørsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1043
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Feil ved RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1055
+#: camel/providers/smtp/camel-smtp-transport.c:1066
 #, 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:1074
+#: camel/providers/smtp/camel-smtp-transport.c:1085
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Feil ved QUIT-svar: %s: ikke-fatal"
@@ -4753,7 +4926,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
+#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:121
 msgid "attachment"
 msgstr "vedlegg"
 
@@ -4774,7 +4947,8 @@ msgstr "Legg til vedlegg..."
 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:1082
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:9
+#: mail/message-list.c:1081
 msgid "Attachment"
 msgstr "Vedlegg"
 
@@ -4798,7 +4972,7 @@ msgstr "MIME-type:"
 msgid "Send as:"
 msgstr "Send som:"
 
-#: composer/e-msg-composer.c:529
+#: composer/e-msg-composer.c:536
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -4807,21 +4981,21 @@ msgstr ""
 "Kunne ikke åpne signaturfilen %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:717
+#: composer/e-msg-composer.c:709
 msgid "Save as..."
 msgstr "Lagre som..."
 
-#: composer/e-msg-composer.c:728
+#: composer/e-msg-composer.c:720
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Feil under lagring av fil: %s"
 
-#: composer/e-msg-composer.c:748
+#: composer/e-msg-composer.c:740
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Feil under lasting av fil: %s"
 
-#: composer/e-msg-composer.c:820
+#: composer/e-msg-composer.c:812
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -4829,12 +5003,12 @@ msgstr ""
 "Kunne ikke åpne skisse-mappen for denne kontoen.\n"
 "Vil du bruke standard skisse-mappe?"
 
-#: composer/e-msg-composer.c:878 data/evolution.desktop.in.h:1
+#: composer/e-msg-composer.c:870 data/evolution.desktop.in.h:1
 #: shell/e-shell-view-menu.c:206
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:884
+#: composer/e-msg-composer.c:876
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4844,27 +5018,27 @@ msgstr ""
 "\n"
 "Vil du lagre endringene?"
 
-#: composer/e-msg-composer.c:909
+#: composer/e-msg-composer.c:901
 msgid "Open file"
 msgstr "Åpne fil"
 
-#: composer/e-msg-composer.c:1035
+#: composer/e-msg-composer.c:1027
 msgid "That file does not exist."
 msgstr "Filen eksisterer ikke."
 
-#: composer/e-msg-composer.c:1045
+#: composer/e-msg-composer.c:1037
 msgid "That is not a regular file."
 msgstr "Er ikke en vanlig fil."
 
-#: composer/e-msg-composer.c:1055
+#: composer/e-msg-composer.c:1047
 msgid "That file exists but is not readable."
 msgstr "Filen eksisterer men er ikke lesbar."
 
-#: composer/e-msg-composer.c:1065
+#: composer/e-msg-composer.c:1057
 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:1087
+#: composer/e-msg-composer.c:1079
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4872,64 +5046,64 @@ msgstr ""
 "File en meget stor (mer enn 100K).\n"
 "Er du sikker på at du vil sette den inn?"
 
-#: composer/e-msg-composer.c:1108
+#: composer/e-msg-composer.c:1100
 msgid "An error occurred while reading the file."
 msgstr "En feil oppsto under lesing fra filen."
 
-#: composer/e-msg-composer.c:1409 composer/e-msg-composer.c:1741
+#: composer/e-msg-composer.c:1401 composer/e-msg-composer.c:1744
 msgid "Compose a message"
 msgstr "Skriv en melding"
 
-#: composer/e-msg-composer.c:1830
+#: composer/e-msg-composer.c:1835
 msgid "Could not create composer window."
 msgstr "Kan ikke opprette komponeringsvinduet."
 
-#: composer/e-msg-composer-hdrs.c:321
+#: composer/e-msg-composer-hdrs.c:323
 msgid "Click here for the address book"
 msgstr "Klikk her for å få opp adresseboken"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:745
+#: composer/e-msg-composer-hdrs.c:354 mail/mail-format.c:753
 msgid "From:"
 msgstr "Fra:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:747
+#: composer/e-msg-composer-hdrs.c:360 mail/mail-format.c:755
 msgid "Reply-To:"
 msgstr "Svar-til:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:643
+#: composer/e-msg-composer-hdrs.c:371 mail/mail-format.c:652
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:749
+#: composer/e-msg-composer-hdrs.c:385 mail/mail-format.c:757
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:384
+#: composer/e-msg-composer-hdrs.c:386
 msgid "Enter the recipients of the message"
 msgstr "Skriv inn mottakerene for meldingen"
 
-#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:751
+#: composer/e-msg-composer-hdrs.c:389 mail/mail-format.c:759
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:390
 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:391
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:394
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4961,6 +5135,30 @@ msgstr "adressekort"
 msgid "calendar information"
 msgstr "kalenderinformasjon"
 
+#: default_user/searches.xml.h:1
+msgid "Body contains"
+msgstr "Kropp inneholder"
+
+#: default_user/searches.xml.h:2
+msgid "Body does not contain"
+msgstr "Kropp inneholder ikke"
+
+#: default_user/searches.xml.h:3
+msgid "Body or subject contains"
+msgstr "Kropp eller emne inneholder"
+
+#: default_user/searches.xml.h:4
+msgid "Sender contains"
+msgstr "Sender inneholder"
+
+#: default_user/searches.xml.h:5
+msgid "Subject contains"
+msgstr "Emne inneholder"
+
+#: default_user/searches.xml.h:6
+msgid "Subject does not contain"
+msgstr "Emne inneholder ikke"
+
 #. 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:477
@@ -5037,7 +5235,7 @@ msgstr "%I:%M:%S %p"
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "Kan ikke initiere Evolutions sammendragskomponent."
 
-#: executive-summary/component/e-summary.c:924
+#: executive-summary/component/e-summary.c:926
 #, c-format
 msgid ""
 "Cannot open the HTML file:\n"
@@ -5046,7 +5244,7 @@ msgstr ""
 "Kan ikke åpne HTML-fil:\n"
 "%s"
 
-#: executive-summary/component/e-summary.c:938
+#: executive-summary/component/e-summary.c:940
 #, c-format
 msgid ""
 "Error reading data:\n"
@@ -5055,10 +5253,14 @@ msgstr ""
 "Feil under lesing av data:\n"
 "%s"
 
-#: executive-summary/component/e-summary.c:956
+#: executive-summary/component/e-summary.c:958
 msgid "File does not have a place for the services.\n"
 msgstr "Filen har ikke en plass til tjenestene.\n"
 
+#: executive-summary/component/e-summary-callbacks.c:126
+msgid "Select a service"
+msgstr "Velg en tjeneste"
+
 #: executive-summary/component/e-summary-callbacks.c:290
 msgid ""
 "You can select a different HTML page for the background of the Executive "
@@ -5070,62 +5272,66 @@ msgstr ""
 "\n"
 "Bare la den være blank som standard"
 
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
+#: executive-summary/component/e-summary-url.c:70
+#: executive-summary/component/e-summary-url.c:75
+#: executive-summary/component/e-summary-url.c:82
 #, c-format
 msgid "Open %s with the default GNOME application"
 msgstr "Åpne %s med standard GNOME applikasjon"
 
-#: executive-summary/component/e-summary-url.c:70
+#: executive-summary/component/e-summary-url.c:71
 #, c-format
 msgid "Open %s with the default GNOME web browser"
 msgstr "Åpne %s med standard GNOME nettleser"
 
-#: executive-summary/component/e-summary-url.c:71
+#: executive-summary/component/e-summary-url.c:72
 #, c-format
 msgid "Send an email to %s"
 msgstr "Send en melding til %s"
 
-#: executive-summary/component/e-summary-url.c:72
+#: executive-summary/component/e-summary-url.c:73
 #, c-format
 msgid "Change the view to %s"
 msgstr "Endre visning til %s"
 
-#: executive-summary/component/e-summary-url.c:73
+#: executive-summary/component/e-summary-url.c:74
 #, c-format
 msgid "Run %s"
 msgstr "Kjør %s"
 
-#: executive-summary/component/e-summary-url.c:75
+#: executive-summary/component/e-summary-url.c:76
 #, c-format
 msgid "Close %s"
 msgstr "Lukk %s"
 
-#: executive-summary/component/e-summary-url.c:76
+#: executive-summary/component/e-summary-url.c:77
 #, c-format
 msgid "Move %s to the left"
 msgstr "Flytt %s til venstre"
 
-#: executive-summary/component/e-summary-url.c:77
+#: executive-summary/component/e-summary-url.c:78
 #, c-format
 msgid "Move %s to the right"
 msgstr "Flytt %s til høyre"
 
-#: executive-summary/component/e-summary-url.c:78
+#: executive-summary/component/e-summary-url.c:79
 #, c-format
 msgid "Move %s into the previous row"
 msgstr "Flytt %s til forrige rad"
 
-#: executive-summary/component/e-summary-url.c:79
+#: executive-summary/component/e-summary-url.c:80
 #, c-format
 msgid "Move %s into the next row"
 msgstr "Flytt %s til neste rad"
 
-#: executive-summary/component/e-summary-url.c:80
+#: executive-summary/component/e-summary-url.c:81
 #, c-format
 msgid "Configure %s"
-msgstr "Konfigurér %s"
+msgstr "Konfigurer %s"
+
+#: executive-summary/component/e-summary-url.c:554
+msgid "page"
+msgstr "side"
 
 #: executive-summary/component/executive-summary-config.glade.h:1
 msgid "Appearance"
@@ -5177,30 +5383,67 @@ msgstr "Test bonobo-tjeneste"
 msgid "Test service"
 msgstr "Test-tjeneste"
 
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
+#: executive-summary/test-service/rdf-summary.c:514
+#: executive-summary/test-service/rdf-summary.c:554
+#: executive-summary/test-service/rdf-summary.c:599
 #: widgets/misc/e-messagebox.c:166
 msgid "Error"
 msgstr "Feil"
 
-#: executive-summary/test-service/rdf-summary.c:768
+#: executive-summary/test-service/rdf-summary.c:522
+#: executive-summary/test-service/rdf-summary.c:561
+#: executive-summary/test-service/rdf-summary.c:606
+#, c-format
+msgid "<b>Cannot open location:<br>%s</b>"
+msgstr "<b>Kan ikke åpne lokasjon: <br>%s</b>"
+
+#: executive-summary/test-service/rdf-summary.c:626
+msgid "<b>Loading RDF file. . .<br>Please wait</b>"
+msgstr "<b>Laster RDF-fil. . .<br>Vennligst vent</b>"
+
+#: executive-summary/test-service/rdf-summary.c:731
+msgid "Location:"
+msgstr "Lokasjon:"
+
+#: executive-summary/test-service/rdf-summary.c:747
+msgid "Maximum number of entries:"
+msgstr "Maksimalt antall oppføringer:"
+
+#. FIXME: Do this better?
+#: executive-summary/test-service/rdf-summary.c:763
+msgid "Show window title"
+msgstr "Vis vindustittel"
+
+#: executive-summary/test-service/rdf-summary.c:780
 msgid "Update automatically"
 msgstr "Oppdater automatisk"
 
-#: executive-summary/test-service/rdf-summary.c:778
+#: executive-summary/test-service/rdf-summary.c:790
 msgid "Update now"
 msgstr "Oppdater nå"
 
-#: executive-summary/test-service/rdf-summary.c:788
+#: executive-summary/test-service/rdf-summary.c:800
 msgid "Update every "
 msgstr "Oppdater hver(t) "
 
-#: executive-summary/test-service/rdf-summary.c:796
+#: executive-summary/test-service/rdf-summary.c:811
 #: filter/filter-datespec.c:83
 msgid "minutes"
 msgstr "minutter"
 
+#: executive-summary/test-service/rdf-summary.c:856
+#, c-format
+msgid "HELP: Page %d!\n"
+msgstr "HJELP: Side %d!\n"
+
+#: executive-summary/test-service/rdf-summary.c:877
+msgid "Downloading..."
+msgstr "Laster ned..."
+
+#: executive-summary/test-service/rdf-summary.c:962
+msgid "Cannot initialize factory"
+msgstr "Kan ikke initiere factory"
+
 #: filter/filter-datespec.c:78
 msgid "year"
 msgstr "år"
@@ -5330,7 +5573,7 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 "Du glemte å velge en meppe.\n"
-"Vennligst gå tilbake og spesifisér en gyldig mappe for levering av e-post."
+"Vennligst gå tilbake og spesifiser en gyldig mappe for levering av e-post."
 
 #: filter/filter-folder.c:225 filter/vfolder-rule.c:285
 #: mail/mail-account-gui.c:682
@@ -5347,11 +5590,11 @@ msgstr "<klikk her for å velge en mappe>"
 
 #: filter/filter.glade.h:4
 msgid "Edit Filters"
-msgstr "Redigér filtre"
+msgstr "Rediger filtre"
 
 #: filter/filter.glade.h:5
 msgid "Edit VFolders"
-msgstr "Redigér VFoldere"
+msgstr "Rediger VFoldere"
 
 #: filter/filter.glade.h:7
 msgid "Incoming"
@@ -5394,7 +5637,7 @@ msgstr ""
 "Feil i regulært uttrykk '%s':\n"
 "%s"
 
-#: filter/filter-part.c:474
+#: filter/filter-part.c:488
 msgid "Test"
 msgstr "Test"
 
@@ -5452,7 +5695,7 @@ msgstr "inneholder"
 
 #: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
-msgstr "Kopiér til mappe"
+msgstr "Kopier til mappe"
 
 #: filter/libfilter-i18n.h:9
 msgid "Date received"
@@ -5583,7 +5826,7 @@ msgid "Replied to"
 msgstr "Svart til"
 
 #: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.c:1082
+#: mail/message-list.c:1081
 msgid "Score"
 msgstr "Poenggi"
 
@@ -5615,7 +5858,7 @@ msgstr "starter med"
 msgid "Stop Processing"
 msgstr "Stopp behandling"
 
-#: filter/libfilter-i18n.h:51 mail/message-list.c:1083
+#: filter/libfilter-i18n.h:51 mail/message-list.c:1082
 msgid "Subject"
 msgstr "Emne"
 
@@ -5635,7 +5878,7 @@ msgstr "Regler"
 msgid "Add Rule"
 msgstr "Legg til regel"
 
-#: filter/rule-editor.c:298
+#: filter/rule-editor.c:299
 msgid "Edit Rule"
 msgstr "Rediger regel"
 
@@ -5643,124 +5886,211 @@ msgstr "Rediger regel"
 msgid "Score Rules"
 msgstr "Poengregler"
 
-#: mail/component-factory.c:329
+#: importers/elm-importer.c:437 importers/netscape-importer.c:784
+#: importers/pine-importer.c:648 shell/e-shell-importer.c:655
+#: shell/importer/import.glade.h:4
+msgid "Import"
+msgstr "Importer"
+
+#: importers/elm-importer.c:442 importers/netscape-importer.c:789
+#: importers/pine-importer.c:653
+msgid "Mail"
+msgstr "E-post"
+
+#: importers/elm-importer.c:446
+msgid "Elm Aliases"
+msgstr "Elm alias"
+
+#: importers/elm-importer.c:474
+msgid ""
+"Evolution has found Elm mail files in ~/Mail.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution har funnet Elm e-post filer i ~/Mail.\n"
+"Vil du importere dem til Evolution?"
+
+#: importers/elm-importer.c:490
+msgid "Elm mail"
+msgstr "Elm e-post"
+
+#: importers/evolution-gnomecard-importer.c:156
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution har funnet GnomeCard filer.\n"
+"Vil du importere dem til Evolution?"
+
+#: importers/netscape-importer.c:794 importers/pine-importer.c:658
+msgid "Settings"
+msgstr "Innstillinger"
+
+#: importers/netscape-importer.c:799 mail/mail-callbacks.c:1464
+msgid "Filters"
+msgstr "Filtre"
+
+#: importers/netscape-importer.c:804
+msgid "Addressbooks"
+msgstr "Adressebøker"
+
+#: importers/netscape-importer.c:811 importers/pine-importer.c:670
+msgid "Don't ask me again"
+msgstr "Ikke spør meg igjen"
+
+#: importers/netscape-importer.c:851
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution har funnet Netscape e-post filer.\n"
+"Vil du importere dem til Evolution?"
+
+#: importers/pine-importer.c:663
+msgid "Addressbook"
+msgstr "Adressebok"
+
+#: importers/pine-importer.c:707
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution har funnet Pine e-post filer.\n"
+"Vil du importere dem til Evolution?"
+
+#: importers/pine-importer.c:725
+msgid "Pine mail"
+msgstr "Pine e-post"
+
+#: mail/component-factory.c:337
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikke initiere Evolutions e-postkomponent."
 
-#: mail/component-factory.c:402
+#: mail/component-factory.c:410
 msgid "Cannot register storage with shell"
 msgstr "Kan ikke registrere lagring i skallet"
 
-#: mail/folder-browser.c:244
+#: mail/folder-browser.c:271
 msgid "Store search as vFolder"
 msgstr "Lagre søk som vMappe"
 
-#: mail/folder-browser.c:552
-msgid "VFolder on Subject"
-msgstr "VFolder for emne"
+#: mail/folder-browser.c:588 ui/evolution-mail.xml.h:95
+msgid "VFolder on _Subject"
+msgstr "VFolder på e_mne"
 
-#: mail/folder-browser.c:555
-msgid "VFolder on Sender"
-msgstr "VFolder for sender"
+#: mail/folder-browser.c:591 ui/evolution-mail.xml.h:93
+msgid "VFolder on Se_nder"
+msgstr "VFolder for se_nder"
 
-#: mail/folder-browser.c:558
-msgid "VFolder on Recipients"
-msgstr "VFolder for mottakere"
+#: mail/folder-browser.c:594 ui/evolution-mail.xml.h:94
+msgid "VFolder on _Recipients"
+msgstr "VFolder for mottake_re"
 
-#: mail/folder-browser.c:561 mail/folder-browser.c:752
-msgid "VFolder on Mailing List"
-msgstr "VFolder på e-postliste"
+#: mail/folder-browser.c:597 ui/evolution-mail.xml.h:92
+msgid "VFolder on Mailing _List"
+msgstr "VFolder på e-post_liste"
 
-#: mail/folder-browser.c:567
-msgid "Filter on Subject"
-msgstr "Filtrér etter emne"
+#: mail/folder-browser.c:603
+msgid "Filter on Sub_ject"
+msgstr "Filtrer på em_ne"
 
-#: mail/folder-browser.c:570
-msgid "Filter on Sender"
-msgstr "Filtrér etter sender"
+#: mail/folder-browser.c:606
+msgid "Filter on Sen_der"
+msgstr "Filtrer på sen_der"
 
-#: mail/folder-browser.c:573
-msgid "Filter on Recipients"
-msgstr "Filtrér etter mottaker"
+#: mail/folder-browser.c:609
+msgid "Filter on Re_cipients"
+msgstr "Filtrer på motta_ker"
 
-#: mail/folder-browser.c:576 mail/folder-browser.c:751
-msgid "Filter on Mailing List"
-msgstr "Filtrér etter e-postliste"
+#: mail/folder-browser.c:612
+msgid "Filter on _Mailing List"
+msgstr "Filtrer på e-_postliste"
 
-#: mail/folder-browser.c:587
+#: mail/folder-browser.c:621
+msgid "_Open"
+msgstr "_Åpne"
+
+#: mail/folder-browser.c:623
 msgid "Resend"
 msgstr "Send på nytt"
 
-#: mail/folder-browser.c:589
-msgid "Save As..."
-msgstr "Lagre som..."
+#: mail/folder-browser.c:625 ui/evolution-calendar.xml.h:43
+#: ui/evolution-mail.xml.h:114 ui/evolution-tasks.xml.h:8
+msgid "_Save As..."
+msgstr "Lagre _som..."
 
-#: mail/folder-browser.c:596
-msgid "Reply to Sender"
-msgstr "Svar til sender"
+#: mail/folder-browser.c:627 ui/evolution-event-editor.xml.h:69
+#: ui/evolution-task-editor-dialog.xml.h:82 ui/evolution-tasks.xml.h:7
+msgid "_Print"
+msgstr "S_kriv ut"
 
-#: mail/folder-browser.c:598 mail/message-browser.c:179
-#: ui/evolution-mail.xml.h:61
-msgid "Reply to All"
-msgstr "Svar til alle"
+#: mail/folder-browser.c:632
+msgid "_Reply to Sender"
+msgstr "Sva_r til sender"
 
-#: mail/folder-browser.c:600 mail/message-browser.c:182
-#: ui/evolution-mail.xml.h:25
-msgid "Forward"
-msgstr "Videresend"
+#: mail/folder-browser.c:634 ui/evolution-mail.xml.h:70
+msgid "Reply to _All"
+msgstr "Svar til _alle"
 
-#: mail/folder-browser.c:602 ui/evolution-mail.xml.h:27
-msgid "Forward inline"
-msgstr "Videresend \"inline\""
+#: mail/folder-browser.c:636 ui/evolution-mail.xml.h:105
+msgid "_Forward"
+msgstr "_Videresend"
 
-#: mail/folder-browser.c:605
-msgid "Mark as Read"
-msgstr "Markér som lest"
+#: mail/folder-browser.c:639 ui/evolution-mail.xml.h:44
+msgid "Mar_k as Read"
+msgstr "Mer_k som lest"
 
-#: mail/folder-browser.c:607
-msgid "Mark as Unread"
-msgstr "Merk som ulest"
+#: mail/folder-browser.c:641 ui/evolution-mail.xml.h:48
+msgid "Mark as U_nread"
+msgstr "Merk som u_lest"
 
-#: mail/folder-browser.c:612
-msgid "Move to Folder..."
-msgstr "Flytt til mappe..."
+#: mail/folder-browser.c:646 ui/evolution-mail.xml.h:109
+msgid "_Move to Folder..."
+msgstr "F_lytt til mappe..."
 
-#: mail/folder-browser.c:614
-msgid "Copy to Folder..."
-msgstr "Kopiér til mappe..."
+#: mail/folder-browser.c:648 ui/evolution-mail.xml.h:99
+msgid "_Copy to Folder..."
+msgstr "_Kopier til mappe..."
 
-#: mail/folder-browser.c:618 ui/evolution-mail.xml.h:82
-msgid "Undelete"
-msgstr "Angre slett"
+#: mail/folder-browser.c:652 ui/evolution-mail.xml.h:119
+msgid "_Undelete"
+msgstr "A_ngre slett"
 
 #. { _("Add Sender to Address Book"),  NULL,
 #. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
 #. { "",                               NULL,
 #. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:628 ui/evolution-mail.xml.h:1
+#: mail/folder-browser.c:662 ui/evolution-mail.xml.h:1
 msgid "Apply Filters"
 msgstr "Påfør filtre"
 
-#: mail/folder-browser.c:632
-msgid "Create Rule From Message"
-msgstr "Lage regel fra melding"
+#: mail/folder-browser.c:666
+msgid "Create Ru_le From Message"
+msgstr "Lage rege_l fra melding"
+
+#: mail/folder-browser.c:805
+msgid "Filter on Mailing List"
+msgstr "Filtrer etter e-postliste"
+
+#: mail/folder-browser.c:806
+msgid "VFolder on Mailing List"
+msgstr "VFolder på e-postliste"
 
-#: mail/folder-browser.c:754
+#: mail/folder-browser.c:808
 #, c-format
 msgid "Filter on Mailing List (%s)"
-msgstr "Filtrér etter e-postliste (%s)"
+msgstr "Filtrer etter e-postliste (%s)"
 
-#: mail/folder-browser.c:755
+#: mail/folder-browser.c:809
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VFolder på e-postliste (%s)"
 
-#: mail/folder-browser-factory.c:211
+#: mail/folder-browser-factory.c:216
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Egenskaper for \"%s\""
 
-#: mail/folder-browser-factory.c:213 ui/evolution-event-editor.xml.h:39
+#: mail/folder-browser-factory.c:218 ui/evolution-event-editor.xml.h:39
 #: ui/evolution-task-editor-dialog.xml.h:42
 msgid "Properties"
 msgstr "Egenskaper"
@@ -5797,17 +6127,9 @@ msgstr "Factory for Evolution e-post komponent."
 msgid "Factory for the Mail Summary component."
 msgstr "Factory for e-post sammendrag komponent."
 
-#: mail/importers/elm-importer.c:420
-msgid ""
-"Evolution has found Elm mail files.\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-"Evolution har funnet Elm e-post filer.\n"
-"Vil du importere dem til Evolution?"
-
-#: mail/importers/elm-importer.c:430
-msgid "Elm mail"
-msgstr "Elm e-post"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+msgid "Mail configuration interface"
+msgstr "Grensesnitt for e-post-konfigurasjon"
 
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 msgid "Factory to import mbox into Evolution"
@@ -5825,26 +6147,6 @@ msgstr "Factory for å importere Outlook Express 4-meldinger til Evolution"
 msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Importerer Outlook Express 4-filer til Evolution"
 
-#: mail/importers/netscape-importer.c:440
-msgid ""
-"Evolution has found Netscape mail files.\n"
-"Would you like them to be imported into Evolution?"
-msgstr ""
-"Evolution har funnet Netscape e-post filer.\n"
-"Vil du importere dem til Evolution?"
-
-#: mail/importers/pine-importer.c:385
-msgid ""
-"Evolution has found Pine mail files.\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-"Evolution har funnet Pine e-post filer.\n"
-"Vil du importere dem til Evolution?"
-
-#: mail/importers/pine-importer.c:395
-msgid "Pine mail"
-msgstr "Pine e-post"
-
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr "Aktivt lagringsformat:"
@@ -5896,7 +6198,7 @@ msgstr " (forvalgt)"
 msgid "Disable"
 msgstr "Deaktiver"
 
-#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+#: mail/mail-accounts.c:199 mail/mail-config.glade.h:30
 msgid "Enable"
 msgstr "Aktiver"
 
@@ -5909,7 +6211,7 @@ 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:536
+#: mail/mail-accounts.c:568
 msgid "Evolution Account Manager"
 msgstr "Kontohåndtering for Evolution"
 
@@ -5937,7 +6239,7 @@ msgstr "%s e-postliste"
 msgid "Add Filter Rule"
 msgstr "Legg til filterregel"
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5949,7 +6251,7 @@ msgstr ""
 "motta eller skrive meldinger.\n"
 "Vil du konfigurere den nå?"
 
-#: mail/mail-callbacks.c:148
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5957,7 +6259,7 @@ msgstr ""
 "Du må konfigurere en identitet\n"
 "før du kan skrive e-post."
 
-#: mail/mail-callbacks.c:160
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -5965,11 +6267,11 @@ msgstr ""
 "Du må konfigurere en e-post-transport\n"
 "før du kan skrive e-post."
 
-#: mail/mail-callbacks.c:204
+#: mail/mail-callbacks.c:205
 msgid "You have not set a mail transport method"
 msgstr "Du har ikke satt en transportmetode for e-post"
 
-#: mail/mail-callbacks.c:237
+#: mail/mail-callbacks.c:238
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -5977,32 +6279,37 @@ msgstr ""
 "Denne meldingen har ikke emne.\n"
 "Send likevel?"
 
-#: mail/mail-callbacks.c:310
+#: mail/mail-callbacks.c:311
 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:353
+#: mail/mail-callbacks.c:354
 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:593
 #, c-format
-msgid "On %s, %s wrote:\n"
-msgstr "Den %s, skrev %s:\n"
+msgid "On %s, %s wrote:"
+msgstr "Den %s, skrev %s:"
 
-#: mail/mail-callbacks.c:775
+#: mail/mail-callbacks.c:755
 msgid "Forwarded message:\n"
 msgstr "Videresendt melding:\n"
 
-#: mail/mail-callbacks.c:878
+#: mail/mail-callbacks.c:849
 msgid "Move message(s) to"
 msgstr "Flytt melding(er) til"
 
-#: mail/mail-callbacks.c:880
+#: mail/mail-callbacks.c:851
 msgid "Copy message(s) to"
-msgstr "Kopiér melding(er) til"
+msgstr "Kopier melding(er) til"
 
-#: mail/mail-callbacks.c:1148
+#: mail/mail-callbacks.c:1130
+#, c-format
+msgid "Are you sure you want to edit all %d messages?"
+msgstr "Er du sikker på at du vil redigere alle %d meldingene?"
+
+#: mail/mail-callbacks.c:1152
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6010,7 +6317,7 @@ msgstr ""
 "Du kan kun redigere meldinger lagret\n"
 "i Skisser-katalogen."
 
-#: mail/mail-callbacks.c:1180
+#: mail/mail-callbacks.c:1186
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6018,11 +6325,20 @@ msgstr ""
 "Du kan kun sende meldinger på nytt\n"
 "som er lagret i sendt-katalogen."
 
-#: mail/mail-callbacks.c:1213 mail/mail-display.c:90
+#: mail/mail-callbacks.c:1198
+#, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr "Er du sikker på at du vil sende alle %d meldingene på nytt?"
+
+#: mail/mail-callbacks.c:1219
+msgid "No Message Selected"
+msgstr "Ingen melding valgt"
+
+#: mail/mail-callbacks.c:1245 mail/mail-display.c:91
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
-#: mail/mail-callbacks.c:1217 mail/mail-display.c:94
+#: mail/mail-callbacks.c:1249 mail/mail-display.c:95
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -6030,15 +6346,15 @@ msgstr ""
 "En fil med samme navn eksisterer allerede.\n"
 "Overskriv den?"
 
-#: mail/mail-callbacks.c:1261
+#: mail/mail-callbacks.c:1293
 msgid "Save Message As..."
 msgstr "Lagre melding som..."
 
-#: mail/mail-callbacks.c:1263
+#: mail/mail-callbacks.c:1295
 msgid "Save Messages As..."
 msgstr "Lagre meldinger som..."
 
-#: mail/mail-callbacks.c:1378
+#: mail/mail-callbacks.c:1454
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6047,15 +6363,20 @@ msgstr ""
 "Feil under lasting av filter-informasjon:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1427 ui/evolution-mail.xml.h:52
+#: mail/mail-callbacks.c:1512 ui/evolution-mail.xml.h:60
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/mail-callbacks.c:1474
+#: mail/mail-callbacks.c:1559
 msgid "Printing of message failed"
 msgstr "Feil under utskrift av melding"
 
-#: mail/mail-config.c:1121 mail/mail-config.c:1124
+#: mail/mail-callbacks.c:1654
+#, c-format
+msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr "Er du sikker på at du vil åpne alle %d meldingene i separate vinduer?"
+
+#: mail/mail-config.c:1199 mail/mail-config.c:1202
 msgid "Connecting to server..."
 msgstr "Kobler til tjener..."
 
@@ -6133,18 +6454,26 @@ msgid "Accounts"
 msgstr "Kontoer"
 
 #: mail/mail-config.glade.h:8
+msgid "Always load images off the net"
+msgstr "Alltid last bilder fra nettet"
+
+#: mail/mail-config.glade.h:10
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "Authentication Type: "
 msgstr "Autentiseringstype: "
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "Automatically check for new mail every"
 msgstr "Sjekk etter meldinger automatisk hver(t)"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
+msgid "Composer"
+msgstr "Skriv"
+
+#: mail/mail-config.glade.h:15
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6160,163 +6489,191 @@ msgstr ""
 "\n"
 "Klikk \"Fullfør\" for å lagre dine innstillinger"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:21
 msgid "De_fault"
 msgstr "_Forvalgt"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
+msgid "Default \"Forward\" style is: "
+msgstr "Standard videresendingsstil er: "
+
+#: mail/mail-config.glade.h:25
 msgid "Done"
 msgstr "Ferdig"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:26
 msgid "Drafts"
 msgstr "Skisser"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:27
 msgid "Drafts folder:"
 msgstr "Skissemappe:"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:29
 msgid "Email Address:"
 msgstr "E-post adresse:"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:31
 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:32
+msgid "Highlight citations with"
+msgstr "Merk sitering med"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:34
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:35
 msgid "Identity"
 msgstr "Identitet"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:36
+msgid "In HTML mail"
+msgstr "I HTML e-post"
+
+#: mail/mail-config.glade.h:37
+msgid "Inline"
+msgstr "Inline"
+
+#: mail/mail-config.glade.h:38
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:39
+msgid "Load images if sender is in addressbook"
+msgstr "Last bilder hvis avsender er i adresseboken"
+
+#: mail/mail-config.glade.h:40
 msgid "Mail Configuration"
 msgstr "E-post-konfigurasjon"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:41
 msgid "Make this my default account"
 msgstr "Bruk denne som standard konto"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:42
 msgid "Mark messages as \"Read\" after:"
 msgstr "Merk melding som \"Lest\" etter:"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:44
+msgid "Never load images off the net"
+msgstr "Aldri last bilder fra nettet"
+
+#: mail/mail-config.glade.h:45
 msgid "News"
 msgstr "News"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:47
 msgid "Optional Information"
 msgstr "Tilleggsinformasjon"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:48
 msgid "Organization:"
 msgstr "Organisasjon:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:49
+msgid "PGP"
+msgstr "PGP"
+
+#: mail/mail-config.glade.h:50
 msgid "PGP binary path:"
 msgstr "Sti til PGP-binærfil:"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:55
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:56
+msgid "Quoted"
+msgstr "Sitert"
+
+#: mail/mail-config.glade.h:57
 msgid "Receiving Email"
 msgstr "Mottar e-post"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:58
 msgid "Receiving Mail"
 msgstr "Mottar e-post"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:59
 msgid "Receiving Options"
 msgstr "Mottar alternativer"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:61
 msgid "Required Information"
 msgstr "Nødvendig informasjon"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:63
 msgid "Select PGP binary"
 msgstr "Velg PGP-binærfil"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:64
 msgid "Send mail in HTML format by default."
 msgstr "Send meldinger i HTML-format som standard"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:65
 msgid "Sending Email"
 msgstr "Sender e-post"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:66
 msgid "Sending Mail"
 msgstr "Sender e-post"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:68
 msgid "Sent"
 msgstr "Sendt"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:69
 msgid "Sent and Draft Messages"
 msgstr "Sendte meldinger og skisser"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:70
 msgid "Sent messages folder:"
 msgstr "Mappe for sendte meldinger:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:71
 msgid "Server Configuration"
 msgstr "Tjenerkonfigurasjon"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:72
 msgid "Server Type: "
 msgstr "Tjenertype: "
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:73
 msgid "Server requires authentication"
 msgstr "Tjener krever autentisering"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:74
 msgid "Signature file:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:75
 msgid "Sources"
 msgstr "Kilder"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:76
 msgid "Special Folders"
 msgstr "Spesielle mapper"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:77
 msgid "Standard Unix mbox"
 msgstr "Standard Unix mbox"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:78
 msgid "Type"
 msgstr "Type"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:79
 msgid "Use secure connection (SSL)"
 msgstr "Bruk sikker forbindelse (SSL)"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:80
 msgid "Username:"
 msgstr "Brukernavn:"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:81
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -6326,162 +6683,157 @@ msgstr ""
 "\n"
 "Klikk \"Neste\" for å begynne."
 
-#: 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:30
+#: mail/mail-config.glade.h:86 ui/evolution-event-editor.xml.h:58
+#: ui/evolution-message-composer.xml.h:42 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:32
 msgid "_Edit"
-msgstr "R_edigér"
+msgstr "R_ediger"
 
-#: mail/mail-display.c:194
+#: mail/mail-display.c:195
 msgid "Save Attachment"
 msgstr "Lagre vedlegg"
 
-#: mail/mail-display.c:234
+#: mail/mail-display.c:235
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kunne ikke opprette midlertidig katalog: %s"
 
-#: mail/mail-display.c:295
+#: mail/mail-display.c:296
 msgid "Save to Disk..."
 msgstr "Lagre til disk..."
 
-#: mail/mail-display.c:297
+#: mail/mail-display.c:298
 #, c-format
 msgid "Open in %s..."
 msgstr "Åpne i %s..."
 
-#: mail/mail-display.c:299
+#: mail/mail-display.c:300
 msgid "View Inline"
 msgstr "Vis \"inline\""
 
-#: mail/mail-display.c:334
+#: mail/mail-display.c:335
 msgid "External Viewer"
 msgstr "Ekstern visning"
 
-#: mail/mail-display.c:357
+#: mail/mail-display.c:358
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Vis \"inline\" (via %s)"
 
-#: mail/mail-display.c:361
+#: mail/mail-display.c:362
 msgid "Hide"
 msgstr "Skjul"
 
-#: mail/mail-display.c:1107
+#: mail/mail-display.c:960
+msgid "Loading message content"
+msgstr "Laster meldingsinnhold"
+
+#: mail/mail-display.c:1239
 msgid "Open link in browser"
 msgstr "Åpne lenke i nettleser"
 
-#: mail/mail-display.c:1109
+#: mail/mail-display.c:1241
 msgid "Save as (FIXME)"
 msgstr "Lagre som"
 
-#: mail/mail-display.c:1111
+#: mail/mail-display.c:1243
 msgid "Copy location (FIXME)"
 msgstr "Kopier lokasjon"
 
-#: mail/mail-format.c:522
+#: mail/mail-format.c:527
 #, c-format
 msgid "%s attachment"
 msgstr "%s-vedlegg"
 
-#: mail/mail-format.c:564
+#: mail/mail-format.c:573
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
 
-#: mail/mail-format.c:772
-msgid "Loading message content"
-msgstr "Laster meldingsinnhold"
-
-#: mail/mail-format.c:1066
+#: mail/mail-format.c:1029
 msgid "No GPG/PGP program configured."
 msgstr "Ingen GPG/PGP-program konfigurert."
 
-#: mail/mail-format.c:1081
+#: mail/mail-format.c:1044
 msgid "Encrypted message not displayed"
 msgstr "Kryptert melding ikke vist"
 
-#: mail/mail-format.c:1087
+#: mail/mail-format.c:1050
 msgid "Encrypted message"
 msgstr "Kryptert melding"
 
-#: mail/mail-format.c:1088
+#: mail/mail-format.c:1051
 msgid "Click icon to decrypt."
 msgstr "Klikk på ikonet for å dekryptere."
 
-#: mail/mail-format.c:1178 mail/mail-format.c:1566
+#: mail/mail-format.c:1141 mail/mail-format.c:1527
 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:1186 mail/mail-format.c:1574
+#: mail/mail-format.c:1149 mail/mail-format.c:1535
 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:1787
+#: mail/mail-format.c:1749
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peker til FTP-tjener (%s)"
 
-#: mail/mail-format.c:1799
+#: mail/mail-format.c:1761
 #, 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:1803
+#: mail/mail-format.c:1765
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peker til lokal fil (%s)"
 
-#: mail/mail-format.c:1837
+#: mail/mail-format.c:1799
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peker til ukjent ekstern data (\"%s\"-type)"
 
-#: mail/mail-format.c:1842
+#: mail/mail-format.c:1804
 msgid "Malformed external-body part."
 msgstr "Feilutformet del for ekstern-kropp."
 
-#: mail/mail-local.c:337
-#, c-format
-msgid "No such folder %s"
-msgstr "Mappen %s eksisterer ikke"
-
-#: mail/mail-local.c:509
+#: mail/mail-local.c:505
 #, c-format
 msgid "Opening '%s'"
 msgstr "Åpner '%s'"
 
-#: mail/mail-local.c:787
+#: mail/mail-local.c:785
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Endrer mappe \"%s\" til \"%s\"-format"
 
-#: mail/mail-local.c:791
+#: mail/mail-local.c:789
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Endre mappe \"%s\" til \"%s\"-format"
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:812
 msgid "Reconfiguring folder"
 msgstr "Omkonfigurerer mappe"
 
 #. first, 'close' the old folder
-#: mail/mail-local.c:843
+#: mail/mail-local.c:841
 msgid "Closing current folder"
 msgstr "Lukker aktiv mappe"
 
-#: mail/mail-local.c:875
+#: mail/mail-local.c:873
 msgid "Renaming old folder and opening"
 msgstr "Endrer navn på gammel mappe og gjenåpner"
 
-#: mail/mail-local.c:893
+#: mail/mail-local.c:891
 msgid "Creating new folder"
 msgstr "Oppretter en ny mappe"
 
-#: mail/mail-local.c:907
+#: mail/mail-local.c:905
 msgid "Copying messages"
 msgstr "Kopierer meldinger"
 
-#: mail/mail-local.c:924
+#: mail/mail-local.c:922
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6490,7 +6842,7 @@ msgstr ""
 "Kan ikke lagre metainformasjon for mappe; du vil sannsynligvis\n"
 "ikke kunne åpne denne mappen igjen: %s"
 
-#: mail/mail-local.c:963
+#: mail/mail-local.c:961
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6516,15 +6868,11 @@ msgstr ""
 "Feil under utføring av operasjon:\n"
 "%s"
 
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:892
+#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:880
 msgid "Working"
 msgstr "Arbeider"
 
-#: mail/mail-mt.c:680 mail/session.c:98
-msgid "Do you accept?"
-msgstr "Aksepterer du?"
-
-#: mail/mail-mt.c:874
+#: mail/mail-mt.c:862
 msgid "Evolution progress"
 msgstr "Evolution fremgang"
 
@@ -6571,50 +6919,50 @@ msgstr "Flytter"
 
 #: mail/mail-ops.c:917
 msgid "Copying"
-msgstr "Kopiérer"
+msgstr "Kopierer"
 
 #: mail/mail-ops.c:992
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i \"%s\""
 
-#: mail/mail-ops.c:1152
+#: mail/mail-ops.c:1154
 msgid "Forwarded messages"
 msgstr "Videresendte meldinger"
 
-#: mail/mail-ops.c:1193 mail/mail-ops.c:1331
+#: mail/mail-ops.c:1195 mail/mail-ops.c:1333
 #, c-format
 msgid "Opening folder %s"
 msgstr "Åpner mappe %s"
 
-#: mail/mail-ops.c:1260
+#: mail/mail-ops.c:1262
 #, c-format
 msgid "Opening store %s"
 msgstr "Åpner lager %s"
 
-#: mail/mail-ops.c:1447
+#: mail/mail-ops.c:1449
 msgid "Expunging folder"
 msgstr "Tømmer mappe"
 
-#: mail/mail-ops.c:1496
+#: mail/mail-ops.c:1498
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Henter melding %s"
 
-#: mail/mail-ops.c:1563
+#: mail/mail-ops.c:1565
 msgid "Retrieving messages"
 msgstr "Henter meldinger"
 
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1575
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Henter melding nummer %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1647
+#: mail/mail-ops.c:1649
 msgid "Saving messages"
 msgstr "Lagrer meldinger"
 
-#: mail/mail-ops.c:1726
+#: mail/mail-ops.c:1728
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6623,12 +6971,12 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1739
+#: mail/mail-ops.c:1741
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Lagrer melding %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1755
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6637,11 +6985,11 @@ msgstr ""
 "Feil under lagring av av meldinger til: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1827
+#: mail/mail-ops.c:1829
 msgid "Saving attachment"
 msgstr "Lagrer vedlegg"
 
-#: mail/mail-ops.c:1842
+#: mail/mail-ops.c:1844
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6650,17 +6998,46 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1870
+#: mail/mail-ops.c:1872
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
+#: mail/mail-ops.c:1939
+#, c-format
+msgid "Disconnecting from %s"
+msgstr "Kobler fra %s"
+
+#: mail/mail-search.c:194 mail/mail-search.c:246
+msgid "(Untitled Message)"
+msgstr "(Melding uten tittel)"
+
+#: mail/mail-search.c:240
+msgid "Find in Message"
+msgstr "Finn i melding"
+
+#: mail/mail-search.c:282
+msgid "Case Sensitive"
+msgstr "Skill mellom store/små bokstaver"
+
+#: mail/mail-search.c:283
+msgid "Search Forward"
+msgstr "Søk fremover"
+
+#: mail/mail-search.c:298
+msgid "Find:"
+msgstr "Finn:"
+
+#: mail/mail-search.c:302
+msgid "Matches:"
+msgstr "Treff:"
+
 #: mail/mail-search-dialogue.c:113
 msgid "_Search"
 msgstr "_Søk"
 
 #: mail/mail-send-recv.c:138
-msgid "Cancelling ..."
+msgid "Cancelling..."
 msgstr "Avbryter..."
 
 #: mail/mail-send-recv.c:233
@@ -6672,11 +7049,11 @@ msgid "Receiving"
 msgstr "Mottar"
 
 #: mail/mail-send-recv.c:285
-msgid "Updating ..."
+msgid "Updating..."
 msgstr "Oppdaterer..."
 
 #: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
-msgid "Waiting ..."
+msgid "Waiting..."
 msgstr "Venter..."
 
 #: mail/mail-send-recv.c:306
@@ -6695,30 +7072,30 @@ msgstr "Uferdig melding skrevet på rør!"
 msgid "Mail Summary"
 msgstr "E-post sammendrag"
 
-#: mail/mail-tools.c:141
+#: mail/mail-tools.c:145
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Kunne ikke opprette midlertidig mbox `%s': %s"
 
-#: mail/mail-tools.c:188
+#: mail/mail-tools.c:192
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (videresendt melding)"
 
-#: mail/mail-tools.c:198
+#: mail/mail-tools.c:202
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (uten emne)"
 
-#: mail/mail-tools.c:215
+#: mail/mail-tools.c:219
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Videresendt melding - %s"
 
-#: mail/mail-tools.c:217
+#: mail/mail-tools.c:221
 msgid "Forwarded message (no subject)"
 msgstr "Videresendt melding (uten emne)"
 
-#: mail/mail-tools.c:414
+#: mail/mail-tools.c:428
 #, c-format
 msgid ""
 "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
@@ -6731,139 +7108,152 @@ msgstr ""
 msgid "VFolders"
 msgstr "VMapper"
 
-#: mail/mail-vfolder.c:426
+#: mail/mail-vfolder.c:438
 msgid "New VFolder"
 msgstr "Ny VFolder"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/message-browser.c:176 ui/evolution-mail.xml.h:60
+#: mail/message-browser.c:189 ui/evolution-mail.xml.h:68
 msgid "Reply"
 msgstr "Svar"
 
-#: mail/message-browser.c:176 ui/evolution-mail.xml.h:66
+#: mail/message-browser.c:189 ui/evolution-mail.xml.h:74
 msgid "Reply to the sender of this message"
 msgstr "Svar til avsender av denne meldingen"
 
-#: mail/message-browser.c:179 ui/evolution-mail.xml.h:64
+#: mail/message-browser.c:192 ui/evolution-mail.xml.h:69
+msgid "Reply to All"
+msgstr "Svar til alle"
+
+#: mail/message-browser.c:192 ui/evolution-mail.xml.h:72
 msgid "Reply to all recipients of this message"
 msgstr "Svar til alle mottakere av denne meldingen"
 
-#: mail/message-browser.c:182 ui/evolution-mail.xml.h:29
+#: mail/message-browser.c:195 ui/evolution-mail.xml.h:25
+msgid "Forward"
+msgstr "Videresend"
+
+#: mail/message-browser.c:195 ui/evolution-mail.xml.h:32
 msgid "Forward this message"
 msgstr "Videresend denne meldingen"
 
-#: mail/message-browser.c:187 ui/evolution-mail.xml.h:57
+#: mail/message-browser.c:200 ui/evolution-mail.xml.h:65
 msgid "Print the selected message"
 msgstr "Skriv ut den valgte meldingen"
 
-#: mail/message-browser.c:190 ui/evolution-mail.xml.h:13
+#: mail/message-browser.c:203 ui/evolution-mail.xml.h:13
 msgid "Delete this message"
 msgstr "Slett denne meldingen"
 
-#: mail/message-browser.c:195 ui/evolution-event-editor.xml.h:33
-#: ui/evolution-task-editor-dialog.xml.h:36
+#: mail/message-browser.c:208 ui/evolution-event-editor.xml.h:33
+#: ui/evolution-mail.xml.h:58 ui/evolution-task-editor-dialog.xml.h:36
 msgid "Previous"
 msgstr "Forrige"
 
-#: mail/message-browser.c:195
+#: mail/message-browser.c:208
 msgid "Previous message"
 msgstr "Forrige melding"
 
-#: mail/message-browser.c:198 ui/evolution-calendar.xml.h:18
-#: ui/evolution-event-editor.xml.h:29 ui/evolution-task-editor-dialog.xml.h:32
+#: mail/message-browser.c:211 ui/evolution-calendar.xml.h:18
+#: ui/evolution-event-editor.xml.h:29 ui/evolution-mail.xml.h:54
+#: ui/evolution-task-editor-dialog.xml.h:32
 msgid "Next"
 msgstr "Neste"
 
-#: mail/message-browser.c:198
+#: mail/message-browser.c:211
 msgid "Next message"
 msgstr "Neste melding"
 
-#: mail/message-list.c:678
+#: mail/message-list.c:677
 msgid "Unseen"
 msgstr "Ulest"
 
-#: mail/message-list.c:679
+#: mail/message-list.c:678
 msgid "Seen"
 msgstr "Lest"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:679
 msgid "Answered"
 msgstr "Besvart"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:680
 msgid "Multiple Unseen Messages"
 msgstr "Flere uleste meldinger"
 
-#: mail/message-list.c:682
+#: mail/message-list.c:681
 msgid "Multiple Messages"
 msgstr "Flere meldinger"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:685
 msgid "Lowest"
 msgstr "Lavest"
 
-#: mail/message-list.c:687
+#: mail/message-list.c:686
 msgid "Lower"
 msgstr "Lavere"
 
-#: mail/message-list.c:691
+#: mail/message-list.c:690
 msgid "Higher"
 msgstr "Høyere"
 
-#: mail/message-list.c:692
+#: mail/message-list.c:691
 msgid "Highest"
 msgstr "Høyest"
 
-#: mail/message-list.c:942
+#: mail/message-list.c:941
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:949
+#: mail/message-list.c:948
 msgid "Today %l:%M %p"
 msgstr "Idag %l:%M %p"
 
-#: mail/message-list.c:958
+#: mail/message-list.c:957
 msgid "Yesterday %l:%M %p"
 msgstr "I går %l:%M %p"
 
-#: mail/message-list.c:970
+#: mail/message-list.c:969
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:978
+#: mail/message-list.c:977
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:980
+#: mail/message-list.c:979
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:1082
+#: mail/message-list.c:1081
 msgid "Flagged"
 msgstr "Merket"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1082
 msgid "From"
 msgstr "Fra"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1082
 msgid "Date"
 msgstr "Dato"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1082
 msgid "Received"
 msgstr "Mottatt"
 
-#: mail/message-list.c:1084
+#: mail/message-list.c:1083
 msgid "To"
 msgstr "Til"
 
-#: mail/message-list.c:1084
+#: mail/message-list.c:1083
 msgid "Size"
 msgstr "Størrelse"
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:47
+#: mail/mail-session.c:161
+msgid "User canceled operation."
+msgstr "Operasjon avbrutt av bruker."
+
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:48
 msgid "Folder"
 msgstr "Mappe"
 
@@ -6971,12 +7361,12 @@ msgstr ""
 "Evolution-katalogen. Venligst flytt den for å \n"
 "tillate installasjon av Evolution's brukerfiler."
 
-#: shell/e-shell.c:379
+#: shell/e-shell.c:388
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikke sette opp lokal lagring -- %s"
 
-#: shell/e-shell.c:1249
+#: shell/e-shell.c:1268
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -7018,16 +7408,117 @@ msgstr "Ny..."
 msgid "(Untitled)"
 msgstr "(Uten navn)"
 
-#: shell/e-shell-view.c:148
+#: shell/e-shell-importer.c:97
+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/e-shell-importer.c:192
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+"Importerer %s\n"
+"Importerer ikke klar.\n"
+"Venter 5 sekunder før nytt forsøk."
+
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+"Importerer %s\n"
+"Importerer oppføring %d."
+
+#: shell/e-shell-importer.c:353
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+"Ingen importerer som kan håndtere\n"
+"%s"
+
+#: shell/e-shell-importer.c:363
+msgid "Importing"
+msgstr "Importerer"
+
+#: shell/e-shell-importer.c:371
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+"Importerer %s.\n"
+"Starter %s"
+
+#: shell/e-shell-importer.c:384
+#, c-format
+msgid "Error starting %s"
+msgstr "Feil under start av %s"
+
+#: shell/e-shell-importer.c:404
+#, c-format
+msgid "Error loading %s"
+msgstr "Feil under lasting av %s"
+
+#: shell/e-shell-importer.c:419
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+"Importerer %s\n"
+"Importerer oppføring 1."
+
+#: shell/e-shell-importer.c:490
+msgid "Automatic"
+msgstr "Automatisk"
+
+#: shell/e-shell-importer.c:540
+msgid "Filename:"
+msgstr "Filnavn:"
+
+#: shell/e-shell-importer.c:545 shell/importer/import.glade.h:5
+msgid "Select a file"
+msgstr "Velg en fil"
+
+#: shell/e-shell-importer.c:555
+msgid "File type:"
+msgstr "Filtype:"
+
+#: shell/e-shell-importer.c:601
+msgid "Select folder"
+msgstr "Velg mappe"
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr "Lukker forbindelser..."
+
+#: shell/e-shell-view.c:149
 msgid "(No folder displayed)"
 msgstr "(Ingen mappe vist)"
 
-#: shell/e-shell-view.c:1184
+#: shell/e-shell-view.c:1204
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1186
+#: shell/e-shell-view.c:1206
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution - %s [%s]"
@@ -7058,6 +7549,14 @@ msgstr ""
 msgid "Go to folder..."
 msgstr "Gå til mappe..."
 
+#: shell/e-shell-view-menu.c:562
+msgid "Work online"
+msgstr "Arbeid \"online\""
+
+#: shell/e-shell-view-menu.c:574 shell/e-shell-view-menu.c:586
+msgid "Work offline"
+msgstr "Arbeid \"offline\""
+
 #: shell/e-shortcuts.c:381
 msgid "Error saving shortcuts."
 msgstr "Feil under lagring av snarveier."
@@ -7183,16 +7682,6 @@ msgstr "Operasjonen er ikke støttet"
 msgid "The specified type is not supported in this storage"
 msgstr "Spesifisert type er ikke støttet for dette lageret"
 
-#: shell/e-storage-set-view.c:650 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:44
-msgid "_View"
-msgstr "_Vis"
-
-#: shell/e-storage-set-view.c:650
-msgid "View the selected folder"
-msgstr "Vis den valgte mappen"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Mappenavn:"
@@ -7209,103 +7698,6 @@ msgstr "Spesifiser hvor mappen skal opprettes:"
 msgid "The Evolution shell."
 msgstr "Evolution skallet."
 
-#: 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:182
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-"Importerer %s\n"
-"Importerer ikke klar.\n"
-"Venter 5 sekunder før nytt forsøk."
-
-#: shell/importer/importer.c:202 shell/importer/importer.c:233
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-"Importerer %s\n"
-"Importerer oppføring %d."
-
-#: shell/importer/importer.c:341
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-"Ingen importerer som kan håndtere\n"
-"%s"
-
-#: shell/importer/importer.c:351
-msgid "Importing"
-msgstr "Importerer"
-
-#: shell/importer/importer.c:359
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-"Importerer %s.\n"
-"Starter %s"
-
-#: 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:402
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-"Importerer %s\n"
-"Importerer oppføring 1."
-
-#: shell/importer/importer.c:473
-msgid "Automatic"
-msgstr "Automatisk"
-
-#: shell/importer/importer.c:523
-msgid "Filename:"
-msgstr "Filnavn:"
-
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
-msgid "Select a file"
-msgstr "Velg en fil"
-
-#: shell/importer/importer.c:538
-msgid "File type:"
-msgstr "Filtype:"
-
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
-msgid "Import"
-msgstr "Importér"
-
 #: 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."
@@ -7328,11 +7720,11 @@ msgstr ""
 "Gjennom denne veiviseren vil du ledes gjennom import av\n"
 "eksterne filer til Evolution."
 
-#: shell/importer/intelligent.c:143
-msgid "Don't ask me again"
-msgstr "Ikke spør meg igjen"
+#: shell/importer/intelligent.c:186
+msgid "Importers"
+msgstr "Importerere"
 
-#: shell/main.c:83
+#: shell/main.c:82
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
@@ -7370,7 +7762,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:108
+#: shell/main.c:107
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7378,19 +7770,19 @@ msgstr ""
 "Takk\n"
 "Evolution utviklerene\n"
 
-#: shell/main.c:139
+#: shell/main.c:138
 msgid "Cannot initialize the Evolution shell."
 msgstr "Kan ikke initialisere Evolution skallet."
 
-#: shell/main.c:185
+#: shell/main.c:184
 msgid "Disable splash screen"
 msgstr "Deaktiver splash"
 
-#: shell/main.c:186
+#: shell/main.c:185
 msgid "Send the debugging output of all components to a file."
 msgstr "Send feilsøkingsutskrift for alle komponentene til en fil."
 
-#: shell/main.c:219
+#: shell/main.c:217
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kunne ikke initialisere Bonobo komponentsystemet."
 
@@ -7414,7 +7806,7 @@ msgstr "Finn en kontakt"
 msgid "New contact"
 msgstr "Ny kontakt"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:50
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:57
 msgid "Previews the message to be printed"
 msgstr "Viser forhåndsvisning av meldingen som skal skrives ut"
 
@@ -7422,7 +7814,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:79
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:88
 msgid "Stop"
 msgstr "Stopp"
 
@@ -7456,8 +7848,8 @@ 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:112
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:43
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:118
+#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:45
 msgid "_Tools"
 msgstr "_Verktøy"
 
@@ -7591,7 +7983,7 @@ msgid "_Month"
 msgstr "_Måned"
 
 #: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:39
+#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:41
 msgid "_New"
 msgstr "_Ny"
 
@@ -7599,11 +7991,6 @@ msgstr "_Ny"
 msgid "_Open Calendar"
 msgstr "_Åpne kalender"
 
-#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:108
-#: ui/evolution-tasks.xml.h:8
-msgid "_Save As..."
-msgstr "Lagre _som..."
-
 #: ui/evolution-calendar.xml.h:45
 msgid "_Week"
 msgstr "_Uke"
@@ -7630,7 +8017,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:58 ui/evolution-task-editor-dialog.xml.h:41
+#: ui/evolution-mail.xml.h:66 ui/evolution-task-editor-dialog.xml.h:41
 msgid "Print..."
 msgstr "Skriv ut..."
 
@@ -7662,13 +8049,13 @@ msgid "Send _message to contact..."
 msgstr "Send _melding til kontakt..."
 
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
+#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:33
 msgid "_File"
 msgstr "_Fil"
 
 #: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:50
 #: ui/evolution-task-editor-dialog.xml.h:85
 msgid "_Save"
 msgstr "_Lagre"
@@ -7715,16 +8102,16 @@ msgstr "Lukk denne avtalen"
 
 #: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
 msgid "Cop_y to Folder... (FIXME)"
-msgstr "Kop_iér til mappe..."
+msgstr "Kop_ier til mappe..."
 
 #: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
 #: ui/evolution-task-editor-dialog.xml.h:14
 msgid "Copy"
-msgstr "Kopiér"
+msgstr "Kopier"
 
 #: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
 msgid "Copy the selection"
-msgstr "Kopiér utvalget"
+msgstr "Kopier utvalget"
 
 #: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
 msgid "Cut"
@@ -7803,7 +8190,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:239
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:241
 msgid "Save"
 msgstr "Lagre"
 
@@ -7824,7 +8211,7 @@ msgstr "Sett opp _møte"
 msgid "Schedule some sort of a meeting"
 msgstr "Sett opp ett eller annet møte"
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:69
+#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:78
 #: ui/evolution-task-editor-dialog.xml.h:57
 msgid "Select All"
 msgstr "Velg alle"
@@ -7835,38 +8222,37 @@ msgstr "Velg alt"
 
 #: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
 msgid "Setup the page settings for your current printer"
-msgstr "Redigér sideinnstillinger for aktiv skriver"
+msgstr "Rediger sideinnstillinger for aktiv skriver"
 
 #: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
 msgid "Task _Request (FIXME)"
 msgstr "_Oppgaveforespørsel"
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:63
+#: ui/evolution-event-editor.xml.h:52 ui/evolution-task-editor-dialog.xml.h:63
 msgid "_About..."
 msgstr "_Om..."
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
+#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:40
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:30
 msgid "_Close"
 msgstr "L_ukk"
 
 #: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Contact (FIXME)"
 msgstr "_Kontakt"
 
 #: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
 msgid "_Copy"
-msgstr "_Kopiér"
+msgstr "_Kopier"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
+#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:41
 #: ui/evolution-task-editor-dialog.xml.h:68
 msgid "_Debug"
 msgstr "_Feilsøk"
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:35
+#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:45
+#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:37
 msgid "_Help"
 msgstr "_Hjelp"
 
@@ -7898,12 +8284,7 @@ msgstr "_Notis"
 msgid "_Paste"
 msgstr "_Lim inn"
 
-#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
-#: ui/evolution-tasks.xml.h:7
-msgid "_Print"
-msgstr "S_kriv ut"
-
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:104
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:111
 #: ui/evolution-task-editor-dialog.xml.h:83
 msgid "_Properties..."
 msgstr "Egenska_per..."
@@ -7913,7 +8294,7 @@ msgid "_Select All"
 msgstr "_Velg alle"
 
 #: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:44
 msgid "_Task (FIXME)"
 msgstr "_Oppgave"
 
@@ -7921,6 +8302,11 @@ msgstr "_Oppgave"
 msgid "_Unread Item (FIXME)"
 msgstr "_Ulest oppføring"
 
+#: ui/evolution-event-editor.xml.h:76 ui/evolution-message-composer.xml.h:52
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:46
+msgid "_View"
+msgstr "_Vis"
+
 #: ui/evolution-executive-summary.xml.h:1
 msgid "Add Service"
 msgstr "Legg til tjeneste"
@@ -7955,7 +8341,7 @@ msgstr "Skriv"
 
 #: ui/evolution-mail.xml.h:5
 msgid "Compose a new message"
-msgstr "Komponér en ny melding"
+msgstr "Komponer en ny melding"
 
 #: ui/evolution-mail.xml.h:6
 msgid "Configure Folder..."
@@ -7963,7 +8349,7 @@ msgstr "Konfigurer mappe..."
 
 #: ui/evolution-mail.xml.h:8
 msgid "Copy message to a new folder"
-msgstr "Kopiér meldingen til en ny mappe"
+msgstr "Kopier meldingen til en ny mappe"
 
 #: ui/evolution-mail.xml.h:9
 msgid "Copy selected messages to another folder"
@@ -8025,148 +8411,168 @@ msgstr "Glem _passord"
 msgid "Forward As"
 msgstr "Videresend som"
 
+#: ui/evolution-mail.xml.h:27
+msgid "Forward attached"
+msgstr "Videresend som vedlegg"
+
 #: ui/evolution-mail.xml.h:28
+msgid "Forward inline"
+msgstr "Videresend \"inline\""
+
+#: ui/evolution-mail.xml.h:29
+msgid "Forward quoted"
+msgstr "Videresend sitert"
+
+#: ui/evolution-mail.xml.h:30
 msgid "Forward the selected mail to someone"
 msgstr "Videresend den valgte meldingen til noen"
 
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-mail.xml.h:31
+msgid "Forward the selected mail to someone as an attachment"
+msgstr "Videresend den valgte meldingen til noen som et vedlegg"
+
+#: ui/evolution-mail.xml.h:33
 msgid "Forward this message in-line with your mail, so you can edit it"
 msgstr ""
 "Videresend denne meldingen \"in-line\" med din e-post, så du kan redigere den"
 
-#: ui/evolution-mail.xml.h:31
+#: ui/evolution-mail.xml.h:34
+msgid "Forward this message quoted like a reply"
+msgstr "Videresend denne meldingen som et svar"
+
+#: ui/evolution-mail.xml.h:35
 msgid "Full _Headers"
 msgstr "Fulle _headere"
 
-#: ui/evolution-mail.xml.h:32
+#: ui/evolution-mail.xml.h:36
+msgid "Go to the next message"
+msgstr "Gå til neste melding"
+
+#: ui/evolution-mail.xml.h:37
+msgid "Go to the previous message"
+msgstr "Gå til forrige melding"
+
+#: ui/evolution-mail.xml.h:38
 msgid "Hide Deleted Messages"
 msgstr "Skjul slettede meldinger"
 
-#: ui/evolution-mail.xml.h:33
+#: ui/evolution-mail.xml.h:39
 msgid "Hide S_elected Messages"
 msgstr "Skjul valgt_e meldinger"
 
-#: ui/evolution-mail.xml.h:34
+#: ui/evolution-mail.xml.h:40
 msgid "Hide _Deleted Messages"
 msgstr "Skjul slette_de meldinger"
 
-#: ui/evolution-mail.xml.h:35
+#: ui/evolution-mail.xml.h:41
 msgid "Hide _Read messages"
 msgstr "Skjul le_ste meldinger"
 
-#: ui/evolution-mail.xml.h:36
+#: ui/evolution-mail.xml.h:42
 msgid "Invert Selection"
 msgstr "Reverser utvalg"
 
-#: ui/evolution-mail.xml.h:37
+#: ui/evolution-mail.xml.h:43
 msgid "Manage _Subscriptions..."
 msgstr "_Håndter abonnement..."
 
-#: ui/evolution-mail.xml.h:38
-msgid "Mar_k as Read"
-msgstr "Mer_k som lest"
-
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail.xml.h:45
 msgid "Mark All as R_ead"
 msgstr "Merk alle som l_est"
 
-#: ui/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:46
 msgid "Mark As Read"
 msgstr "Merk som lest"
 
-#: ui/evolution-mail.xml.h:41
+#: ui/evolution-mail.xml.h:47
 msgid "Mark As U_nread"
 msgstr "Merk som _ulest"
 
-#: ui/evolution-mail.xml.h:42
-msgid "Mark as U_nread"
-msgstr "Merk som u_lest"
-
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:49
 msgid "Mark the selected messages as having been read"
 msgstr "Merk valgte meldinger som lest"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:50
 msgid "Mark the selected messages as not having been read"
 msgstr "Merk valgte meldinger som ikke lest"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:51
 msgid "Move"
 msgstr "Flytt"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:52
 msgid "Move message to a new folder"
 msgstr "Flytt meldingen til en ny mappe"
 
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:53
 msgid "Move selected messages to another folder"
 msgstr "Flytt valgte meldinger til en annen mappe"
 
-#: ui/evolution-mail.xml.h:48
+#: ui/evolution-mail.xml.h:55
 msgid "Open in New Window"
 msgstr "Åpne i nytt vindu"
 
-#: ui/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:56
 msgid "Open the current message in a new window"
 msgstr "Åpne aktiv melding i et nytt vindu"
 
-#: ui/evolution-mail.xml.h:54
+#: ui/evolution-mail.xml.h:62
 msgid "Print Preview of message..."
 msgstr "Vis forhåndsvisning av melding..."
 
-#: ui/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:63
 msgid "Print message to the printer"
 msgstr "Skriv ut denne meldingen på skriveren"
 
-#: ui/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:64
 msgid "Print message..."
 msgstr "Skriv ut melding..."
 
-#: ui/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:67
 msgid "Redirect (FIXME: implement me)"
 msgstr "Omdiriger"
 
-#: ui/evolution-mail.xml.h:62
-msgid "Reply to _All"
-msgstr "Svar til _alle"
-
-#: ui/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:71
 msgid "Reply to all"
 msgstr "Svar til alle"
 
-#: ui/evolution-mail.xml.h:65
+#: ui/evolution-mail.xml.h:73
 msgid "Reply to sender"
 msgstr "Svar til sender"
 
-#: ui/evolution-mail.xml.h:67
+#: ui/evolution-mail.xml.h:75
+msgid "S_earch Message"
+msgstr "Søk i m_elding"
+
+#: ui/evolution-mail.xml.h:76
 msgid "S_ource"
 msgstr "K_ilde"
 
-#: ui/evolution-mail.xml.h:68
+#: ui/evolution-mail.xml.h:77
 msgid "Save the message into a new file"
 msgstr "Lagre meldingen til en ny fil"
 
-#: ui/evolution-mail.xml.h:70 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:79 ui/evolution-subscribe.xml.h:7
 msgid "Select _All"
 msgstr "Velg _alle"
 
-#: ui/evolution-mail.xml.h:71
+#: ui/evolution-mail.xml.h:80
 msgid "Select _Thread"
 msgstr "Velg _tråd"
 
-#: ui/evolution-mail.xml.h:72
+#: ui/evolution-mail.xml.h:81
 msgid "Send / Receive"
 msgstr "Send / motta"
 
-#: ui/evolution-mail.xml.h:73
+#: ui/evolution-mail.xml.h:82
 msgid "Send a reply to the person who sent you this mail"
 msgstr "Send et svar til personen som sendte deg denne meldingen"
 
-#: ui/evolution-mail.xml.h:74
+#: ui/evolution-mail.xml.h:83
 msgid "Send a single mail in reply to all the selected mail"
 msgstr "Send en enkelt melding i svar til alle valgte meldinger"
 
-#: ui/evolution-mail.xml.h:75
+#: ui/evolution-mail.xml.h:84
 msgid ""
 "Send queued mail\n"
 "    and retrieve new mail"
@@ -8174,130 +8580,90 @@ msgstr ""
 "Send kølagt e-post\n"
 "    og hent ny e-post"
 
-#: ui/evolution-mail.xml.h:77
+#: ui/evolution-mail.xml.h:86
 msgid "Send queued mail and retrieve new mail"
 msgstr "Send kølagt e-post og hent ny e-post"
 
-#: ui/evolution-mail.xml.h:78
+#: ui/evolution-mail.xml.h:87
 msgid "Show _All"
 msgstr "Vis _alle"
 
-#: ui/evolution-mail.xml.h:80
+#: ui/evolution-mail.xml.h:89
 msgid "Threaded Message list"
 msgstr "Meldingsliste med tråder"
 
-#: ui/evolution-mail.xml.h:81
+#: ui/evolution-mail.xml.h:90
 msgid "Un-delete the selected messages"
 msgstr "Angre slett av den valgte meldingen"
 
-#: ui/evolution-mail.xml.h:83
-msgid "VFolder on Mailing _List"
-msgstr "VFolder på e-post_liste"
-
-#: ui/evolution-mail.xml.h:84
-msgid "VFolder on Se_nder"
-msgstr "VFolder for se_nder"
-
-#: ui/evolution-mail.xml.h:85
-msgid "VFolder on _Recipients"
-msgstr "VFolder for mottake_re"
-
-#: ui/evolution-mail.xml.h:86
-msgid "VFolder on _Subject"
-msgstr "VFolder på e_mne"
+#: ui/evolution-mail.xml.h:91
+msgid "Undelete"
+msgstr "Angre slett"
 
-#: ui/evolution-mail.xml.h:87
+#: ui/evolution-mail.xml.h:96
 msgid "View Raw Message Source"
 msgstr "Vis rå meldingskode"
 
-#: ui/evolution-mail.xml.h:88
+#: ui/evolution-mail.xml.h:97
 msgid "Virtual Folder _Editor..."
 msgstr "R_edigering av virtuelle mapper..."
 
-#: ui/evolution-mail.xml.h:89
+#: ui/evolution-mail.xml.h:98
 msgid "_Apply Filters"
 msgstr "_Påfør filtre"
 
-#: ui/evolution-mail.xml.h:90
-msgid "_Attachment"
-msgstr "_Vedlegg"
-
-#: ui/evolution-mail.xml.h:91
-msgid "_Copy to Folder..."
-msgstr "_Kopiér til mappe..."
-
-#: ui/evolution-mail.xml.h:92
+#: ui/evolution-mail.xml.h:100
 msgid "_Create Filter From Message"
 msgstr "La_g filter fra melding"
 
-#: ui/evolution-mail.xml.h:94
+#: ui/evolution-mail.xml.h:102
 msgid "_Expunge"
 msgstr "_Tøm"
 
-#: ui/evolution-mail.xml.h:95
+#: ui/evolution-mail.xml.h:103
 msgid "_Filters..."
 msgstr "_Filtre..."
 
-#: ui/evolution-mail.xml.h:96 ui/evolution.xml.h:32
+#: ui/evolution-mail.xml.h:104 ui/evolution.xml.h:34
 msgid "_Folder"
 msgstr "_Mappe"
 
-#: ui/evolution-mail.xml.h:97
-msgid "_Forward"
-msgstr "_Videresend"
-
-#: ui/evolution-mail.xml.h:98
-msgid "_Inline"
-msgstr "_Inline"
-
-#: ui/evolution-mail.xml.h:99 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:106 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
-msgstr "Re_versér utvalg"
+msgstr "Re_verser utvalg"
 
-#: ui/evolution-mail.xml.h:100
+#: ui/evolution-mail.xml.h:107
 msgid "_Mail Message"
 msgstr "Send _melding"
 
-#: ui/evolution-mail.xml.h:101
+#: ui/evolution-mail.xml.h:108
 msgid "_Mail Settings..."
 msgstr "Innstillinger for e-post..."
 
-#: ui/evolution-mail.xml.h:102
-msgid "_Move to Folder..."
-msgstr "F_lytt til mappe..."
-
-#: ui/evolution-mail.xml.h:103
+#: ui/evolution-mail.xml.h:110
 msgid "_Open Selected Items"
 msgstr "_Åpne valgte oppføringer"
 
-#: ui/evolution-mail.xml.h:105
-msgid "_Quoted"
-msgstr "_Sitert"
-
-#: ui/evolution-mail.xml.h:106
+#: ui/evolution-mail.xml.h:112
 msgid "_Reply"
 msgstr "Sva_r"
 
-#: ui/evolution-mail.xml.h:107
+#: ui/evolution-mail.xml.h:113
 msgid "_Resend Messages"
 msgstr "Send meldinge_r på nytt"
 
-#: ui/evolution-mail.xml.h:109
+#: ui/evolution-mail.xml.h:115
 msgid "_Save Message As..."
 msgstr "Lagre melding _som..."
 
-#: ui/evolution-mail.xml.h:110
+#: ui/evolution-mail.xml.h:116
 msgid "_Send / Receive"
 msgstr "_Send / motta"
 
-#: ui/evolution-mail.xml.h:111
+#: ui/evolution-mail.xml.h:117
 msgid "_Threaded"
 msgstr "Med _tråder"
 
-#: ui/evolution-mail.xml.h:113
-msgid "_Undelete"
-msgstr "A_ngre slett"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Legg ved"
@@ -8309,7 +8675,7 @@ msgstr "Lukk aktiv fil"
 
 #: ui/evolution-message-composer.xml.h:5
 msgid "Encrypt this message with PGP"
-msgstr "Kryptér denne meldingen med PGP"
+msgstr "Krypter denne meldingen med PGP"
 
 #: ui/evolution-message-composer.xml.h:6
 msgid "F_ormat"
@@ -8333,11 +8699,11 @@ msgstr "Åpne en fil"
 
 #: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
-msgstr "Kryptér med PGP"
+msgstr "Krypter med PGP"
 
 #: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
-msgstr "Signér med PGP"
+msgstr "Signer med PGP"
 
 #: ui/evolution-message-composer.xml.h:17
 msgid "Save _Draft"
@@ -8401,7 +8767,7 @@ msgstr "Vis vedlegg"
 
 #: ui/evolution-message-composer.xml.h:33
 msgid "Sign this message with your PGP key"
-msgstr "Signér denne meldingen med din PGP-nøkkel"
+msgstr "Signer denne meldingen med din PGP-nøkkel"
 
 #: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the BCC field is displayed"
@@ -8419,35 +8785,35 @@ msgstr "Slå av/på visning av Fra-feltet"
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Slå av/på visning av Svar-til feltet"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Bcc Field"
 msgstr "_Bcc-felt"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:39
 msgid "_Cc Field"
 msgstr "_Cc-felt"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:44
 msgid "_From Field"
 msgstr "_Fra-felt"
 
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Insert"
 msgstr "Sett _inn"
 
-#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-message-composer.xml.h:47
 msgid "_Insert text file... (FIXME)"
 msgstr "Sett _inn tekstfil..."
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:48
 msgid "_Open..."
 msgstr "_Åpne..."
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:49
 msgid "_Reply-To Field"
 msgstr "Svar-til felt"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:51
 msgid "_Security"
 msgstr "_Sikkerhet"
 
@@ -8473,7 +8839,7 @@ msgstr "Fjern mappe fra din liste over abbonerte mapper"
 
 #: ui/evolution-subscribe.xml.h:8
 msgid "Subscribe"
-msgstr "Abonnér"
+msgstr "Abonner"
 
 #: ui/evolution-subscribe.xml.h:9
 msgid "Unsubscribe"
@@ -8539,7 +8905,7 @@ msgstr "Angre"
 msgid "Undo the last action"
 msgstr "Angre siste handling"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:29
 msgid "_Appointment (FIXME)"
 msgstr "_Avtale"
 
@@ -8617,7 +8983,7 @@ msgstr "Kom _igang"
 
 #: ui/evolution.xml.h:13
 msgid "Import an external file format"
-msgstr "Importér et eksternt filformat"
+msgstr "Importer et eksternt filformat"
 
 #: ui/evolution.xml.h:14
 msgid "Main toolbar"
@@ -8640,65 +9006,77 @@ msgid "Submit bug report using Bug Buddy."
 msgstr "Send inn feilrapport ved bruk av Bug Buddy."
 
 #: ui/evolution.xml.h:19
+msgid "Toggle"
+msgstr "Bytt"
+
+#: ui/evolution.xml.h:20
 msgid "Toggle whether to show the folder bar"
 msgstr "Slå av/på visning av mappelinjen"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Slå av/på visning av snarveilinjen"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
+msgid "Toggle whether we are working offline."
+msgstr "Skift til \"offline\" arbeidsmodus."
+
+#: ui/evolution.xml.h:23
 msgid "Using the C_ontact Manager"
 msgstr "Bruk av k_ontaktdatabasen"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 msgid "Using the _Calendar"
 msgstr "Bruk av _kalenderen"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Using the _Mailer"
 msgstr "Bruk av e-_postprogrammet"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Work Offline"
 msgstr "Arbeid \"offline\""
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "_About Evolution..."
 msgstr "_Om Evolution..."
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Actions"
 msgstr "H_andlinger"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:35
 msgid "_Folder Bar"
 msgstr "_Mappelinje"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:36
 msgid "_Go to Folder..."
 msgstr "_Gå til mappe..."
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Import file..."
-msgstr "_Importér fil..."
+msgstr "_Importer fil..."
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:39
 msgid "_Index"
 msgstr "_Indeks"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:40
 msgid "_Mail message"
 msgstr "Send _melding"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:42
 msgid "_New Folder"
 msgstr "_Ny mappe"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:43
 msgid "_Shortcut Bar"
 msgstr "_Snarveilinje"
 
+#: ui/evolution.xml.h:47
+msgid "_Work Offline"
+msgstr "Ar_beid \"offline\""
+
 #: views/addressbook/galview.xml.h:1
 msgid "Adress Cards"
 msgstr "Adressekort"
@@ -8814,11 +9192,11 @@ msgstr "Alle deltakere"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
-#: widgets/menus/gal-view-menus.c:177
+#: widgets/menus/gal-view-menus.c:176
 msgid "_Current View"
 msgstr "_Aktiv visning"
 
-#: widgets/menus/gal-view-menus.c:196
+#: widgets/menus/gal-view-menus.c:202
 msgid "Define Views"
 msgstr "Definer visninger"
 
@@ -8850,16 +9228,28 @@ msgstr "Datoen må skrives inn på formatet: %s"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:166
+#: widgets/misc/e-filter-bar.c:168
 msgid "Save Search"
 msgstr "Lagre søk"
 
-#: widgets/misc/e-filter-bar.c:237
+#: widgets/misc/e-filter-bar.c:239
 msgid "Advanced Search"
 msgstr "Avansert søk"
 
-#: widgets/misc/e-filter-bar.c:317
-msgid "Advanced ..."
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "Lagre som..."
+
+#: widgets/misc/e-filter-bar.h:102
+msgid "Show All"
+msgstr "Vis alle"
+
+#: widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
+msgstr "Rediger..."
+
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
 msgstr "Avansert..."
 
 #: widgets/misc/e-messagebox.c:152
@@ -8883,7 +9273,7 @@ msgstr "Melding"
 msgid "Don't show this message again."
 msgstr "Ikke vis denne meldingen igjen."
 
-#: widgets/misc/e-search-bar.c:148
+#: widgets/misc/e-search-bar.c:155
 msgid "Sear_ch"
 msgstr "Sø_k"
 
@@ -8907,6 +9297,77 @@ msgstr "init_corba(): kunne ikke initiere GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 
+#~ msgid "Forward _inline"
+#~ msgstr "Videresend \"_inline\""
+
+#~ msgid "Search \"%s\""
+#~ msgstr "Søk \"%s\""
+
+#~ msgid "_Attachment"
+#~ msgstr "_Vedlegg"
+
+#~ msgid "SASL"
+#~ msgstr "SASL"
+
+#~ msgid "View the selected folder"
+#~ msgstr "Vis den valgte mappen"
+
+#~ msgid ""
+#~ "We were unable to open this addressbook.  This either\n"
+#~ "means you have entered an incorrect URI, or have tried\n"
+#~ "to access an LDAP server and don't have LDAP support\n"
+#~ "compiled in.  If you've entered a URI, check the URI for\n"
+#~ "correctness and reenter.  If not, you probably have\n"
+#~ "attempted to access an LDAP server.  If you wish to be\n"
+#~ "able to use LDAP, you'll need to download and install\n"
+#~ "OpenLDAP and recompile and install Evolution.\n"
+#~ msgstr ""
+#~ "Kunne ikke åpne denne adresseboken. Dette beyr at du\n"
+#~ "har skrevet inn en ugyldig URI, eller at du har forsøkt\n"
+#~ "å aksessere en LDAP-tjener og ikke har støtte for LDAP\n"
+#~ "kompilert inn. Hvis du skrev inn en URI, vær vennlig\n"
+#~ "og sjekk om denne er korrekt, og skriv den inn på nytt.\n"
+#~ "Hvis ikke har du sannsynligvis forsøkt å bruke en LDAP-\n"
+#~ "tjener. Hvis du ønsker å bruke LDAP må du laste ned og\n"
+#~ "installere OpenLDAP, deretter må du kompilere og\n"
+#~ "installere Evolution på nytt.\n"
+
+#~ msgid "Show all "
+#~ msgstr "Vis alle "
+
+#~ msgid "Advanced ..."
+#~ msgstr "Avansert..."
+
+#~ msgid "Save As ..."
+#~ msgstr "Lagre som..."
+
+#~ msgid "%s is not a selectable folder"
+#~ msgstr "%s er ikke en valgbar mappe"
+
+#~ msgid "VFolder on Subject"
+#~ msgstr "VFolder for emne"
+
+#~ msgid "VFolder on Sender"
+#~ msgstr "VFolder for sender"
+
+#~ msgid "VFolder on Recipients"
+#~ msgstr "VFolder for mottakere"
+
+#~ msgid "Mark as Read"
+#~ msgstr "Marker som lest"
+
+#~ msgid "Mark as Unread"
+#~ msgstr "Merk som ulest"
+
+#~ msgid "Move to Folder..."
+#~ msgstr "Flytt til mappe..."
+
+#~ msgid "Copy to Folder..."
+#~ msgstr "Kopier til mappe..."
+
+#~ msgid "Do you accept?"
+#~ msgstr "Aksepterer du?"
+
 #~ msgid "Click here to add a contact"
 #~ msgstr "Klikk her for å legge til en kontakt"
 
@@ -9013,9 +9474,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Kerberos"
 #~ msgstr "Kerberos"
 
-#~ msgid "Mail"
-#~ msgstr "E-post"
-
 #~ msgid "Mail Account"
 #~ msgstr "E-post konto"
 
@@ -9040,9 +9498,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Required"
 #~ msgstr "Nødvendige"
 
-#~ msgid "Save password"
-#~ msgstr "Lagre passord"
-
 #~ msgid "Select signature file"
 #~ msgstr "Velg signaturfil"
 
@@ -9123,25 +9578,25 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "Tide er gyldig"
 
 #~ msgid "Edit Filter Rule"
-#~ msgstr "Redigér filterregel"
+#~ msgstr "Rediger filterregel"
 
 #~ msgid "Add VFolder Rule"
 #~ msgstr "Legg til regel for VFolder"
 
 #~ msgid "Edit VFolder Rule"
-#~ msgstr "Redigér VFolder regel"
+#~ msgstr "Rediger VFolder regel"
 
 #~ msgid "Disabled"
 #~ msgstr "Slått av"
 
 #~ msgid "Synchronize"
-#~ msgstr "Synkronisér"
+#~ msgstr "Synkroniser"
 
 #~ msgid "Copy From Pilot"
-#~ msgstr "Kopiér fra Pilot"
+#~ msgstr "Kopier fra Pilot"
 
 #~ msgid "Copy To Pilot"
-#~ msgstr "Kopiér til Pilot"
+#~ msgstr "Kopier til Pilot"
 
 #~ msgid "Merge From Pilot"
 #~ msgstr "Flett fra Pilot"
@@ -9194,7 +9649,7 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ "pilot-listen fra gnome-pilot daemonen"
 
 #~ msgid "Configure the address conduit"
-#~ msgstr "Konfigurér oppgavelisten"
+#~ msgstr "Konfigurer oppgavelisten"
 
 #~ msgid "Evolution Address conduit "
 #~ msgstr "Oppgaver"
@@ -9206,13 +9661,13 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "Konfigurasjonsverktøy for evolutions kalender-komponent.\n"
 
 #~ msgid "Configure the GnomeCal conduit"
-#~ msgstr "Konfigurér GnomeCal-komponent"
+#~ msgstr "Konfigurer GnomeCal-komponent"
 
 #~ msgid "Evolution Calendar conduit"
 #~ msgstr "Evolution kalender-komponent"
 
 #~ msgid "Configure the todo conduit"
-#~ msgstr "Konfigurér oppgavelistekomponenten"
+#~ msgstr "Konfigurer oppgavelistekomponenten"
 
 #~ msgid "Evolution ToDo conduit "
 #~ msgstr "Oppgaver"
@@ -9288,10 +9743,10 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "Lag regel"
 
 #~ msgid "Fi_lter on Sender"
-#~ msgstr "Fi_ltrér etter sender"
+#~ msgstr "Fi_ltrer etter sender"
 
 #~ msgid "Filter on Rec_ipients"
-#~ msgstr "F_iltrér etter mottaker"
+#~ msgstr "F_iltrer etter mottaker"
 
 #~ msgid "Get Mail"
 #~ msgstr "Hent e-post"
@@ -9303,7 +9758,7 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "Vis _alle meldinger"
 
 #~ msgid "_Filter on Subject"
-#~ msgstr "_Filtrér etter emne"
+#~ msgstr "_Filtrer etter emne"
 
 #~ msgid "_Mail Configuration..."
 #~ msgstr "_E-post konfigurasjon..."
@@ -9326,9 +9781,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Show the _Shortcut Bar"
 #~ msgstr "Vis _snarveilinjen"
 
-#~ msgid "_Settings"
-#~ msgstr "Inn_stillinger"
-
 #~ msgid "The priority must be between 1 and 9, inclusive"
 #~ msgstr "Prioriteten må være mellom 0 og 9, inklusive"
 
@@ -9336,7 +9788,7 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "Sett opp møte"
 
 #~ msgid "Edit this appointment..."
-#~ msgstr "Redigér denne avtalen..."
+#~ msgstr "Rediger denne avtalen..."
 
 #~ msgid "New"
 #~ msgstr "Ny"
@@ -9350,24 +9802,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Error saving composition to 'Drafts': %s"
 #~ msgstr "Feil under lagring av brevet i 'Skisser': %s"
 
-#~ msgid "Body or subject contains"
-#~ msgstr "Kropp eller emne inneholder"
-
-#~ msgid "Body contains"
-#~ msgstr "Kropp inneholder"
-
-#~ msgid "Subject contains"
-#~ msgstr "Emne inneholder"
-
-#~ msgid "Body does not contain"
-#~ msgstr "Kropp inneholder ikke"
-
-#~ msgid "Subject does not contain"
-#~ msgstr "Emne inneholder ikke"
-
-#~ msgid "Sender contains"
-#~ msgstr "Sender inneholder"
-
 #~ msgid "Connect to server"
 #~ msgstr "Koble til tjener"
 
@@ -9390,7 +9824,7 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "Flytt meldinger fra \"%s\" til \"%s\""
 
 #~ msgid "Copy messages from \"%s\" into \"%s\""
-#~ msgstr "Kopiér meldinger fra \"%s\" til \"%s\""
+#~ msgstr "Kopier meldinger fra \"%s\" til \"%s\""
 
 #~ msgid "(No description)"
 #~ msgstr "(Ingen beskrivelse)"
@@ -9421,19 +9855,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Corrupted message from dispatching thread?"
 #~ msgstr "Korrupt melding fra utsender-tråd?"
 
-#~ msgid "Could not create dialog box."
-#~ msgstr "Kan ikke opprette dialogboks."
-
-#~ msgid "User cancelled query."
-#~ msgstr "Spørring avbrutt av bruker."
-
-#~ msgid ""
-#~ "Cannot open location `%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Kan ikk åpne lokasjon `%s':\n"
-#~ "%s"
-
 #~ msgid "Get store for \"%s\""
 #~ msgstr "Hent lager for \"%s\""
 
@@ -9578,9 +9999,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ "Kan ikke åpne fil %s:\n"
 #~ "%s"
 
-#~ msgid "Fetching email from %s"
-#~ msgstr "Henter e-post fra %s"
-
 #~ msgid "Fetch email from %s"
 #~ msgstr "Hent e-post fra %s"
 
@@ -9588,7 +10006,7 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "Filtrering av post etter behov"
 
 #~ msgid "Filter email on demand"
-#~ msgstr "Fi_ltrér e-post ved behov"
+#~ msgstr "Fi_ltrer e-post ved behov"
 
 #~ msgid "Sending queue"
 #~ msgstr "Sender kø"
@@ -9655,9 +10073,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Hide from Sender"
 #~ msgstr "Skjul fra sender"
 
-#~ msgid "Hide Subject \"%s\""
-#~ msgstr "Skjul emne \"%s\""
-
 #~ msgid "Hide from Sender <%s>"
 #~ msgstr "Skjul fra sender <%s>"
 
@@ -9761,7 +10176,7 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "Legg til news-tjener"
 
 #~ msgid "Edit News Server"
-#~ msgstr "Redigér news-tjener"
+#~ msgstr "Rediger news-tjener"
 
 #~ msgid "The connection was successful!"
 #~ msgstr "Tilkoblingen var vellykket!"
@@ -9896,7 +10311,7 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "Synkroniserer \"%s\""
 
 #~ msgid "Synchronize \"%s\""
-#~ msgstr "Synkronisér \"%s\""
+#~ msgstr "Synkroniser \"%s\""
 
 #~ msgid "Displaying message UID \"%s\""
 #~ msgstr "Viser melding-UID \"%s\""
@@ -10082,9 +10497,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Cannot copy data to output file: %s"
 #~ msgstr "Kan ikke kopiere data til utfil: %s"
 
-#~ msgid "Could not load or create summary"
-#~ msgstr "Kunne ikke laste eller opprette sammendrag"
-
 #~ msgid "Cannot append message to mh folder: %s"
 #~ msgstr "Kan ikke legge til melding i mh-mappe: %s"
 
@@ -10118,15 +10530,9 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Cannot initialize Evolution's mail storage hash."
 #~ msgstr "Kan ikke initiere Evolutions e-postlagrings-hash."
 
-#~ msgid "Forward as Attachment"
-#~ msgstr "Videresend som vedlegg"
-
 #~ msgid "_New appointment..."
 #~ msgstr "_Ny avtale..."
 
-#~ msgid "_Open"
-#~ msgstr "_Åpne"
-
 #~ msgid "Create a new folder"
 #~ msgstr "Opprett en ny mappe"
 
@@ -10166,7 +10572,7 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "Opprett opgavelisteoppføring"
 
 #~ msgid "Edit to-do item"
-#~ msgstr "Redigér oppgavelisteoppføring"
+#~ msgstr "Rediger oppgavelisteoppføring"
 
 #~ msgid "Due Date:"
 #~ msgstr "Ferdig-dato:"
@@ -10254,7 +10660,7 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ "Velkommen til Evolution E-post-konfigurasjonsdruiden!\n"
 #~ "Ved å fylle ut litt informasjon om dine e-post-\n"
 #~ "innstillinger kan du begynne å sende og motta e-post\n"
-#~ "med én gang. Klikk neste for å fortsette."
+#~ "med en gang. Klikk neste for å fortsette."
 
 #~ msgid "Add Optional Fields..."
 #~ msgstr "Legg til tillegsfelt..."
@@ -10266,7 +10672,7 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "Bla gjennom..."
 
 #~ msgid "Edit Mail Configuration Settings"
-#~ msgstr "Redigér innstillinger for e-post-konfigurasjon"
+#~ msgstr "Rediger innstillinger for e-post-konfigurasjon"
 
 #~ msgid "Preferred type: "
 #~ msgstr "Foretrukket type: "
@@ -10304,7 +10710,7 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "Ingen protokoll for åpning av URI `%s'"
 
 #~ msgid "_Copy to Folder"
-#~ msgstr "_Kopiér til mappe"
+#~ msgstr "_Kopier til mappe"
 
 #~ msgid "_Move to Folder"
 #~ msgstr "_Flytt til mappe"
@@ -10319,7 +10725,7 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "Videresend melding"
 
 #~ msgid "Copy Message"
-#~ msgstr "Kopiér melding"
+#~ msgstr "Kopier melding"
 
 #~ msgid "Quick Search"
 #~ msgstr "Raskt søk"
@@ -10427,13 +10833,13 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "Lagre og lukk denne avtalen"
 
 #~ msgid "Invite attendees to a meeting"
-#~ msgstr "Invitér deltakere til et møte"
+#~ msgstr "Inviter deltakere til et møte"
 
 #~ msgid "Cut selected item into clipboard"
 #~ msgstr "Klipp ut valgt oppføring til utklippstavlen"
 
 #~ msgid "Copy selected item into clipboard"
-#~ msgstr "Kopiér valgt oppføring til utklippstavlen"
+#~ msgstr "Kopier valgt oppføring til utklippstavlen"
 
 #~ msgid "Select recipients' addresses"
 #~ msgstr "Velg mottakerenes adresser"