Updated Norwegian translation. Huge update.

2001-07-09  Kjartan Maraas  <kmaraas@gnome.org>

	* no.po: Updated Norwegian translation.
	* POTFILES.in: Huge update.

svn path=/trunk/; revision=10904

3 files changed, 2139 insertions, 1602 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 7a317f945e..df582f1de6 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-09  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* no.po: Updated Norwegian translation.
+	* POTFILES.in: Huge update.
+	
 2001-07-08  Christian Rose  <menthos@menthos.com>
 
 	* sv.po: Updated Swedish translation.
@@ -17,6 +22,7 @@
 
         * es.po: Updated Spanish translation.
 	
+>>>>>>> 1.516
 2001-07-07  Christian Rose  <menthos@menthos.com>
 
 	* sv.po: Updated Swedish translation.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5c5049ac7a..f66c0497a7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -7,13 +7,6 @@ addressbook/backend/ebook/load-pine-addressbook.c
 addressbook/backend/ebook/test-client.c
 addressbook/backend/ebook/test-client-list.c
 addressbook/conduit/address-conduit.c
-addressbook/gui/contact-editor/contact-editor.glade
-addressbook/gui/contact-editor/e-contact-editor.c
-addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade
-addressbook/gui/contact-editor/e-contact-quick-add.c
-addressbook/gui/contact-editor/fulladdr.glade
-addressbook/gui/contact-editor/fullname.glade
-addressbook/gui/contact-list-editor/contact-list-editor.glade
 addressbook/gui/component/addressbook.c
 addressbook/gui/component/addressbook-config.c
 addressbook/gui/component/addressbook-config.glade
@@ -22,44 +15,62 @@ addressbook/gui/component/addressbook-storage.c
 addressbook/gui/component/e-address-popup.c
 addressbook/gui/component/e-address-widget.c
 addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in
+addressbook/gui/component/select-names/e-select-names.c
 addressbook/gui/component/select-names/e-select-names-popup.c
 addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in
 addressbook/gui/component/select-names/select-names.glade
+addressbook/gui/contact-editor/contact-editor.glade
+addressbook/gui/contact-editor/e-contact-editor.c
+addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade
+addressbook/gui/contact-editor/e-contact-quick-add.c
+addressbook/gui/contact-editor/fulladdr.glade
+addressbook/gui/contact-editor/fullname.glade
+addressbook/gui/contact-list-editor/contact-list-editor.glade
 addressbook/gui/contact-list-editor/e-contact-list-editor.c
 addressbook/gui/merging/e-card-duplicate-detected.glade
 addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade
 addressbook/gui/search/e-addressbook-search-dialog.c
 addressbook/gui/widgets/alphabet.glade
+addressbook/gui/widgets/e-addressbook-reflow-adapter.c
+addressbook/gui/widgets/e-addressbook-table-adapter.c
+addressbook/gui/widgets/e-addressbook-util.c
 addressbook/gui/widgets/e-addressbook-view.c
 addressbook/gui/widgets/e-minicard.c
 addressbook/gui/widgets/e-minicard-control.c
 addressbook/gui/widgets/e-minicard-view.c
-addressbook/gui/widgets/e-addressbook-reflow-adapter.c
 addressbook/gui/widgets/gal-view-factory-minicard.c
 addressbook/printing/e-contact-print.glade
 calendar/cal-util/timeutil.c
 calendar/conduits/calendar/calendar-conduit.c
 calendar/conduits/todo/todo-conduit.c
-calendar/gui/alarm-notify/alarm-queue.c
-calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in
 calendar/gui/alarm-notify/alarm-notify-dialog.c
 calendar/gui/alarm-notify/alarm-notify.glade
+calendar/gui/alarm-notify/alarm-queue.c
+calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in
 calendar/gui/alarm-notify/notify-main.c
 calendar/gui/calendar-commands.c
 calendar/gui/calendar-model.c
+calendar/gui/calendar-view-factory.c
 calendar/gui/control-factory.c
 calendar/gui/dialogs/alarm-options.c
 calendar/gui/dialogs/alarm-options.glade
 calendar/gui/dialogs/alarm-page.c
 calendar/gui/dialogs/alarm-page.glade
 calendar/gui/dialogs/cal-prefs-dialog.glade
+calendar/gui/dialogs/cancel-comp.c
+calendar/gui/dialogs/changed-comp.c
+calendar/gui/dialogs/comp-editor.c
+calendar/gui/dialogs/comp-editor-util.c
 calendar/gui/dialogs/delete-comp.c
+calendar/gui/dialogs/e-timezone-dialog.c
 calendar/gui/dialogs/e-timezone-dialog.glade
 calendar/gui/dialogs/event-editor.c
 calendar/gui/dialogs/event-page.glade
-calendar/gui/dialogs/recurrence-page.glade
+calendar/gui/dialogs/meeting-page.c
 calendar/gui/dialogs/recurrence-page.c
+calendar/gui/dialogs/recurrence-page.glade
 calendar/gui/dialogs/save-comp.c
+calendar/gui/dialogs/send-comp.c
 calendar/gui/dialogs/task-details-page.glade
 calendar/gui/dialogs/task-editor.c
 calendar/gui/dialogs/task-page.glade
@@ -76,19 +87,21 @@ calendar/gui/gnome-cal.c
 calendar/gui/GNOME_Evolution_Calendar.oaf.in
 calendar/gui/goto.c
 calendar/gui/goto-dialog.glade
+calendar/gui/itip-utils.c
 calendar/gui/main.c
 calendar/gui/print.c
 calendar/gui/tasks-control.c
 calendar/gui/tasks-migrate.c
 calendar/gui/weekday-picker.c
-calendar/pcs/query.c
 camel/camel-cipher-context.c
 camel/camel-cms-context.h
+camel/camel-disco-diary.c
 camel/camel-disco-store.c
 camel/camel-filter-driver.c
 camel/camel-filter-search.c
 camel/camel-folder-search.c
 camel/camel-lock.c
+camel/camel-lock-client.c
 camel/camel-movemail.c
 camel/camel-pgp-context.c
 camel/camel-pgp-mime.c
@@ -105,16 +118,16 @@ camel/camel-service.c
 camel/camel-session.c
 camel/camel-smime-context.c
 camel/camel-store.c
-camel/camel-tcp-stream-ssl.c
 camel/camel-tcp-stream-openssl.c
+camel/camel-tcp-stream-ssl.c
 camel/camel-url.c
 camel/camel-vee-folder.c
 camel/camel-vtrash-folder.c
 #camel/providers/cache/camel-cache-map.c
 #camel/providers/cache/camel-cache-store.c
-camel/providers/imap/camel-imap-message-cache.c
 camel/providers/imap/camel-imap-command.c
 camel/providers/imap/camel-imap-folder.c
+camel/providers/imap/camel-imap-message-cache.c
 camel/providers/imap/camel-imap-provider.c
 camel/providers/imap/camel-imap-store.c
 camel/providers/local/camel-local-provider.c
@@ -129,6 +142,9 @@ camel/providers/local/camel-mbox-summary.c
 camel/providers/local/camel-mh-folder.c
 camel/providers/local/camel-mh-store.c
 camel/providers/local/camel-mh-summary.c
+camel/providers/local/camel-spool-folder.c
+camel/providers/local/camel-spool-store.c
+camel/providers/local/camel-spool-summary.c
 camel/providers/nntp/camel-nntp-auth.c
 camel/providers/nntp/camel-nntp-folder.c
 camel/providers/nntp/camel-nntp-grouplist.c
@@ -146,6 +162,7 @@ composer/e-msg-composer-attachment.c
 composer/e-msg-composer-attachment.glade
 composer/e-msg-composer.c
 composer/e-msg-composer-hdrs.c
+composer/e-msg-composer-select-file.c
 composer/evolution-composer.c
 data/evolution.desktop.in
 data/evolution.keys.in
@@ -166,11 +183,11 @@ filter/score-editor.c
 filter/score-rule.c
 filter/vfolder-editor.c
 filter/vfolder-rule.c
+importers/elm-importer.c
+importers/evolution-gnomecard-importer.c
 importers/GNOME_Evolution_Elm_Intelligent_Importer.oaf.in
 importers/GNOME_Evolution_Netscape_Intelligent_Importer.oaf.in
 importers/GNOME_Evolution_Pine_Intelligent_Importer.oaf.in
-importers/elm-importer.c
-importers/evolution-gnomecard-importer.c
 importers/netscape-importer.c
 importers/pine-importer.c
 mail/component-factory.c
@@ -182,6 +199,7 @@ mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in
 mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in
 mail/local-config.glade
 mail/mail-account-editor.c
+mail/mail-account-editor-news.c
 mail/mail-account-gui.c
 mail/mail-accounts.c
 mail/mail-autofilter.c
@@ -197,23 +215,25 @@ mail/mail-local.c
 mail/mail-mt.c
 mail/mail-ops.c
 mail/mail-search.c
-mail/mail-search-dialogue.c
 mail/mail-search.c
+mail/mail-search-dialogue.c
 mail/mail-send-recv.c
+mail/mail-session.c
 mail/mail-tools.c
 mail/mail-vfolder.c
 mail/message-browser.c
 mail/message-list.c
 mail/message-list.etspec
-mail/mail-session.c
 mail/subscribe-dialog.c
-my-evolution/GNOME_Evolution_Summary.oaf.in
 my-evolution/component-factory.c
+my-evolution/e-summary.c
 my-evolution/e-summary-calendar.c
 my-evolution/e-summary-mail.c
+my-evolution/e-summary-preferences.c
 my-evolution/e-summary-rdf.c
+my-evolution/e-summary-tasks.c
 my-evolution/e-summary-weather.c
-my-evolution/e-summary.c
+my-evolution/GNOME_Evolution_Summary.oaf.in
 my-evolution/main.c
 my-evolution/metar.c
 my-evolution/my-evolution.glade
@@ -248,9 +268,10 @@ ui/evolution-event-editor.xml
 ui/evolution-executive-summary.xml
 ui/evolution-mail-global.xml
 ui/evolution-mail-list.xml
-ui/evolution-mail-message.xml
 ui/evolution-mail-messagedisplay.xml
+ui/evolution-mail-message.xml
 ui/evolution-message-composer.xml
+ui/evolution-signature-editor.xml
 ui/evolution-subscribe.xml
 ui/evolution-task-editor.xml
 ui/evolution-tasks.xml
diff --git a/po/no.po b/po/no.po
index 17225f4563..27cf56f97b 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,19 +5,19 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-applets 1.4.1\n"
-"POT-Creation-Date: 2001-07-03 00:09+0200\n"
-"PO-Revision-Date: 2001-07-03 00:22+0200\n"
+"POT-Creation-Date: 2001-07-09 09:20+0200\n"
+"PO-Revision-Date: 2001-07-09 09:21+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3546
+#: addressbook/backend/ebook/e-card.c:3606
 msgid "Card: "
 msgstr "Kort: "
 
-#: addressbook/backend/ebook/e-card.c:3548
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "Name: "
@@ -25,7 +25,7 @@ msgstr ""
 "\n"
 "Navn:"
 
-#: addressbook/backend/ebook/e-card.c:3549
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Prefix:     "
@@ -33,7 +33,7 @@ msgstr ""
 "\n"
 "Prefiks:    "
 
-#: addressbook/backend/ebook/e-card.c:3550
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Given:      "
@@ -41,7 +41,7 @@ msgstr ""
 "\n"
 "Oppgitt:     "
 
-#: addressbook/backend/ebook/e-card.c:3551
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Additional: "
@@ -49,7 +49,7 @@ msgstr ""
 "\n"
 "Tillegg: "
 
-#: addressbook/backend/ebook/e-card.c:3552
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Family:     "
@@ -57,7 +57,7 @@ msgstr ""
 "\n"
 "Familie:    "
 
-#: addressbook/backend/ebook/e-card.c:3553
+#: addressbook/backend/ebook/e-card.c:3613
 msgid ""
 "\n"
 "  Suffix:     "
@@ -65,7 +65,7 @@ msgstr ""
 "\n"
 "Suffiks:    "
 
-#: addressbook/backend/ebook/e-card.c:3567
+#: addressbook/backend/ebook/e-card.c:3627
 msgid ""
 "\n"
 "Birth Date: "
@@ -73,7 +73,7 @@ msgstr ""
 "\n"
 "Fødselsdato: "
 
-#: addressbook/backend/ebook/e-card.c:3578
+#: addressbook/backend/ebook/e-card.c:3638
 msgid ""
 "\n"
 "Address:"
@@ -81,7 +81,7 @@ msgstr ""
 "\n"
 "Adresse:"
 
-#: addressbook/backend/ebook/e-card.c:3580
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -89,7 +89,7 @@ msgstr ""
 "\n"
 "Postboks:  "
 
-#: addressbook/backend/ebook/e-card.c:3581
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Ext:         "
@@ -97,7 +97,7 @@ msgstr ""
 "\n"
 "Linje:         "
 
-#: addressbook/backend/ebook/e-card.c:3582
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  Street:      "
@@ -105,7 +105,7 @@ msgstr ""
 "\n"
 "Gate:     "
 
-#: addressbook/backend/ebook/e-card.c:3583
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  City:        "
@@ -113,7 +113,7 @@ msgstr ""
 "\n"
 "By:          "
 
-#: addressbook/backend/ebook/e-card.c:3584
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Region:      "
@@ -121,7 +121,7 @@ msgstr ""
 "\n"
 "Region:     "
 
-#: addressbook/backend/ebook/e-card.c:3585
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Postal Code: "
@@ -129,7 +129,7 @@ msgstr ""
 "\n"
 "Postnummer: "
 
-#: addressbook/backend/ebook/e-card.c:3586
+#: addressbook/backend/ebook/e-card.c:3646
 msgid ""
 "\n"
 "  Country:     "
@@ -137,7 +137,7 @@ msgstr ""
 "\n"
 "Land:    "
 
-#: addressbook/backend/ebook/e-card.c:3599
+#: addressbook/backend/ebook/e-card.c:3659
 msgid ""
 "\n"
 "Delivery Label: "
@@ -145,7 +145,7 @@ msgstr ""
 "\n"
 "Leveringsetikett: "
 
-#: addressbook/backend/ebook/e-card.c:3611
+#: addressbook/backend/ebook/e-card.c:3671
 msgid ""
 "\n"
 "Telephones:\n"
@@ -153,7 +153,7 @@ msgstr ""
 "\n"
 "Telefoner:\n"
 
-#: addressbook/backend/ebook/e-card.c:3614
+#: addressbook/backend/ebook/e-card.c:3674
 msgid ""
 "\n"
 "Telephone:"
@@ -161,7 +161,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3638
+#: addressbook/backend/ebook/e-card.c:3698
 msgid ""
 "\n"
 "E-mail:\n"
@@ -169,7 +169,7 @@ msgstr ""
 "\n"
 "E-post:\n"
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3701
 msgid ""
 "\n"
 "E-mail:"
@@ -177,7 +177,7 @@ msgstr ""
 "\n"
 "E-post:"
 
-#: addressbook/backend/ebook/e-card.c:3660
+#: addressbook/backend/ebook/e-card.c:3720
 msgid ""
 "\n"
 "Mailer: "
@@ -185,7 +185,7 @@ msgstr ""
 "\n"
 "E-post program: "
 
-#: addressbook/backend/ebook/e-card.c:3666
+#: addressbook/backend/ebook/e-card.c:3726
 msgid ""
 "\n"
 "Time Zone: "
@@ -193,7 +193,7 @@ msgstr ""
 "\n"
 "Tidssone: "
 
-#: addressbook/backend/ebook/e-card.c:3674
+#: addressbook/backend/ebook/e-card.c:3734
 msgid ""
 "\n"
 "Geo Location: "
@@ -201,7 +201,7 @@ msgstr ""
 "\n"
 "Geografisk lokasjon: "
 
-#: addressbook/backend/ebook/e-card.c:3678
+#: addressbook/backend/ebook/e-card.c:3738
 msgid ""
 "\n"
 "Business Role: "
@@ -209,7 +209,7 @@ msgstr ""
 "\n"
 "Stilling: "
 
-#: addressbook/backend/ebook/e-card.c:3690
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "Org: "
@@ -217,7 +217,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3691
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Name:  "
@@ -225,7 +225,7 @@ msgstr ""
 "\n"
 "Navn:  "
 
-#: addressbook/backend/ebook/e-card.c:3692
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit:  "
@@ -233,7 +233,7 @@ msgstr ""
 "\n"
 "Enhet:  "
 
-#: addressbook/backend/ebook/e-card.c:3693
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit2: "
@@ -241,7 +241,7 @@ msgstr ""
 "\n"
 "Enhet2: "
 
-#: addressbook/backend/ebook/e-card.c:3694
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit3: "
@@ -249,7 +249,7 @@ msgstr ""
 "\n"
 "Enhet3: "
 
-#: addressbook/backend/ebook/e-card.c:3695
+#: addressbook/backend/ebook/e-card.c:3755
 msgid ""
 "\n"
 "  Unit4: "
@@ -257,7 +257,7 @@ msgstr ""
 "\n"
 "Enhet4: "
 
-#: addressbook/backend/ebook/e-card.c:3699
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Categories: "
@@ -265,7 +265,7 @@ msgstr ""
 "\n"
 "Kategorier: "
 
-#: addressbook/backend/ebook/e-card.c:3700
+#: addressbook/backend/ebook/e-card.c:3760
 msgid ""
 "\n"
 "Comment: "
@@ -283,7 +283,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3713
+#: addressbook/backend/ebook/e-card.c:3773
 msgid ""
 "\n"
 "Unique String: "
@@ -291,7 +291,7 @@ msgstr ""
 "\n"
 "Unik streng: "
 
-#: addressbook/backend/ebook/e-card.c:3716
+#: addressbook/backend/ebook/e-card.c:3776
 msgid ""
 "\n"
 "Public Key: "
@@ -299,19 +299,15 @@ msgstr ""
 "\n"
 "Offentlig nøkkel: "
 
-#: addressbook/backend/ebook/e-card.c:3978
+#: addressbook/backend/ebook/e-card.c:4038
 msgid "Multiple VCards"
 msgstr "Flere VCard"
 
-#: addressbook/backend/ebook/e-card.c:3986
+#: addressbook/backend/ebook/e-card.c:4046
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard for %s"
 
-#: addressbook/backend/ebook/e-destination.c:344
-msgid "???"
-msgstr "???"
-
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
 msgid "Factory to import VCard files into Evolution."
 msgstr "Factory for import av VCard-filer til Evolution."
@@ -357,393 +353,6 @@ msgstr "Kunne ikke starte wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "Kunne ikke lese pilotens adresseapplikasjonsblokk"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
-msgstr "Legg til"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
-msgid "Anni_versary:"
-msgstr "Br_yllupsdag:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
-msgid "B_usiness"
-msgstr "A_rbeid"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
-msgid "Business _Fax"
-msgstr "_Faks på arbeid"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "K_ontakter..."
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/event-page.glade.h:2
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Ca_tegories..."
-msgstr "Ka_tegorier..."
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "Contact Editor"
-msgstr "Kontaktredigering"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor.c:135
-msgid "Details"
-msgstr "Detaljer"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
-msgid "File As:"
-msgstr "Lagre som:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "General"
-msgstr "Generelt"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
-msgid "New phone type"
-msgstr "Ny telefontype"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
-msgid "No_tes:"
-msgstr "No_tater:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-msgid "Phone Types"
-msgstr "Telefontyper"
-
-#: addressbook/gui/component/e-address-popup.c:466
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
-#: addressbook/gui/contact-editor/e-contact-editor.c:1486
-msgid "Primary Email"
-msgstr "Primær e-post"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
-msgid "Wants to receive _HTML mail"
-msgstr "Vil motta _HTML e-post"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-msgid "Web page address:"
-msgstr "Hjemmeside-adresse:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:96
-msgid "_Add"
-msgstr "_Legg til"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
-msgid "_Address..."
-msgstr "_Adresse..."
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
-msgid "_Assistant's name:"
-msgstr "Assistents navn"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-msgid "_Birthday:"
-msgstr "Fø_dselsdag:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-msgid "_Business"
-msgstr "Ar_beid"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "_Firma:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:1220 mail/mail-config.glade.h:97
-#: ui/evolution-mail-message.xml.h:76 ui/evolution-tasks.xml.h:14
-#: ui/evolution.xml.h:46
-msgid "_Delete"
-msgstr "_Slett"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
-msgid "_Department:"
-msgstr "Av_deling:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-msgid "_Full Name..."
-msgstr ":Fullt navn..."
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-msgid "_Home"
-msgstr "_Hjemme"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-msgid "_Job title:"
-msgstr "_Jobbtittel:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Manager's Name:"
-msgstr "_Leders navn:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
-msgid "_Mobile"
-msgstr "_Mobil"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
-msgid "_Nickname:"
-msgstr "Kalle_navn:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
-msgid "_Office:"
-msgstr "Kont_or:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
-msgid "_Profession:"
-msgstr "_Yrke:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
-msgid "_Spouse:"
-msgstr "Ekte_felle:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-msgid "_This is the mailing address"
-msgstr "De_tte er postadressen"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:669
-msgid "This contact belongs to these categories:"
-msgstr "Denne kontakten hører til disse kategoriene:"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1444
-#: addressbook/gui/widgets/e-addressbook-view.c:735
-msgid "Assistant"
-msgstr "Assistent"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1445
-#: addressbook/gui/contact-editor/e-contact-editor.c:1512
-msgid "Business"
-msgstr "Arbeid"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1446
-msgid "Business 2"
-msgstr "Arbeid 2"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1447
-#: addressbook/gui/widgets/e-addressbook-view.c:715
-msgid "Business Fax"
-msgstr "Faks på arbeid"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1448
-msgid "Callback"
-msgstr "Tilbakering"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1449
-msgid "Car"
-msgstr "Bil"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1450
-msgid "Company"
-msgstr "Firma"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1451
-#: addressbook/gui/contact-editor/e-contact-editor.c:1513
-msgid "Home"
-msgstr "Hjemme"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1452
-msgid "Home 2"
-msgstr "Hjemme 2"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1453
-#: addressbook/gui/widgets/e-addressbook-view.c:716
-msgid "Home Fax"
-msgstr "Faks hjemme"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1454
-#: addressbook/gui/widgets/e-addressbook-view.c:719
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1455
-msgid "Mobile"
-msgstr "Mobil"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1456
-#: addressbook/gui/contact-editor/e-contact-editor.c:1514
-#: mail/mail-config.glade.h:57
-msgid "Other"
-msgstr "Andre"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1457
-#: addressbook/gui/widgets/e-addressbook-view.c:721
-msgid "Other Fax"
-msgstr "Annen faks"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1458
-#: addressbook/gui/widgets/e-addressbook-view.c:722
-msgid "Pager"
-msgstr "Personsøker"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1459
-msgid "Primary"
-msgstr "Primær"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1460
-#: addressbook/gui/widgets/e-addressbook-view.c:723
-msgid "Radio"
-msgstr "Radio"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1461
-#: addressbook/gui/widgets/e-addressbook-view.c:724
-msgid "Telex"
-msgstr "Teleks"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1462
-msgid "TTY/TDD"
-msgstr "TTY/TTD"
-
-#: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1487
-#: addressbook/gui/widgets/e-addressbook-view.c:727
-msgid "Email 2"
-msgstr "E-post 2"
-
-#: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1488
-#: addressbook/gui/widgets/e-addressbook-view.c:728
-msgid "Email 3"
-msgstr "E-post 3"
-
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "Slett kontakt?"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
-msgid "Contact Quick-Add"
-msgstr "Hurtigkontakt"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
-msgid "Edit Full"
-msgstr "Rediger alt"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:702
-msgid "Full Name"
-msgstr "Fullt navn"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
-msgid "E-mail"
-msgstr "E-post"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "Adresse _2:"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
-msgid "Canada"
-msgstr "Kanada"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
-msgid "Check Address"
-msgstr "Sjekk adresse"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
-msgid "Countr_y:"
-msgstr "Lan_d:"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
-msgid "Finland"
-msgstr "Finland"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
-msgid "USA"
-msgstr "USA"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
-msgid "_Address:"
-msgstr "_Adresse:"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
-msgid "_City:"
-msgstr "_By:"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
-msgid "_PO Box:"
-msgstr "_Postboks:"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:10
-msgid "_State/Province:"
-msgstr "_Stat/Provins:"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:11
-msgid "_ZIP Code:"
-msgstr "_ZIP/Postnummer:"
-
-#: addressbook/gui/contact-editor/fullname.glade.h:1
-msgid "Check Full Name"
-msgstr "Sjekk fullt navn:"
-
-#: addressbook/gui/contact-editor/fullname.glade.h:2
-msgid "Dr."
-msgstr "Dr."
-
-#: addressbook/gui/contact-editor/fullname.glade.h:3
-msgid "Esq."
-msgstr "Esq."
-
-#: addressbook/gui/contact-editor/fullname.glade.h:4
-msgid "I"
-msgstr "I"
-
-#: addressbook/gui/contact-editor/fullname.glade.h:5
-msgid "II"
-msgstr "II"
-
-#: addressbook/gui/contact-editor/fullname.glade.h:6
-msgid "III"
-msgstr "III"
-
-#: addressbook/gui/contact-editor/fullname.glade.h:7
-msgid "Jr."
-msgstr "Jr."
-
-#: addressbook/gui/contact-editor/fullname.glade.h:8
-msgid "Miss"
-msgstr "Frk"
-
-#: addressbook/gui/contact-editor/fullname.glade.h:9
-msgid "Mr."
-msgstr "Hr."
-
-#: addressbook/gui/contact-editor/fullname.glade.h:10
-msgid "Mrs."
-msgstr "Fru"
-
-#: addressbook/gui/contact-editor/fullname.glade.h:11
-msgid "Ms."
-msgstr "Frk."
-
-#: addressbook/gui/contact-editor/fullname.glade.h:12
-msgid "Sr."
-msgstr "Sr."
-
-#: addressbook/gui/contact-editor/fullname.glade.h:13
-msgid "_First:"
-msgstr "_Fornavn:"
-
-#: addressbook/gui/contact-editor/fullname.glade.h:14
-msgid "_Last:"
-msgstr "_Etternavn:"
-
-#: addressbook/gui/contact-editor/fullname.glade.h:15
-msgid "_Middle:"
-msgstr "_Mellomnavn:"
-
-#: addressbook/gui/contact-editor/fullname.glade.h:16
-msgid "_Suffix:"
-msgstr "_Suffiks:"
-
-#: addressbook/gui/contact-editor/fullname.glade.h:17
-msgid "_Title:"
-msgstr "_Tittel:"
-
 #: addressbook/gui/component/addressbook.c:345
 #, c-format
 msgid "Enter password for %s"
