Updated Norwegian (bokmål) translation.

2001-10-18  Kjartan Maraas  <kmaraas@gnome.org>

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

svn path=/trunk/; revision=13754

3 files changed, 631 insertions, 492 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 428eec68aa..288e881716 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-18  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* no.po: Updated Norwegian (bokmål) translation.
+	
 2001-10-18  Wang Jian  <lark@linux.net.cn>
 
 	* zh_CN.po: Added Simplified Chinese translation by
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 71ad701c0c..495cee2afc 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -283,6 +283,7 @@ shell/e-storage-set-view.etspec
 shell/e-storage.c
 shell/e-summary-storage.c
 shell/e-task-widget.c
+shell/evolution-shell-component.c
 shell/evolution-shell-component-utils.c
 shell/glade/e-active-connection-dialog.glade
 shell/glade/e-shell-folder-creation-dialog.glade
@@ -325,6 +326,7 @@ widgets/misc/e-filter-bar.c
 widgets/misc/e-filter-bar.h
 widgets/misc/e-messagebox.c
 widgets/misc/e-search-bar.c
+wombat/GNOME_Evolution_Wombat.oaf.in
 wombat/GNOME_Evolution_WombatLDAP.oaf.in
 wombat/GNOME_Evolution_WombatNOLDAP.oaf.in
 wombat/wombat.c
diff --git a/po/no.po b/po/no.po
index 9f24047c3a..ceeaba8dab 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-applets 1.4.1\n"
-"POT-Creation-Date: 2001-10-13 13:18+0200\n"
-"PO-Revision-Date: 2001-10-13 13:20+0200\n"
+"POT-Creation-Date: 2001-10-18 19:17+0200\n"
+"PO-Revision-Date: 2001-10-18 19:23+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -143,7 +143,7 @@ msgstr "ISDN"
 #: addressbook/backend/ebook/e-card-simple.c:84
 #: addressbook/gui/contact-editor/e-contact-editor.c:1599
 #: addressbook/gui/contact-editor/e-contact-editor.c:1657
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 msgid "Other"
 msgstr "Andre"
 
@@ -301,11 +301,11 @@ msgstr "Kategorier"
 msgid "Family Name"
 msgstr "Etternavn"
 
-#: addressbook/backend/ebook/e-card.c:3620
+#: addressbook/backend/ebook/e-card.c:3713
 msgid "Card: "
 msgstr "Kort: "
 
-#: addressbook/backend/ebook/e-card.c:3622
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "Name: "
@@ -313,7 +313,7 @@ msgstr ""
 "\n"
 "Navn:"
 
-#: addressbook/backend/ebook/e-card.c:3623
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "  Prefix:     "
@@ -321,7 +321,7 @@ msgstr ""
 "\n"
 "Prefiks:    "
 
-#: addressbook/backend/ebook/e-card.c:3624
+#: addressbook/backend/ebook/e-card.c:3717
 msgid ""
 "\n"
 "  Given:      "
@@ -329,7 +329,7 @@ msgstr ""
 "\n"
 "Oppgitt:     "
 
-#: addressbook/backend/ebook/e-card.c:3625
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "  Additional: "
@@ -337,7 +337,7 @@ msgstr ""
 "\n"
 "Tillegg: "
 
-#: addressbook/backend/ebook/e-card.c:3626
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "  Family:     "
@@ -345,7 +345,7 @@ msgstr ""
 "\n"
 "Familie:    "
 
-#: addressbook/backend/ebook/e-card.c:3627
+#: addressbook/backend/ebook/e-card.c:3720
 msgid ""
 "\n"
 "  Suffix:     "
@@ -353,7 +353,7 @@ msgstr ""
 "\n"
 "Suffiks:    "
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3734
 msgid ""
 "\n"
 "Birth Date: "
@@ -361,7 +361,7 @@ msgstr ""
 "\n"
 "Fødselsdato: "
 
-#: addressbook/backend/ebook/e-card.c:3652
+#: addressbook/backend/ebook/e-card.c:3745
 msgid ""
 "\n"
 "Address:"
@@ -369,7 +369,7 @@ msgstr ""
 "\n"
 "Adresse:"
 
-#: addressbook/backend/ebook/e-card.c:3654
+#: addressbook/backend/ebook/e-card.c:3747
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -377,7 +377,7 @@ msgstr ""
 "\n"
 "Postboks:  "
 
-#: addressbook/backend/ebook/e-card.c:3655
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "  Ext:         "
@@ -385,7 +385,7 @@ msgstr ""
 "\n"
 "Linje:         "
 
-#: addressbook/backend/ebook/e-card.c:3656
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "  Street:      "
@@ -393,7 +393,7 @@ msgstr ""
 "\n"
 "Gate:     "
 
-#: addressbook/backend/ebook/e-card.c:3657
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  City:        "
@@ -401,7 +401,7 @@ msgstr ""
 "\n"
 "By:          "
 
-#: addressbook/backend/ebook/e-card.c:3658
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Region:      "
@@ -409,7 +409,7 @@ msgstr ""
 "\n"
 "Region:     "
 
-#: addressbook/backend/ebook/e-card.c:3659
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Postal Code: "
@@ -417,7 +417,7 @@ msgstr ""
 "\n"
 "Postnummer: "
 
-#: addressbook/backend/ebook/e-card.c:3660
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Country:     "
@@ -425,7 +425,7 @@ msgstr ""
 "\n"
 "Land:    "
 
-#: addressbook/backend/ebook/e-card.c:3673
+#: addressbook/backend/ebook/e-card.c:3766
 msgid ""
 "\n"
 "Delivery Label: "
@@ -433,7 +433,7 @@ msgstr ""
 "\n"
 "Leveringsetikett: "
 
-#: addressbook/backend/ebook/e-card.c:3685
+#: addressbook/backend/ebook/e-card.c:3778
 msgid ""
 "\n"
 "Telephones:\n"
@@ -441,7 +441,7 @@ msgstr ""
 "\n"
 "Telefoner:\n"
 
-#: addressbook/backend/ebook/e-card.c:3688
+#: addressbook/backend/ebook/e-card.c:3781
 msgid ""
 "\n"
 "Telephone:"
@@ -449,7 +449,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3712
+#: addressbook/backend/ebook/e-card.c:3805
 msgid ""
 "\n"
 "E-mail:\n"
@@ -457,7 +457,7 @@ msgstr ""
 "\n"
 "E-post:\n"
 
-#: addressbook/backend/ebook/e-card.c:3715
+#: addressbook/backend/ebook/e-card.c:3808
 msgid ""
 "\n"
 "E-mail:"
@@ -465,7 +465,7 @@ msgstr ""
 "\n"
 "E-post:"
 
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3827
 msgid ""
 "\n"
 "Mailer: "
@@ -473,7 +473,7 @@ msgstr ""
 "\n"
 "E-post program: "
 
-#: addressbook/backend/ebook/e-card.c:3740
+#: addressbook/backend/ebook/e-card.c:3833
 msgid ""
 "\n"
 "Time Zone: "
@@ -481,7 +481,7 @@ msgstr ""
 "\n"
 "Tidssone: "
 
-#: addressbook/backend/ebook/e-card.c:3748
+#: addressbook/backend/ebook/e-card.c:3841
 msgid ""
 "\n"
 "Geo Location: "
@@ -489,7 +489,7 @@ msgstr ""
 "\n"
 "Geografisk lokasjon: "
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3845
 msgid ""
 "\n"
 "Business Role: "
@@ -497,7 +497,7 @@ msgstr ""
 "\n"
 "Stilling: "
 
-#: addressbook/backend/ebook/e-card.c:3764
+#: addressbook/backend/ebook/e-card.c:3857
 msgid ""
 "\n"
 "Org: "
@@ -505,7 +505,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3765
+#: addressbook/backend/ebook/e-card.c:3858
 msgid ""
 "\n"
 "  Name:  "
@@ -513,7 +513,7 @@ msgstr ""
 "\n"
 "Navn:  "
 
-#: addressbook/backend/ebook/e-card.c:3766
+#: addressbook/backend/ebook/e-card.c:3859
 msgid ""
 "\n"
 "  Unit:  "
@@ -521,7 +521,7 @@ msgstr ""
 "\n"
 "Enhet:  "
 
-#: addressbook/backend/ebook/e-card.c:3767
+#: addressbook/backend/ebook/e-card.c:3860
 msgid ""
 "\n"
 "  Unit2: "
@@ -529,7 +529,7 @@ msgstr ""
 "\n"
 "Enhet2: "
 
-#: addressbook/backend/ebook/e-card.c:3768
+#: addressbook/backend/ebook/e-card.c:3861
 msgid ""
 "\n"
 "  Unit3: "
@@ -537,7 +537,7 @@ msgstr ""
 "\n"
 "Enhet3: "
 
-#: addressbook/backend/ebook/e-card.c:3769
+#: addressbook/backend/ebook/e-card.c:3862
 msgid ""
 "\n"
 "  Unit4: "
@@ -545,7 +545,7 @@ msgstr ""
 "\n"
 "Enhet4: "
 
-#: addressbook/backend/ebook/e-card.c:3773
+#: addressbook/backend/ebook/e-card.c:3866
 msgid ""
 "\n"
 "Categories: "
@@ -553,7 +553,7 @@ msgstr ""
 "\n"
 "Kategorier: "
 
-#: addressbook/backend/ebook/e-card.c:3774
+#: addressbook/backend/ebook/e-card.c:3867
 msgid ""
 "\n"
 "Comment: "
@@ -571,7 +571,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3787
+#: addressbook/backend/ebook/e-card.c:3880
 msgid ""
 "\n"
 "Unique String: "
@@ -579,7 +579,7 @@ msgstr ""
 "\n"
 "Unik streng: "
 
-#: addressbook/backend/ebook/e-card.c:3790
+#: addressbook/backend/ebook/e-card.c:3883
 msgid ""
 "\n"
 "Public Key: "
@@ -587,11 +587,11 @@ msgstr ""
 "\n"
 "Offentlig nøkkel: "
 
-#: addressbook/backend/ebook/e-card.c:4143
+#: addressbook/backend/ebook/e-card.c:4236
 msgid "Multiple VCards"
 msgstr "Flere VCard"
 
