Updated Norwegian translation.

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

	* no.po: Updated Norwegian translation.

svn path=/trunk/; revision=9842

2 files changed, 604 insertions, 429 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 4b9e3fffb9..03100f808a 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-16  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* no.po: Updated Norwegian translation.
+
 2001-05-15  Chris Toshok  <toshok@ximian.com>
 
 	* POTFILES.in: e-minicard-view-model.c ->
diff --git a/po/no.po b/po/no.po
index aa2e347070..e4880a25df 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.8\n"
-"POT-Creation-Date: 2001-05-16 00:29+0200\n"
-"PO-Revision-Date: 2001-05-16 00:38+02:00\n"
+"POT-Creation-Date: 2001-05-17 14:24+0200\n"
+"PO-Revision-Date: 2001-05-17 14:47+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -457,8 +457,8 @@ msgid "_Company:"
 msgstr "_Firma:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:650 mail/mail-config.glade.h:85
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:101
+#: mail/folder-browser.c:656 mail/mail-config.glade.h:85
+#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:103
 #: ui/evolution-task-editor-dialog.xml.h:69
 msgid "_Delete"
 msgstr "_Slett"
@@ -512,7 +512,7 @@ msgid "This contact belongs to these categories:"
 msgstr "Denne kontakten hører til disse kategoriene:"
 
 #: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/widgets/e-addressbook-view.c:688
 msgid "Assistant"
 msgstr "Assistent"
 
@@ -526,7 +526,7 @@ msgid "Business 2"
 msgstr "Arbeid 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:656
+#: addressbook/gui/widgets/e-addressbook-view.c:668
 msgid "Business Fax"
 msgstr "Faks på arbeid"
 
@@ -552,12 +552,12 @@ msgid "Home 2"
 msgstr "Hjemme 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:657
+#: addressbook/gui/widgets/e-addressbook-view.c:669
 msgid "Home Fax"
 msgstr "Faks hjemme"
 
 #: addressbook/contact-editor/e-contact-editor.c:1252
-#: addressbook/gui/widgets/e-addressbook-view.c:660
+#: addressbook/gui/widgets/e-addressbook-view.c:672
 msgid "ISDN"
 msgstr "ISDN"
 
@@ -571,12 +571,12 @@ msgid "Other"
 msgstr "Annet"
 
 #: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:662
+#: addressbook/gui/widgets/e-addressbook-view.c:674
 msgid "Other Fax"
 msgstr "Annen faks"
 
 #: addressbook/contact-editor/e-contact-editor.c:1256
-#: addressbook/gui/widgets/e-addressbook-view.c:663
+#: addressbook/gui/widgets/e-addressbook-view.c:675
 msgid "Pager"
 msgstr "Personsøker"
 
@@ -585,12 +585,12 @@ msgid "Primary"
 msgstr "Primær"
 
 #: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:664
+#: addressbook/gui/widgets/e-addressbook-view.c:676
 msgid "Radio"
 msgstr "Radio"
 
 #: addressbook/contact-editor/e-contact-editor.c:1259
-#: addressbook/gui/widgets/e-addressbook-view.c:665
+#: addressbook/gui/widgets/e-addressbook-view.c:677
 msgid "Telex"
 msgstr "Teleks"
 
@@ -599,12 +599,12 @@ msgid "TTY/TDD"
 msgstr "TTY/TTD"
 
 #: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:668
+#: addressbook/gui/widgets/e-addressbook-view.c:680
 msgid "Email 2"
 msgstr "E-post 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:669
+#: addressbook/gui/widgets/e-addressbook-view.c:681
 msgid "Email 3"
 msgstr "E-post 3"
 
@@ -621,7 +621,7 @@ msgid "Edit Full"
 msgstr "Rediger alt"
 
 #: addressbook/contact-editor/e-contact-quick-add.c:276
-#: addressbook/gui/widgets/e-addressbook-view.c:643
+#: addressbook/gui/widgets/e-addressbook-view.c:655
 msgid "Full Name"
 msgstr "Fullt navn"
 
@@ -949,13 +949,13 @@ msgid "Addressbook Sources"
 msgstr "Adressebok-kilder"
 
 #: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-#: addressbook/gui/widgets/e-minicard-view-model.c:253
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:590
 #: 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/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
+#: mail/message-browser.c:202 ui/evolution-addressbook.xml.h:3
+#: ui/evolution-event-editor.xml.h:17 ui/evolution-mail.xml.h:22
 #: ui/evolution-task-editor-dialog.xml.h:18
 msgid "Delete"
 msgstr "Slett"
@@ -1076,7 +1076,7 @@ msgid "Select name from:"
 msgstr "Velg navn fra:"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:211
+#: mail/mail-search.c:242
 msgid "Search"
 msgstr "Søk"
 
@@ -1188,149 +1188,148 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:513
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-#: addressbook/gui/widgets/e-minicard-view-model.c:152
-#: addressbook/gui/widgets/e-minicard-view-model.c:248
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:525
+#: addressbook/gui/widgets/e-addressbook-view.c:585
 msgid "Save as VCard"
 msgstr "Lagre som VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-#: addressbook/gui/widgets/e-minicard-view-model.c:249
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:586
 msgid "Send contact to other"
 msgstr "Send kontakt til andre"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-#: addressbook/gui/widgets/e-minicard-view-model.c:250
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:587
 msgid "Send message to contact"
 msgstr "Send melding til kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-#: 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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+#: addressbook/gui/widgets/e-addressbook-view.c:588 mail/message-browser.c:199
+#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:23
+#: ui/evolution-mail.xml.h:65 ui/evolution-tasks.xml.h:4
 msgid "Print"
 msgstr "Skriv ut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-#: addressbook/gui/widgets/e-minicard-view-model.c:252
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:589
 msgid "Print Envelope"
 msgstr "Skriv ut konvolutt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:641
+#: addressbook/gui/widgets/e-addressbook-view.c:653
 msgid "* Click here to add a contact *"
 msgstr "* Klikk her for å legge til en kontakt *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:642
+#: addressbook/gui/widgets/e-addressbook-view.c:654
 msgid "File As"
 msgstr "Lagre som"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:644
+#: addressbook/gui/widgets/e-addressbook-view.c:656
 msgid "Email"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:645
+#: addressbook/gui/widgets/e-addressbook-view.c:657
 msgid "Primary Phone"
 msgstr "Primær telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:646
+#: addressbook/gui/widgets/e-addressbook-view.c:658
 msgid "Assistant Phone"
 msgstr "Assistents telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:647
+#: addressbook/gui/widgets/e-addressbook-view.c:659
 msgid "Business Phone"
 msgstr "Arbeidstelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:648
+#: addressbook/gui/widgets/e-addressbook-view.c:660
 msgid "Callback Phone"
 msgstr "Telefon for tilbakeringing"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:649
+#: addressbook/gui/widgets/e-addressbook-view.c:661
 msgid "Company Phone"
 msgstr "Firmatelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:650
+#: addressbook/gui/widgets/e-addressbook-view.c:662
 msgid "Home Phone"
 msgstr "Hjemmetelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:651
+#: addressbook/gui/widgets/e-addressbook-view.c:663
 msgid "Organization"
 msgstr "Organisasjon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:652
+#: addressbook/gui/widgets/e-addressbook-view.c:664
 msgid "Business Address"
 msgstr "Arbeidsadresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:653
+#: addressbook/gui/widgets/e-addressbook-view.c:665
 msgid "Home Address"
 msgstr "Hjemmeadresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:654
+#: addressbook/gui/widgets/e-addressbook-view.c:666
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:667
 msgid "Car Phone"
 msgstr "Biltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:658
+#: addressbook/gui/widgets/e-addressbook-view.c:670
 msgid "Business Phone 2"
 msgstr "Arbeidstelefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:659
+#: addressbook/gui/widgets/e-addressbook-view.c:671
 msgid "Home Phone 2"
 msgstr "Hjemmetelefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:661
