Updated Norwegian (bokmål) translation. Updated with a bunch of missing

2001-03-13  Kjartan Maraas  <kmaraas@gnome.org>

	* no.po: Updated Norwegian (bokmål) translation.
	* POTFILES.in: Updated with a bunch of missing files.

svn path=/trunk/; revision=8653

3 files changed, 1066 insertions, 1041 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index c837fda12b..ffa870e4d0 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-13  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* no.po: Updated Norwegian (bokmål) translation.
+	* POTFILES.in: Updated with a bunch of missing files.
+	
 2001-03-12  Jarkko Ranta  <jjranta@cc.joensuu.fi>
 
 	* fi.po: Updated Finnish translation.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index dcea8e3a72..8b57dd7a25 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -5,12 +5,11 @@ addressbook/backend/ebook/load-gnomecard-addressbook.c
 addressbook/backend/ebook/load-pine-addressbook.c
 addressbook/backend/ebook/test-client-list.c
 addressbook/backend/ebook/test-client.c
-addressbook/conduit/address-conduit-control-applet.c
 addressbook/conduit/address-conduit.c
-addressbook/conduit/e-address-conduit-control-applet.desktop.in
 addressbook/contact-editor/contact-editor.glade
 addressbook/contact-editor/e-contact-editor-confirm-delete.glade
 addressbook/contact-editor/e-contact-editor.c
+addressbook/contact-editor/e-contact-quick-add.c
 addressbook/contact-editor/fulladdr.glade
 addressbook/contact-editor/fullname.glade
 addressbook/gui/component/addressbook-factory.c
@@ -18,8 +17,10 @@ addressbook/gui/component/addressbook.c
 addressbook/gui/component/addressbook-storage.c
 addressbook/gui/component/addressbook-config.c
 addressbook/gui/component/addressbook-config.glade
+addressbook/gui/component/e-address-widget.c
 addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in
 addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in
+addressbook/gui/component/select-names/e-select-names-popup.c
 addressbook/gui/component/select-names/select-names.glade
 addressbook/gui/search/e-addressbook-search-dialog.c
 addressbook/gui/widgets/alphabet.glade
@@ -30,11 +31,7 @@ addressbook/gui/widgets/e-minicard.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-control-applet.c
 calendar/conduits/calendar/calendar-conduit.c
-calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in
-calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in
-calendar/conduits/todo/todo-conduit-control-applet.c
 calendar/conduits/todo/todo-conduit.c
 #calendar/gui/alarm-notify.c
 calendar/gui/calendar-commands.c
@@ -87,6 +84,7 @@ camel/camel-sasl-plain.c
 camel/camel-search-private.c
 camel/camel-service.c
 camel/camel-session.c
+camel/camel-store.c
 camel/camel-url.c
 camel/camel-vee-folder.c
 camel/providers/imap/camel-imap-command.c
@@ -121,6 +119,7 @@ composer/e-msg-composer-hdrs.c
 composer/e-msg-composer.c
 composer/evolution-composer.c
 data/evolution.keys.in
+default_user/searches.xml
 e-util/e-time-utils.c
 executive-summary/GNOME_Evolution_Summary.oaf.in
 executive-summary/component/component-factory.c
@@ -173,6 +172,7 @@ mail/mail-vfolder.c
 mail/mail-view.c
 mail/message-list.c
 mail/openpgp-utils.c
+mail/session.c
 mail/subscribe-dialog.c
 shell/glade/e-shell-folder-creation-dialog.glade
 shell/importer/importer.c
@@ -203,6 +203,7 @@ ui/evolution-tasks.xml
 ui/evolution.xml
 widgets/meeting-time-sel/e-meeting-time-sel-item.c
 widgets/meeting-time-sel/e-meeting-time-sel.c
+widgets/menus/gal-view-menus.c
 widgets/misc/e-calendar-item.c
 widgets/misc/e-calendar.c
 widgets/misc/e-cell-date-edit.c
diff --git a/po/no.po b/po/no.po
index 4ee4adf4d5..d9e391cbaf 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.8\n"
-"POT-Creation-Date: 2001-03-05 22:49+0100\n"
-"PO-Revision-Date: 2001-03-05 22:50+01:00\n"
+"POT-Creation-Date: 2001-03-13 00:10-0500\n"
+"PO-Revision-Date: 2001-03-13 00:18-05:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -312,132 +312,13 @@ msgstr "Importerer GnomeCard-filer til Evolution."
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
 #: addressbook/conduit/address-conduit.c:1089
-#: addressbook/gui/component/addressbook-factory.c:38
+#: addressbook/gui/component/addressbook-factory.c:39
 #: calendar/conduits/calendar/calendar-conduit.c:1151
 #: calendar/conduits/todo/todo-conduit.c:965
 #: calendar/gui/alarm-notify/notify-main.c:68 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initialisere Bonobo"
 
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr "Slått av"
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Synkronisér"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "Kopiér fra Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "Kopiér til Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr "Flett fra Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr "Flett til Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr "JP Rosevar <jpr@helixcode.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr "Opprinnelig forfatter:"
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr "Evolution adressebok-komponent"
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "© 1998-2000 the Free Software Foundation og Helix Code"
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr "Konfigurasjonsverktøy for evolutions adressebok-komponent.\n"
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "Synkroniseringshandling"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr "Komponent-tilstand"
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-"Ingen pilot er konfigurert, vennligst\n"
-"velg cappleten 'Egenskaper for pilot link' først."
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "Ikke tilkoblet gnome-pilot daemon"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-"En feil oppsto under forsøk på å hente\n"
-"pilot-listen fra gnome-pilot daemonen"
-
 #: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
 msgstr "Markøren kunne ikke lokaliseres\n"
@@ -463,19 +344,11 @@ msgstr "Kunne ikke starte wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "Kunne ikke lese pilotens adresseapplikasjonsblokk"
 
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:1
-msgid "Configure the address conduit"
-msgstr "Konfigurér oppgavelisten"
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Address conduit "
-msgstr "Oppgaver"
-
 #: addressbook/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/component/addressbook-config.glade.h:1
 #: calendar/gui/e-meeting-dialog.glade.h:1
 #: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "Add"
 msgstr "Legg til"
 
@@ -516,7 +389,7 @@ msgstr "Lagre som:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:10
 #: executive-summary/component/executive-summary-config.glade.h:3
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "General"
 msgstr "Generelt"
 
@@ -546,6 +419,7 @@ msgid "Web page address:"
 msgstr "Hjemmeside-adresse:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:17
+#: mail/mail-config.glade.h:80
 msgid "_Add"
 msgstr "_Legg til"
 
@@ -570,8 +444,8 @@ msgid "_Company:"
 msgstr "_Firma:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:23
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:49
-#: ui/evolution-task-editor-dialog.xml.h:69
+#: mail/mail-config.glade.h:81 ui/evolution-event-editor.xml.h:57
+#: ui/evolution-mail.xml.h:61 ui/evolution-task-editor-dialog.xml.h:69
 msgid "_Delete"
 msgstr "_Slett"
 
@@ -690,7 +564,7 @@ msgstr "Mobil"
 #: addressbook/contact-editor/e-contact-editor.c:1205
 #: addressbook/contact-editor/e-contact-editor.c:1263
 #: addressbook/gui/widgets/e-addressbook-view.c:591
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:48
+#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:46
 msgid "Other"
 msgstr "Annet"
 
@@ -730,6 +604,22 @@ msgstr "E-post 2"
 msgid "Email 3"
 msgstr "E-post 3"
 
+#: addressbook/contact-editor/e-contact-quick-add.c:214
+msgid "Contact Quick-Add"
+msgstr "Hurtigkontakt"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:216
+msgid "Edit Full"
+msgstr "Rediger alt"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:253
+msgid "Full Name"
+msgstr "Fullt navn"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:259
+msgid "E-mail"
+msgstr "E-post"
+
 #: addressbook/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adresse _2:"
@@ -928,7 +818,7 @@ msgstr "Ingen (anonym modus)"
 #: addressbook/gui/component/addressbook-config.c:160
 #: camel/providers/imap/camel-imap-store.c:260
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:140
+#: camel/providers/pop3/camel-pop3-store.c:145
 msgid "Password"
 msgstr "Passord"
 
@@ -969,7 +859,7 @@ msgid "Remember this password"
 msgstr "Husk dette passordet"
 
 #: addressbook/gui/component/addressbook-config.c:401
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Host:"
 msgstr "Vert:"
 
@@ -998,12 +888,12 @@ msgid "Search Scope:"
 msgstr "Søkeområde:"
 
 #: addressbook/gui/component/addressbook-config.c:484
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "Authentication:"
 msgstr "Autentisering:"
 
 #: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config-druid.c:498 mail/mail-config.glade.h:52
+#: mail/mail-config-druid.c:517 mail/mail-config.glade.h:49
 msgid "Path:"
 msgstr "Sti:"
 
@@ -1030,7 +920,7 @@ msgid ""
 msgstr "Velg type adressebok du har, og skriv inn relevant informasjon om den."
 
 #: addressbook/gui/component/addressbook-config.c:666
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:41
 msgid "Name:"
 msgstr "Navn:"
 
@@ -1055,16 +945,16 @@ msgstr "Adressebok-kilder"
 #: addressbook/gui/component/addressbook-config.glade.h:3
 #: calendar/gui/e-meeting-dialog.glade.h:8
 #: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:19 mail/folder-browser.c:536
-#: mail/mail-config.glade.h:21 mail/mail-view.c:150
+#: filter/libfilter-i18n.h:11 mail/folder-browser.c:570
+#: mail/mail-config.glade.h:20 mail/mail-view.c:150
 #: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:6 ui/evolution-task-editor-dialog.xml.h:18
+#: ui/evolution-mail.xml.h:7 ui/evolution-task-editor-dialog.xml.h:18
 msgid "Delete"
 msgstr "Slett"
 
 #: addressbook/gui/component/addressbook-config.glade.h:4
 #: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/folder-browser.c:522 mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:22
 msgid "Edit"
 msgstr "Redigér"
 
@@ -1077,31 +967,44 @@ msgstr "Navn"
 msgid "URI"
 msgstr "URI"
 
+#: addressbook/gui/component/e-address-widget.c:259
+#: addressbook/gui/component/select-names/e-select-names-popup.c:259
+msgid "Add to Contacts"
+msgstr "Legg til i kontakter"
+
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for displaying an address."
+msgstr "En Bonobo-kontroll for visning av en adresse."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
 msgid "A sample Bonobo control which displays an addressbook."
 msgstr "Eksempel på Bonobo-kontroll som viser en adressebok."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "Kontroll som viser et minikort for Evolutions adressebok."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Evolution adressebok minikort visning"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Evolution component for handling contacts."
 msgstr "Evolution komponent for håndtering av kontakter."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Factory for minikort kontroll for adressebok"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook's address displayer"
+msgstr "Factory for adressebokens adressevisning"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Factory for the Evolution addressbook component."
 msgstr "Factory for Evolution adressebok-komponent."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the sample Addressbook control"
 msgstr "Factory for eksempelkontroll for adressebok"
 
@@ -1113,6 +1016,20 @@ msgstr "Evolution adressebok-komponent"
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Factory for adressebokens grensesnitt for navnevalg"
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:121
+#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
+#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
+msgid "Remove"
+msgstr "Fjern"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:136
+msgid "Remove All"
+msgstr "Fjern alle"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:200
+msgid "Edit Contact Info"
+msgstr "Rediger kontaktinfo"
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Find..."
 msgstr "Finn..."
@@ -1481,7 +1398,7 @@ msgstr "Stilnavn:"
 msgid "Top:"
 msgstr "Topp:"
 
-#: addressbook/printing/e-contact-print.glade.h:40 mail/mail-config.glade.h:75
+#: addressbook/printing/e-contact-print.glade.h:40
 msgid "Type:"
 msgstr "Type:"
 
@@ -1489,14 +1406,6 @@ msgstr "Type:"
 msgid "Width:"
 msgstr "Bredde:"
 
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
-msgstr "Evolution kalender-komponent"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr "Konfigurasjonsverktøy for evolutions kalender-komponent.\n"
-
 #: calendar/conduits/calendar/calendar-conduit.c:687
 #: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
@@ -1507,30 +1416,6 @@ msgstr "Feil under kommunikasjon med kalendertjeneren"
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikke lese pilotens kalender-applikasjonsblokk"
 
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:1
-msgid "Configure the GnomeCal conduit"
-msgstr "Konfigurér GnomeCal-komponent"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Calendar conduit"
-msgstr "Evolution kalender-komponent"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:1
-msgid "Configure the todo conduit"
-msgstr "Konfigurér oppgavelistekomponenten"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:2
-msgid "Evolution ToDo conduit "
-msgstr "Oppgaver"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr "Evolution oppgaveliste-komponent"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr "Konfigurasjonsverktøy for evolutions oppgavelistekomponent.\n"
-
 #: calendar/conduits/todo/todo-conduit.c:600
 #: calendar/conduits/todo/todo-conduit.c:603
 msgid "Could not read pilot's ToDo application block"
@@ -1676,10 +1561,10 @@ msgstr ""
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:899 calendar/gui/calendar-model.c:1123
 #: calendar/gui/calendar-model.c:1177 calendar/gui/e-calendar-table.c:328
-#: calendar/gui/e-calendar-table.c:403 mail/mail-account-editor.c:707
-#: mail/mail-account-editor.c:709 mail/mail-account-editor.c:798
-#: mail/mail-accounts.c:115 mail/mail-config-druid.c:923
-#: mail/mail-config.glade.h:45 shell/e-shell-view.c:1119
+#: calendar/gui/e-calendar-table.c:403 mail/mail-account-editor.c:756
+#: mail/mail-account-editor.c:758 mail/mail-account-editor.c:853
+#: mail/mail-accounts.c:115 mail/mail-config-druid.c:1090
+#: mail/mail-config.glade.h:43 shell/e-shell-view.c:1119
 #: widgets/misc/e-cell-date-edit.c:231 widgets/misc/e-dateedit.c:421
 #: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
 msgid "None"
@@ -1869,7 +1754,7 @@ msgid "Beep when alarm windows appear."
 msgstr "Pip når alarmvinduet kommer til syne."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:4