-#: addressbook/backend/ebook/e-card.c:4151
+#: addressbook/backend/ebook/e-card.c:4244
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard for %s"
@@ -600,25 +600,25 @@ msgstr "VCard for %s"
 #: 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:1169
+#: addressbook/conduit/address-conduit.c:1433
 #: addressbook/gui/component/addressbook-factory.c:49
-#: calendar/conduits/calendar/calendar-conduit.c:1266
-#: calendar/conduits/todo/todo-conduit.c:1034
+#: calendar/conduits/calendar/calendar-conduit.c:1384
+#: calendar/conduits/todo/todo-conduit.c:1064
 #: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initialisere Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:257
-#: addressbook/backend/pas/pas-backend-ldap.c:2047
+#: addressbook/backend/pas/pas-backend-file.c:259
+#: addressbook/backend/pas/pas-backend-ldap.c:2059
 msgid "Searching..."
 msgstr "Søker..."
 
-#: addressbook/backend/pas/pas-backend-file.c:259
+#: addressbook/backend/pas/pas-backend-file.c:261
 msgid "Loading..."
 msgstr "Laster..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:268
+#: addressbook/backend/pas/pas-backend-file.c:270
 msgid "Error in search expression."
 msgstr "Feil i søkeuttrykk."
 
@@ -638,44 +638,44 @@ msgstr "Venter på tilkobling til LDAP-tjener..."
 msgid "Adding card to LDAP server..."
 msgstr "Legger til kort på LDAP-tjener..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:959
+#: addressbook/backend/pas/pas-backend-ldap.c:963
 msgid "Removing card from LDAP server..."
 msgstr "Fjerner kort fra LDAP-tjener..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1064
+#: addressbook/backend/pas/pas-backend-ldap.c:1072
 msgid "Modifying card from LDAP server..."
 msgstr "Endrer kort fra LDAP-tjener..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1992
+#: addressbook/backend/pas/pas-backend-ldap.c:2004
 msgid "Receiving LDAP search results..."
 msgstr "Mottar søkeresultater fra LDAP-tjener..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1997
+#: addressbook/backend/pas/pas-backend-ldap.c:2009
 msgid "Restarting search."
 msgstr "Starter søk på nytt."
 
-#: addressbook/conduit/address-conduit.c:204
+#: addressbook/conduit/address-conduit.c:241
 msgid "Cursor could not be loaded\n"
 msgstr "Markøren kunne ikke lokaliseres\n"
 
-#: addressbook/conduit/address-conduit.c:217
+#: addressbook/conduit/address-conduit.c:254
 msgid "EBook not loaded\n"
 msgstr "EBook ikke lastet\n"
 
-#: addressbook/conduit/address-conduit.c:733
-#: calendar/conduits/calendar/calendar-conduit.c:841
-#: calendar/conduits/todo/todo-conduit.c:609
+#: addressbook/conduit/address-conduit.c:997
+#: calendar/conduits/calendar/calendar-conduit.c:940
+#: calendar/conduits/todo/todo-conduit.c:639
 msgid "Could not start wombat server"
 msgstr "Kunne ikke starte wombat tjener"
 
-#: addressbook/conduit/address-conduit.c:734
-#: calendar/conduits/calendar/calendar-conduit.c:842
-#: calendar/conduits/todo/todo-conduit.c:610
+#: addressbook/conduit/address-conduit.c:998
+#: calendar/conduits/calendar/calendar-conduit.c:941
+#: calendar/conduits/todo/todo-conduit.c:640
 msgid "Could not start wombat"
 msgstr "Kunne ikke starte wombat"
 
-#: addressbook/conduit/address-conduit.c:764
-#: addressbook/conduit/address-conduit.c:767
+#: addressbook/conduit/address-conduit.c:1028
+#: addressbook/conduit/address-conduit.c:1031
 msgid "Could not read pilot's Address application block"
 msgstr "Kunne ikke lese pilotens adresseapplikasjonsblokk"
 
@@ -784,7 +784,7 @@ msgid "Base"
 msgstr "Basis"
 
 #: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:177
+#: calendar/gui/dialogs/task-editor.c:179
 msgid "Basic"
 msgstr "Grunnleggende"
 
@@ -870,12 +870,12 @@ msgstr "Konton_avn:"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:92 my-evolution/my-evolution.glade.h:21
+#: mail/mail-config.glade.h:91 my-evolution/my-evolution.glade.h:21
 msgid "_Add"
 msgstr "_Legg til"
 
 #: addressbook/gui/component/addressbook-config.glade.h:25
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:97
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:96
 #: ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
 #: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
@@ -896,7 +896,7 @@ msgstr "_Port:"
 msgid "_Server name:"
 msgstr "_Tjenernavn:"
 
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-storage.c:169
 msgid "Other Contacts"
 msgstr "Andre kontakter"
 
@@ -1039,7 +1039,7 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr "Factory for adressebokens grensesnitt for navnevalg"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:164
-#: addressbook/gui/component/select-names/e-select-names.c:757
+#: addressbook/gui/component/select-names/e-select-names.c:759
 #: composer/e-msg-composer-attachment-bar.c:497 filter/filter-filter.c:436
 #: filter/filter-rule.c:613 shell/e-shortcuts-view.c:181
 msgid "Remove"
@@ -1070,21 +1070,22 @@ msgstr "(%d ikke vist)"
 msgid "Unnamed Contact"
 msgstr "Kontakt uten navn:"
 
-#: addressbook/gui/component/select-names/e-select-names.c:516
+#: addressbook/gui/component/select-names/e-select-names.c:517
 msgid ""
-"Evolution is unable to get the addressbook local storage. This may have been "
-"caused by the evolution-addressbook component crashing. To help us better "
-"understand and ultimately resolve this problem, please send an e-mail to Jon "
-"Trowbridge <trow@ximian.com> with a detailed description of the "
-"circumstances under which this error occurred.  Thank you."
+"Evolution is unable to get the addressbook local storage.\n"
+"This may have been caused by the evolution-addressbook component crashing.\n"
+"To help us better understand and ultimately resolve this problem,\n"
+"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+"detailed description of the circumstances under which this error\n"
+"occurred.  Thank you."
 msgstr ""
-"Evolution finner ikke lokalt lager for adressebok. Dette kan være forårsaket "
-"av av evolution-addressbook komponenten har krasjet. For å hjelpe oss med å "
-"forstå, og til slutt fikse problemet, vennligst send en melding til Jon "
-"Trowbridge <trow@ximian.com> med en detaljert beskrivelse av omstendighetene "
-"rundt feilen. Takk."
+"Evolution finner ikke lokalt lager for adressebok.\n"
+"Dette kan være forårsaket av av evolution-addressbook komponenten har krasjet.\n"
+"For å hjelpe oss med å forstå, og til slutt fikse problemet,\n"
+"vennligst send en melding til Jon Trowbridge <trow@ximian.com> med en\n"
+"detaljert beskrivelse av omstendighetene rundt feilen. Takk."
 
-#: addressbook/gui/component/select-names/e-select-names.c:593
+#: addressbook/gui/component/select-names/e-select-names.c:595
 msgid "Select Contacts from Addressbook"
 msgstr "Velg kontakter fra adresseboken"
 
@@ -1149,7 +1150,7 @@ msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:184
 msgid "Details"
 msgstr "Detaljer"
 
@@ -1220,7 +1221,7 @@ msgstr "_Kontakter..."
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:843 filter/filter.glade.h:8
-#: mail/folder-browser.c:1422 mail/mail-config.glade.h:96
+#: mail/folder-browser.c:1451 mail/mail-config.glade.h:95
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:39
 msgid "_Delete"
@@ -1320,7 +1321,16 @@ msgstr "Fullt navn"
 msgid "E-mail"
 msgstr "E-post"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#. This is a filename. Translators take note.
+#: addressbook/gui/contact-editor/e-contact-save-as.c:92
+msgid "card.vcf"
+msgstr "kort.vcf"
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:156
+msgid "list"
+msgstr "liste"
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:188
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2513,12 +2523,13 @@ msgid "Error modifying card"
 msgstr "Feil ved endring av kort"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:34
+#: shell/evolution-shell-component.c:944
 msgid "Success"
 msgstr "Suksess"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1732
-#: shell/e-storage.c:525
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1740
+#: shell/e-storage.c:529 shell/evolution-shell-component.c:981
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
@@ -2526,7 +2537,8 @@ msgstr "Ukjent feil"
 msgid "Repository offline"
 msgstr "Lager \"offline\""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:515
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:517
+#: shell/evolution-shell-component.c:972
 msgid "Permission denied"
 msgstr "Tilgang nektet"
 
@@ -2880,18 +2892,18 @@ msgstr "Lav"
 msgid "Undefined"
 msgstr "Udefinert"
 
-#: calendar/conduits/calendar/calendar-conduit.c:797
-#: calendar/conduits/todo/todo-conduit.c:564
+#: calendar/conduits/calendar/calendar-conduit.c:896
+#: calendar/conduits/todo/todo-conduit.c:594
 msgid "Error while communicating with calendar server"
 msgstr "Feil under kommunikasjon med kalendertjeneren"
 
-#: calendar/conduits/calendar/calendar-conduit.c:900
-#: calendar/conduits/calendar/calendar-conduit.c:903
+#: calendar/conduits/calendar/calendar-conduit.c:1018
+#: calendar/conduits/calendar/calendar-conduit.c:1021
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikke lese pilotens kalender-applikasjonsblokk"
 
-#: calendar/conduits/todo/todo-conduit.c:668
-#: calendar/conduits/todo/todo-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:698
+#: calendar/conduits/todo/todo-conduit.c:701
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikke lese pilotens applikasjonsblokk for oppgaveliste"
 
@@ -3114,7 +3126,7 @@ msgid "Free"
 msgstr "Ledig"
 
 #: calendar/gui/calendar-model.c:568 calendar/gui/e-calendar-table.c:438
-#: calendar/gui/e-meeting-time-sel.c:393
+#: calendar/gui/e-meeting-time-sel.c:393 shell/evolution-shell-component.c:966
 msgid "Busy"
 msgstr "Opptatt"
 