+#: addressbook/gui/widgets/e-addressbook-view.c:673
 msgid "Other Phone"
 msgstr "Annen telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:666
+#: addressbook/gui/widgets/e-addressbook-view.c:678
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:667
+#: addressbook/gui/widgets/e-addressbook-view.c:679
 msgid "Other Address"
 msgstr "Annen adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:670
+#: addressbook/gui/widgets/e-addressbook-view.c:682
 msgid "Web Site"
 msgstr "Nettside"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:683
 msgid "Department"
 msgstr "Avdeling"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/widgets/e-addressbook-view.c:684
 msgid "Office"
 msgstr "Kontor"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: addressbook/gui/widgets/e-addressbook-view.c:685
 msgid "Title"
 msgstr "Tittel"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:686
 msgid "Profession"
 msgstr "Yrke"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:675
+#: addressbook/gui/widgets/e-addressbook-view.c:687
 msgid "Manager"
 msgstr "Leder"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-view.c:689
 msgid "Nickname"
 msgstr "Kallenavn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:678
+#: addressbook/gui/widgets/e-addressbook-view.c:690
 msgid "Spouse"
 msgstr "Ektefelle"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:679
+#: addressbook/gui/widgets/e-addressbook-view.c:691
 msgid "Note"
 msgstr "Kommentar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:692
 msgid "Free-busy URL"
 msgstr "Fri-ledig URL"
 
@@ -1338,7 +1337,7 @@ msgstr "Fri-ledig URL"
 msgid "Save in addressbook"
 msgstr "Lagre i adressebok"
 
-#: addressbook/gui/widgets/e-minicard-view.c:507
+#: addressbook/gui/widgets/e-minicard-view.c:216
 msgid ""
 "\n"
 "\n"
@@ -3185,9 +3184,8 @@ msgstr "Dette året (%Y)"
 msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1552
+#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1560
 #: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:61
 msgid "Print Preview"
 msgstr "Forhåndsvisning av utskrift"
 
@@ -3238,17 +3236,14 @@ 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"
 
@@ -3330,23 +3325,23 @@ msgstr ""
 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
+#: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr "Signering er ikke støttet av dette cipheret"
 
-#: camel/camel-cipher-context.c:209
+#: camel/camel-cipher-context.c:211
 msgid "Clearsigning is not supported by this cipher"
 msgstr "\"Clearsigning\" er ikke støttet av dette cipheret"
 
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:251
 msgid "Verifying is not supported by this cipher"
 msgstr "Verifisering er ikke støttet av dette cipheret"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:294
 msgid "Encryption is not supported by this cipher"
 msgstr "Kryptering er ikke støttet av dette cipheret"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:336
 msgid "Decryption is not supported by this cipher"
 msgstr "Dekryptering er ikke støttet av dette cipheret"
 
@@ -3524,71 +3519,71 @@ msgstr "(Ukjent feil)"
 msgid "Error copying mail temp file: %s"
 msgstr "Feil under kopiering midlertidig meldingsfil: %s"
 
-#: camel/camel-pgp-context.c:188
+#: camel/camel-pgp-context.c:190
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Vennligst skriv inn din %s passphrase for %s"
 
-#: camel/camel-pgp-context.c:191
+#: camel/camel-pgp-context.c:193
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Vennligst skriv inn din %s passphrase"
 
-#: camel/camel-pgp-context.c:509
+#: camel/camel-pgp-context.c:511
 msgid "No plaintext to sign."
 msgstr "Ingen klartekst å signere."
 
-#: camel/camel-pgp-context.c:516 camel/camel-pgp-context.c:688
-#: camel/camel-pgp-context.c:1055 camel/camel-pgp-context.c:1267
+#: camel/camel-pgp-context.c:518 camel/camel-pgp-context.c:690
+#: camel/camel-pgp-context.c:1057 camel/camel-pgp-context.c:1269
 msgid "No password provided."
 msgstr "Ingen passord gitt."
 
-#: 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
+#: camel/camel-pgp-context.c:524 camel/camel-pgp-context.c:696
+#: camel/camel-pgp-context.c:879 camel/camel-pgp-context.c:1064
+#: camel/camel-pgp-context.c:1276
 #, 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:681
+#: camel/camel-pgp-context.c:683
 msgid "No plaintext to clearsign."
 msgstr "Ingen klartekst å kjøre \"plainsign\" på."
 
-#: camel/camel-pgp-context.c:871
+#: camel/camel-pgp-context.c:873
 msgid "No plaintext to verify."
 msgstr "Ingen klartekst å verifisere."
 
-#: camel/camel-pgp-context.c:888
+#: camel/camel-pgp-context.c:890
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Kunne ikke opprette midlertidig fil: %s"
 
-#: camel/camel-pgp-context.c:1045
+#: camel/camel-pgp-context.c:1047
 msgid "No plaintext to encrypt."
 msgstr "Ingen klartekst å kryptere."
 
-#: camel/camel-pgp-context.c:1071
+#: camel/camel-pgp-context.c:1073
 msgid "No recipients specified"
 msgstr "Ingen mottakere spesifisert"
 
-#: camel/camel-pgp-context.c:1259
+#: camel/camel-pgp-context.c:1261
 msgid "No ciphertext to decrypt."
 msgstr "Ingen ciphertekst å dekryptere."
 
-#: camel/camel-pkcs7-context.c:197 camel/camel-smime-context.c:199
+#: camel/camel-pkcs7-context.c:197 camel/camel-smime-context.c:195
 #, 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
+#: camel/camel-pkcs7-context.c:213 camel/camel-smime-context.c:211
 msgid "Error hashing password."
 msgstr "Feil under hashing av passord."
 
-#: camel/camel-pkcs7-context.c:222 camel/camel-smime-context.c:224
+#: camel/camel-pkcs7-context.c:222 camel/camel-smime-context.c:220
 msgid "Invalid password."
 msgstr "Ugyldig passord"
 
-#: camel/camel-pkcs7-context.c:329 camel/camel-smime-context.c:332
+#: camel/camel-pkcs7-context.c:329 camel/camel-smime-context.c:328
 #, c-format
 msgid "Could not sign: certificate not found for \"%s\"."
 msgstr "Kunne ikke signere: sertifikat ikke funnet for \"%s\"."
@@ -3598,24 +3593,24 @@ msgstr "Kunne ikke signere: sertifikat ikke funnet for \"%s\"."
 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
+#: camel/camel-pkcs7-context.c:567 camel/camel-smime-context.c:529
 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
+#: camel/camel-pkcs7-context.c:590 camel/camel-smime-context.c:536
 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
+#: camel/camel-pkcs7-context.c:620 camel/camel-smime-context.c:571
 #, 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
+#: camel/camel-pkcs7-context.c:626 camel/camel-smime-context.c:577
 msgid "Could not encrypt: encoding failed."
 msgstr "Kunne ikke kryptere: koding feilet."
 
-#: camel/camel-pkcs7-context.c:677 camel/camel-smime-context.c:630
+#: camel/camel-pkcs7-context.c:677 camel/camel-smime-context.c:627
 msgid "Failed to decrypt: Unknown"
 msgstr "Klarte ikke å dekryptere: Ukjent"
 
@@ -3853,19 +3848,19 @@ msgstr ""
 "Kan ikke opprette katalog %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:348
+#: camel/camel-smime-context.c:344
 msgid "Could not sign: failed to create content info."
 msgstr "Kan ikke signere: klarte ikke å opprette innholdsinformasjon."
 
-#: camel/camel-smime-context.c:355
+#: camel/camel-smime-context.c:351
 msgid "Could not sign: failed to create signing context."
 msgstr "Kunne ikke signere: klarte ikke å opprette signeringskontekst."
 
-#: camel/camel-smime-context.c:361
+#: camel/camel-smime-context.c:357
 msgid "Could not sign: failed to create signature."
 msgstr "Kunne ikke signere: klarte ikke å opprette signatur."
 
