Updated Norwegian (bokmål) translation. Updated.

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

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

svn path=/trunk/; revision=11883

3 files changed, 1162 insertions, 1077 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 5e310dbd3a..c3fb095315 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-10  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* no.po: Updated Norwegian (bokmål) translation.
+	* POTFILES.in: Updated.
+		
 2001-08-10  Valek Filippov  <frob@df.ru>
 
 	* ru.po: updated russian translation.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c361bdecae..fa32baa741 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -119,6 +119,7 @@ camel/camel-sasl-digest-md5.c
 camel/camel-sasl-kerberos4.c
 camel/camel-sasl-login.c
 camel/camel-sasl-plain.c
+camel/camel-sasl-popb4smtp.c
 camel/camel-search-private.c
 camel/camel-service.c
 camel/camel-session.c
@@ -202,6 +203,7 @@ mail/component-factory.c
 mail/folder-browser-factory.c
 mail/folder-browser-ui.c
 mail/folder-browser.c
+mail/folder-info.c
 mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in
 mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in
 mail/local-config.glade
@@ -232,6 +234,7 @@ mail/message-browser.c
 mail/message-list.c
 mail/message-list.etspec
 mail/subscribe-dialog.c
+mail/subscribe-dialog.etspec
 my-evolution/GNOME_Evolution_Summary.oaf.in
 my-evolution/component-factory.c
 my-evolution/e-summary-calendar.c
@@ -262,6 +265,7 @@ shell/e-shortcuts.c
 shell/e-storage-set-view.c
 shell/e-storage-set-view.etspec
 shell/e-storage.c
+shell/e-summary-storage.c
 shell/e-task-widget.c
 shell/glade/e-active-connection-dialog.glade
 shell/glade/e-shell-folder-creation-dialog.glade
diff --git a/po/no.po b/po/no.po
index eb7e3590c1..c4b8224087 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-08-08 14:38+0200\n"
-"PO-Revision-Date: 2001-08-08 14:47+0200\n"
+"POT-Creation-Date: 2001-08-10 18:42+0200\n"
+"PO-Revision-Date: 2001-08-10 19:31+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -21,11 +21,11 @@ msgstr "Factory for import av VCard-filer til Evolution."
 msgid "Imports VCard files into Evolution."
 msgstr "Importerer VCard-filer til Evolution."
 
-#: addressbook/backend/ebook/e-card.c:3601
+#: addressbook/backend/ebook/e-card.c:3624
 msgid "Card: "
 msgstr "Kort: "
 
-#: addressbook/backend/ebook/e-card.c:3603
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Name: "
@@ -33,7 +33,7 @@ msgstr ""
 "\n"
 "Navn:"
 
-#: addressbook/backend/ebook/e-card.c:3604
+#: addressbook/backend/ebook/e-card.c:3627
 msgid ""
 "\n"
 "  Prefix:     "
@@ -41,7 +41,7 @@ msgstr ""
 "\n"
 "Prefiks:    "
 
-#: addressbook/backend/ebook/e-card.c:3605
+#: addressbook/backend/ebook/e-card.c:3628
 msgid ""
 "\n"
 "  Given:      "
@@ -49,7 +49,7 @@ msgstr ""
 "\n"
 "Oppgitt:     "
 
-#: addressbook/backend/ebook/e-card.c:3606
+#: addressbook/backend/ebook/e-card.c:3629
 msgid ""
 "\n"
 "  Additional: "
@@ -57,7 +57,7 @@ msgstr ""
 "\n"
 "Tillegg: "
 
-#: addressbook/backend/ebook/e-card.c:3607
+#: addressbook/backend/ebook/e-card.c:3630
 msgid ""
 "\n"
 "  Family:     "
@@ -65,7 +65,7 @@ msgstr ""
 "\n"
 "Familie:    "
 
-#: addressbook/backend/ebook/e-card.c:3608
+#: addressbook/backend/ebook/e-card.c:3631
 msgid ""
 "\n"
 "  Suffix:     "
@@ -73,7 +73,7 @@ msgstr ""
 "\n"
 "Suffiks:    "
 
-#: addressbook/backend/ebook/e-card.c:3622
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "Birth Date: "
@@ -81,7 +81,7 @@ msgstr ""
 "\n"
 "Fødselsdato: "
 
-#: addressbook/backend/ebook/e-card.c:3633
+#: addressbook/backend/ebook/e-card.c:3656
 msgid ""
 "\n"
 "Address:"
@@ -89,7 +89,7 @@ msgstr ""
 "\n"
 "Adresse:"
 
-#: addressbook/backend/ebook/e-card.c:3635
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -97,7 +97,7 @@ msgstr ""
 "\n"
 "Postboks:  "
 
-#: addressbook/backend/ebook/e-card.c:3636
+#: addressbook/backend/ebook/e-card.c:3659
 msgid ""
 "\n"
 "  Ext:         "
@@ -105,7 +105,7 @@ msgstr ""
 "\n"
 "Linje:         "
 
-#: addressbook/backend/ebook/e-card.c:3637
+#: addressbook/backend/ebook/e-card.c:3660
 msgid ""
 "\n"
 "  Street:      "
@@ -113,7 +113,7 @@ msgstr ""
 "\n"
 "Gate:     "
 
-#: addressbook/backend/ebook/e-card.c:3638
+#: addressbook/backend/ebook/e-card.c:3661
 msgid ""
 "\n"
 "  City:        "
@@ -121,7 +121,7 @@ msgstr ""
 "\n"
 "By:          "
 
-#: addressbook/backend/ebook/e-card.c:3639
+#: addressbook/backend/ebook/e-card.c:3662
 msgid ""
 "\n"
 "  Region:      "
@@ -129,7 +129,7 @@ msgstr ""
 "\n"
 "Region:     "
 
-#: addressbook/backend/ebook/e-card.c:3640
+#: addressbook/backend/ebook/e-card.c:3663
 msgid ""
 "\n"
 "  Postal Code: "
@@ -137,7 +137,7 @@ msgstr ""
 "\n"
 "Postnummer: "
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3664
 msgid ""
 "\n"
 "  Country:     "
@@ -145,7 +145,7 @@ msgstr ""
 "\n"
 "Land:    "
 
-#: addressbook/backend/ebook/e-card.c:3654
+#: addressbook/backend/ebook/e-card.c:3677
 msgid ""
 "\n"
 "Delivery Label: "
@@ -153,7 +153,7 @@ msgstr ""
 "\n"
 "Leveringsetikett: "
 
-#: addressbook/backend/ebook/e-card.c:3666
+#: addressbook/backend/ebook/e-card.c:3689
 msgid ""
 "\n"
 "Telephones:\n"
@@ -161,7 +161,7 @@ msgstr ""
 "\n"
 "Telefoner:\n"
 
-#: addressbook/backend/ebook/e-card.c:3669
+#: addressbook/backend/ebook/e-card.c:3692
 msgid ""
 "\n"
 "Telephone:"
@@ -169,7 +169,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3693
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "E-mail:\n"
@@ -177,7 +177,7 @@ msgstr ""
 "\n"
 "E-post:\n"
 
-#: addressbook/backend/ebook/e-card.c:3696
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "E-mail:"
@@ -185,7 +185,7 @@ msgstr ""
 "\n"
 "E-post:"
 
-#: addressbook/backend/ebook/e-card.c:3715
+#: addressbook/backend/ebook/e-card.c:3738
 msgid ""
 "\n"
 "Mailer: "
@@ -193,7 +193,7 @@ msgstr ""
 "\n"
 "E-post program: "
 
-#: addressbook/backend/ebook/e-card.c:3721
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "Time Zone: "
@@ -201,7 +201,7 @@ msgstr ""
 "\n"
 "Tidssone: "
 
-#: addressbook/backend/ebook/e-card.c:3729
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "Geo Location: "
@@ -209,7 +209,7 @@ msgstr ""
 "\n"
 "Geografisk lokasjon: "
 
-#: addressbook/backend/ebook/e-card.c:3733
+#: addressbook/backend/ebook/e-card.c:3756
 msgid ""
 "\n"
 "Business Role: "
@@ -217,7 +217,7 @@ msgstr ""
 "\n"
 "Stilling: "
 
-#: addressbook/backend/ebook/e-card.c:3745
+#: addressbook/backend/ebook/e-card.c:3768
 msgid ""
 "\n"
 "Org: "
@@ -225,7 +225,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3746
+#: addressbook/backend/ebook/e-card.c:3769
 msgid ""
 "\n"
 "  Name:  "
@@ -233,7 +233,7 @@ msgstr ""
 "\n"
 "Navn:  "
 
-#: addressbook/backend/ebook/e-card.c:3747
+#: addressbook/backend/ebook/e-card.c:3770
 msgid ""
 "\n"
 "  Unit:  "
@@ -241,7 +241,7 @@ msgstr ""
 "\n"
 "Enhet:  "
 
-#: addressbook/backend/ebook/e-card.c:3748
+#: addressbook/backend/ebook/e-card.c:3771
 msgid ""
 "\n"
 "  Unit2: "
@@ -249,7 +249,7 @@ msgstr ""
 "\n"
 "Enhet2: "
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "  Unit3: "
@@ -257,7 +257,7 @@ msgstr ""
 "\n"
 "Enhet3: "
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3773
 msgid ""
 "\n"
 "  Unit4: "
@@ -265,7 +265,7 @@ msgstr ""
 "\n"
 "Enhet4: "
 
-#: addressbook/backend/ebook/e-card.c:3754
+#: addressbook/backend/ebook/e-card.c:3777
 msgid ""
 "\n"
 "Categories: "
@@ -273,7 +273,7 @@ msgstr ""
 "\n"
 "Kategorier: "
 
-#: addressbook/backend/ebook/e-card.c:3755
+#: addressbook/backend/ebook/e-card.c:3778
 msgid ""
 "\n"
 "Comment: "
@@ -291,7 +291,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3768
+#: addressbook/backend/ebook/e-card.c:3791
 msgid ""
 "\n"
 "Unique String: "
@@ -299,7 +299,7 @@ msgstr ""
 "\n"
 "Unik streng: "
 
-#: addressbook/backend/ebook/e-card.c:3771
+#: addressbook/backend/ebook/e-card.c:3794
 msgid ""
 "\n"
 "Public Key: "
@@ -307,11 +307,11 @@ msgstr ""
 "\n"
 "Offentlig nøkkel: "
 
-#: addressbook/backend/ebook/e-card.c:4043
+#: addressbook/backend/ebook/e-card.c:4066
 msgid "Multiple VCards"
 msgstr "Flere VCard"
 
-#: addressbook/backend/ebook/e-card.c:4051
+#: addressbook/backend/ebook/e-card.c:4074
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard for %s"
@@ -397,188 +397,152 @@ msgstr "Factory for Evolution adressebok-komponent."
 msgid "Factory for the sample Addressbook control"
 msgstr "Factory for eksempelkontroll for adressebok"
 
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
-msgstr "LDAP-tjener"
-
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
-msgstr "Fil"
+#: addressbook/gui/component/addressbook-config.c:144
+msgid "Edit Addressbook"
+msgstr "Rediger adressebok"
 
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
-msgstr "Ukjent type adressebok"
+#: addressbook/gui/component/addressbook-config.glade.h:1
+msgid "389"
+msgstr "389"
 
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr "Ingen (anonym modus)"
+#: addressbook/gui/component/addressbook-config.glade.h:2
+msgid "Account Name"
+msgstr "Kontonavn"
 
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:51
-msgid "Password"
-msgstr "Passord"
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Add Addressbook"
+msgstr "Legg til adressebok"
 
-#: addressbook/gui/component/addressbook-config.c:168
-msgid "Unknown auth type"
-msgstr "Ukjent autentiseringstype"
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "Advanced"
+msgstr "Avansert"
 
-#: addressbook/gui/component/addressbook-config.c:177
+#: addressbook/gui/component/addressbook-config.glade.h:5
 msgid "Base"
 msgstr "Basis"
 
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "One"
-msgstr "En"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Subtree"
-msgstr "Undertre"
-
-#: addressbook/gui/component/addressbook-config.c:184
-msgid "Unknown scope type"
-msgstr "Ukjent type område"
-
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "Bind DN:"
-msgstr "Bind DN:"
-
-#: addressbook/gui/component/addressbook-config.c:350
-msgid "FIXME Bind DN Help text here"
-msgstr ""
-
-#. Remember the password?
-#: addressbook/gui/component/addressbook-config.c:352 mail/mail-mt.c:439
-msgid "Remember this password"
-msgstr "Husk dette passordet"
-
-#: addressbook/gui/component/addressbook-config.c:403
-msgid "Host:"
-msgstr "Vert:"
-
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "FIXME Host help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:406
-msgid "Root DN:"
-msgstr "Rot DN:"
-
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Root DN help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:411
-msgid "Port:"
-msgstr "Port:"
-
-#: addressbook/gui/component/addressbook-config.c:412
-msgid "FIXME Port help text here."
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:151
+#, fuzzy
+msgid "Basic"
+msgstr "Grunnleggende"
 
-#: addressbook/gui/component/addressbook-config.c:432
-msgid "Search Scope:"
-msgstr "Søkeområde:"
+#: addressbook/gui/component/addressbook-config.glade.h:7
+msgid "De_lete"
+msgstr "S_lett"
 
-#: addressbook/gui/component/addressbook-config.c:479
-msgid "Authentication:"
-msgstr "Autentisering:"
+#: addressbook/gui/component/addressbook-config.glade.h:8
+msgid "One"
+msgstr "En"
 
-#: addressbook/gui/component/addressbook-config.c:501
-msgid "Advanced LDAP Options"
-msgstr "Avanserte LDAP-alternativer"
+#: addressbook/gui/component/addressbook-config.glade.h:9
+msgid "Search _base:"
+msgstr "Søke_basis:"
 
-#: addressbook/gui/component/addressbook-config.c:522
-msgid "Path:"
-msgstr "Sti:"
+#: addressbook/gui/component/addressbook-config.glade.h:10
+msgid "Search s_cope: "
+msgstr "Sø_keområde:"
 
-#: addressbook/gui/component/addressbook-config.c:523
-msgid "FIXME Path Help text here"
-msgstr "Hjelp for stier her?"
+#: addressbook/gui/component/addressbook-config.glade.h:11
+msgid "Server Name"
+msgstr "Tjenernavn:"
 
-#: addressbook/gui/component/addressbook-config.c:528
-msgid "Create path if it doesn't exist."
-msgstr "Opprett sti hvis den ikke eksisterer."
+#: addressbook/gui/component/addressbook-config.glade.h:12
+msgid "Sub"
+msgstr "Under"
 
-#: addressbook/gui/component/addressbook-config.c:663
-msgid "Edit Addressbook"
-msgstr "Rediger adressebok"
+#: addressbook/gui/component/addressbook-config.glade.h:13
+msgid "The information below is required in order to add an addressbook.  "
+msgstr "Informasjonen under kreves for å legge til en adressebok."
 
-#: addressbook/gui/component/addressbook-config.c:665
-msgid "Add Addressbook"
-msgstr "Legg til adressebok"
+#: addressbook/gui/component/addressbook-config.glade.h:14
+msgid "This information is not required for most ldap servers. "
+msgstr "Denne informasjonen kreves ikke for de fleste ldap-tjenere."
 
-#: addressbook/gui/component/addressbook-config.c:683
+#: addressbook/gui/component/addressbook-config.glade.h:15
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr "Velg type adressebok du har, og skriv inn relevant informasjon om den."
+"This information is used by your ldap server to specify which nodes are used "
+"in a search. Contact your server administrator for more information."
+msgstr "Denne informasjonen brukes av din ldap-tjener for å spesifisere hvilke noder som brukes i et søk. Kontakt din administrator for mer informasjon."
 