@@ -3178,7 +3190,7 @@ msgstr "Prosentverdien må være mellom 0 og 100, inklusive"
 #: calendar/gui/calendar-model.c:1239 calendar/gui/dialogs/meeting-page.c:331
 #: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1446
 #: mail/mail-accounts.c:143 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
 #: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:453
 #: widgets/misc/e-dateedit.c:1453 widgets/misc/e-dateedit.c:1568
@@ -3232,7 +3244,7 @@ msgstr "Beskrivelse inneholder"
 msgid "Comment contains"
 msgstr "Kommentar inneholder"
 
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1061
+#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
 msgid "Unmatched"
 msgstr "Ingen treff"
 
@@ -3504,7 +3516,7 @@ msgstr "slutt på avtale"
 msgid "hour(s)"
 msgstr "time(r)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:117
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:116
 msgid "minute(s)"
 msgstr "minutt(er)"
 
@@ -3794,36 +3806,36 @@ msgstr " (Ferdig "
 msgid "Due "
 msgstr "Ferdig "
 
-#: calendar/gui/dialogs/comp-editor.c:630
+#: calendar/gui/dialogs/comp-editor.c:631
 msgid "Edit Appointment"
 msgstr "Rediger avtale"
 
-#: calendar/gui/dialogs/comp-editor.c:635
+#: calendar/gui/dialogs/comp-editor.c:636
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:638
+#: calendar/gui/dialogs/comp-editor.c:639
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgave - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:641
+#: calendar/gui/dialogs/comp-editor.c:642
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaloppføring - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:655
+#: calendar/gui/dialogs/comp-editor.c:656
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/comp-editor.c:972 mail/mail-callbacks.c:1764
-#: mail/mail-display.c:100
+#: calendar/gui/dialogs/comp-editor.c:1006 mail/mail-callbacks.c:1770
+#: mail/mail-display.c:101
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
-#: calendar/gui/dialogs/comp-editor.c:976 mail/mail-callbacks.c:1771
-#: mail/mail-display.c:104
+#: calendar/gui/dialogs/comp-editor.c:1010 mail/mail-callbacks.c:1777
+#: mail/mail-display.c:105
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -3831,12 +3843,12 @@ msgstr ""
 "En fil med samme navn eksisterer allerede.\n"
 "Overskriv den?"
 
-#: calendar/gui/dialogs/comp-editor.c:1039 ui/evolution-comp-editor.xml.h:13
+#: calendar/gui/dialogs/comp-editor.c:1073 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Lagre som..."
 
-#: calendar/gui/dialogs/comp-editor.c:1192
+#: calendar/gui/dialogs/comp-editor.c:1226
 msgid "Unable to obtain current version!"
 msgstr "Kan ikke hente versjonsdata!"
 
@@ -4058,7 +4070,7 @@ msgstr "Status"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:87
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:86
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Type"
@@ -4208,14 +4220,14 @@ msgstr "_Prioritet:"
 msgid "_Status:"
 msgstr "_Status:"
 
-#: calendar/gui/dialogs/task-editor.c:189
-#: calendar/gui/dialogs/task-editor.c:293
+#: calendar/gui/dialogs/task-editor.c:191
+#: calendar/gui/dialogs/task-editor.c:320
 msgid "Assignment"
 msgstr "Tildeling"
 
 #: calendar/gui/dialogs/task-page.glade.h:4 calendar/gui/e-itip-control.c:692
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:28
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:27
 msgid "Description:"
 msgstr "Beskrivelse:"
 
@@ -4287,7 +4299,7 @@ msgid "100%"
 msgstr "100%"
 
 #: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3444
-#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1401
+#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1430
 #: shell/e-shortcuts-view.c:385
 msgid "_Open"
 msgstr "_Åpne"
@@ -4338,8 +4350,8 @@ msgstr "Klikk for å legge til en oppgave"
 msgid "Alarms"
 msgstr "Alarmer"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:718
-#: camel/camel-filter-driver.c:834
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:721
+#: camel/camel-filter-driver.c:837
 msgid "Complete"
 msgstr "Fullført"
 
@@ -5201,7 +5213,7 @@ msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
 #: calendar/gui/print.c:2312 calendar/gui/print.c:2404
-#: mail/mail-callbacks.c:2180 my-evolution/e-summary.c:607
+#: mail/mail-callbacks.c:2196 my-evolution/e-summary.c:607
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "Forhåndsvisning av utskrift"
@@ -5418,52 +5430,52 @@ msgstr "Resynkroniserer med tjener"
 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:549 camel/camel-filter-driver.c:558
+#: camel/camel-filter-driver.c:552 camel/camel-filter-driver.c:561
 msgid "Syncing folders"
 msgstr "Synkroniserer mapper"
 
-#: camel/camel-filter-driver.c:659
+#: camel/camel-filter-driver.c:662
 msgid "Unable to open spool folder"
 msgstr "Kunne ikke åpne spool-mappen"
 
-#: camel/camel-filter-driver.c:668
+#: camel/camel-filter-driver.c:671
 msgid "Unable to process spool folder"
 msgstr "Kan ikke prosessere spool-mappen"
 
-#: camel/camel-filter-driver.c:683
+#: camel/camel-filter-driver.c:686
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Henter melding %d (%d%%)"
 
-#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:700
+#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:703
 #, c-format
 msgid "Failed on message %d"
 msgstr "Feilet på melding %d"
 
-#: camel/camel-filter-driver.c:688
+#: camel/camel-filter-driver.c:691
 msgid "Cannot open message"
 msgstr "Kan ikke åpne melding"
 
-#: camel/camel-filter-driver.c:714 camel/camel-filter-driver.c:829
+#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:832
 msgid "Syncing folder"
 msgstr "Synkroniserer mappe"
 
-#: camel/camel-filter-driver.c:786
+#: camel/camel-filter-driver.c:789
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Henter melding %d av %d"
 
-#: camel/camel-filter-driver.c:791 camel/camel-filter-driver.c:809
+#: camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Feilet på melding %d av %d"
 
-#: camel/camel-filter-driver.c:918
+#: camel/camel-filter-driver.c:921
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Feil under lesing av filter: %s: %s"
 
-#: camel/camel-filter-driver.c:924
+#: camel/camel-filter-driver.c:927
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Feil under kjøring av filter: %s: %s"
@@ -5664,33 +5676,33 @@ msgstr ""
 "Kunne ikke verifisere denne meldingen: kunne ikke opprette midlertidig fil: %"
 "s"
 
-#: camel/camel-pgp-context.c:1077
+#: camel/camel-pgp-context.c:1076
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr "Kan ikke kryptere denne meldingen: ingen tekst å kryptere"
 
-#: camel/camel-pgp-context.c:1087
+#: camel/camel-pgp-context.c:1086
 msgid "Cannot encrypt this message: no password provided"
 msgstr "Kan ikke kryptere denne meldingen: ingen passord oppgitt"
 
-#: camel/camel-pgp-context.c:1094
+#: camel/camel-pgp-context.c:1093
 #, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 "Kunne ikke kryptere denne meldingen: kunne ikke opprette rør til GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:1103
+#: camel/camel-pgp-context.c:1102
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "Kan ikke kryptere denne meldingen: ingen mottakere oppgitt"
 
-#: camel/camel-pgp-context.c:1265
+#: camel/camel-pgp-context.c:1264
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr "Kan ikke dekryptere denne meldingen: ingen ciphertekst å dekryptere"
 
-#: camel/camel-pgp-context.c:1273
+#: camel/camel-pgp-context.c:1272
 msgid "Cannot decrypt this message: no password provided"
 msgstr "Kan ikke dekryptere denne meldingen: ingen passord oppgitt"
 
-#: camel/camel-pgp-context.c:1280
+#: camel/camel-pgp-context.c:1279
 #, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
@@ -5872,7 +5884,7 @@ msgstr "Ukjent autentiseringstilstand."
 
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:55
+#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:54
 msgid "Password"
 msgstr "Passord"
 
@@ -6004,7 +6016,7 @@ msgstr "Kan ikke finne mappe: Ugyldig operasjon på dette lageret"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kan ikke opprette mappe: Ugyldig operasjon på dette lageret"
 
-#: camel/camel-tcp-stream-openssl.c:542
+#: camel/camel-tcp-stream-openssl.c:541
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -6014,7 +6026,7 @@ msgstr ""
 "Emne: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:547 camel/camel-tcp-stream-ssl.c:421
+#: camel/camel-tcp-stream-openssl.c:546 camel/camel-tcp-stream-ssl.c:421
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6161,7 +6173,7 @@ msgstr "Kan ikke åpne cache-katalog: %s"
 msgid "Failed to cache message %s: %s"
 msgstr "Feil under mellomlagring av melding %s: %s"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:15
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
 msgid "Checking for new mail"
 msgstr "Ser etter nye meldinger"
 
@@ -6331,18 +6343,22 @@ msgstr "Kunne ikke lagre sammendrag: %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Kunne ikke legge til melding i sammendraget: ukjent grunn"
 
-#: camel/providers/local/camel-maildir-folder.c:181
+#: camel/providers/local/camel-maildir-folder.c:182
+msgid "Maildir append message cancelled"
+msgstr "Operasjon for å legge til melding i maildir avbrutt"
+
+#: camel/providers/local/camel-maildir-folder.c:185
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Kan ikke legge til melding i maildir mappe: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:206
-#: camel/providers/local/camel-maildir-folder.c:218
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-mbox-folder.c:328
-#: camel/providers/local/camel-mh-folder.c:195
-#: camel/providers/local/camel-mh-folder.c:204
-#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:210
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-maildir-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:332
+#: camel/providers/local/camel-mh-folder.c:199
+#: camel/providers/local/camel-mh-folder.c:208
+#: camel/providers/local/camel-mh-folder.c:216
 #: camel/providers/local/camel-spool-folder.c:580
 #, c-format
 msgid ""
@@ -6352,15 +6368,15 @@ msgstr ""
 "Kan ikke hente melding: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:206