-#: camel/camel-smime-context.c:388
+#: camel/camel-smime-context.c:384
 msgid "'clearsign' is not supported by S/MIME."
 msgstr "'klarsignering' er ikke støttet av dette S/MIME."
 
@@ -4926,7 +4921,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:121
+#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:122
 msgid "attachment"
 msgstr "vedlegg"
 
@@ -5004,7 +4999,7 @@ msgstr ""
 "Vil du bruke standard skisse-mappe?"
 
 #: composer/e-msg-composer.c:870 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:206
+#: shell/e-shell-view-menu.c:224
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -5886,30 +5881,35 @@ msgstr "Rediger regel"
 msgid "Score Rules"
 msgstr "Poengregler"
 
-#: importers/elm-importer.c:437 importers/netscape-importer.c:784
-#: importers/pine-importer.c:648 shell/e-shell-importer.c:655
+#: importers/elm-importer.c:512 importers/netscape-importer.c:780
+#: importers/pine-importer.c:646 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
+#: importers/elm-importer.c:517 importers/netscape-importer.c:785
+#: importers/pine-importer.c:651
 msgid "Mail"
 msgstr "E-post"
 
-#: importers/elm-importer.c:446
+#: importers/elm-importer.c:521
 msgid "Elm Aliases"
 msgstr "Elm alias"
 
-#: importers/elm-importer.c:474
+#: importers/elm-importer.c:528 importers/netscape-importer.c:807
+#: importers/pine-importer.c:668
+msgid "Don't ask me again"
+msgstr "Ikke spør meg igjen"
+
+#: importers/elm-importer.c:561
 msgid ""
-"Evolution has found Elm mail files in ~/Mail.\n"
+"Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
 msgstr ""
-"Evolution har funnet Elm e-post filer i ~/Mail.\n"
+"Evolution har funnet Elm e-post filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: importers/elm-importer.c:490
+#: importers/elm-importer.c:579
 msgid "Elm mail"
 msgstr "Elm e-post"
 
@@ -5921,23 +5921,19 @@ msgstr ""
 "Evolution har funnet GnomeCard filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: importers/netscape-importer.c:794 importers/pine-importer.c:658
+#: importers/netscape-importer.c:790 importers/pine-importer.c:656
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: importers/netscape-importer.c:799 mail/mail-callbacks.c:1464
+#: importers/netscape-importer.c:795 mail/mail-callbacks.c:1472
 msgid "Filters"
 msgstr "Filtre"
 
-#: importers/netscape-importer.c:804
+#: importers/netscape-importer.c:800
 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
+#: importers/netscape-importer.c:847
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -5945,11 +5941,11 @@ msgstr ""
 "Evolution har funnet Netscape e-post filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: importers/pine-importer.c:663
+#: importers/pine-importer.c:661
 msgid "Addressbook"
 msgstr "Adressebok"
 
-#: importers/pine-importer.c:707
+#: importers/pine-importer.c:705
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -5957,7 +5953,7 @@ msgstr ""
 "Evolution har funnet Pine e-post filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: importers/pine-importer.c:725
+#: importers/pine-importer.c:723
 msgid "Pine mail"
 msgstr "Pine e-post"
 
@@ -5969,89 +5965,89 @@ msgstr "Kan ikke initiere Evolutions e-postkomponent."
 msgid "Cannot register storage with shell"
 msgstr "Kan ikke registrere lagring i skallet"
 
-#: mail/folder-browser.c:271
+#: mail/folder-browser.c:270
 msgid "Store search as vFolder"
 msgstr "Lagre søk som vMappe"
 
-#: mail/folder-browser.c:588 ui/evolution-mail.xml.h:95
+#: mail/folder-browser.c:594
 msgid "VFolder on _Subject"
 msgstr "VFolder på e_mne"
 
-#: mail/folder-browser.c:591 ui/evolution-mail.xml.h:93
+#: mail/folder-browser.c:597
 msgid "VFolder on Se_nder"
 msgstr "VFolder for se_nder"
 
-#: mail/folder-browser.c:594 ui/evolution-mail.xml.h:94
+#: mail/folder-browser.c:600
 msgid "VFolder on _Recipients"
 msgstr "VFolder for mottake_re"
 
-#: mail/folder-browser.c:597 ui/evolution-mail.xml.h:92
+#: mail/folder-browser.c:603
 msgid "VFolder on Mailing _List"
 msgstr "VFolder på e-post_liste"
 
-#: mail/folder-browser.c:603
+#: mail/folder-browser.c:609
 msgid "Filter on Sub_ject"
 msgstr "Filtrer på em_ne"
 
-#: mail/folder-browser.c:606
+#: mail/folder-browser.c:612
 msgid "Filter on Sen_der"
 msgstr "Filtrer på sen_der"
 
-#: mail/folder-browser.c:609
+#: mail/folder-browser.c:615
 msgid "Filter on Re_cipients"
 msgstr "Filtrer på motta_ker"
 
-#: mail/folder-browser.c:612
+#: mail/folder-browser.c:618
 msgid "Filter on _Mailing List"
 msgstr "Filtrer på e-_postliste"
 
-#: mail/folder-browser.c:621
+#: mail/folder-browser.c:627
 msgid "_Open"
 msgstr "_Åpne"
 
-#: mail/folder-browser.c:623
+#: mail/folder-browser.c:629
 msgid "Resend"
 msgstr "Send på nytt"
 
-#: mail/folder-browser.c:625 ui/evolution-calendar.xml.h:43
-#: ui/evolution-mail.xml.h:114 ui/evolution-tasks.xml.h:8
+#: mail/folder-browser.c:631 ui/evolution-calendar.xml.h:43
+#: ui/evolution-mail.xml.h:118 ui/evolution-tasks.xml.h:8
 msgid "_Save As..."
 msgstr "Lagre _som..."
 
-#: mail/folder-browser.c:627 ui/evolution-event-editor.xml.h:69
+#: mail/folder-browser.c:633 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:632
+#: mail/folder-browser.c:638 ui/evolution-mail.xml.h:117
 msgid "_Reply to Sender"
 msgstr "Sva_r til sender"
 
-#: mail/folder-browser.c:634 ui/evolution-mail.xml.h:70
+#: mail/folder-browser.c:640 ui/evolution-mail.xml.h:72
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/folder-browser.c:636 ui/evolution-mail.xml.h:105
+#: mail/folder-browser.c:642
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: mail/folder-browser.c:639 ui/evolution-mail.xml.h:44
+#: mail/folder-browser.c:645
 msgid "Mar_k as Read"
 msgstr "Mer_k som lest"
 
-#: mail/folder-browser.c:641 ui/evolution-mail.xml.h:48
+#: mail/folder-browser.c:647
 msgid "Mark as U_nread"
 msgstr "Merk som u_lest"
 
-#: mail/folder-browser.c:646 ui/evolution-mail.xml.h:109
+#: mail/folder-browser.c:652
 msgid "_Move to Folder..."
 msgstr "F_lytt til mappe..."
 
-#: mail/folder-browser.c:648 ui/evolution-mail.xml.h:99
+#: mail/folder-browser.c:654
 msgid "_Copy to Folder..."
 msgstr "_Kopier til mappe..."
 
-#: mail/folder-browser.c:652 ui/evolution-mail.xml.h:119
+#: mail/folder-browser.c:658 ui/evolution-mail.xml.h:121
 msgid "_Undelete"
 msgstr "A_ngre slett"
 
@@ -6059,38 +6055,38 @@ msgstr "A_ngre slett"
 #. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
 #. { "",                               NULL,
 #. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:662 ui/evolution-mail.xml.h:1
+#: mail/folder-browser.c:668
 msgid "Apply Filters"
 msgstr "Påfør filtre"
 
-#: mail/folder-browser.c:666
+#: mail/folder-browser.c:672
 msgid "Create Ru_le From Message"
 msgstr "Lage rege_l fra melding"
 
-#: mail/folder-browser.c:805
+#: mail/folder-browser.c:811
 msgid "Filter on Mailing List"
 msgstr "Filtrer etter e-postliste"
 