-#: addressbook/gui/component/addressbook-config.c:691
-#: my-evolution/e-summary-preferences.c:881
-msgid "Name:"
-msgstr "Navn:"
-
-#: addressbook/gui/component/addressbook-config.c:692
-msgid "FIXME Name help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:694
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2
-msgid "Description:"
-msgstr "Beskrivelse:"
-
-#: addressbook/gui/component/addressbook-config.c:695
-msgid "FIXME Description help text here"
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:16
+msgid ""
+"This is the base node for all your searches on the ldap server. Contact your "
+"server administrator for more information."
+msgstr "Dette er basisnoden for alle dine søk på ldap-tjeneren. Kontakt din administrator for mer informasjon."
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "Addressbook Sources"
-msgstr "Adressebok-kilder"
+#: addressbook/gui/component/addressbook-config.glade.h:17
+msgid "This is the name of the server where your addressbook is located."
+msgstr "Dette er navnet på tjeneren hvor din adressebok er lokalisert."
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "De_lete"
-msgstr "S_lett"
+#: addressbook/gui/component/addressbook-config.glade.h:18
+msgid "This is the port that your ldap server uses."
+msgstr "Dette er porten som din ldap-tjener bruker."
 
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "Name"
-msgstr "Navn"
+#: addressbook/gui/component/addressbook-config.glade.h:19
+msgid ""
+"This name will be used to identify your account. It is for display purposes "
+"only."
+msgstr "Dette navnet vil brukes til å indentifisere din konto. Det brukes kun for visning på skjermen."
 
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "URI"
-msgstr "URI"
+#: addressbook/gui/component/addressbook-config.glade.h:20
+msgid "_Account name:"
+msgstr "Konton_avn:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/component/addressbook-config.glade.h:21
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:9 mail/mail-config.glade.h:87
+#: calendar/gui/dialogs/alarm-page.glade.h:9 mail/mail-config.glade.h:88
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Add"
 msgstr "_Legg til"
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
-#: mail/mail-config.glade.h:92 ui/evolution-mail-messagedisplay.xml.h:6
+#: addressbook/gui/component/addressbook-config.glade.h:22
+#: mail/mail-config.glade.h:93 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:40
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: addressbook/gui/component/addressbook-storage.c:131
+#: addressbook/gui/component/addressbook-config.glade.h:23
+msgid "_My server requires authentication"
+msgstr "_Min tjener krever autentisering"
+
+#: addressbook/gui/component/addressbook-config.glade.h:24
+msgid "_Port:"
+msgstr "_Port:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:25
+msgid "_Server name:"
+msgstr "_Tjenernavn:"
+
+#: addressbook/gui/component/addressbook-storage.c:135
 msgid "Other Contacts"
 msgstr "Andre kontakter"
 
-#: addressbook/gui/component/addressbook.c:379
+#: addressbook/gui/component/addressbook.c:371
 #, c-format
-msgid "Enter password for %s"
-msgstr "Skriv inn passord for %s"
+msgid "Please enter your email address and password for access to %s"
+msgstr "Vennligst skriv inn din e-postadresse og passord for tilgang til %s"
+
+#: addressbook/gui/component/addressbook.c:379
+msgid "LDAP Authentication"
+msgstr "LDAP-autentisering"
 
-#: addressbook/gui/component/addressbook.c:407
+#: addressbook/gui/component/addressbook.c:390
+msgid "Email Address:"
+msgstr "E-post adresse:"
+
+#: addressbook/gui/component/addressbook.c:403
+msgid "Password:"
+msgstr "Passord:"
+
+#: addressbook/gui/component/addressbook.c:466
 msgid "Unable to open addressbook"
 msgstr "Kunne ikke åpne adresseboken"
 
-#: addressbook/gui/component/addressbook.c:414
+#: addressbook/gui/component/addressbook.c:473
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -588,7 +552,7 @@ msgstr ""
 "at du har skrevet inn en ugyldig URI, eller at LDAP-tjeneren\n"
 "er nede"
 
-#: addressbook/gui/component/addressbook.c:419
+#: addressbook/gui/component/addressbook.c:478
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -600,7 +564,7 @@ msgstr ""
 "må du kompilere programmet fra kildekoden i CVS etter å\n"
 "ha hentet OpenLDAP fra lenken under.\n"
 
-#: addressbook/gui/component/addressbook.c:427
+#: addressbook/gui/component/addressbook.c:486
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -608,29 +572,29 @@ msgstr ""
 "Kunne ikke åpne denne adresseboken. Vennligst sjekk at stien\n"
 "eksisterer og at du har rettigheter til å aksessere den."
 
-#: addressbook/gui/component/addressbook.c:578
+#: addressbook/gui/component/addressbook.c:637
 #: calendar/gui/cal-search-bar.c:54
 msgid "Any field contains"
 msgstr "Et felt inneholder"
 
-#: addressbook/gui/component/addressbook.c:579
+#: addressbook/gui/component/addressbook.c:638
 msgid "Name contains"
 msgstr "Navn inneholder"
 
-#: addressbook/gui/component/addressbook.c:580
+#: addressbook/gui/component/addressbook.c:639
 msgid "Email contains"
 msgstr "E-post inneholder"
 
-#: addressbook/gui/component/addressbook.c:581
+#: addressbook/gui/component/addressbook.c:640
 msgid "Category contains"
 msgstr "Kategori inneholder"
 
-#: addressbook/gui/component/addressbook.c:582 widgets/misc/e-filter-bar.h:97
+#: addressbook/gui/component/addressbook.c:641 widgets/misc/e-filter-bar.h:97
 #: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Avansert..."
 
-#: addressbook/gui/component/addressbook.c:741
+#: addressbook/gui/component/addressbook.c:800
 msgid "The URI that the Folder Browser will display"
 msgstr "URIen som mappeutforskeren vil vise"
 
@@ -645,19 +609,19 @@ msgstr "(ingen)"
 
 #: addressbook/gui/component/e-address-popup.c:466
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: addressbook/gui/contact-editor/e-contact-editor.c:1549
+#: addressbook/gui/contact-editor/e-contact-editor.c:1581
 msgid "Primary Email"
 msgstr "Primær e-post"
 
 #: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1550
-#: addressbook/gui/widgets/e-addressbook-view.c:797
+#: addressbook/gui/contact-editor/e-contact-editor.c:1582
+#: addressbook/gui/widgets/e-addressbook-view.c:801
 msgid "Email 2"
 msgstr "E-post 2"
 
 #: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1551
-#: addressbook/gui/widgets/e-addressbook-view.c:798
+#: addressbook/gui/contact-editor/e-contact-editor.c:1583
+#: addressbook/gui/widgets/e-addressbook-view.c:802
 msgid "Email 3"
 msgstr "E-post 3"
 
@@ -712,13 +676,10 @@ 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:156
-#: addressbook/gui/component/select-names/e-select-names.c:634
+#: addressbook/gui/component/select-names/e-select-names.c:639
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c:550 filter/filter.glade.h:9
-#: my-evolution/e-summary-preferences.c:1168
-#: my-evolution/e-summary-preferences.c:1218
-#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:205
-#: shell/e-shortcuts-view.c:414
+#: filter/filter-rule.c:543 filter/filter.glade.h:9
+#: shell/e-shortcuts-view.c:176 shell/e-shortcuts-view.c:385
 msgid "Remove"
 msgstr "Fjern"
 
@@ -739,25 +700,32 @@ msgid "Unable to get local storage.  This should never happen."
 msgstr "Kunne ikke finne lokalt lager. Burde aldri skje."
 
 #: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "C_ontaining:"
+msgstr "Inneh_older:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "F_ind"
+msgstr "F_inn"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
 msgid "Message Recipients"
 msgstr "Meldingsmottakere:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:2
+#: addressbook/gui/component/select-names/select-names.glade.h:4
 msgid "Select Names"
 msgstr "Velg navn"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select name from _folder:"
-msgstr "Velg navn fra _mappe:"
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+msgid "Show contacts matching the following criteria:"
+msgstr "Vis kontakter som møter følgende kriterier:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:4
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "_Category:"
 msgstr "_Kategori:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "_Søk"
+#: addressbook/gui/component/select-names/select-names.glade.h:7
+msgid "_Folder:"
+msgstr "_Mappe:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
@@ -773,7 +741,7 @@ msgstr "_Faks på arbeid"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:4
 #: calendar/gui/dialogs/event-page.glade.h:3
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Ka_tegorier..."
 
@@ -782,7 +750,7 @@ msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor.c:135
+#: calendar/gui/dialogs/task-editor.c:156
 msgid "Details"
 msgstr "Detaljer"
 
@@ -837,16 +805,15 @@ msgstr "Ar_beid"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:20
+#: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "_Kontakter..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #: calendar/gui/dialogs/alarm-page.glade.h:10
-#: calendar/gui/dialogs/meeting-page.c:1447
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1313
-#: mail/mail-config.glade.h:91 ui/evolution-mail-message.xml.h:87
-#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:42
+#: calendar/gui/dialogs/meeting-page.c:1472 mail/folder-browser.c:1313
+#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:88
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:39
 msgid "_Delete"
 msgstr "_Slett"
 
@@ -898,113 +865,112 @@ msgstr "De_tte er postadressen"
 msgid "Delete Contact?"
 msgstr "Slett kontakt?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:722
+#: addressbook/gui/contact-editor/e-contact-editor.c:725
 msgid "This contact belongs to these categories:"
 msgstr "Denne kontakten hører til disse kategoriene:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1507
-#: addressbook/gui/widgets/e-addressbook-view.c:805
+#: addressbook/gui/contact-editor/e-contact-editor.c:1539
+#: addressbook/gui/widgets/e-addressbook-view.c:809
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1508
-#: addressbook/gui/contact-editor/e-contact-editor.c:1575
-#: e-util/e-categories-config.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1540
+#: addressbook/gui/contact-editor/e-contact-editor.c:1607
 msgid "Business"
 msgstr "Arbeid"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1509
+#: addressbook/gui/contact-editor/e-contact-editor.c:1541
 msgid "Business 2"
 msgstr "Arbeid 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1510
-#: addressbook/gui/widgets/e-addressbook-view.c:785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1542
+#: addressbook/gui/widgets/e-addressbook-view.c:789
 msgid "Business Fax"
 msgstr "Faks på arbeid"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/contact-editor/e-contact-editor.c:1543
 msgid "Callback"
 msgstr "Tilbakering"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1512
+#: addressbook/gui/contact-editor/e-contact-editor.c:1544
 msgid "Car"
 msgstr "Bil"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1513
+#: addressbook/gui/contact-editor/e-contact-editor.c:1545
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1514
-#: addressbook/gui/contact-editor/e-contact-editor.c:1576
+#: addressbook/gui/contact-editor/e-contact-editor.c:1546
+#: addressbook/gui/contact-editor/e-contact-editor.c:1608
 msgid "Home"
 msgstr "Hjemme"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1515
+#: addressbook/gui/contact-editor/e-contact-editor.c:1547
 msgid "Home 2"
 msgstr "Hjemme 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1516
-#: addressbook/gui/widgets/e-addressbook-view.c:786
+#: addressbook/gui/contact-editor/e-contact-editor.c:1548
+#: addressbook/gui/widgets/e-addressbook-view.c:790
 msgid "Home Fax"
 msgstr "Faks hjemme"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1517
-#: addressbook/gui/widgets/e-addressbook-view.c:789
+#: addressbook/gui/contact-editor/e-contact-editor.c:1549
+#: addressbook/gui/widgets/e-addressbook-view.c:793
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1518
+#: addressbook/gui/contact-editor/e-contact-editor.c:1550
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1519
-#: addressbook/gui/contact-editor/e-contact-editor.c:1577
-#: mail/mail-config.glade.h:48
+#: addressbook/gui/contact-editor/e-contact-editor.c:1551
+#: addressbook/gui/contact-editor/e-contact-editor.c:1609
+#: mail/mail-config.glade.h:49
 msgid "Other"
 msgstr "Andre"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1520
-#: addressbook/gui/widgets/e-addressbook-view.c:791
+#: addressbook/gui/contact-editor/e-contact-editor.c:1552
+#: addressbook/gui/widgets/e-addressbook-view.c:795
 msgid "Other Fax"
 msgstr "Annen faks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1521
-#: addressbook/gui/widgets/e-addressbook-view.c:792
+#: addressbook/gui/contact-editor/e-contact-editor.c:1553
+#: addressbook/gui/widgets/e-addressbook-view.c:796
 msgid "Pager"
 msgstr "Personsøker"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1522
+#: addressbook/gui/contact-editor/e-contact-editor.c:1554
 msgid "Primary"
 msgstr "Primær"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1523
-#: addressbook/gui/widgets/e-addressbook-view.c:793
+#: addressbook/gui/contact-editor/e-contact-editor.c:1555
+#: addressbook/gui/widgets/e-addressbook-view.c:797
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1524
-#: addressbook/gui/widgets/e-addressbook-view.c:794
+#: addressbook/gui/contact-editor/e-contact-editor.c:1556
+#: addressbook/gui/widgets/e-addressbook-view.c:798
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1525
+#: addressbook/gui/contact-editor/e-contact-editor.c:1557
 msgid "TTY/TDD"
 msgstr "TTY/TTD"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:265
 msgid "Contact Quick-Add"
 msgstr "Hurtigkontakt"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:267
 msgid "Edit Full"
 msgstr "Rediger alt"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:772
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/widgets/e-addressbook-view.c:776
 msgid "Full Name"
 msgstr "Fullt navn"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:299
 msgid "E-mail"
 msgstr "E-post"
 
@@ -1146,6 +1112,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr "_Skjul adresser når du sender e-post til listen"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "_Remove"
 msgstr "Fje_rn"
 
@@ -1154,7 +1121,7 @@ msgid "contact-list-editor"
 msgstr "kontakt-liste-redigering"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
 msgid "Contact List Editor"
 msgstr "Kontaktlisteredigering"
 
@@ -1321,45 +1288,51 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
 #: addressbook/gui/widgets/e-addressbook-view.c:610
-#: addressbook/gui/widgets/e-addressbook-view.c:670
-#: addressbook/gui/widgets/e-addressbook-view.c:1282
+#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/widgets/e-addressbook-view.c:1286
 #: ui/evolution-addressbook.xml.h:18
 msgid "Save as VCard"
 msgstr "Lagre som VCard"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
-#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:265
+#: shell/e-shortcuts-view.c:378 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Åpne"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+#: addressbook/gui/widgets/e-addressbook-view.c:673
 #: ui/evolution-addressbook.xml.h:25
 msgid "Send contact to other"
 msgstr "Send kontakt til andre"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:674
 #: ui/evolution-addressbook.xml.h:26
 msgid "Send message to contact"
 msgstr "Send melding til kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
-#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:675
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:63
 #: ui/evolution-tasks.xml.h:10 ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Skriv ut"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:677
 msgid "Print Envelope"
 msgstr "Skriv ut konvolutt"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-#: addressbook/gui/widgets/e-addressbook-view.c:675 filter/filter.glade.h:2
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:679 filter/filter.glade.h:2
 #: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Slett"
@@ -1375,7 +1348,7 @@ msgid "Success"
 msgstr "Suksess"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1589
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1619
 #: shell/e-storage.c:501
 msgid "Unknown error"
 msgstr "Ukjent feil"
@@ -1425,131 +1398,131 @@ msgid "Error removing list"
 msgstr "Feil ved fjerning av liste"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1155
+#: addressbook/gui/widgets/e-addressbook-view.c:1159
 msgid "Error removing card"
 msgstr "Feil ved fjerning av kort"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:770
+#: addressbook/gui/widgets/e-addressbook-view.c:774
 msgid "* Click here to add a contact *"
 msgstr "* Klikk her for å legge til en kontakt *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:771
+#: addressbook/gui/widgets/e-addressbook-view.c:775
 msgid "File As"
 msgstr "Lagre som"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:773
+#: addressbook/gui/widgets/e-addressbook-view.c:777
 msgid "Email"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:774
+#: addressbook/gui/widgets/e-addressbook-view.c:778
 msgid "Primary Phone"
 msgstr "Primær telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:775
+#: addressbook/gui/widgets/e-addressbook-view.c:779
 msgid "Assistant Phone"
 msgstr "Assistents telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:776
+#: addressbook/gui/widgets/e-addressbook-view.c:780
 msgid "Business Phone"
 msgstr "Arbeidstelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:777
+#: addressbook/gui/widgets/e-addressbook-view.c:781
 msgid "Callback Phone"
 msgstr "Telefon for tilbakeringing"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:778
+#: addressbook/gui/widgets/e-addressbook-view.c:782
 msgid "Company Phone"
 msgstr "Firmatelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:779
+#: addressbook/gui/widgets/e-addressbook-view.c:783
 msgid "Home Phone"
 msgstr "Hjemmetelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:780