-#: camel/providers/local/camel-mbox-folder.c:328
-#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-maildir-folder.c:210
+#: camel/providers/local/camel-mbox-folder.c:332
+#: camel/providers/local/camel-mh-folder.c:199
 #: camel/providers/local/camel-spool-folder.c:580
 msgid "No such message"
 msgstr "Ingen slik melding"
 
-#: camel/providers/local/camel-maildir-folder.c:227
-#: camel/providers/local/camel-mh-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:231
+#: camel/providers/local/camel-mh-folder.c:217
 msgid "Invalid message contents"
 msgstr "Ugyldig meldingsinnhold"
 
@@ -6430,14 +6446,18 @@ msgstr "Kan ikke opprette mappelås på: %s: %s"
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Kan ikke åpne postboks: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:265
+#: camel/providers/local/camel-mbox-folder.c:266
+msgid "Mail append cancelled"
+msgstr "Opreasjon for å legge til e-post avbrutt"
+
+#: camel/providers/local/camel-mbox-folder.c:269
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Kan ikke legge til melding i mbox-filen: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:344
-#: camel/providers/local/camel-mbox-folder.c:376
-#: camel/providers/local/camel-mbox-folder.c:389
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-mbox-folder.c:393
 #: camel/providers/local/camel-spool-folder.c:596
 #: camel/providers/local/camel-spool-folder.c:628
 #: camel/providers/local/camel-spool-folder.c:641
@@ -6449,12 +6469,12 @@ msgstr ""
 "Kan ikke hente melding: %s fra mappe %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:377
+#: camel/providers/local/camel-mbox-folder.c:381
 #: camel/providers/local/camel-spool-folder.c:629
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Mappen ser ut til å ha blitt korrupt og kan ikke repareres."
 
-#: camel/providers/local/camel-mbox-folder.c:390
+#: camel/providers/local/camel-mbox-folder.c:394
 #: camel/providers/local/camel-spool-folder.c:642
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Oppbygging av melding feilet: Korrupt postboks?"
@@ -6501,8 +6521,8 @@ 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:249
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
+#: camel/providers/local/camel-mbox-summary.c:498
+#: camel/providers/local/camel-mbox-summary.c:699
 #: camel/providers/local/camel-spool-summary.c:644
 #: camel/providers/local/camel-spool-summary.c:936
 msgid "Storing folder"
@@ -6524,23 +6544,23 @@ msgstr "Fatal feil i lesing av postboksen nær posisjon %ld i mappe %s"
 msgid "Cannot check folder: %s: %s"
 msgstr "Kan ikke sjekke mappe: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
+#: camel/providers/local/camel-mbox-summary.c:503
+#: camel/providers/local/camel-mbox-summary.c:704
 #: camel/providers/local/camel-spool-summary.c:649
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Kunne ikke åpne fil %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
+#: camel/providers/local/camel-mbox-summary.c:520
 #: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kan ikke åpne midlertidig postboks: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
+#: camel/providers/local/camel-mbox-summary.c:545
+#: camel/providers/local/camel-mbox-summary.c:553
+#: camel/providers/local/camel-mbox-summary.c:742
+#: camel/providers/local/camel-mbox-summary.c:750
 #: camel/providers/local/camel-spool-summary.c:698
 #: camel/providers/local/camel-spool-summary.c:706
 #: camel/providers/local/camel-spool-summary.c:979
@@ -6548,43 +6568,47 @@ msgstr "Kan ikke åpne midlertidig postboks: %s"
 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:597
+#: camel/providers/local/camel-mbox-summary.c:596
 #: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Feil under skriving til midlertidig postboks: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:614
+#: camel/providers/local/camel-mbox-summary.c:613
 #: camel/providers/local/camel-spool-summary.c:772
 #, 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:632
-#: camel/providers/local/camel-mbox-summary.c:801
+#: camel/providers/local/camel-mbox-summary.c:631
+#: camel/providers/local/camel-mbox-summary.c:800
 #: camel/providers/local/camel-spool-summary.c:1037
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kunne ikke lukke kildemappe %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:640
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Kunne ikke lukke midlertidig mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:651
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunne ikke endre navn på mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:875
+#: camel/providers/local/camel-mbox-summary.c:874
 #: camel/providers/local/camel-spool-summary.c:545
 #: camel/providers/local/camel-spool-summary.c:1111
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ukjent feil: %s"
 
-#: camel/providers/local/camel-mh-folder.c:172
+#: camel/providers/local/camel-mh-folder.c:173
+msgid "MH append message cancelled"
+msgstr "Operasjon for å legge til melding for MH avbrutt"
+
+#: camel/providers/local/camel-mh-folder.c:176
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Kan ikke legge til melding i mh-mappe: %s: %s"
@@ -6792,7 +6816,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:51 mail/mail-config.glade.h:54
+#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:53
 msgid "POP"
 msgstr "POP"
 
@@ -6888,7 +6912,7 @@ msgid "Unexpected response from POP server: %s"
 msgstr "Uventet svar fra POP-tjener: %s"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -6942,7 +6966,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:67
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:66
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -7094,7 +7118,7 @@ msgstr "Kan ikke sende melding: senderadresse ikke definert."
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan ikke sende melding: senderadresse ikke gyldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:594 mail/mail-ops.c:546
+#: camel/providers/smtp/camel-smtp-transport.c:594 mail/mail-ops.c:560
 msgid "Sending message"
 msgstr "Sender melding"
 
@@ -7168,34 +7192,34 @@ msgstr "Tidsavbrudd for DATA-forespørsel: %s: melding ikke sendt."
 msgid "DATA response error: %s: mail not sent"
 msgstr "Feil ved DATA-svar: %s: melding ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1018
-#: camel/providers/smtp/camel-smtp-transport.c:1054
+#: camel/providers/smtp/camel-smtp-transport.c:1031
+#: camel/providers/smtp/camel-smtp-transport.c:1049
 #, 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:1073
+#: camel/providers/smtp/camel-smtp-transport.c:1068
 #, 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:1097
+#: camel/providers/smtp/camel-smtp-transport.c:1092
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Tidsavbrudd for RSET-forespørsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1116
+#: camel/providers/smtp/camel-smtp-transport.c:1111
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Feil ved RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1139
+#: camel/providers/smtp/camel-smtp-transport.c:1134
 #, 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:1158
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Feil ved QUIT-svar: %s: ikke-fatal"
@@ -7225,7 +7249,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:357 mail/mail-display.c:134
+#: composer/e-msg-composer-attachment-bar.c:357 mail/mail-display.c:135
 msgid "attachment"
 msgstr "vedlegg"
 
@@ -7269,52 +7293,52 @@ msgstr "MIME-type:"
 msgid "Suggest automatic display of attachment"
 msgstr "Foreslå automatisk visning av vedlegg"
 
-#: composer/e-msg-composer-hdrs.c:326
+#: composer/e-msg-composer-hdrs.c:324
 msgid "Click here for the address book"
 msgstr "Klikk her for å få opp adresseboken"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:357
+#: composer/e-msg-composer-hdrs.c:355
 msgid "From:"
 msgstr "Fra:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:361
 msgid "Reply-To:"
 msgstr "Svar-til:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:374
+#: composer/e-msg-composer-hdrs.c:372
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:386
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Enter the recipients of the message"
 msgstr "Skriv inn mottakerene for meldingen"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:391
 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:396
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:397
+#: composer/e-msg-composer-hdrs.c:395
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -7336,29 +7360,29 @@ msgstr ""
 "Feil under lesing av fil %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:858
+#: composer/e-msg-composer.c:859
 msgid "Save as..."
 msgstr "Lagre som..."
 
-#: composer/e-msg-composer.c:867
+#: composer/e-msg-composer.c:868
 msgid "Warning!"
 msgstr "Advarsel!"
 
-#: composer/e-msg-composer.c:871
+#: composer/e-msg-composer.c:872
 msgid "File exists, overwrite?"
 msgstr "Filen eksisterer, overskriv?"
 
-#: composer/e-msg-composer.c:893
+#: composer/e-msg-composer.c:894
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Feil under lagring av fil: %s"
 
-#: composer/e-msg-composer.c:912
+#: composer/e-msg-composer.c:913
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Feil under lasting av fil: %s"
 
-#: composer/e-msg-composer.c:983
+#: composer/e-msg-composer.c:984
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -7366,16 +7390,16 @@ msgstr ""
 "Kunne ikke åpne skisse-mappen for denne kontoen.\n"
 "Vil du bruke standard skisse-mappe?"
 
-#: composer/e-msg-composer.c:1036
+#: composer/e-msg-composer.c:1037
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Feil under tilgang til fil: %s"
 
-#: composer/e-msg-composer.c:1044
+#: composer/e-msg-composer.c:1045
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikke hente melding fra editor"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1052
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -7384,7 +7408,7 @@ msgstr ""
 "Kunne ikke søke i fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1059
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -7393,7 +7417,7 @@ msgstr ""
 "Kunne ikke kutte av fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1068
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -7402,7 +7426,7 @@ msgstr ""
 "Feil under autolagring av av melding: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1169
+#: composer/e-msg-composer.c:1170
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -7410,7 +7434,7 @@ msgstr ""
 "Ximian Evolution har funnet ikke-lagrede filer fra en tidligere sesjon.\n"
 "Vil du prøve å gjenopprette dem?"
 
-#: composer/e-msg-composer.c:1317
+#: composer/e-msg-composer.c:1321
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -7420,25 +7444,37 @@ msgstr ""
 "\n"
 "Vil du lagre endringene?"
 
-#: composer/e-msg-composer.c:1324
+#: composer/e-msg-composer.c:1328
 msgid "Warning: Modified Message"
 msgstr "Advarsel: Endret melding"
 
-#: composer/e-msg-composer.c:1347
+#: composer/e-msg-composer.c:1351
 msgid "Open file"
 msgstr "Åpne fil"
 
-#: composer/e-msg-composer.c:1496
+#: composer/e-msg-composer.c:1500
 msgid "Insert File"
 msgstr "Sett inn fil"
 
-#: composer/e-msg-composer.c:1871 composer/e-msg-composer.c:2317
+#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2313
 msgid "Compose a message"
 msgstr "Skriv en melding"
 