-#: mail/folder-browser.c:806
+#: mail/folder-browser.c:812
 msgid "VFolder on Mailing List"
 msgstr "VFolder på e-postliste"
 
-#: mail/folder-browser.c:808
+#: mail/folder-browser.c:814
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrer etter e-postliste (%s)"
 
-#: mail/folder-browser.c:809
+#: mail/folder-browser.c:815
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VFolder på e-postliste (%s)"
 
-#: mail/folder-browser-factory.c:216
+#: mail/folder-browser-factory.c:196
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Egenskaper for \"%s\""
 
-#: mail/folder-browser-factory.c:218 ui/evolution-event-editor.xml.h:39
+#: mail/folder-browser-factory.c:198 ui/evolution-event-editor.xml.h:39
 #: ui/evolution-task-editor-dialog.xml.h:42
 msgid "Properties"
 msgstr "Egenskaper"
@@ -6334,11 +6330,11 @@ msgstr "Er du sikker på at du vil sende alle %d meldingene på nytt?"
 msgid "No Message Selected"
 msgstr "Ingen melding valgt"
 
-#: mail/mail-callbacks.c:1245 mail/mail-display.c:91
+#: mail/mail-callbacks.c:1253 mail/mail-display.c:92
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
-#: mail/mail-callbacks.c:1249 mail/mail-display.c:95
+#: mail/mail-callbacks.c:1257 mail/mail-display.c:96
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -6346,15 +6342,15 @@ msgstr ""
 "En fil med samme navn eksisterer allerede.\n"
 "Overskriv den?"
 
-#: mail/mail-callbacks.c:1293
+#: mail/mail-callbacks.c:1301
 msgid "Save Message As..."
 msgstr "Lagre melding som..."
 
-#: mail/mail-callbacks.c:1295
+#: mail/mail-callbacks.c:1303
 msgid "Save Messages As..."
 msgstr "Lagre meldinger som..."
 
-#: mail/mail-callbacks.c:1454
+#: mail/mail-callbacks.c:1462
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6363,15 +6359,15 @@ msgstr ""
 "Feil under lasting av filter-informasjon:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1512 ui/evolution-mail.xml.h:60
+#: mail/mail-callbacks.c:1520
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/mail-callbacks.c:1559
+#: mail/mail-callbacks.c:1567
 msgid "Printing of message failed"
 msgstr "Feil under utskrift av melding"
 
-#: mail/mail-callbacks.c:1654
+#: mail/mail-callbacks.c:1662
 #, 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?"
@@ -6685,58 +6681,58 @@ msgstr ""
 
 #: 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
+#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:33
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: mail/mail-display.c:195
+#: mail/mail-display.c:196
 msgid "Save Attachment"
 msgstr "Lagre vedlegg"
 
-#: mail/mail-display.c:235
+#: mail/mail-display.c:236
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kunne ikke opprette midlertidig katalog: %s"
 
-#: mail/mail-display.c:296
+#: mail/mail-display.c:297
 msgid "Save to Disk..."
 msgstr "Lagre til disk..."
 
-#: mail/mail-display.c:298
+#: mail/mail-display.c:299
 #, c-format
 msgid "Open in %s..."
 msgstr "Åpne i %s..."
 
-#: mail/mail-display.c:300
+#: mail/mail-display.c:301
 msgid "View Inline"
 msgstr "Vis \"inline\""
 
-#: mail/mail-display.c:335
+#: mail/mail-display.c:336
 msgid "External Viewer"
 msgstr "Ekstern visning"
 
-#: mail/mail-display.c:358
+#: mail/mail-display.c:359
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Vis \"inline\" (via %s)"
 
-#: mail/mail-display.c:362
+#: mail/mail-display.c:363
 msgid "Hide"
 msgstr "Skjul"
 
-#: mail/mail-display.c:960
+#: mail/mail-display.c:962
 msgid "Loading message content"
 msgstr "Laster meldingsinnhold"
 
-#: mail/mail-display.c:1239
+#: mail/mail-display.c:1253
 msgid "Open link in browser"
 msgstr "Åpne lenke i nettleser"
 
-#: mail/mail-display.c:1241
+#: mail/mail-display.c:1255
 msgid "Save as (FIXME)"
 msgstr "Lagre som"
 
-#: mail/mail-display.c:1243
+#: mail/mail-display.c:1257
 msgid "Copy location (FIXME)"
 msgstr "Kopier lokasjon"
 
@@ -7008,27 +7004,27 @@ msgstr "Kan ikke skrive data: %s"
 msgid "Disconnecting from %s"
 msgstr "Kobler fra %s"
 
-#: mail/mail-search.c:194 mail/mail-search.c:246
+#: mail/mail-search.c:138
 msgid "(Untitled Message)"
 msgstr "(Melding uten tittel)"
 
-#: mail/mail-search.c:240
+#: mail/mail-search.c:268
 msgid "Find in Message"
 msgstr "Finn i melding"
 
-#: mail/mail-search.c:282
+#: mail/mail-search.c:298
 msgid "Case Sensitive"
 msgstr "Skill mellom store/små bokstaver"
 
-#: mail/mail-search.c:283
+#: mail/mail-search.c:299
 msgid "Search Forward"
 msgstr "Søk fremover"
 
-#: mail/mail-search.c:298
+#: mail/mail-search.c:316
 msgid "Find:"
 msgstr "Finn:"
 
-#: mail/mail-search.c:302
+#: mail/mail-search.c:319
 msgid "Matches:"
 msgstr "Treff:"
 
@@ -7114,54 +7110,54 @@ msgstr "Ny VFolder"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/message-browser.c:189 ui/evolution-mail.xml.h:68
+#: mail/message-browser.c:188 ui/evolution-mail.xml.h:70
 msgid "Reply"
 msgstr "Svar"
 
-#: mail/message-browser.c:189 ui/evolution-mail.xml.h:74
+#: mail/message-browser.c:188
 msgid "Reply to the sender of this message"
 msgstr "Svar til avsender av denne meldingen"
 
-#: mail/message-browser.c:192 ui/evolution-mail.xml.h:69
+#: mail/message-browser.c:191 ui/evolution-mail.xml.h:71
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: mail/message-browser.c:192 ui/evolution-mail.xml.h:72
+#: mail/message-browser.c:191
 msgid "Reply to all recipients of this message"
 msgstr "Svar til alle mottakere av denne meldingen"
 
-#: mail/message-browser.c:195 ui/evolution-mail.xml.h:25
+#: mail/message-browser.c:194 ui/evolution-mail.xml.h:33
 msgid "Forward"
 msgstr "Videresend"
 
-#: mail/message-browser.c:195 ui/evolution-mail.xml.h:32
+#: mail/message-browser.c:194
 msgid "Forward this message"
 msgstr "Videresend denne meldingen"
 
-#: mail/message-browser.c:200 ui/evolution-mail.xml.h:65
+#: mail/message-browser.c:199
 msgid "Print the selected message"
 msgstr "Skriv ut den valgte meldingen"
 
-#: mail/message-browser.c:203 ui/evolution-mail.xml.h:13
+#: mail/message-browser.c:202
 msgid "Delete this message"
 msgstr "Slett denne meldingen"
 
-#: 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
+#: mail/message-browser.c:207 ui/evolution-event-editor.xml.h:33
+#: ui/evolution-mail.xml.h:64 ui/evolution-task-editor-dialog.xml.h:36
 msgid "Previous"
 msgstr "Forrige"
 
-#: mail/message-browser.c:208
+#: mail/message-browser.c:207
 msgid "Previous message"
 msgstr "Forrige melding"
 
-#: mail/message-browser.c:211 ui/evolution-calendar.xml.h:18
-#: ui/evolution-event-editor.xml.h:29 ui/evolution-mail.xml.h:54
+#: mail/message-browser.c:210 ui/evolution-calendar.xml.h:18
+#: ui/evolution-event-editor.xml.h:29 ui/evolution-mail.xml.h:57
 #: ui/evolution-task-editor-dialog.xml.h:32
 msgid "Next"
 msgstr "Neste"
 