+#: addressbook/gui/widgets/e-addressbook-view.c:784
 msgid "Organization"
 msgstr "Organisasjon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:781
+#: addressbook/gui/widgets/e-addressbook-view.c:785
 msgid "Business Address"
 msgstr "Arbeidsadresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:782
+#: addressbook/gui/widgets/e-addressbook-view.c:786
 msgid "Home Address"
 msgstr "Hjemmeadresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:783
+#: addressbook/gui/widgets/e-addressbook-view.c:787
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:784
+#: addressbook/gui/widgets/e-addressbook-view.c:788
 msgid "Car Phone"
 msgstr "Biltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:787
+#: addressbook/gui/widgets/e-addressbook-view.c:791
 msgid "Business Phone 2"
 msgstr "Arbeidstelefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:788
+#: addressbook/gui/widgets/e-addressbook-view.c:792
 msgid "Home Phone 2"
 msgstr "Hjemmetelefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:790
+#: addressbook/gui/widgets/e-addressbook-view.c:794
 msgid "Other Phone"
 msgstr "Annen telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:795
+#: addressbook/gui/widgets/e-addressbook-view.c:799
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:796
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 msgid "Other Address"
 msgstr "Annen adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:799
+#: addressbook/gui/widgets/e-addressbook-view.c:803
 msgid "Web Site"
 msgstr "Nettside"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:800
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 msgid "Department"
 msgstr "Avdeling"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:801
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 msgid "Office"
 msgstr "Kontor"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:802
+#: addressbook/gui/widgets/e-addressbook-view.c:806
 msgid "Title"
 msgstr "Tittel"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:803
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 msgid "Profession"
 msgstr "Yrke"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:804
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 msgid "Manager"
 msgstr "Leder"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:806
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 msgid "Nickname"
 msgstr "Kallenavn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:807
+#: addressbook/gui/widgets/e-addressbook-view.c:811
 msgid "Spouse"
 msgstr "Ektefelle"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:808
+#: addressbook/gui/widgets/e-addressbook-view.c:812
 msgid "Note"
 msgstr "Kommentar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:809
+#: addressbook/gui/widgets/e-addressbook-view.c:813
 msgid "Free-busy URL"
 msgstr "Fri-ledig URL"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1152
+#: addressbook/gui/widgets/e-addressbook-view.c:1156
 msgid "Done."
 msgstr "Ferdig."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1184
+#: addressbook/gui/widgets/e-addressbook-view.c:1188
 msgid "Removing cards..."
 msgstr "Fjerner kort..."
 
@@ -1908,7 +1881,7 @@ msgstr "%A %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1353 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/e-day-view.c:1368 calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -1917,18 +1890,26 @@ msgstr "%a %d %b"
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: calendar/gui/calendar-commands.c:426 calendar/gui/calendar-commands.c:431
-#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:439
-#: widgets/misc/e-calendar-item.c:1068
-msgid "%B %Y"
-msgstr "%B %Y"
+#: calendar/gui/calendar-commands.c:426
+#, c-format
+msgid "%d"
+msgstr "%d"
 
-#: calendar/gui/calendar-commands.c:429
-msgid "%B"
-msgstr "%B"
+#: calendar/gui/calendar-commands.c:428 calendar/gui/calendar-commands.c:435
+#: calendar/gui/calendar-commands.c:441 calendar/gui/calendar-commands.c:443
+msgid "%d %B %Y"
+msgstr "%d %B %Y"
 
-#: calendar/gui/calendar-commands.c:575
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:240
+msgid "%d %B"
+msgstr "%d %B"
+
+#: calendar/gui/calendar-commands.c:579
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -1966,21 +1947,21 @@ msgid "W"
 msgstr "V"
 
 #: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
-#: calendar/gui/dialogs/task-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:639
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:641
 msgid "High"
 msgstr "Høy"
 
 #: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
 #: calendar/gui/calendar-model.c:1624
-#: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:638
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:640
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
-#: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:637
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:639
 msgid "Low"
 msgstr "Lav"
 
@@ -1995,27 +1976,27 @@ msgid "Busy"
 msgstr "Opptatt"
 
 #: calendar/gui/calendar-model.c:680 calendar/gui/calendar-model.c:1192
-#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:401
 msgid "Not Started"
 msgstr "Ikke startet"
 
 #: calendar/gui/calendar-model.c:683 calendar/gui/calendar-model.c:1194
-#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:402
 msgid "In Progress"
 msgstr "Under arbeid"
 
 #: calendar/gui/calendar-model.c:686 calendar/gui/calendar-model.c:1196
-#: calendar/gui/dialogs/meeting-page.c:648
-#: calendar/gui/dialogs/meeting-page.c:671
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:696
+#: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:403
 msgid "Completed"
 msgstr "Fullført"
 
 #: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
-#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
@@ -2062,7 +2043,7 @@ msgstr "Prioriteten må være en av 'Høy', 'Normal', 'Lav' eller 'Udefinert'."
 
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:1105
-#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/dialogs/task-details-page.glade.h:13
 #: calendar/gui/e-calendar-table.c:331
 msgid "Undefined"
 msgstr "Udefinert"
@@ -2070,10 +2051,10 @@ msgstr "Udefinert"
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:1190
 #: calendar/gui/dialogs/e-timezone-dialog.c:202
-#: calendar/gui/dialogs/meeting-page.c:327
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1394
+#: calendar/gui/dialogs/meeting-page.c:368
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1398
 #: mail/mail-accounts.c:134 mail/mail-accounts.c:388
-#: mail/mail-config.glade.h:46 shell/e-shell-view.c:1375
+#: mail/mail-config.glade.h:47 shell/e-shell-view.c:1380
 #: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:437
 #: widgets/misc/e-dateedit.c:1356 widgets/misc/e-dateedit.c:1471
 msgid "None"
@@ -2087,15 +2068,15 @@ msgstr "Gjeninntreffer"
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:620
-#: calendar/gui/dialogs/meeting-page.c:630
-#: calendar/gui/dialogs/meeting-page.c:1158
-#: calendar/gui/dialogs/meeting-page.c:1254
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:655
+#: calendar/gui/dialogs/meeting-page.c:1183
+#: calendar/gui/dialogs/meeting-page.c:1279
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
+#: calendar/gui/dialogs/meeting-page.c:1280
 msgid "No"
 msgstr "Nei"
 
@@ -2127,16 +2108,16 @@ msgstr "Beskrivelse inneholder"
 msgid "Comment contains"
 msgstr "Kommentar inneholder"
 
-#: calendar/gui/cal-search-bar.c:349
+#: calendar/gui/cal-search-bar.c:378
 msgid "Category:"
 msgstr "Kategori:"
 
 #. All, Unmatched, separator items
-#: calendar/gui/cal-search-bar.c:469
+#: calendar/gui/cal-search-bar.c:498
 msgid "All"
 msgstr "Alle"
 
-#: calendar/gui/cal-search-bar.c:474
+#: calendar/gui/cal-search-bar.c:503
 msgid "Unfiled"
 msgstr "Ikke lagret"
 
@@ -2274,11 +2255,11 @@ msgid "Run a program"
 msgstr "Kjør et program"
 
 #: calendar/gui/dialogs/alarm-page.c:349 calendar/gui/dialogs/alarm-page.c:385
-#: calendar/gui/dialogs/meeting-page.c:576
-#: calendar/gui/dialogs/meeting-page.c:611
-#: calendar/gui/dialogs/meeting-page.c:676
-#: calendar/gui/dialogs/meeting-page.c:1226
-#: calendar/gui/dialogs/meeting-page.c:1242
+#: calendar/gui/dialogs/meeting-page.c:601
+#: calendar/gui/dialogs/meeting-page.c:636
+#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:1251
+#: calendar/gui/dialogs/meeting-page.c:1267
 #: camel/providers/smtp/camel-smtp-transport.c:223
 #: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
@@ -2302,13 +2283,11 @@ msgstr "etter avtalens slutt"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
-#: calendar/gui/dialogs/task-details-page.glade.h:1
 msgid "Basics"
 msgstr "Basis"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
 #: calendar/gui/e-itip-control.c:298
 msgid "Date/Time:"
 msgstr "Dato/klokke:"
@@ -2318,8 +2297,7 @@ msgid "Reminders"
 msgstr "Påminnelser"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Sammendrag:"
@@ -2350,7 +2328,7 @@ msgstr "slutt på avtale"
 msgid "hour(s)"
 msgstr "time(r)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:112
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:113
 msgid "minute(s)"
 msgstr "minutt(er)"
 
@@ -2403,7 +2381,7 @@ msgid "Compress weekends in month view"
 msgstr "Komprimer helger i månedsvisning"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:26
 msgid "Display"
 msgstr "Vis"
 
@@ -2585,59 +2563,59 @@ msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Du har ikke gjort endringer. Oppdater redigering?"
 
 #: calendar/gui/dialogs/comp-editor-util.c:154
-#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+#: calendar/gui/e-itip-control.c:630 calendar/gui/print.c:2116
 msgid " to "
 msgstr " til "
 
 #: calendar/gui/dialogs/comp-editor-util.c:158
-#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#: calendar/gui/e-itip-control.c:634 calendar/gui/print.c:2120
 msgid " (Completed "
 msgstr " (Fullført "
 
 #: calendar/gui/dialogs/comp-editor-util.c:160
-#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#: calendar/gui/e-itip-control.c:636 calendar/gui/print.c:2122
 msgid "Completed "
 msgstr "Fullført "
 
 #: calendar/gui/dialogs/comp-editor-util.c:165
-#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+#: calendar/gui/e-itip-control.c:641 calendar/gui/print.c:2127
 msgid " (Due "
 msgstr " (Ferdig "
 
 #: calendar/gui/dialogs/comp-editor-util.c:167
-#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+#: calendar/gui/e-itip-control.c:643 calendar/gui/print.c:2129
 msgid "Due "
 msgstr "Ferdig "
 
-#: calendar/gui/dialogs/comp-editor.c:449
+#: calendar/gui/dialogs/comp-editor.c:454
 msgid "Edit Appointment"
 msgstr "Rediger avtale"
 
-#: calendar/gui/dialogs/comp-editor.c:454
+#: calendar/gui/dialogs/comp-editor.c:459
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:457
+#: calendar/gui/dialogs/comp-editor.c:462
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgave - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:460
+#: calendar/gui/dialogs/comp-editor.c:465
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaloppføring - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:474
+#: calendar/gui/dialogs/comp-editor.c:479
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1477
+#: calendar/gui/dialogs/comp-editor.c:843 mail/mail-callbacks.c:1477
 #: mail/mail-display.c:98
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
-#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1482
+#: calendar/gui/dialogs/comp-editor.c:847 mail/mail-callbacks.c:1482
 #: mail/mail-display.c:102
 msgid ""
 "A file by that name already exists.\n"
@@ -2646,12 +2624,12 @@ msgstr ""
 "En fil med samme navn eksisterer allerede.\n"
 "Overskriv den?"
 
-#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
-#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
+#: calendar/gui/dialogs/comp-editor.c:910 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Lagre som..."
 
-#: calendar/gui/dialogs/comp-editor.c:1026
+#: calendar/gui/dialogs/comp-editor.c:1063
 msgid "Unable to obtain current version!"
 msgstr "Kan ikke hente versjonsdata!"
 
@@ -2719,20 +2697,20 @@ msgstr ""
 "tidssone.\n"
 "Bru høyre musknapp til å zoome ut."
 
-#: calendar/gui/dialogs/event-editor.c:154
+#: calendar/gui/dialogs/event-editor.c:156
 msgid "Appointment"
 msgstr "Avtale"
 
-#: calendar/gui/dialogs/event-editor.c:159
+#: calendar/gui/dialogs/event-editor.c:161
 msgid "Reminder"
 msgstr "Påminnelse"
 
-#: calendar/gui/dialogs/event-editor.c:164
+#: calendar/gui/dialogs/event-editor.c:166
 msgid "Recurrence"
 msgstr "Gjeninntreffelse"
 
-#: calendar/gui/dialogs/event-editor.c:169
-#: calendar/gui/dialogs/event-editor.c:248
+#: calendar/gui/dialogs/event-editor.c:171
+#: calendar/gui/dialogs/event-editor.c:273
 msgid "Meeting"
 msgstr "Møte"
 
@@ -2745,7 +2723,7 @@ msgid "B_usy"
 msgstr "_Opptatt"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Klassifisering"
@@ -2755,7 +2733,7 @@ msgid "Con_fidential"
 msgstr "Kon_fidensiell"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Date & Time"
 msgstr "Dato & klokke"
 
@@ -2764,12 +2742,12 @@ msgid "F_ree"
 msgstr "L_edig"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: calendar/gui/dialogs/task-page.glade.h:5
 msgid "Pri_vate"
 msgstr "Pri_vat"
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pu_blic"
 msgstr "Of_fentlig"
 
@@ -2779,7 +2757,7 @@ msgid "Show Time As"
 msgstr "Vis tid som"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:17
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Su_mmary:"
 msgstr "Sa_mmendrag:"
 
@@ -2791,125 +2769,125 @@ msgstr "S_lutt-tid:"
 msgid "_Start time:"
 msgstr "_Start-tid:"
 
-#: calendar/gui/dialogs/meeting-page.c:551
-#: calendar/gui/dialogs/meeting-page.c:568
-#: calendar/gui/dialogs/meeting-page.c:1154
-#: calendar/gui/dialogs/meeting-page.c:1222
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:1179
+#: calendar/gui/dialogs/meeting-page.c:1247
 msgid "Individual"
 msgstr "Individuell"
 
-#: calendar/gui/dialogs/meeting-page.c:553
-#: calendar/gui/dialogs/meeting-page.c:570
-#: calendar/gui/dialogs/meeting-page.c:1223
+#: calendar/gui/dialogs/meeting-page.c:578
+#: calendar/gui/dialogs/meeting-page.c:595
+#: calendar/gui/dialogs/meeting-page.c:1248
 msgid "Group"
 msgstr "Gruppe"
 
-#: calendar/gui/dialogs/meeting-page.c:555
-#: calendar/gui/dialogs/meeting-page.c:572
-#: calendar/gui/dialogs/meeting-page.c:1224
+#: calendar/gui/dialogs/meeting-page.c:580
+#: calendar/gui/dialogs/meeting-page.c:597
+#: calendar/gui/dialogs/meeting-page.c:1249
 msgid "Resource"
 msgstr "Ressurs"
 
-#: calendar/gui/dialogs/meeting-page.c:557
-#: calendar/gui/dialogs/meeting-page.c:574
-#: calendar/gui/dialogs/meeting-page.c:1225
+#: calendar/gui/dialogs/meeting-page.c:582
+#: calendar/gui/dialogs/meeting-page.c:599
+#: calendar/gui/dialogs/meeting-page.c:1250
 msgid "Room"
 msgstr "Rom"
 
-#: calendar/gui/dialogs/meeting-page.c:586
-#: calendar/gui/dialogs/meeting-page.c:603
-#: calendar/gui/dialogs/meeting-page.c:1238
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:628
+#: calendar/gui/dialogs/meeting-page.c:1263
 msgid "Chair"
 msgstr "Stol"
 
-#: calendar/gui/dialogs/meeting-page.c:588
-#: calendar/gui/dialogs/meeting-page.c:605
-#: calendar/gui/dialogs/meeting-page.c:1156
-#: calendar/gui/dialogs/meeting-page.c:1239
+#: calendar/gui/dialogs/meeting-page.c:613
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1181
+#: calendar/gui/dialogs/meeting-page.c:1264
 msgid "Required Participant"
 msgstr ""
 "Obligatorisk\n"
 "deltaker"
 
-#: calendar/gui/dialogs/meeting-page.c:590
-#: calendar/gui/dialogs/meeting-page.c:607
-#: calendar/gui/dialogs/meeting-page.c:1240
+#: calendar/gui/dialogs/meeting-page.c:615
+#: calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1265
 msgid "Optional Participant"
 msgstr "Valgfri deltaker"
 
-#: calendar/gui/dialogs/meeting-page.c:592
-#: calendar/gui/dialogs/meeting-page.c:609
-#: calendar/gui/dialogs/meeting-page.c:1241
+#: calendar/gui/dialogs/meeting-page.c:617
+#: calendar/gui/dialogs/meeting-page.c:634
+#: calendar/gui/dialogs/meeting-page.c:1266
 msgid "Non-Participant"
 msgstr "Ikke-deltaker"
 