-#: composer/e-msg-composer.c:2407
-msgid "Could not create composer window."
-msgstr "Kan ikke opprette komponeringsvinduet."
+#: composer/e-msg-composer.c:2330
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
+"Kunne ikke opprette vindu for ny melding:\n"
+"Klarte ikke å aktivere kontroll for adressevelger."
+
+#: composer/e-msg-composer.c:2353
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"Kunne ikke opprette skrivevindu:\n"
+"Klarte ikke å aktivere HTML-redigeringskomponenten."
 
 #: composer/evolution-composer.c:349
 msgid ""
@@ -7735,7 +7771,7 @@ msgstr "Velg mappe"
 msgid "Enter folder URI"
 msgstr "Skriv inn URI for mappen"
 
-#: filter/filter-folder.c:303
+#: filter/filter-folder.c:304
 msgid "<click here to select a folder>"
 msgstr "<klikk her for å velge en mappe>"
 
@@ -7977,7 +8013,7 @@ msgstr "Svart til"
 msgid "Score"
 msgstr "Poenggi"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1333
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1339
 msgid "Sender"
 msgstr "Avsender"
 
@@ -8206,7 +8242,7 @@ msgstr "Egenskaper ..."
 msgid "Change this folder's properties"
 msgstr "Endre denne mappens egenskaper"
 
-#: mail/component-factory.c:721
+#: mail/component-factory.c:729
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -8214,27 +8250,27 @@ msgstr ""
 "Noen av dine innstillinger for e-post ser ut til å være korrupt. Vennligst "
 "sjekk at alt er i orden."
 
-#: mail/component-factory.c:861
+#: mail/component-factory.c:871
 msgid "New Mail Message"
 msgstr "Ny e-post melding"
 
-#: mail/component-factory.c:861
+#: mail/component-factory.c:871
 msgid "New _Mail Message"
 msgstr "Ny e-post _melding"
 
-#: mail/component-factory.c:885
+#: mail/component-factory.c:895
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikke initiere Evolutions e-postkomponent."
 
-#: mail/component-factory.c:894
+#: mail/component-factory.c:904
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Kan ikke initiere Evolutions konfigurasjonskomponent for e-post."
 
-#: mail/component-factory.c:900
+#: mail/component-factory.c:910
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Kan ikke initiere Evolutions mappeinfo-komponent."
 
-#: mail/component-factory.c:1065
+#: mail/component-factory.c:1075
 msgid "Cannot register storage with shell"
 msgstr "Kan ikke registrere lagring i skallet"
 
@@ -8247,164 +8283,164 @@ msgstr "Egenskaper for \"%s\""
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: mail/folder-browser.c:261 mail/mail-display.c:300
+#: mail/folder-browser.c:275 mail/mail-display.c:301
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kunne ikke opprette midlertidig katalog: %s"
 
-#: mail/folder-browser.c:733
+#: mail/folder-browser.c:747
 #, c-format
 msgid "%d new"
 msgstr "%d nye"
 
-#: mail/folder-browser.c:736 mail/folder-browser.c:741
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:750 mail/folder-browser.c:755
+#: mail/folder-browser.c:777
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:737
+#: mail/folder-browser.c:751
 #, c-format
 msgid "%d hidden"
 msgstr "%d skjulte"
 
-#: mail/folder-browser.c:742
+#: mail/folder-browser.c:756
 #, c-format
 msgid "%d selected"
 msgstr "%d valgt"
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:779
 #, c-format
 msgid "%d unsent"
 msgstr "%d usendte"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d sent"
 msgstr "%d sendt"
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:783
 #, c-format
 msgid "%d total"
 msgstr "%d totalt"
 
-#: mail/folder-browser.c:1012
+#: mail/folder-browser.c:1032
 msgid "Create vFolder from Search"
 msgstr "Lag vFolder fra søk"
 
-#: mail/folder-browser.c:1384
+#: mail/folder-browser.c:1413
 msgid "VFolder on _Subject"
 msgstr "VFolder på e_mne"
 
-#: mail/folder-browser.c:1385
+#: mail/folder-browser.c:1414
 msgid "VFolder on Se_nder"
 msgstr "VFolder for se_nder"
 
-#: mail/folder-browser.c:1386
+#: mail/folder-browser.c:1415
 msgid "VFolder on _Recipients"
 msgstr "VFolder for mottake_re"
 
-#: mail/folder-browser.c:1387
+#: mail/folder-browser.c:1416
 msgid "VFolder on Mailing _List"
 msgstr "VFolder på e-post_liste"
 
-#: mail/folder-browser.c:1391
+#: mail/folder-browser.c:1420
 msgid "Filter on Sub_ject"
 msgstr "Filtrer på em_ne"
 
-#: mail/folder-browser.c:1392
+#: mail/folder-browser.c:1421
 msgid "Filter on Sen_der"
 msgstr "Filtrer på sen_der"
 
-#: mail/folder-browser.c:1393
+#: mail/folder-browser.c:1422
 msgid "Filter on Re_cipients"
 msgstr "Filtrer på motta_ker"
 
-#: mail/folder-browser.c:1394
+#: mail/folder-browser.c:1423
 msgid "Filter on _Mailing List"
 msgstr "Filtrer på e-_postliste"
 
-#: mail/folder-browser.c:1402 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1431 ui/evolution-mail-message.xml.h:89
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding..."
 
-#: mail/folder-browser.c:1403 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1432 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "Lagre _som..."
 
-#: mail/folder-browser.c:1404
+#: mail/folder-browser.c:1433
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: mail/folder-browser.c:1408 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1437 ui/evolution-mail-message.xml.h:96
 msgid "_Reply to Sender"
 msgstr "Sva_r til sender"
 
-#: mail/folder-browser.c:1409 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1438 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: mail/folder-browser.c:1410 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1439 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/folder-browser.c:1411
+#: mail/folder-browser.c:1440
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: mail/folder-browser.c:1413 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1442 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Mer_k som lest"
 
-#: mail/folder-browser.c:1414 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1443 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Merk som _ulest"
 
-#: mail/folder-browser.c:1415
+#: mail/folder-browser.c:1444
 msgid "Mark as _Important"
 msgstr "Merk som v_iktig"
 
-#: mail/folder-browser.c:1416
+#: mail/folder-browser.c:1445
 msgid "Mark as Unim_portant"
 msgstr "Merk som uv_iktig"
 
-#: mail/folder-browser.c:1420
+#: mail/folder-browser.c:1449
 msgid "_Move to Folder..."
 msgstr "Fl_ytt til mappe..."
 
-#: mail/folder-browser.c:1421
+#: mail/folder-browser.c:1450
 msgid "_Copy to Folder..."
 msgstr "K_opier til mappe..."
 
-#: mail/folder-browser.c:1423 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1452 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "A_ngre slett"
 
-#: mail/folder-browser.c:1427
+#: mail/folder-browser.c:1456
 msgid "Add Sender to Address Book"
 msgstr "Legg til sender i adressebok"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1459
 msgid "Apply Filters"
 msgstr "Påfør filtre"
 
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1461
 msgid "Create Ru_le From Message"
 msgstr "Lage rege_l fra melding"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1611
 msgid "Filter on Mailing List"
 msgstr "Filtrer etter e-postliste"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1612
 msgid "VFolder on Mailing List"
 msgstr "VFolder på e-postliste"
 
-#: mail/folder-browser.c:1585
+#: mail/folder-browser.c:1614
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrer etter e-postliste (%s)"
 
-#: mail/folder-browser.c:1586
+#: mail/folder-browser.c:1615
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VFolder på e-postliste (%s)"
@@ -8536,7 +8572,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 Close button and title
-#: mail/mail-accounts.c:769 mail/mail-config.glade.h:45
+#: mail/mail-accounts.c:769 mail/mail-config.glade.h:44
 msgid "Mail Settings"
 msgstr "Innstillinger for e-post"
 
@@ -8584,7 +8620,7 @@ msgstr ""
 "Du må konfigurere en identitet\n"
 "før du kan skrive e-post."
 
-#: mail/mail-callbacks.c:204
+#: mail/mail-callbacks.c:207
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -8592,12 +8628,12 @@ msgstr ""
 "Du må konfigurere en e-post-transport\n"
 "før du kan skrive e-post."
 
-#: mail/mail-callbacks.c:230
+#: mail/mail-callbacks.c:236
 msgid "You have not set a mail transport method"
 msgstr "Du har ikke satt en transportmetode for e-post"
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:264
+#: mail/mail-callbacks.c:270
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -8605,11 +8641,11 @@ msgstr ""
 "Du sender en melding i HMTL-format, men følgende mottakeres ønsker ikke å "
 "motta meldinger i HTML-format:\n"
 
-#: mail/mail-callbacks.c:279
+#: mail/mail-callbacks.c:285
 msgid "Send anyway?"
 msgstr "Send likevel?"
 
-#: mail/mail-callbacks.c:321
+#: mail/mail-callbacks.c:327
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -8617,7 +8653,7 @@ msgstr ""
 "Denne meldingen har ikke emne.\n"
 "Send likevel?"
 
-#: mail/mail-callbacks.c:365
+#: mail/mail-callbacks.c:371
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -8625,11 +8661,11 @@ msgstr ""
 "Siden kontaktlisten du sender til er konfigurert til å skjule listens "
 "adresser vil denne meldingen kunn inneholde Bcc mottakere."
 
-#: mail/mail-callbacks.c:369
+#: mail/mail-callbacks.c:375
 msgid "This message contains only Bcc recipients."
 msgstr "Denne meldingen inneholder kun Bcc mottakere."
 
-#: mail/mail-callbacks.c:373
+#: mail/mail-callbacks.c:379
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -8639,40 +8675,40 @@ msgstr ""
 "\"Apparently-To\" header.\n"
 "Send likevel?"
 
-#: mail/mail-callbacks.c:467
+#: mail/mail-callbacks.c:473
 msgid "This message contains invalid recipients:"
 msgstr "Denne meldingen inneholder ugyldige mottakere:"
 
-#: mail/mail-callbacks.c:502
+#: mail/mail-callbacks.c:508
 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:598
+#: mail/mail-callbacks.c:604
 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:834
+#: mail/mail-callbacks.c:840
 msgid "an unknown sender"
 msgstr "en ukjent avsender"
 