+#: ui/evolution-calendar.xml.h:3
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -1965,8 +1850,7 @@ msgid "Pick a color"
 msgstr "Velg en farge"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:164 filter/libfilter-i18n.h:38
-#: filter/libfilter-i18n.h:113
+#: calendar/gui/e-calendar-table.c:164
 msgid "Priority"
 msgstr "Prioritet"
 
@@ -2069,7 +1953,7 @@ msgid "minutes before they occur."
 msgstr "minutter i forveien."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "seconds."
 msgstr "sekunder"
 
@@ -2368,7 +2252,7 @@ msgid "New Appointment..."
 msgstr "Ny avtale..."
 
 #: calendar/gui/e-day-view.c:3026 calendar/gui/e-week-view.c:3234
-#: mail/folder-browser.c:521 ui/evolution-calendar.xml.h:17
+#: mail/folder-browser.c:541 ui/evolution-calendar.xml.h:15
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Åpne"
@@ -2488,8 +2372,7 @@ msgstr "Laster kalender..."
 msgid "Organizer:"
 msgstr "Organisator:"
 
-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:48
-#: filter/libfilter-i18n.h:119
+#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:38
 msgid "Sender"
 msgstr "Avsender"
 
@@ -2583,8 +2466,8 @@ msgstr ""
 "Sett av\n"
 "tid"
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:58
-#: filter/libfilter-i18n.h:134 mail/message-list.c:1171
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:44
+#: mail/message-list.c:1171
 msgid "Status"
 msgstr "Status"
 
@@ -2681,7 +2564,7 @@ msgstr "Kjør et program"
 msgid "Send an email"
 msgstr "Send en melding"
 
-#: calendar/gui/event-editor-dialog.glade.h:24
+#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:25
 msgid "Settings..."
 msgstr "Innstillinger..."
 
@@ -2706,14 +2589,12 @@ msgstr "_Start-tid:"
 msgid "_Starting date:"
 msgstr "_Start dato:"
 
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:5
-#: filter/libfilter-i18n.h:10 filter/libfilter-i18n.h:63
-#: filter/libfilter-i18n.h:139
+#. Automatically generated. Do not edit.
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
 msgid "after"
 msgstr "etter"
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:64
-#: filter/libfilter-i18n.h:140
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
 msgid "before"
 msgstr "før"
 
@@ -3142,7 +3023,9 @@ msgstr "Dette året (%Y)"
 msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
-#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1237
+#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1287
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:20
+#: ui/evolution-mail.xml.h:32
 msgid "Print Preview"
 msgstr "Forhåndsvisning av utskrift"
 
@@ -3349,16 +3232,16 @@ msgid "(unknown host)"
 msgstr "(ukjent vert)"
 
 #: camel/camel-remote-store.c:408 camel/camel-remote-store.c:470
-#: camel/camel-remote-store.c:538
+#: camel/camel-remote-store.c:539
 #: camel/providers/imap/camel-imap-command.c:289
 msgid "Operation cancelled"
 msgstr "Opreasjon avbrutt"
 
-#: camel/camel-remote-store.c:543
+#: camel/camel-remote-store.c:544
 msgid "Server unexpectedly disconnected"
 msgstr "Tjener koblet fra uventet."
 
-#: camel/camel-sasl-anonymous.c:97 camel/camel-sasl-plain.c:73
+#: camel/camel-sasl-anonymous.c:97 camel/camel-sasl-plain.c:84
 msgid "Authentication failed."
 msgstr "Autentisering feilet."
 
@@ -3389,7 +3272,7 @@ msgstr ""
 "Ugyldig sporingsinformasjon:\n"
 "%s"
 
-#: camel/camel-sasl-cram-md5.c:32 mail/mail-config.glade.h:11
+#: camel/camel-sasl-cram-md5.c:32 mail/mail-config.glade.h:10
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
@@ -3401,7 +3284,7 @@ msgstr ""
 "Dette alternativet kobler til tjeneren med bruk av CRAM-MD5-passord, hvis "
 "tjeneren støtter det."
 
-#: camel/camel-sasl-digest-md5.c:37 mail/mail-config.glade.h:19
+#: camel/camel-sasl-digest-md5.c:37 mail/mail-config.glade.h:18
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
@@ -3413,28 +3296,28 @@ msgstr ""
 "Dette alternativet kobler til tjeneren med bruk av DIGEST-MD5-passord, hvis "
 "tjeneren støtter det."
 
-#: camel/camel-sasl-digest-md5.c:757
+#: camel/camel-sasl-digest-md5.c:761
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr "Spørring fra tjener for lang (>2048 oktetter)\n"
 
-#: camel/camel-sasl-digest-md5.c:766
+#: camel/camel-sasl-digest-md5.c:770
 msgid "Server challenge invalid\n"
 msgstr "Ugyldig spørring fra tjener\n"
 
-#: camel/camel-sasl-digest-md5.c:772
+#: camel/camel-sasl-digest-md5.c:776
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr ""
 "Spørring fra tjener inneholdt ugyldig tegn for \"Kvalitet for beskyttelse\"\n"
 
-#: camel/camel-sasl-digest-md5.c:794
+#: camel/camel-sasl-digest-md5.c:798
 msgid "Server response did not contain authorization data\n"
 msgstr "Svar fra tjener inneholdt ikke autorisasjonsdata\n"
 
-#: camel/camel-sasl-digest-md5.c:812
+#: camel/camel-sasl-digest-md5.c:816
 msgid "Server response contained incomplete authorization data\n"
 msgstr "Svar fra tjener inneholdt ukomplette autorisasjonsdata\n"
 
-#: camel/camel-sasl-digest-md5.c:822
+#: camel/camel-sasl-digest-md5.c:826
 msgid "Server response does not match\n"
 msgstr "Svar fra tjener er ikke likt\n"
 
@@ -3461,6 +3344,18 @@ msgstr ""
 msgid "Bad authentication response from server."
 msgstr "Ugyldig svar på autentisering fra tjener."
 
+#: camel/camel-sasl-plain.c:29
+msgid "PLAIN"
+msgstr "PLAIN"
+
+#: camel/camel-sasl-plain.c:31
+msgid ""
+"This option will connect to the server using a the PLAIN SASL mechanism if "
+"the server supports it."
+msgstr ""
+"Dette alternativet kobler til tjeneren med bruk av PLAIN SASL-mekanismen "
+"hvis tjeneren støtter det."
+
 #: camel/camel-search-private.c:105
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
@@ -3513,6 +3408,12 @@ msgstr ""
 "Kan ikke opprette katalog %s:\n"
 "%s"
 
+#. Fill in the new fields
+#: camel/camel-store.c:382 mail/mail-ops.c:942 mail/mail-ops.c:949
+#: mail/mail-ops.c:967 mail/mail-ops.c:968
+msgid "Trash"
+msgstr "Søppel"
+
 #: camel/camel-url.c:77
 #, c-format
 msgid "URL string `%s' contains no protocol"
@@ -3589,12 +3490,28 @@ msgstr ""
 "Dette valget vil la deg koble til en IMAP-tjener ved å bruke et "
 "klartekst-passord."
 
-#: camel/providers/imap/camel-imap-store.c:448
+#: camel/providers/imap/camel-imap-store.c:407
+#, c-format
+msgid "IMAP server %s does not support requested authentication type %s"
+msgstr "IMAP-tjener %s støtter ikke etterspurt autentiseringstype %s"
+
+#: camel/providers/imap/camel-imap-store.c:418
+#, c-format
+msgid "No support for authentication type %s"
+msgstr "Ingen støtte for autentiseringstype %s"
+
+#: camel/providers/imap/camel-imap-store.c:446
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sVennligst skriv inn IMAP-passord for %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:484
+#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:345
+msgid "You didn't enter a password."
+msgstr "Du skrev ikke inn et passord."
+
+#: camel/providers/imap/camel-imap-store.c:482
+#: camel/providers/smtp/camel-smtp-transport.c:353
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3605,7 +3522,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:758
+#: camel/providers/imap/camel-imap-store.c:756
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kan ikke opprette katalog %s: %s"
@@ -3840,7 +3757,7 @@ msgid "Cannot summarise folder: %s: %s"
 msgstr "Kan ikke lage sammendrag for mappe: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1311
+#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1328
 msgid "Synchronising folder"
 msgstr "Synkroniserer mappe"
 
@@ -4011,7 +3928,7 @@ msgstr ""
 "e-post fra enkelte e-posttilbydere via web i tillegg til proprietære "
 "e-postsystemer."
 
-#: camel/providers/pop3/camel-pop3-store.c:142
+#: camel/providers/pop3/camel-pop3-store.c:147
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -4020,7 +3937,7 @@ msgstr ""
 "klartekst. Dette er det eneste alternativet som er støttet av mange "
 "POP-tjenere."
 
-#: camel/providers/pop3/camel-pop3-store.c:152
+#: camel/providers/pop3/camel-pop3-store.c:157
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -4030,29 +3947,29 @@ msgstr ""
 "passord via APOP-protokollen. Dette vil kanskje ikke virke for alle brukere "
 "selv på tjenere som hevder å støtte det."
 
-#: camel/providers/pop3/camel-pop3-store.c:164
+#: camel/providers/pop3/camel-pop3-store.c:169
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Dette lar deg koble til POP-tjeneren ved å bruke Kerberos 4 som "
 "autentisering."
 
-#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Kunne ikke autentisere mot KPOP-tjener: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:326
+#: camel/providers/pop3/camel-pop3-store.c:331
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Kunne ikke koble til POP-tjener på %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:373
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sVennligst skriv inn POP3-passord for %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:397
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4061,12 +3978,12 @@ msgstr ""
 "Kunne ikke koble til POP-tjener.\n"
 "Feil under oversending av brukernavn: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:395
-#: camel/providers/pop3/camel-pop3-store.c:432
+#: camel/providers/pop3/camel-pop3-store.c:400
+#: camel/providers/pop3/camel-pop3-store.c:437
 msgid "(Unknown)"
 msgstr "(Ukjent)"
 
-#: camel/providers/pop3/camel-pop3-store.c:422
+#: camel/providers/pop3/camel-pop3-store.c:427
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -4074,7 +3991,7 @@ msgstr ""
 "Kunne ikke koble til POP-tjeneren.\n"
 "Ingen støtte for forespurt autentiseringsmekanisme."
 
-#: camel/providers/pop3/camel-pop3-store.c:430
+#: camel/providers/pop3/camel-pop3-store.c:435
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4083,13 +4000,13 @@ msgstr ""
 "Kunne ikke koble til POP-tjener.\n"
 "Feil ved oversending av passord: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:530