-#: calendar/gui/dialogs/meeting-page.c:638
-#: calendar/gui/dialogs/meeting-page.c:661
-#: calendar/gui/dialogs/meeting-page.c:1164
-#: calendar/gui/dialogs/meeting-page.c:1267
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:686
+#: calendar/gui/dialogs/meeting-page.c:1189
+#: calendar/gui/dialogs/meeting-page.c:1292
 msgid "Needs Action"
 msgstr "Trenger handling"
 
-#: calendar/gui/dialogs/meeting-page.c:640
-#: calendar/gui/dialogs/meeting-page.c:663
-#: calendar/gui/dialogs/meeting-page.c:1268
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:688
+#: calendar/gui/dialogs/meeting-page.c:1293
 msgid "Accepted"
 msgstr "Godtatt"
 
-#: calendar/gui/dialogs/meeting-page.c:642
-#: calendar/gui/dialogs/meeting-page.c:665
-#: calendar/gui/dialogs/meeting-page.c:1269
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:690
+#: calendar/gui/dialogs/meeting-page.c:1294
 msgid "Declined"
 msgstr "Avslått"
 
-#: calendar/gui/dialogs/meeting-page.c:644
-#: calendar/gui/dialogs/meeting-page.c:667
-#: calendar/gui/dialogs/meeting-page.c:1270
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:692
+#: calendar/gui/dialogs/meeting-page.c:1295
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr "Tentativ"
 
-#: calendar/gui/dialogs/meeting-page.c:646
-#: calendar/gui/dialogs/meeting-page.c:669
-#: calendar/gui/dialogs/meeting-page.c:1271
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/meeting-page.c:694
+#: calendar/gui/dialogs/meeting-page.c:1296
 msgid "Delegated"
 msgstr "Delegert"
 
-#: calendar/gui/dialogs/meeting-page.c:650
-#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:675
+#: calendar/gui/dialogs/meeting-page.c:698
 msgid "In Process"
 msgstr "Under arbeid"
 
-#: calendar/gui/dialogs/meeting-page.c:712
+#: calendar/gui/dialogs/meeting-page.c:737
 msgid "That person is already attending the meeting!"
 msgstr "Denne personen er allerede satt opp for dette møtet!"
 
-#: calendar/gui/dialogs/meeting-page.c:763
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:788
+#: calendar/gui/dialogs/meeting-page.c:838
 msgid "Chair Persons"
 msgstr "Styremedlemmer"
 
-#: calendar/gui/dialogs/meeting-page.c:765
-#: calendar/gui/dialogs/meeting-page.c:813
-#: calendar/gui/dialogs/meeting-page.c:933
+#: calendar/gui/dialogs/meeting-page.c:790
+#: calendar/gui/dialogs/meeting-page.c:838
+#: calendar/gui/dialogs/meeting-page.c:958
 msgid "Required Participants"
 msgstr "Obligatoriske deltakere"
 
-#: calendar/gui/dialogs/meeting-page.c:767
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:792
+#: calendar/gui/dialogs/meeting-page.c:838
 msgid "Optional Participants"
 msgstr "Valgfrie deltakere"
 
-#: calendar/gui/dialogs/meeting-page.c:769
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:794
+#: calendar/gui/dialogs/meeting-page.c:838
 msgid "Non-Participants"
 msgstr "Ikke-deltakere"
 
-#: calendar/gui/dialogs/meeting-page.c:891
+#: calendar/gui/dialogs/meeting-page.c:916
 msgid "Sent By:"
 msgstr "Sendt av:"
 
-#: calendar/gui/dialogs/meeting-page.c:1442
+#: calendar/gui/dialogs/meeting-page.c:1467
 msgid "_Delegate To..."
 msgstr "_Deleger til..."
 
@@ -2946,19 +2924,18 @@ msgid "Role"
 msgstr "Rolle"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14 e-util/e-categories-config.c:94
-#: filter/libfilter-i18n.h:49 mail/message-list.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:14 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
 msgid "Status"
 msgstr "Status"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:82
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:83
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Type"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organisator:"
@@ -3009,38 +2986,38 @@ msgstr "gjentakelser"
 msgid "A_dd"
 msgstr "Le_gg til"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Custom recurrence"
-msgstr "Egendefinert gjeninntreffelse"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr "Hver"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "Exceptions"
 msgstr "Unntak"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "No recurrence"
-msgstr "Ingen gjeninntreffelse"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
 msgid "Preview"
 msgstr "Forhåndsvis"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Recurrence Rule"
 msgstr "Regel for gjenintreffelse"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "Simple recurrence"
-msgstr "Enkel gjeninntreffelse"
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "_Custom recurrence"
+msgstr "E_gendefinert gjeninntreffelse"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "_Modify"
 msgstr "E_ndre"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+msgid "_No recurrence"
+msgstr "I_ngen gjeninntreffelse"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+msgid "_Simple recurrence"
+msgstr "Enkel gjeninntreffel_se"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr "for"
@@ -3082,59 +3059,55 @@ msgid "The journal entry has changed. Send an updated version?"
 msgstr "Journaloppføringen er endret. Send en oppdatert versjon?"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-msgid "Date Completed:"
-msgstr "Fullført dato:"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-msgid "Delegated From:"
-msgstr "Delegert fra:"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
+msgstr "% ferdig"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-msgid "Delegated To:"
-msgstr "Delegert til:"
+msgid "Date Completed:"
+msgstr "Fullført dato:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-msgid "No one"
-msgstr "Ingen"
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+msgid "Progress"
+msgstr "Fremgang"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 #: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor.c:130
-msgid "Task"
-msgstr "Oppgave"
+#: calendar/gui/dialogs/task-details-page.glade.h:14
+msgid "_Priority:"
+msgstr "_Prioritet:"
 
-#: calendar/gui/dialogs/task-page.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% ferdi_g:"
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+msgid "_Status:"
+msgstr "_Status:"
 
-#: calendar/gui/dialogs/task-page.glade.h:14
-msgid "Progress"
-msgstr "Fremgang"
+#: calendar/gui/dialogs/task-editor.c:161
+#: calendar/gui/dialogs/task-editor.c:239
+msgid "Assignment"
+msgstr "Tildeling"
 
-#: calendar/gui/dialogs/task-page.glade.h:16
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Beskrivelse:"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Sta_rt Date:"
 msgstr "Sta_rt dato:"
 
-#: calendar/gui/dialogs/task-page.glade.h:19
+#: calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Confidential"
 msgstr "_Konfidensiell"
 
-#: calendar/gui/dialogs/task-page.glade.h:21
+#: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "Fer_dig-dato:"
 
-#: calendar/gui/dialogs/task-page.glade.h:22
-msgid "_Priority:"
-msgstr "_Prioritet:"
-
-#: calendar/gui/dialogs/task-page.glade.h:23
-msgid "_Status:"
-msgstr "_Status:"
-
 #: calendar/gui/e-calendar-table.c:350
 #, c-format
 msgid "0%"
@@ -3190,27 +3163,27 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:849 calendar/gui/e-day-view.c:3363
-#: calendar/gui/e-week-view.c:3206 mail/folder-browser.c:1278
+#: calendar/gui/e-calendar-table.c:849 calendar/gui/e-day-view.c:3378
+#: calendar/gui/e-week-view.c:3230 mail/folder-browser.c:1278
 msgid "_Open"
 msgstr "_Åpne"
 
-#: calendar/gui/e-calendar-table.c:853 calendar/gui/e-day-view.c:3372
-#: calendar/gui/e-week-view.c:3215 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:853 calendar/gui/e-day-view.c:3387
+#: calendar/gui/e-week-view.c:3239 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Klipp _ut"
 
-#: calendar/gui/e-calendar-table.c:855 calendar/gui/e-day-view.c:3374
-#: calendar/gui/e-week-view.c:3217 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+#: calendar/gui/e-calendar-table.c:855 calendar/gui/e-day-view.c:3389
+#: calendar/gui/e-week-view.c:3241 ui/evolution-addressbook.xml.h:34
+#: ui/evolution-calendar.xml.h:32 ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "_Kopier"
 
-#: calendar/gui/e-calendar-table.c:857 calendar/gui/e-day-view.c:3349
-#: calendar/gui/e-day-view.c:3376 calendar/gui/e-week-view.c:3193
-#: calendar/gui/e-week-view.c:3219 ui/evolution-addressbook.xml.h:35
-#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+#: calendar/gui/e-calendar-table.c:857 calendar/gui/e-day-view.c:3364
+#: calendar/gui/e-day-view.c:3391 calendar/gui/e-week-view.c:3217
+#: calendar/gui/e-week-view.c:3243 ui/evolution-addressbook.xml.h:35
+#: ui/evolution-calendar.xml.h:35 ui/evolution-tasks.xml.h:16
 msgid "_Paste"
 msgstr "_Lim inn"
 
@@ -3234,11 +3207,6 @@ msgstr "Sle_tt valgte oppgaver"
 msgid "Click here to add a task"
 msgstr "Klikk her for å legge til en oppgave"
 
-#: calendar/gui/e-calendar-table.etspec.h:2
-#, no-c-format
-msgid "% Complete"
-msgstr "% ferdig"
-
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Alarmer"
@@ -3295,141 +3263,141 @@ msgstr "%02i minutters oppdeling"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1339
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1354
 #: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1366
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1381
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:578 calendar/gui/e-week-view.c:311
+#: calendar/gui/e-day-view.c:588 calendar/gui/e-week-view.c:324
 #: calendar/gui/print.c:759
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:581 calendar/gui/e-week-view.c:314
+#: calendar/gui/e-day-view.c:591 calendar/gui/e-week-view.c:327
 #: calendar/gui/print.c:761
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3342
+#: calendar/gui/e-day-view.c:3357
 msgid "New _Appointment"
 msgstr "Ny _avtale"
 
-#: calendar/gui/e-day-view.c:3344 calendar/gui/e-week-view.c:3188
+#: calendar/gui/e-day-view.c:3359 calendar/gui/e-week-view.c:3212
 msgid "New All Day _Event"
 msgstr "Ny avtale som varer h_ele dagen"
 
-#: calendar/gui/e-day-view.c:3354 calendar/gui/e-week-view.c:3198
+#: calendar/gui/e-day-view.c:3369 calendar/gui/e-week-view.c:3222
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Gå _til idag"
 
-#: calendar/gui/e-day-view.c:3356 calendar/gui/e-week-view.c:3200
+#: calendar/gui/e-day-view.c:3371 calendar/gui/e-week-view.c:3224
 msgid "_Go to Date..."
 msgstr "_Gå til dato..."
 
-#: calendar/gui/e-day-view.c:3365 calendar/gui/e-week-view.c:3208
+#: calendar/gui/e-day-view.c:3380 calendar/gui/e-week-view.c:3232
 msgid "_Delete this Appointment"
 msgstr "Sle_tt denne avtalen"
 
-#: calendar/gui/e-day-view.c:3384 calendar/gui/e-week-view.c:3233
+#: calendar/gui/e-day-view.c:3399 calendar/gui/e-week-view.c:3257
 msgid "Make this Occurrence _Movable"
 msgstr "Gjør denne hendelsen _flyttbar"
 
-#: calendar/gui/e-day-view.c:3386 calendar/gui/e-week-view.c:3235
+#: calendar/gui/e-day-view.c:3401 calendar/gui/e-week-view.c:3259
 msgid "Delete this _Occurrence"
 msgstr "Slett denne _hendelsen"
 
-#: calendar/gui/e-day-view.c:3388 calendar/gui/e-week-view.c:3237
+#: calendar/gui/e-day-view.c:3403 calendar/gui/e-week-view.c:3261
 msgid "Delete _All Occurrences"
 msgstr "Slett _alle hendelser"
 
-#: calendar/gui/e-itip-control.c:694
+#: calendar/gui/e-itip-control.c:697
 msgid "This is an event that can be added to your calendar."
 msgstr "Dette er en hendelse som kan legges til i din kalender."
 
-#: calendar/gui/e-itip-control.c:697
+#: calendar/gui/e-itip-control.c:700
 msgid "This is a meeting request."
 msgstr "Dette er en møteforespørsel."
 
-#: calendar/gui/e-itip-control.c:700
+#: calendar/gui/e-itip-control.c:703
 msgid "This is one or more additions to a current meeting."
 msgstr "Dette er et eller flere tillegg til et aktivt møte."
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:706
 msgid "This is a request for the latest event information."
 msgstr "Dette er en forespørsel etter seneste informasjon om hendelsen."
 
-#: calendar/gui/e-itip-control.c:706
+#: calendar/gui/e-itip-control.c:709
 msgid "This is a reply to a meeting request."
 msgstr "Dette er et svar på en møteforespørsel."
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:712
 msgid "This is an event cancellation."
 msgstr "Dette er en avlysing av en hendelse."
 
-#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
-#: calendar/gui/e-itip-control.c:780
+#: calendar/gui/e-itip-control.c:715 calendar/gui/e-itip-control.c:755
+#: calendar/gui/e-itip-control.c:783
 msgid "The message is not understandable."
 msgstr "Meldingen er ikke forståelig."
 
-#: calendar/gui/e-itip-control.c:737
+#: calendar/gui/e-itip-control.c:740
 msgid "This is an task that can be added to your calendar."
 msgstr "Dette er en oppgave som kan legges til i din kalender."
 
-#: calendar/gui/e-itip-control.c:740
+#: calendar/gui/e-itip-control.c:743
 msgid "This is a task request."
 msgstr "Dette er en oppgaveforespørsel."
 
-#: calendar/gui/e-itip-control.c:743
+#: calendar/gui/e-itip-control.c:746
 msgid "This is a request for the latest task information."
 msgstr "Dette er en forespørsel om seneste informasjon om oppgaven."
 
-#: calendar/gui/e-itip-control.c:746
+#: calendar/gui/e-itip-control.c:749
 msgid "This is a reply to a task request."
 msgstr "Dette er et svar på en oppgaveforespørsel."
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:752
 msgid "This is an task cancellation."
 msgstr "Dette er en avlysing av en oppgave."
 
-#: calendar/gui/e-itip-control.c:771
+#: calendar/gui/e-itip-control.c:774
 msgid "This is freebusy information."
 msgstr "Dette er ledig/opptatt-informasjon."
 
-#: calendar/gui/e-itip-control.c:774
+#: calendar/gui/e-itip-control.c:777
 msgid "This is a request for freebusy information."
 msgstr "Dette er en forespørsel om ledig/opptatt-informasjon."
 
-#: calendar/gui/e-itip-control.c:777
+#: calendar/gui/e-itip-control.c:780
 msgid "This is a reply to a freebusy request."
 msgstr "Dette er et svar på en forespørsel etter ledig/opptatt-informasjon."
 
-#: calendar/gui/e-itip-control.c:834
+#: calendar/gui/e-itip-control.c:837
 msgid "The message does not appear to be properly formed"
 msgstr "Meldingen ser ikke ut til å være riktig utformet"
 
-#: calendar/gui/e-itip-control.c:853
+#: calendar/gui/e-itip-control.c:856
 msgid "The message contains only unsupported requests."
 msgstr "Meldingen inneholder kun forespørsler som ikke er støttet."
 
-#: calendar/gui/e-itip-control.c:877
+#: calendar/gui/e-itip-control.c:880
 msgid "The information contained in this attachment was not valid"
 msgstr "Informasjonen i dette vedlegget var ikke gyldig."
 
-#: calendar/gui/e-itip-control.c:989
+#: calendar/gui/e-itip-control.c:992
 msgid "I couldn't update your calendar file!\n"
 msgstr "Kunne ikke oppdatere din kalenderfil!\n"
 
-#: calendar/gui/e-itip-control.c:1015
+#: calendar/gui/e-itip-control.c:1018
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Kunne ikke fjerne oppføringen fra din kalenderfil!\n"
 