@@ -783,7 +392,7 @@ 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:554 calendar/gui/gnome-cal.c:215
+#: addressbook/gui/component/addressbook.c:554 calendar/gui/gnome-cal.c:218
 msgid "Any field contains"
 msgstr "Et felt inneholder"
 
@@ -821,8 +430,8 @@ msgstr "Ingen (anonym modus)"
 
 #: addressbook/gui/component/addressbook-config.c:165
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:291
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:61
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:63
 msgid "Password"
 msgstr "Passord"
 
@@ -855,12 +464,12 @@ msgid "FIXME Bind DN Help text here"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:352
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 msgid "Remember this password"
 msgstr "Husk dette passordet"
 
 #: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:42
 msgid "Host:"
 msgstr "Vert:"
 
@@ -897,7 +506,7 @@ msgid "Advanced LDAP Options"
 msgstr "Avanserte LDAP-alternativer"
 
 #: addressbook/gui/component/addressbook-config.c:522
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:64
 msgid "Path:"
 msgstr "Sti:"
 
@@ -924,7 +533,7 @@ msgid ""
 msgstr "Velg type adressebok du har, og skriv inn relevant informasjon om den."
 
 #: addressbook/gui/component/addressbook-config.c:688
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53 my-evolution/e-summary-preferences.c:887
 msgid "Name:"
 msgstr "Navn:"
 
@@ -942,6 +551,14 @@ msgstr "Beskrivelse:"
 msgid "FIXME Description help text here"
 msgstr ""
 
+#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1 filter/filter.glade.h:1
+#: mail/mail-config.glade.h:7
+msgid "Add"
+msgstr "Legg til"
+
 #: addressbook/gui/component/addressbook-config.glade.h:2
 msgid "Addressbook Sources"
 msgstr "Adressebok-kilder"
@@ -953,7 +570,7 @@ msgstr "Adressebok-kilder"
 #: calendar/gui/dialogs/recurrence-page.glade.h:5 filter/filter.glade.h:2
 #: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:27
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-mail-message.xml.h:16 ui/evolution-tasks.xml.h:6
+#: ui/evolution-mail-message.xml.h:16 ui/evolution-tasks.xml.h:5
 msgid "Delete"
 msgstr "Slett"
 
@@ -983,6 +600,24 @@ msgstr "Andre kontakter"
 msgid "(none)"
 msgstr "(ingen)"
 
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/e-contact-editor.c:1476
+msgid "Primary Email"
+msgstr "Primær e-post"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1477
+#: addressbook/gui/widgets/e-addressbook-view.c:727
+msgid "Email 2"
+msgstr "E-post 2"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1478
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 3"
+msgstr "E-post 3"
+
 #: addressbook/gui/component/e-address-popup.c:579
 msgid "Select an Action"
 msgstr "Velg en handling"
@@ -1003,13 +638,13 @@ msgstr "Kjører spørring i adressebok..."
 
 #: addressbook/gui/component/e-address-popup.c:916
 #: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:276
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
 msgid "Edit Contact Info"
 msgstr "Rediger kontaktinfo"
 
 #: addressbook/gui/component/e-address-popup.c:946
 #: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:342
+#: addressbook/gui/component/select-names/e-select-names-popup.c:339
 msgid "Add to Contacts"
 msgstr "Legg til i kontakter"
 
@@ -1070,9 +705,10 @@ msgid "Factory for the sample Addressbook control"
 msgstr "Factory for eksempelkontroll for adressebok"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:613
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
 #: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:267 shell/e-shortcuts-view.c:470
+#: shell/e-shortcuts-view.c:272 shell/e-shortcuts-view.c:475
 msgid "Remove"
 msgstr "Fjern"
 
@@ -1113,6 +749,397 @@ msgstr "_Kategori:"
 msgid "_Search"
 msgstr "_Søk"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+msgid "Anni_versary:"
+msgstr "Br_yllupsdag:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+msgid "B_usiness"
+msgstr "A_rbeid"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+msgid "Business _Fax"
+msgstr "_Faks på arbeid"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+msgid "C_ontacts..."
+msgstr "K_ontakter..."
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
+msgid "Ca_tegories..."
+msgstr "Ka_tegorier..."
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+msgid "Contact Editor"
+msgstr "Kontaktredigering"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/task-editor.c:135
+msgid "Details"
+msgstr "Detaljer"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+msgid "File As:"
+msgstr "Lagre som:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+msgid "General"
+msgstr "Generelt"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+msgid "New phone type"
+msgstr "Ny telefontype"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+msgid "No_tes:"
+msgstr "No_tater:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+msgid "Phone Types"
+msgstr "Telefontyper"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+msgid "Wants to receive _HTML mail"
+msgstr "Vil motta _HTML e-post"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+msgid "Web page address:"
+msgstr "Hjemmeside-adresse:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: mail/mail-config.glade.h:101
+msgid "_Add"
+msgstr "_Legg til"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+msgid "_Address..."
+msgstr "_Adresse..."
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+msgid "_Assistant's name:"
+msgstr "Assistents navn"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+msgid "_Birthday:"
+msgstr "Fø_dselsdag:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+msgid "_Business"
+msgstr "Ar_beid"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+msgid "_Company:"
+msgstr "_Firma:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: mail/folder-browser.c:1293 mail/mail-config.glade.h:102
+#: ui/evolution-mail-message.xml.h:78 ui/evolution-tasks.xml.h:15
+#: ui/evolution.xml.h:45
+msgid "_Delete"
+msgstr "_Slett"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+msgid "_Department:"
+msgstr "Av_deling:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+msgid "_Full Name..."
+msgstr ":Fullt navn..."
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+msgid "_Home"
+msgstr "_Hjemme"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+msgid "_Job title:"
+msgstr "_Jobbtittel:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+msgid "_Manager's Name:"
+msgstr "_Leders navn:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+msgid "_Mobile"
+msgstr "_Mobil"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+msgid "_Nickname:"
+msgstr "Kalle_navn:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+msgid "_Office:"
+msgstr "Kont_or:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+msgid "_Profession:"
+msgstr "_Yrke:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+msgid "_Spouse:"
+msgstr "Ekte_felle:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+msgid "_This is the mailing address"
+msgstr "De_tte er postadressen"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:663
+msgid "This contact belongs to these categories:"
+msgstr "Denne kontakten hører til disse kategoriene:"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1434
+#: addressbook/gui/widgets/e-addressbook-view.c:735
+msgid "Assistant"
+msgstr "Assistent"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1435
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+msgid "Business"
+msgstr "Arbeid"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1436
+msgid "Business 2"
+msgstr "Arbeid 2"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1437
+#: addressbook/gui/widgets/e-addressbook-view.c:715
+msgid "Business Fax"
+msgstr "Faks på arbeid"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1438
+msgid "Callback"
+msgstr "Tilbakering"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1439
+msgid "Car"
+msgstr "Bil"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1440
+msgid "Company"
+msgstr "Firma"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1441
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+msgid "Home"
+msgstr "Hjemme"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+msgid "Home 2"
+msgstr "Hjemme 2"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1443
+#: addressbook/gui/widgets/e-addressbook-view.c:716
+msgid "Home Fax"
+msgstr "Faks hjemme"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1444
+#: addressbook/gui/widgets/e-addressbook-view.c:719
+msgid "ISDN"
+msgstr "ISDN"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1445
+msgid "Mobile"
+msgstr "Mobil"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1446
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: mail/mail-config.glade.h:59
+msgid "Other"
+msgstr "Andre"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1447
+#: addressbook/gui/widgets/e-addressbook-view.c:721
+msgid "Other Fax"
+msgstr "Annen faks"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1448
+#: addressbook/gui/widgets/e-addressbook-view.c:722
+msgid "Pager"
+msgstr "Personsøker"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1449
+msgid "Primary"
+msgstr "Primær"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1450
+#: addressbook/gui/widgets/e-addressbook-view.c:723
+msgid "Radio"
+msgstr "Radio"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1451
+#: addressbook/gui/widgets/e-addressbook-view.c:724
+msgid "Telex"
+msgstr "Teleks"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1452
+msgid "TTY/TDD"
+msgstr "TTY/TTD"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "Slett kontakt?"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
+msgid "Contact Quick-Add"
+msgstr "Hurtigkontakt"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
+msgid "Edit Full"
+msgstr "Rediger alt"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:702
+msgid "Full Name"
+msgstr "Fullt navn"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
+msgid "E-mail"
+msgstr "E-post"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+msgid "Address _2:"
+msgstr "Adresse _2:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+msgid "Canada"
+msgstr "Kanada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Check Address"
+msgstr "Sjekk adresse"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Countr_y:"
+msgstr "Lan_d:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "Finland"
+msgstr "Finland"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "USA"
+msgstr "USA"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "_Address:"
+msgstr "_Adresse:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "_City:"
+msgstr "_By:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+msgid "_PO Box:"
+msgstr "_Postboks:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+msgid "_State/Province:"
+msgstr "_Stat/Provins:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+msgid "_ZIP Code:"
+msgstr "_ZIP/Postnummer:"
+
+#: addressbook/gui/contact-editor/fullname.glade.h:1
+msgid "Check Full Name"
+msgstr "Sjekk fullt navn:"
+
+#: addressbook/gui/contact-editor/fullname.glade.h:2
+msgid "Dr."
+msgstr "Dr."
+
+#: addressbook/gui/contact-editor/fullname.glade.h:3
+msgid "Esq."
+msgstr "Esq."
+
+#: addressbook/gui/contact-editor/fullname.glade.h:4
+msgid "I"
+msgstr "I"
+
+#: addressbook/gui/contact-editor/fullname.glade.h:5
+msgid "II"
+msgstr "II"
+
+#: addressbook/gui/contact-editor/fullname.glade.h:6
+msgid "III"
+msgstr "III"
+
+#: addressbook/gui/contact-editor/fullname.glade.h:7
+msgid "Jr."
+msgstr "Jr."
+
+#: addressbook/gui/contact-editor/fullname.glade.h:8
+msgid "Miss"
+msgstr "Frk"
+
+#: addressbook/gui/contact-editor/fullname.glade.h:9
+msgid "Mr."
+msgstr "Hr."
+
+#: addressbook/gui/contact-editor/fullname.glade.h:10
+msgid "Mrs."
+msgstr "Fru"
+
+#: addressbook/gui/contact-editor/fullname.glade.h:11
+msgid "Ms."
+msgstr "Frk."
+
+#: addressbook/gui/contact-editor/fullname.glade.h:12
+msgid "Sr."
+msgstr "Sr."
+
+#: addressbook/gui/contact-editor/fullname.glade.h:13
+msgid "_First:"
+msgstr "_Fornavn:"
+
+#: addressbook/gui/contact-editor/fullname.glade.h:14
+msgid "_Last:"
+msgstr "_Etternavn:"
+
+#: addressbook/gui/contact-editor/fullname.glade.h:15
+msgid "_Middle:"
+msgstr "_Mellomnavn:"
+
+#: addressbook/gui/contact-editor/fullname.glade.h:16
+msgid "_Suffix:"
+msgstr "_Suffiks:"
+
+#: addressbook/gui/contact-editor/fullname.glade.h:17
+msgid "_Title:"
+msgstr "_Tittel:"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+msgid "List _name:"
+msgstr "Listenavn:"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+msgid "Members"
+msgstr "Medlemmer"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Type an email address or drag a contact into the list below:"
+msgstr "Skriv en e-post adresse eller dra en kontakt inn i feltet under:"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+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
+msgid "_Remove"
+msgstr "Fje_rn"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+msgid "contact-list-editor"
+msgstr "kontakt-liste-redigering"
+
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+msgid "Contact List Editor"
+msgstr "Kontaktlisteredigering"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "Legg til likevel"
@@ -1291,8 +1318,8 @@ msgstr "Send melding til kontakt"
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
 #: addressbook/gui/widgets/e-addressbook-view.c:604
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:8 ui/evolution-mail-message.xml.h:51
-#: ui/evolution-tasks.xml.h:10 ui/my-evolution.xml.h:2
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-mail-message.xml.h:53
+#: ui/evolution-tasks.xml.h:9 ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Skriv ut"
 
@@ -1301,6 +1328,70 @@ msgstr "Skriv ut"
 msgid "Print Envelope"
 msgstr "Skriv ut konvolutt"
 
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-minicard.c:451
+msgid "Error modifying card"
+msgstr "Feil ved endring av kort"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+msgid "Success"
+msgstr "Suksess"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:481
+msgid "Unknown error"
+msgstr "Ukjent feil"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+msgid "Repository offline"
+msgstr "Lager \"offline\""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:475
+msgid "Permission denied"
+msgstr "Tilgang nektet"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+msgid "Card not found"
+msgstr "Kort ikke funnet"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr "Kort-ID eksisterer allerede"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+msgid "Protocol not supported"
+msgstr "Protokollen er ikke støttet"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+msgid "Canceled"
+msgstr "Avbrutt"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+msgid "Other error"
+msgstr "Annen feil"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+msgid "Error adding list"
+msgstr "Feil under tillegg av liste"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+msgid "Error adding card"
+msgstr "Feil ved tillegg av kort"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+msgid "Error modifying list"
+msgstr "Feil ved endring av liste"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+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:1085
+msgid "Error removing card"
+msgstr "Feil ved fjerning av kort"
+
 #: addressbook/gui/widgets/e-addressbook-view.c:700
 msgid "* Click here to add a contact *"
 msgstr "* Klikk her for å legge til en kontakt *"
@@ -1421,18 +1512,10 @@ msgstr "Fri-ledig URL"
 msgid "Done."
 msgstr "Ferdig."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
-msgid "Error removing card"
-msgstr "Feil ved fjerning av kort"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1114
 msgid "Removing cards..."
 msgstr "Fjerner kort..."
 
-#: addressbook/gui/widgets/e-minicard.c:451
-msgid "Error modifying card"
-msgstr "Feil ved endring av kort"
-
 #: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "Lagre i adressebok"
@@ -1634,31 +1717,6 @@ msgstr "Kunne ikke lese pilotens kalender-applikasjonsblokk"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikke lese pilotens applikasjonsblokk for oppgaveliste"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:623
-#: calendar/gui/alarm-notify/alarm-queue.c:922
-#: calendar/gui/alarm-notify/alarm-queue.c:978
-msgid "Reminder of your appointment at "
-msgstr "Påminnelse om din avtale "
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: calendar/gui/alarm-notify/alarm-queue.c:914
-msgid "Snooze"
-msgstr "Utsett"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:927
-#: calendar/gui/alarm-notify/alarm-queue.c:982
-msgid "Ok"
-msgstr "Ok"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
-msgstr "Alarm-tjeneste"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-msgid "Factory for the alarm notification service"
-msgstr "Factory for alarm-tjenesten"
-
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:153
 #, c-format
 msgid "Notification about your appointment starting on %s and ending on %s"
@@ -1728,7 +1786,8 @@ msgstr "Ingen sammendrag tilgjengelig."
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution.xml.h:5
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Lukk"
 
@@ -1736,10 +1795,35 @@ msgstr "Lukk"
 msgid "Edit appointment"
 msgstr "Rediger avtale:"
 
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#: calendar/gui/alarm-notify/alarm-queue.c:914
+msgid "Snooze"
+msgstr "Utsett"
+
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:4
 msgid "Snooze time (minutes)"
 msgstr "Utsett-tid (minutter)"
 
+#: calendar/gui/alarm-notify/alarm-queue.c:623
+#: calendar/gui/alarm-notify/alarm-queue.c:922
+#: calendar/gui/alarm-notify/alarm-queue.c:978
+msgid "Reminder of your appointment at "
+msgstr "Påminnelse om din avtale "
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:927
+#: calendar/gui/alarm-notify/alarm-queue.c:982
+msgid "Ok"
+msgstr "Ok"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr "Alarm-tjeneste"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+msgid "Factory for the alarm notification service"
+msgstr "Factory for alarm-tjenesten"
+
 #: calendar/gui/alarm-notify/notify-main.c:58
 #, c-format
 msgid ""
@@ -1760,128 +1844,128 @@ msgstr "Kunne ikke initiere gnome-vfs"
 msgid "Could not create the alarm notify service factory"
 msgstr "Kunne ikke opprette factory for alarm-tjenesten"
 
-#: calendar/gui/calendar-commands.c:275
+#: calendar/gui/calendar-commands.c:278
 msgid "File not found"
 msgstr "Fil ikke funnet"
 
-#: calendar/gui/calendar-commands.c:299
+#: calendar/gui/calendar-commands.c:302
 msgid "Open calendar"
 msgstr "Åpne kalender"
 
-#: calendar/gui/calendar-commands.c:341
+#: calendar/gui/calendar-commands.c:344
 msgid "Save calendar"
 msgstr "Lagre kalender"
 
-#: calendar/gui/calendar-commands.c:523
+#: calendar/gui/calendar-commands.c:596
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Kunne ikke opprette kalendervisning. Vennligst sjekk din ORBit og OAF "
 "konfigurasjon."
 
-#: calendar/gui/calendar-model.c:361 calendar/gui/calendar-model.c:951
-#: calendar/gui/e-calendar-table.c:419
+#: calendar/gui/calendar-model.c:379 calendar/gui/calendar-model.c:974
+#: calendar/gui/e-calendar-table.c:426
 msgid "Public"
 msgstr "Offentlig"
 
-#: calendar/gui/calendar-model.c:364 calendar/gui/calendar-model.c:953
-#: calendar/gui/e-calendar-table.c:420
+#: calendar/gui/calendar-model.c:382 calendar/gui/calendar-model.c:976
+#: calendar/gui/e-calendar-table.c:427
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:367 calendar/gui/calendar-model.c:955
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/gui/calendar-model.c:385 calendar/gui/calendar-model.c:978
+#: calendar/gui/e-calendar-table.c:428
 msgid "Confidential"
 msgstr "Konfidensiell"
 
-#: calendar/gui/calendar-model.c:370 calendar/gui/dialogs/alarm-page.c:320
-#: calendar/gui/dialogs/alarm-page.c:356
+#: calendar/gui/calendar-model.c:388 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
 #: camel/providers/smtp/camel-smtp-transport.c:222
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:418
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: calendar/gui/calendar-model.c:458
+#: calendar/gui/calendar-model.c:479
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:458
+#: calendar/gui/calendar-model.c:479
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:460
+#: calendar/gui/calendar-model.c:481
 msgid "E"
 msgstr "Ø"
 
-#: calendar/gui/calendar-model.c:460
+#: calendar/gui/calendar-model.c:481
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1119
+#: calendar/gui/calendar-model.c:519 calendar/gui/calendar-model.c:1150
 #: calendar/gui/dialogs/task-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:441 mail/message-list.c:620
+#: calendar/gui/e-calendar-table.c:448 mail/message-list.c:625
 msgid "High"
 msgstr "Høy"
 
-#: calendar/gui/calendar-model.c:500 calendar/gui/calendar-model.c:1121
-#: calendar/gui/calendar-model.c:1644
+#: calendar/gui/calendar-model.c:521 calendar/gui/calendar-model.c:1152
+#: calendar/gui/calendar-model.c:1675
 #: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:442 mail/message-list.c:619
+#: calendar/gui/e-calendar-table.c:449 mail/message-list.c:624
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:502 calendar/gui/calendar-model.c:1123
+#: calendar/gui/calendar-model.c:523 calendar/gui/calendar-model.c:1154
 #: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:443 mail/message-list.c:618
+#: calendar/gui/e-calendar-table.c:450 mail/message-list.c:623
 msgid "Low"
 msgstr "Lav"
 
-#: calendar/gui/calendar-model.c:538 calendar/gui/calendar-model.c:1175
-#: calendar/gui/e-calendar-table.c:495
+#: calendar/gui/calendar-model.c:559 calendar/gui/calendar-model.c:1206
+#: calendar/gui/e-calendar-table.c:502
 msgid "Transparent"
 msgstr "Gjennomsiktig"
 
-#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1177
-#: calendar/gui/e-calendar-table.c:494
+#: calendar/gui/calendar-model.c:562 calendar/gui/calendar-model.c:1208
+#: calendar/gui/e-calendar-table.c:501
 msgid "Opaque"
 msgstr "Ugjennomsiktig"
 
-#: calendar/gui/calendar-model.c:690 calendar/gui/calendar-model.c:1229
+#: calendar/gui/calendar-model.c:711 calendar/gui/calendar-model.c:1260
 #: calendar/gui/dialogs/task-page.glade.h:12
-#: calendar/gui/e-calendar-table.c:515
+#: calendar/gui/e-calendar-table.c:522
 msgid "Not Started"
 msgstr "Ikke startet"
 
-#: calendar/gui/calendar-model.c:693 calendar/gui/calendar-model.c:1231
+#: calendar/gui/calendar-model.c:714 calendar/gui/calendar-model.c:1262
 #: calendar/gui/dialogs/task-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:516
+#: calendar/gui/e-calendar-table.c:523
 msgid "In Progress"
 msgstr "Under arbeid"
 
-#: calendar/gui/calendar-model.c:696 calendar/gui/calendar-model.c:1233
+#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1264
 #: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:517