-#: mail/message-browser.c:211
+#: mail/message-browser.c:210
 msgid "Next message"
 msgstr "Neste melding"
 
@@ -7523,19 +7519,19 @@ msgstr "%s - Evolution %s"
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution - %s [%s]"
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-view-menu.c:175
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy ble ikke funnet i din $PATH."
 
-#: shell/e-shell-view-menu.c:179
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy kunne ikke kjøres."
 
-#: shell/e-shell-view-menu.c:208
+#: shell/e-shell-view-menu.c:226
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:210
+#: shell/e-shell-view-menu.c:228
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -7545,15 +7541,15 @@ msgstr ""
 "for e-post, kalender og kontaktdatabaser for\n"
 "GNOME skrivebordsmiljøet."
 
-#: shell/e-shell-view-menu.c:374
+#: shell/e-shell-view-menu.c:392
 msgid "Go to folder..."
 msgstr "Gå til mappe..."
 
-#: shell/e-shell-view-menu.c:562
+#: shell/e-shell-view-menu.c:576
 msgid "Work online"
 msgstr "Arbeid \"online\""
 
-#: shell/e-shell-view-menu.c:574 shell/e-shell-view-menu.c:586
+#: shell/e-shell-view-menu.c:588 shell/e-shell-view-menu.c:600
 msgid "Work offline"
 msgstr "Arbeid \"offline\""
 
@@ -7806,7 +7802,7 @@ msgstr "Finn en kontakt"
 msgid "New contact"
 msgstr "Ny kontakt"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:57
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:63
 msgid "Previews the message to be printed"
 msgstr "Viser forhåndsvisning av meldingen som skal skrives ut"
 
@@ -7814,7 +7810,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:88
+#: ui/evolution-addressbook.xml.h:12
 msgid "Stop"
 msgstr "Stopp"
 
@@ -7848,8 +7844,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:118
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:45
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-task-editor-dialog.xml.h:88
+#: ui/evolution.xml.h:46
 msgid "_Tools"
 msgstr "_Verktøy"
 
@@ -7983,7 +7979,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:41
+#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:42
 msgid "_New"
 msgstr "_Ny"
 
@@ -8017,7 +8013,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:66 ui/evolution-task-editor-dialog.xml.h:41
+#: ui/evolution-task-editor-dialog.xml.h:41
 msgid "Print..."
 msgstr "Skriv ut..."
 
@@ -8050,7 +8046,7 @@ 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:43 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:33
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:34
 msgid "_File"
 msgstr "_Fil"
 
@@ -8104,7 +8100,7 @@ msgstr "Lukk denne avtalen"
 msgid "Cop_y to Folder... (FIXME)"
 msgstr "Kop_ier til mappe..."
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
+#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:8
 #: ui/evolution-task-editor-dialog.xml.h:14
 msgid "Copy"
 msgstr "Kopier"
@@ -8211,8 +8207,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:78
-#: ui/evolution-task-editor-dialog.xml.h:57
+#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
 msgid "Select All"
 msgstr "Velg alle"
 
@@ -8233,12 +8228,12 @@ msgid "_About..."
 msgstr "_Om..."
 
 #: 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
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:31
 msgid "_Close"
 msgstr "L_ukk"
 
 #: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:32
 msgid "_Contact (FIXME)"
 msgstr "_Kontakt"
 
@@ -8252,7 +8247,7 @@ msgid "_Debug"
 msgstr "_Feilsøk"
 
 #: 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
+#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:38
 msgid "_Help"
 msgstr "_Hjelp"
 
@@ -8284,7 +8279,7 @@ msgstr "_Notis"
 msgid "_Paste"
 msgstr "_Lim inn"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:111
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:115
 #: ui/evolution-task-editor-dialog.xml.h:83
 msgid "_Properties..."
 msgstr "Egenska_per..."
@@ -8294,7 +8289,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:44
+#: ui/evolution.xml.h:45
 msgid "_Task (FIXME)"
 msgstr "_Oppgave"
 
@@ -8303,7 +8298,7 @@ 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
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:47
 msgid "_View"
 msgstr "_Vis"
 
@@ -8327,29 +8322,33 @@ msgstr "Innstillinger for sammendrag..."
 msgid "New Mail"
 msgstr "Ny melding"
 
+#: ui/evolution-mail.xml.h:1
+msgid "Apply filter rules to the selected messages"
+msgstr "Aktiver filterregler på de valgte meldingene"
+
 #: ui/evolution-mail.xml.h:2
-msgid "Apply any new filters to the mail in this box"
-msgstr "Bruk alle nye filtre på meldinger i denne mappen"
+msgid "Cancel"
+msgstr "Avbryt"
 
 #: ui/evolution-mail.xml.h:3
+msgid "Cancel the current mail operation"
+msgstr "Avbryt aktiv e-postoperasjon"
+
+#: ui/evolution-mail.xml.h:4
 msgid "Change the properties of this folder"
 msgstr "Endre egenskaper for denne mappen"
 
-#: ui/evolution-mail.xml.h:4
+#: ui/evolution-mail.xml.h:5
 msgid "Compose"
 msgstr "Skriv"
 
-#: ui/evolution-mail.xml.h:5
-msgid "Compose a new message"
-msgstr "Komponer en ny melding"
-
 #: ui/evolution-mail.xml.h:6
-msgid "Configure Folder..."
-msgstr "Konfigurer mappe..."
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "Skriv et svar til alle mottakere av den valgte meldingen"
 
-#: ui/evolution-mail.xml.h:8
-msgid "Copy message to a new folder"
-msgstr "Kopier meldingen til en ny mappe"
+#: ui/evolution-mail.xml.h:7
+msgid "Compose a reply to the sender of the selected message"
+msgstr "Skriv et svar til avsender av den valgte meldingen"
 
 #: ui/evolution-mail.xml.h:9
 msgid "Copy selected messages to another folder"
@@ -8359,310 +8358,411 @@ msgstr "Kopier valgte meldinger til en annen mappe"
 msgid "Create _Virtual Folder From Message"
 msgstr "Lage _virtuell mappe fra melding"
 
+#: ui/evolution-mail.xml.h:11
+msgid "Create a rule to filter messages from this sender"
+msgstr ""
+
 #: ui/evolution-mail.xml.h:12
-msgid "Delete the selected messages"
-msgstr "Slett de valgte meldingene"
+msgid "Create a rule to filter messages to these recipients"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:13
+msgid "Create a rule to filter messages to this mailing list"
+msgstr ""
 
 #: ui/evolution-mail.xml.h:14
-msgid "Display all of the message headers"
-msgstr "Vis komplette meldingshoder"
+msgid "Create a rule to filter messages with this subject"
+msgstr "Lag en regel for filtrering av meldinger med dette emnet"
 
 #: ui/evolution-mail.xml.h:15
-msgid "Edit Message"
-msgstr "Rediger melding"
+msgid "Create a virtual folder for these recipients"
+msgstr "Lag en virtuell mappe for disse mottakerene"
 
 #: ui/evolution-mail.xml.h:16
-msgid "Edit the current message"
-msgstr "Rediger aktiv melding"
+msgid "Create a virtual folder for this mailing list"
+msgstr "Lag en virtuell mappe for denne e-postlisten"
 
 #: ui/evolution-mail.xml.h:17
-msgid "Empty _Trash"
-msgstr "_Tøm søppelkurven"
+msgid "Create a virtual folder for this sender"
+msgstr "Lag en virtuell mappe for denne avsenderen"
 
 #: ui/evolution-mail.xml.h:18
-msgid "Expunge"
-msgstr "Tøm"
+msgid "Create a virtual folder for this subject"
+msgstr "Lag en virtuell mappe for dette emnet"
 
 #: ui/evolution-mail.xml.h:19