@@ -3480,15 +3448,7 @@ msgstr "Kunne ikke laste oppgavene i `%s'"
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden som er nødvendig for å laste `%s' er ikke støttet"
 
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
-#: my-evolution/e-summary-calendar.c:240
-msgid "%d %B"
-msgstr "%d %B"
-
-#: calendar/gui/e-week-view.c:3186 calendar/gui/e-week-view.c:3224
+#: calendar/gui/e-week-view.c:3210 calendar/gui/e-week-view.c:3248
 msgid "New _Appointment..."
 msgstr "Ny _avtale..."
 
@@ -3523,41 +3483,41 @@ msgid "Go To Date"
 msgstr "Gå til dato"
 
 #: calendar/gui/goto-dialog.glade.h:6
+msgid "Go To Today"
+msgstr "Gå til i dag"
+
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "Januar"
 
-#: calendar/gui/goto-dialog.glade.h:7
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "July"
 msgstr "Juli"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "June"
 msgstr "Juni"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "March"
 msgstr "Mars"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "May"
 msgstr "Mai"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "November"
 msgstr "November"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "October"
 msgstr "Oktober"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:14
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/goto-dialog.glade.h:14
-msgid "_Go to Today"
-msgstr "_Gå til i dag"
-
 #: calendar/gui/itip-utils.c:228
 msgid "An organizer must be set."
 msgstr "En organisator må oppgis."
@@ -3715,7 +3675,7 @@ msgid "Sa"
 msgstr "Lør"
 
 #: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:212
-#: my-evolution/e-summary-tasks.c:228 shell/e-shortcuts.c:1024
+#: my-evolution/e-summary-tasks.c:228 shell/e-shortcuts.c:1025
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Oppgaver"
@@ -3916,7 +3876,7 @@ msgid ""
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:978
+#: calendar/pcs/query.c:967
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "Evaluering av søkeuttrykket ga ikke en boolsk verdi"
 
@@ -4020,7 +3980,7 @@ msgstr "Feil under lesing av filter: %s: %s"
 msgid "Error executing filter: %s: %s"
 msgstr "Feil under kjøring av filter: %s: %s"
 
-#: camel/camel-filter-search.c:495 camel/camel-filter-search.c:502
+#: camel/camel-filter-search.c:468 camel/camel-filter-search.c:475
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Feil under lagring av filtersøk: %s: %s"
@@ -4047,12 +4007,12 @@ msgstr ""
 msgid "(match-all) requires a single bool result"
 msgstr "(treff-alle) krever et enkelt bolsk resultat"
 
-#: camel/camel-folder-search.c:559
+#: camel/camel-folder-search.c:563
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Utfører spørring på ukjent header: %s"
 
-#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:716
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Ugyldig type i kropp-inneholder, forventer streng"
 
@@ -4374,6 +4334,33 @@ msgstr "Dette valget vil koble til tjeneren ved bruk av et passord."
 msgid "Unknown authentication state."
 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:67 mail/mail-config.glade.h:52
+msgid "Password"
+msgstr "Passord"
+
+#: camel/camel-sasl-popb4smtp.c:34
+msgid "POP before SMTP"
+msgstr "POP før SMTP"
+
+#: camel/camel-sasl-popb4smtp.c:36
+msgid "This option will authorise a POP connection before attempting SMTP"
+msgstr ""
+"Dette alternativet vil autorisere en POP-forbindelse før forsøk på SMTP"
+
+#: camel/camel-sasl-popb4smtp.c:107
+msgid "POP Source URI"
+msgstr "Kilde-URI for POP"
+
+#: camel/camel-sasl-popb4smtp.c:111
+msgid "POP Before SMTP auth using an unknown transport"
+msgstr "POP før SMTP autentisering via en ukjent transport"
+
+#: camel/camel-sasl-popb4smtp.c:116
+msgid "POP Before SMTP auth using a non-pop source"
+msgstr "POP før SMTP autentisering via ikke-pop kilde"
+
 #: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
@@ -4422,12 +4409,12 @@ msgstr "E-post-tilbyder for virtuelle mapper"
 msgid "For reading mail as a query of another set of folders"
 msgstr "For lesing av e-post som en spørring på et annet sett med mapper"
 
-#: camel/camel-session.c:295 camel/camel-session.c:364
+#: camel/camel-session.c:297 camel/camel-session.c:366
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Ingen tilbyder tilgjengelig for protokoll `%s'"
 
-#: camel/camel-session.c:481
+#: camel/camel-session.c:483
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -4602,7 +4589,7 @@ msgstr "Kunne ikke finne meldingskropp i FETCH-svar."
 msgid "Could not open cache directory: %s"
 msgstr "Kan ikke åpne cache-katalog: %s"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:13
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
 msgid "Checking for new mail"
 msgstr "Ser etter nye meldinger"
 
@@ -4610,7 +4597,7 @@ msgstr "Ser etter nye meldinger"
 msgid "Check for new messages in all folders"
 msgstr "Se etter nye meldinger i alle mapper"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:651
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:653
 msgid "Folders"
 msgstr "Mapper"
 
@@ -4958,7 +4945,7 @@ msgstr "Kan ikke lage sammendrag for mappe: %s: %s"
 #: camel/providers/local/camel-mbox-summary.c:502
 #: camel/providers/local/camel-mbox-summary.c:703
 #: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1538
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1536
 msgid "Synchronising folder"
 msgstr "Synkroniserer mappe"
 
@@ -5210,7 +5197,7 @@ msgstr "Behold meldinger på tjeneren"
 msgid "Delete after %s day(s)"
 msgstr "Slett etter %s dag(er)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:50
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:51
 msgid "POP"
 msgstr "POP"
 
@@ -5306,7 +5293,7 @@ msgid "No such folder `%s'."
 msgstr "Ingen slik mappe `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:70
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -5360,7 +5347,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:62
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:63
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -5512,7 +5499,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:594
+#: camel/providers/smtp/camel-smtp-transport.c:594 mail/mail-ops.c:595
 msgid "Sending message"
 msgstr "Sender melding"
 
@@ -5676,52 +5663,52 @@ msgstr "MIME-type:"
 msgid "Suggest automatic display of attachment"
 msgstr "Foreslå automatisk visning av vedlegg"
 
-#: composer/e-msg-composer-hdrs.c:328
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr "Klikk her for å få opp adresseboken"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:359
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr "Fra:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:365
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Reply-To:"
 msgstr "Svar-til:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr "Skriv inn mottakerene for meldingen"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:394
 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:398
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -5734,7 +5721,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Legg ved en fil"
 
-#: composer/e-msg-composer.c:669
+#: composer/e-msg-composer.c:687
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -5743,7 +5730,7 @@ msgstr ""
 "Kan ikke åpne fil %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:682
+#: composer/e-msg-composer.c:700
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -5752,29 +5739,29 @@ msgstr ""
 "Feil under lesing av fil %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:872
+#: composer/e-msg-composer.c:890
 msgid "Save as..."
 msgstr "Lagre som..."
 
-#: composer/e-msg-composer.c:881
+#: composer/e-msg-composer.c:899
 msgid "Warning!"
 msgstr "Advarsel!"
 
-#: composer/e-msg-composer.c:883
+#: composer/e-msg-composer.c:901
 msgid "File exists, overwrite?"
 msgstr "Filen eksisterer, overskriv?"
 
-#: composer/e-msg-composer.c:905
+#: composer/e-msg-composer.c:923
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Feil under lagring av fil: %s"
 
-#: composer/e-msg-composer.c:925
+#: composer/e-msg-composer.c:943
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Feil under lasting av fil: %s"
 
-#: composer/e-msg-composer.c:996
+#: composer/e-msg-composer.c:1014
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -5782,16 +5769,16 @@ msgstr ""
 "Kunne ikke åpne skisse-mappen for denne kontoen.\n"
 "Vil du bruke standard skisse-mappe?"
 
-#: composer/e-msg-composer.c:1046
+#: composer/e-msg-composer.c:1064
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Feil under tilgang til fil: %s"
 
-#: composer/e-msg-composer.c:1054
+#: composer/e-msg-composer.c:1072
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikke hente melding fra editor"
 
-#: composer/e-msg-composer.c:1060
+#: composer/e-msg-composer.c:1078
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -5800,7 +5787,7 @@ msgstr ""
 "Kunne ikke søke i fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1066
+#: composer/e-msg-composer.c:1084
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -5809,7 +5796,7 @@ msgstr ""
 "Kunne ikke kutte av fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1075
+#: composer/e-msg-composer.c:1093
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -5818,7 +5805,7 @@ msgstr ""
 "Feil under autolagring av av melding: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1173
+#: composer/e-msg-composer.c:1193
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
 "Would you like to attempt recovery?"
@@ -5826,7 +5813,7 @@ msgstr ""
 "Evolution har funnet ikke-lagrede filer fra en tidligere sesjon.\n"
 "Vil du prøve å gjenopprette?"
 
-#: composer/e-msg-composer.c:1321
+#: composer/e-msg-composer.c:1341
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5836,24 +5823,24 @@ msgstr ""
 "\n"
 "Vil du lagre endringene?"
 
-#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: composer/e-msg-composer.c:1348 data/evolution.desktop.in.h:1
 #: shell/e-shell-view-menu.c:215
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:1351
+#: composer/e-msg-composer.c:1371
 msgid "Open file"
 msgstr "Åpne fil"
 
-#: composer/e-msg-composer.c:1500
+#: composer/e-msg-composer.c:1520
 msgid "Insert File"
 msgstr "Sett inn fil"
 
-#: composer/e-msg-composer.c:1874 composer/e-msg-composer.c:2270
+#: composer/e-msg-composer.c:1894 composer/e-msg-composer.c:2294
 msgid "Compose a message"
 msgstr "Skriv en melding"
 
-#: composer/e-msg-composer.c:2364
+#: composer/e-msg-composer.c:2384
 msgid "Could not create composer window."
 msgstr "Kan ikke opprette komponeringsvinduet."
 
@@ -5898,89 +5885,17 @@ msgid "Recipients contain"
 msgstr "Mottakere inneholder"
 
 #: default_user/searches.xml.h:5
+msgid "Sender contains"
+msgstr "Sender inneholder"
+
+#: default_user/searches.xml.h:6
 msgid "Subject contains"
 msgstr "Emne inneholder"
 
-#: default_user/searches.xml.h:6
+#: default_user/searches.xml.h:7
 msgid "Subject does not contain"
 msgstr "Emne inneholder ikke"
 
-#: e-util/e-categories-config.c:64
-msgid "Birthday"
-msgstr "Fødselsdag"
-
-#: e-util/e-categories-config.c:68
-msgid "Competition"
-msgstr "Konkurranse"
-
-#: e-util/e-categories-config.c:70
-msgid "Favorites"
-msgstr "Favoritter"
-
-#: e-util/e-categories-config.c:72
-msgid "Gifts"
-msgstr "Gaver"
-
-#: e-util/e-categories-config.c:74
-msgid "Goals/Objectives"
-msgstr "Mål/Objektiver"
-
-#: e-util/e-categories-config.c:76
-msgid "Holiday"
-msgstr "Ferie"
-
-#: e-util/e-categories-config.c:78
-msgid "Holiday Cards"
-msgstr "Feriekort"
-
-#: e-util/e-categories-config.c:80
-msgid "Hot Contacts"
-msgstr "Hete kontakter"
-
-#: e-util/e-categories-config.c:82
-msgid "Ideas"
-msgstr "Idéer"
-
-#: e-util/e-categories-config.c:84
-msgid "International"
-msgstr "Internasjonalt"
-
-#: e-util/e-categories-config.c:86
-msgid "Key Customer"
-msgstr "Nøkkelkunde"
-
-#: e-util/e-categories-config.c:88
-msgid "Miscellaneous"
-msgstr "Forskjellig"
-
-#: e-util/e-categories-config.c:90
-msgid "Personal"
-msgstr "Personlig"
-
-#: e-util/e-categories-config.c:92
-msgid "Phone Calls"
-msgstr "Telefonsamtaler"
-
-#: e-util/e-categories-config.c:96
-msgid "Strategies"
-msgstr "Strategier"
-
-#: e-util/e-categories-config.c:98
-msgid "Suppliers"
-msgstr "Leverandører"
-
-#: e-util/e-categories-config.c:100
-msgid "Time & Expenses"
-msgstr "Tid & utgifter"
-
-#: e-util/e-categories-config.c:102
-msgid "VIP"
-msgstr "VIP"
-
-#: e-util/e-categories-config.c:104
-msgid "Waiting"
-msgstr "Venter"
-
 #. strptime format for a date.
 #: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
 #: e-util/e-time-utils.c:239
@@ -6178,20 +6093,20 @@ msgstr ""
 "Du glemte å velge en meppe.\n"
 "Vennligst gå tilbake og spesifiser en gyldig mappe for levering av e-post."
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:319
 #: mail/mail-account-gui.c:790
 msgid "Select Folder"
 msgstr "Velg mappe"
 
-#: filter/filter-folder.c:250
+#: filter/filter-folder.c:257
 msgid "Enter folder URI"
 msgstr "Skriv inn URI for mappen"
 
-#: filter/filter-folder.c:296
+#: filter/filter-folder.c:303
 msgid "<click here to select a folder>"
 msgstr "<klikk her for å velge en mappe>"
 
-#: filter/filter-input.c:193
+#: filter/filter-input.c:197
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -6204,45 +6119,43 @@ msgstr ""
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:633
+#: filter/filter-rule.c:626
 msgid "Rule name: "
 msgstr "Regelnavn: "
 
-#: filter/filter-rule.c:637
+#: filter/filter-rule.c:630
 msgid "Untitled"
 msgstr "Uten navn"
 
-#: filter/filter-rule.c:654
+#: filter/filter-rule.c:647
 msgid "If"
 msgstr "Hvis"
 
-#: filter/filter-rule.c:672
+#: filter/filter-rule.c:665
 msgid "Execute actions"
 msgstr "Utfør handlinger"
 
-#: filter/filter-rule.c:676
+#: filter/filter-rule.c:669
 msgid "if all criteria are met"
 msgstr "hvis alle kriterier er møtt"
 
-#: filter/filter-rule.c:681
+#: filter/filter-rule.c:674
 msgid "if any criteria are met"
 msgstr "hvis et kriterie er møtt"
 
-#: filter/filter-rule.c:692
+#: filter/filter-rule.c:685
 msgid "Add criterion"
 msgstr "Legg til kriterie"
 
-#: filter/filter-rule.c:777
+#: filter/filter-rule.c:770
 msgid "incoming"
 msgstr "innkommende"
 
-#: filter/filter-rule.c:777
+#: filter/filter-rule.c:770
 msgid "outgoing"
 msgstr "utgående"
 
-#: filter/filter.glade.h:1 my-evolution/e-summary-preferences.c:1161
-#: my-evolution/e-summary-preferences.c:1209
-#: my-evolution/e-summary-preferences.c:1271
+#: filter/filter.glade.h:1
 msgid "Add"
 msgstr "Legg til"
 
@@ -6512,7 +6425,7 @@ msgid "Import"
 msgstr "Importer"
 
 #: importers/elm-importer.c:475 importers/netscape-importer.c:819
-#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+#: importers/pine-importer.c:632
 msgid "Mail"
 msgstr "Post"
 
@@ -6635,8 +6548,8 @@ msgid "Could not create temporary directory: %s"
 msgstr "Kunne ikke opprette midlertidig katalog: %s"
 
 #: mail/folder-browser.c:900
-msgid "Store search as vFolder"
-msgstr "Lagre søk som vMappe"
+msgid "Create vFolder from Search"
+msgstr "La_g vFolder fra søk"
 
 #: mail/folder-browser.c:1245
 msgid "VFolder on _Subject"
@@ -6674,7 +6587,7 @@ msgstr "Filtrer på e-_postliste"
 msgid "Resend"
 msgstr "Send på nytt"
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:96
 #: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "Lagre _som..."
@@ -6683,7 +6596,7 @@ msgstr "Lagre _som..."
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:94
+#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:95
 msgid "_Reply to Sender"
 msgstr "Sva_r til sender"
 
@@ -6723,7 +6636,7 @@ msgstr "Fl_ytt til mappe..."
 msgid "_Copy to Folder..."
 msgstr "K_opier til mappe..."
 
-#: mail/folder-browser.c:1315 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1315 ui/evolution-mail-message.xml.h:98
 msgid "_Undelete"
 msgstr "A_ngre slett"
 