+#: calendar/gui/e-calendar-table.c:524
 msgid "Completed"
 msgstr "Fullført"
 
-#: calendar/gui/calendar-model.c:699 calendar/gui/calendar-model.c:1235
+#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1266
 #: calendar/gui/dialogs/task-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:518 camel/camel-service.c:544
+#: calendar/gui/e-calendar-table.c:525 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Avbrutt"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:847 e-util/e-time-utils.c:267
+#: calendar/gui/calendar-model.c:870 e-util/e-time-utils.c:267
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d.%m.%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:850 e-util/e-time-utils.c:276
+#: calendar/gui/calendar-model.c:873 e-util/e-time-utils.c:276
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d.%m.%Y %H:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:855
+#: calendar/gui/calendar-model.c:878
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1892,7 +1976,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:935
+#: calendar/gui/calendar-model.c:958
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
@@ -1900,17 +1984,19 @@ msgstr ""
 "'Ingen'"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:949 calendar/gui/calendar-model.c:1173
-#: calendar/gui/calendar-model.c:1227 calendar/gui/e-calendar-table.c:418
-#: calendar/gui/e-calendar-table.c:493 mail/mail-account-gui.c:1295
-#: mail/mail-accounts.c:126 mail/mail-accounts.c:177
-#: mail/mail-config.glade.h:54 shell/e-shell-view.c:1398
-#: widgets/misc/e-cell-date-edit.c:237 widgets/misc/e-dateedit.c:432
-#: widgets/misc/e-dateedit.c:1341 widgets/misc/e-dateedit.c:1456
+#: calendar/gui/calendar-model.c:972 calendar/gui/calendar-model.c:1204
+#: calendar/gui/calendar-model.c:1258
+#: calendar/gui/dialogs/e-timezone-dialog.c:197
+#: calendar/gui/e-calendar-table.c:425 calendar/gui/e-calendar-table.c:500
+#: mail/mail-account-gui.c:1295 mail/mail-accounts.c:129
+#: mail/mail-accounts.c:380 mail/mail-config.glade.h:56
+#: shell/e-shell-view.c:1397 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:439 widgets/misc/e-dateedit.c:1369
+#: widgets/misc/e-dateedit.c:1484
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/calendar-model.c:1023
+#: calendar/gui/calendar-model.c:1054
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1920,125 +2006,204 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1063
+#: calendar/gui/calendar-model.c:1094
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Prosentverdien må være mellom 0 og 100, inklusive"
 
-#: calendar/gui/calendar-model.c:1104
+#: calendar/gui/calendar-model.c:1135
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr "Prioriteten må være en av 'Høy', 'Normal', 'Lav' eller 'Udefinert'."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1117
+#: calendar/gui/calendar-model.c:1148
 #: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:444
+#: calendar/gui/e-calendar-table.c:451
 msgid "Undefined"
 msgstr "Udefinert"
 
-#: calendar/gui/calendar-model.c:1158
+#: calendar/gui/calendar-model.c:1189
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 "Gjennomsiktigheten må være en av 'Gjennomsiktig', 'Ugjennomsiktig' eller "
 "\"Ingen'."
 
-#: calendar/gui/calendar-model.c:1646
+#: calendar/gui/calendar-model.c:1677
 msgid "Recurring"
 msgstr "Gjeninntreffer"
 
-#: calendar/gui/calendar-model.c:1648
+#: calendar/gui/calendar-model.c:1679
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: calendar/gui/calendar-model.c:1654
+#: calendar/gui/calendar-model.c:1685
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1654
+#: calendar/gui/calendar-model.c:1685
 msgid "No"
 msgstr "Nei"
 
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+msgid "Day View"
+msgstr "Dagvisning"
+
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+msgid "Work Week View"
+msgstr "Arbeidsukevisning"
+
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+msgid "Week View"
+msgstr "Ukevisning"
+
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+msgid "Month View"
+msgstr "Månedsvisning"
+
 #: calendar/gui/control-factory.c:128
 msgid "The URI that the calendar will display"
 msgstr "URIen som kalenderen skal vise"
 
-#: calendar/gui/dialogs/alarm-page.c:255
+#: calendar/gui/dialogs/alarm-options.c:354
+msgid "Audio Alarm Options"
+msgstr "Alternativer for lyd-alarmer"
+
+#: calendar/gui/dialogs/alarm-options.c:363
+msgid "Message Alarm Options"
+msgstr "Alternativer for meldingsalarmer"
+
+#: calendar/gui/dialogs/alarm-options.c:372
+msgid "Mail Alarm Options"
+msgstr "Alternativer for e-post-alarm"
+
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr "Alternativer for program-alarmer"
+
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
+msgstr "Alternativer for ukjente alarmer"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
+msgstr "Gjentagelse av alarm"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr "Alternativer for e-post-alarm"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+msgid "Message to Display"
+msgstr "Melding som skal vises"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+msgid "Play sound:"
+msgstr "Spill lyd:"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
+msgstr "Gjenta alarmen"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+msgid "Run program:"
+msgstr "Kjør program:"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
+msgstr "Med disse argumentene:"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:81
+msgid "days"
+msgstr "dager"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+msgid "extra times every"
+msgstr "ekstra ganger hver"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:82
+msgid "hours"
+msgstr "timer"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:83
+msgid "minutes"
+msgstr "minutter"
+
+#: calendar/gui/dialogs/alarm-page.c:284
 #, c-format
 msgid "%d days"
 msgstr "%d dager"
 
-#: calendar/gui/dialogs/alarm-page.c:257
+#: calendar/gui/dialogs/alarm-page.c:286
 msgid "1 day"
 msgstr "1 dag"
 
-#: calendar/gui/dialogs/alarm-page.c:260
+#: calendar/gui/dialogs/alarm-page.c:289
 #, c-format
 msgid "%d weeks"
 msgstr "%d uker"
 
-#: calendar/gui/dialogs/alarm-page.c:262
+#: calendar/gui/dialogs/alarm-page.c:291
 msgid "1 week"
 msgstr "1 uke"
 
-#: calendar/gui/dialogs/alarm-page.c:265
+#: calendar/gui/dialogs/alarm-page.c:294
 #, c-format
 msgid "%d hours"
 msgstr "%d timer"
 
-#: calendar/gui/dialogs/alarm-page.c:267
+#: calendar/gui/dialogs/alarm-page.c:296
 msgid "1 hour"
 msgstr "1 time"
 
-#: calendar/gui/dialogs/alarm-page.c:270
+#: calendar/gui/dialogs/alarm-page.c:299
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutter"
 
-#: calendar/gui/dialogs/alarm-page.c:272
+#: calendar/gui/dialogs/alarm-page.c:301
 msgid "1 minute"
 msgstr "1 minutt"
 
-#: calendar/gui/dialogs/alarm-page.c:275
+#: calendar/gui/dialogs/alarm-page.c:304
 #, c-format
 msgid "%d seconds"
 msgstr "%d  sekunder"
 
-#: calendar/gui/dialogs/alarm-page.c:277
+#: calendar/gui/dialogs/alarm-page.c:306
 msgid "1 second"
 msgstr "1 sekund"
 
-#: calendar/gui/dialogs/alarm-page.c:302
-#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:7
 msgid "Play a sound"
 msgstr "Spill en lyd"
 
-#: calendar/gui/dialogs/alarm-page.c:306
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.c:335
 msgid "Show a dialog"
 msgstr "Vis en dialog"
 
-#: calendar/gui/dialogs/alarm-page.c:310
-#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:10
 msgid "Send an email"
 msgstr "Send en melding"
 
-#: calendar/gui/dialogs/alarm-page.c:314
-#: calendar/gui/dialogs/alarm-page.glade.h:7
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:9
 msgid "Run a program"
 msgstr "Kjør et program"
 
-#: calendar/gui/dialogs/alarm-page.c:332
+#: calendar/gui/dialogs/alarm-page.c:361
 msgid " before start of appointment"
 msgstr " før avtalen starter"
 
-#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.c:364
 msgid " after start of appointment"
 msgstr " etter avtalens start"
 
-#: calendar/gui/dialogs/alarm-page.c:345
+#: calendar/gui/dialogs/alarm-page.c:374
 msgid " before end of appointment"
 msgstr " før avtalens slutt"
 
-#: calendar/gui/dialogs/alarm-page.c:348
+#: calendar/gui/dialogs/alarm-page.c:377
 msgid " after end of appointment"
 msgstr " etter avtalens slutt"
 
@@ -2055,15 +2220,19 @@ msgstr "Basis"
 msgid "Date/Time:"
 msgstr "Dato/klokke:"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+msgid "Display a message"
+msgstr "Vis en melding"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:6
+msgid "Options..."
+msgstr "Alternativer..."
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "Reminders"
 msgstr "Påminnelser"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9 ui/evolution-calendar.xml.h:36
-msgid "Settings..."
-msgstr "Innstillinger..."
-
 #: calendar/gui/dialogs/alarm-page.glade.h:11
 #: calendar/gui/dialogs/recurrence-page.glade.h:13
 #: calendar/gui/dialogs/task-details-page.glade.h:8
@@ -2093,7 +2262,7 @@ msgstr "slutt på avtale"
 msgid "hour(s)"
 msgstr "time(r)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:99
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:104
 msgid "minute(s)"
 msgstr "minutt"
 
@@ -2134,6 +2303,7 @@ msgid "Beep when alarm windows appear."
 msgstr "Pip når alarmvinduet kommer til syne."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: my-evolution/my-evolution.glade.h:6 shell/e-shortcuts.c:1001
 #: ui/evolution-calendar.xml.h:4
 msgid "Calendar"
 msgstr "Kalender"
@@ -2184,7 +2354,7 @@ msgid "Fri"
 msgstr "Fre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:918
+#: calendar/gui/dialogs/recurrence-page.c:985
 msgid "Friday"
 msgstr "Fredag"
 
@@ -2193,7 +2363,7 @@ msgid "Mon"
 msgstr "Man"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:914
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "Monday"
 msgstr "Mandag"
 
@@ -2214,7 +2384,7 @@ msgid "Sat"
 msgstr "Lør"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:919
+#: calendar/gui/dialogs/recurrence-page.c:986
 msgid "Saturday"
 msgstr "Lørdag"
 
@@ -2235,7 +2405,7 @@ msgid "Sun"
 msgstr "Søn"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:920
+#: calendar/gui/dialogs/recurrence-page.c:987
 msgid "Sunday"
 msgstr "Søndag"
 
@@ -2252,7 +2422,7 @@ msgid "Thu"
 msgstr "Tor"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:917
+#: calendar/gui/dialogs/recurrence-page.c:984
 msgid "Thursday"
 msgstr "Torsdag"
 
@@ -2277,7 +2447,7 @@ msgid "Tue"
 msgstr "Tir"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:915
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "Tuesday"
 msgstr "Tirsdag"
 
@@ -2286,7 +2456,7 @@ msgid "Wed"
 msgstr "Ons"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:916
+#: calendar/gui/dialogs/recurrence-page.c:983
 msgid "Wednesday"
 msgstr "Onsdag"
 
@@ -2298,6 +2468,139 @@ msgstr "Arbeidsuke"
 msgid "minutes before they occur."
 msgstr "minutter i forveien."
 
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
+msgstr "Møtestatus er endret. Send en oppdatert versjon?"
+
+#: calendar/gui/dialogs/cancel-comp.c:58
+msgid "Are you sure you want to cancel and delete this meeting?"
+msgstr "Er du sikker på at du vil avlyse og slette dette møtet?"
+
+#: calendar/gui/dialogs/cancel-comp.c:63
+msgid "Are you sure you want to cancel and delete this task?"
+msgstr "Er du sikker på at du vil avlyse og slette denne oppgaven?"
+
+#: calendar/gui/dialogs/cancel-comp.c:68
+msgid "Are you sure you want to cancel and delete this journal entry?"
+msgstr "Er du sikker på at du vil avlyse og slette denne journaloppføringen?"
+
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
+msgstr "Denne hendelsen er slettet."
+
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
+msgstr "Denne oppgaven er slettet."
+
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr "Denne journaloppføringen er slettet."
+
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+"%s  Du har gjort endringer. Forkast disse endringene og lukk redigering?"
+
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr "%s  Du har ikke gjort endringer. Lukk redigering?"
+
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr "Denne hendelsen er endret."
+
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr "Denne oppgaven er endret."
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr "Denne journaloppføringen er endret."
+
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+"%s  Du har gjort endringer. Forkast disse endringene og oppdater redigering?"
+
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr "%s  Du har ikke gjort endringer. Oppdater redigering?"
+
+#: calendar/gui/dialogs/comp-editor.c:448
+msgid "Edit Appointment"
+msgstr "Rediger avtale"
+
+#: calendar/gui/dialogs/comp-editor.c:453
+#, c-format
+msgid "Appointment - %s"
+msgstr "Avtale - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:456
+#, c-format
+msgid "Task - %s"
+msgstr "Oppgave - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:459
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Journaloppføring - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:473
+msgid "No summary"
+msgstr "Ingen sammendrag"
+
+#: calendar/gui/dialogs/comp-editor.c:805 mail/mail-callbacks.c:1462
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr "Overskriv fil?"
+
+#: calendar/gui/dialogs/comp-editor.c:809 mail/mail-callbacks.c:1466
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"En fil med samme navn eksisterer allerede.\n"
+"Overskriv den?"
+
+#: calendar/gui/dialogs/comp-editor.c:872 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "Lagre som..."
+
+#: calendar/gui/dialogs/comp-editor.c:1025
+msgid "Unable to obtain current version!"
+msgstr "Kan ikke hente versjonsdata!"
+
+#: calendar/gui/dialogs/comp-editor-util.c:155
+#: calendar/gui/e-itip-control.c:546 calendar/gui/print.c:2237
+msgid " to "
+msgstr " til "
+
+#: calendar/gui/dialogs/comp-editor-util.c:159
+#: calendar/gui/e-itip-control.c:550 calendar/gui/print.c:2241
+msgid " (Completed "
+msgstr " (Fullført "
+
+#: calendar/gui/dialogs/comp-editor-util.c:161
+#: calendar/gui/e-itip-control.c:552 calendar/gui/print.c:2243
+msgid "Completed "
+msgstr "Fullført "
+
+#: calendar/gui/dialogs/comp-editor-util.c:166
+#: calendar/gui/e-itip-control.c:557 calendar/gui/print.c:2248
+msgid " (Due "
+msgstr " (Ferdig "
+
+#: calendar/gui/dialogs/comp-editor-util.c:168
+#: calendar/gui/e-itip-control.c:559 calendar/gui/print.c:2250
+msgid "Due "
+msgstr "Ferdig "
+
 #: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -2340,20 +2643,41 @@ msgstr "Er du sikker på at du vil slette %d oppgaver?"
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Er du sikker på at du vil slette %d journaloppføringer?"
 
-#: calendar/gui/dialogs/event-editor.c:136
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+msgid "Select a Time Zone"
+msgstr "Velg en tidssone"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+msgid "Selection:"
+msgstr "Utvalg:"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+msgid "Time Zones"
+msgstr "Tidssoner"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+"Bruk venstre musknapp til å zoome inn på et område av kartet og velg en tidssone.\n"
+"Bru høyre musknapp til å zoome ut."
+
+#: calendar/gui/dialogs/event-editor.c:154
 msgid "Appointment"
 msgstr "Avtale"
 
-#: calendar/gui/dialogs/event-editor.c:141
+#: calendar/gui/dialogs/event-editor.c:159
 msgid "Reminder"
 msgstr "Påminnelse"
 
-#: calendar/gui/dialogs/event-editor.c:146
+#: calendar/gui/dialogs/event-editor.c:164
 msgid "Recurrence"
 msgstr "Gjeninntreffelse"
 
-#: calendar/gui/dialogs/event-editor.c:151
-#: calendar/gui/dialogs/event-editor.c:223
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
 msgid "Meeting"
 msgstr "Møte"
 
@@ -2363,7 +2687,7 @@ msgstr "Varer he_le dagen"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
 #: calendar/gui/dialogs/task-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:245
+#: calendar/gui/e-calendar-table.c:248
 msgid "Classification"
 msgstr "Klassifisering"
 
@@ -2405,6 +2729,40 @@ msgstr "S_lutt-tid:"
 msgid "_Start time:"
 msgstr "_Start-tid:"
 
+#: calendar/gui/dialogs/meeting-page.c:644
+msgid "Sent By:"
+msgstr "Sendt av:"
+
+#: calendar/gui/dialogs/recurrence-page.c:434 calendar/gui/print.c:1978
+#: calendar/gui/print.c:1980 calendar/gui/print.c:1981
+msgid "%a %b %d %Y"
+msgstr "%a %b %d %Y"
+
+#: calendar/gui/dialogs/recurrence-page.c:582
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr ""
+"Denne avtalen har gjeninntreffelser som ikke kan redigeres av Evolution."
+
+#: calendar/gui/dialogs/recurrence-page.c:954
+msgid "on"
+msgstr "på"
+
+#: calendar/gui/dialogs/recurrence-page.c:980 filter/filter-datespec.c:81
+msgid "day"
+msgstr "dag"
+
+#: calendar/gui/dialogs/recurrence-page.c:1110
+msgid "on the"
+msgstr "den"
+
+#: calendar/gui/dialogs/recurrence-page.c:1118
+msgid "th"
+msgstr "de"
+
+#: calendar/gui/dialogs/recurrence-page.c:1288
+msgid "occurrences"
+msgstr "gjentakelser"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:3
 msgid "Custom recurrence"
 msgstr "Egendefinert gjeninntreffelse"
@@ -2461,47 +2819,29 @@ msgstr "uke(r)"
 msgid "year(s)"
 msgstr "år"
 
-#: calendar/gui/dialogs/recurrence-page.c:398 calendar/gui/print.c:1978
-#: calendar/gui/print.c:1980 calendar/gui/print.c:1981
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
-
-#: calendar/gui/dialogs/recurrence-page.c:544
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-"Denne avtalen har gjeninntreffelser som ikke kan redigeres av Evolution."
-
-#: calendar/gui/dialogs/recurrence-page.c:887
-msgid "on"
-msgstr "på"
-
-#: calendar/gui/dialogs/recurrence-page.c:913 filter/filter-datespec.c:81
-msgid "day"
-msgstr "dag"
-
-#: calendar/gui/dialogs/recurrence-page.c:1043
-msgid "on the"
-msgstr "den"
-
-#: calendar/gui/dialogs/recurrence-page.c:1051
-msgid "th"
-msgstr "de"
-
-#: calendar/gui/dialogs/recurrence-page.c:1215
-msgid "occurrences"
-msgstr "gjentakelser"
-
 #: calendar/gui/dialogs/save-comp.c:51
 msgid "Do you want to save changes?"
 msgstr "Vil du lagre endringene?"
 
+#: calendar/gui/dialogs/send-comp.c:56
+msgid "The meeting information has changed. Send an updated version?"
+msgstr "Møteinformasjonen er endret. Send en oppdatert versjon?"
+
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
+msgstr "Oppgaveinformasjonen er endret. Send en oppdatert versjon?"
+
+#: calendar/gui/dialogs/send-comp.c:66
+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 By:"
-msgstr "Delegert av:"
+msgid "Delegated From:"
+msgstr "Delegert fra:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 msgid "Delegated To:"
@@ -2517,6 +2857,7 @@ msgid "Organizer:"
 msgstr "Organisator:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:895
 msgid "URL:"
 msgstr "URL:"
 
@@ -2549,223 +2890,223 @@ msgstr "_Prioritet:"
 msgid "_Status:"
 msgstr "_Status:"
 
-#: calendar/gui/e-calendar-table.c:244
+#: calendar/gui/e-calendar-table.c:247
 msgid "Categories"
 msgstr "Kategorier"
 
-#: calendar/gui/e-calendar-table.c:246
+#: calendar/gui/e-calendar-table.c:249
 msgid "Completion Date"
 msgstr "Fullført dato"
 
-#: calendar/gui/e-calendar-table.c:247
+#: calendar/gui/e-calendar-table.c:250
 msgid "End Date"
 msgstr "Sluttdato"
 
-#: calendar/gui/e-calendar-table.c:248
+#: calendar/gui/e-calendar-table.c:251
 msgid "Start Date"
 msgstr "Startdato"
 
-#: calendar/gui/e-calendar-table.c:249
+#: calendar/gui/e-calendar-table.c:252
 msgid "Due Date"
 msgstr "Ferdig-dato"
 
-#: calendar/gui/e-calendar-table.c:250
+#: calendar/gui/e-calendar-table.c:253
 msgid "Geographical Position"
 msgstr "Geografisk plassering"
 
-#: calendar/gui/e-calendar-table.c:251
+#: calendar/gui/e-calendar-table.c:254
 msgid "Percent complete"
 msgstr "Prosent fullført"
 
-#: calendar/gui/e-calendar-table.c:252
+#: calendar/gui/e-calendar-table.c:255
 msgid "Priority"
 msgstr "Prioritet"
 
-#: calendar/gui/e-calendar-table.c:253
+#: calendar/gui/e-calendar-table.c:256
 msgid "Summary"
 msgstr "Sammendrag"
 
-#: calendar/gui/e-calendar-table.c:254
+#: calendar/gui/e-calendar-table.c:257
 msgid "Transparency"
 msgstr "Gjennomsiktighet"
 
-#: calendar/gui/e-calendar-table.c:255
+#: calendar/gui/e-calendar-table.c:258
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-calendar-table.c:256
+#: calendar/gui/e-calendar-table.c:259
 msgid "Alarms"
 msgstr "Alarmer"
 
-#: calendar/gui/e-calendar-table.c:257
+#: calendar/gui/e-calendar-table.c:260
 msgid "Click here to add a task"
 msgstr "Klikk her for å legge til en oppgave"
 
-#: calendar/gui/e-calendar-table.c:463
+#: calendar/gui/e-calendar-table.c:470
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:464
+#: calendar/gui/e-calendar-table.c:471
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:465
+#: calendar/gui/e-calendar-table.c:472
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:466
+#: calendar/gui/e-calendar-table.c:473
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:467
+#: calendar/gui/e-calendar-table.c:474
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:468
+#: calendar/gui/e-calendar-table.c:475
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:469
+#: calendar/gui/e-calendar-table.c:476
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:470
+#: calendar/gui/e-calendar-table.c:477
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-calendar-table.c:478
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:472
+#: calendar/gui/e-calendar-table.c:479
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:473
+#: calendar/gui/e-calendar-table.c:480
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:950
+#: calendar/gui/e-calendar-table.c:957
 msgid "Edit this task"
 msgstr "Rediger denne oppgaven"
 
-#: calendar/gui/e-calendar-table.c:951 calendar/gui/e-calendar-table.c:961
-#: calendar/gui/e-day-view.c:3268 calendar/gui/e-week-view.c:3100
+#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-calendar-table.c:968
+#: calendar/gui/e-day-view.c:3315 calendar/gui/e-week-view.c:3158
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-calendar.xml.h:10
 #: ui/evolution-mail-list.xml.h:4
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: calendar/gui/e-calendar-table.c:952 calendar/gui/e-calendar-table.c:962
-#: calendar/gui/e-day-view.c:3270 calendar/gui/e-week-view.c:3102
+#: calendar/gui/e-calendar-table.c:959 calendar/gui/e-calendar-table.c:969
+#: calendar/gui/e-day-view.c:3317 calendar/gui/e-week-view.c:3160
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-calendar.xml.h:5
 #: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:5
 msgid "Copy"
 msgstr "Kopier"
 
-#: calendar/gui/e-calendar-table.c:953 calendar/gui/e-calendar-table.c:963
-#: calendar/gui/e-day-view.c:3243 calendar/gui/e-day-view.c:3272
-#: calendar/gui/e-week-view.c:3076 calendar/gui/e-week-view.c:3104
+#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-calendar-table.c:970
+#: calendar/gui/e-day-view.c:3290 calendar/gui/e-day-view.c:3319
+#: calendar/gui/e-week-view.c:3134 calendar/gui/e-week-view.c:3162
 #: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:26
 #: ui/evolution-mail-list.xml.h:12
 msgid "Paste"
 msgstr "Lim inn"
 