+#: camel/providers/pop3/camel-pop3-store.c:535
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ingen slik mappe `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:61
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4143,7 +4060,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:34 mail/mail-config.glade.h:58
+#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:55
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -4256,11 +4173,16 @@ msgstr "Autentisering kreves"
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Feil ved Welcome-svar: %s: mulig ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:386
+#: camel/providers/smtp/camel-smtp-transport.c:330
+#, c-format
+msgid "%sPlease enter the SMTP password for %s@%s"
+msgstr "%sVennligst skriv inn SMTP-passord for %s@%s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:438
 msgid "No authentication required"
 msgstr "Ingen autentisering nødvendig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:388
+#: camel/providers/smtp/camel-smtp-transport.c:440
 msgid ""
 "This option will connect to the SMTP server without using any kind of "
 "authentication. This should be fine for connecting to most SMTP servers."
@@ -4268,106 +4190,106 @@ msgstr ""
 "Dette alternativet lar deg koble til SMTP-tjeneren uten bruk av "
 "autentisering. Dette bør fungere for de fleste SMTP-tjenerene."
 
-#: camel/providers/smtp/camel-smtp-transport.c:431
+#: camel/providers/smtp/camel-smtp-transport.c:483
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-tjener %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:433
+#: camel/providers/smtp/camel-smtp-transport.c:485
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP e-postlevering via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:458
+#: camel/providers/smtp/camel-smtp-transport.c:510
 msgid "Cannot send message: sender address not defined."
 msgstr "Kan ikke sende melding: senderadresse ikke definert."
 
-#: camel/providers/smtp/camel-smtp-transport.c:465
+#: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan ikke sende melding: senderadresse ikke gyldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:479
+#: camel/providers/smtp/camel-smtp-transport.c:531
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan ikke sende melding: ingen mottakere definert."
 
-#: camel/providers/smtp/camel-smtp-transport.c:573
+#: camel/providers/smtp/camel-smtp-transport.c:625
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Tidsavbrudd for HELO-forespørsel: %s: ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:592
+#: camel/providers/smtp/camel-smtp-transport.c:644
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Feil ved HELO-svar: %s: ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:627
-#: camel/providers/smtp/camel-smtp-transport.c:639
+#: camel/providers/smtp/camel-smtp-transport.c:679
+#: camel/providers/smtp/camel-smtp-transport.c:691
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Tidsavbrudd for AUTH-forespørsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:697
+#: camel/providers/smtp/camel-smtp-transport.c:749
 msgid "Bad authentication response from server.\n"
 msgstr "Ugyldig svar på autentisering fra tjener.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:774
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Tidsavbrudd for \"MAIL FROM\"-forespørsel: %s: melding ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:741
+#: camel/providers/smtp/camel-smtp-transport.c:793
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "Feil ved \"MAIL FROM\"-forespørsel: %s: melding ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:766
+#: camel/providers/smtp/camel-smtp-transport.c:818
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Tidsavbrudd for \"RCPT TO\"-forespørsel: %s: melding ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:785
+#: camel/providers/smtp/camel-smtp-transport.c:837
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Feil ved \"RCPT TO\"-svar: %s: melding ikke sendt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:816
+#: camel/providers/smtp/camel-smtp-transport.c:868
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Tidsavbrudd for DATA-forespørsel: %s: melding ikke sendt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:835
+#: camel/providers/smtp/camel-smtp-transport.c:887
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Feil ved DATA-svar: %s: melding ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:850
-#: camel/providers/smtp/camel-smtp-transport.c:868
+#: camel/providers/smtp/camel-smtp-transport.c:902
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Tidsavbrudd for DATA-send: meldingsterminering: %s: melding ikke sendt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:887
+#: camel/providers/smtp/camel-smtp-transport.c:939
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "Feil ved DATA-svar: meldingsterminering: %s: melding ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:911
+#: camel/providers/smtp/camel-smtp-transport.c:963
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Tidsavbrudd for RSET-forespørsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:930
+#: camel/providers/smtp/camel-smtp-transport.c:982
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Feil ved RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:953
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Tidsavbrudd for QUIT-forespørsel: %s: ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Feil ved QUIT-svar: %s: ikke-fatal"
@@ -4406,11 +4328,6 @@ msgstr "vedlegg"
 msgid "Attach a file"
 msgstr "Legg ved en fil"
 
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "Fjern"
-
 #: composer/e-msg-composer-attachment-bar.c:461
 msgid "Remove selected items from the attachment list"
 msgstr "Fjern valgte oppføringer fra vedleggslisten"
@@ -4424,6 +4341,7 @@ msgid "Attach a file to the message"
 msgstr "Legg en fil ved meldingen"
 
 #: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1171
+#: ui/evolution-mail.xml.h:1
 msgid "Attachment"
 msgstr "Vedlegg"
 
@@ -4447,40 +4365,45 @@ msgstr "MIME-type:"
 msgid "Send as:"
 msgstr "Send som:"
 
-#: composer/e-msg-composer-hdrs.c:176 composer/e-msg-composer-hdrs.c:386
-#: mail/mail-format.c:627
-msgid "From:"
-msgstr "Fra:"
-
-#: composer/e-msg-composer-hdrs.c:330
+#: composer/e-msg-composer-hdrs.c:314
 msgid "Click here for the address book"
 msgstr "Klikk her for å få opp adresseboken"
 
-#: composer/e-msg-composer-hdrs.c:387
-msgid "Enter the identity you wish to send this message from"
-msgstr "Skriv inn identiteten du ønsker å bruke ved sending av denne meldingen"
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:679
+msgid "From:"
+msgstr "Fra:"
+
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:601
+msgid "Subject:"
+msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:391 mail/mail-format.c:631
+#: composer/e-msg-composer-hdrs.c:365 mail/mail-format.c:683
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:366
 msgid "Enter the recipients of the message"
 msgstr "Skriv inn mottakerene for meldingen"
 
-#: composer/e-msg-composer-hdrs.c:396 mail/mail-format.c:633
+#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:685
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:397
+#: composer/e-msg-composer-hdrs.c:370
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Skriv inn adressene som skal motta en kopi av meldingen"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:373
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:374
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4488,15 +4411,7 @@ msgstr ""
 "Skriv inn adressene som skal motta en kopi av meldingen uten å komme til "
 "syne i mottakerlisten for meldingen."
 
-#: composer/e-msg-composer-hdrs.c:409 mail/mail-format.c:635
-msgid "Subject:"
-msgstr "Emne:"
-
-#: composer/e-msg-composer-hdrs.c:410
-msgid "Enter the subject of the mail"
-msgstr "Skriv inn emnet for meldingen"
-
-#: composer/e-msg-composer.c:512
+#: composer/e-msg-composer.c:518
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -4505,26 +4420,26 @@ msgstr ""
 "Kunne ikke åpne signaturfilen %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:680
+#: composer/e-msg-composer.c:706
 msgid "Save as..."
 msgstr "Lagre som..."
 
-#: composer/e-msg-composer.c:691
+#: composer/e-msg-composer.c:717
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Feil under lagring av fil: %s"
 
-#: composer/e-msg-composer.c:711
+#: composer/e-msg-composer.c:737
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Feil under lasting av fil: %s"
 
-#: composer/e-msg-composer.c:791 evolution.desktop.in.h:1
+#: composer/e-msg-composer.c:817 evolution.desktop.in.h:1
 #: shell/e-shell-view-menu.c:192
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:797
+#: composer/e-msg-composer.c:823
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4534,27 +4449,27 @@ msgstr ""
 "\n"
 "Vil du lagre endringene?"
 
-#: composer/e-msg-composer.c:822
+#: composer/e-msg-composer.c:848
 msgid "Open file"
 msgstr "Åpne fil"
 
-#: composer/e-msg-composer.c:948
+#: composer/e-msg-composer.c:974
 msgid "That file does not exist."
 msgstr "Filen eksisterer ikke."
 
-#: composer/e-msg-composer.c:958
+#: composer/e-msg-composer.c:984
 msgid "That is not a regular file."
 msgstr "Er ikke en vanlig fil."
 
-#: composer/e-msg-composer.c:968
+#: composer/e-msg-composer.c:994
 msgid "That file exists but is not readable."
 msgstr "Filen eksisterer men er ikke lesbar."
 
-#: composer/e-msg-composer.c:978
+#: composer/e-msg-composer.c:1004
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Filen ser ut til å være tilgjengelig men open(2) feilet."
 
-#: composer/e-msg-composer.c:1000
+#: composer/e-msg-composer.c:1026
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4562,15 +4477,15 @@ msgstr ""
 "File en meget stor (mer enn 100K).\n"
 "Er du sikker på at du vil sette den inn?"
 
-#: composer/e-msg-composer.c:1021
+#: composer/e-msg-composer.c:1047
 msgid "An error occurred while reading the file."
 msgstr "En feil oppsto under lesing fra filen."
 
-#: composer/e-msg-composer.c:1264 composer/e-msg-composer.c:1499
+#: composer/e-msg-composer.c:1327 composer/e-msg-composer.c:1655
 msgid "Compose a message"
 msgstr "Skriv en melding"
 
-#: composer/e-msg-composer.c:1580
+#: composer/e-msg-composer.c:1739
 msgid "Could not create composer window."
 msgstr "Kan ikke opprette komponeringsvinduet."
 
@@ -4920,8 +4835,8 @@ msgstr "nå"
 msgid "<click here to select a date>"
 msgstr "<klikk her for å velge en dato>"
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:332
-#: mail/mail-autofilter.c:354
+#: filter/filter-editor.c:160 mail/mail-autofilter.c:336
+#: mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr "Legg til filterregel"
 
@@ -5015,8 +4930,8 @@ msgstr "Fjern kriterie"
 msgid "Replied to"
 msgstr "Svart til"
 
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
+#. { N_("Deleted"), "Deleted" },
+#. { N_("Draft"), "Draft" },
 #: filter/filter-system-flag.c:70
 msgid "Important"
 msgstr "Viktig"
@@ -5065,204 +4980,172 @@ msgstr "med alle lokaleog aktive eksterne mapper"
 msgid "with all local folders"
 msgstr "med alle lokale mapper"
 
-#: filter/libfilter-i18n.h:7 mail/message-list.c:624
-msgid "Answered"
-msgstr "Besvart"
-
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "Gi farge"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Gi poeng"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:5
+msgid "Attachments"
+msgstr "Vedlegg"
+
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "inneholder"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopiér til mappe"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Dato mottatt"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Dato sendt"
 
-#: filter/libfilter-i18n.h:24
-msgid "Deleted"
-msgstr "Slettet"
+#: filter/libfilter-i18n.h:12
+msgid "does not contain"
+msgstr "inneholder ikke"
 
-#: filter/libfilter-i18n.h:25
-msgid "Draft"
-msgstr "Skisse"
+#: filter/libfilter-i18n.h:13
+msgid "does not end with"
+msgstr "slutter ikke med"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not exist"
+msgstr "eksisterer ikke"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not sound like"
+msgstr "ligner ikke"
+
+#: filter/libfilter-i18n.h:16
+msgid "does not start with"
+msgstr "starter ikke med"
+
+#: filter/libfilter-i18n.h:17
+msgid "Do Not Exist"
+msgstr "Eksisterer ikke"
+
+#: filter/libfilter-i18n.h:18
+msgid "ends with"
+msgstr "slutter med"
+
+#: filter/libfilter-i18n.h:19
+msgid "Exist"
+msgstr "Eksisterer"
 
-#: filter/libfilter-i18n.h:28 filter/libfilter-i18n.h:83
+#: filter/libfilter-i18n.h:20
+msgid "exists"
+msgstr "eksisterer"
+
+#: filter/libfilter-i18n.h:21
 msgid "Expression"
 msgstr "Uttrykk"
 
-#: filter/libfilter-i18n.h:29 mail/message-list.c:1171
-msgid "Flagged"
-msgstr "Merket"
-
-#: filter/libfilter-i18n.h:30 filter/libfilter-i18n.h:84
+#: filter/libfilter-i18n.h:22
 msgid "Forward to Address"
 msgstr "Videresend til adresse"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:23
+msgid "is"
+msgstr "er"
+
+#: filter/libfilter-i18n.h:24
+msgid "is greater than"
+msgstr "er større enn"
+
+#: filter/libfilter-i18n.h:25
+msgid "is less than"
+msgstr "er mindre enn"
+
+#: filter/libfilter-i18n.h:26
+msgid "is not"
+msgstr "er ikke"
+
+#: filter/libfilter-i18n.h:27
 msgid "Mailing list"
 msgstr "E-postliste"
 
-#: filter/libfilter-i18n.h:32 filter/libfilter-i18n.h:98
+#: filter/libfilter-i18n.h:28
 msgid "Message Body"
 msgstr "Meldingskropp"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:29
 msgid "Message Header"
 msgstr "Meldingshode"
 
-#: filter/libfilter-i18n.h:34 filter/libfilter-i18n.h:99
+#: filter/libfilter-i18n.h:30
 msgid "Message was received"
 msgstr "Meldingen ble mottatt"
 
-#: filter/libfilter-i18n.h:35 filter/libfilter-i18n.h:100
+#: filter/libfilter-i18n.h:31
 msgid "Message was sent"
 msgstr "Meldingen ble sendt"
 
-#: filter/libfilter-i18n.h:36 filter/libfilter-i18n.h:101
+#: filter/libfilter-i18n.h:32
 msgid "Move to Folder"
 msgstr "Flytt til mappe"
 
-#: filter/libfilter-i18n.h:41 filter/libfilter-i18n.h:114
+#: filter/libfilter-i18n.h:33
+msgid "on or after"
+msgstr "på eller etter"
+
+#: filter/libfilter-i18n.h:34
+msgid "on or before"
+msgstr "på eller før"
+
+#: filter/libfilter-i18n.h:35
 msgid "Recipients"
 msgstr "Mottakere"
 
-#: filter/libfilter-i18n.h:42 filter/libfilter-i18n.h:117
+#: filter/libfilter-i18n.h:36
 msgid "Regex Match"
 msgstr "Treff på vanlig uttrykk"
 
-#: filter/libfilter-i18n.h:44 mail/message-list.c:621
-msgid "Seen"
-msgstr "Lest"
-
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:192 filter/score-rule.c:194
+#: filter/libfilter-i18n.h:37 filter/score-rule.c:192 filter/score-rule.c:194
 #: mail/message-list.c:1171
 msgid "Score"
 msgstr "Poenggi"
 
-#: filter/libfilter-i18n.h:50
-msgid "Set Flag"
-msgstr "Sett flagg"
-
-#: filter/libfilter-i18n.h:52 filter/libfilter-i18n.h:122
+#: filter/libfilter-i18n.h:39
 msgid "Set Status"
 msgstr "Sett status"
 
-#: filter/libfilter-i18n.h:54 filter/libfilter-i18n.h:125
+#: filter/libfilter-i18n.h:40
+msgid "sounds like"
+msgstr "lyder som"
+
+#: filter/libfilter-i18n.h:41 mail/mail-config.glade.h:68
 msgid "Source"
 msgstr "Kilde"
 
-#: filter/libfilter-i18n.h:55 filter/libfilter-i18n.h:126
+#: filter/libfilter-i18n.h:42
 msgid "Specific header"
 msgstr "Spesifikk header"
 
-#: filter/libfilter-i18n.h:60 filter/libfilter-i18n.h:136
+#: filter/libfilter-i18n.h:43
+msgid "starts with"
+msgstr "starter med"
+
+#: filter/libfilter-i18n.h:45
 msgid "Stop Processing"
 msgstr "Stopp behandling"
 
-#: filter/libfilter-i18n.h:61 filter/libfilter-i18n.h:137
-#: mail/message-list.c:1172
+#: filter/libfilter-i18n.h:46 mail/message-list.c:1172
 msgid "Subject"
 msgstr "Emne"
 
-#: filter/libfilter-i18n.h:65 filter/libfilter-i18n.h:141
-msgid "contains"
-msgstr "inneholder"
-
-#: filter/libfilter-i18n.h:67 filter/libfilter-i18n.h:75
-#: filter/libfilter-i18n.h:142
-msgid "does not contain"
-msgstr "inneholder ikke"
-
-#: filter/libfilter-i18n.h:68 filter/libfilter-i18n.h:76
-#: filter/libfilter-i18n.h:143
-msgid "does not end with"
-msgstr "slutter ikke med"
-
-#: filter/libfilter-i18n.h:69 filter/libfilter-i18n.h:77
-#: filter/libfilter-i18n.h:144
-msgid "does not exist"
-msgstr "eksisterer ikke"
-
-#: filter/libfilter-i18n.h:70 filter/libfilter-i18n.h:78
-#: filter/libfilter-i18n.h:145
-msgid "does not sound like"
-msgstr "ligner ikke"
-
-#: filter/libfilter-i18n.h:71 filter/libfilter-i18n.h:79
-#: filter/libfilter-i18n.h:146
-msgid "does not start with"
-msgstr "starter ikke med"
-
-#: filter/libfilter-i18n.h:72 filter/libfilter-i18n.h:80
-#: filter/libfilter-i18n.h:147
-msgid "ends with"
-msgstr "slutter med"
-
-#: filter/libfilter-i18n.h:73 filter/libfilter-i18n.h:81
-#: filter/libfilter-i18n.h:148
-msgid "exists"
-msgstr "eksisterer"
-
-#: filter/libfilter-i18n.h:86 filter/libfilter-i18n.h:93
-#: filter/libfilter-i18n.h:104 filter/libfilter-i18n.h:152
-msgid "is"
-msgstr "er"
-
-#: filter/libfilter-i18n.h:87 filter/libfilter-i18n.h:94
-#: filter/libfilter-i18n.h:149
-msgid "is greater than"
-msgstr "er større enn"
-
-#: filter/libfilter-i18n.h:88 filter/libfilter-i18n.h:95
-#: filter/libfilter-i18n.h:150
-msgid "is less than"
-msgstr "er mindre enn"
-
-#: filter/libfilter-i18n.h:89 filter/libfilter-i18n.h:96
-#: filter/libfilter-i18n.h:151
-msgid "is not"
-msgstr "er ikke"
-
-#: filter/libfilter-i18n.h:91
-msgid "matches regex"
-msgstr "er lik regex"
-
-#: filter/libfilter-i18n.h:106 filter/libfilter-i18n.h:110
-#: filter/libfilter-i18n.h:153
-msgid "on or after"
-msgstr "på eller etter"
-
-#: filter/libfilter-i18n.h:107 filter/libfilter-i18n.h:111
-#: filter/libfilter-i18n.h:154
-msgid "on or before"
-msgstr "på eller før"
-
-#: filter/libfilter-i18n.h:123 filter/libfilter-i18n.h:129
-#: filter/libfilter-i18n.h:155
-msgid "sounds like"
-msgstr "lyder som"
-
-#: filter/libfilter-i18n.h:131 filter/libfilter-i18n.h:133
-#: filter/libfilter-i18n.h:156
-msgid "starts with"
-msgstr "starter med"
-
-#: filter/libfilter-i18n.h:158
+#: filter/libfilter-i18n.h:47
 msgid "was after"
 msgstr "var etter"
 
-#: filter/libfilter-i18n.h:159
+#: filter/libfilter-i18n.h:48
 msgid "was before"
 msgstr "var før"
 
@@ -5282,112 +5165,124 @@ msgstr "Legg til regel for VFolder"
 msgid "Edit VFolder Rule"
 msgstr "Redigér VFolder regel"
 
-#: mail/component-factory.c:302
+#: mail/component-factory.c:304
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikke initiere Evolutions e-postkomponent."
 
-#: mail/component-factory.c:375
+#: mail/component-factory.c:377
 msgid "Cannot register storage with shell"
 msgstr "Kan ikke registrere lagring i skallet"
 
+#: mail/folder-browser-factory.c:214
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "Egenskaper for \"%s\""
+
+#: mail/folder-browser-factory.c:216 ui/evolution-event-editor.xml.h:39
+#: ui/evolution-task-editor-dialog.xml.h:42
+msgid "Properties"
+msgstr "Egenskaper"
+
 #: mail/folder-browser.c:219
 msgid "Store search as vFolder"
 msgstr "Lagre søk som vMappe"
 
-#: mail/folder-browser.c:507
+#: mail/folder-browser.c:508
 msgid "VFolder on Subject"
 msgstr "VFolder for emne"
 
-#: mail/folder-browser.c:508
+#: mail/folder-browser.c:511
 msgid "VFolder on Sender"
 msgstr "VFolder for sender"
 
-#: mail/folder-browser.c:509
+#: mail/folder-browser.c:514
 msgid "VFolder on Recipients"
 msgstr "VFolder for mottakere"
 
-#: mail/folder-browser.c:510 mail/folder-browser.c:628
+#: mail/folder-browser.c:517 mail/folder-browser.c:701
 msgid "VFolder on Mailing List"
 msgstr "VFolder på e-postliste"
 
-#: mail/folder-browser.c:512
+#: mail/folder-browser.c:523
 msgid "Filter on Subject"
 msgstr "Filtrér etter emne"
 
-#: mail/folder-browser.c:513
+#: mail/folder-browser.c:526
 msgid "Filter on Sender"
 msgstr "Filtrér etter sender"
 
-#: mail/folder-browser.c:514
+#: mail/folder-browser.c:529
 msgid "Filter on Recipients"
 msgstr "Filtrér etter mottaker"
 
-#: mail/folder-browser.c:515 mail/folder-browser.c:627
+#: mail/folder-browser.c:532 mail/folder-browser.c:700
 msgid "Filter on Mailing List"
 msgstr "Filtrér etter e-postliste"
 
-#: mail/folder-browser.c:523
+#: mail/folder-browser.c:543
 msgid "Save As..."
 msgstr "Lagre som..."
 
-#: mail/folder-browser.c:524 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail.xml.h:26 ui/evolution-tasks.xml.h:4
+#: mail/folder-browser.c:545 mail/mail-view.c:148
+#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:19
+#: ui/evolution-mail.xml.h:31 ui/evolution-tasks.xml.h:4
 msgid "Print"
 msgstr "Skriv ut"
 
-#: mail/folder-browser.c:526
+#: mail/folder-browser.c:550
 msgid "Reply to Sender"
 msgstr "Svar til sender"
 
-#: mail/folder-browser.c:527 mail/mail-view.c:141 ui/evolution-mail.xml.h:32
+#: mail/folder-browser.c:552 mail/mail-view.c:141 ui/evolution-mail.xml.h:39
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: mail/folder-browser.c:528 mail/mail-view.c:144 ui/evolution-mail.xml.h:12
+#: mail/folder-browser.c:554 mail/mail-view.c:144 ui/evolution-mail.xml.h:15
 msgid "Forward"
 msgstr "Videresend"
 
-#: mail/folder-browser.c:529 ui/evolution-mail.xml.h:13
+#: mail/folder-browser.c:556
 msgid "Forward inline"
 msgstr "Videresend \"inline\""
 
-#: mail/folder-browser.c:531
+#: mail/folder-browser.c:559
 msgid "Mark as Read"
 msgstr "Markér som lest"
 
-#: mail/folder-browser.c:532
+#: mail/folder-browser.c:561
 msgid "Mark as Unread"
 msgstr "Merk som ulest"
 
-#: mail/folder-browser.c:534
+#: mail/folder-browser.c:566
 msgid "Move to Folder..."
 msgstr "Flytt til mappe..."
 
-#: mail/folder-browser.c:535
+#: mail/folder-browser.c:568
 msgid "Copy to Folder..."
 msgstr "Kopiér til mappe..."
 
-#: mail/folder-browser.c:537
+#: mail/folder-browser.c:572
 msgid "Undelete"
 msgstr "Angre slett"
 
-#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:541
+#. { _("Add Sender to Address Book"),  NULL,
+#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
+#. { "",                               NULL,
+#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
+#: mail/folder-browser.c:582
 msgid "Apply Filters"
 msgstr "Påfør filtre"
 
-#: mail/folder-browser.c:543
+#: mail/folder-browser.c:586
 msgid "Create Rule From Message"
 msgstr "Lage regel fra melding"
 
-#: mail/folder-browser.c:630
+#: mail/folder-browser.c:703
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrér etter e-postliste (%s)"
 
-#: mail/folder-browser.c:631
+#: mail/folder-browser.c:704
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VFolder på e-postliste (%s)"
@@ -5491,7 +5386,7 @@ msgstr "Er du sikker på at du vil slette denne diskusjonsgruppekontoen?"
 msgid "Evolution Account Manager"
 msgstr "Kontohåndtering for Evolution"
 
-#: mail/mail-account-editor.c:290
+#: mail/mail-account-editor.c:307
 msgid ""
 "One or more of your servers are not configured correctly.\n"
 "Do you wish to save anyway?"
@@ -5500,10 +5395,14 @@ msgstr ""
 "Vil du lagre likevel?"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:658
+#: mail/mail-account-editor.c:706
 msgid "Evolution Account Editor"
 msgstr "Kontoredigering for Evolution"
 
+#: mail/mail-account-editor.c:727
+msgid "Unspecified"
+msgstr "Uspesifisert"
+
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
@@ -5519,12 +5418,12 @@ msgstr "Emne er %s"
 msgid "Mail from %s"
 msgstr "E-post fra %s"
 
-#: mail/mail-autofilter.c:284
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "%s e-postliste"
 
-#: mail/mail-callbacks.c:83
+#: mail/mail-callbacks.c:85
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5536,7 +5435,7 @@ msgstr ""
 "motta eller skrive meldinger.\n"
 "Vil du konfigurere den nå?"
 
-#: mail/mail-callbacks.c:136
+#: mail/mail-callbacks.c:138
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5544,7 +5443,7 @@ msgstr ""
 "Du må konfigurere en identitet\n"
 "før du kan skrive e-post."
 
-#: mail/mail-callbacks.c:148
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -5552,11 +5451,11 @@ msgstr ""
 "Du må konfigurere en e-post-transport\n"
 "før du kan skrive e-post."
 
-#: mail/mail-callbacks.c:192
+#: mail/mail-callbacks.c:194
 msgid "You have not set a mail transport method"
 msgstr "Du har ikke satt en transportmetode for e-post"
 
-#: mail/mail-callbacks.c:225
+#: mail/mail-callbacks.c:227
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -5564,32 +5463,32 @@ msgstr ""
 "Denne meldingen har ikke emne.\n"
 "Send likevel?"
 
-#: mail/mail-callbacks.c:292
+#: mail/mail-callbacks.c:294
 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:314
+#: mail/mail-callbacks.c:316
 msgid "You must specify recipients in order to send this message."
 msgstr "Du må spesifisere mottakere for å kunne sende denne meldingen."
 
-#: mail/mail-callbacks.c:577
+#: mail/mail-callbacks.c:579
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "Den %s, skrev %s:\n"
 
-#: mail/mail-callbacks.c:735
+#: mail/mail-callbacks.c:761
 msgid "Forwarded message:\n"
 msgstr "Videresendt melding:\n"
 
-#: mail/mail-callbacks.c:820
+#: mail/mail-callbacks.c:864
 msgid "Move message(s) to"
 msgstr "Flytt melding(er) til"
 
-#: mail/mail-callbacks.c:822
+#: mail/mail-callbacks.c:866
 msgid "Copy message(s) to"
 msgstr "Kopiér melding(er) til"
 
-#: mail/mail-callbacks.c:957
+#: mail/mail-callbacks.c:1007
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -5597,11 +5496,11 @@ msgstr ""
 "Du kan kun redigere meldinger lagret\n"
 "i Skisser-katalogen."
 
-#: mail/mail-callbacks.c:990 mail/mail-display.c:83
+#: mail/mail-callbacks.c:1040 mail/mail-display.c:83
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
-#: mail/mail-callbacks.c:994 mail/mail-display.c:87
+#: mail/mail-callbacks.c:1044 mail/mail-display.c:87
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -5609,15 +5508,15 @@ msgstr ""
 "En fil med samme navn eksisterer allerede.\n"
 "Overskriv den?"
 
-#: mail/mail-callbacks.c:1038
+#: mail/mail-callbacks.c:1088
 msgid "Save Message As..."
 msgstr "Lagre melding som..."
 
-#: mail/mail-callbacks.c:1040
+#: mail/mail-callbacks.c:1090
 msgid "Save Messages As..."
 msgstr "Lagre meldinger som..."
 
-#: mail/mail-callbacks.c:1148
+#: mail/mail-callbacks.c:1198
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -5626,11 +5525,11 @@ msgstr ""
 "Feil under lasting av filter-informasjon:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1197
+#: mail/mail-callbacks.c:1247
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/mail-callbacks.c:1244
+#: mail/mail-callbacks.c:1294
 msgid "Printing of message failed"
 msgstr "Feil under utskrift av melding"
 
@@ -5646,31 +5545,27 @@ msgstr "Kontoinformasjon"
 msgid "Account Management"
 msgstr "Håndtering av konti"
 
-#: mail/mail-config.glade.h:4
-msgid "Account Properties"
-msgstr "Egenskaper for konto"
-
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "Advanced"
 msgstr "Avansert"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "Authentication Type:"
 msgstr "Autentiseringstype:"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Automatically check mail every"
 msgstr "Sjekk etter meldinger hver(t)"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 msgid "Check settings"
 msgstr "Sjekk innstillinger"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -5686,178 +5581,178 @@ msgstr ""
 "\n"
 "Klikk \"Fullfør\" for å lagre dine innstillinger"
 
-#: mail/mail-config.glade.h:20
-msgid "Default"
-msgstr "Forvalgt"
+#: mail/mail-config.glade.h:19
+msgid "De_fault"
+msgstr "_Forvalgt"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Done"
 msgstr "Ferdig"
 
 #: mail/mail-config.glade.h:23
-msgid "E-Mail Address:"
+msgid "Email Address:"
 msgstr "E-post adresse:"
 
-#: mail/mail-config.glade.h:25
-msgid "Email Address:"
+#: mail/mail-config.glade.h:24
+msgid "Email address:"
 msgstr "E-post adresse:"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "Evolution Mail Configuration"
 msgstr "Evolution e-post-konfigurasjon"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Full Name:"
 msgstr "Fullt navn:"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Hostname:"
 msgstr "Vertsnavn:"
 
+#: mail/mail-config.glade.h:30
+msgid "IMAP"
+msgstr "IMAP"
+
 #: mail/mail-config.glade.h:31
 msgid "Identity"
 msgstr "Identitet"
 
 #: mail/mail-config.glade.h:32
-msgid "Include in \"Get Mail\" operations."
-msgstr "Ta med i \"Hent e-post\"-operasjoner."
+msgid "Include this account when receiving mail"
+msgstr "Ta med denne kontoen når du mottar e-post"
 
 #: mail/mail-config.glade.h:33
-msgid "Incoming Mail Server"
-msgstr "E-posttjener for innkommende post"
-
-#: mail/mail-config.glade.h:34
 msgid "Keep mail on server"
 msgstr "Behold e-post på tjener"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid "Kerberos"
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:35
 msgid "Mail"
 msgstr "E-post"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:36
 msgid "Mail Account"
 msgstr "E-post konto"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 msgid "Mail Configuration"
 msgstr "E-post-konfigurasjon"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:38
 msgid "Mail Configuration Druid"
 msgstr "E-post-konfigurasjonsdruide"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 msgid "Make this my default account"
 msgstr "Bruk denne som standard konto"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "Mark messages as \"Read\" after:"
 msgstr "Merk melding som \"Lest\" etter:"
 
 #: mail/mail-config.glade.h:42
-msgid "Miscellaneous"
-msgstr "Forskjellig"
-
-#: mail/mail-config.glade.h:44
 msgid "News"
 msgstr "News"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:44
 msgid "Optional"
 msgstr "Valgfri"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:45
 msgid "Organization:"
 msgstr "Organisasjon:"
 
-#: mail/mail-config.glade.h:49
-msgid "Outgoing Mail Server"
-msgstr "E-posttjener for utgående post"
-
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:47
 msgid "PGP binary path:"
 msgstr "Sti til PGP-binærfil:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:48
 msgid "Password:"
 msgstr "Passord:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:50
 msgid "Plain Text"
 msgstr "Vanlig tekst"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:51
 msgid "Receiving Email"
 msgstr "Mottar e-post"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:52
 msgid "Remember my password"
 msgstr "Husk mitt passord"
 
-#: mail/mail-config.glade.h:56 mail/mail-format.c:629
-msgid "Reply-To:"
-msgstr "Svar-til:"
+#: mail/mail-config.glade.h:53
+msgid "Reply address:"
+msgstr "Svaradresse:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:54
 msgid "Required"
 msgstr "Nødvendige"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:56
 msgid "Save password"
 msgstr "Lagre passord"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:57
 msgid "Select PGP binary"
 msgstr "Velg PGP-binærfil"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:58
 msgid "Select signature file"
 msgstr "Velg signaturfil"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:59
 msgid "Send mail in HTML format by default."
 msgstr "Send meldinger i HTML-format som standard"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:60
 msgid "Sending Email"
 msgstr "Sender e-post"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:62
 msgid "Server Configuration"
 msgstr "Tjenerkonfigurasjon"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:63
 msgid "Server Type: "
 msgstr "Tjenertype: "
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:64
 msgid "Server requires authentication"
 msgstr "Tjener krever autentisering"
 
-#: mail/mail-config.glade.h:68
-msgid "Servers"
-msgstr "Tjenere"
+#: mail/mail-config.glade.h:65
+msgid "Server type:"
+msgstr "Tjenertype:"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:66
 msgid "Signature file:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:67
 msgid "Signature:"
 msgstr "Signatur:"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Sources"
 msgstr "Kilder"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "This server requires a secure connection (SSL)"
 msgstr "Denne tjeneren krever en sikker forbindelse (SSL)"
 
+#: mail/mail-config.glade.h:71
+msgid "Transport"
+msgstr "Transport"
+
+#: mail/mail-config.glade.h:72
+msgid "Transport Authentication"
+msgstr "Autentisering for transport"
+
 #: mail/mail-config.glade.h:73
 msgid "Type"
 msgstr "Type"
@@ -5870,15 +5765,15 @@ msgstr ""
 "Skriv inn et referansenavn for disse tjenerene. For eksempel: \"Arbeid\" "
 "eller \"Hjemme\"."
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 msgid "User Information"
 msgstr "Brukerinformasjon"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 msgid "Username:"
 msgstr "Brukernavn:"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:77
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -5888,11 +5783,17 @@ msgstr ""
 "\n"
 "Klikk \"Neste\" for å begynne."
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82 ui/evolution-event-editor.xml.h:58
+#: ui/evolution-message-composer.xml.h:42 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:28
+msgid "_Edit"
+msgstr "R_edigér"
+
+#: mail/mail-config.glade.h:83
 msgid "minutes."
 msgstr "minutter."
 
-#: mail/mail-config-druid.c:402
+#: mail/mail-config-druid.c:421
 #, c-format
 msgid ""
 "Failed to verify the incoming mail configuration.\n"
@@ -5901,11 +5802,11 @@ msgstr ""
 "Feil under verifisering av konfigurasjon av innkommende\n"
 "post. Du vil kunne oppleve problemer ved henting av e-post fra %s"
 
-#: mail/mail-config-druid.c:496
+#: mail/mail-config-druid.c:515
 msgid "Namespace:"
 msgstr "Navneområde:"
 
-#: mail/mail-config-druid.c:684
+#: mail/mail-config-druid.c:708
 #, c-format
 msgid ""
 "Failed to verify the outgoing mail configuration.\n"
@@ -5915,7 +5816,7 @@ msgstr ""
 "Du vil kunne oppleve problemer ved sending av e-post gjennom %s"
 
 #. set window title
-#: mail/mail-config-druid.c:1043
+#: mail/mail-config-druid.c:1215
 msgid "Evolution Account Wizard"
 msgstr "Evolution kontoveiviser"
 
@@ -5959,91 +5860,100 @@ msgstr "Skjul"
 msgid "%s attachment"
 msgstr "%s-vedlegg"
 
-#: mail/mail-format.c:654
+#: mail/mail-format.c:681
+msgid "Reply-To:"
+msgstr "Svar-til:"
+
+#: mail/mail-format.c:704
 msgid "Loading message content"
 msgstr "Laster meldingsinnhold"
 
-#: mail/mail-format.c:943
+#: mail/mail-format.c:993
 msgid "Encrypted message not displayed"
 msgstr "Kryptert melding ikke vist"
 
-#: mail/mail-format.c:949
+#: mail/mail-format.c:999
 msgid "Encrypted message"
 msgstr "Kryptert melding"
 
-#: mail/mail-format.c:950
+#: mail/mail-format.c:1000
 msgid "Click icon to decrypt."
 msgstr "Klikk på ikonet for å dekryptere."
 
-#: mail/mail-format.c:1019 mail/mail-format.c:1406
+#: mail/mail-format.c:1069 mail/mail-format.c:1456
 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:1027 mail/mail-format.c:1414
+#: mail/mail-format.c:1077 mail/mail-format.c:1464
 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:1627
+#: mail/mail-format.c:1677
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peker til FTP-tjener (%s)"
 
-#: mail/mail-format.c:1639
+#: mail/mail-format.c:1689
 #, 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:1643
+#: mail/mail-format.c:1693
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peker til lokal fil (%s)"
 
-#: mail/mail-format.c:1677
+#: mail/mail-format.c:1727
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peker til ukjent ekstern data (\"%s\"-type)"
 
-#: mail/mail-format.c:1682
+#: mail/mail-format.c:1732
 msgid "Malformed external-body part."
 msgstr "Feilutformet del for ekstern-kropp."
 
-#: mail/mail-local.c:458
+#: mail/mail-local.c:335
+#, c-format
+msgid "No such folder %s"
+msgstr "Mappen %s eksisterer ikke"
+
+#: mail/mail-local.c:508
 #, c-format
 msgid "Opening '%s'"
 msgstr "Åpner '%s'"
 
-#: mail/mail-local.c:743
+#: mail/mail-local.c:786
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Endrer mappe \"%s\" til \"%s\"-format"
 
-#: mail/mail-local.c:747
+#: mail/mail-local.c:790
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Endre mappe \"%s\" til \"%s\"-format"
 
-#: mail/mail-local.c:771
+#: mail/mail-local.c:814
 msgid "Reconfiguring folder"
 msgstr "Omkonfigurerer mappe"
 
 #. first, 'close' the old folder
-#: mail/mail-local.c:800
+#: mail/mail-local.c:843
 msgid "Closing current folder"
 msgstr "Lukker aktiv mappe"
 
-#: mail/mail-local.c:832
+#: mail/mail-local.c:875
 msgid "Renaming old folder and opening"
 msgstr "Endrer navn på gammel mappe og gjenåpner"
 
-#: mail/mail-local.c:850
+#: mail/mail-local.c:893
 msgid "Creating new folder"
 msgstr "Oppretter en ny mappe"
 
-#: mail/mail-local.c:864
+#: mail/mail-local.c:907
 msgid "Copying messages"
 msgstr "Kopierer meldinger"
 
-#: mail/mail-local.c:885
+#: mail/mail-local.c:928
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6052,7 +5962,7 @@ msgstr ""
 "Kan ikke lagre metainformasjon for mappe; du vil sannsynligvis\n"
 "ikke kunne åpne denne mappen igjen: %s"
 
-#: mail/mail-local.c:924
+#: mail/mail-local.c:967
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6078,11 +5988,15 @@ msgstr ""
 "Feil under utføring av operasjon:\n"
 "%s"
 
-#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:789
+#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:875
 msgid "Working"
 msgstr "Arbeider"
 
-#: mail/mail-mt.c:771
+#: mail/mail-mt.c:666 mail/session.c:90
+msgid "Do you accept?"
+msgstr "Aksepterer du?"
+
+#: mail/mail-mt.c:857
 msgid "Evolution progress"
 msgstr "Evolution fremgang"
 
@@ -6095,75 +6009,75 @@ msgstr "Sender \"%s\""
 msgid "Sending message"
 msgstr "Sender melding"
 
-#: mail/mail-ops.c:744
+#: mail/mail-ops.c:752
 msgid "Saving message to folder"
 msgstr "Lagrer melding til mappe"
 
-#: mail/mail-ops.c:817
+#: mail/mail-ops.c:825
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flytter melding(er) til %s"
 
-#: mail/mail-ops.c:817
+#: mail/mail-ops.c:825
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer meldinger til %s"
 
-#: mail/mail-ops.c:834
+#: mail/mail-ops.c:842
 msgid "Moving"
 msgstr "Flytter"
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:845
 msgid "Copying"
 msgstr "Kopiérer"
 
-#: mail/mail-ops.c:848
+#: mail/mail-ops.c:856
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s melding %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:919
+#: mail/mail-ops.c:927
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i \"%s\""
 
-#: mail/mail-ops.c:1068
+#: mail/mail-ops.c:1085
 msgid "Forwarded messages"
 msgstr "Videresendte meldinger"
 
-#: mail/mail-ops.c:1109 mail/mail-ops.c:1247
+#: mail/mail-ops.c:1126 mail/mail-ops.c:1264
 #, c-format
 msgid "Opening folder %s"
 msgstr "Åpner mappe %s"
 
-#: mail/mail-ops.c:1176
+#: mail/mail-ops.c:1193
 #, c-format
 msgid "Opening store %s"
 msgstr "Åpner lager %s"
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1380
 msgid "Expunging folder"
 msgstr "Tømmer mappe"
 
-#: mail/mail-ops.c:1412
+#: mail/mail-ops.c:1429
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Henter melding %s"
 
-#: mail/mail-ops.c:1479
+#: mail/mail-ops.c:1496
 msgid "Retrieving messages"
 msgstr "Henter meldinger"
 
-#: mail/mail-ops.c:1489
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Henter melding nummer %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1563
+#: mail/mail-ops.c:1580
 msgid "Saving messages"
 msgstr "Lagrer meldinger"
 
-#: mail/mail-ops.c:1642
+#: mail/mail-ops.c:1659
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6172,12 +6086,12 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1655
+#: mail/mail-ops.c:1672
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Lagrer melding %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1669
+#: mail/mail-ops.c:1686
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6186,11 +6100,11 @@ msgstr ""
 "Feil under lagring av av meldinger til: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1743
+#: mail/mail-ops.c:1760
 msgid "Saving attachment"
 msgstr "Lagrer vedlegg"
 
-#: mail/mail-ops.c:1758
+#: mail/mail-ops.c:1775
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6199,7 +6113,7 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1786
+#: mail/mail-ops.c:1803
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
@@ -6249,24 +6163,31 @@ msgstr "Uferdig melding skrevet på rør!"
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Kunne ikke opprette midlertidig mbox `%s': %s"
 