-msgid "Filter on Mailing _List"
-msgstr "Filtrer etter e-post_liste"
+msgid "Create or edit mail accounts and other preferences"
+msgstr "Opprett eller rediger e-post kontoer og andre brukervalg"
 
 #: ui/evolution-mail.xml.h:20
-msgid "Filter on Se_nder"
-msgstr "Filtrer etter se_nder"
+msgid "Create or edit rules for filtering new mail"
+msgstr "Opprett eller rediger regler for filtrering av ny e-post"
 
 #: ui/evolution-mail.xml.h:21
-msgid "Filter on _Recipients"
-msgstr "Filtrer på mottake_re"
-
-#: ui/evolution-mail.xml.h:22
-msgid "Filter on _Subject"
-msgstr "Filtrer på e_mne"
+msgid "Create or edit virtual folder definitions"
+msgstr "Opprett eller rediger definisjoner av virtuelle mapper"
 
 #: ui/evolution-mail.xml.h:23
-msgid "Finaly remove all mails tagged for deletion"
-msgstr "Fjern alle meldinger som er merket for sletting"
+msgid "Display the next message"
+msgstr "Vis neste melding"
 
 #: ui/evolution-mail.xml.h:24
-msgid "Forget _Passwords"
-msgstr "Glem _passord"
+msgid "Display the previous message"
+msgstr "Vis forrige melding"
+
+#: ui/evolution-mail.xml.h:25
+msgid "Empty _Trash"
+msgstr "_Tøm søppelkurven"
 
 #: ui/evolution-mail.xml.h:26
-msgid "Forward As"
-msgstr "Videresend som"
+msgid "Filter on Mailing _List"
+msgstr "Filtrer etter e-post_liste"
 
 #: ui/evolution-mail.xml.h:27
-msgid "Forward attached"
-msgstr "Videresend som vedlegg"
+msgid "Filter on Se_nder"
+msgstr "Filtrer etter se_nder"
 
 #: ui/evolution-mail.xml.h:28
-msgid "Forward inline"
-msgstr "Videresend \"inline\""
+msgid "Filter on _Recipients"
+msgstr "Filtrer på mottake_re"
 
 #: ui/evolution-mail.xml.h:29
-msgid "Forward quoted"
-msgstr "Videresend sitert"
+msgid "Filter on _Subject"
+msgstr "Filtrer på e_mne"
 
 #: ui/evolution-mail.xml.h:30
-msgid "Forward the selected mail to someone"
-msgstr "Videresend den valgte meldingen til noen"
+msgid "Force images in HTML mail to be loaded"
+msgstr ""
 
 #: 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"
+msgid "Forget _Passwords"
+msgstr "Glem _passord"
 
-#: ui/evolution-mail.xml.h:33
-msgid "Forward this message in-line with your mail, so you can edit it"
+#: ui/evolution-mail.xml.h:32
+msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
-"Videresend denne meldingen \"in-line\" med din e-post, så du kan redigere den"
 
 #: ui/evolution-mail.xml.h:34
-msgid "Forward this message quoted like a reply"
-msgstr "Videresend denne meldingen som et svar"
+msgid "Forward As"
+msgstr "Videresend som"
 
 #: ui/evolution-mail.xml.h:35
-msgid "Full _Headers"
-msgstr "Fulle _headere"
+msgid "Forward _Attached"
+msgstr "Videresend vedl_agt"
 
 #: ui/evolution-mail.xml.h:36
-msgid "Go to the next message"
-msgstr "Gå til neste melding"
+msgid "Forward _Inline"
+msgstr "Videresend \"_inline\""
 
 #: ui/evolution-mail.xml.h:37
-msgid "Go to the previous message"
-msgstr "Gå til forrige melding"
+msgid "Forward _Quoted"
+msgstr "Videresend si_tert"
 
 #: ui/evolution-mail.xml.h:38
-msgid "Hide Deleted Messages"
-msgstr "Skjul slettede meldinger"
+msgid "Forward the selected message in the body of a new message"
+msgstr "Videresend den valgte meldingen i kroppen av en ny melding"
 
 #: ui/evolution-mail.xml.h:39
+msgid "Forward the selected message quoted like a reply"
+msgstr "Videresend den valgte meldingen sitert som et svar"
+
+#: ui/evolution-mail.xml.h:40
+msgid "Forward the selected message to someone"
+msgstr "Videresend den valgte meldingen til noen"
+
+#: ui/evolution-mail.xml.h:41
+msgid "Forward the selected message to someone as an attachment"
+msgstr "Videresend den valgte meldingen til noen som et vedlegg"
+
+#: ui/evolution-mail.xml.h:42
 msgid "Hide S_elected Messages"
 msgstr "Skjul valgt_e meldinger"
 
-#: ui/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:43
 msgid "Hide _Deleted Messages"
 msgstr "Skjul slette_de meldinger"
 
-#: ui/evolution-mail.xml.h:41
+#: ui/evolution-mail.xml.h:44
 msgid "Hide _Read messages"
 msgstr "Skjul le_ste meldinger"
 
-#: ui/evolution-mail.xml.h:42
-msgid "Invert Selection"
-msgstr "Reverser utvalg"
+#: ui/evolution-mail.xml.h:45
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:46
+msgid "Load _Images"
+msgstr "Last b_ilder"
+
+#: ui/evolution-mail.xml.h:47
 msgid "Manage _Subscriptions..."
 msgstr "_Håndter abonnement..."
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:48
+msgid "Mar_k As Read"
+msgstr "Mer_k som lest"
+
+#: ui/evolution-mail.xml.h:49
 msgid "Mark All as R_ead"
 msgstr "Merk alle som l_est"
 
-#: ui/evolution-mail.xml.h:46
-msgid "Mark As Read"
-msgstr "Merk som lest"
-
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:50
 msgid "Mark As U_nread"
 msgstr "Merk som _ulest"
 
-#: ui/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:51
+msgid "Mark all visible messages as read"
+msgstr "Merk alle synlige meldinger som lest"
+
+#: ui/evolution-mail.xml.h:52
 msgid "Mark the selected messages as having been read"
 msgstr "Merk valgte meldinger som lest"
 
-#: ui/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:53
 msgid "Mark the selected messages as not having been read"
 msgstr "Merk valgte meldinger som ikke lest"
 
-#: ui/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:54
+msgid "Mark the selected messages for deletion"
+msgstr "Merk valgte meldinger for sletting"
+
+#: ui/evolution-mail.xml.h:55
 msgid "Move"
 msgstr "Flytt"
 
-#: 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:53
+#: ui/evolution-mail.xml.h:56
 msgid "Move selected messages to another folder"
 msgstr "Flytt valgte meldinger til en annen mappe"
 
-#: ui/evolution-mail.xml.h:55
-msgid "Open in New Window"
-msgstr "Åpne i nytt vindu"
+#: ui/evolution-mail.xml.h:58
+msgid "Open a window for composing a mail message"
+msgstr ""
 
-#: 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:59
+msgid "Open the selected message in a new window"
+msgstr "Åpne valgt melding i et nytt vindu"
 
-#: ui/evolution-mail.xml.h:62
-msgid "Print Preview of message..."
-msgstr "Vis forhåndsvisning av melding..."
+#: ui/evolution-mail.xml.h:60
+#, fuzzy
+msgid "Open the selected message in the composer to re-send it"
+msgstr "Merk valgte meldinger som lest"
 
-#: ui/evolution-mail.xml.h:63
-msgid "Print message to the printer"
-msgstr "Skriv ut denne meldingen på skriveren"
+#: ui/evolution-mail.xml.h:61
+#, fuzzy
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "Flytt valgte meldinger til en annen mappe"
+
+#: ui/evolution-mail.xml.h:62
+#, fuzzy
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Flytt valgte meldinger til en annen mappe"
 
-#: ui/evolution-mail.xml.h:64
-msgid "Print message..."
+#: ui/evolution-mail.xml.h:66
+msgid "Print Message..."
 msgstr "Skriv ut melding..."
 
 #: ui/evolution-mail.xml.h:67