-#: mail/mail-callbacks.c:839
+#: mail/mail-callbacks.c:845
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%a, %Y-%m-%d kl. %H:%M skrev %%s:"
 
-#: mail/mail-callbacks.c:1235
+#: mail/mail-callbacks.c:1241
 msgid "Move message(s) to"
 msgstr "Flytt melding(er) til"
 
-#: mail/mail-callbacks.c:1237
+#: mail/mail-callbacks.c:1243
 msgid "Copy message(s) to"
 msgstr "Kopier melding(er) til"
 
-#: mail/mail-callbacks.c:1632
+#: mail/mail-callbacks.c:1638
 #, 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:1654
+#: mail/mail-callbacks.c:1660
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8680,7 +8716,7 @@ msgstr ""
 "Du kan kun redigere meldinger lagret\n"
 "i Skisser-katalogen."
 
-#: mail/mail-callbacks.c:1690
+#: mail/mail-callbacks.c:1696
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8688,28 +8724,28 @@ msgstr ""
 "Du kan kun sende meldinger på nytt\n"
 "som er lagret i sendt-katalogen."
 
-#: mail/mail-callbacks.c:1704
+#: mail/mail-callbacks.c:1710
 #, 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:1727
+#: mail/mail-callbacks.c:1733
 msgid "No Message Selected"
 msgstr "Ingen melding valgt"
 
-#: mail/mail-callbacks.c:1815
+#: mail/mail-callbacks.c:1821
 msgid "Save Message As..."
 msgstr "Lagre melding som..."
 
-#: mail/mail-callbacks.c:1817
+#: mail/mail-callbacks.c:1823
 msgid "Save Messages As..."
 msgstr "Lagre meldinger som..."
 
-#: mail/mail-callbacks.c:1962 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:1968 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Advarsel"
 
-#: mail/mail-callbacks.c:1969
+#: mail/mail-callbacks.c:1975
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8721,11 +8757,11 @@ msgstr ""
 "\n"
 "Vil du virkelig slette disse meldingene?"
 
-#: mail/mail-callbacks.c:1976
+#: mail/mail-callbacks.c:1982
 msgid "Do not ask me again."
 msgstr "Ikke spør meg igjen."
 
-#: mail/mail-callbacks.c:2081
+#: mail/mail-callbacks.c:2087
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8734,19 +8770,19 @@ msgstr ""
 "Feil under lasting av filter-informasjon:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2093
+#: mail/mail-callbacks.c:2099
 msgid "Filters"
 msgstr "Filtre"
 
-#: mail/mail-callbacks.c:2141
+#: mail/mail-callbacks.c:2157
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/mail-callbacks.c:2187
+#: mail/mail-callbacks.c:2203
 msgid "Printing of message failed"
 msgstr "Feil under utskrift av melding"
 
-#: mail/mail-callbacks.c:2276
+#: mail/mail-callbacks.c:2294
 #, 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?"
@@ -8872,42 +8908,38 @@ msgid "Always encrypt to myself when sending encrypted mail"
 msgstr "Alltid krypter til meg selv ved sending av kryptert e-post."
 
 #: mail/mail-config.glade.h:9
-msgid "Always encrypt to myself when sending encrypyed mail"
-msgstr "Alltid krypter til meg selv ved sending av kryptert e-post"
-
-#: mail/mail-config.glade.h:10
 msgid "Always sign outgoing messages when using this account"
 msgstr "Alltid signer utgående meldinger når denne kontoen brukes"
 
-#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Vedlegg"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Authentication Type: "
 msgstr "Autentiseringstype: "
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Certificate ID:"
 msgstr "Sertifikat-ID:"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "Composer"
 msgstr "Skriv"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Configuration"
 msgstr "Konfigurasjon"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Confirm when Expunging a folder"
 msgstr "Bekreft ved tømming av mappe"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -8923,229 +8955,229 @@ msgstr ""
 "\n"
 "Klikk \"Fullfør\" for å lagre dine innstillinger"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "De_fault"
 msgstr "_Forvalgt"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "Default Forward style is: "
 msgstr "Standard videresendingsstil er: "
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Default character encoding: "
 msgstr "Standard tegnkoding: "
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Digital IDs..."
 msgstr "Digitale IDer..."
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Display"
 msgstr "Vis"
 
-#: mail/mail-config.glade.h:31 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:30 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Ferdig"
 
-#: mail/mail-config.glade.h:32 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:31 shell/e-local-storage.c:174
 msgid "Drafts"
 msgstr "Skisser"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Drafts folder:"
 msgstr "Skissemappe:"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "E_nable"
 msgstr "A_ktiver"
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
+#: mail/mail-config.glade.h:34 widgets/misc/e-filter-bar.h:96
 #: widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Rediger..."
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:35
 msgid "Enabled"
 msgstr "Aktivert"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:36
 msgid "Get Digital ID..."
 msgstr "Hent digital ID..."
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 msgid "HTML signature file:"
 msgstr "HTML-signaturfil:"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:38
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:40 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:39 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identitet"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "In HTML mail"
 msgstr "I HTML e-post"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 msgid "Inline"
 msgstr "Inline"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Mail Configuration"
 msgstr "E-post-konfigurasjon"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Mailbox location"
 msgstr "Plassering av postboks"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 msgid "Make this my _default account"
 msgstr "Bruk denne som stan_dard konto"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
 msgid "NNTP Server:"
 msgstr "NNTP-tjener:"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "News"
 msgstr "News"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 msgid "Optional Information"
 msgstr "Tilleggsinformasjon"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 msgid "PGP Key ID:"
 msgstr "PGP-nøkkel ID:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 msgid "Pick a color"
 msgstr "Velg en farge"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 msgid "Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Spør ved sending av HTML-meldinger til kontakter som ikke øsker dem"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Prompt when sending messages with an _empty subject"
 msgstr "Spør ved sending av meldinger uten _emne"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr "Spør ved sending av meldinger med kun _Bcc-mottakere definert"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:61
 msgid "Quoted"
 msgstr "Sitert"
 
-#: mail/mail-config.glade.h:63 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Innkommende e-post"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Receiving Mail"
 msgstr "Innkommende e-post"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 msgid "Receiving Options"
 msgstr "Alternativer innkommende"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
 msgid "Required Information"
 msgstr "Nødvendig informasjon"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 msgid "Secure MIME"
 msgstr "Sikker MIME"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Security"
 msgstr "Sikkerhet"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:69
 msgid "Select Filter Log file..."
 msgstr "Velg en loggfil for filter..."
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Select PGP binary"
 msgstr "Velg PGP-binærfil"
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:71 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Utgående e-post"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 msgid "Sending Mail"
 msgstr "Utgående e-post"
 
-#: mail/mail-config.glade.h:75 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:74 mail/message-list.etspec.h:6
 #: shell/e-local-storage.c:177
 msgid "Sent"
 msgstr "Sendt"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 msgid "Sent and Draft Messages"
 msgstr "Sendte meldinger og skisser"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 msgid "Sent messages folder:"
 msgstr "Mappe for sendte meldinger:"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:77
 msgid "Server Configuration"
 msgstr "Tjenerkonfigurasjon"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:78
 msgid "Server Type: "
 msgstr "Tjenertype: "
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:79
 msgid "Server requires _authentication"
 msgstr "Tjener krever _autentisering"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:80
 msgid "Signature file:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:81
 msgid "Source"
 msgstr "Kilde"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:82
 msgid "Source Information"
 msgstr "Kildeinformasjon"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:83
 msgid "Sources"
 msgstr "Kilder"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:84
 msgid "Special Folders"
 msgstr "Spesielle mapper"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:85
 msgid "Standard Unix mbox"
 msgstr "Standard Unix mbox"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:87
 msgid "Use secure connection (_SSL)"
 msgstr "Bruk sikker forbindelse (_SSL)"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:88
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -9155,103 +9187,103 @@ msgstr ""
 "\n"
 "Klikk \"Neste\" for å begynne. "
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:92
 msgid "_Always load images off the net"
 msgstr "_Alltid last bilder fra nettet"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:93
 msgid "_Automatically check for new mail every"
 msgstr "Sjekk etter meldinger _automatisk hver(t)"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:94
 msgid "_Check for supported types"
 msgstr "S_øk etter støttede typer"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:97
 msgid "_Email Address:"
 msgstr "_E-post adresse:"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:98
 msgid "_Empty trash folders on exit"
 msgstr "Tøm søpp_elkurven ved slutt"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:99
 msgid "_Full Name:"
 msgstr "_Fullt navn:"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:100
 msgid "_HTML Signature:"
 msgstr "_HTML-signatur:"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:101
 msgid "_Highlight citations with"
 msgstr "M_erk sitering med"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:102
 msgid "_Host:"
 msgstr "_Vert:"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:103
 msgid "_Load images if sender is in addressbook"
 msgstr "_Last bilder hvis avsender er i adresseboken"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:104
 msgid "_Log filter actions to:"
 msgstr "_Logg filterhandlinger til:"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:105
 msgid "_Mark messages as Read after"
 msgstr "_Merk meldinger som Lest etter"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:106
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:107
 msgid "_Never load images off the net"
 msgstr "Aldri last bilder fra _nettet"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:108
 msgid "_Organization:"
 msgstr "_Organisasjon:"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "_PGP binary path:"
 msgstr "Sti til _PGP-binærfil:"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 msgid "_Path:"
 msgstr "S_ti:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 msgid "_Remember this password"
 msgstr "Husk dette passo_rdet"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 msgid "_Send mail in HTML format by default."
 msgstr "_Send meldinger i HTML-format som standard."
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "_Signature file:"
 msgstr "_Signaturfil:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 msgid "_Username:"
 msgstr "Br_ukernavn:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 msgid "description"
 msgstr "beskrivelse"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:117
 msgid "newswindow1"
 msgstr "nyhetsvindu1"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:118
 msgid "placeholder"
 msgstr "plassholder"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:119
 msgid "seconds."
 msgstr "sekunder"
 
@@ -9291,53 +9323,53 @@ msgstr "Kunne ikke opprette S/MIME \"envelope\" kontekst."
 msgid "Could not create a S/MIME decode context."
 msgstr "Kunne ikke opprette S/MIME dekodingskontekst."
 