-#: mail/mail-tools.c:191
+#: mail/mail-tools.c:185
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (videresendt melding)"
 
-#: mail/mail-tools.c:201
+#: mail/mail-tools.c:195
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (uten emne)"
 
-#: mail/mail-tools.c:218
+#: mail/mail-tools.c:212
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Videresendt melding - %s"
 
-#: mail/mail-tools.c:220
+#: mail/mail-tools.c:214
 msgid "Forwarded message (no subject)"
 msgstr "Videresendt melding (uten emne)"
 
+#: mail/mail-tools.c:411
+#, c-format
+msgid ""
+"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+"%s<br><b>Subject:</b> %s<br>"
+msgstr "-----Videresendt melding---<br><b>Fra:</b> %s<br><b>Til:</b> %s<br><b>Emne:</b> %s<br>"
+
 #: mail/mail-vfolder.c:248
 msgid "VFolders"
 msgstr "VMapper"
@@ -6277,43 +6198,42 @@ msgstr "Ny VFolder"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:31
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:38
 msgid "Reply"
 msgstr "Svar"
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:36
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
 msgid "Reply to the sender of this message"
 msgstr "Svar til avsender av denne meldingen"
 
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:35
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
 msgid "Reply to all recipients of this message"
 msgstr "Svar til alle mottakere av denne meldingen"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:14
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:17
 msgid "Forward this message"
 msgstr "Videresend denne meldingen"
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:30
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:34
 msgid "Print the selected message"
 msgstr "Skriv ut den valgte meldingen"
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:7
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:8
 msgid "Delete this message"
 msgstr "Slett denne meldingen"
 