-#: calendar/gui/e-calendar-table.c:955
+#: calendar/gui/e-calendar-table.c:962
 msgid "Mark as complete"
 msgstr "Merk som fullført"
 
-#: calendar/gui/e-calendar-table.c:956
+#: calendar/gui/e-calendar-table.c:963
 msgid "Delete this task"
 msgstr "Slett denne oppgaven"
 
-#: calendar/gui/e-calendar-table.c:965
+#: calendar/gui/e-calendar-table.c:972
 msgid "Mark tasks as complete"
 msgstr "Merk oppgaven som fullført"
 
-#: calendar/gui/e-calendar-table.c:966 ui/evolution-tasks.xml.h:7
+#: calendar/gui/e-calendar-table.c:973 ui/evolution-tasks.xml.h:6
 msgid "Delete selected tasks"
 msgstr "Slett valgte oppgaver"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:572 calendar/gui/e-week-view.c:306
+#: calendar/gui/e-day-view.c:574 calendar/gui/e-week-view.c:307
 #: calendar/gui/print.c:785
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:575 calendar/gui/e-week-view.c:309
+#: calendar/gui/e-day-view.c:577 calendar/gui/e-week-view.c:310
 #: calendar/gui/print.c:787
 msgid "pm"
 msgstr "pm"
 
 #. 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:275 calendar/gui/e-day-view.c:1325
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1327
 #: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1602
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1339
+#: calendar/gui/e-day-view-top-item.c:289 calendar/gui/e-day-view.c:1341
 #: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:283 calendar/gui/e-day-view.c:1352
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1354
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:3248 ui/evolution-calendar.xml.h:21
+#: calendar/gui/e-day-view.c:3295 ui/evolution-calendar.xml.h:21
 msgid "New Appointment"
 msgstr "Ny avtale"
 
-#: calendar/gui/e-day-view.c:3250 calendar/gui/e-week-view.c:3083
+#: calendar/gui/e-day-view.c:3297 calendar/gui/e-week-view.c:3141
 msgid "New All Day Event"
 msgstr "Ny avtale som varer hele dagen"
 
-#: calendar/gui/e-day-view.c:3255 calendar/gui/e-week-view.c:3088
+#: calendar/gui/e-day-view.c:3302 calendar/gui/e-week-view.c:3146
 msgid "Go to Today"
 msgstr "Gå til idag"
 
-#: calendar/gui/e-day-view.c:3257 calendar/gui/e-week-view.c:3090
+#: calendar/gui/e-day-view.c:3304 calendar/gui/e-week-view.c:3148
 msgid "Go to Date..."
 msgstr "Gå til dato..."
 
-#: calendar/gui/e-day-view.c:3264 calendar/gui/e-week-view.c:3096
-#: shell/e-shortcuts-view.c:463 ui/evolution-calendar.xml.h:24
+#: calendar/gui/e-day-view.c:3311 calendar/gui/e-week-view.c:3154
+#: shell/e-shortcuts-view.c:468 ui/evolution-calendar.xml.h:24
 #: ui/evolution-message-composer.xml.h:12
 msgid "Open"
 msgstr "Åpne"
 
-#: calendar/gui/e-day-view.c:3266 calendar/gui/e-week-view.c:3098
+#: calendar/gui/e-day-view.c:3313 calendar/gui/e-week-view.c:3156
 msgid "Delete this Appointment"
 msgstr "Slett denne avtalen"
 
-#: calendar/gui/e-day-view.c:3281 calendar/gui/e-week-view.c:3118
+#: calendar/gui/e-day-view.c:3328 calendar/gui/e-week-view.c:3176
 msgid "Make this Occurrence Movable"
 msgstr "Gjør denne avtalen flyttbar"
 
-#: calendar/gui/e-day-view.c:3283 calendar/gui/e-week-view.c:3120
+#: calendar/gui/e-day-view.c:3330 calendar/gui/e-week-view.c:3178
 msgid "Delete this Occurrence"
 msgstr "Slett denne oppføringen"
 
-#: calendar/gui/e-day-view.c:3285
+#: calendar/gui/e-day-view.c:3332
 msgid "Delete all Occurrences"
 msgstr "Slett alle oppføringer"
 
@@ -2774,104 +3115,84 @@ msgstr "Slett alle oppføringer"
 msgid "%02i minute divisions"
 msgstr "%02i minutters oppdeling"
 
-#: calendar/gui/e-itip-control.c:544 calendar/gui/print.c:2237
-msgid " to "
-msgstr " til "
-
-#: calendar/gui/e-itip-control.c:548 calendar/gui/print.c:2241
-msgid " (Completed "
-msgstr " (Fullført "
-
-#: calendar/gui/e-itip-control.c:550 calendar/gui/print.c:2243
-msgid "Completed "
-msgstr "Fullført "
-
-#: calendar/gui/e-itip-control.c:555 calendar/gui/print.c:2248
-msgid " (Due "
-msgstr " (Ferdig "
-
-#: calendar/gui/e-itip-control.c:557 calendar/gui/print.c:2250
-msgid "Due "
-msgstr "Ferdig "
-
-#: calendar/gui/e-itip-control.c:611
+#: calendar/gui/e-itip-control.c:613
 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:614
+#: calendar/gui/e-itip-control.c:616
 msgid "This is a meeting request."
 msgstr "Dette er en møteforespørsel."
 
-#: calendar/gui/e-itip-control.c:617
+#: calendar/gui/e-itip-control.c:619
 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:620
+#: calendar/gui/e-itip-control.c:622
 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:623
+#: calendar/gui/e-itip-control.c:625
 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:626
+#: calendar/gui/e-itip-control.c:628
 msgid "This is an event cancellation."
 msgstr "Dette er en avlysing av en hendelse."
 
-#: calendar/gui/e-itip-control.c:629 calendar/gui/e-itip-control.c:668
-#: calendar/gui/e-itip-control.c:696
+#: calendar/gui/e-itip-control.c:631 calendar/gui/e-itip-control.c:670
+#: calendar/gui/e-itip-control.c:698
 msgid "The message is not understandable."
 msgstr "Meldingen er ikke forståelig."
 
-#: calendar/gui/e-itip-control.c:653
+#: calendar/gui/e-itip-control.c:655
 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:656
+#: calendar/gui/e-itip-control.c:658
 msgid "This is a task request."
 msgstr "Dette er en oppgaveforespørsel."
 
-#: calendar/gui/e-itip-control.c:659
+#: calendar/gui/e-itip-control.c:661
 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:662
+#: calendar/gui/e-itip-control.c:664
 msgid "This is a reply to a task request."
 msgstr "Dette er et svar på en oppgaveforespørsel."
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:667
 msgid "This is an task cancellation."
 msgstr "Dette er en avlysing av en oppgave."
 
-#: calendar/gui/e-itip-control.c:687
+#: calendar/gui/e-itip-control.c:689
 msgid "This is freebusy information."
 msgstr "Dette er ledig/opptatt-informasjon."
 
-#: calendar/gui/e-itip-control.c:690
+#: calendar/gui/e-itip-control.c:692
 msgid "This is a request for freebusy information."
 msgstr "Dette er en forespørsel om ledig/opptatt-informasjon."
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:695
 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:716
+#: calendar/gui/e-itip-control.c:718
 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:735
+#: calendar/gui/e-itip-control.c:737
 msgid "The message contains only unsupported requests."
 msgstr "Meldingen inneholder kun forespørsler som ikke er støttet."
 
-#: calendar/gui/e-itip-control.c:751
+#: calendar/gui/e-itip-control.c:753
 msgid "The information contained in this attachment was not valid"
 msgstr "Informasjonen i dette vedlegget var ikke gyldig."
 
-#: calendar/gui/e-itip-control.c:867
+#: calendar/gui/e-itip-control.c:869
 msgid "I couldn't update your calendar file!\n"
 msgstr "Kunne ikke oppdatere din kalenderfil!\n"
 
-#: calendar/gui/e-itip-control.c:892
+#: calendar/gui/e-itip-control.c:894
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Kunne ikke fjerne oppføringen fra din kalenderfil!\n"
 
@@ -2912,30 +3233,30 @@ msgstr "slutt-dato"
 msgid "date-start"
 msgstr "start-dato"
 
-#: calendar/gui/e-tasks.c:185 calendar/gui/e-tasks.c:522
-#: calendar/gui/e-tasks.c:555
+#: calendar/gui/e-tasks.c:184 calendar/gui/e-tasks.c:521
+#: calendar/gui/e-tasks.c:554
 msgid "All"
 msgstr "Alle"
 
-#: calendar/gui/e-tasks.c:191
+#: calendar/gui/e-tasks.c:190
 msgid "Category:"
 msgstr "Kategori:"
 
-#: calendar/gui/e-tasks.c:330
+#: calendar/gui/e-tasks.c:329
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kunne ikke laste oppgavene i `%s'"
 
-#: calendar/gui/e-tasks.c:342
+#: calendar/gui/e-tasks.c:341
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden som er nødvendig for å laste `%s' er ikke støttet"
 
-#: calendar/gui/e-week-view.c:3081 calendar/gui/e-week-view.c:3109
+#: calendar/gui/e-week-view.c:3139 calendar/gui/e-week-view.c:3167
 msgid "New Appointment..."
 msgstr "Ny avtale..."
 
-#: calendar/gui/e-week-view.c:3122
+#: calendar/gui/e-week-view.c:3180
 msgid "Delete All Occurrences"
 msgstr "Slett alle oppføringer"
 
@@ -2946,28 +3267,28 @@ msgstr "Slett alle oppføringer"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/gnome-cal.c:216
+#: calendar/gui/gnome-cal.c:219
 msgid "Summary contains"
 msgstr "Sammendrag inneholder"
 
-#: calendar/gui/gnome-cal.c:217
+#: calendar/gui/gnome-cal.c:220
 msgid "Description contains"
 msgstr "Beskrivelse inneholder"
 
-#: calendar/gui/gnome-cal.c:218
+#: calendar/gui/gnome-cal.c:221
 msgid "Comment contains"
 msgstr "Kommentar inneholder"
 
-#: calendar/gui/gnome-cal.c:219
+#: calendar/gui/gnome-cal.c:222
 msgid "Has category"
 msgstr "Har kategori"
 
-#: calendar/gui/gnome-cal.c:1015
+#: calendar/gui/gnome-cal.c:1054
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kunne ikke åpne mappen i `%s'"
 
-#: calendar/gui/gnome-cal.c:1026
+#: calendar/gui/gnome-cal.c:1065
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoden som er nødvendig for å åpne `%s' er ikke støttet"
@@ -3060,6 +3381,10 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
+#: calendar/gui/itip-utils.c:211
+msgid "An organizer must be set."
+msgstr "En organisator må oppgis."
+
 #: calendar/gui/print.c:451
 msgid "1st"
 msgstr "1"
@@ -3212,7 +3537,9 @@ msgstr "Fre"
 msgid "Sa"
 msgstr "Lør"
 
-#: calendar/gui/print.c:1847 views/tasks/galview.xml.h:1
+#: calendar/gui/print.c:1847 my-evolution/e-summary-tasks.c:156
+#: my-evolution/e-summary-tasks.c:172 shell/e-shortcuts.c:1002
+#: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Oppgaver"
 
@@ -3249,7 +3576,7 @@ msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
 #: calendar/gui/print.c:2409 calendar/gui/print.c:2501
-#: mail/mail-callbacks.c:1780 my-evolution/e-summary.c:449
+#: mail/mail-callbacks.c:1798 my-evolution/e-summary.c:452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:31
 #: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
@@ -3309,96 +3636,6 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "SMTOTFL"
 
-#: calendar/pcs/query.c:218
-msgid "time-now expects 0 arguments"
-msgstr "tid-nå forventer 0 argumenter"
-
-#: calendar/pcs/query.c:242
-msgid "make-time expects 1 argument"
-msgstr "lag-tid forventer 1 argument"
-
-#: calendar/pcs/query.c:247
-msgid "make-time expects argument 1 to be a string"
-msgstr "lag-tid forventer at argument 1 er en streng"
-
-#: calendar/pcs/query.c:255
-msgid "make-time argument 1 must be an ISO 8601 date/time string"
-msgstr ""
-
-#: calendar/pcs/query.c:281
-msgid "time-add-day expects 2 arguments"
-msgstr ""
-
-#: calendar/pcs/query.c:286
-msgid "time-add-day expects argument 1 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/query.c:293
-msgid "time-add-day expects argument 2 to be an integer"
-msgstr ""
-
-#: calendar/pcs/query.c:318
-msgid "time-day-begin expects 1 argument"
-msgstr ""
-
-#: calendar/pcs/query.c:323
-msgid "time-day-begin expects argument 1 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/query.c:348
-msgid "time-day-end expects 1 argument"
-msgstr ""
-
-#: calendar/pcs/query.c:353
-msgid "time-day-end expects argument 1 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/query.c:389
-msgid "get-vtype expects 0 arguments"
-msgstr ""
-
-#: calendar/pcs/query.c:472
-msgid "occur-in-time-range? expects 2 arguments"
-msgstr ""
-
-#: calendar/pcs/query.c:477
-msgid "occur-in-time-range? expects argument 1 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/query.c:484
-msgid "occur-in-time-range? expects argument 2 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/query.c:611
-msgid "contains? expects 2 arguments"
-msgstr "inneholder? forventer 2 argumenter"
-
-#: calendar/pcs/query.c:616
-msgid "contains? expects argument 1 to be a string"
-msgstr ""
-
-#: calendar/pcs/query.c:623
-msgid "contains? expects argument 2 to be a string"
-msgstr ""
-
-#: calendar/pcs/query.c:640
-msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
-"\""
-msgstr ""
-
-#: calendar/pcs/query.c:678
-msgid "has-categories? expects at least 1 argument"
-msgstr ""
-
-#: calendar/pcs/query.c:684
-msgid "has-categories? expects all arguments to be strings"
-msgstr ""
-
-#: calendar/pcs/query.c:932
-msgid "Evaluation of the search expression did not yield a boolean value"
-msgstr "Evaluering av søkeuttrykket ga ikke en boolsk verdi"
-
 #: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr "Signering er ikke støttet av dette cipheret"
@@ -3419,6 +3656,32 @@ msgstr "Kryptering er ikke støttet av dette cipheret"
 msgid "Decryption is not supported by this cipher"
 msgstr "Dekryptering er ikke støttet av dette cipheret"
 
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+"Kunne ikke skrive loggoppføring: %s\n"
+"Videre operasjoner på denne tjeneren vil ikke kunne spilles av når\n"
+"du kobler til dette nettverket igjen."
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+"Kunne ikke åpne `%s':\n"
+"%s\n"
+"Endringer i denne mappen vil ikke resynkroniseres."
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr "Resynkroniserer med tjener"
+
 #: camel/camel-disco-store.c:305
 msgid "You must be working online to complete this operation"
 msgstr "Du må arbeide tilknyttet for å fullføre denne operasjonen"
@@ -3477,7 +3740,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:437 camel/camel-filter-search.c:444
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Feil under lagring av filtersøk: %s: %s"
@@ -3534,6 +3797,26 @@ msgstr "Feil under låsing ved bruk av fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Feil under låsing ved bruk av flock(2): %s"
 
+#: camel/camel-lock-client.c:110
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Kunne ikke rør for låshjelper: %s"
+
+#: camel/camel-lock-client.c:123
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Kan ikke kjøre fork for låshjelper: %s"
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "Kunne ikke låse '%s': protokollfeil med låshjelper"
+
+#: camel/camel-lock-client.c:212
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Kunne ikke låse '%s'"
+
 #: camel/camel-movemail.c:104
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -3598,44 +3881,44 @@ msgstr "Vennligst skriv inn din %s passphrase for %s"
 msgid "Please enter your %s passphrase"
 msgstr "Vennligst skriv inn din %s passphrase"
 
-#: camel/camel-pgp-context.c:511
+#: camel/camel-pgp-context.c:515
 msgid "No plaintext to sign."
 msgstr "Ingen klartekst å signere."
 
-#: camel/camel-pgp-context.c:518 camel/camel-pgp-context.c:690
-#: camel/camel-pgp-context.c:1057 camel/camel-pgp-context.c:1269
+#: camel/camel-pgp-context.c:522 camel/camel-pgp-context.c:694
+#: camel/camel-pgp-context.c:1064 camel/camel-pgp-context.c:1276
 msgid "No password provided."
 msgstr "Ingen passord gitt."
 
-#: camel/camel-pgp-context.c:524 camel/camel-pgp-context.c:696
-#: camel/camel-pgp-context.c:879 camel/camel-pgp-context.c:1064
-#: camel/camel-pgp-context.c:1276
+#: camel/camel-pgp-context.c:528 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:883 camel/camel-pgp-context.c:1071
+#: camel/camel-pgp-context.c:1283
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Kunne ikke opprette rør til GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:683
+#: camel/camel-pgp-context.c:687
 msgid "No plaintext to clearsign."
 msgstr "Ingen klartekst å kjøre \"plainsign\" på."
 
-#: camel/camel-pgp-context.c:873
+#: camel/camel-pgp-context.c:877
 msgid "No plaintext to verify."
 msgstr "Ingen klartekst å verifisere."
 
-#: camel/camel-pgp-context.c:890
+#: camel/camel-pgp-context.c:894
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Kunne ikke opprette midlertidig fil: %s"
 
-#: camel/camel-pgp-context.c:1047
+#: camel/camel-pgp-context.c:1054
 msgid "No plaintext to encrypt."
 msgstr "Ingen klartekst å kryptere."
 
-#: camel/camel-pgp-context.c:1073
+#: camel/camel-pgp-context.c:1080
 msgid "No recipients specified"
 msgstr "Ingen mottakere spesifisert"
 
-#: camel/camel-pgp-context.c:1261
+#: camel/camel-pgp-context.c:1268
 msgid "No ciphertext to decrypt."
 msgstr "Ingen ciphertekst å dekryptere."
 
@@ -3911,32 +4194,22 @@ msgid "Failed to verify certificates."
 msgstr "Feil under verifisering av sertifikater."
 
 #. Fill in the new fields
-#: camel/camel-store.c:378 mail/mail-ops.c:955 mail/mail-ops.c:962
-#: mail/mail-ops.c:980 mail/mail-ops.c:981
+#: camel/camel-store.c:378 mail/mail-ops.c:987 mail/mail-ops.c:994
+#: mail/mail-ops.c:1012 mail/mail-ops.c:1013
 msgid "Trash"
 msgstr "Søppel"
 
-#: camel/camel-tcp-stream-ssl.c:348
+#: camel/camel-tcp-stream-openssl.c:426
 #, c-format
 msgid ""
-"EMail: %s\n"
-"Common Name: %s\n"
-"Organization Unit: %s\n"
-"Organization: %s\n"
-"Locality: %s\n"
-"State: %s\n"
-"Country: %s"
+"Issuer: %s\n"
+"Subject: %s"
 msgstr ""
-"E-post: %s\n"
-"Vanlig navn: %s\n"
-"Organisasjonsenhet: %s\n"
-"Organisasjon: %s\n"
-"Lokasjon: %s\n"
-"Stat: %s\n"
-"Land: %s"
+"Utsteder: %s\n"
+"Emne: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:428 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:431 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -3951,14 +4224,24 @@ msgstr ""
 "\n"
 "Vil du akseptere likevel?"
 
-#: camel/camel-tcp-stream-openssl.c:423
+#: camel/camel-tcp-stream-ssl.c:348
 #, c-format
 msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
 msgstr ""
-"Utsteder: %s\n"
-"Emne: %s"
+"E-post: %s\n"
+"Vanlig navn: %s\n"
+"Organisasjonsenhet: %s\n"
+"Organisasjon: %s\n"
+"Lokasjon: %s\n"
+"Stat: %s\n"
+"Land: %s"
 
 #: camel/camel-url.c:289
 #, c-format
@@ -3979,11 +4262,6 @@ msgstr "Ingen slik melding: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr "Du kan ikke kopiere meldinger fra denne søppel-katalogen."
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "Kan ikke åpne cache-katalog: %s"
-
 #: camel/providers/imap/camel-imap-command.c:234
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
@@ -3994,20 +4272,16 @@ msgstr "Uventet svar fra IMAP-tjener: %s"
 msgid "IMAP command failed: %s"
 msgstr "IMAP-kommando feilet: %s"
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr "Ukjent feil"
-
 #: camel/providers/imap/camel-imap-command.c:297
 msgid "Server response ended too soon."
 msgstr "Svar fra tjener ble avsluttet for tidlig."
 
-#: camel/providers/imap/camel-imap-command.c:489
+#: camel/providers/imap/camel-imap-command.c:493
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Svar fra IMAP-tjener inneholdt ikke %s-informasjon"
 
-#: camel/providers/imap/camel-imap-command.c:526
+#: camel/providers/imap/camel-imap-command.c:530
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Uventet svar 'OK' fra IMAP-tjener: %s"
@@ -4030,16 +4304,20 @@ msgstr "Mappen ble ødelagt og laget på nytt på tjeneren."
 msgid "Scanning IMAP folder"
 msgstr "Skanner IMAP-mappe"
 
-#: camel/providers/imap/camel-imap-folder.c:1468
-#: camel/providers/imap/camel-imap-folder.c:1744
+#: camel/providers/imap/camel-imap-folder.c:1483
+#: camel/providers/imap/camel-imap-folder.c:1763
 msgid "This message is not currently available"
 msgstr "Denne meldingen er ikke tilgjengelig"
 
-#: camel/providers/imap/camel-imap-folder.c:1496
-#: camel/providers/imap/camel-imap-folder.c:1777
+#: camel/providers/imap/camel-imap-folder.c:1796
 msgid "Could not find message body in FETCH response."
 msgstr "Kunne ikke finne meldingskropp i FETCH-svar."
 
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, c-format
+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:16
 msgid "Checking for new mail"
 msgstr "Ser etter nye meldinger"
@@ -4048,7 +4326,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:643
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:642
 msgid "Folders"
 msgstr "Mapper"
 
@@ -4152,6 +4430,7 @@ msgid "For storing local mail in standard Unix spool directories"
 msgstr "For lagring av lokal e-post i standard Unix spool-kataloger"
 
 #: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Lagerrot %s er ikke en absolutt sti"
@@ -4192,6 +4471,7 @@ msgid "Could not delete folder index file `%s': %s"
 msgstr "Kunne ikke slette indeksfil for mappe `%s': %s"
 
 #: camel/providers/local/camel-local-summary.c:404
+#: camel/providers/local/camel-spool-summary.c:1153
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Kunne ikke legge til melding i sammendraget: ukjent grunn"
 
@@ -4207,6 +4487,7 @@ msgstr "Kan ikke legge til melding i maildir mappe: %s: %s"
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-mh-folder.c:204
 #: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -4218,6 +4499,7 @@ msgstr ""
 #: camel/providers/local/camel-maildir-folder.c:201
 #: camel/providers/local/camel-mbox-folder.c:322
 #: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
 msgstr "Ingen slik melding"
 
@@ -4226,7 +4508,7 @@ msgstr "Ingen slik melding"
 msgid "Invalid message contents"
 msgstr "Ugyldig meldingsinnhold"
 
-#: camel/providers/local/camel-maildir-store.c:101
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -4236,14 +4518,14 @@ msgstr ""
 "Kan ikke åpne mappe `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Mappen `%s' eksisterer ikke."
 
-#: camel/providers/local/camel-maildir-store.c:112
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -4253,23 +4535,23 @@ msgstr ""
 "Kunne ikke opprette mappe `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:127
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' er ikke en maildir katalog."
 