-#: mail/mail-display.c:245
+#: mail/mail-display.c:246
 msgid "Save Attachment"
 msgstr "Lagre vedlegg"
 
-#: mail/mail-display.c:352
+#: mail/mail-display.c:353
 msgid "Save to Disk..."
 msgstr "Lagre til disk..."
 
-#: mail/mail-display.c:354
+#: mail/mail-display.c:355
 msgid "View Inline"
 msgstr "Vis \"inline\""
 
-#: mail/mail-display.c:356
+#: mail/mail-display.c:357
 #, c-format
 msgid "Open in %s..."
 msgstr "Åpne i %s..."
 
-#: mail/mail-display.c:417
+#: mail/mail-display.c:418
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Vis \"inline\" (via %s)"
 
-#: mail/mail-display.c:421
+#: mail/mail-display.c:422
 msgid "Hide"
 msgstr "Skjul"
 
-#: mail/mail-display.c:442
+#: mail/mail-display.c:443
 msgid "External Viewer"
 msgstr "Ekstern visning"
 
-#: mail/mail-display.c:1107
+#: mail/mail-display.c:1108
 msgid "Loading message content"
 msgstr "Laster meldingsinnhold"
 
-#: mail/mail-display.c:1587
+#: mail/mail-display.c:1590
 msgid "Open Link in Browser"
 msgstr "Åpne lenke i nettleser"
 
-#: mail/mail-display.c:1589
+#: mail/mail-display.c:1592
 msgid "Copy Link Location"
 msgstr "Kopier lokasjon for lenke"
 
-#: mail/mail-display.c:1592
+#: mail/mail-display.c:1595
 msgid "Save Link as (FIXME)"
 msgstr "Lagre lenke som"
 
-#: mail/mail-display.c:1595
+#: mail/mail-display.c:1598
 msgid "Save Image as..."
 msgstr "Lagre bilde som..."
 
@@ -9482,7 +9514,7 @@ msgstr "Du kan ikke endre format på en ikke-lokal mappe."
 msgid "Reconfigure /%s"
 msgstr "Konfigurer /%s på nytt"
 
-#: mail/mail-mt.c:199
+#: mail/mail-mt.c:224
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -9491,7 +9523,7 @@ msgstr ""
 "Feil under '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:202
+#: mail/mail-mt.c:227
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -9501,24 +9533,24 @@ msgstr ""
 "%s"
 
 #. Remember the password?
-#: mail/mail-mt.c:506
+#: mail/mail-mt.c:553
 msgid "Remember this password"
 msgstr "Husk dette passordet"
 
-#: mail/mail-mt.c:507
+#: mail/mail-mt.c:554
 msgid "Remember this password for the remainder of this session"
 msgstr "Husk dette passordet for resten av denne sesjonen"
 
-#: mail/mail-mt.c:564
+#: mail/mail-mt.c:611
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Skriv inn passord for %s"
 
-#: mail/mail-mt.c:567
+#: mail/mail-mt.c:614
 msgid "Enter Password"
 msgstr "Skriv inn passord"
 
-#: mail/mail-mt.c:883
+#: mail/mail-mt.c:1062
 msgid "Working"
 msgstr "Arbeider"
 
@@ -9526,118 +9558,118 @@ msgstr "Arbeider"
 msgid "Filtering Folder"
 msgstr "Filtrerer mappe"
 
-#: mail/mail-ops.c:229
+#: mail/mail-ops.c:249
 msgid "Fetching Mail"
 msgstr "Henter e-post"
 
-#: mail/mail-ops.c:473 mail/mail-ops.c:505
+#: mail/mail-ops.c:491 mail/mail-ops.c:520
 msgid "However, the message was successfully sent."
 msgstr "Likevel, fullførte sending av meldingen."
 
-#: mail/mail-ops.c:542
+#: mail/mail-ops.c:556
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender \"%s\""
 
-#: mail/mail-ops.c:661
+#: mail/mail-ops.c:675
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
 
-#: mail/mail-ops.c:680
+#: mail/mail-ops.c:694
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Feilet på melding %d av %d"
 
-#: mail/mail-ops.c:682 mail/mail-send-recv.c:522
+#: mail/mail-ops.c:696 mail/mail-send-recv.c:522
 msgid "Complete."
 msgstr "Fullført."
 
-#: mail/mail-ops.c:775
+#: mail/mail-ops.c:789
 msgid "Saving message to folder"
 msgstr "Lagrer melding til mappe"
 
-#: mail/mail-ops.c:855
+#: mail/mail-ops.c:869
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flytter melding(er) til %s"
 
-#: mail/mail-ops.c:855
+#: mail/mail-ops.c:869
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer meldinger til %s"
 
-#: mail/mail-ops.c:877
+#: mail/mail-ops.c:891
 #, c-format
 msgid "Cannot copy a folder `%s' to itself"
 msgstr "Kan ikke kopiere en mappe `%s' til seg selv"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:898
 msgid "Moving"
 msgstr "Flytter"
 
-#: mail/mail-ops.c:887
+#: mail/mail-ops.c:901
 msgid "Copying"
 msgstr "Kopierer"
 
-#: mail/mail-ops.c:997
+#: mail/mail-ops.c:1011
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i \"%s\""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1047 shell/e-local-storage.c:179
+#: mail/mail-ops.c:1061 shell/e-local-storage.c:179
 msgid "Trash"
 msgstr "Søppel"
 
-#: mail/mail-ops.c:1180
+#: mail/mail-ops.c:1194
 msgid "Forwarded messages"
 msgstr "Videresendte meldinger"
 
-#: mail/mail-ops.c:1223
+#: mail/mail-ops.c:1237
 #, c-format
 msgid "Opening folder %s"
 msgstr "Åpner mappe %s"
 
-#: mail/mail-ops.c:1295
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Opening store %s"
 msgstr "Åpner lager %s"
 
-#: mail/mail-ops.c:1364
+#: mail/mail-ops.c:1378
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjerner mappe %s"
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1472
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrer mappe '%s'"
 
-#: mail/mail-ops.c:1509
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Oppfrisker mappe"
 
-#: mail/mail-ops.c:1545
+#: mail/mail-ops.c:1559
 msgid "Expunging folder"
 msgstr "Tømmer mappe"
 
-#: mail/mail-ops.c:1594
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Henter melding %s"
 
-#: mail/mail-ops.c:1661
+#: mail/mail-ops.c:1675
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Henter %d melding(er)"
 
-#: mail/mail-ops.c:1747
+#: mail/mail-ops.c:1761
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Lagrer %d melding(er)"
 
-#: mail/mail-ops.c:1859
+#: mail/mail-ops.c:1873
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -9646,7 +9678,7 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1901
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -9655,11 +9687,11 @@ msgstr ""
 "Feil under lagring av av meldinger til: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1961
+#: mail/mail-ops.c:1975
 msgid "Saving attachment"
 msgstr "Lagrer vedlegg"
 
-#: mail/mail-ops.c:1977
+#: mail/mail-ops.c:1991
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -9668,17 +9700,17 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2008
+#: mail/mail-ops.c:2022
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: mail/mail-ops.c:2077
+#: mail/mail-ops.c:2091
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kobler fra %s"
 
-#: mail/mail-ops.c:2078
+#: mail/mail-ops.c:2092
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Kobler til %s på nytt"
@@ -9880,7 +9912,7 @@ msgstr "%a %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2334
+#: mail/message-list.c:2327
 msgid "Generating message list"
 msgstr "Genererer meldingsliste"
 
@@ -9981,11 +10013,11 @@ msgstr "Avtaler"
 msgid "No appointments"
 msgstr "Ingen avtaler"
 
-#: my-evolution/e-summary-calendar.c:364
-msgid "%k%M %d %B"
-msgstr "%k%M %d %B"
+#: my-evolution/e-summary-calendar.c:363
+msgid "%k:%M %d %B"
+msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:366
+#: my-evolution/e-summary-calendar.c:365
 msgid "%l:%M %d %B"
 msgstr "%l: %M %d %B"
 
@@ -11597,11 +11629,11 @@ msgstr "Ny..."
 msgid "(Untitled)"
 msgstr "(Uten navn)"
 
-#: shell/e-shell-importer.c:141
+#: shell/e-shell-importer.c:142
 msgid "Choose the type of importer to run"
 msgstr "Velg type importerer som skal kjøres"
 
-#: shell/e-shell-importer.c:144
+#: shell/e-shell-importer.c:145
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11615,13 +11647,13 @@ msgstr ""
 "Du kan velge \"Automatisk\" hvis du ikke vet, så vil Evolution prøve å finne "
 "ut hvilken type det er for deg."
 
-#: shell/e-shell-importer.c:150
+#: shell/e-shell-importer.c:151
 msgid "Please select the information that you would like to import"
 msgstr "Vennligst velg informasjon du ønsker å importere"
 
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:242
+#: shell/e-shell-importer.c:243
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11632,7 +11664,7 @@ msgstr ""
 "Importerer ikke klar.\n"
 "Venter 5 sekunder før nytt forsøk."
 
-#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
+#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11641,16 +11673,16 @@ msgstr ""
 "Importerer %s\n"
 "Importerer oppføring %d."
 
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:397
 #, c-format
 msgid "File %s does not exist"
 msgstr "Filen %s eksisterer ikke"
 
-#: shell/e-shell-importer.c:408
+#: shell/e-shell-importer.c:409
 msgid "You may only import to local folders"
 msgstr "Du kan kun importere til lokale mapper"
 
-#: shell/e-shell-importer.c:423
+#: shell/e-shell-importer.c:424
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -11659,11 +11691,11 @@ msgstr ""
 "Ingen importerer som kan håndtere\n"
 "%s"
 
-#: shell/e-shell-importer.c:433
+#: shell/e-shell-importer.c:434
 msgid "Importing"
 msgstr "Importerer"
 
-#: shell/e-shell-importer.c:441
+#: shell/e-shell-importer.c:442
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -11672,17 +11704,17 @@ msgstr ""
 "Importerer %s.\n"
 "Starter %s"
 