-#: mail/mail-vtrash.c:97
-#, c-format
-msgid "Opening Trash folder for %s"
-msgstr "Åpner søppel-mappe for %s"
-
-#: mail/mail-vtrash.c:106
-msgid "Getting matches"
-msgstr "Finner treff"
-
 #: mail/message-list.c:618
 msgid "Unseen"
 msgstr "Ulest"
 
+#: mail/message-list.c:621
+msgid "Seen"
+msgstr "Lest"
+
+#: mail/message-list.c:624
+msgid "Answered"
+msgstr "Besvart"
+
 #: mail/message-list.c:627
 msgid "Multiple Unseen Messages"
 msgstr "Flere uleste meldinger"
@@ -6361,6 +6281,10 @@ msgstr "%b %d %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
+#: mail/message-list.c:1171
+msgid "Flagged"
+msgstr "Merket"
+
 #: mail/message-list.c:1172
 msgid "From"
 msgstr "Fra"
@@ -6813,13 +6737,13 @@ msgstr "Fjern denne snarveien fra snarveilinjen"
 msgid "Error saving shortcuts."
 msgstr "Feil under lagring av snarveier."
 
-#: shell/e-storage-set-view.c:345 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:41
+#: shell/e-storage-set-view.c:468 ui/evolution-event-editor.xml.h:76
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:42
 msgid "_View"
 msgstr "_Vis"
 
-#: shell/e-storage-set-view.c:345
+#: shell/e-storage-set-view.c:468
 msgid "View the selected folder"
 msgstr "Vis den valgte mappen"
 
@@ -6876,7 +6800,7 @@ msgid "The Evolution shell."
 msgstr "Evolution skallet."
 
 #: shell/main.c:74
-#, no-c-format
+#, c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
 "of the Evolution groupware suite.\n"