-#: camel/providers/local/camel-maildir-store.c:156
-#: camel/providers/local/camel-maildir-store.c:193
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kunne ikke slette mappe `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:157
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr "ikke en maildir katalog"
 
-#: camel/providers/local/camel-maildir-store.c:267
+#: camel/providers/local/camel-maildir-store.c:276
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Kunne ikke søke i mappe `%s': %s"
@@ -4281,11 +4563,13 @@ msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Kan ikke åpne maildir katalogsti: %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Kan ikke opprette mappelås på: %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Kan ikke åpne postboks: %s: %s\n"
@@ -4298,6 +4582,9 @@ msgstr "Kan ikke legge til melding i mbox-filen: %s: %s"
 #: camel/providers/local/camel-mbox-folder.c:338
 #: camel/providers/local/camel-mbox-folder.c:370
 #: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4307,10 +4594,12 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Mappen ser ut til å ha blitt korrupt og kan ikke repareres."
 
 #: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Oppbygging av melding feilet: Korrupt postboks?"
 
@@ -4356,36 +4645,45 @@ msgstr "MAppen `%s' er ikke tom. Ikke slettet."
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
 #: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
 msgid "Summarising folder"
 msgstr "Lager sammendrag for mappe"
 
 #: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr "Kunne ikke åpne mappe: %s: lager sammendrag fra posisjon %ld: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Fatal feil i lesing av postboksen nær posisjon %ld i mappe %s"
 
 #: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 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 mail/mail-ops.c:1539
+#: 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:1461
 msgid "Synchronising folder"
 msgstr "Synkroniserer mappe"
 
 #: camel/providers/local/camel-mbox-summary.c:507
 #: camel/providers/local/camel-mbox-summary.c:708
+#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "Kan ikke åpne mappe for å lage sammendrag: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kan ikke åpne midlertidig postboks: %s"
@@ -4394,21 +4692,28 @@ msgstr "Kan ikke åpne midlertidig postboks: %s"
 #: camel/providers/local/camel-mbox-summary.c:557
 #: camel/providers/local/camel-mbox-summary.c:746
 #: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-spool-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:706
+#: camel/providers/local/camel-spool-summary.c:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Feil i sammendrag og mappe, selv etter synkronisering"
 
 #: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Feil under skriving til midlertidig postboks: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Skriving til midlertidig postboks feilet: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:635
 #: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kunne ikke lukke kildemappe %s: %s"
@@ -4424,6 +4729,8 @@ msgid "Could not rename folder: %s"
 msgstr "Kunne ikke endre navn på mappe: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ukjent feil: %s"
@@ -4443,39 +4750,94 @@ msgstr "`%s' er ikke en katalog."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Kan ikke åpne MH-katalogsti: %s: %s"
 
+#: camel/providers/local/camel-spool-folder.c:465
+#, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr "Kan ikke legge til melding i spool-filen: %s: %s"
+
+#: camel/providers/local/camel-spool-store.c:132
+#, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr "Spool `%s' eksisterer ikke eller er ikke en vanlig fil"
+
+#: camel/providers/local/camel-spool-store.c:159
+#, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "Mappen `%s/%s' eksisterer ikke."
+
+#: camel/providers/local/camel-spool-store.c:176
+msgid "Spool stores do not have an inbox"
+msgstr "Spool-lager har ikke en innboks"
+
+#: camel/providers/local/camel-spool-store.c:186
+#, c-format
+msgid "Spool mail file %s"
+msgstr "Spool e-post-fil %s"
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr "Spool-mapper kan ikke være gis nytt navn"
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr "Spoolmapper kan ikke være slettes"
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "Kunne ikke synkronisere midlertidig mappe %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "Kunne ikke synkronisere spool-mappe %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+"Kunne ikke synkronisere spool-mappe %s: %s\n"
+"Mappen kan være korrupt, kopi lagret i `%s'"
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Vennligst skriv inn NNTP-passord for %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:66
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr "Tjeneren godtok ikke brukernavn"
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr "Feil under sending av brukernavn til tjener"
 
-#: camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr "Tjeneren godtok ikke brukernavn/passord"
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr "Melding %s ikke funnet"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr "Kunne ikke hente gruppeliste fra tjeneren."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Kunne ikke laste gruppelistefil for %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Kunne ikke lagre gruppelistefil for %s: %s"
@@ -4490,17 +4852,17 @@ msgstr ""
 "Dette er en tilbyder for lesing av og posting av innlegg til USENET "
 "nyhetsgrupper."
 
-#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "Kunne ikke åpne katalog for news-tjener: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:286
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET News via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -4508,8 +4870,8 @@ msgstr ""
 "Dette alternativet vil autentisere mot NNTP-tjeneren ved bruk av klartekst "
 "passord."
 
-#: camel/providers/nntp/camel-nntp-store.c:325
-#: camel/providers/nntp/camel-nntp-store.c:488
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Kunne ikke åpne eller opprette .newsrc-fil for %s: %s"
@@ -4560,7 +4922,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:60
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:62
 msgid "POP"
 msgstr "POP"
 
@@ -4656,7 +5018,7 @@ msgid "No such folder `%s'."
 msgstr "Ingen slik mappe `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4710,7 +5072,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:72
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:75
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -4981,7 +5343,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:126
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:131
 msgid "attachment"
 msgstr "vedlegg"
 
@@ -5010,10 +5372,11 @@ msgid "MIME type:"
 msgstr "MIME-type:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:131
 msgid "Suggest automatic display of attachment"
 msgstr "Foreslå automatisk visning av vedlegg"
 
-#: composer/e-msg-composer.c:653
+#: composer/e-msg-composer.c:670
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -5022,7 +5385,7 @@ msgstr ""
 "Kan ikke åpne fil %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:666
+#: composer/e-msg-composer.c:683
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -5031,21 +5394,29 @@ msgstr ""
 "Feil under lesing av fil %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:856
+#: composer/e-msg-composer.c:869
 msgid "Save as..."
 msgstr "Lagre som..."
 
-#: composer/e-msg-composer.c:867
+#: composer/e-msg-composer.c:878
+msgid "Warning!"
+msgstr "Advarsel!"
+
+#: composer/e-msg-composer.c:880
+msgid "File exists, overwrite?"
+msgstr "Filen eksisterer, overskriv?"
+
+#: composer/e-msg-composer.c:902
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Feil under lagring av fil: %s"
 
-#: composer/e-msg-composer.c:887
+#: composer/e-msg-composer.c:922
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Feil under lasting av fil: %s"
 
-#: composer/e-msg-composer.c:959
+#: composer/e-msg-composer.c:993
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -5053,12 +5424,56 @@ msgstr ""
 "Kunne ikke åpne skisse-mappen for denne kontoen.\n"
 "Vil du bruke standard skisse-mappe?"
 
-#: composer/e-msg-composer.c:1025 data/evolution.desktop.in.h:1
+#: composer/e-msg-composer.c:1043
+#, c-format
+msgid "Error accessing file: %s"
+msgstr "Feil under tilgang til fil: %s"
+
+#: composer/e-msg-composer.c:1051
+msgid "Unable to retrieve message from editor"
+msgstr "Kunne ikke hente melding fra editor"
+
+#: composer/e-msg-composer.c:1057
+#, c-format
+msgid ""
+"Unable to seek on file: %s\n"
+"%s"
+msgstr ""
+"Kunne ikke søke i fil: %s\n"
+"%s"
+
+#: composer/e-msg-composer.c:1063
+#, c-format
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
+msgstr ""
+"Kunne ikke kutte av fil: %s\n"
+"%s"
+
+#: composer/e-msg-composer.c:1072
+#, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr ""
+"Feil under autolagring av av melding: %s:\n"
+" %s"
+
+#: composer/e-msg-composer.c:1164
+msgid ""
+"Evolution has detected an editor buffer from a previous session.\n"
+"Would you like to recover this buffer?"
+msgstr ""
+"Evolution har funnet en redigeringsbuffer fra en tidligere sesjon.\n"
+"Vil du prøve å gjenopprette denne bufferen?"
+
+#: composer/e-msg-composer.c:1316 data/evolution.desktop.in.h:1
 #: shell/e-shell-view-menu.c:231
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:1031
+#: composer/e-msg-composer.c:1322
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5068,19 +5483,19 @@ msgstr ""
 "\n"
 "Vil du lagre endringene?"
 
-#: composer/e-msg-composer.c:1056
+#: composer/e-msg-composer.c:1347
 msgid "Open file"
 msgstr "Åpne fil"
 
-#: composer/e-msg-composer.c:1206
+#: composer/e-msg-composer.c:1496
 msgid "Insert File"
 msgstr "Sett inn fil"
 
-#: composer/e-msg-composer.c:1543 composer/e-msg-composer.c:1932
+#: composer/e-msg-composer.c:1853 composer/e-msg-composer.c:2230
 msgid "Compose a message"
 msgstr "Skriv en melding"
 
-#: composer/e-msg-composer.c:2026
+#: composer/e-msg-composer.c:2324
 msgid "Could not create composer window."
 msgstr "Kan ikke opprette komponeringsvinduet."
 
@@ -5137,6 +5552,11 @@ msgstr ""
 "Skriv inn adressene som skal motta en kopi av meldingen uten å komme til "
 "syne i mottakerlisten for meldingen."
 
+#: composer/e-msg-composer-select-file.c:221
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Legg ved en fil"
+
 #: composer/evolution-composer.c:359
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -5188,7 +5608,7 @@ msgstr "Emne inneholder ikke"
 #. strptime format for a date.
 #: e-util/e-time-utils.c:64 e-util/e-time-utils.c:106
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1284 widgets/misc/e-dateedit.c:1465
+#: widgets/misc/e-dateedit.c:1312 widgets/misc/e-dateedit.c:1493
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
@@ -5206,15 +5626,15 @@ msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
 #: e-util/e-time-utils.c:83 e-util/e-time-utils.c:194
-#: e-util/e-time-utils.c:309 widgets/misc/e-dateedit.c:1262
-#: widgets/misc/e-dateedit.c:1321 widgets/misc/e-dateedit.c:1500
+#: e-util/e-time-utils.c:309 widgets/misc/e-dateedit.c:1290
+#: widgets/misc/e-dateedit.c:1349 widgets/misc/e-dateedit.c:1528
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:86 e-util/e-time-utils.c:197
-#: e-util/e-time-utils.c:301 widgets/misc/e-dateedit.c:1259
-#: widgets/misc/e-dateedit.c:1318 widgets/misc/e-dateedit.c:1497
+#: e-util/e-time-utils.c:301 widgets/misc/e-dateedit.c:1287
+#: widgets/misc/e-dateedit.c:1346 widgets/misc/e-dateedit.c:1525
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -5261,26 +5681,14 @@ msgstr "uke"
 msgid "weeks"
 msgstr "uker"
 
-#: filter/filter-datespec.c:81
-msgid "days"
-msgstr "dager"
-
 #: filter/filter-datespec.c:82
 msgid "hour"
 msgstr "time"
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr "timer"
-
 #: filter/filter-datespec.c:83
 msgid "minute"
 msgstr "minutt"
 
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr "minutter"
-
 #: filter/filter-datespec.c:84
 msgid "second"
 msgstr "sekund"
@@ -5446,23 +5854,23 @@ msgstr "Regelnavn: "
 msgid "Untitled"
 msgstr "Uten navn"
 
-#: filter/filter-rule.c:646
+#: filter/filter-rule.c:647
 msgid "If"
 msgstr "Hvis"
 
-#: filter/filter-rule.c:664
+#: filter/filter-rule.c:665
 msgid "Execute actions"
 msgstr "Utfør handlinger"
 
-#: filter/filter-rule.c:668
+#: filter/filter-rule.c:669
 msgid "if all criteria are met"
 msgstr "hvis alle kriterier er møtt"
 
-#: filter/filter-rule.c:673
+#: filter/filter-rule.c:674
 msgid "if any criteria are met"
 msgstr "hvis et kriterie er møtt"
 
-#: filter/filter-rule.c:684
+#: filter/filter-rule.c:685
 msgid "Add criterion"
 msgstr "Legg til kriterie"
 
@@ -5475,8 +5883,8 @@ msgid "outgoing"
 msgstr "utgående"
 
 #: filter/libfilter-i18n.h:3
-msgid "Assign Colour"
-msgstr "Gi farge"
+msgid "Assign Color"
+msgstr "Tilegn farge"
 
 #: filter/libfilter-i18n.h:4
 msgid "Assign Score"
@@ -5627,7 +6035,7 @@ msgstr "Svart til"
 msgid "Score"
 msgstr "Poenggi"
 
-#: filter/libfilter-i18n.h:43 mail/mail-callbacks.c:1048
+#: filter/libfilter-i18n.h:43 mail/mail-callbacks.c:1062
 msgid "Sender"
 msgstr "Avsender"
 
@@ -5636,39 +6044,43 @@ msgid "Set Status"
 msgstr "Sett status"
 
 #: filter/libfilter-i18n.h:45
+msgid "Size (kB)"
+msgstr "Størrelse (kB)"
+
+#: filter/libfilter-i18n.h:46
 msgid "sounds like"
 msgstr "lyder som"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "Source Account"
 msgstr "Kildekonto"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "Specific header"
 msgstr "Spesifikk header"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "starts with"
 msgstr "starter med"
 
-#: filter/libfilter-i18n.h:49 mail/message-list.etspec.h:8
+#: filter/libfilter-i18n.h:50 mail/message-list.etspec.h:8
 msgid "Status"
 msgstr "Status"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 msgid "Stop Processing"
 msgstr "Stopp behandling"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:776
+#: filter/libfilter-i18n.h:52 mail/mail-format.c:785
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Emne"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "was after"
 msgstr "var etter"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "was before"
 msgstr "var før"
 
@@ -5688,29 +6100,29 @@ msgstr "Rediger regel"
 msgid "Score Rules"
 msgstr "Poengregler"
 
-#: importers/elm-importer.c:512 importers/evolution-gnomecard-importer.c:238
-#: importers/netscape-importer.c:780 importers/pine-importer.c:646
+#: importers/elm-importer.c:501 importers/evolution-gnomecard-importer.c:224
+#: importers/netscape-importer.c:769 importers/pine-importer.c:638
 #: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
 #: shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Importer"
 
-#: importers/elm-importer.c:517 importers/netscape-importer.c:785
-#: importers/pine-importer.c:651
+#: importers/elm-importer.c:506 importers/netscape-importer.c:774
+#: importers/pine-importer.c:643 my-evolution/my-evolution.glade.h:12
 msgid "Mail"
 msgstr "Post"
 
-#: importers/elm-importer.c:521
+#: importers/elm-importer.c:510
 msgid "Elm Aliases"
 msgstr "Elm alias"
 
-#: importers/elm-importer.c:528 importers/evolution-gnomecard-importer.c:250
-#: importers/netscape-importer.c:807 importers/pine-importer.c:668
+#: importers/elm-importer.c:517 importers/evolution-gnomecard-importer.c:236
+#: importers/netscape-importer.c:796 importers/pine-importer.c:660
 #: shell/importer/intelligent.c:199
 msgid "Don't ask me again"
 msgstr "Ikke spør meg igjen"
 
-#: importers/elm-importer.c:561
+#: importers/elm-importer.c:550
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -5722,11 +6134,11 @@ msgstr ""
 msgid "Elm mail"
 msgstr "Elm e-post"
 
-#: importers/evolution-gnomecard-importer.c:243 importers/pine-importer.c:661
+#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:653
 msgid "Addressbook"
 msgstr "Adressebok"
 
-#: importers/evolution-gnomecard-importer.c:275
+#: importers/evolution-gnomecard-importer.c:261
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -5734,19 +6146,19 @@ msgstr ""
 "Evolution har funnet GnomeCard filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: importers/netscape-importer.c:790 importers/pine-importer.c:656
+#: importers/netscape-importer.c:779 importers/pine-importer.c:648
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: importers/netscape-importer.c:795 mail/mail-callbacks.c:1692
+#: importers/netscape-importer.c:784 mail/mail-callbacks.c:1710
 msgid "Filters"
 msgstr "Filtre"
 
-#: importers/netscape-importer.c:800
+#: importers/netscape-importer.c:789
 msgid "Addressbooks"
 msgstr "Adressebøker"
 
-#: importers/netscape-importer.c:847
+#: importers/netscape-importer.c:836
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -5754,7 +6166,7 @@ msgstr ""
 "Evolution har funnet Netscape e-post filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: importers/pine-importer.c:705
+#: importers/pine-importer.c:697
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -5762,143 +6174,152 @@ msgstr ""
 "Evolution har funnet Pine e-post filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:725
 msgid "Pine mail"
 msgstr "Pine e-post"
 
-#: mail/component-factory.c:651
+#: mail/component-factory.c:679
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikke initiere Evolutions e-postkomponent."
 
-#: mail/component-factory.c:785
+#: mail/component-factory.c:813
 msgid "Cannot register storage with shell"
 msgstr "Kan ikke registrere lagring i skallet"
 
-#: mail/folder-browser.c:813
+#: mail/folder-browser.c:227 mail/mail-display.c:268
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Kunne ikke opprette midlertidig katalog: %s"
+
+#: mail/folder-browser.c:884
 msgid "Store search as vFolder"
 msgstr "Lagre søk som vMappe"
 
-#: mail/folder-browser.c:1156
+#: mail/folder-browser.c:1227
 msgid "VFolder on _Subject"
 msgstr "VFolder på e_mne"
 
-#: mail/folder-browser.c:1159
+#: mail/folder-browser.c:1230
 msgid "VFolder on Se_nder"
 msgstr "VFolder for se_nder"
 
-#: mail/folder-browser.c:1162
+#: mail/folder-browser.c:1233
 msgid "VFolder on _Recipients"
 msgstr "VFolder for mottake_re"
 
-#: mail/folder-browser.c:1165
+#: mail/folder-browser.c:1236
 msgid "VFolder on Mailing _List"
 msgstr "VFolder på e-post_liste"
 
-#: mail/folder-browser.c:1171
+#: mail/folder-browser.c:1242
 msgid "Filter on Sub_ject"
 msgstr "Filtrer på em_ne"
 
-#: mail/folder-browser.c:1174
+#: mail/folder-browser.c:1245
 msgid "Filter on Sen_der"
 msgstr "Filtrer på sen_der"
 
-#: mail/folder-browser.c:1177
+#: mail/folder-browser.c:1248
 msgid "Filter on Re_cipients"
 msgstr "Filtrer på motta_ker"
 
-#: mail/folder-browser.c:1180
+#: mail/folder-browser.c:1251
 msgid "Filter on _Mailing List"
 msgstr "Filtrer på e-_postliste"
 
-#: mail/folder-browser.c:1189
+#: mail/folder-browser.c:1260
 msgid "_Open"
 msgstr "_Åpne"
 
-#: mail/folder-browser.c:1191
+#: mail/folder-browser.c:1262
 msgid "Resend"
 msgstr "Send på nytt"
 
-#: mail/folder-browser.c:1193 ui/evolution-calendar.xml.h:52
-#: ui/evolution-mail-message.xml.h:84 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1264 ui/evolution-calendar.xml.h:54
+#: ui/evolution-mail-message.xml.h:86 ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "Lagre _som..."
 
-#: mail/folder-browser.c:1195 ui/evolution-tasks.xml.h:16
+#: mail/folder-browser.c:1266 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: mail/folder-browser.c:1200 ui/evolution-mail-message.xml.h:83
+#: mail/folder-browser.c:1271 ui/evolution-mail-message.xml.h:85
 msgid "_Reply to Sender"
 msgstr "Sva_r til sender"
 
-#: mail/folder-browser.c:1202 ui/evolution-mail-message.xml.h:59
+#: mail/folder-browser.c:1273 ui/evolution-mail-message.xml.h:61
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: mail/folder-browser.c:1204 ui/evolution-mail-message.xml.h:58
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:60
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/folder-browser.c:1206
+#: mail/folder-browser.c:1277
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: mail/folder-browser.c:1209
+#: mail/folder-browser.c:1280
 msgid "Mar_k as Read"
 msgstr "Mer_k som lest"
 
-#: mail/folder-browser.c:1211
+#: mail/folder-browser.c:1282
 msgid "Mark as U_nread"
 msgstr "Merk som _ulest"
 
-#: mail/folder-browser.c:1216
+#: mail/folder-browser.c:1284
+msgid "Mark as _Important"
+msgstr "Merk som v_iktig"
+
+#: mail/folder-browser.c:1289
 msgid "_Move to Folder..."
 msgstr "Fl_ytt til mappe..."
 
-#: mail/folder-browser.c:1218
+#: mail/folder-browser.c:1291
 msgid "_Copy to Folder..."
 msgstr "K_opier til mappe..."
 
-#: mail/folder-browser.c:1222 ui/evolution-mail-message.xml.h:85
+#: mail/folder-browser.c:1295 ui/evolution-mail-message.xml.h:87
 msgid "_Undelete"
 msgstr "A_ngre slett"
 
-#: mail/folder-browser.c:1227
+#: mail/folder-browser.c:1300
 msgid "Add Sender to Address Book"
 msgstr "Legg til sender i adressebok"
 
-#: mail/folder-browser.c:1232
+#: mail/folder-browser.c:1305
 msgid "Apply Filters"
 msgstr "Påfør filtre"
 
-#: mail/folder-browser.c:1236
+#: mail/folder-browser.c:1309
 msgid "Create Ru_le From Message"
 msgstr "Lage rege_l fra melding"
 
-#: mail/folder-browser.c:1375
+#: mail/folder-browser.c:1448
 msgid "Filter on Mailing List"
 msgstr "Filtrer etter e-postliste"
 
-#: mail/folder-browser.c:1376
+#: mail/folder-browser.c:1449
 msgid "VFolder on Mailing List"
 msgstr "VFolder på e-postliste"
 
-#: mail/folder-browser.c:1378
+#: mail/folder-browser.c:1451
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrer etter e-postliste (%s)"
 
-#: mail/folder-browser.c:1379
+#: mail/folder-browser.c:1452
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VFolder på e-postliste (%s)"
 
-#: mail/folder-browser-ui.c:252
+#: mail/folder-browser-ui.c:253
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Egenskaper for \"%s\""
 
-#: mail/folder-browser-ui.c:254
+#: mail/folder-browser-ui.c:255
 msgid "Properties"
 msgstr "Egenskaper"
 
@@ -5988,7 +6409,7 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor.c:105
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:105
 msgid "You have not filled in all of the required information."
 msgstr "Du har ikke fylt ut all nødvendig informasjon."
 
@@ -5997,6 +6418,11 @@ msgstr "Du har ikke fylt ut all nødvendig informasjon."
 msgid "Evolution Account Editor"
 msgstr "Kontoredigering for Evolution"
 
+#. give our dialog an OK button and title
+#: mail/mail-account-editor-news.c:160
+msgid "Evolution News Editor"
+msgstr "Evolution nyhetsredigerer"
+
 #: mail/mail-account-gui.c:891
 msgid "Save signature"
 msgstr "Lagre signatur"
@@ -6011,28 +6437,28 @@ msgstr ""
 "\n"
 "Vil du lagre endringene?"
 
-#: mail/mail-accounts.c:127 mail/mail-accounts.c:178
+#: mail/mail-accounts.c:130
 msgid " (default)"
 msgstr " (forvalgt)"
 
-#: mail/mail-accounts.c:210
+#: mail/mail-accounts.c:169
 msgid "Disable"
 msgstr "Deaktiver"
 
-#: mail/mail-accounts.c:212 mail/mail-config.glade.h:36
+#: mail/mail-accounts.c:171 mail/mail-config.glade.h:37
 msgid "Enable"
 msgstr "Aktiver"
 
-#: mail/mail-accounts.c:300 mail/mail-accounts.c:304
+#: mail/mail-accounts.c:259 mail/mail-accounts.c:263
 msgid "Are you sure you want to delete this account?"
 msgstr "Er du sikker på at du vil slette denne kontoen?"
 