-#: shell/e-shell-importer.c:454
+#: shell/e-shell-importer.c:455
 #, c-format
 msgid "Error starting %s"
 msgstr "Feil under start av %s"
 
-#: shell/e-shell-importer.c:473
+#: shell/e-shell-importer.c:474
 #, c-format
 msgid "Error loading %s"
 msgstr "Feil under lasting av %s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11691,31 +11723,31 @@ msgstr ""
 "Importerer %s\n"
 "Importerer oppføring 1."
 
-#: shell/e-shell-importer.c:560
+#: shell/e-shell-importer.c:561
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: shell/e-shell-importer.c:611
+#: shell/e-shell-importer.c:612
 msgid "Filename:"
 msgstr "Filnavn:"
 
-#: shell/e-shell-importer.c:616
+#: shell/e-shell-importer.c:617
 msgid "Select a file"
 msgstr "Velg en fil"
 
-#: shell/e-shell-importer.c:626
+#: shell/e-shell-importer.c:627
 msgid "File type:"
 msgstr "Filtype:"
 
-#: shell/e-shell-importer.c:651
+#: shell/e-shell-importer.c:652
 msgid "Import data and settings from older programs"
 msgstr "Importer data og innstillinger fra andre programmer"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:656
 msgid "Import a single file"
 msgstr "Importer en enkelt fil"
 
-#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:574
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:576
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -11723,24 +11755,24 @@ msgstr ""
 "Vennligst vent...\n"
 "Søker etter eksisterende oppsett"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:577
+#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:579
 msgid "Starting Intelligent Importers"
 msgstr "Starter intelligent import"
 
-#: shell/e-shell-importer.c:846 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:847 shell/e-shell-startup-wizard.c:700
 #, c-format
 msgid "From %s:"
 msgstr "Fra %s:"
 
-#: shell/e-shell-importer.c:1009
+#: shell/e-shell-importer.c:1010
 msgid "Select folder"
 msgstr "Velg mappe"
 
-#: shell/e-shell-importer.c:1010
+#: shell/e-shell-importer.c:1011
 msgid "Select a destination folder for importing this data"
 msgstr "Velg en målmappe for å importere data"
 
-#: shell/e-shell-importer.c:1122 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1123 shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Importer"
 
@@ -11757,7 +11789,7 @@ msgstr ""
 "(%s:%d)Kunne ikke starte assistent-grensesnittet for Evolution\n"
 "%s"
 
-#: shell/e-shell-startup-wizard.c:740
+#: shell/e-shell-startup-wizard.c:742
 msgid ""
 "Please select the information\n"
 "that you would like to import"
@@ -11872,7 +11904,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikke sette opp lokal lagring -- %s"
 
-#: shell/e-shell.c:1499
+#: shell/e-shell.c:1507
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -11883,23 +11915,23 @@ msgstr ""
 "har avsluttet uventet. Du vil måtte avslutte Evolution og starte på\n"
 "nytt for å få tilgang til disse dataene igjen."
 
-#: shell/e-shell.c:1722 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1730 widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
 
-#: shell/e-shell.c:1724
+#: shell/e-shell.c:1732
 msgid "Invalid arguments"
 msgstr "Ugyldige argumenter"
 
-#: shell/e-shell.c:1726
+#: shell/e-shell.c:1734
 msgid "Cannot register on OAF"
 msgstr "Kan ikke registrere i OAF"
 
-#: shell/e-shell.c:1728
+#: shell/e-shell.c:1736
 msgid "Configuration Database not found"
 msgstr "Konfigurasjonsdatabase ikke funnet"
 
-#: shell/e-shell.c:1730 shell/e-storage.c:501
+#: shell/e-shell.c:1738 shell/e-storage.c:501
 msgid "Generic error"
 msgstr "Vanlig feil"
 
@@ -12058,29 +12090,37 @@ msgid "Not enough space to create the folder"
 msgstr "Ikke nok plass til å opprette mappen"
 
 #: shell/e-storage.c:511
+msgid "The folder is not empty"
+msgstr "Mappen er ikke tom"
+
+#: shell/e-storage.c:513
 msgid "The specified folder was not found"
 msgstr "Spesifisert mappe ble ikke funnet"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:515
 msgid "Function not implemented in this storage"
 msgstr "Funksjonen er ikke implementert i dette lageret"
 
-#: shell/e-storage.c:517
+#: shell/e-storage.c:519
 msgid "Operation not supported"
 msgstr "Operasjonen er ikke støttet"
 
-#: shell/e-storage.c:519
+#: shell/e-storage.c:521
 msgid "The specified type is not supported in this storage"
 msgstr "Spesifisert type er ikke støttet for dette lageret"
 
-#: shell/e-storage.c:521
+#: shell/e-storage.c:523
 msgid "The specified folder cannot be modified or removed"
 msgstr "Spesifisert mappe kan ikke endres eller fjernes"
 
-#: shell/e-storage.c:523
+#: shell/e-storage.c:525
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Kan ikke gjøre en mappe til barn av en av sine etterkommere"
 
+#: shell/e-storage.c:527
+msgid "Cannot create a folder with that name"
+msgstr "Kunne ikke opprette en mappe med det navnet"
+
 #: shell/e-task-widget.c:192
 #, c-format
 msgid "%s (...)"
@@ -12091,6 +12131,103 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fullført)"
 
+#: shell/evolution-shell-component.c:946
+msgid "CORBA error"
+msgstr "CORBA-feil"
+
+#: shell/evolution-shell-component.c:948
+msgid "Interrupted"
+msgstr "Avbrutt"
+
+#: shell/evolution-shell-component.c:950
+msgid "Invalid argument"
+msgstr "Ugyldig argument"
+
+#: shell/evolution-shell-component.c:952
+msgid "Already has an owner"
+msgstr "Har allerede en eier"
+
+#: shell/evolution-shell-component.c:954
+msgid "No owner"
+msgstr "Ingen eier"
+
+#: shell/evolution-shell-component.c:956
+msgid "Not found"
+msgstr "Ikke funnet"
+
+#: shell/evolution-shell-component.c:958
+msgid "Unsupported type"
+msgstr "Ustøttet type"
+
+#: shell/evolution-shell-component.c:960
+msgid "Unsupported schema"
+msgstr "Ustøttet schema"
+
+#: shell/evolution-shell-component.c:962
+msgid "Unsupported operation"
+msgstr "Ustøttet operasjon"
+
+#: shell/evolution-shell-component.c:964
+msgid "Internal error"
+msgstr "Intern feil"
+
+#: shell/evolution-shell-component.c:968
+msgid "Exists"
+msgstr "Eksisterer"
+
+#: shell/evolution-shell-component.c:970
+msgid "Invalid URI"
+msgstr "Ugyldig URI"
+
+#: shell/evolution-shell-component.c:974
+msgid "Has subfolders"
+msgstr "Har undermapper"
+
+#: shell/evolution-shell-component.c:976
+msgid "No space left"
+msgstr "Ingen plass igjen"
+
+#: shell/evolution-shell-component.c:978
+msgid "Old owner has died"
+msgstr "Gammel eier er død"
+
+#: shell/evolution-shell-component-utils.c:125
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+"%s\n"
+"\n"
+"Ukjent feil."
+
+#: shell/evolution-shell-component-utils.c:128
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Feilen fra komponentsystemet er:\n"
+"%s"
+
+#: shell/evolution-shell-component-utils.c:135
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Feilen fra aktiveringssystemet er:\n"
+"%s"
+
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active connections"
 msgstr "Aktive tilkoblinger"
@@ -12254,15 +12391,15 @@ msgstr "Kan ikke aksessere Ximian Evolution-skallet."
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Kan ikke initiere Ximian Evolution-skallet: %s"
 
-#: shell/main.c:346
+#: shell/main.c:344
 msgid "Disable splash screen"
 msgstr "Deaktiver splash"
 
-#: shell/main.c:347
+#: shell/main.c:345
 msgid "Send the debugging output of all components to a file."
 msgstr "Send feilsøkingsutskrift for alle komponentene til en fil."
 
-#: shell/main.c:389
+#: shell/main.c:387
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kunne ikke initialisere Bonobo komponentsystemet."
 
@@ -13863,11 +14000,13 @@ msgstr "Sø_k"
 msgid "Find Now"
 msgstr "Finn nå "
 
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 #: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
 #: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
 msgid "The Personal Addressbook Server"
 msgstr "Personlig adressebok-tjener"
 
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
 #: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:2
 #: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:2
 msgid "The Personal Calendar Server; calendar factory"
@@ -13885,6 +14024,12 @@ msgstr "init_corba(): kunne ikke initiere GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 
+#~ msgid "Could not create composer window."
+#~ msgstr "Kan ikke opprette komponeringsvinduet."
+
+#~ msgid "Always encrypt to myself when sending encrypyed mail"
+#~ msgstr "Alltid krypter til meg selv ved sending av kryptert e-post"
+
 #~ msgid "Cannot initialize Evolution's Executive Summary component."
 #~ msgstr "Kan ikke initiere Evolutions sammendragskomponent."
 
@@ -14471,9 +14616,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Delegated From:"
 #~ msgstr "Delegert fra:"
 
-#~ msgid "No one"
-#~ msgstr "Ingen"
-
 #~ msgid "Task"
 #~ msgstr "Oppgave"
 
@@ -15945,9 +16087,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "completed"
 #~ msgstr "ferdig"
 
-#~ msgid "not found"
-#~ msgstr "ikke funnet"
-
 #~ msgid "no /bin/sh"
 #~ msgstr "ingen /bin/sh"
 
@@ -15957,9 +16096,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "autocompleted"
 #~ msgstr "autoutfylt"
 
-#~ msgid "history list empty"
-#~ msgstr "Historikken er tom"
-
 #~ msgid "Command history"
 #~ msgstr "Kommandohistorikk"
 
@@ -18432,9 +18568,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Could not create a tasks file in `%s'"
 #~ msgstr "Kunne ikke opprette oppgavefil i `%s'"
 
-#~ msgid "Could not create a folder in `%s'"
-#~ msgstr "Kunne ikke opprette mappe i `%s'"
-
 #~ msgid "Hide Subject"
 #~ msgstr "Skjul emne"