@@ -6953,40 +6877,51 @@ msgstr "Finn en kontakt"
 msgid "New contact"
 msgstr "Ny kontakt"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:18
+#: ui/evolution-mail.xml.h:30
+msgid "Previews the message to be printed"
+msgstr "Viser forhåndsvisning av meldingen som skal skrives ut"
+
+#: ui/evolution-addressbook.xml.h:11
 msgid "Print contacts"
 msgstr "Skriv ut kontakter"
 
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-mail.xml.h:41
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:49
 msgid "Stop"
 msgstr "Stopp"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:13
 msgid "Stop Loading"
 msgstr "Stopp innlesing"
 
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:14
 msgid "View All"
 msgstr "Vis alle"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:15
 msgid "View all contacts"
 msgstr "Vis alle kontakter"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "_Addressbook Configuration..."
-msgstr "Konfigurasjon av adressebok..."
+#: ui/evolution-addressbook.xml.h:16
+msgid "_Addressbook Sources..."
+msgstr "_Adressebok-kilder..."
 
-#: ui/evolution-addressbook.xml.h:15
-msgid "_Print Contacts..."
-msgstr "S_kriv ut kontakter..."
+#: ui/evolution-addressbook.xml.h:17
+msgid "_Contact"
+msgstr "_Kontakt"
 
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15
+msgid "_Print..."
+msgstr "S_kriv ut..."
+
+#: ui/evolution-addressbook.xml.h:19
 msgid "_Search for contacts"
 msgstr "_Søk etter kontakter"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-event-editor.xml.h:74
-#: ui/evolution-task-editor-dialog.xml.h:88
+#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:37
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:76
+#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:41
 msgid "_Tools"
 msgstr "_Verktøy"
 
@@ -6998,118 +6933,115 @@ msgstr "5 dager"
 msgid "Alter preferences"
 msgstr "Endre brukervalg"
 
-#: ui/evolution-calendar.xml.h:3
-msgid "Ca_lendar"
-msgstr "Ka_lender"
-
-#: ui/evolution-calendar.xml.h:5
-msgid "Calendar Preferences..."
-msgstr "Brukervalg for kalender..."
-
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:4
 msgid "Create a new appointment"
 msgstr "Opprett en ny avtale"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:5
 msgid "Create a new calendar"
 msgstr "Opprett en ny kalender"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:6
 msgid "Day"
 msgstr "Dag"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:7
 msgid "Go To"
 msgstr "Gå til"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:8
 msgid "Go back in time"
 msgstr "Gå tilbake i tid"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:9
 msgid "Go forward in time"
 msgstr "Gå fremover i tid"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:10
 msgid "Go to a specific date"
 msgstr "Gå til en spesifikk dato"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to present time"
 msgstr "Gå til i dag"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:12
 msgid "Month"
 msgstr "Måned"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:13
 msgid "New Appointment"
 msgstr "Ny avtale"
 
-#: ui/evolution-calendar.xml.h:16 ui/evolution-event-editor.xml.h:29
+#: ui/evolution-calendar.xml.h:14 ui/evolution-event-editor.xml.h:29
 #: ui/evolution-task-editor-dialog.xml.h:32
 msgid "Next"
 msgstr "Neste"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:16
 msgid "Open Calendar"
 msgstr "Åpne kalender"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:17
 msgid "Prev"
 msgstr "Forrige"
 
 #: ui/evolution-calendar.xml.h:21
+msgid "Print calendar"
+msgstr "Skriv ut kalender"
+
+#: ui/evolution-calendar.xml.h:22
 msgid "Print this Calendar"
 msgstr "Skriv ut denne kalenderen"
 
-#: ui/evolution-calendar.xml.h:22 ui/evolution-message-composer.xml.h:15
+#: ui/evolution-calendar.xml.h:23 ui/evolution-message-composer.xml.h:15
 msgid "Save As"
 msgstr "Lagre som"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:24
 msgid "Save calendar as something else"
 msgstr "Lagre kalender som noe annet"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 day"
 msgstr "Vis 1 dag"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr "Vis 1 måned"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr "Vis 1 uke"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Vis arbeidsuken"
 
-#: ui/evolution-calendar.xml.h:28 widgets/misc/e-cell-date-edit.c:223
+#: ui/evolution-calendar.xml.h:30 widgets/misc/e-cell-date-edit.c:223
 #: widgets/misc/e-dateedit.c:413
 msgid "Today"
 msgstr "Idag"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "Uke"
 
-#: ui/evolution-calendar.xml.h:30 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
+#: ui/evolution-calendar.xml.h:32
+msgid "_Appointment"
+msgstr "_Avtale"
+
+#: ui/evolution-calendar.xml.h:33 ui/evolution-event-editor.xml.h:66
+#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:37
 msgid "_New"
 msgstr "_Ny"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:34
 msgid "_Open Calendar"
 msgstr "_Åpne kalender"
 
-#: ui/evolution-calendar.xml.h:32
-msgid "_Print this calendar"
-msgstr "S_kriv ut denne kalenderen"
-
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:8
+#: ui/evolution-calendar.xml.h:36 ui/evolution-mail.xml.h:73
+#: ui/evolution-tasks.xml.h:8
 msgid "_Save As..."
 msgstr "Lagre _som..."
 
@@ -7135,7 +7067,7 @@ msgid "Print this item"
 msgstr "Skriv ut denne oppføringen"
 
 #: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:41
+#: ui/evolution-mail.xml.h:35 ui/evolution-task-editor-dialog.xml.h:41
 msgid "Print..."
 msgstr "Skriv ut..."
 
@@ -7167,17 +7099,13 @@ msgid "Send _message to contact..."
 msgstr "Send _melding til kontakt..."
 
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:38 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
+#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Fil"
 
-#: ui/evolution-contact-editor.xml.h:15
-msgid "_Print..."
-msgstr "S_kriv ut..."
-
 #: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-task-editor-dialog.xml.h:85
 msgid "_Save"
 msgstr "_Lagre"
@@ -7226,7 +7154,7 @@ msgstr "Lukk denne avtalen"
 msgid "Cop_y to Folder... (FIXME)"
 msgstr "Kop_iér til mappe..."
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:3
+#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:4
 #: ui/evolution-task-editor-dialog.xml.h:14
 msgid "Copy"
 msgstr "Kopiér"
@@ -7315,10 +7243,6 @@ msgstr "Skriveropps_ett..."
 msgid "Print Setup"
 msgstr "Skriveroppsett"
 
-#: ui/evolution-event-editor.xml.h:39 ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "Egenskaper"
-
 #: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
 #: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:207
 msgid "Save"
@@ -7357,18 +7281,18 @@ msgstr "Redigér sideinnstillinger for aktiv skriver"
 msgid "Task _Request (FIXME)"
 msgstr "_Oppgaveforespørsel"
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:34
+#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:37
 #: ui/evolution-task-editor-dialog.xml.h:63
 msgid "_About..."
 msgstr "_Om..."
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:35
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
+#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:40
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:26
 msgid "_Close"
 msgstr "L_ukk"
 
 #: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:27
 msgid "_Contact (FIXME)"
 msgstr "_Kontakt"
 
@@ -7376,19 +7300,13 @@ msgstr "_Kontakt"
 msgid "_Copy"
 msgstr "_Kopiér"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:36
+#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:41
 #: ui/evolution-task-editor-dialog.xml.h:68
 msgid "_Debug"
 msgstr "_Feilsøk"
 
-#: ui/evolution-event-editor.xml.h:58 ui/evolution-message-composer.xml.h:37
-#: ui/evolution-subscribe.xml.h:10 ui/evolution-task-editor-dialog.xml.h:70
-#: ui/evolution.xml.h:30
-msgid "_Edit"
-msgstr "R_edigér"
-
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
+#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:45
+#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:33
 msgid "_Help"
 msgstr "_Hjelp"
 
@@ -7425,7 +7343,8 @@ msgstr "_Lim inn"
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-task-editor-dialog.xml.h:83
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:72
+#: ui/evolution-task-editor-dialog.xml.h:83
 msgid "_Properties..."
 msgstr "Egenska_per..."
 
@@ -7462,206 +7381,234 @@ msgstr "Innstillinger for sammendrag..."
 msgid "New Mail"
 msgstr "Ny melding"
 
-#: ui/evolution-mail.xml.h:1
+#: ui/evolution-mail.xml.h:2
 msgid "Compose"
 msgstr "Skriv"
 
-#: ui/evolution-mail.xml.h:2
+#: ui/evolution-mail.xml.h:3
 msgid "Compose a new message"
 msgstr "Komponér en ny melding"
 
-#: ui/evolution-mail.xml.h:4
+#: ui/evolution-mail.xml.h:5
 msgid "Copy message to a new folder"
 msgstr "Kopiér meldingen til en ny mappe"
 
-#: ui/evolution-mail.xml.h:5
-msgid "Create Rule"
-msgstr "Lag regel"
-
-#: ui/evolution-mail.xml.h:8 ui/evolution-subscribe.xml.h:3
-msgid "F_older"
-msgstr "M_appe"
+#: ui/evolution-mail.xml.h:6
+msgid "Create _Virtual Folder From Message"
+msgstr "Lage _virtuell mappe fra melding"
 
 #: ui/evolution-mail.xml.h:9
-msgid "Fi_lter on Sender"
-msgstr "Fi_ltrér etter sender"
+msgid "Display all of the message headers"
+msgstr "Vis komplette meldingshoder"
 
 #: ui/evolution-mail.xml.h:10
-msgid "Filter on Rec_ipients"
-msgstr "F_iltrér etter mottaker"
+msgid "Empty Trash"
+msgstr "Tøm søppelkurven"
 
 #: ui/evolution-mail.xml.h:11
+msgid "Filter on Se_nder"
+msgstr "Filtrer etter se_nder"
+
+#: ui/evolution-mail.xml.h:12
+msgid "Filter on _Recipients"
+msgstr "Filtrer på mottake_re"
+
+#: ui/evolution-mail.xml.h:13
+msgid "Filter on _Subject"
+msgstr "Filtrer på e_mne"
+
+#: ui/evolution-mail.xml.h:14
 msgid "Forget _Passwords"
 msgstr "Glem _passord"
 
-#: ui/evolution-mail.xml.h:15
-msgid "Get Mail"
-msgstr "Hent e-post"
-
 #: ui/evolution-mail.xml.h:16
-msgid "Hide S_elected Messages"
-msgstr "Skjul valgt_e meldinger"
-
-#: ui/evolution-mail.xml.h:17
-msgid "Hide _Deleted Messages"
-msgstr "Skjul slette_de meldinger"
+msgid "Forward As"
+msgstr "Videresend som"
 
 #: ui/evolution-mail.xml.h:18
-msgid "Hide _Read messages"
-msgstr "Skjul le_ste meldinger"
+msgid "Full Headers"
+msgstr "Fulle headere"
 
 #: ui/evolution-mail.xml.h:19
-msgid "Mail _Filters..."
-msgstr "E-post _filtre..."
+msgid "Hide S_elected Messages"
+msgstr "Skjul valgt_e meldinger"
 
 #: ui/evolution-mail.xml.h:20
-msgid "Manage Subscriptions..."
-msgstr "Håndtér abonnement..."
+msgid "Hide _Deleted Messages"
+msgstr "Skjul slette_de meldinger"
 
 #: ui/evolution-mail.xml.h:21
-msgid "Mar_k As Read"
-msgstr "Mar_kér som lest"
+msgid "Hide _Read messages"
+msgstr "Skjul le_ste meldinger"
 
 #: ui/evolution-mail.xml.h:22
-msgid "Mark As U_nread"
-msgstr "Merk som _ulest"
+msgid "Inline"
+msgstr "Inline"
 
 #: ui/evolution-mail.xml.h:23
-msgid "Move"
-msgstr "Flytt"
+msgid "Manage _Subscriptions..."
+msgstr "_Håndter abonnement..."
 
 #: ui/evolution-mail.xml.h:24
-msgid "Move message to a new folder"
-msgstr "Flytt meldingen til en ny mappe"
+msgid "Mar_k as Read"
+msgstr "Mer_k som lest"
 
 #: ui/evolution-mail.xml.h:25
-msgid "Previews the message to be printed"
-msgstr "Viser forhåndsvisning av meldingen som skal skrives ut"
+msgid "Mark All as R_ead"
+msgstr "Merk alle som l_est"
+
+#: ui/evolution-mail.xml.h:26
+msgid "Mark as U_nread"
+msgstr "Merk som u_lest"
 
 #: ui/evolution-mail.xml.h:27
-msgid "Print Preview of message..."
-msgstr "Vis forhåndsvisning av melding..."
+msgid "Message _Display"
+msgstr "Mel_dingsvisning"
 
 #: ui/evolution-mail.xml.h:28
-msgid "Print message to the printer"
-msgstr "Skriv ut denne meldingen på skriveren"
+msgid "Move"
+msgstr "Flytt"
 
 #: ui/evolution-mail.xml.h:29
-msgid "Print message..."
-msgstr "Skriv ut melding..."
+msgid "Move message to a new folder"
+msgstr "Flytt meldingen til en ny mappe"
 
 #: ui/evolution-mail.xml.h:33
-msgid "Reply to _All"
-msgstr "Svar til _alle"
+msgid "Print message to the printer"
+msgstr "Skriv ut denne meldingen på skriveren"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Reply to _Sender"
-msgstr "Svar til _sender"
+#: ui/evolution-mail.xml.h:36
+msgid "Quoted"
+msgstr "Sitert"
 
 #: ui/evolution-mail.xml.h:37
+msgid "Redirect (FIXME: implement me)"
+msgstr "Omdiriger"
+
+#: ui/evolution-mail.xml.h:40
+msgid "Reply to _All"
+msgstr "Svar til _alle"
+
+#: ui/evolution-mail.xml.h:43
 msgid "S_ource"
 msgstr "K_ilde"
 
-#: ui/evolution-mail.xml.h:38 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:44 ui/evolution-subscribe.xml.h:7
 msgid "Select _All"
 msgstr "Velg _alle"
 
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail.xml.h:45
+msgid "Select _Thread"
+msgstr "Velg _tråd"
+
+#: ui/evolution-mail.xml.h:46
+msgid "Send and Receive"
+msgstr "Send og motta"
+
+#: ui/evolution-mail.xml.h:47
 msgid "Send queued mail and retrieve new mail"
 msgstr "Send kølagt e-post og hent ny e-post"
 