-#: mail/mail-accounts.c:464 mail/mail-accounts.c:468
+#: mail/mail-accounts.c:504 mail/mail-accounts.c:508
 msgid "Are you sure you want to delete this news account?"
 msgstr "Er du sikker på at du vil slette denne diskusjonsgruppekontoen?"
 
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:651
+#: mail/mail-accounts.c:703
 msgid "Evolution Account Manager"
 msgstr "Kontohåndtering for Evolution"
 
@@ -6108,7 +6534,8 @@ msgid ""
 "Send anyway?"
 msgstr ""
 "Denne meldingen inneholder kun Bcc mottakere.\n"
-"Det er mulig at e-post tjeneren kan vise mottakerene ved å legge til en \"Apparently-To\" header.\n"
+"Det er mulig at e-post tjeneren kan vise mottakerene ved å legge til en "
+"\"Apparently-To\" header.\n"
 "Send likevel?"
 
 #: mail/mail-callbacks.c:359
@@ -6119,29 +6546,29 @@ msgstr "Du må spesifisere mottakere for å kunne sende denne meldingen."
 msgid "You must configure an account before you can send this email."
 msgstr "Du må konfigurere en konto før du kan sender denne meldingen."
 
-#: mail/mail-callbacks.c:655
+#: mail/mail-callbacks.c:656
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr "Den %s, skrev %s:"
 
-#: mail/mail-callbacks.c:874
+#: mail/mail-callbacks.c:888
 msgid "Forwarded message:\n"
 msgstr "Videresendt melding:\n"
 
-#: mail/mail-callbacks.c:968
+#: mail/mail-callbacks.c:982
 msgid "Move message(s) to"
 msgstr "Flytt melding(er) til"
 
-#: mail/mail-callbacks.c:970
+#: mail/mail-callbacks.c:984
 msgid "Copy message(s) to"
 msgstr "Kopier melding(er) til"
 
-#: mail/mail-callbacks.c:1324
+#: mail/mail-callbacks.c:1339
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Er du sikker på at du vil redigere alle %d meldingene?"
 
-#: mail/mail-callbacks.c:1346
+#: mail/mail-callbacks.c:1361
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6149,7 +6576,7 @@ msgstr ""
 "Du kan kun redigere meldinger lagret\n"
 "i Skisser-katalogen."
 
-#: mail/mail-callbacks.c:1380
+#: mail/mail-callbacks.c:1395
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6157,36 +6584,24 @@ msgstr ""
 "Du kan kun sende meldinger på nytt\n"
 "som er lagret i sendt-katalogen."
 
-#: mail/mail-callbacks.c:1392
+#: mail/mail-callbacks.c:1407
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Er du sikker på at du vil sende alle %d meldingene på nytt?"
 
-#: mail/mail-callbacks.c:1413
+#: mail/mail-callbacks.c:1428
 msgid "No Message Selected"
 msgstr "Ingen melding valgt"
 
-#: mail/mail-callbacks.c:1447 mail/mail-display.c:96
-msgid "Overwrite file?"
-msgstr "Overskriv fil?"
-
-#: mail/mail-callbacks.c:1451 mail/mail-display.c:100
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"En fil med samme navn eksisterer allerede.\n"
-"Overskriv den?"
-
-#: mail/mail-callbacks.c:1495
+#: mail/mail-callbacks.c:1510
 msgid "Save Message As..."
 msgstr "Lagre melding som..."
 
-#: mail/mail-callbacks.c:1497
+#: mail/mail-callbacks.c:1512
 msgid "Save Messages As..."
 msgstr "Lagre meldinger som..."
 
-#: mail/mail-callbacks.c:1682
+#: mail/mail-callbacks.c:1700
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6195,20 +6610,20 @@ msgstr ""
 "Feil under lasting av filter-informasjon:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1740
+#: mail/mail-callbacks.c:1758
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/mail-callbacks.c:1787
+#: mail/mail-callbacks.c:1805
 msgid "Printing of message failed"
 msgstr "Feil under utskrift av melding"
 
-#: mail/mail-callbacks.c:1882
+#: mail/mail-callbacks.c:1900
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Er du sikker på at du vil åpne alle %d meldingene i separate vinduer?"
 
-#: mail/mail-config.c:1503 mail/mail-config.c:1506
+#: mail/mail-config.c:1561 mail/mail-config.c:1564
 msgid "Connecting to server..."
 msgstr "Kobler til tjener..."
 
@@ -6374,191 +6789,211 @@ msgstr "Rediger..."
 msgid "Email Address:"
 msgstr "E-post adresse:"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:36
+msgid "Empty trash folders on exit"
+msgstr "Tøm søppelmappene ved slutt"
+
+#: mail/mail-config.glade.h:38
 msgid "Full Name:"
 msgstr "Fullt navn:"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:39
 msgid "Get Digital ID..."
 msgstr "Hent digital ID..."
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 msgid "HTML Signature:"
 msgstr "HTML-signatur:"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 msgid "Highlight citations with"
 msgstr "Merk sitering med"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:43
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Identity"
 msgstr "Identitet"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 msgid "In HTML mail"
 msgstr "I HTML e-post"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:46
 msgid "Inline"
 msgstr "Inline"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "Load images if sender is in addressbook"
 msgstr "Last bilder hvis avsender er i adresseboken"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:49
 msgid "Mail Configuration"
 msgstr "E-post-konfigurasjon"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:50
 msgid "Make this my default account"
 msgstr "Bruk denne som standard konto"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:51
 msgid "Mark messages as \"Read\" after:"
 msgstr "Merk melding som \"Lest\" etter:"
 
 #: mail/mail-config.glade.h:52
+msgid "NNTP Server:"
+msgstr "NNTP-tjener:"
+
+#: mail/mail-config.glade.h:54
 msgid "Never load images off the net"
 msgstr "Aldri last bilder fra nettet"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "News"
 msgstr "News"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Optional Information"
 msgstr "Tilleggsinformasjon"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Organization:"
 msgstr "Organisasjon:"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid "PGP Key ID:"
 msgstr "PGP-nøkkel ID:"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid "PGP binary path:"
 msgstr "Sti til PGP-binærfil:"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:65
 msgid "Pick a color"
 msgstr "Velg en farge"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:66
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
+msgid "Prompt when sending messages with an empty subject"
+msgstr "Spør ved sending av melding uten emne"
+
+#: mail/mail-config.glade.h:68
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Quoted"
 msgstr "Sitert"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Receiving Email"
 msgstr "Innkommende e-post"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:71
 msgid "Receiving Mail"
 msgstr "Innkommende e-post"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Receiving Options"
 msgstr "Alternativer innkommende"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 msgid "Required Information"
 msgstr "Nødvendig informasjon"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:76
 msgid "Secure MIME"
 msgstr "Sikker MIME"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 msgid "Security"
 msgstr "Sikkerhet"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:78
 msgid "Select PGP binary"
 msgstr "Velg PGP-binærfil"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid "Send mail in HTML format by default."
 msgstr "Send meldinger i HTML-format som standard"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Sending Email"
 msgstr "Utgående e-post"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:81
 msgid "Sending Mail"
 msgstr "Utgående e-post"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "Sent"
 msgstr "Sendt"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:84
 msgid "Sent and Draft Messages"
 msgstr "Sendte meldinger og skisser"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:85
 msgid "Sent messages folder:"
 msgstr "Mappe for sendte meldinger:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:86
 msgid "Server Configuration"
 msgstr "Tjenerkonfigurasjon"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Server Type: "
 msgstr "Tjenertype: "
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 msgid "Server requires authentication"
 msgstr "Tjener krever autentisering"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "Signature file:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
+msgid "Source"
+msgstr "Kilde"
+
+#: mail/mail-config.glade.h:91
+msgid "Source Information"
+msgstr "Kildeinformasjon"
+
+#: mail/mail-config.glade.h:92
 msgid "Sources"
 msgstr "Kilder"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:93
 msgid "Special Folders"
 msgstr "Spesielle mapper"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:94
 msgid "Standard Unix mbox"
 msgstr "Standard Unix mbox"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:95
 msgid "Type"
 msgstr "Type"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:96
 msgid "Use secure connection (SSL)"
 msgstr "Bruk sikker forbindelse (SSL)"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:97
 msgid "Username:"
 msgstr "Brukernavn:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:98
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -6568,18 +7003,23 @@ msgstr ""
 "\n"
 "Klikk \"Neste\" for å begynne."
 
-#: mail/mail-config.glade.h:98 ui/evolution-comp-editor.xml.h:20
+#: mail/mail-config.glade.h:103 ui/evolution-comp-editor.xml.h:20
 #: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:47 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:47
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:105
+msgid "newswindow1"
+msgstr "nyhetsvindu1"
+
+#: mail/mail-config.glade.h:106
 msgid "placeholder"
 msgstr "plassholder"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:107
 msgid "seconds."
 msgstr "sekunder"
 
@@ -6619,57 +7059,75 @@ msgstr "Kunne ikke opprette S/MIME \"envelope\" kontekst."
 msgid "Could not create a S/MIME decode context."
 msgstr "Kunne ikke opprette S/MIME dekodingskontekst."
 
-#: mail/mail-display.c:200
+#: mail/mail-display.c:220
 msgid "Save Attachment"
 msgstr "Lagre vedlegg"
 
-#: mail/mail-display.c:240
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Kunne ikke opprette midlertidig katalog: %s"
-
-#: mail/mail-display.c:301
+#: mail/mail-display.c:330
 msgid "Save to Disk..."
 msgstr "Lagre til disk..."
 
-#: mail/mail-display.c:303
+#: mail/mail-display.c:332
 #, c-format
 msgid "Open in %s..."
 msgstr "Åpne i %s..."
 
-#: mail/mail-display.c:305
+#: mail/mail-display.c:334
 msgid "View Inline"
 msgstr "Vis \"inline\""
 
-#: mail/mail-display.c:340
+#: mail/mail-display.c:369
 msgid "External Viewer"
 msgstr "Ekstern visning"
 
-#: mail/mail-display.c:363
+#: mail/mail-display.c:392
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Vis \"inline\" (via %s)"
 
-#: mail/mail-display.c:367
+#: mail/mail-display.c:396
 msgid "Hide"
 msgstr "Skjul"
 
-#: mail/mail-display.c:961
+#: mail/mail-display.c:1028
 msgid "Loading message content"
 msgstr "Laster meldingsinnhold"
 
-#: mail/mail-display.c:1280
+#: mail/mail-display.c:1371
 msgid "Open Link in Browser"
 msgstr "Åpne lenke i nettleser"
 
-#: mail/mail-display.c:1282
-msgid "Save as (FIXME)"
-msgstr "Lagre som"
-
-#: mail/mail-display.c:1284
+#: mail/mail-display.c:1373
 msgid "Copy Link Location"
 msgstr "Kopier lokasjon for lenke"
 
+#: mail/mail-display.c:1375
+msgid "Save Link as (FIXME)"
+msgstr "Lagre lenke som"
+
+#: mail/mail-display.c:1377
+msgid "Save Image as"
+msgstr "Lagre bilde som"
+
+#: mail/mail-folder-cache.c:166
+#, c-format
+msgid "%d new"
+msgstr "%d nye"
+
+#: mail/mail-folder-cache.c:172 mail/mail-folder-cache.c:179
+msgid ", "
+msgstr ", "
+
+#: mail/mail-folder-cache.c:173
+#, c-format
+msgid "%d hidden"
+msgstr "%d skjulte"
+
+#: mail/mail-folder-cache.c:180
+#, c-format
+msgid "%d total"
+msgstr "%d totalt"
+
 #: mail/mail-format.c:532
 #, c-format
 msgid "%s attachment"
@@ -6679,71 +7137,71 @@ msgstr "%s-vedlegg"
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
 
-#: mail/mail-format.c:649 mail/message-list.etspec.h:2
+#: mail/mail-format.c:658 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dato"
 
-#: mail/mail-format.c:765 mail/message-list.etspec.h:4
+#: mail/mail-format.c:774 mail/message-list.etspec.h:4
 msgid "From"
 msgstr "Fra"
 
-#: mail/mail-format.c:768
+#: mail/mail-format.c:777
 msgid "Reply-To"
 msgstr "Svar-til"
 
-#: mail/mail-format.c:771 mail/message-list.etspec.h:10
+#: mail/mail-format.c:780 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Til"
 
-#: mail/mail-format.c:774
+#: mail/mail-format.c:783
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:1096
+#: mail/mail-format.c:1105
 msgid "No GPG/PGP program configured."
 msgstr "Ingen GPG/PGP-program konfigurert."
 
-#: mail/mail-format.c:1111
+#: mail/mail-format.c:1120
 msgid "Encrypted message not displayed"
 msgstr "Kryptert melding ikke vist"
 
-#: mail/mail-format.c:1117
+#: mail/mail-format.c:1126
 msgid "Encrypted message"
 msgstr "Kryptert melding"
 
-#: mail/mail-format.c:1118
+#: mail/mail-format.c:1127
 msgid "Click icon to decrypt."
 msgstr "Klikk på ikonet for å dekryptere."
 
-#: mail/mail-format.c:1174
+#: mail/mail-format.c:1183
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Denne meldingen er digitalt signert og er funnet autentisk."
 
-#: mail/mail-format.c:1182
+#: mail/mail-format.c:1191
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "Denne meldingen er digitalt signert, men kan ikke finnes autentisk."
 
-#: mail/mail-format.c:1833
+#: mail/mail-format.c:1842
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peker til FTP-tjener (%s)"
 
-#: mail/mail-format.c:1845
+#: mail/mail-format.c:1854
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Peker til lokal fil (%s) gyldig på nettsted \"%s\""
 
-#: mail/mail-format.c:1849
+#: mail/mail-format.c:1858
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peker til lokal fil (%s)"
 