+msgid "Print Preview..."
+msgstr "Forhåndsvisning av utskrift"
+
+#: ui/evolution-mail.xml.h:68
+msgid "Print message to the printer"
+msgstr "Skriv ut denne meldingen på skriveren"
+
+#: ui/evolution-mail.xml.h:69
 msgid "Redirect (FIXME: implement me)"
 msgstr "Omdiriger"
 
-#: ui/evolution-mail.xml.h:71
-msgid "Reply to all"
-msgstr "Svar til alle"
-
 #: ui/evolution-mail.xml.h:73
-msgid "Reply to sender"
-msgstr "Svar til sender"
-
-#: 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:74
+msgid "Save the message as a text file"
+msgstr "Lagre meldingen som en tekstfil"
 
-#: 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:75
+msgid "Search for text in the body of the displayed message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:79 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:76 ui/evolution-subscribe.xml.h:7
 msgid "Select _All"
 msgstr "Velg _alle"
 
-#: ui/evolution-mail.xml.h:80
+#: ui/evolution-mail.xml.h:77
 msgid "Select _Thread"
 msgstr "Velg _tråd"
 
+#: ui/evolution-mail.xml.h:78
+msgid "Select all and only the messages that are not currently selected"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:79
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:80
+msgid "Select all visible messages"
+msgstr "Velg alle synlige meldinger"
+
 #: ui/evolution-mail.xml.h:81
 msgid "Send / Receive"
 msgstr "Send / motta"
 
 #: 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"
+msgid "Send queued mail and retrieve new mail"
+msgstr "Send kølagt e-post og hent ny e-post"
 
 #: 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"
+msgid "Show Email _Source"
+msgstr "Vis e-post-kilde"
 
 #: ui/evolution-mail.xml.h:84
-msgid ""
-"Send queued mail\n"
-"    and retrieve new mail"
-msgstr ""
-"Send kølagt e-post\n"
-"    og hent ny e-post"
+msgid "Show Full _Headers"
+msgstr "Vis fulle _headere"
+
+#: ui/evolution-mail.xml.h:85
+msgid "Show _All"
+msgstr "Vis _alle"
 
 #: 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"
+msgid "Show message in the normal style"
+msgstr "Vis melding i normal stil"
 
 #: ui/evolution-mail.xml.h:87
-msgid "Show _All"
-msgstr "Vis _alle"
+#, fuzzy
+msgid "Show message with all email headers"
+msgstr "Se etter nye meldinger i alle mapper"
+
+#: ui/evolution-mail.xml.h:88
+msgid "Show messages that have been temporarily hidden"
+msgstr ""
 
 #: ui/evolution-mail.xml.h:89
+#, fuzzy
+msgid "Show the raw email source of the message"
+msgstr "Legg en fil ved meldingen"
+
+#: ui/evolution-mail.xml.h:90
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:91
+#, fuzzy
+msgid "Temporarily hide all messages that have already been read"
+msgstr "Merk valgte meldinger som lest"
+
+#: ui/evolution-mail.xml.h:92
+#, fuzzy
+msgid "Temporarily hide the selected messages"
+msgstr "Slett de valgte meldingene"
+
+#: ui/evolution-mail.xml.h:93
 msgid "Threaded Message list"
 msgstr "Meldingsliste med tråder"
 
-#: ui/evolution-mail.xml.h:90
+#: ui/evolution-mail.xml.h:94
 msgid "Un-delete the selected messages"
 msgstr "Angre slett av den valgte meldingen"
 
-#: ui/evolution-mail.xml.h:91
-msgid "Undelete"
-msgstr "Angre slett"
+#: ui/evolution-mail.xml.h:95
+#, fuzzy
+msgid "VFolder on Mailing _List..."
+msgstr "VFolder på e-post_liste"
 
 #: ui/evolution-mail.xml.h:96
-msgid "View Raw Message Source"
-msgstr "Vis rå meldingskode"
+#, fuzzy
+msgid "VFolder on Se_nder..."
+msgstr "VFolder for se_nder"
 
 #: ui/evolution-mail.xml.h:97
+#, fuzzy
+msgid "VFolder on _Recipients..."
+msgstr "VFolder for mottake_re"
+
+#: ui/evolution-mail.xml.h:98
+#, fuzzy
+msgid "VFolder on _Subject..."
+msgstr "VFolder på e_mne"
+
+#: ui/evolution-mail.xml.h:99
 msgid "Virtual Folder _Editor..."
 msgstr "R_edigering av virtuelle mapper..."
 
-#: ui/evolution-mail.xml.h:98
+#: ui/evolution-mail.xml.h:100
 msgid "_Apply Filters"
 msgstr "_Påfør filtre"
 
-#: ui/evolution-mail.xml.h:100
+#: ui/evolution-mail.xml.h:101
+msgid "_Copy to Folder"
+msgstr "_Kopier til mappe"
+
+#: ui/evolution-mail.xml.h:102
 msgid "_Create Filter From Message"
 msgstr "La_g filter fra melding"
 
-#: ui/evolution-mail.xml.h:102
+#: ui/evolution-mail.xml.h:104
 msgid "_Expunge"
 msgstr "_Tøm"
 
-#: ui/evolution-mail.xml.h:103
+#: ui/evolution-mail.xml.h:105
 msgid "_Filters..."
 msgstr "_Filtre..."
 
-#: ui/evolution-mail.xml.h:104 ui/evolution.xml.h:34
+#: ui/evolution-mail.xml.h:106 ui/evolution.xml.h:35
 msgid "_Folder"
 msgstr "_Mappe"
 
-#: ui/evolution-mail.xml.h:106 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:107
+#, fuzzy
+msgid "_Forward Message"
+msgstr "Videresend melding"
+
+#: ui/evolution-mail.xml.h:108 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "Re_verser utvalg"
 
-#: ui/evolution-mail.xml.h:107
+#: ui/evolution-mail.xml.h:109
 msgid "_Mail Message"
 msgstr "Send _melding"
 
-#: ui/evolution-mail.xml.h:108
+#: ui/evolution-mail.xml.h:110
 msgid "_Mail Settings..."
 msgstr "Innstillinger for e-post..."
 
-#: ui/evolution-mail.xml.h:110
-msgid "_Open Selected Items"
-msgstr "_Åpne valgte oppføringer"
+#: ui/evolution-mail.xml.h:111
+#, fuzzy
+msgid "_Message Display"
+msgstr "Mel_dingsvisning"
 
 #: ui/evolution-mail.xml.h:112
-msgid "_Reply"
-msgstr "Sva_r"
+msgid "_Move to Folder"
+msgstr "_Flytt til mappe"
 
 #: ui/evolution-mail.xml.h:113
-msgid "_Resend Messages"
-msgstr "Send meldinge_r på nytt"
+#, fuzzy
+msgid "_Normal Display"
+msgstr "_Vis"
 
-#: ui/evolution-mail.xml.h:115
-msgid "_Save Message As..."
-msgstr "Lagre melding _som..."
+#: ui/evolution-mail.xml.h:114
+#, fuzzy
+msgid "_Open Message"
+msgstr "Send meldinge_r på nytt"
 
 #: ui/evolution-mail.xml.h:116
+#, fuzzy
+msgid "_Re-send Message"
+msgstr "Send meldinge_r på nytt"
+
+#: ui/evolution-mail.xml.h:119
 msgid "_Send / Receive"
 msgstr "_Send / motta"
 
-#: ui/evolution-mail.xml.h:117
-msgid "_Threaded"
-msgstr "Med _tråder"
+#: ui/evolution-mail.xml.h:120
+#, fuzzy
+msgid "_Threaded Message List"
+msgstr "Meldingsliste med tråder"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
@@ -8905,7 +9005,7 @@ msgstr "Angre"
 msgid "Undo the last action"
 msgstr "Angre siste handling"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:29
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:30
 msgid "_Appointment (FIXME)"
 msgstr "_Avtale"
 