-#: ui/evolution-mail.xml.h:40
-msgid "Show _All Messages"
-msgstr "Vis _alle meldinger"
+#: ui/evolution-mail.xml.h:48
+msgid "Show _All"
+msgstr "Vis _alle"
 
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:50
 msgid "Threaded Message list"
 msgstr "Meldingsliste med tråder"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:51
 msgid "VFolder on Se_nder"
 msgstr "VFolder for se_nder"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:52
 msgid "VFolder on _Recipients"
 msgstr "VFolder for mottake_re"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:53
+msgid "VFolder on _Subject"
+msgstr "VFolder på e_mne"
+
+#: ui/evolution-mail.xml.h:54
 msgid "View Raw Message Source"
 msgstr "Vis rå meldingskode"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:55
+msgid "Virtual Folder _Editor..."
+msgstr "R_edigering av virtuelle mapper..."
+
+#: ui/evolution-mail.xml.h:56
+msgid "_Actions"
+msgstr "H_andlinger"
+
+#: ui/evolution-mail.xml.h:57
 msgid "_Apply Filters"
 msgstr "_Påfør filtre"
 
-#: ui/evolution-mail.xml.h:47
-msgid "_Configure Folder..."
-msgstr "_Konfigurér mappe..."
+#: ui/evolution-mail.xml.h:58
+msgid "_Compose"
+msgstr "_Skriv"
 
-#: ui/evolution-mail.xml.h:48
+#: ui/evolution-mail.xml.h:59
 msgid "_Copy to Folder..."
 msgstr "_Kopiér til mappe..."
 
-#: ui/evolution-mail.xml.h:50
-msgid "_Edit Message"
-msgstr "R_edigér melding"
+#: ui/evolution-mail.xml.h:60
+msgid "_Create Filter From Message"
+msgstr "La_g filter fra melding"
 
-#: ui/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:62
 msgid "_Expunge"
 msgstr "_Tøm"
 
-#: ui/evolution-mail.xml.h:52
-msgid "_Filter on Subject"
-msgstr "_Filtrér etter emne"
+#: ui/evolution-mail.xml.h:63
+msgid "_Filters..."
+msgstr "_Filtre..."
 
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:64 ui/evolution.xml.h:30
+msgid "_Folder"
+msgstr "_Mappe"
+
+#: ui/evolution-mail.xml.h:65
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: ui/evolution-mail.xml.h:54 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:66 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "Re_versér utvalg"
 
-#: ui/evolution-mail.xml.h:55
-msgid "_Mail Configuration..."
-msgstr "_E-post konfigurasjon..."
+#: ui/evolution-mail.xml.h:67
+msgid "_Mail Message"
+msgstr "Send _melding"
 
-#: ui/evolution-mail.xml.h:56
-msgid "_Message"
-msgstr "_Melding"
+#: ui/evolution-mail.xml.h:68
+msgid "_Mail Settings..."
+msgstr "Innstillinger for e-post..."
 
-#: ui/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:69
+msgid "_Message Hiding"
+msgstr "_Meldingsskjuling"
+
+#: ui/evolution-mail.xml.h:70
 msgid "_Move to Folder..."
 msgstr "F_lytt til mappe..."
 
-#: ui/evolution-mail.xml.h:58
-msgid "_Open in New Window"
-msgstr "_Åpne i nytt vindu"
+#: ui/evolution-mail.xml.h:71
+msgid "_Open Selected Items"
+msgstr "_Åpne valgte oppføringer"
 
-#: ui/evolution-mail.xml.h:59
-msgid "_Print Message"
-msgstr "S_kriv ut melding"
-
-#: ui/evolution-mail.xml.h:60
-msgid "_Save Message As..."
-msgstr "Lagre melding _som..."
+#: ui/evolution-mail.xml.h:74
+msgid "_Send and Receive"
+msgstr "_Send og motta"
 
-#: ui/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:75
 msgid "_Threaded"
 msgstr "Med _tråder"
 
-#: ui/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:77
 msgid "_Undelete"
 msgstr "A_ngre slett"
 
-#: ui/evolution-mail.xml.h:63
-msgid "_VFolder on Subject"
-msgstr "_VFolder for emne"
-
-#: ui/evolution-mail.xml.h:64
-msgid "_Virtual Folder Editor..."
-msgstr "Redigering av _virtuelle mapper..."
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Legg ved"
@@ -7767,15 +7714,43 @@ msgstr "Vis vedlegg"
 msgid "Sign this message with your PGP key"
 msgstr "Signér denne meldingen med din PGP-nøkkel"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:34
+msgid "Toggles whether the BCC field is displayed"
+msgstr "Slå av/på visning av BCC-feltet"
+
+#: ui/evolution-message-composer.xml.h:35
+msgid "Toggles whether the CC field is displayed"
+msgstr "Slå av/på visning av CC-feltet"
+
+#: ui/evolution-message-composer.xml.h:36
+msgid "Toggles whether the From chooser is displayed"
+msgstr "Slå av/på visning av Fra-feltet"
+
+#: ui/evolution-message-composer.xml.h:38
+msgid "_Bcc Field"
+msgstr "_Bcc-felt"
+
+#: ui/evolution-message-composer.xml.h:39
+msgid "_Cc Field"
+msgstr "_Cc-felt"
+
+#: ui/evolution-message-composer.xml.h:44
+msgid "_From Field"
+msgstr "_Fra-felt"
+
+#: ui/evolution-message-composer.xml.h:46
+msgid "_Insert"
+msgstr "Sett _inn"
+
+#: ui/evolution-message-composer.xml.h:47
 msgid "_Insert text file... (FIXME)"
 msgstr "Sett _inn tekstfil..."
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:48
 msgid "_Open..."
 msgstr "_Åpne..."
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:50
 msgid "_Security"
 msgstr "_Sikkerhet"
 
@@ -7783,6 +7758,10 @@ msgstr "_Sikkerhet"
 msgid "Add folder to your list of subscribed folders"
 msgstr "Legg til mappe på listen over abonnerte mapper"
 
+#: ui/evolution-subscribe.xml.h:3
+msgid "F_older"
+msgstr "M_appe"
+
 #: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List"
 msgstr "Les listen på nytt"
@@ -7863,7 +7842,7 @@ msgstr "Angre"
 msgid "Undo the last action"
 msgstr "Angre siste handling"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:25
 msgid "_Appointment (FIXME)"
 msgstr "_Avtale"
 
@@ -7891,6 +7870,10 @@ msgstr "Lagre oppgave som noe annet"
 msgid "Tasks Preferences..."
 msgstr "Brukervalg for oppgaver..."
 
+#: ui/evolution-tasks.xml.h:9
+msgid "_Task"
+msgstr "_Oppgave"
+
 #: ui/evolution.xml.h:1
 msgid "About Evolution..."
 msgstr "Om Evolution..."
@@ -7900,8 +7883,8 @@ msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
 #: ui/evolution.xml.h:4
-msgid "Customi_ze..."
-msgstr "_Tilpass..."
+msgid "Customi_ze Toolbars..."
+msgstr "Til_pass verktøylinjer..."
 
 #: ui/evolution.xml.h:5
 msgid "Customize"
@@ -7924,96 +7907,92 @@ msgid "Evolution bar _shortcut"
 msgstr "Evolution-linje _snarvei"
 
 #: ui/evolution.xml.h:10
-msgid "Exit"
-msgstr "Avslutt"
-
-#: ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "Avslutt programmet"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:11
 msgid "Getting _Started"
 msgstr "Kom _igang"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:12
 msgid "Import an external file format"
 msgstr "Importér et eksternt filformat"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Hovedverktøylinje"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:14
 msgid "Show information about Evolution"
 msgstr "Vis informasjon om Evolution"
 
-#: ui/evolution.xml.h:16
-msgid "Show the _Folder Bar"
-msgstr "Vis _mappelinjen"
-
-#: ui/evolution.xml.h:17
-msgid "Show the _Shortcut Bar"
-msgstr "Vis _snarveilinjen"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:15
 msgid "Submit Bug Report"
 msgstr "Send inn feilrapport"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:16
 msgid "Submit _Bug Report"
 msgstr "Sen_d inn feilrapport"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:17
 msgid "Submit bug report using Bug Buddy."
 msgstr "Send inn feilrapport ved bruk av Bug Buddy."
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:18
 msgid "Toggle whether to show the folder bar"
 msgstr "Slå av/på visning av mappelinjen"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:19
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Slå av/på visning av snarveilinjen"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:20
 msgid "Using the C_ontact Manager"
 msgstr "Bruk av k_ontaktdatabasen"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:21
 msgid "Using the _Calendar"
 msgstr "Bruk av _kalenderen"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:22
 msgid "Using the _Mailer"
 msgstr "Bruk av e-_postprogrammet"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:23
+msgid "Work Offline"
+msgstr "Arbeid \"offline\""
+
+#: ui/evolution.xml.h:24
 msgid "_About Evolution..."
 msgstr "_Om Evolution..."
 
-#: ui/evolution.xml.h:32
-msgid "_Folder"
-msgstr "_Mappe"
+#: ui/evolution.xml.h:31
+msgid "_Folder Bar"
+msgstr "_Mappelinje"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:32
 msgid "_Go to Folder..."
 msgstr "_Gå til mappe..."
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:34
 msgid "_Import file..."
 msgstr "_Importér fil..."
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:35
 msgid "_Index"
 msgstr "_Indeks"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:36
 msgid "_Mail message"
 msgstr "Send _melding"
 
+#: ui/evolution.xml.h:38
+msgid "_New Folder"
+msgstr "_Ny mappe"
+
 #: ui/evolution.xml.h:39
-msgid "_Settings"
-msgstr "Inn_stillinger"
+msgid "_Shortcut Bar"
+msgstr "_Snarveilinje"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
@@ -8094,6 +8073,10 @@ msgstr "Tid for møtets slutt:"
 msgid "All Attendees"
 msgstr "Alle deltakere"
 
+#: widgets/menus/gal-view-menus.c:171
+msgid "_Current View"
+msgstr "_Aktiv visning"
+
 #. 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:421
@@ -8211,6 +8194,231 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 msgid "The Evolution groupware suite"
 msgstr "Gruppevaresuiten Evolution"
 