@@ -6739,24 +6652,28 @@ msgstr "Påfør filtre"
 msgid "Create Ru_le From Message"
 msgstr "Lage rege_l fra melding"
 
-#: mail/folder-browser.c:1486
+#: mail/folder-browser.c:1487
 msgid "Filter on Mailing List"
 msgstr "Filtrer etter e-postliste"
 
-#: mail/folder-browser.c:1487
+#: mail/folder-browser.c:1488
 msgid "VFolder on Mailing List"
 msgstr "VFolder på e-postliste"
 
-#: mail/folder-browser.c:1489
+#: mail/folder-browser.c:1490
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrer etter e-postliste (%s)"
 
-#: mail/folder-browser.c:1490
+#: mail/folder-browser.c:1491
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VFolder på e-postliste (%s)"
 
+#: mail/folder-info.c:60
+msgid "Getting Folder Information"
+msgstr "Henter mappeinformasjon"
+
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 msgid "Factory to import mbox into Evolution"
 msgstr "Factory for å importere mbox til Evolution"
@@ -7082,11 +6999,11 @@ msgstr ""
 msgid "Evolution Account Wizard"
 msgstr "Evolution kontoveiviser"
 
-#: mail/mail-config.c:1564
+#: mail/mail-config.c:1570
 msgid "Checking Service"
 msgstr "Sjekker tjeneste"
 
-#: mail/mail-config.c:1635 mail/mail-config.c:1638
+#: mail/mail-config.c:1641 mail/mail-config.c:1644
 msgid "Connecting to server..."
 msgstr "Kobler til tjener..."
 
@@ -7122,27 +7039,31 @@ msgstr "Alltid krypter til meg selv ved sending av kryptert e-post."
 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:9 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:9
+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:10 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Vedlegg"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:11
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:12
 msgid "Authentication Type: "
 msgstr "Autentiseringstype: "
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:13
 msgid "Certificate ID:"
 msgstr "Sertifikat-ID:"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:15
 msgid "Composer"
 msgstr "Skriv"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -7158,228 +7079,228 @@ msgstr ""
 "\n"
 "Klikk \"Fullfør\" for å lagre dine innstillinger"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:22
 msgid "De_fault"
 msgstr "_Forvalgt"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:23
 msgid "Default Forward style is: "
 msgstr "Standard videresendingsstil er: "
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:24
 msgid "Default character encoding: "
 msgstr "Standard tegnkoding: "
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:25
 msgid "Digital IDs..."
 msgstr "Digitale IDer..."
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:27
 msgid "Done"
 msgstr "Ferdig"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Drafts"
 msgstr "Skisser"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
 msgid "Drafts folder:"
 msgstr "Skissemappe:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:30
 msgid "E_nable"
 msgstr "A_ktiver"
 
-#: mail/mail-config.glade.h:30 widgets/misc/e-filter-bar.h:96
+#: mail/mail-config.glade.h:31 widgets/misc/e-filter-bar.h:96
 #: widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Rediger..."
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid "Enabled"
 msgstr "Aktivert"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:33
 msgid "Get Digital ID..."
 msgstr "Hent digital ID..."
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:34
 msgid "HTML signature file:"
 msgstr "HTML-signaturfil:"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:35
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:36
 msgid "Identity"
 msgstr "Identitet"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:37
 msgid "In HTML mail"
 msgstr "I HTML e-post"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:38
 msgid "Inline"
 msgstr "Inline"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:39
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 msgid "Mail Configuration"
 msgstr "E-post-konfigurasjon"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 msgid "Mailbox location"
 msgstr "Plassering av postboks"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:42
 msgid "Make this my _default account"
 msgstr "Bruk denne som stan_dard konto"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:43
 msgid "Message _preview should be displayed by default"
 msgstr "Forhåndsvisning av meldinger skal være _på som standard"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Message list should display in a _threaded fashion by default"
 msgstr "Meldingslisten skal vises med _tråder som standard"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 msgid "NNTP Server:"
 msgstr "NNTP-tjener:"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:46
 msgid "News"
 msgstr "News"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "Optional Information"
 msgstr "Tilleggsinformasjon"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:50
 msgid "PGP Key ID:"
 msgstr "PGP-nøkkel ID:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:53
 msgid "Pick a color"
 msgstr "Velg en farge"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:54
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 msgid "Prompt when sending messages with an _empty subject"
 msgstr "Spør ved sending av meldinger uten _emne"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 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:56
+#: mail/mail-config.glade.h:57
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Quoted"
 msgstr "Sitert"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 msgid "Receiving Email"
 msgstr "Innkommende e-post"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:60
 msgid "Receiving Mail"
 msgstr "Innkommende e-post"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:61
 msgid "Receiving Options"
 msgstr "Alternativer innkommende"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:62
 msgid "Required Information"
 msgstr "Nødvendig informasjon"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:64
 msgid "Secure MIME"
 msgstr "Sikker MIME"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:65
 msgid "Security"
 msgstr "Sikkerhet"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:66
 msgid "Select Filter Log file..."
 msgstr "Velg en loggfil for filter..."
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:67
 msgid "Select PGP binary"
 msgstr "Velg PGP-binærfil"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:68
 msgid "Sending Email"
 msgstr "Utgående e-post"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
 msgid "Sending Mail"
 msgstr "Utgående e-post"
 
-#: mail/mail-config.glade.h:70 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:71 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "Sendt"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:72
 msgid "Sent and Draft Messages"
 msgstr "Sendte meldinger og skisser"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:73
 msgid "Sent messages folder:"
 msgstr "Mappe for sendte meldinger:"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:74
 msgid "Server Configuration"
 msgstr "Tjenerkonfigurasjon"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:75
 msgid "Server Type: "
 msgstr "Tjenertype: "
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:76
 msgid "Server requires _authentication"
 msgstr "Tjener krever _autentisering"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
 msgid "Signature file:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "Source"
 msgstr "Kilde"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 msgid "Source Information"
 msgstr "Kildeinformasjon"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:80
 msgid "Sources"
 msgstr "Kilder"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "Special Folders"
 msgstr "Spesielle mapper"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Standard Unix mbox"
 msgstr "Standard Unix mbox"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 msgid "Use secure connection (_SSL)"
 msgstr "Bruk sikker forbindelse (_SSL)"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:85
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -7389,103 +7310,103 @@ msgstr ""
 "\n"
 "Klikk \"Neste\" for å begynne."
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:89
 msgid "_Always load images off the net"
 msgstr "_Alltid last bilder fra nettet"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:90
 msgid "_Automatically check for new mail every"
 msgstr "Sjekk etter meldinger _automatisk hver(t)"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:91
 msgid "_Check for supported types"
 msgstr "S_øk etter støttede typer"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 msgid "_Email Address:"
 msgstr "_E-post adresse:"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:95
 msgid "_Empty trash folders on exit"
 msgstr "Tøm søpp_elkurven ved slutt"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:96
 msgid "_Full Name:"
 msgstr "_Fullt navn:"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:97
 msgid "_HTML Signature:"
 msgstr "_HTML-signatur:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 msgid "_Highlight citations with"
 msgstr "_Merk sitering med"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 msgid "_Host:"
 msgstr "_Vert:"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "_Load images if sender is in addressbook"
 msgstr "_Last bilder hvis avsender er i adresseboken"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 msgid "_Log filter actions to:"
 msgstr "_Logg filterhandlinger til:"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 msgid "_Mark messages as Read after"
 msgstr "_Merk meldinger som Lest etter"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "_Never load images off the net"
 msgstr "Aldri last bilder fra _nettet"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "_Organization:"
 msgstr "_Organisasjon:"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "_PGP binary path:"
 msgstr "Sti til _PGP-binærfil:"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "_Path:"
 msgstr "S_ti:"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "_Remember PGP Passphrase until exit"
 msgstr "Husk PGP-passo_rd til du avslutter"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 msgid "_Remember this password"
 msgstr "Husk dette passo_rdet"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "_Send mail in HTML format by default."
 msgstr "_Send meldinger i HTML-format som standard."
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "_Signature file:"
 msgstr "_Signaturfil:"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "_Username:"
 msgstr "Br_ukernavn:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "newswindow1"
 msgstr "nyhetsvindu1"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
 msgid "placeholder"
 msgstr "plassholder"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:116
 msgid "seconds."
 msgstr "sekunder"
 
@@ -7739,6 +7660,11 @@ msgstr ""
 "Feil under utføring av operasjon:\n"
 "%s"
 
+#. Remember the password?
+#: mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Husk dette passordet"
+
 #: mail/mail-mt.c:796
 msgid "Working"
 msgstr "Arbeider"
@@ -7751,100 +7677,100 @@ msgstr "Filtrerer mappe"
 msgid "Fetching Mail"
 msgstr "Henter e-post"
 
-#: mail/mail-ops.c:590
+#: mail/mail-ops.c:591
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender \"%s\""
 
-#: mail/mail-ops.c:710
+#: mail/mail-ops.c:709
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
 
-#: mail/mail-ops.c:729
+#: mail/mail-ops.c:728
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Feilet på melding %d av %d"
 
-#: mail/mail-ops.c:731 mail/mail-send-recv.c:506
+#: mail/mail-ops.c:730 mail/mail-send-recv.c:511
 msgid "Complete."
 msgstr "Fullført."
 
-#: mail/mail-ops.c:817
+#: mail/mail-ops.c:823
 msgid "Saving message to folder"
 msgstr "Lagrer melding til mappe"
 
-#: mail/mail-ops.c:896
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flytter melding(er) til %s"
 
-#: mail/mail-ops.c:896
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer meldinger til %s"
 
-#: mail/mail-ops.c:913
+#: mail/mail-ops.c:919
 msgid "Moving"
 msgstr "Flytter"
 
-#: mail/mail-ops.c:916
+#: mail/mail-ops.c:922
 msgid "Copying"
 msgstr "Kopierer"
 
-#: mail/mail-ops.c:1028
+#: mail/mail-ops.c:1034
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i \"%s\""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1068 mail/mail-ops.c:1069
+#: mail/mail-ops.c:1074 mail/mail-ops.c:1075
 msgid "Trash"
 msgstr "Søppel"
 
-#: mail/mail-ops.c:1203
+#: mail/mail-ops.c:1211
 msgid "Forwarded messages"
 msgstr "Videresendte meldinger"
 
-#: mail/mail-ops.c:1245 mail/mail-ops.c:1390
+#: mail/mail-ops.c:1253 mail/mail-ops.c:1394
 #, c-format
 msgid "Opening folder %s"
 msgstr "Åpner mappe %s"
 
-#: mail/mail-ops.c:1316
+#: mail/mail-ops.c:1322
 #, c-format
 msgid "Opening store %s"
 msgstr "Åpner lager %s"
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1460
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjerner mappe %s"
 
-#: mail/mail-ops.c:1590
+#: mail/mail-ops.c:1586
 msgid "Refreshing folder"
 msgstr "Oppfrisker mappe"
 
-#: mail/mail-ops.c:1626
+#: mail/mail-ops.c:1622
 msgid "Expunging folder"
 msgstr "Tømmer mappe"
 
-#: mail/mail-ops.c:1675
+#: mail/mail-ops.c:1671
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Henter melding %s"
 
-#: mail/mail-ops.c:1744
+#: mail/mail-ops.c:1738
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Henter %d melding(er)"
 
-#: mail/mail-ops.c:1830
+#: mail/mail-ops.c:1824
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Lagrer %d melding(er)"
 
-#: mail/mail-ops.c:1909
+#: mail/mail-ops.c:1904
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -7853,7 +7779,7 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1935
+#: mail/mail-ops.c:1930
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -7862,11 +7788,11 @@ msgstr ""
 "Feil under lagring av av meldinger til: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2009
+#: mail/mail-ops.c:2004
 msgid "Saving attachment"
 msgstr "Lagrer vedlegg"
 
-#: mail/mail-ops.c:2025
+#: mail/mail-ops.c:2020
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -7875,16 +7801,20 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2054
+#: mail/mail-ops.c:2049
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: mail/mail-ops.c:2123
+#: mail/mail-ops.c:2118
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kobler fra %s"
 
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "_Søk"
+
 #: mail/mail-search.c:138
 msgid "(Untitled Message)"
 msgstr "(Melding uten tittel)"
@@ -7921,19 +7851,19 @@ msgstr "Treff:"
 msgid "Cancelling..."
 msgstr "Avbryter..."
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:257
 msgid "Send & Receive mail"
 msgstr "Send & motta e-post"
 
-#: mail/mail-send-recv.c:308
+#: mail/mail-send-recv.c:311
 msgid "Updating..."
 msgstr "Oppdaterer..."
 
-#: mail/mail-send-recv.c:308 mail/mail-send-recv.c:359
+#: mail/mail-send-recv.c:311 mail/mail-send-recv.c:364
 msgid "Waiting..."
 msgstr "Venter..."
 
-#: mail/mail-send-recv.c:502
+#: mail/mail-send-recv.c:507
 msgid "Cancelled."
 msgstr "Avbrutt"
 
@@ -7976,71 +7906,71 @@ msgstr "(Uten emne)"
 msgid "%s - Message"
 msgstr "%s - Melding"
 
-#: mail/message-list.c:627
+#: mail/message-list.c:629
 msgid "Unseen"
 msgstr "Ulest"
 
-#: mail/message-list.c:628
+#: mail/message-list.c:630
 msgid "Seen"
 msgstr "Lest"
 
-#: mail/message-list.c:629
+#: mail/message-list.c:631
 msgid "Answered"
 msgstr "Besvart"
 
-#: mail/message-list.c:630
+#: mail/message-list.c:632
 msgid "Multiple Unseen Messages"
 msgstr "Flere uleste meldinger"
 
-#: mail/message-list.c:631
+#: mail/message-list.c:633
 msgid "Multiple Messages"
 msgstr "Flere meldinger"
 
-#: mail/message-list.c:635
+#: mail/message-list.c:637
 msgid "Lowest"
 msgstr "Lavest"
 
-#: mail/message-list.c:636
+#: mail/message-list.c:638
 msgid "Lower"
 msgstr "Lavere"
 
-#: mail/message-list.c:640
+#: mail/message-list.c:642
 msgid "Higher"
 msgstr "Høyere"
 
-#: mail/message-list.c:641
+#: mail/message-list.c:643
 msgid "Highest"
 msgstr "Høyest"
 
-#: mail/message-list.c:891
+#: mail/message-list.c:893
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:898
+#: mail/message-list.c:900
 msgid "Today %l:%M %p"
 msgstr "Idag %l:%M %p"
 
-#: mail/message-list.c:907
+#: mail/message-list.c:909
 msgid "Yesterday %l:%M %p"
 msgstr "I går %l:%M %p"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:921
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:927
+#: mail/message-list.c:929
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:929
+#: mail/message-list.c:931
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2299
+#: mail/message-list.c:2305
 msgid "Generating message list"
 msgstr "Genererer meldingsliste"
 
-#: mail/message-list.c:2311
+#: mail/message-list.c:2317
 msgid "Updating message list"
 msgstr "Oppdaterer meldingsliste"
 
@@ -8076,15 +8006,16 @@ msgstr "Abonnerer på mappe \"%s\""
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Fjerner abonnement på mappe \"%s\""
 
-#: mail/subscribe-dialog.c:1190 shell/e-storage-set-view.etspec.h:1
+#: mail/subscribe-dialog.c:1190 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Mappe"
 
-#: mail/subscribe-dialog.c:1410
+#: mail/subscribe-dialog.c:1432
 msgid "No server has been selected"
 msgstr "Ingen tjener er valgt"
 
-#: mail/subscribe-dialog.c:1467
+#: mail/subscribe-dialog.c:1489
 msgid "Please select a server."
 msgstr "Vennligst velg en tjener."
 
@@ -8136,7 +8067,11 @@ msgstr "Legg til news-tjener"
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Skriv inn URL for nyhetsstedet du vil legge til"
 
-#: my-evolution/e-summary-preferences.c:1408
+#: my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "Navn:"
+
+#: my-evolution/e-summary-preferences.c:1403
 msgid "My Evolution Settings"
 msgstr "Innstillinger for Min Evolution"
 
@@ -9363,112 +9298,124 @@ msgid "Drifting dust whirls"
 msgstr "Drivende støvvirvler"
 
 #: my-evolution/my-evolution.glade.h:1