@@ -8966,114 +9066,119 @@ msgid "E_xit"
 msgstr "A_vslutt"
 
 #: ui/evolution.xml.h:9
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Evolution"
+
+#: ui/evolution.xml.h:10
 msgid "Evolution _Window"
 msgstr "Evolution vindu"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:11
 msgid "Evolution bar _shortcut"
 msgstr "Evolution-linje _snarvei"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:12
 msgid "Exit the program"
 msgstr "Avslutt programmet"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:13
 msgid "Getting _Started"
 msgstr "Kom _igang"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:14
 msgid "Import an external file format"
 msgstr "Importer et eksternt filformat"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:15
 msgid "Main toolbar"
 msgstr "Hovedverktøylinje"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:16
 msgid "Show information about Evolution"
 msgstr "Vis informasjon om Evolution"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:17
 msgid "Submit Bug Report"
 msgstr "Send inn feilrapport"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:18
 msgid "Submit _Bug Report"
 msgstr "Sen_d inn feilrapport"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Submit bug report using Bug Buddy."
 msgstr "Send inn feilrapport ved bruk av Bug Buddy."
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:20
 msgid "Toggle"
 msgstr "Bytt"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Toggle whether to show the folder bar"
 msgstr "Slå av/på visning av mappelinjen"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Slå av/på visning av snarveilinjen"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:23
 msgid "Toggle whether we are working offline."
 msgstr "Skift til \"offline\" arbeidsmodus."
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:24
 msgid "Using the C_ontact Manager"
 msgstr "Bruk av k_ontaktdatabasen"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "Using the _Calendar"
 msgstr "Bruk av _kalenderen"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "Using the _Mailer"
 msgstr "Bruk av e-_postprogrammet"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "Work Offline"
 msgstr "Arbeid \"offline\""
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_About Evolution..."
 msgstr "_Om Evolution..."
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:29
 msgid "_Actions"
 msgstr "H_andlinger"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:36
 msgid "_Folder Bar"
 msgstr "_Mappelinje"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:37
 msgid "_Go to Folder..."
 msgstr "_Gå til mappe..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:39
 msgid "_Import file..."
 msgstr "_Importer fil..."
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:40
 msgid "_Index"
 msgstr "_Indeks"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:41
 msgid "_Mail message"
 msgstr "Send _melding"
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:43
 msgid "_New Folder"
 msgstr "_Ny mappe"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:44
 msgid "_Shortcut Bar"
 msgstr "_Snarveilinje"
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:48
 msgid "_Work Offline"
 msgstr "Ar_beid \"offline\""
 
@@ -9297,8 +9402,101 @@ 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 ""
+#~ "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?"
+
+#~ msgid "Apply any new filters to the mail in this box"
+#~ msgstr "Bruk alle nye filtre på meldinger i denne mappen"
+
+#~ msgid "Compose a new message"
+#~ msgstr "Komponer en ny melding"
+
+#~ msgid "Configure Folder..."
+#~ msgstr "Konfigurer mappe..."
+
+#~ msgid "Copy message to a new folder"
+#~ msgstr "Kopier meldingen til en ny mappe"
+
+#~ msgid "Display all of the message headers"
+#~ msgstr "Vis komplette meldingshoder"
+
+#~ msgid "Edit Message"
+#~ msgstr "Rediger melding"
+
+#~ msgid "Edit the current message"
+#~ msgstr "Rediger aktiv melding"
+
+#~ msgid "Expunge"
+#~ msgstr "Tøm"
+
+#~ msgid "Finaly remove all mails tagged for deletion"
+#~ msgstr "Fjern alle meldinger som er merket for sletting"
+
+#~ msgid "Forward inline"
+#~ msgstr "Videresend \"inline\""
+
+#~ 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"
+
+#~ msgid "Hide Deleted Messages"
+#~ msgstr "Skjul slettede meldinger"
+
+#~ msgid "Invert Selection"
+#~ msgstr "Reverser utvalg"
+
+#~ msgid "Move message to a new folder"
+#~ msgstr "Flytt meldingen til en ny mappe"
+
+#~ msgid "Open in New Window"
+#~ msgstr "Åpne i nytt vindu"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "Vis forhåndsvisning av melding..."
+
+#~ msgid "Reply to all"
+#~ msgstr "Svar til alle"
+
+#~ msgid "Reply to sender"
+#~ msgstr "Svar til sender"
+
+#~ msgid "S_ource"
+#~ msgstr "K_ilde"
+
+#~ msgid "Send a reply to the person who sent you this mail"
+#~ msgstr "Send et svar til personen som sendte deg denne meldingen"
+
+#~ msgid "Send a single mail in reply to all the selected mail"
+#~ msgstr "Send en enkelt melding i svar til alle valgte meldinger"
+
+#~ msgid ""
+#~ "Send queued mail\n"
+#~ "    and retrieve new mail"
+#~ msgstr ""
+#~ "Send kølagt e-post\n"
+#~ "    og hent ny e-post"
+
+#~ msgid "Undelete"
+#~ msgstr "Angre slett"
+
+#~ msgid "View Raw Message Source"
+#~ msgstr "Vis rå meldingskode"
+
+#~ msgid "_Open Selected Items"
+#~ msgstr "_Åpne valgte oppføringer"
+
+#~ msgid "_Reply"
+#~ msgstr "Sva_r"
+
+#~ msgid "_Save Message As..."
+#~ msgstr "Lagre melding _som..."
+
+#~ msgid "_Threaded"
+#~ msgstr "Med _tråder"
 
 #~ msgid "Search \"%s\""
 #~ msgstr "Søk \"%s\""
@@ -9568,9 +9766,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "<unknown>"
 #~ msgstr "<ukjent>"
 
-#~ msgid "Message _Display"
-#~ msgstr "Mel_dingsvisning"
-
 #~ msgid "_Message Hiding"
 #~ msgstr "_Meldingsskjuling"
 
@@ -9974,9 +10169,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "_Audio"
 #~ msgstr "_Lyd"
 
-#~ msgid "_Display"
-#~ msgstr "_Vis"
-
 #~ msgid "_Mail"
 #~ msgstr "_E-post"
 
@@ -10014,9 +10206,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Send queue"
 #~ msgstr "Send kø"
 
-#~ msgid "Cancel"
-#~ msgstr "Avbryt"
-
 #~ msgid "Examining %s"
 #~ msgstr "Undersøker %s"
 
@@ -10202,24 +10391,15 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "News Sources"
 #~ msgstr "News-kilder"
 
-#~ msgid "Send messages in HTML format"
-#~ msgstr "Send meldinger i HTML-format"
-
 #~ msgid "No GPG/PGP support available in this copy of Evolution."
 #~ msgstr "Ingen GPG/PGP-støtte tilgjengelig i denne versjonen av Evolution."
 
 #~ msgid "Server Timeouts"
 #~ msgstr "Tidsavbrudd for tjener"
 
-#~ msgid "Mail Source"
-#~ msgstr "E-post-kilde"
-
 #~ msgid "Sending a message without a subject"
 #~ msgstr "Sender en melding uten emne"
 
-#~ msgid "Send a message without a subject"
-#~ msgstr "Send en melding uten emne"
-
 #~ msgid "Mark messages in folder \"%s\""
 #~ msgstr "Merk meldinger i mappe \"%s\""
 
@@ -10709,21 +10889,12 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Don't know protocol to open URI `%s'"
 #~ msgstr "Ingen protokoll for åpning av URI `%s'"
 
-#~ msgid "_Copy to Folder"
-#~ msgstr "_Kopier til mappe"
-
-#~ msgid "_Move to Folder"
-#~ msgstr "_Flytt til mappe"
-
 #~ msgid "Recur on the"
 #~ msgstr "Gjeninntreff den"
 
 #~ msgid "th day of the month"
 #~ msgstr "de dagen i måneden"
 
-#~ msgid "Forward Message"
-#~ msgstr "Videresend melding"
-
 #~ msgid "Copy Message"
 #~ msgstr "Kopier melding"