+#~ msgid "Disabled"
+#~ msgstr "Slått av"
+
+#~ msgid "Synchronize"
+#~ msgstr "Synkronisér"
+
+#~ msgid "Copy From Pilot"
+#~ msgstr "Kopiér fra Pilot"
+
+#~ msgid "Copy To Pilot"
+#~ msgstr "Kopiér til Pilot"
+
+#~ msgid "Merge From Pilot"
+#~ msgstr "Flett fra Pilot"
+
+#~ msgid "Merge To Pilot"
+#~ msgstr "Flett til Pilot"
+
+#~ msgid "JP Rosevear <jpr@helixcode.com>"
+#~ msgstr "JP Rosevar <jpr@helixcode.com>"
+
+#~ msgid "Original Author:"
+#~ msgstr "Opprinnelig forfatter:"
+
+#~ msgid "Eskil Heyn Olsen <deity@eskil.dk>"
+#~ msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
+
+#~ msgid "Evolution Addressbook Conduit"
+#~ msgstr "Evolution adressebok-komponent"
+
+#~ msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
+#~ msgstr "© 1998-2000 the Free Software Foundation og Helix Code"
+
+#~ msgid "Configuration utility for the evolution addressbook conduit.\n"
+#~ msgstr "Konfigurasjonsverktøy for evolutions adressebok-komponent.\n"
+
+#~ msgid "gnome-unknown.xpm"
+#~ msgstr "gnome-unknown.xpm"
+
+#~ msgid "Synchronize Action"
+#~ msgstr "Synkroniseringshandling"
+
+#~ msgid "Conduit state"
+#~ msgstr "Komponent-tilstand"
+
+#~ msgid ""
+#~ "No pilot configured, please choose the\n"
+#~ "'Pilot Link Properties' capplet first."
+#~ msgstr ""
+#~ "Ingen pilot er konfigurert, vennligst\n"
+#~ "velg cappleten 'Egenskaper for pilot link' først."
+
+#~ msgid "Not connected to the gnome-pilot daemon"
+#~ msgstr "Ikke tilkoblet gnome-pilot daemon"
+
+#~ msgid ""
+#~ "An error occured when trying to fetch\n"
+#~ "pilot list from the gnome-pilot daemon"
+#~ msgstr ""
+#~ "En feil oppsto under forsøk på å hente\n"
+#~ "pilot-listen fra gnome-pilot daemonen"
+
+#~ msgid "Configure the address conduit"
+#~ msgstr "Konfigurér oppgavelisten"
+
+#~ msgid "Evolution Address conduit "
+#~ msgstr "Oppgaver"
+
+#~ msgid "Evolution Calendar Conduit"
+#~ msgstr "Evolution kalender-komponent"
+
+#~ msgid "Configuration utility for the evolution calendar conduit.\n"
+#~ msgstr "Konfigurasjonsverktøy for evolutions kalender-komponent.\n"
+
+#~ msgid "Configure the GnomeCal conduit"
+#~ msgstr "Konfigurér GnomeCal-komponent"
+
+#~ msgid "Evolution Calendar conduit"
+#~ msgstr "Evolution kalender-komponent"
+
+#~ msgid "Configure the todo conduit"
+#~ msgstr "Konfigurér oppgavelistekomponenten"
+
+#~ msgid "Evolution ToDo conduit "
+#~ msgstr "Oppgaver"
+
+#~ msgid "Evolution ToDo Conduit"
+#~ msgstr "Evolution oppgaveliste-komponent"
+
+#~ msgid "Configuration utility for the evolution todo conduit.\n"
+#~ msgstr "Konfigurasjonsverktøy for evolutions oppgavelistekomponent.\n"
+
+#~ msgid "Deleted"
+#~ msgstr "Slettet"
+
+#~ msgid "Draft"
+#~ msgstr "Skisse"
+
+#~ msgid "Set Flag"
+#~ msgstr "Sett flagg"
+
+#~ msgid "matches regex"
+#~ msgstr "er lik regex"
+
+#~ msgid "Opening Trash folder for %s"
+#~ msgstr "Åpner søppel-mappe for %s"
+
+#~ msgid "Getting matches"
+#~ msgstr "Finner treff"
+
+#~ msgid "Attachment (FIXME: implement me)"
+#~ msgstr "Vedlegg"
+
+#~ msgid "Quoted (FIXME: implement me)"
+#~ msgstr "Sitert"
+
+#~ msgid "Enter the identity you wish to send this message from"
+#~ msgstr ""
+#~ "Skriv inn identiteten du ønsker å bruke ved sending av denne meldingen"
+
+#~ msgid "Enter the subject of the mail"
+#~ msgstr "Skriv inn emnet for meldingen"
+
+#~ msgid "Account Properties"
+#~ msgstr "Egenskaper for konto"
+
+#~ msgid "E-Mail Address:"
+#~ msgstr "E-post adresse:"
+
+#~ msgid "Include in \"Get Mail\" operations."
+#~ msgstr "Ta med i \"Hent e-post\"-operasjoner."
+
+#~ msgid "Incoming Mail Server"
+#~ msgstr "E-posttjener for innkommende post"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Forskjellig"
+
+#~ msgid "Outgoing Mail Server"
+#~ msgstr "E-posttjener for utgående post"
+
+#~ msgid "Servers"
+#~ msgstr "Tjenere"
+
+#~ msgid "_Addressbook Configuration..."
+#~ msgstr "Konfigurasjon av adressebok..."
+
+#~ msgid "_Print Contacts..."
+#~ msgstr "S_kriv ut kontakter..."
+
+#~ msgid "Ca_lendar"
+#~ msgstr "Ka_lender"
+
+#~ msgid "Calendar Preferences..."
+#~ msgstr "Brukervalg for kalender..."
+
+#~ msgid "_Print this calendar"
+#~ msgstr "S_kriv ut denne kalenderen"
+
+#~ msgid "Create Rule"
+#~ msgstr "Lag regel"
+
+#~ msgid "Fi_lter on Sender"
+#~ msgstr "Fi_ltrér etter sender"
+
+#~ msgid "Filter on Rec_ipients"
+#~ msgstr "F_iltrér etter mottaker"
+
+#~ msgid "Get Mail"
+#~ msgstr "Hent e-post"
+
+#~ msgid "Mar_k As Read"
+#~ msgstr "Mar_kér som lest"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Merk som _ulest"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "Vis forhåndsvisning av melding..."
+
+#~ msgid "Print message..."
+#~ msgstr "Skriv ut melding..."
+
+#~ msgid "Reply to _Sender"
+#~ msgstr "Svar til _sender"
+
+#~ msgid "Show _All Messages"
+#~ msgstr "Vis _alle meldinger"
+
+#~ msgid "_Configure Folder..."
+#~ msgstr "_Konfigurér mappe..."
+
+#~ msgid "_Edit Message"
+#~ msgstr "R_edigér melding"
+
+#~ msgid "_Filter on Subject"
+#~ msgstr "_Filtrér etter emne"
+
+#~ msgid "_Mail Configuration..."
+#~ msgstr "_E-post konfigurasjon..."
+
+#~ msgid "_Open in New Window"
+#~ msgstr "_Åpne i nytt vindu"
+
+#~ msgid "_Print Message"
+#~ msgstr "S_kriv ut melding"
+
+#~ msgid "_Save Message As..."
+#~ msgstr "Lagre melding _som..."
+
+#~ msgid "_VFolder on Subject"
+#~ msgstr "_VFolder for emne"
+
+#~ msgid "Customi_ze..."
+#~ msgstr "_Tilpass..."
+
+#~ msgid "Show the _Folder Bar"
+#~ msgstr "Vis _mappelinjen"
+
+#~ msgid "Show the _Shortcut Bar"
+#~ msgstr "Vis _snarveilinjen"
+
+#~ msgid "_Settings"
+#~ msgstr "Inn_stillinger"
+
 #~ msgid "The priority must be between 1 and 9, inclusive"
 #~ msgstr "Prioriteten må være mellom 0 og 9, inklusive"
 
@@ -8220,21 +8428,9 @@ msgstr "Gruppevaresuiten Evolution"
 #~ msgid "Edit this appointment..."
 #~ msgstr "Redigér denne avtalen..."
 
-#~ msgid "Transport"
-#~ msgstr "Transport"
-
 #~ msgid "New"
 #~ msgstr "Ny"
 
-#~ msgid "label26"
-#~ msgstr "etikett26"
-
-#~ msgid "label21"
-#~ msgstr "etikett21"
-
-#~ msgid "label55"
-#~ msgstr "etikett55"
-
 #~ msgid "Saving changes to message..."
 #~ msgstr "Lagre endringer i meldingen..."
 
@@ -8371,126 +8567,21 @@ msgstr "Gruppevaresuiten Evolution"
 #~ msgid "Local folders may not be nested."
 #~ msgstr "Lokale mapper kan ikke være rekursive."
 
-#~ msgid "FIXME: _Appointment"
-#~ msgstr "_Avtale"
-
-#~ msgid "FIXME: _Mail Message"
-#~ msgstr "Send _melding"
-
-#~ msgid "FIXME: _Contact"
-#~ msgstr "_Kontakt"
-
-#~ msgid "FIXME: _Task"
-#~ msgstr "_Oppgave"
-
-#~ msgid "FIXME: Task _Request"
-#~ msgstr "Oppgavefo_respørsel"
-
-#~ msgid "FIXME: _Journal Entry"
-#~ msgstr "_Journaloppføring"
-
-#~ msgid "FIXME: _Note"
-#~ msgstr "_Notis"
-
-#~ msgid "FIXME: Ch_oose Form..."
-#~ msgstr "Velg skjema..."
-
-#~ msgid "FIXME: _Memo Style"
-#~ msgstr "_Notis-stil"
-
-#~ msgid "FIXME: S_end"
-#~ msgstr "_Send"
-
-#~ msgid "FIXME: Save Attac_hments..."
-#~ msgstr "Lagre vedle_gg..."
-
-#~ msgid "FIXME: _Move to Folder..."
-#~ msgstr "_Flytt til mappe..."
-
-#~ msgid "FIXME: Cop_y to Folder..."
-#~ msgstr "Kopiér til mappe..."
-
 #~ msgid "Page Set_up"
 #~ msgstr "Sideoppsett"
 
-#~ msgid "FIXME: Print Pre_view"
-#~ msgstr "Forhåndsvisning av utskrift"
-
-#~ msgid "FIXME: Mark as U_nread"
-#~ msgstr "Merk som ulest"
-
 #~ msgid "_Object"
 #~ msgstr "_Objekt"
 
-#~ msgid "FIXME: _Item"
-#~ msgstr "_Oppføring"
-
-#~ msgid "FIXME: _Unread Item"
-#~ msgstr "_Ulest oppføring"
-
-#~ msgid "FIXME: _Standard"
-#~ msgstr "_Standard"
-
-#~ msgid "FIXME: __Formatting"
-#~ msgstr "_Formatering"
-
-#~ msgid "FIXME: _Customize..."
-#~ msgstr "_Tilpass..."
-
 #~ msgid "Ne_xt"
 #~ msgstr "Nes_te"
 
 #~ msgid "_Toolbars"
 #~ msgstr "Verk_tøylinjer"
 
-#~ msgid "FIXME: _File..."
-#~ msgstr "_Fil..."
-
-#~ msgid "FIXME: It_em..."
-#~ msgstr "Opp_føring"
-
-#~ msgid "FIXME: _Object..."
-#~ msgstr "_Objekt..."
-
-#~ msgid "FIXME: _Font..."
-#~ msgstr "FIXME: Skri_fttyper..."
-
-#~ msgid "FIXME: _Paragraph..."
-#~ msgstr "_Avsnitt..."
-
-#~ msgid "FIXME: Desi_gn This Form"
-#~ msgstr "_Utform dette skjemaet"
-
-#~ msgid "FIXME: D_esign a Form..."
-#~ msgstr "U_tform et skjema..."
-
-#~ msgid "FIXME: Publish _Form..."
-#~ msgstr "Publisér skjema..."
-
-#~ msgid "FIXME: Pu_blish Form As..."
-#~ msgstr "Pu_blisér skjema som..."
-
-#~ msgid "FIXME: Script _Debugger"
-#~ msgstr "Feilsøking i skript"
-
-#~ msgid "FIXME: _Spelling..."
-#~ msgstr "_Stavekontroll..."
-
 #~ msgid "_Forms"
 #~ msgstr "Sk_jemaer"
 
-#~ msgid "FIXME: For_ward"
-#~ msgstr "_Videresend"
-
-#~ msgid "_Insert"
-#~ msgstr "Sett _inn"
-
-#~ msgid "FIXME: Previous"
-#~ msgstr "Forrige"
-
-#~ msgid "FIXME: Next"
-#~ msgstr "Neste"
-
 #~ msgid "Configure the Evolution Calendar conduit"
 #~ msgstr "Konfigurasjon av Evolution kalenderkomponent"
 
@@ -8506,9 +8597,6 @@ msgstr "Gruppevaresuiten Evolution"
 #~ msgid "Time"
 #~ msgstr "Tid"
 
-#~ msgid "_Contacts"
-#~ msgstr "_Kontakter"
-
 #~ msgid "description"
 #~ msgstr "beskrivelse"
 
@@ -8562,9 +8650,6 @@ msgstr "Gruppevaresuiten Evolution"
 #~ msgid "Open..."
 #~ msgstr "Åpne..."
 
-#~ msgid "Open the task"
-#~ msgstr "Åpne oppgaven"
-
 #~ msgid "Days"
 #~ msgstr "Dager"
 
@@ -8643,30 +8728,6 @@ msgstr "Gruppevaresuiten Evolution"
 #~ msgid "Saving changes to %s"
 #~ msgstr "Lagrer endringer til %s"
 
-#~ msgid "FIXME: Chec_k Names"
-#~ msgstr "Sjek_k navn"
-
-#~ msgid "FIXME: Help"
-#~ msgstr "Hjelp"
-
-#~ msgid "FIXME: In_complete Task"
-#~ msgstr "U_komplett oppgave"
-
-#~ msgid "FIXME: Insert File"
-#~ msgstr "Sett inn fil"
-
-#~ msgid "FIXME: Rec_urrence..."
-#~ msgstr "Gjentakelse..."
-
-#~ msgid "FIXME: _Formatting"
-#~ msgstr "_Formatering"
-
-#~ msgid "FIXME: _New Appointment"
-#~ msgstr "_Ny avtale"
-
-#~ msgid "Find _Again"
-#~ msgstr "Finn ig_jen"
-
 #~ msgid "_Find..."
 #~ msgstr "_Finn..."
 
@@ -8679,24 +8740,6 @@ msgstr "Gruppevaresuiten Evolution"
 #~ msgid "_Undo"
 #~ msgstr "_Angre"
 
-#~ msgid "FIXME: Assig_n Task"
-#~ msgstr "Tildel o_ppgave"
-
-#~ msgid "FIXME: Reply to A_ll"
-#~ msgstr "Svar til a_lle"
-
-#~ msgid "FIXME: _Mark Complete"
-#~ msgstr "_Merk som fullført"
-
-#~ msgid "FIXME: _New Task"
-#~ msgstr "_Ny oppgave"
-
-#~ msgid "FIXME: _Reply"
-#~ msgstr "Sva_r"
-
-#~ msgid "FIXME: _note"
-#~ msgstr "_notis"
-
 #~ msgid "Group %i"
 #~ msgstr "Gruppe %i"
 
@@ -8768,9 +8811,6 @@ msgstr "Gruppevaresuiten Evolution"
 #~ msgid "Full name:"
 #~ msgstr "Fullt navn:"
 
-#~ msgid "Email address:"
-#~ msgstr "E-post adresse:"
-
 #~ msgid "Signature File"
 #~ msgstr "Signaturfil"
 
@@ -8961,9 +9001,6 @@ msgstr "Gruppevaresuiten Evolution"
 #~ msgid "Headings:"
 #~ msgstr "Topptekster:"
 
-#~ msgid "Empty days:"
-#~ msgstr "Tomme dager:"
-
 #~ msgid "Highlighted day:"
 #~ msgstr "Merket dag:"
 
@@ -9009,9 +9046,6 @@ msgstr "Gruppevaresuiten Evolution"
 #~ msgid "Display message UID \"%s\""
 #~ msgstr "Vis meldings-UID \"%s\""
 
-#~ msgid "Clear message display"
-#~ msgstr "Tøm meldingsvisning"
-
 #~ msgid "Opening messages from folder \"%s\""
 #~ msgstr "Åpner meldinger fra mappe \"%s\""
 
@@ -9030,9 +9064,6 @@ msgstr "Gruppevaresuiten Evolution"
 #~ msgid "N_ew Directory Server"
 #~ msgstr "Ny katalog-tj_ener"
 
-#~ msgid "_Actions"
-#~ msgstr "H_andlinger"
-
 #~ msgid "appointment"
 #~ msgstr "avtaler"
 
@@ -9444,9 +9475,6 @@ msgstr "Gruppevaresuiten Evolution"
 #~ msgid "Custom search"
 #~ msgstr "Egendefinert søk"
 
-#~ msgid "Full Search"
-#~ msgstr "Fullt søk"
-
 #~ msgid " (XXX unread)"
 #~ msgstr " (XXX ulest)"
 
@@ -9522,15 +9550,9 @@ msgstr "Gruppevaresuiten Evolution"
 #~ msgid "Yearly"
 #~ msgstr "Årlig"
 
-#~ msgid "label23"
-#~ msgstr "etikett23"
-
 #~ msgid "Every "
 #~ msgstr "Hver"
 
-#~ msgid "label24"
-#~ msgstr "etikett24"
-
 #~ msgid ""
 #~ "1st\n"
 #~ "2nd\n"
@@ -9561,9 +9583,6 @@ msgstr "Gruppevaresuiten Evolution"
 #~ "Lørdag\n"
 #~ "Søndag\n"
 
-#~ msgid "label27"
-#~ msgstr "etikett27"
-
 #~ msgid "Ending date"
 #~ msgstr "Sluttdato"