-msgid "Add new feed"
-msgstr "Legg til ny tjeneste"
+msgid " _Remove"
+msgstr " Fje_rn"
 
 #: my-evolution/my-evolution.glade.h:2
-msgid "All folders:"
-msgstr "Alle mapper:"
+msgid "Add n_ew feed"
+msgstr "L_egg til ny tjeneste"
 
 #: my-evolution/my-evolution.glade.h:3
-msgid "All news feeds:"
-msgstr "Alle nyhetstjenester"
+msgid "Al_l stations:"
+msgstr "Al_le stasjoner:"
 
 #: my-evolution/my-evolution.glade.h:4
-msgid "All stations:"
-msgstr "Alle stasjoner:"
+msgid "All _folders:"
+msgstr "Alle _mapper:"
 
-#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:1023
+#: my-evolution/my-evolution.glade.h:5
+msgid "All news _feeds:"
+msgstr "Alle _nyhetstjenester"
+
+#: my-evolution/my-evolution.glade.h:6 shell/e-shortcuts.c:1024
 msgid "Calendar"
 msgstr "Kalender"
 
-#: my-evolution/my-evolution.glade.h:6
-msgid "Display folders:"
-msgstr "Vis mapper:"
-
 #: my-evolution/my-evolution.glade.h:7
-msgid "Display stations:"
-msgstr "Vis stasjoner:"
+msgid "How many days should the calendar display at once?"
+msgstr "Hvor mange dager skal kalenderen vise om gangen?"
 
 #: my-evolution/my-evolution.glade.h:8
-msgid "Displayed feeds:"
-msgstr "Viste tjenester:"
+msgid "Ma_x number of items shown:"
+msgstr "Ma_ksimalt antall oppføringer som vises:"
 
 #: my-evolution/my-evolution.glade.h:9
-msgid "Five days"
-msgstr "Fem dager"
+msgid "News Feed Settings"
+msgstr "Innstillinger for nyhetstjeneste"
 
 #: my-evolution/my-evolution.glade.h:10
-msgid "How many days should the calendar display at once?"
-msgstr "Hvor mange dager skal kalenderen vise om gangen?"
+msgid "One mont_h"
+msgstr "E_n måned"
+
+#: my-evolution/my-evolution.glade.h:11
+msgid "One w_eek"
+msgstr "_En uke"
 
 #: my-evolution/my-evolution.glade.h:12
-msgid "Max number of items shown:"
-msgstr "Maksimalt antall oppføringer som vises:"
+msgid "Refresh _time (seconds):"
+msgstr "Oppda_teringstid (sekunder):"
 
 #: my-evolution/my-evolution.glade.h:13
-msgid "News Feed Settings"
-msgstr "Innstillinger for nyhetstjeneste"
+msgid "Show _all tasks"
+msgstr "Vis _alle oppgaver"
 
 #: my-evolution/my-evolution.glade.h:14
-msgid "News Feeds"
-msgstr "Nyhetstjenester"
+msgid "Show _today's tasks"
+msgstr "Vis _oppgaver for i dag"
 
 #: my-evolution/my-evolution.glade.h:15
-msgid "One day"
-msgstr "En dag"
+msgid "Tasks "
+msgstr "Oppgaver "
 
 #: my-evolution/my-evolution.glade.h:16
-msgid "One month"
-msgstr "En måned"
+msgid "Units: "
+msgstr "Enheter: "
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "One week"
-msgstr "En uke"
-
-#: my-evolution/my-evolution.glade.h:18
-msgid "Refresh time (seconds):"
-msgstr "Oppdateringsintervall (sekunder):"
+msgid "Weather settings"
+msgstr "Innstillinger for vær"
 
 #: my-evolution/my-evolution.glade.h:19
-msgid "Schedule"
-msgstr "Sett av tid"
+msgid "_Display folders:"
+msgstr "_Vis mapper:"
 
 #: my-evolution/my-evolution.glade.h:20
-msgid "Show all tasks"
-msgstr "Vis alle oppgaver"
+msgid "_Display stations:"
+msgstr "_Vis stasjoner:"
 
 #: my-evolution/my-evolution.glade.h:21
-msgid "Show full path for folders"
-msgstr "Vis full sti til mapper"
+msgid "_Displayed feeds:"
+msgstr "_Viste tjenester:"
 
 #: my-evolution/my-evolution.glade.h:22
-msgid "Show today's tasks"
-msgstr "Vis oppgaver for i dag"
+msgid "_Five days"
+msgstr "_Fem dager"
 
 #: my-evolution/my-evolution.glade.h:23
-msgid "Tasks "
-msgstr "Oppgaver "
+msgid "_Mail"
+msgstr "_E-post"
 
 #: my-evolution/my-evolution.glade.h:24
-msgid "Units: "
-msgstr "Enheter: "
+msgid "_News Feeds"
+msgstr "_Nyhetstjenester"
 
 #: my-evolution/my-evolution.glade.h:25
-msgid "Weather"
-msgstr "Vær"
+msgid "_One day"
+msgstr "_En dag"
 
 #: my-evolution/my-evolution.glade.h:26
-msgid "Weather settings"
-msgstr "Innstillinger for vær"
+msgid "_Refresh time (seconds):"
+msgstr "Oppdate_ringstid (sekunder):"
 
 #: my-evolution/my-evolution.glade.h:27
-msgid "imperial"
-msgstr "imperiell"
+msgid "_Schedule"
+msgstr "_Sett av tid"
 
 #: my-evolution/my-evolution.glade.h:28
-msgid "metric"
-msgstr "metrisk"
+msgid "_Show full path for folders"
+msgstr "Vi_s full sti for mapper"
+
+#: my-evolution/my-evolution.glade.h:29
+msgid "_Weather"
+msgstr "_Vær"
+
+#: my-evolution/my-evolution.glade.h:30
+msgid "_imperial"
+msgstr "_imperiell"
+
+#: my-evolution/my-evolution.glade.h:31
+msgid "m_etric"
+msgstr "m_etrisk"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
 msgid "The Evolution shell."
@@ -9615,17 +9562,17 @@ msgstr "Er du sikker på at du vil fjerne mappen '%s'?"
 
 #. Popup a dialog asking what the user would like to rename
 #. the folder to
-#: shell/e-shell-folder-commands.c:450
+#: shell/e-shell-folder-commands.c:452
 #, c-format
 msgid "Rename folder '%s'"
 msgstr "Endre navn på mappe '%s'"
 
-#: shell/e-shell-folder-commands.c:454 shell/e-shortcuts-view.c:412
+#: shell/e-shell-folder-commands.c:456 shell/e-shortcuts-view.c:383
 msgid "Rename"
 msgstr "Endre navn"
 
 #. Make, pack the label
-#: shell/e-shell-folder-commands.c:462
+#: shell/e-shell-folder-commands.c:464
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Mappenavn:"
@@ -9815,40 +9762,40 @@ msgstr "Arbeid \"online\""
 msgid "Work Offline"
 msgstr "Arbeid \"offline\""
 
-#: shell/e-shell-view.c:175
+#: shell/e-shell-view.c:177
 msgid "(No folder displayed)"
 msgstr "(Ingen mappe vist)"
 
-#: shell/e-shell-view.c:1380
+#: shell/e-shell-view.c:1385
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1382
+#: shell/e-shell-view.c:1387
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution - %s [%s]"
 
-#: shell/e-shell-view.c:1420
+#: shell/e-shell-view.c:1425
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Evolution er koblet til. Klikk på denne knappen for å arbeide frakoblet."
 
-#: shell/e-shell-view.c:1427
+#: shell/e-shell-view.c:1432
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution er i ferd med å koble fra."
 
-#: shell/e-shell-view.c:1433
+#: shell/e-shell-view.c:1438
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Evolution er frakoblet. Klikk på denne knappen for å arbeide tilkoblet."
 
-#: shell/e-shell.c:489
+#: shell/e-shell.c:491
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikke sette opp lokal lagring -- %s"
 
-#: shell/e-shell.c:1393
+#: shell/e-shell.c:1405
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -9857,35 +9804,35 @@ msgstr ""
 "Ops! Visningen for `%s' døde uventet. :-(\n"
 "Dette betyr sannsynligvis at komponenten %s har krasjet."
 
-#: shell/e-shell.c:1579 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1609 widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
 
-#: shell/e-shell.c:1581
+#: shell/e-shell.c:1611
 msgid "Invalid arguments"
 msgstr "Ugyldige argumenter"
 
-#: shell/e-shell.c:1583
+#: shell/e-shell.c:1613
 msgid "Cannot register on OAF"
 msgstr "Kan ikke registrere i OAF"
 
-#: shell/e-shell.c:1585
+#: shell/e-shell.c:1615
 msgid "Configuration Database not found"
 msgstr "Konfigurasjonsdatabase ikke funnet"
 
-#: shell/e-shell.c:1587 shell/e-storage.c:481
+#: shell/e-shell.c:1617 shell/e-storage.c:481
 msgid "Generic error"
 msgstr "Vanlig feil"
 
-#: shell/e-shortcuts-view.c:101
+#: shell/e-shortcuts-view.c:72
 msgid "Create new shortcut group"
 msgstr "Opprett ny snarveigruppe"
 
-#: shell/e-shortcuts-view.c:102
+#: shell/e-shortcuts-view.c:73
 msgid "Group name:"
 msgstr "Gruppenavn:"
 
-#: shell/e-shortcuts-view.c:200
+#: shell/e-shortcuts-view.c:171
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -9894,117 +9841,113 @@ msgstr ""
 "Vil du virkelig fjerne gruppen\n"
 "`%s' fra snarveilinjen?"
 
-#: shell/e-shortcuts-view.c:205
+#: shell/e-shortcuts-view.c:176
 msgid "Don't remove"
 msgstr "Ikke fjern"
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:204
 msgid "Rename Shortcut Group"
 msgstr "Endre navn på snarveigruppen"
 
-#: shell/e-shortcuts-view.c:234
+#: shell/e-shortcuts-view.c:205
 msgid "Rename selected shortcut group to:"
 msgstr "Endre valgt snarveigruppe til:"
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:218
 msgid "_Small Icons"
 msgstr "_Små ikoner"
 
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:219
 msgid "Show the shortcuts as small icons"
 msgstr "Vis snarveier som små ikoner"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:221
 msgid "_Large Icons"
 msgstr "Store i_koner"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:222
 msgid "Show the shortcuts as large icons"
 msgstr "Vis snarveier som store ikoner"
 
-#: shell/e-shortcuts-view.c:262
+#: shell/e-shortcuts-view.c:233
 msgid "_New Group..."
 msgstr "_Ny gruppe..."
 
-#: shell/e-shortcuts-view.c:263
+#: shell/e-shortcuts-view.c:234
 msgid "Create a new shortcut group"
 msgstr "Opprett en ny snarveigruppe"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:236
 msgid "_Remove this Group..."
 msgstr "Fje_rn denne gruppen..."
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:237
 msgid "Remove this shortcut group"
 msgstr "Fjern denne snarveigruppen"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:239
 msgid "Re_name this Group..."
 msgstr "E_ndre navn på denne gruppen..."
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:240
 msgid "Rename this shortcut group"
 msgstr "Endre navn på denne snarveigruppen"
 
-#: shell/e-shortcuts-view.c:274
+#: shell/e-shortcuts-view.c:245
 msgid "_Hide the Shortcut Bar"
 msgstr "Sk_jul snarveilinjen"
 
-#: shell/e-shortcuts-view.c:275
+#: shell/e-shortcuts-view.c:246
 msgid "Hide the shortcut bar"
 msgstr "Skjul snarveilinjen"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:365
 msgid "Rename shortcut"
 msgstr "Endre navn på snarvei"
 
-#: shell/e-shortcuts-view.c:395
+#: shell/e-shortcuts-view.c:366
 msgid "Rename selected shortcut to:"
 msgstr "Endre navn på valgt snarvei til:"
 
-#: shell/e-shortcuts-view.c:407 ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "Åpne"
-
-#: shell/e-shortcuts-view.c:407
+#: shell/e-shortcuts-view.c:378
 msgid "Open the folder linked to this shortcut"
 msgstr "Åpne mappen som er lenket til denne snarveien"
 
-#: shell/e-shortcuts-view.c:409 ui/evolution.xml.h:20
+#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:20
 msgid "Open in New Window"
 msgstr "Åpne i nytt vindu"
 
-#: shell/e-shortcuts-view.c:409
+#: shell/e-shortcuts-view.c:380
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Åpne mappen som er lenket til denne snarveien i et nytt vindu"
 
-#: shell/e-shortcuts-view.c:412
+#: shell/e-shortcuts-view.c:383
 msgid "Rename this shortcut"
 msgstr "Endre navn på denne snarveien"
 
-#: shell/e-shortcuts-view.c:414
+#: shell/e-shortcuts-view.c:385
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Fjern denne snarveien fra snarveilinjen"
 
-#: shell/e-shortcuts.c:619
+#: shell/e-shortcuts.c:620
 msgid "Error saving shortcuts."
 msgstr "Feil under lagring av snarveier."
 
-#: shell/e-shortcuts.c:1018
+#: shell/e-shortcuts.c:1019
 msgid "Shortcuts"
 msgstr "Snarveier"
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: shell/e-shortcuts.c:1022
+#: shell/e-shortcuts.c:1023
 msgid "Inbox"
 msgstr "Innboks"
 
-#: shell/e-shortcuts.c:1025
+#: shell/e-shortcuts.c:1026
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: shell/e-storage-set-view.c:1486
+#: shell/e-storage-set-view.c:1464 shell/e-summary-storage.c:78
 msgid "My Evolution"
 msgstr "Min Evolution"
 
@@ -10048,12 +9991,12 @@ msgstr "Operasjonen er ikke støttet"
 msgid "The specified type is not supported in this storage"
 msgstr "Spesifisert type er ikke støttet for dette lageret"
 
-#: shell/e-task-widget.c:168
+#: shell/e-task-widget.c:170
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:173
+#: shell/e-task-widget.c:175
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fullført)"
@@ -10266,9 +10209,12 @@ msgstr "Stopp"
 msgid "Stop Loading"
 msgstr "Stopp innlesing"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution.xml.h:37
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:29
+#: ui/evolution-comp-editor.xml.h:19 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:25
+#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-task-editor.xml.h:9
 msgid "_Actions"
 msgstr "H_andlinger"
 
@@ -10281,11 +10227,11 @@ msgid "_Contact"
 msgstr "_Kontakt"
 
 #: ui/evolution-addressbook.xml.h:33
-msgid "_Contact Group"
-msgstr "_Kontaktgruppe"
+msgid "_Contact List"
+msgstr "_Kontaktliste"
 
-#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:35
-#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
+#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:36
+#: ui/evolution-contact-editor.xml.h:16 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "S_kriv ut..."
 
@@ -10301,8 +10247,9 @@ msgstr "_Søk etter kontakter"
 msgid "_Select All"
 msgstr "_Velg alle"
 
-#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:36
-#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution.xml.h:59
+#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:37
+#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-messagedisplay.xml.h:8
 msgid "_Tools"
 msgstr "_Verktøy"
 
@@ -10394,23 +10341,23 @@ msgstr "Vis arbeidsuken"
 msgid "W_ork Week"
 msgstr "Arbeids_uke"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:30
 msgid "_Appointment..."
 msgstr "_Avtale..."
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:31
 msgid "_Calendar Settings..."
 msgstr "Innstillinger for _kalender..."
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:33
 msgid "_Day"
 msgstr "_Dag"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:34
 msgid "_Month"
 msgstr "_Måned"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:38
 msgid "_Week"
 msgstr "_Uke"
 
@@ -10455,8 +10402,7 @@ msgstr "Skriv ut denne oppføringen"
 msgid "Print..."
 msgstr "Skriv ut..."
 
-#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
-#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-comp-editor.xml.h:15
 msgid "Save and Close"
 msgstr "Lagre og lukk"
 
@@ -10472,16 +10418,12 @@ msgstr "Lagre denne oppføringen til disk"
 msgid "Setup the page settings for your current printer"
 msgstr "Rediger sideinnstillinger for aktiv skriver"
 
-#: ui/evolution-comp-editor.xml.h:19
-msgid "_Action"
-msgstr "H_andling"
-
-#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:41
 msgid "_File"
 msgstr "_Fil"
 