-#: mail/mail-format.c:1883
+#: mail/mail-format.c:1892
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peker til ukjent ekstern data (\"%s\"-type)"
 
-#: mail/mail-format.c:1888
+#: mail/mail-format.c:1897
 msgid "Malformed external-body part."
 msgstr "Feilutformet del for ekstern-kropp."
 
@@ -6831,112 +7289,102 @@ msgstr "Arbeider"
 msgid "Evolution progress"
 msgstr "Evolution fremgang"
 
-#: mail/mail-ops.c:547
+#: mail/mail-ops.c:556
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender \"%s\""
 
-#: mail/mail-ops.c:551
+#: mail/mail-ops.c:560
 msgid "Sending message"
 msgstr "Sender melding"
 
-#: mail/mail-ops.c:662
+#: mail/mail-ops.c:676
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
 
-#: mail/mail-ops.c:681
+#: mail/mail-ops.c:695
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Feilet på melding %d av %d"
 
-#: mail/mail-ops.c:683 mail/mail-send-recv.c:492
+#: mail/mail-ops.c:697 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr "Fullført."
 
-#: mail/mail-ops.c:768
+#: mail/mail-ops.c:783
 msgid "Saving message to folder"
 msgstr "Lagrer melding til mappe"
 
-#: mail/mail-ops.c:843
+#: mail/mail-ops.c:862
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flytter melding(er) til %s"
 
-#: mail/mail-ops.c:843
+#: mail/mail-ops.c:862
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer meldinger til %s"
 
-#: mail/mail-ops.c:860
+#: mail/mail-ops.c:879
 msgid "Moving"
 msgstr "Flytter"
 
-#: mail/mail-ops.c:863
+#: mail/mail-ops.c:882
 msgid "Copying"
 msgstr "Kopierer"
 
-#: mail/mail-ops.c:940
+#: mail/mail-ops.c:972
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i \"%s\""
 
-#: mail/mail-ops.c:1102
+#: mail/mail-ops.c:1134
 msgid "Forwarded messages"
 msgstr "Videresendte meldinger"
 
-#: mail/mail-ops.c:1143 mail/mail-ops.c:1281
+#: mail/mail-ops.c:1175 mail/mail-ops.c:1313
 #, c-format
 msgid "Opening folder %s"
 msgstr "Åpner mappe %s"
 
-#: mail/mail-ops.c:1210
+#: mail/mail-ops.c:1242
 #, c-format
 msgid "Opening store %s"
 msgstr "Åpner lager %s"
 
-#: mail/mail-ops.c:1349
+#: mail/mail-ops.c:1381
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjerner mappe %s"
 
-#: mail/mail-ops.c:1436
-#, c-format
-msgid "Moving folder %s to %s"
-msgstr "Flytter mappe %s til %s"
-
-#: mail/mail-ops.c:1438
-#, c-format
-msgid "Copying folder %s to %s"
-msgstr "Kopierer mappe %s til %s"
-
-#: mail/mail-ops.c:1591
+#: mail/mail-ops.c:1513
 msgid "Refreshing folder"
 msgstr "Oppfrisker mappe"
 
-#: mail/mail-ops.c:1627
+#: mail/mail-ops.c:1549
 msgid "Expunging folder"
 msgstr "Tømmer mappe"
 
-#: mail/mail-ops.c:1676
+#: mail/mail-ops.c:1598
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Henter melding %s"
 
-#: mail/mail-ops.c:1743
+#: mail/mail-ops.c:1665
 msgid "Retrieving messages"
 msgstr "Henter meldinger"
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1675
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Henter melding nummer %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1827
+#: mail/mail-ops.c:1749
 msgid "Saving messages"
 msgstr "Lagrer meldinger"
 
-#: mail/mail-ops.c:1906
+#: mail/mail-ops.c:1828
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6945,12 +7393,12 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1919
+#: mail/mail-ops.c:1841
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Lagrer melding %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1933
+#: mail/mail-ops.c:1855
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6959,11 +7407,11 @@ msgstr ""
 "Feil under lagring av av meldinger til: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2007
+#: mail/mail-ops.c:1929
 msgid "Saving attachment"
 msgstr "Lagrer vedlegg"
 
-#: mail/mail-ops.c:2022
+#: mail/mail-ops.c:1944
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6972,12 +7420,12 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2050
+#: mail/mail-ops.c:1972
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: mail/mail-ops.c:2117
+#: mail/mail-ops.c:2039
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kobler fra %s"
@@ -7034,6 +7482,10 @@ msgstr "Sender"
 msgid "Cancelled."
 msgstr "Avbrutt"
 
+#: mail/mail-session.c:170
+msgid "User canceled operation."
+msgstr "Operasjon avbrutt av bruker."
+
 #: mail/mail-tools.c:159
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
@@ -7066,71 +7518,71 @@ msgstr ""
 "-----Videresendt melding---<br><b>Fra:</b> %s<br><b>Til:</b> %s<br><b>Emne:</"
 "b> %s<br>"
 
-#: mail/mail-vfolder.c:249
+#: mail/mail-vfolder.c:250
 msgid "VFolders"
 msgstr "VMapper"
 
-#: mail/mail-vfolder.c:438
+#: mail/mail-vfolder.c:442
 msgid "New VFolder"
 msgstr "Ny VFolder"
 
-#: mail/message-list.c:608
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr "Ulest"
 
-#: mail/message-list.c:609
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr "Lest"
 
-#: mail/message-list.c:610
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr "Besvart"
 
-#: mail/message-list.c:611
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr "Flere uleste meldinger"
 
-#: mail/message-list.c:612
+#: mail/message-list.c:617
 msgid "Multiple Messages"
 msgstr "Flere meldinger"
 
-#: mail/message-list.c:616
+#: mail/message-list.c:621
 msgid "Lowest"
 msgstr "Lavest"
 
-#: mail/message-list.c:617
+#: mail/message-list.c:622
 msgid "Lower"
 msgstr "Lavere"
 
-#: mail/message-list.c:621
+#: mail/message-list.c:626
 msgid "Higher"
 msgstr "Høyere"
 
-#: mail/message-list.c:622
+#: mail/message-list.c:627
 msgid "Highest"
 msgstr "Høyest"
 
-#: mail/message-list.c:872
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:879
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr "Idag %l:%M %p"
 
-#: mail/message-list.c:888
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr "I går %l:%M %p"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:910
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
@@ -7146,10 +7598,6 @@ msgstr "Mottatt"
 msgid "Size"
 msgstr "Størrelse"
 
-#: mail/mail-session.c:170
-msgid "User canceled operation."
-msgstr "Operasjon avbrutt av bruker."
-
 #: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Mappe"
@@ -7178,22 +7626,22 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "Fjerner abonnement på mappe \"%s\""
 
 #. Construct the app
-#: mail/subscribe-dialog.c:877
+#: mail/subscribe-dialog.c:878
 msgid "Manage Subscriptions"
 msgstr "Håndter abonnement"
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "Evolution-komponent for sammendrag."
-
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "Factory for Evolutions sammendrag-komponent."
-
 #: my-evolution/component-factory.c:140
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "Kan ikke initiere Evolutions sammendragskomponent."
 
+#: my-evolution/e-summary.c:413 ui/my-evolution.xml.h:3
+msgid "Print My Evolution"
+msgstr "Skriv ut Min Evolution"
+
+#: my-evolution/e-summary.c:459
+msgid "Printing of My Evolution failed"
+msgstr "Utskrift av Min Evolution feilet"
+
 #: my-evolution/e-summary-calendar.c:158 my-evolution/e-summary-calendar.c:176
 msgid "Appointments"
 msgstr "Avtaler"
@@ -7210,10 +7658,30 @@ msgstr "%I:%M%p"
 msgid "Mail summary"
 msgstr "E-post sammendrag"
 
+#: my-evolution/e-summary-preferences.c:424
+msgid "Dictionary.com Word of the Day"
+msgstr "Dictionary.com Ord for dagen"
+
+#: my-evolution/e-summary-preferences.c:446
+msgid "Quotes of the Day"
+msgstr "Dagens sitat"
+
+#: my-evolution/e-summary-preferences.c:875
+msgid "Add a news feed"
+msgstr "Legg til news-tjener"
+
+#: my-evolution/e-summary-preferences.c:883
+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-rdf.c:378 my-evolution/e-summary-rdf.c:404
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>Feil under nedlasting av RDF</b>"
 
+#: my-evolution/e-summary-tasks.c:157
+msgid "No tasks"
+msgstr "Ingen oppgaver"
+
 #: my-evolution/e-summary-weather.c:56
 msgid "My Weather"
 msgstr "Min værmelding"
@@ -7222,17 +7690,17 @@ msgstr "Min værmelding"
 msgid "<b>Error downloading Metar</b>"
 msgstr "<b>Feil under nedlasting av Metar</b>"
 
-#: my-evolution/e-summary-weather.c:600
+#: my-evolution/e-summary-weather.c:612
 msgid "Regions"
 msgstr "Regioner"
 
-#: my-evolution/e-summary.c:410 ui/my-evolution.xml.h:3
-msgid "Print My Evolution"
-msgstr "Skriv ut Min Evolution"
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr "Evolution-komponent for sammendrag."
 
-#: my-evolution/e-summary.c:456
-msgid "Printing of My Evolution failed"
-msgstr "Utskrift av Min Evolution feilet"
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+msgid "Factory for the Evolution executive summary component."
+msgstr "Factory for Evolutions sammendrag-komponent."
 
 #: my-evolution/main.c:52
 msgid "Executive summary component could not initialize Bonobo.\n"
@@ -8388,6 +8856,122 @@ msgstr "Blåsende støvvirvler"
 msgid "Drifting dust whirls"
 msgstr "Drivende støvvirvler"
 
+#: my-evolution/my-evolution.glade.h:1
+msgid "Add ->"
+msgstr "Legg til ->"
+
+#: my-evolution/my-evolution.glade.h:2
+msgid "Add new feed"
+msgstr "Legg til ny tjeneste"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All folders:"
+msgstr "Alle mapper:"
+
+#: my-evolution/my-evolution.glade.h:4
+msgid "All news feeds:"
+msgstr "Alle nyhetstjenester"
+
+#: my-evolution/my-evolution.glade.h:5
+msgid "All stations:"
+msgstr "Alle stasjoner:"
+
+#: my-evolution/my-evolution.glade.h:7
+msgid "Display folders:"
+msgstr "Vis mapper:"
+
+#: my-evolution/my-evolution.glade.h:8
+msgid "Display stations:"
+msgstr "Vis stasjoner:"
+
+#: my-evolution/my-evolution.glade.h:9
+msgid "Displayed feeds:"
+msgstr "Viste tjenester:"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "Five days"
+msgstr "Fem dager"
+
+#: my-evolution/my-evolution.glade.h:11
+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:13
+msgid "Max number of items shown:"
+msgstr "Maksimalt antall oppføringer som vises:"
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "News Feed Settings"
+msgstr "Innstillinger for nyhetstjeneste"
+
+#: my-evolution/my-evolution.glade.h:15
+msgid "News Feeds"
+msgstr "Nyhetstjenester"
+
+#: my-evolution/my-evolution.glade.h:16
+msgid "One day"
+msgstr "En dag"
+
+#: my-evolution/my-evolution.glade.h:17
+msgid "One month"
+msgstr "En måned"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "One week"
+msgstr "En uke"
+
+#: my-evolution/my-evolution.glade.h:19
+msgid "Refresh time (seconds):"
+msgstr "Oppdateringsintervall (sekunder):"
+
+#: my-evolution/my-evolution.glade.h:20
+msgid "Remove <-"
+msgstr "Fjern <-"
+
+#: my-evolution/my-evolution.glade.h:21
+msgid "Schedule"
+msgstr "Sett av tid"
+
+#: my-evolution/my-evolution.glade.h:22
+msgid "Show all tasks"
+msgstr "Vis alle oppgaver"
+
+#: my-evolution/my-evolution.glade.h:23
+msgid "Show full path for folders"
+msgstr "Vis full sti til mapper"
+
+#: my-evolution/my-evolution.glade.h:24
+msgid "Show today's tasks"
+msgstr "Vis oppgaver for i dag"
+
+#: my-evolution/my-evolution.glade.h:25
+msgid "Tasks "
+msgstr "Oppgaver "
+
+#: my-evolution/my-evolution.glade.h:26
+msgid "Units: "
+msgstr "Enheter: "
+
+#: my-evolution/my-evolution.glade.h:27
+msgid "Weather"
+msgstr "Vær"
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "Weather settings"
+msgstr "Innstillinger for vær"
+
+#: my-evolution/my-evolution.glade.h:29
+msgid "Wipe trackers"
+msgstr "Visk ut sporere"
+
+#: my-evolution/my-evolution.glade.h:30
+msgid "imperial"
+msgstr "imperiell"
+
+#: my-evolution/my-evolution.glade.h:31
+msgid "metric"
+msgstr "metrisk"
+
 #: shell/e-activity-handler.c:198
 msgid "Show Details"
 msgstr "Vis detaljer"
@@ -8396,7 +8980,7 @@ msgstr "Vis detaljer"
 msgid "Cancel Operation"
 msgstr "Alys operasjon"
 
-#: shell/e-setup.c:125 shell/e-setup.c:198
+#: shell/e-setup.c:125 shell/e-setup.c:195
 msgid "Evolution installation"
 msgstr "Evolution installasjon"
 
@@ -8418,19 +9002,15 @@ msgstr ""
 msgid "Could not update files correctly"
 msgstr "Kunne ikke oppdatere filene."
 
-#: shell/e-setup.c:173 shell/e-setup.c:241
-msgid "Evolution files successfully installed."
-msgstr "Evolutions filer ble installert."
-
-#: shell/e-setup.c:202
+#: shell/e-setup.c:199
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Dette ser ut til å være første gang du kjører Evolution."
 
-#: shell/e-setup.c:203
+#: shell/e-setup.c:200
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr "Vennligst klikk \"OK\" for å installere Evolutions brukerfiler under"
 
-#: shell/e-setup.c:222
+#: shell/e-setup.c:219
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -8441,16 +9021,16 @@ msgstr ""
 "%s\n"
 "Feil: %s"
 
-#: shell/e-setup.c:237
+#: shell/e-setup.c:234
 #, c-format
 msgid ""
-"Cannot copy files into\n"
+"An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
-"Kan ikke kopiere filer til\n"
+"En feil oppsto under kopiering av filer til\n"
 "`%s'."
 
-#: shell/e-setup.c:304
+#: shell/e-setup.c:299
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -8461,7 +9041,7 @@ msgstr ""
 "Venligst flytt denne for å tillate installasjon\n"
 "av Evolution's brukerfiler."
 
-#: shell/e-setup.c:318
+#: shell/e-setup.c:313
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -8475,7 +9055,7 @@ msgstr ""
 "kan kjøre.\n"
 "Vil du fjerne denne katalogen?"
 
-#: shell/e-setup.c:343
+#: shell/e-setup.c:338
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -8486,12 +9066,12 @@ msgstr ""
 "Evolution-katalogen. Venligst flytt den for å \n"
 "tillate installasjon av Evolution's brukerfiler."
 
-#: shell/e-shell.c:433
+#: shell/e-shell.c:446
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikke sette opp lokal lagring -- %s"
 
-#: shell/e-shell.c:1281
+#: shell/e-shell.c:1308
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -8500,37 +9080,49 @@ msgstr ""
 "Ops! Visningen for `%s' døde uventet. :-(\n"
 "Dette betyr sannsynligvis at komponenten %s har krasjet."
 
-#: shell/e-shell-folder-commands.c:242
+#: shell/e-shell-folder-commands.c:159
+msgid "Cannot move a folder over itself."
+msgstr "Kan ikke flytte en mappe over seg selv."
+
+#: shell/e-shell-folder-commands.c:161
+msgid "Cannot copy a folder over itself."
+msgstr "Kan ikke kopiere en mappe oppå seg selv."
+
+#: shell/e-shell-folder-commands.c:175
+msgid "Cannot move a folder into one of its descendants."
+msgstr "Kan ikke flytte en mappe til en av sine egne undermapper."
+
+#: shell/e-shell-folder-commands.c:269
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Spesifiser en mappe som mappen \"%s\" skal kopieres til:"
 
-#: shell/e-shell-folder-commands.c:247
+#: shell/e-shell-folder-commands.c:274
 msgid "Copy folder"
 msgstr "Kopier mappe"
 
-#: shell/e-shell-folder-commands.c:285
+#: shell/e-shell-folder-commands.c:312
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Spesifiser en mappe å flytte mappen \"%s\" til:"
 
-#: shell/e-shell-folder-commands.c:290
+#: shell/e-shell-folder-commands.c:317
 msgid "Move folder"
 msgstr "Flytt mappe"
 
 #. Popup a dialog asking if they are sure they want to delete
 #. the folder
-#: shell/e-shell-folder-commands.c:324
+#: shell/e-shell-folder-commands.c:351
 #, c-format
 msgid "Delete folder '%s'"
 msgstr "Slett mappe '%s'"
 
-#: shell/e-shell-folder-commands.c:332
+#: shell/e-shell-folder-commands.c:359
 #, c-format
 msgid "Are you sure you want to remove the '%s' folder?"
 msgstr "Er du sikker på at du vil fjerne mappen '%s'?"
 
-#: shell/e-shell-folder-commands.c:390
+#: shell/e-shell-folder-commands.c:417
 #, c-format
 msgid "Rename folder '%s'"
 msgstr "Endre navn på mappe '%s'"
@@ -8673,35 +9265,35 @@ msgstr "Velg en målmappe for å importere data"
 msgid "Closing connections..."
 msgstr "Lukker forbindelser..."
 
-#: shell/e-shell-view.c:174
+#: shell/e-shell-view.c:173
 msgid "(No folder displayed)"
 msgstr "(Ingen mappe vist)"
 
 #. Special case for My Evolution
-#: shell/e-shell-view.c:1387 shell/e-storage-set-view.c:1441
+#: shell/e-shell-view.c:1386 shell/e-storage-set-view.c:1441
 msgid "My Evolution"
 msgstr "Min Evolution"
 
-#: shell/e-shell-view.c:1404
+#: shell/e-shell-view.c:1403
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1406
+#: shell/e-shell-view.c:1405
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution - %s [%s]"
 
-#: shell/e-shell-view.c:1444
+#: shell/e-shell-view.c:1443
 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:1451
+#: shell/e-shell-view.c:1450
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution er i ferd med å koble fra."
 
-#: shell/e-shell-view.c:1457
+#: shell/e-shell-view.c:1456
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Evolution er frakoblet. Klikk på denne knappen for å arbeide tilkoblet."
@@ -8728,43 +9320,55 @@ msgstr ""
 "for e-post, kalender og kontaktdatabaser for\n"
 "GNOME skrivebordsmiljøet."
 
-#: shell/e-shell-view-menu.c:464
+#: shell/e-shell-view-menu.c:453
 msgid "Go to folder..."
 msgstr "Gå til mappe..."
 
-#: shell/e-shell-view-menu.c:465
+#: shell/e-shell-view-menu.c:454
 msgid "Select the folder that you want to open"
 msgstr "Velg mappen du ønsker å åpne"
 
-#: shell/e-shell-view-menu.c:610
+#: shell/e-shell-view-menu.c:599
 msgid "Create a new shortcut"
 msgstr "Opprett en ny snarvei"
 
-#: shell/e-shell-view-menu.c:611
+#: shell/e-shell-view-menu.c:600
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Velg mappen du ønsker snarveien skal peke til:"
 
-#: shell/e-shell-view-menu.c:718
+#: shell/e-shell-view-menu.c:705
 msgid "Work online"
 msgstr "Arbeid \"online\""
 
-#: shell/e-shell-view-menu.c:730 shell/e-shell-view-menu.c:742
+#: shell/e-shell-view-menu.c:717 shell/e-shell-view-menu.c:729
 msgid "Work offline"
 msgstr "Arbeid \"offline\""
 
-#: shell/e-shortcuts.c:596
+#: shell/e-shortcuts.c:601
 msgid "Error saving shortcuts."
 msgstr "Feil under lagring av snarveier."
 
-#: shell/e-shortcuts-view.c:136
+#: shell/e-shortcuts.c:998
+msgid "Shortcuts"
+msgstr "Snarveier"
+
+#: shell/e-shortcuts.c:1000
+msgid "Inbox"
+msgstr "Innboks"
+
+#: shell/e-shortcuts.c:1003
+msgid "Contacts"
+msgstr "Kontakter"
+
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr "Opprett ny snarveigruppe"
 
-#: shell/e-shortcuts-view.c:139
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "Gruppenavn:"
 
-#: shell/e-shortcuts-view.c:262
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -8773,95 +9377,95 @@ msgstr ""
 "Vil du virkelig fjerne gruppen\n"
 "`%s' fra snarveilinjen?"
 
-#: shell/e-shortcuts-view.c:267
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "Ikke fjern"
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:297
 msgid "Rename Shortcut Group"
 msgstr "Endre navn på snarveigruppen"
 
-#: shell/e-shortcuts-view.c:293
+#: shell/e-shortcuts-view.c:298
 msgid "Rename selected shortcut group to:"
 msgstr "Endre valgt snarveigruppe til:"
 
-#: shell/e-shortcuts-view.c:303
+#: shell/e-shortcuts-view.c:308
 msgid "_Small Icons"
 msgstr "_Små ikoner"
 
-#: shell/e-shortcuts-view.c:304
+#: shell/e-shortcuts-view.c:309
 msgid "Show the shortcuts as small icons"
 msgstr "Vis snarveier som små ikoner"
 
-#: shell/e-shortcuts-view.c:306
+#: shell/e-shortcuts-view.c:311
 msgid "_Large Icons"
 msgstr "Store i_koner"
 
-#: shell/e-shortcuts-view.c:307
+#: shell/e-shortcuts-view.c:312
 msgid "Show the shortcuts as large icons"
 msgstr "Vis snarveier som store ikoner"
 
-#: shell/e-shortcuts-view.c:318
+#: shell/e-shortcuts-view.c:323
 msgid "_New Group..."
 msgstr "_Ny gruppe..."
 
-#: shell/e-shortcuts-view.c:319
+#: shell/e-shortcuts-view.c:324
 msgid "Create a new shortcut group"
 msgstr "Opprett en ny snarveigruppe"
 
-#: shell/e-shortcuts-view.c:321
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:326
+msgid "_Remove this Group..."
 msgstr "Fje_rn denne gruppen..."
 
-#: shell/e-shortcuts-view.c:322
+#: shell/e-shortcuts-view.c:327
 msgid "Remove this shortcut group"
 msgstr "Fjern denne snarveigruppen"
 
-#: shell/e-shortcuts-view.c:324
-msgid "Re_name This Group..."
+#: shell/e-shortcuts-view.c:329
+msgid "Re_name this Group..."
 msgstr "E_ndre navn på denne gruppen..."
 
-#: shell/e-shortcuts-view.c:325
+#: shell/e-shortcuts-view.c:330
 msgid "Rename this shortcut group"
 msgstr "Endre navn på denne snarveigruppen"
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:335
 msgid "_Hide the Shortcut Bar"
 msgstr "Sk_jul snarveilinjen"
 
-#: shell/e-shortcuts-view.c:331
+#: shell/e-shortcuts-view.c:336
 msgid "Hide the shortcut bar"
 msgstr "Skjul snarveilinjen"
 
-#: shell/e-shortcuts-view.c:450
+#: shell/e-shortcuts-view.c:455
 msgid "Rename shortcut"
 msgstr "Endre navn på snarvei"
 
-#: shell/e-shortcuts-view.c:451
+#: shell/e-shortcuts-view.c:456
 msgid "Rename selected shortcut to:"
 msgstr "Endre navn på valgt snarvei til:"
 
-#: shell/e-shortcuts-view.c:463
+#: shell/e-shortcuts-view.c:468
 msgid "Open the folder linked to this shortcut"
 msgstr "Åpne mappen som er lenket til denne snarveien"
 
-#: shell/e-shortcuts-view.c:465 ui/evolution.xml.h:24
+#: shell/e-shortcuts-view.c:470 ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "Åpne i nytt vindu"
 
-#: shell/e-shortcuts-view.c:465
+#: shell/e-shortcuts-view.c:470
 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:468
+#: shell/e-shortcuts-view.c:473
 msgid "Rename"
 msgstr "Endre navn"
 
-#: shell/e-shortcuts-view.c:468
+#: shell/e-shortcuts-view.c:473
 msgid "Rename this shortcut"
 msgstr "Endre navn på denne snarveien"
 
-#: shell/e-shortcuts-view.c:470
+#: shell/e-shortcuts-view.c:475
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Fjern denne snarveien fra snarveilinjen"
 
@@ -8901,10 +9505,6 @@ msgstr "Spesifisert mappe ble ikke funnet"
 msgid "Function not implemented in this storage"
 msgstr "Funksjonen er ikke implementert i dette lageret"
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr "Tilgang nektet"
-
 #: shell/e-storage.c:477
 msgid "Operation not supported"
 msgstr "Operasjonen er ikke støttet"
@@ -8972,42 +9572,32 @@ msgstr "Ikke importer"
 #: shell/main.c:89
 #, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
 "\n"
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 msgstr ""
 "Hei. Takk for at du har tatt deg tid til å laste ned denne prøveversjonen\n"
-"av Evolution gruppevare-suiten.\n"
+"av Evolution gruppevarepakken.\n"
 "\n"
 "Evolution er ikke ferdig. Det nærmer seg, men deler av funksjonaliteten\n"
-"mangler eller er ikke fullført. Hvis du ikke finner ut hvordan ting\n"
-"virker, er grunnen sannsynligvis bare at dette ikke er lagt til i koden\n"
-"ennå.\n"
-"\n"
-"Vi håper at Evolution vil være nyttig for deg, men vi føler fremdeles\n"
-"behov for å advare deg om følgende: Evolution vil: krasje, miste din e-post\n"
-"når du ikke vil at det skal skje, etterlate seg vilfarne prosesser som  \n"
-"spiser 100% av din CPU-tid, låse seg, sende e-post i HTML-format til\n"
-"tilfeldige e-postlister, og tabbe deg ut foran dine venner og kolleger.\n"
-"Bruk kun etter anvisninger.\n"
+"mangler eller er ikke fullført.\n"
+"Hvis du finner feil, vennligst rapporter dem til bugzilla.ximian.com.\n"
+"Dette produktet gir deg ingen garanti og er ikke ment for\n"
+"individer som har lett for voldsomme sinneutbrudd.\n"
 "\n"
 "Vi håper at du nyter resultatene av vårt harde arbeid, og vi venter i\n"
 "spenning på at du tilbyr din hjelp!\n"
 
-#: shell/main.c:114
+#: shell/main.c:110
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -9015,24 +9605,24 @@ msgstr ""
 "Takk\n"
 "Evolution utviklerene\n"
 
-#: shell/main.c:152
+#: shell/main.c:148
 msgid "Cannot access the Evolution shell."
 msgstr "Kan ikke aksessere Evolution-skallet."
 
-#: shell/main.c:212
+#: shell/main.c:208
 msgid "Disable splash screen"
 msgstr "Deaktiver splash"
 
-#: shell/main.c:213
+#: shell/main.c:209
 msgid "Send the debugging output of all components to a file."
 msgstr "Send feilsøkingsutskrift for alle komponentene til en fil."
 
-#: shell/main.c:248
+#: shell/main.c:244
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kunne ikke initialisere Bonobo komponentsystemet."
 
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:3
-#: ui/evolution-tasks.xml.h:2
+#: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Klipp _ut"
 
@@ -9104,17 +9694,17 @@ msgstr "_Kontakt"
 msgid "_Contact Group"
 msgstr "_Kontaktgruppe"
 
-#: ui/evolution-addressbook.xml.h:25 ui/evolution-calendar.xml.h:45
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-addressbook.xml.h:25 ui/evolution-calendar.xml.h:47
+#: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "_Kopier"
 
-#: ui/evolution-addressbook.xml.h:26 ui/evolution-calendar.xml.h:50
-#: ui/evolution-tasks.xml.h:15
+#: ui/evolution-addressbook.xml.h:26 ui/evolution-calendar.xml.h:52
+#: ui/evolution-tasks.xml.h:16
 msgid "_Paste"
 msgstr "_Lim inn"
 
-#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:51
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:53
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:13 ui/my-evolution.xml.h:5
 msgid "_Print..."
@@ -9128,8 +9718,8 @@ msgstr "_Søk etter kontakter"
 msgid "_Select All"
 msgstr "_Velg alle"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:53
-#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:64
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:55
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "_Verktøy"
 
@@ -9137,7 +9727,7 @@ msgstr "_Verktøy"
 msgid "5 Days"
 msgstr "5 dager"
 
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
+#: ui/evolution-calendar.xml.h:2
 msgid "Alter preferences"
 msgstr "Endre brukervalg"
 
@@ -9193,7 +9783,7 @@ msgstr "Måned"
 msgid "New _Event"
 msgstr "Ny avtal_e"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-mail-message.xml.h:46
+#: ui/evolution-calendar.xml.h:23 ui/evolution-mail-message.xml.h:48
 msgid "Next"
 msgstr "Neste"
 
@@ -9217,64 +9807,76 @@ msgstr "Skriv ut kalender"
 msgid "Print this Calendar"
 msgstr "Skriv ut denne kalenderen"
 
-#: ui/evolution-calendar.xml.h:34 ui/evolution-message-composer.xml.h:19
+#: ui/evolution-calendar.xml.h:34
+msgid "Publish Free/Busy Information"
+msgstr "Publiser ledig/opptatt-informasjon"
+
+#: ui/evolution-calendar.xml.h:35
+msgid "Publish Free/Busy information for this calendar"
+msgstr "Publiser ledig/opptatt informasjon for denne kalenderen"
+
+#: ui/evolution-calendar.xml.h:36 ui/evolution-message-composer.xml.h:19
 msgid "Save As"
 msgstr "Lagre som"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:37
 msgid "Save calendar as something else"
 msgstr "Lagre kalender som noe annet"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:38
+msgid "Settings..."
+msgstr "Innstillinger..."
+
+#: ui/evolution-calendar.xml.h:39
 msgid "Show 1 day"
 msgstr "Vis 1 dag"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:40
 msgid "Show 1 month"
 msgstr "Vis 1 måned"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:41
 msgid "Show 1 week"
 msgstr "Vis 1 uke"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:42
 msgid "Show the working week"
 msgstr "Vis arbeidsuken"
 
-#: ui/evolution-calendar.xml.h:41 widgets/misc/e-cell-date-edit.c:229
-#: widgets/misc/e-dateedit.c:424
+#: ui/evolution-calendar.xml.h:43 widgets/misc/e-cell-date-edit.c:232
+#: widgets/misc/e-dateedit.c:431
 msgid "Today"
 msgstr "Idag"
 
-#: ui/evolution-calendar.xml.h:42
+#: ui/evolution-calendar.xml.h:44
 msgid "W_ork Week"
 msgstr "Arbeids_uke"
 
-#: ui/evolution-calendar.xml.h:43
+#: ui/evolution-calendar.xml.h:45
 msgid "Week"
 msgstr "Uke"
 
-#: ui/evolution-calendar.xml.h:44
+#: ui/evolution-calendar.xml.h:46
 msgid "_Appointment"
 msgstr "_Avtale"
 
-#: ui/evolution-calendar.xml.h:46
+#: ui/evolution-calendar.xml.h:48
 msgid "_Day"
 msgstr "_Dag"
 
-#: ui/evolution-calendar.xml.h:47
+#: ui/evolution-calendar.xml.h:49
 msgid "_Month"
 msgstr "_Måned"
 
-#: ui/evolution-calendar.xml.h:48 ui/evolution.xml.h:57
+#: ui/evolution-calendar.xml.h:50 ui/evolution.xml.h:56
 msgid "_New"
 msgstr "_Ny"
 
-#: ui/evolution-calendar.xml.h:49
+#: ui/evolution-calendar.xml.h:51
 msgid "_Open Calendar"
 msgstr "_Åpne kalender"
 
-#: ui/evolution-calendar.xml.h:54
+#: ui/evolution-calendar.xml.h:56
 msgid "_Week"
 msgstr "_Uke"
 
@@ -9291,7 +9893,7 @@ msgid "Delete this appointment"
 msgstr "Slett denne avtalen"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:21
 msgid "Main toolbar"
 msgstr "Hovedverktøylinje"
 
@@ -9317,11 +9919,6 @@ msgstr "Skriv ut denne oppføringen"
 msgid "Print..."
 msgstr "Skriv ut..."
 
-#: ui/evolution-comp-editor.xml.h:14 widgets/misc/e-filter-bar.h:94
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
-msgstr "Lagre som..."
-
 #: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
 #: ui/evolution-contact-list-editor.xml.h:8
 msgid "Save and Close"
@@ -9346,12 +9943,14 @@ msgstr "H_andling"
 #: ui/evolution-comp-editor.xml.h:21 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-mail-messagedisplay.xml.h:10
-#: ui/evolution-message-composer.xml.h:48 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:48
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
 msgid "_File"
 msgstr "_Fil"
 
-#: ui/evolution-comp-editor.xml.h:22 ui/evolution.xml.h:52
+#: ui/evolution-comp-editor.xml.h:22 ui/evolution-signature-editor.xml.h:9
+#: ui/evolution.xml.h:51
 msgid "_Help"
 msgstr "_Hjelp"
 
@@ -9398,6 +9997,7 @@ msgstr "Send _melding til kontakt..."
 #: ui/evolution-contact-editor.xml.h:16
 #: ui/evolution-contact-list-editor.xml.h:14
 #: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Lagre"
 
@@ -9450,7 +10050,7 @@ msgid "Schedule a meeting for this item"
 msgstr "Sett opp møte for denne oppføringen"
 
 #: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:41
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Actions"
 msgstr "H_andlinger"
 
@@ -9635,7 +10235,7 @@ msgstr "Meldingsliste med tråder"
 msgid "_Expunge"
 msgstr "_Tøm"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:49
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
 msgid "_Folder"
 msgstr "_Mappe"
 
@@ -9643,7 +10243,7 @@ msgstr "_Mappe"
 msgid "_Invert Selection"
 msgstr "Re_verser utvalg"
 
-#: ui/evolution-mail-list.xml.h:28 ui/evolution.xml.h:59
+#: ui/evolution-mail-list.xml.h:28
 msgid "_Properties..."
 msgstr "Egenska_per..."
 
@@ -9651,6 +10251,34 @@ msgstr "Egenska_per..."
 msgid "_Threaded Message List"
 msgstr "Meldingsliste med _tråder"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Lukk dette vinduet"
+
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
+msgstr "Til_pass verktøylinjer..."
+
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
+msgstr "Tilpass"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr "Tilpass verktøylinjer"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+msgid "_Close"
+msgstr "L_ukk"
+
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+msgid "_View"
+msgstr "_Vis"
+
 #: ui/evolution-mail-message.xml.h:1
 msgid "Apply filter rules to the selected messages"
 msgstr "Aktiver filterregler på de valgte meldingene"
@@ -9800,193 +10428,170 @@ msgid "Mar_k As Read"
 msgstr "Mer_k som lest"
 
 #: ui/evolution-mail-message.xml.h:40
+msgid "Mark As I_mportant"
+msgstr "Merk som _viktig"
+
+#: ui/evolution-mail-message.xml.h:41
 msgid "Mark As U_nread"
 msgstr "Merk som _ulest"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:42
 msgid "Mark the selected messages as having been read"
 msgstr "Merk valgte meldinger som lest"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:43
+msgid "Mark the selected messages as important"
+msgstr "Merk valgte meldinger som viktige"
+
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as not having been read"
 msgstr "Merk valgte meldinger som ikke lest"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark the selected messages for deletion"
 msgstr "Merk valgte meldinger for sletting"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 msgid "Move"
 msgstr "Flytt"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
 msgid "Move selected messages to another folder"
 msgstr "Flytt valgte meldinger til en annen mappe"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
 msgid "Open the selected message in a new window"
 msgstr "Åpne valgt melding i et nytt vindu"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:50
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Åpne valgt melding i redigeringsvinduet for å sende den på nytt"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
 msgid "Previews the message to be printed"
 msgstr "Viser forhåndsvisning av meldingen som skal skrives ut"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
 msgid "Previous"
 msgstr "Forrige"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:54
 msgid "Print Message..."
 msgstr "Skriv ut melding..."
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:55
 msgid "Print Preview..."
 msgstr "Forhåndsvisning av utskrift"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
 msgid "Print message to the printer"
 msgstr "Skriv ut denne meldingen på skriveren"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
 msgid "Redirect (FIXME: implement me)"
 msgstr "Omdiriger"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
 msgid "Reply"
 msgstr "Svar"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:62
 msgid "S_earch Message"
 msgstr "Søk i m_elding"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:63
 msgid "Save the message as a text file"
 msgstr "Lagre meldingen som en tekstfil"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:64
 msgid "Search for text in the body of the displayed message"
 msgstr "Søk etter tekst i kroppen av vist melding"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
 msgid "Show Email _Source"
 msgstr "Vis e-post-kilde"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Show Full _Headers"
 msgstr "Vis fulle _headere"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:67
 msgid "Show message in the normal style"
 msgstr "Vis melding i normal stil"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:68
 msgid "Show message with all email headers"
 msgstr "Vis melding med fulle e-post headere"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Show the raw email source of the message"
 msgstr "Vis e-post meldingen i sin råe form"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Un-delete the selected messages"
 msgstr "Angre slett av den valgte meldingen"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 msgid "VFolder on Mailing _List..."
 msgstr "VFolder på e-post_liste..."
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:72
 msgid "VFolder on Se_nder..."
 msgstr "VFolder for se_nder..."
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:73
 msgid "VFolder on _Recipients..."
 msgstr "VFolder for mottake_re..."
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:74
 msgid "VFolder on _Subject..."
 msgstr "VFolder på e_mne..."
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:75
 msgid "_Apply Filters"
 msgstr "_Påfør filtre"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "_Copy to Folder"
 msgstr "_Kopier til mappe"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "_Create Filter From Message"
 msgstr "La_g filter fra melding"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 msgid "_Forward Message"
 msgstr "_Videresend melding"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "_Message Display"
 msgstr "_Meldingsvisning"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "_Move to Folder"
 msgstr "_Flytt til mappe"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "_Normal Display"
 msgstr "_Normal visning"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "_Open Message"
 msgstr "_Åpne melding"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Re-send Message"
 msgstr "_Send melding på nytt"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
-msgid "Close this window"
-msgstr "Lukk dette vinduet"
-
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
-msgid "Customi_ze Toolbars..."
-msgstr "Til_pass verktøylinjer..."
-
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:12
-msgid "Customize"
-msgstr "Tilpass"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:13
-msgid "Customize toolbars"
-msgstr "Tilpass verktøylinjer"
-
-#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:43
-msgid "_Close"
-msgstr "L_ukk"
-
-#: ui/evolution-mail-messagedisplay.xml.h:12
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:65
-msgid "_View"
-msgstr "_Vis"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Legg ved"
 
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Legg ved en fil"
-
-#: ui/evolution-message-composer.xml.h:4
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Lukk aktiv fil"
 
@@ -10038,7 +10643,8 @@ msgstr "Krypter med S/MIME"
 msgid "S/MIME Sign"
 msgstr "Signer med S/MIME"
 
-#: ui/evolution-message-composer.xml.h:18 widgets/misc/e-filter-bar.c:241
+#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:240
 msgid "Save"
 msgstr "Lagre"
 
@@ -10055,6 +10661,7 @@ msgid "Save in folder..."
 msgstr "Lagre i mappe..."
 
 #: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save the current file"
 msgstr "Lagre aktiv fil"
 
@@ -10135,6 +10742,7 @@ msgid "_Cc Field"
 msgstr "_Cc-felt"
 
 #: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:6
 msgid "_Debug"
 msgstr "_Feilsøk"
 
@@ -10147,6 +10755,7 @@ msgid "_From Field"
 msgstr "_Fra-felt"
 
 #: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "Sett _inn"
 
@@ -10206,35 +10815,43 @@ msgstr "Deleger oppgave"
 msgid "Re_fresh Task"
 msgstr "O_ppdater oppgave"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:2
 msgid "Copy selected task"
 msgstr "Kopier valgt oppgave"
 
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:3
 msgid "Create a new task"
 msgstr "Opprett en ny oppgave"
 
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:4
 msgid "Cut selected task"
 msgstr "Klipp ut valgt oppgave"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:7
 msgid "New Task"
 msgstr "Ny oppgave"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:8
 msgid "Paste task from the clipboard"
 msgstr "Lim inn oppgave fra utklippstavlen"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:10
 msgid "Save task as something else"
 msgstr "Lagre oppgave som noe annet"
 
+#: ui/evolution-tasks.xml.h:11
+msgid "Set task view preferences"
+msgstr "Endre brukervalg for oppgavevisning"
+
 #: ui/evolution-tasks.xml.h:12
 msgid "Tasks Preferences..."
 msgstr "Brukervalg for oppgaver..."
 
-#: ui/evolution-tasks.xml.h:18
+#: ui/evolution-tasks.xml.h:13
+msgid "TasksPreferences"
+msgstr "Brukervalg for oppgaver"
+
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "_Oppgave"
 
@@ -10250,183 +10867,179 @@ msgstr "Legg til på _snarveilinje"
 msgid "Change the name of this folder"
 msgstr "Endre navn på denne mappen"
 
-#: ui/evolution.xml.h:4
-msgid "Change the properties for this folder"
-msgstr "Endre egenskaper for denne mappen"
-
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:6
 msgid "Copy this folder"
 msgstr "Kopier denne mappen"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:7
 msgid "Create _New Folder..."
 msgstr "Opprett _ny mappe..."
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:8
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "Lag en lenke til denne mappen på snarveilinjen"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:9
 msgid "Create a new folder"
 msgstr "Opprett en ny mappe"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:13
 msgid "Delete this folder"
 msgstr "Slett denne mappen"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Vis en annen mappe"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "A_vslutt"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:16
 msgid "Evolution _FAQ"
 msgstr "Evolution _OBS"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:17
 msgid "Evolution _Window"
 msgstr "Evolution vindu"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "Avslutt programmet"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "Kom _igang"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr "Importer et eksternt filformat"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:22
 msgid "Move this folder to another place"
 msgstr "Flytt denne mappen til et annet sted"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Åpne i nytt _vindu"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "Åpne denne mappen i et annet vindu"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Vis informasjon om Evolution"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "Send inn feilrapport"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "Sen_d inn feilrapport"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr "Send inn feilrapport ved bruk av Bug Buddy."
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:30
 msgid "Toggle"
 msgstr "Bytt"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr "Slå av/på visning av mappelinjen"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Slå av/på visning av snarveilinjen"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "Skift til \"offline\" arbeidsmodus."
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr "Bruk av k_ontaktdatabasen"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "Bruk av _kalenderen"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr "Bruk av e-_postprogrammet"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:37
 msgid "View the selected folder"
 msgstr "Vis den valgte mappen"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:38
 msgid "Work Offline"
 msgstr "Arbeid \"offline\""
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "_Om Evolution..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:41
 msgid "_Appointment (FIXME)"
 msgstr "_Avtale"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:43
 msgid "_Contact (FIXME)"
 msgstr "_Kontakt"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "_Kopier..."
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "_Mappelinje"
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_Gå til mappe..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr "_Importer fil..."
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "_Indeks"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr "Send _melding"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:55
 msgid "_Move..."
 msgstr "_Flytt..."
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "_Ny mappe"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:58
 msgid "_Rename..."
 msgstr "_Gi nytt navn..."
 
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:59
 msgid "_Shortcut"
 msgstr "_Snarvei"
 
-#: ui/evolution.xml.h:62
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr "_Snarveilinje"
 
-#: ui/evolution.xml.h:63
+#: ui/evolution.xml.h:61
 msgid "_Task (FIXME)"
 msgstr "_Oppgave"
 
-#: ui/evolution.xml.h:66
+#: ui/evolution.xml.h:64
 msgid "_Work Offline"
 msgstr "Ar_beid \"offline\""
 
@@ -10450,22 +11063,6 @@ msgstr "Etter firma"
 msgid "Phone List"
 msgstr "Telefonliste"
 
-#: views/calendar/galview.xml.h:1
-msgid "Day View"
-msgstr "Dagvisning"
-
-#: views/calendar/galview.xml.h:2
-msgid "Month View"
-msgstr "Månedsvisning"
-
-#: views/calendar/galview.xml.h:3
-msgid "Week View"
-msgstr "Ukevisning"
-
-#: views/calendar/galview.xml.h:4
-msgid "Work Week View"
-msgstr "Arbeidsukevisning"
-
 #: views/mail/galview.xml.h:1
 msgid "By Sender"
 msgstr "Etter avsender"
@@ -10579,24 +11176,24 @@ msgstr "Definer visninger"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:422
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "MTOTFLS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1061 widgets/misc/e-calendar-item.c:2756
+#: widgets/misc/e-calendar-item.c:1067 widgets/misc/e-calendar-item.c:2766
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:221 widgets/misc/e-dateedit.c:418
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:425
 msgid "Now"
 msgstr "nå"
 
-#: widgets/misc/e-cell-date-edit.c:245
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
 
-#: widgets/misc/e-cell-date-edit.c:726
+#: widgets/misc/e-cell-date-edit.c:731
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Datoen må skrives inn på formatet: %s"
@@ -10670,7 +11267,7 @@ msgstr "Skriv inn tegnsett som skal brukes"
 msgid "Other..."
 msgstr "Andre..."
 
-#: widgets/misc/e-charset-picker.c:378
+#: widgets/misc/e-charset-picker.c:394
 msgid "Character Encoding"
 msgstr "Tegnkoding"
 
@@ -10678,11 +11275,11 @@ msgstr "Tegnkoding"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:168
+#: widgets/misc/e-filter-bar.c:167
 msgid "Save Search"
 msgstr "Lagre søk"
 
-#: widgets/misc/e-filter-bar.c:239
+#: widgets/misc/e-filter-bar.c:238
 msgid "Advanced Search"
 msgstr "Avansert søk"
 
@@ -10743,6 +11340,46 @@ msgstr "init_corba(): kunne ikke initiere GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 
+#~ msgid "time-now expects 0 arguments"
+#~ msgstr "tid-nå forventer 0 argumenter"
+
+#~ msgid "make-time expects 1 argument"
+#~ msgstr "lag-tid forventer 1 argument"
+
+#~ msgid "make-time expects argument 1 to be a string"
+#~ msgstr "lag-tid forventer at argument 1 er en streng"
+
+#~ msgid "contains? expects 2 arguments"
+#~ msgstr "inneholder? forventer 2 argumenter"
+
+#~ msgid "Evaluation of the search expression did not yield a boolean value"
+#~ msgstr "Evaluering av søkeuttrykket ga ikke en boolsk verdi"
+
+#~ msgid "???"
+#~ msgstr "???"
+
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "Evolutions filer ble installert."
+
+#~ msgid ""
+#~ "Cannot copy files into\n"
+#~ "`%s'."
+#~ msgstr ""
+#~ "Kan ikke kopiere filer til\n"
+#~ "`%s'."
+
+#~ msgid "Change the properties for this folder"
+#~ msgstr "Endre egenskaper for denne mappen"
+
+#~ msgid "Delegated By:"
+#~ msgstr "Delegert av:"
+
+#~ msgid "Moving folder %s to %s"
+#~ msgstr "Flytter mappe %s til %s"
+
+#~ msgid "Copying folder %s to %s"
+#~ msgstr "Kopierer mappe %s til %s"
+
 #~ msgid "="
 #~ msgstr "="
 
@@ -10752,15 +11389,9 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Alarms timeout after"
 #~ msgstr "Tidsavbrudd for alarm etter"
 
-#~ msgid "Audio Alarms"
-#~ msgstr "Lyd-alarmer"
-
 #~ msgid "Colors"
 #~ msgstr "Farger"
 
-#~ msgid "Display options"
-#~ msgstr "Vis alternativer"
-
 #~ msgid "Enable snoozing for"
 #~ msgstr "Slå på utsetting for "
 
@@ -10922,9 +11553,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Applet Width:"
 #~ msgstr "Applet-bredde:"
 
-#~ msgid "Update Interval (seconds):"
-#~ msgstr "Oppdateringsintervall (sekunder):"
-
 #~ msgid "Low Charge Threshold:"
 #~ msgstr "Terskel for lavnivå på strøm:"
 
@@ -11705,9 +12333,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Show Notes"
 #~ msgstr "Vis notiser"
 
-#~ msgid "GNotes Settings"
-#~ msgstr "Innstillinger for GNotes"
-
 #~ msgid "Default Height"
 #~ msgstr "Standard høyde"
 
@@ -12423,12 +13048,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Reset"
 #~ msgstr "Nullstill"
 
-#~ msgid "Odometer setting"
-#~ msgstr "Odometer innstilling"
-
-#~ msgid "Use Metric"
-#~ msgstr "Bruk utgangsverdi"
-
 #~ msgid "auto_reset"
 #~ msgstr "auto_reset"
 
@@ -12734,9 +13353,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Paint what radius around each pixel?"
 #~ msgstr "Radius for tegning rundt hver piksel?"
 
-#~ msgid "Solarise Image"
-#~ msgstr "Solariser bildet"
-
 #~ msgid "Solarize factor?"
 #~ msgstr "Faktor for solarisering?"
 
@@ -12850,9 +13466,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Creating user directory: %s\n"
 #~ msgstr "Oppretter brukerkatalog: %s\n"
 
-#~ msgid "Unable to create user directory: %s\n"
-#~ msgstr "Kunne ikke opprette brukerkatalog: %s\n"
-
 #~ msgid "%d.%d.%d"
 #~ msgstr "%d.%d.%d"
 
@@ -13076,9 +13689,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Text to display:"
 #~ msgstr "Tekst som skal vises:"
 
-#~ msgid "Alert options"
-#~ msgstr "Alternativer for alarm"
-
 #~ msgid "Load average monitor"
 #~ msgstr "Snittbelastningsmodul"
 
@@ -13098,9 +13708,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Enabled"
 #~ msgstr "Aktivert"
 
-#~ msgid "Line delay"
-#~ msgstr "Linjepause"
-
 #~ msgid "Update interval"
 #~ msgstr "Oppdateringsintervall"
 
@@ -13334,9 +13941,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Modem Lights"
 #~ msgstr "Modemlys"
 
-#~ msgid "Show modem status"
-#~ msgstr "Vis modemstatus"
-
 #~ msgid "Fifteen"
 #~ msgstr "Femten"
 
@@ -13540,9 +14144,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ "File en meget stor (mer enn 100K).\n"
 #~ "Er du sikker på at du vil sette den inn?"
 
-#~ msgid "An error occurred while reading the file."
-#~ msgstr "En feil oppsto under lesing fra filen."
-
 #~ msgid "Reply to the sender of this message"
 #~ msgstr "Svar til avsender av denne meldingen"
 
@@ -13631,13 +14232,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Role"
 #~ msgstr "Rolle"
 
-#~ msgid ""
-#~ "Schedule\n"
-#~ "Time"
-#~ msgstr ""
-#~ "Sett av\n"
-#~ "tid"
-
 #~ msgid "Could not test lock file for %s: %s"
 #~ msgstr "Kunne ikke sjekke låsfil for %s: %s"
 
@@ -13737,18 +14331,12 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "<b>Loading RDF file. . .<br>Please wait</b>"
 #~ msgstr "<b>Laster RDF-fil. . .<br>Vennligst vent</b>"
 
-#~ msgid "Maximum number of entries:"
-#~ msgstr "Maksimalt antall oppføringer:"
-
 #~ msgid "Show window title"
 #~ msgstr "Vis vindustittel"
 
 #~ msgid "Update automatically"
 #~ msgstr "Oppdater automatisk"
 
-#~ msgid "Update every "
-#~ msgstr "Oppdater hver(t) "
-
 #~ msgid "HELP: Page %d!\n"
 #~ msgstr "HJELP: Side %d!\n"
 
@@ -13911,27 +14499,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "%H:%M%n"
 #~ msgstr "%H:%M%n"
 
-#~ msgid "Error adding card"
-#~ msgstr "Feil ved tillegg av kort"
-
-#~ msgid "Success"
-#~ msgstr "Suksess"
-
-#~ msgid "Repository offline"
-#~ msgstr "Lager \"offline\""
-
-#~ msgid "Card not found"
-#~ msgstr "Kort ikke funnet"
-
-#~ msgid "Protocol not supported"
-#~ msgstr "Protokollen er ikke støttet"
-
-#~ msgid "Canceled"
-#~ msgstr "Avbrutt"
-
-#~ msgid "Other error"
-#~ msgstr "Annen feil"
-
 #~ msgid "Add Service"
 #~ msgstr "Legg til tjeneste"
 
@@ -13950,21 +14517,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Edit Task"
 #~ msgstr "Rediger oppgave"
 
-#~ msgid "Appointment - %s"
-#~ msgstr "Avtale - %s"
-
-#~ msgid "Task - %s"
-#~ msgstr "Oppgave - %s"
-
-#~ msgid "Journal entry - %s"
-#~ msgstr "Journaloppføring - %s"
-
-#~ msgid "No summary"
-#~ msgstr "Ingen sammendrag"
-
-#~ msgid "Edit Appointment"
-#~ msgstr "Rediger avtale"
-
 #~ msgid "Appointment Basics"
 #~ msgstr "Grunnleggende om avtaler"
 
@@ -14309,9 +14861,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Evolution Mail Configuration"
 #~ msgstr "Evolution e-post-konfigurasjon"
 
-#~ msgid "Hostname:"
-#~ msgstr "Vertsnavn:"
-
 #~ msgid "IMAP"
 #~ msgstr "IMAP"
 
@@ -14321,9 +14870,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Keep mail on server"
 #~ msgstr "Behold e-post på tjener"
 
-#~ msgid "Kerberos"
-#~ msgstr "Kerberos"
-
 #~ msgid "Mail Account"
 #~ msgstr "E-post konto"
 
@@ -14345,9 +14891,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Server type:"
 #~ msgstr "Tjenertype:"
 
-#~ msgid "Source"
-#~ msgstr "Kilde"
-
 #~ msgid "Transport"
 #~ msgstr "Transport"
 
@@ -14628,9 +15171,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Appending \"%s\""
 #~ msgstr "Legger til \"%s\""
 
-#~ msgid "Appending a message without a subject"
-#~ msgstr "Legger til en melding uten emne"
-
 #~ msgid "Moving messages from \"%s\" into \"%s\""
 #~ msgstr "Flytter meldinger fra \"%s\" til \"%s\""
 
@@ -14671,9 +15211,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Unsubscribe from folder \"%s\""
 #~ msgstr "Slett abonnement på mappe \"%s\""
 
-#~ msgid "All Folders"
-#~ msgstr "Alle mapper"
-
 #~ msgid "Display folders whose name contain:"
 #~ msgstr "Vis mapper som inneholder:"
 
@@ -14686,9 +15223,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Local stores do not have a default folder"
 #~ msgstr "Lokale lager har ikke en standardmappe"
 
-#~ msgid "Local folders may not be nested."
-#~ msgstr "Lokale mapper kan ikke være rekursive."
-
 #~ msgid "Page Set_up"
 #~ msgstr "Sideoppsett"
 
@@ -14886,9 +15420,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Signature File"
 #~ msgstr "Signaturfil"
 
-#~ msgid "Server:"
-#~ msgstr "Tjener:"
-
 #~ msgid "Mail source type:"
 #~ msgstr "Type e-post-kilde:"
 
@@ -14947,9 +15478,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Edit Source"
 #~ msgstr "Rediger kilde"
 
-#~ msgid "Add News Server"
-#~ msgstr "Legg til news-tjener"
-
 #~ msgid "Edit News Server"
 #~ msgstr "Rediger news-tjener"
 
@@ -14971,9 +15499,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Mail Transport"
 #~ msgstr "E-post-transport"
 
-#~ msgid "News Servers"
-#~ msgstr "News-tjenere"
-
 #~ msgid "News Sources"
 #~ msgstr "News-kilder"
 
@@ -15071,9 +15596,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Load \"%s\""
 #~ msgstr "Last \"%s\""
 
-#~ msgid "Synchronizing \"%s\""
-#~ msgstr "Synkroniserer \"%s\""
-
 #~ msgid "Synchronize \"%s\""
 #~ msgstr "Synkroniser \"%s\""
 
@@ -15107,9 +15629,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "appointment"
 #~ msgstr "avtaler"
 
-#~ msgid "task"
-#~ msgstr "oppgave"
-
 #~ msgid "journal entry"
 #~ msgstr "journaloppføring"
 
@@ -15279,9 +15798,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Could not execute %s: %s\n"
 #~ msgstr "Kunne ikke kjøre %s: %s\n"
 
-#~ msgid "Cannot fork %s: %s"
-#~ msgstr "Kan ikke kjøre fork på %s: %s"
-
 #~ msgid "Cannot initialize Evolution's mail storage hash."
 #~ msgstr "Kan ikke initiere Evolutions e-postlagrings-hash."
 
@@ -15301,9 +15817,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ "Innkommende\n"
 #~ "Utgående"
 
-#~ msgid "window2"
-#~ msgstr "vindu2"
-
 #~ msgid ""
 #~ "This appointment has custom recurrence rules that cannot be edited by "
 #~ "Evolution.\n"
@@ -15379,9 +15892,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Preferences"
 #~ msgstr "Brukervalg"
 
-#~ msgid "Alarm Properties"
-#~ msgstr "Egenskaper for alarmer"
-
 #~ msgid "Beep on display alarms"
 #~ msgstr "Pip ved visning av alarmer"