@@ -10498,7 +10440,14 @@ msgid "Print En_velope..."
 msgstr "Skriv ut konvolutt..."
 
 #: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
+msgid "Save"
+msgstr "Lagre"
+
+#: ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "L_agre som..."
@@ -10519,30 +10468,30 @@ msgstr "Se hjelp"
 msgid "Send _message to contact..."
 msgstr "Send _melding til kontakt..."
 
-#: ui/evolution-contact-editor.xml.h:16
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:17
+#: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:54
 #: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Lagre"
 
-#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete this list"
 msgstr "Slett denne listen"
 
-#: ui/evolution-contact-list-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:4
 msgid "Delete..."
 msgstr "Slett..."
 
-#: ui/evolution-contact-list-editor.xml.h:6
+#: ui/evolution-contact-list-editor.xml.h:7
 msgid "Save the list and close the dialog box"
 msgstr "Lagre listen og lukk dialogboksen"
 
-#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:8
 msgid "Se_nd list to other..."
 msgstr "Se_nd liste til andre..."
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:9
 msgid "Send _message to list..."
 msgstr "Send _melding til liste..."
 
@@ -10650,27 +10599,27 @@ msgstr "Abboner eller fjern abonnement på mapper på eksterne tjenere"
 msgid "Virtual Folder _Editor..."
 msgstr "R_edigering av virtuelle mapper..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Filters..."
 msgstr "_Filtre..."
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:20
 msgid "_Mail Message"
 msgstr "Send _melding"
 
-#: ui/evolution-mail-global.xml.h:20
+#: ui/evolution-mail-global.xml.h:21
 msgid "_Mail Settings..."
 msgstr "Innstillinger for e-post..."
 
-#: ui/evolution-mail-global.xml.h:21
+#: ui/evolution-mail-global.xml.h:22
 msgid "_Preview Pane"
 msgstr "_Forhåndsvisningsvindu"
 
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:23
 msgid "_Send / Receive"
 msgstr "_Send / motta"
 
-#: ui/evolution-mail-global.xml.h:23
+#: ui/evolution-mail-global.xml.h:24
 msgid "_Subscribe to Folders..."
 msgstr "_Abonnerer på mapper..."
 
@@ -10740,8 +10689,8 @@ msgid "Select all visible messages"
 msgstr "Velg alle synlige meldinger"
 
 #: ui/evolution-mail-list.xml.h:20
-msgid "Show _All"
-msgstr "Vis _alle"
+msgid "Sh_ow Hidden Messages"
+msgstr "_Vis skjulte meldinger"
 
 #: ui/evolution-mail-list.xml.h:21
 msgid "Show messages that have been temporarily hidden"
@@ -10759,23 +10708,23 @@ msgstr "Skjul valgte meldinger midlertidig"
 msgid "Threaded Message list"
 msgstr "Meldingsliste med tråder"
 
-#: ui/evolution-mail-list.xml.h:25
+#: ui/evolution-mail-list.xml.h:26
 msgid "_Expunge"
 msgstr "_Tøm"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:45
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:42
 msgid "_Folder"
 msgstr "_Mappe"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "Re_verser utvalg"
 
-#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-mail-list.xml.h:29
 msgid "_Properties..."
 msgstr "Egenska_per..."
 
-#: ui/evolution-mail-list.xml.h:29
+#: ui/evolution-mail-list.xml.h:30
 msgid "_Threaded Message List"
 msgstr "Meldingsliste med _tråder"
 
@@ -11079,39 +11028,39 @@ msgstr "VFolder for mottake_re..."
 msgid "VFolder on _Subject..."
 msgstr "VFolder på e_mne..."
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Apply Filters"
 msgstr "_Påfør filtre"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Copy to Folder"
 msgstr "_Kopier til mappe"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 msgid "_Create Filter From Message"
 msgstr "La_g filter fra melding"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:89
 msgid "_Forward Message"
 msgstr "_Videresend melding"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:90
 msgid "_Message Display"
 msgstr "_Meldingsvisning"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Move to Folder"
 msgstr "_Flytt til mappe"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Normal Display"
 msgstr "_Normal visning"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Open Message"
 msgstr "_Åpne melding"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Re-send Message"
 msgstr "_Send melding på nytt"
 
@@ -11122,12 +11071,12 @@ msgstr "Lukk dette vinduet"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:37
 msgid "_Close"
 msgstr "L_ukk"
 
 #: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:60
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:54
 msgid "_View"
 msgstr "_Vis"
 
@@ -11191,11 +11140,6 @@ msgstr "Krypter med S/MIME"
 msgid "S/MIME Sign"
 msgstr "Signer med S/MIME"
 
-#: ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
-msgid "Save"
-msgstr "Lagre"
-
 #: ui/evolution-message-composer.xml.h:20
 msgid "Save As"
 msgstr "Lagre som"
@@ -11323,7 +11267,7 @@ msgstr "Svar-til felt"
 msgid "_Security"
 msgstr "_Sikkerhet"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:48
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:45
 msgid "_Help"
 msgstr "_Hjelp"
 
@@ -11532,66 +11476,50 @@ msgid "_About Evolution..."
 msgstr "_Om Evolution..."
 
 #: ui/evolution.xml.h:38
-msgid "_Appointment (FIXME)"
-msgstr "_Avtale"
-
-#: ui/evolution.xml.h:40
-msgid "_Contact (FIXME)"
-msgstr "_Kontakt"
-
-#: ui/evolution.xml.h:41
 msgid "_Copy..."
 msgstr "_Kopier..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:43
 msgid "_Folder Bar"
 msgstr "_Mappelinje"
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:44
 msgid "_Go to Folder..."
 msgstr "_Gå til mappe..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:46
 msgid "_Import file..."
 msgstr "_Importer fil..."
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:47
 msgid "_Index"
 msgstr "_Indeks"
 
-#: ui/evolution.xml.h:51
-msgid "_Mail message"
-msgstr "Send _melding"
-
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:48
 msgid "_Move..."
 msgstr "_Flytt..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Ny"
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:50
 msgid "_New Folder"
 msgstr "_Ny mappe"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:51
 msgid "_Rename..."
 msgstr "_Gi nytt navn..."
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:52
 msgid "_Shortcut"
 msgstr "_Snarvei"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:53
 msgid "_Shortcut Bar"
 msgstr "_Snarveilinje"
 
-#: ui/evolution.xml.h:58
-msgid "_Task (FIXME)"
-msgstr "_Oppgave"
-
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:55
 msgid "_Work Offline"
 msgstr "Ar_beid \"offline\""
 
@@ -11724,6 +11652,11 @@ msgstr "Definer visninger"
 msgid "MTWTFSS"
 msgstr "MTOTFLS"
 
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1071
+msgid "%B %Y"
+msgstr "%B %Y"
+
 #: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "nå"
@@ -11822,7 +11755,15 @@ msgstr "Redigering av søk"
 msgid "Save Search"
 msgstr "Lagre søk"
 
-#: widgets/misc/e-filter-bar.h:95 widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:94
+msgid "Add to Saved Searches"
+msgstr "Legg til i lagrede søk"
+
+#: widgets/misc/e-filter-bar.h:95
+msgid "Clear"
+msgstr "Tøm"
+
+#: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "Vis alle"
 
@@ -11851,13 +11792,13 @@ msgstr "Melding"
 msgid "Don't show this message again."
 msgstr "Ikke vis denne meldingen igjen."
 
-#: widgets/misc/e-search-bar.c:180
+#: widgets/misc/e-search-bar.c:176
 msgid "Sear_ch"
 msgstr "Sø_k"
 
-#: widgets/misc/e-search-bar.c:272
-msgid "Activate"
-msgstr "Aktiver"
+#: widgets/misc/e-search-bar.c:268
+msgid "Find Now"
+msgstr "Finn nå"
 
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 msgid "The Personal Addressbook Server"
@@ -11879,6 +11820,177 @@ msgstr "init_corba(): kunne ikke initiere GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 
+#~ msgid "LDAP Server"
+#~ msgstr "LDAP-tjener"
+
+#~ msgid "File"
+#~ msgstr "Fil"
+
+#~ msgid "Unknown addressbook type"
+#~ msgstr "Ukjent type adressebok"
+
+#~ msgid "None (anonymous mode)"
+#~ msgstr "Ingen (anonym modus)"
+
+#~ msgid "Unknown auth type"
+#~ msgstr "Ukjent autentiseringstype"
+
+#~ msgid "Subtree"
+#~ msgstr "Undertre"
+
+#~ msgid "Unknown scope type"
+#~ msgstr "Ukjent type område"
+
+#~ msgid "Bind DN:"
+#~ msgstr "Bind DN:"
+
+#~ msgid "Host:"
+#~ msgstr "Vert:"
+
+#~ msgid "Root DN:"
+#~ msgstr "Rot DN:"
+
+#~ msgid "Authentication:"
+#~ msgstr "Autentisering:"
+
+#~ msgid "Advanced LDAP Options"
+#~ msgstr "Avanserte LDAP-alternativer"
+
+#~ msgid "Path:"
+#~ msgstr "Sti:"
+
+#~ msgid "FIXME Path Help text here"
+#~ msgstr "Hjelp for stier her?"
+
+#~ msgid "Create path if it doesn't exist."
+#~ msgstr "Opprett sti hvis den ikke eksisterer."
+
+#~ msgid ""
+#~ "Select the kind of addressbook you have, and enter the relevant "
+#~ "information about it."
+#~ msgstr ""
+#~ "Velg type adressebok du har, og skriv inn relevant informasjon om den."
+
+#~ msgid "Addressbook Sources"
+#~ msgstr "Adressebok-kilder"
+
+#~ msgid "Name"
+#~ msgstr "Navn"
+
+#~ msgid "URI"
+#~ msgstr "URI"
+
+#~ msgid "Enter password for %s"
+#~ msgstr "Skriv inn passord for %s"
+
+#~ msgid "Select name from _folder:"
+#~ msgstr "Velg navn fra _mappe:"
+
+#~ msgid "%B"
+#~ msgstr "%B"
+
+#~ msgid "Delegated From:"
+#~ msgstr "Delegert fra:"
+
+#~ msgid "Delegated To:"
+#~ msgstr "Delegert til:"
+
+#~ msgid "No one"
+#~ msgstr "Ingen"
+
+#~ msgid "Task"
+#~ msgstr "Oppgave"
+
+#~ msgid "% Comp_lete:"
+#~ msgstr "% ferdi_g:"
+
+#~ msgid "_Go to Today"
+#~ msgstr "_Gå til i dag"
+
+#~ msgid "Birthday"
+#~ msgstr "Fødselsdag"
+
+#~ msgid "Competition"
+#~ msgstr "Konkurranse"
+
+#~ msgid "Favorites"
+#~ msgstr "Favoritter"
+
+#~ msgid "Gifts"
+#~ msgstr "Gaver"
+
+#~ msgid "Goals/Objectives"
+#~ msgstr "Mål/Objektiver"
+
+#~ msgid "Holiday"
+#~ msgstr "Ferie"
+
+#~ msgid "Holiday Cards"
+#~ msgstr "Feriekort"
+
+#~ msgid "Hot Contacts"
+#~ msgstr "Hete kontakter"
+
+#~ msgid "Ideas"
+#~ msgstr "Idéer"
+
+#~ msgid "International"
+#~ msgstr "Internasjonalt"
+
+#~ msgid "Key Customer"
+#~ msgstr "Nøkkelkunde"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Forskjellig"
+
+#~ msgid "Personal"
+#~ msgstr "Personlig"
+
+#~ msgid "Phone Calls"
+#~ msgstr "Telefonsamtaler"
+
+#~ msgid "Strategies"
+#~ msgstr "Strategier"
+
+#~ msgid "Suppliers"
+#~ msgstr "Leverandører"
+
+#~ msgid "Time & Expenses"
+#~ msgstr "Tid & utgifter"
+
+#~ msgid "VIP"
+#~ msgstr "VIP"
+
+#~ msgid "Waiting"
+#~ msgstr "Venter"
+
+#~ msgid "Store search as vFolder"
+#~ msgstr "Lagre søk som vMappe"
+
+#~ msgid "_Contact Group"
+#~ msgstr "_Kontaktgruppe"
+
+#~ msgid "_Action"
+#~ msgstr "H_andling"
+
+#~ msgid "Show _All"
+#~ msgstr "Vis _alle"
+
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "_Avtale"
+
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "_Kontakt"
+
+#~ msgid "_Mail message"
+#~ msgstr "Send _melding"
+
+#~ msgid "_Task (FIXME)"
+#~ msgstr "_Oppgave"
+
+#~ msgid "Activate"
+#~ msgstr "Aktiver"
+
 #~ msgid "Transparent"
 #~ msgstr "Gjennomsiktig"
 
@@ -11905,9 +12017,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Transparency"
 #~ msgstr "Gjennomsiktighet"
 
-#~ msgid "_Go To Today"
-#~ msgstr "_Gå til idag"
-
 #~ msgid "Store"
 #~ msgstr "Lager"
 
@@ -11956,9 +12065,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Sending"
 #~ msgstr "Sender"
 
-#~ msgid "Sender contains"
-#~ msgstr "Sender inneholder"
-
 #~ msgid "Set task view preferences"
 #~ msgstr "Endre brukervalg for oppgavevisning"
 
@@ -13300,9 +13406,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Proxy host:"
 #~ msgstr "Proxy-vert:"
 
-#~ msgid "Password:"
-#~ msgstr "Passord:"
-
 #~ msgid ""
 #~ "Warning: Your password will be saved as\n"
 #~ "unencrypted text in a private configuration\n"
@@ -13593,9 +13696,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Modem Lights Settings"
 #~ msgstr "Instillinger for Modemlys"
 
-#~ msgid "Connecting"
-#~ msgstr "Kobler til"
-
 #~ msgid "Connect command:"
 #~ msgstr "Tilkoblingskommando:"
 
@@ -13659,9 +13759,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Set options as default"
 #~ msgstr "Sett alternativer som standard"
 
-#~ msgid "Advanced"
-#~ msgstr "Avansert"
-
 #~ msgid "CPU Load Applet"
 #~ msgstr "CPU Last applet"
 
@@ -14814,9 +14911,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Size of URL history: "
 #~ msgstr "Størrelse på historikken for URLer:"
 
-#~ msgid "Clear"
-#~ msgstr "Tøm"
-
 #~ msgid "all entries in URL history"
 #~ msgstr "alle oppføringer i URL-historikken"
 
@@ -15139,9 +15233,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Assig_n Task (FIXME)"
 #~ msgstr "_Tildel oppgave"
 
-#~ msgid "Find"
-#~ msgstr "Finn"
-
 #~ msgid "Meeting Re_quest (FIXME)"
 #~ msgstr "Møteforesp_ørsel"
 
@@ -15523,9 +15614,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ "kan også brukes for å hente e-post fra enkelte e-posttilbydere via web i "
 #~ "tillegg til proprietære e-postsystemer."
 
-#~ msgid "Secure SMTP"
-#~ msgstr "Sikker SMTP"
-
 #~ msgid ""
 #~ "For delivering mail by connecting to a remote mailhub using SMTP over an "
 #~ "SSL connection.\n"
@@ -15576,9 +15664,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Required"
 #~ msgstr "Nødvendige"
 
-#~ msgid "Server type:"
-#~ msgstr "Tjenertype:"
-
 #~ msgid "Transport"
 #~ msgstr "Transport"
 
@@ -15802,9 +15887,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Reply to _Sender"
 #~ msgstr "Svar til _sender"
 
-#~ msgid "Show _All Messages"
-#~ msgstr "Vis _alle meldinger"
-
 #~ msgid "_Filter on Subject"
 #~ msgstr "_Filtrer etter emne"
 
@@ -15991,9 +16073,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "_Audio"
 #~ msgstr "_Lyd"
 
-#~ msgid "_Mail"
-#~ msgstr "_E-post"
-
 #~ msgid "_Program"
 #~ msgstr "_Program"
 
@@ -16611,9 +16690,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "_Submit Bug Report"
 #~ msgstr "_Send inn feilrapport"
 
-#~ msgid "Send _Now"
-#~ msgstr "Send _nå"
-
 #~ msgid "Custom search"
 #~ msgstr "Egendefinert søk"