Updated Norwegian translation.

2001-01-30  Kjartan Maraas  <kmaraas@gnome.org>

	* no.po: Updated Norwegian translation.

svn path=/trunk/; revision=7899

3 files changed, 1413 insertions, 1277 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index adadb75730..b3433fbec9 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-01-30  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* no.po: Updated Norwegian translation.
+	
 2001-01-29  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
 
 	* sk.po: Added initial Slovak translation.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ff9334c49a..c2ded23ca8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,14 +1,3 @@
-ui/evolution-executive-summary.xml
-executive-summary/component/component-factory.c
-camel/providers/vee/camel-vee-folder.c
-executive-summary/component/e-summary-callbacks.c
-executive-summary/component/e-summary-url.c
-executive-summary/component/e-summary.c
-executive-summary/component/main.c
-executive-summary/test-service/rdf-summary.c
-mail/mail-config.c
-ui/evolution-task-editor-dialog.xml
-ui/evolution-tasks.xml
 addressbook/backend/ebook/e-card-simple.c
 addressbook/backend/ebook/e-card.c
 addressbook/backend/ebook/load-gnomecard-addressbook.c
@@ -69,11 +58,14 @@ calendar/gui/popup-menu.c
 calendar/gui/print.c
 calendar/gui/tasks-control.c
 calendar/gui/weekday-picker.c
+camel/camel-filter-driver.c
 camel/camel-filter-search.c
+camel/camel-folder-search.c
 camel/camel-lock.c
 camel/camel-movemail.c
 camel/camel-provider.c
 camel/camel-remote-store.c
+camel/camel-search-private.c
 camel/camel-service.c
 camel/camel-session.c
 camel/camel-url.c
@@ -103,6 +95,7 @@ camel/providers/sendmail/camel-sendmail-provider.c
 camel/providers/sendmail/camel-sendmail-transport.c
 camel/providers/smtp/camel-smtp-provider.c
 camel/providers/smtp/camel-smtp-transport.c
+camel/providers/vee/camel-vee-folder.c
 camel/providers/vee/camel-vee-provider.c
 composer/e-msg-composer-attachment-bar.c
 composer/e-msg-composer-attachment.c
@@ -110,6 +103,12 @@ composer/e-msg-composer-attachment.glade
 composer/e-msg-composer-hdrs.c
 composer/e-msg-composer.c
 composer/evolution-composer.c
+executive-summary/component/component-factory.c
+executive-summary/component/e-summary-callbacks.c
+executive-summary/component/e-summary-url.c
+executive-summary/component/e-summary.c
+executive-summary/component/main.c
+executive-summary/test-service/rdf-summary.c
 filter/filter-datespec.c
 filter/filter-editor.c
 filter/filter-filter.c
@@ -133,6 +132,7 @@ mail/mail-accounts.c
 mail/mail-account-editor.c
 mail/mail-autofilter.c
 mail/mail-callbacks.c
+mail/mail-config.c
 mail/mail-config.glade
 mail/mail-config-druid.c
 mail/mail-crypto.c
@@ -142,6 +142,7 @@ mail/mail-local.c
 mail/mail-mt.c
 mail/mail-ops.c
 mail/mail-search-dialogue.c
+mail/mail-send-recv.c
 mail/mail-summary.c
 mail/mail-threads.c
 mail/mail-tools.c
@@ -162,13 +163,17 @@ shell/e-shortcuts.c
 shell/e-storage-set-view.c
 shell/e-storage.c
 shell/main.c
+shell/importer/importer.c
 ui/evolution-addressbook.xml
 ui/evolution-calendar.xml
 ui/evolution-contact-editor.xml
 ui/evolution-event-editor.xml
+ui/evolution-executive-summary.xml
 ui/evolution-mail.xml
 ui/evolution-message-composer.xml
 ui/evolution-subscribe.xml
+ui/evolution-task-editor-dialog.xml
+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
@@ -176,4 +181,5 @@ widgets/misc/e-calendar-item.c
 widgets/misc/e-calendar.c
 widgets/misc/e-clipped-label.c
 widgets/misc/e-dateedit.c
+widgets/misc/e-messagebox.c
 widgets/misc/e-search-bar.c
diff --git a/po/no.po b/po/no.po
index df15a881b1..27f67ae082 100644
--- a/po/no.po
+++ b/po/no.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.8\n"
-"POT-Creation-Date: 2001-01-18 09:08+0100\n"
-"PO-Revision-Date: 2001-01-18 09:19+01:00\n"
+"POT-Creation-Date: 2001-01-30 01:08+0100\n"
+"PO-Revision-Date: 2001-01-30 01:08+01:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -304,10 +304,10 @@ msgstr ""
 #: addressbook/backend/ebook/load-pine-addressbook.c:17
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1090
+#: addressbook/conduit/address-conduit.c:1089
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
+#: calendar/conduits/calendar/calendar-conduit.c:1151
+#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initialisere Bonobo"
 
@@ -438,20 +438,20 @@ msgstr "Markøren kunne ikke lokaliseres\n"
 msgid "EBook not loaded\n"
 msgstr "EBook ikke lastet\n"
 
-#: addressbook/conduit/address-conduit.c:653
-#: calendar/conduits/calendar/calendar-conduit.c:729
-#: calendar/conduits/todo/todo-conduit.c:544
+#: addressbook/conduit/address-conduit.c:651
+#: calendar/conduits/calendar/calendar-conduit.c:731
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr "Kunne ikke starte wombat tjener"
 
-#: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/conduit/address-conduit.c:652
+#: calendar/conduits/calendar/calendar-conduit.c:732
+#: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr "Kunne ikke starte wombat"
 
-#: addressbook/conduit/address-conduit.c:686
-#: addressbook/conduit/address-conduit.c:689
+#: addressbook/conduit/address-conduit.c:684
+#: addressbook/conduit/address-conduit.c:687
 msgid "Could not read pilot's Address application block"
 msgstr "Kunne ikke lese pilotens adresseapplikasjonsblokk"
 
@@ -469,8 +469,8 @@ msgid "_Add"
 msgstr "_Legg til"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-event-editor.xml.h:103 ui/evolution-mail.xml.h:49
-#: ui/evolution-task-editor-dialog.xml.h:107
+#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:49
+#: ui/evolution-task-editor-dialog.xml.h:69
 msgid "_Delete"
 msgstr "_Slett"
 
@@ -485,7 +485,6 @@ msgstr "Ny telefontype"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
 #: 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
 msgid "Add"
@@ -563,9 +562,7 @@ msgid "_Address..."
 msgstr "_Adresse..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:11
-#: executive-summary/component/executive-summary-config.glade.h:3
-#: mail/mail-config.glade.h:26
+#: calendar/gui/event-editor-dialog.glade.h:11 mail/mail-config.glade.h:26
 msgid "General"
 msgstr "Generelt"
 
@@ -677,7 +674,7 @@ msgstr "Mobil"
 #: addressbook/contact-editor/e-contact-editor.c:1286
 #: addressbook/contact-editor/e-contact-editor.c:1381
 #: addressbook/gui/widgets/e-addressbook-view.c:578
-#: calendar/gui/e-meeting-dialog.glade.h:14
+#: mail/mail-config.glade.h:45
 msgid "Other"
 msgstr "Annet"
 
@@ -833,16 +830,16 @@ msgstr "Som _minikort"
 msgid "As _Table"
 msgstr "Som _tabell"
 
-#: addressbook/gui/component/addressbook.c:374
+#: addressbook/gui/component/addressbook.c:406
 #, c-format
 msgid "Enter password for %s"
 msgstr "Skriv inn passord for %s"
 
-#: addressbook/gui/component/addressbook.c:402
+#: addressbook/gui/component/addressbook.c:434
 msgid "Unable to open addressbook"
 msgstr "Kunne ikke åpne adresseboken"
 
-#: addressbook/gui/component/addressbook.c:407
+#: addressbook/gui/component/addressbook.c:439
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -863,27 +860,27 @@ msgstr ""
 "installere OpenLDAP, deretter må du kompilere og\n"
 "installere Evolution på nytt.\n"
 
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:562 mail/folder-browser.c:221
 msgid "Show All"
 msgstr "Vis alle"
 
-#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
+#: addressbook/gui/component/addressbook.c:564 mail/folder-browser.c:223
 msgid "Advanced..."
 msgstr "Avansert..."
 
-#: addressbook/gui/component/addressbook.c:562
+#: addressbook/gui/component/addressbook.c:594
 msgid "Any field contains"
 msgstr "Et felt inneholder"
 
-#: addressbook/gui/component/addressbook.c:563
+#: addressbook/gui/component/addressbook.c:595
 msgid "Name contains"
 msgstr "Navn inneholder"
 
-#: addressbook/gui/component/addressbook.c:564
+#: addressbook/gui/component/addressbook.c:596
 msgid "Email contains"
 msgstr "E-post inneholder"
 
-#: addressbook/gui/component/addressbook.c:707
+#: addressbook/gui/component/addressbook.c:739
 msgid "The URI that the Folder Browser will display"
 msgstr "URIen som mappeutforskeren vil vise"
 
@@ -969,7 +966,7 @@ msgid "Authentication:"
 msgstr "Autentisering:"
 
 #: addressbook/gui/component/addressbook-config.c:455
-#: mail/mail-config.glade.h:46
+#: mail/mail-config-druid.c:461 mail/mail-config.glade.h:48
 msgid "Path:"
 msgstr "Sti:"
 
@@ -992,7 +989,7 @@ msgid ""
 msgstr "Velg type adressebok du har, og skriv inn relevant informasjon om den."
 
 #: addressbook/gui/component/addressbook-config.c:616
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 msgid "Name:"
 msgstr "Navn:"
 
@@ -1006,18 +1003,18 @@ msgid "Addressbook Sources"
 msgstr "Adressebok-kilder"
 
 #: addressbook/gui/component/addressbook-config.glade.h:3
-#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-meeting-dialog.glade.h:8
+#: calendar/gui/e-calendar-table.c:402
 #: calendar/gui/event-editor-dialog.glade.h:8 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:7 mail/folder-browser.c:673
+#: filter/libfilter-i18n.h:7 mail/folder-browser.c:684
 #: mail/mail-config.glade.h:19 mail/mail-view.c:150
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:14
-#: ui/evolution-mail.xml.h:6 ui/evolution-task-editor-dialog.xml.h:14
+#: 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
 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:659 mail/mail-config.glade.h:22
+#: filter/filter.glade.h:3 mail/folder-browser.c:670
+#: mail/mail-config.glade.h:22
 msgid "Edit"
 msgstr "Redigér"
 
@@ -1030,42 +1027,6 @@ msgstr "Navn"
 msgid "URI"
 msgstr "URI"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-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
-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
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolution adressebok minikort visning"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Evolution component for handling contacts."
-msgstr "Evolution komponent for håndtering av kontakter."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Factory for minikort kontroll for adressebok"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Factory for the Evolution addressbook component."
-msgstr "Factory for Evolution adressebok-komponent."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the sample Addressbook control"
-msgstr "Factory for eksempelkontroll for adressebok"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "Evolution adressebok-komponent"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Factory for adressebokens grensesnitt for navnevalg"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Find..."
 msgstr "Finn..."
@@ -1082,8 +1043,7 @@ msgstr "Velg navn"
 msgid "Select name from:"
 msgstr "Velg navn fra:"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:147
-#: mail/mail-search-dialogue.c:104
+#: addressbook/gui/search/e-addressbook-search-dialog.c:151
 msgid "Search"
 msgstr "Søk"
 
@@ -1248,10 +1208,6 @@ msgstr "Kommentar"
 msgid "Free-busy URL"
 msgstr "Fri-ledig URL"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:593
-msgid "Click here to add a contact"
-msgstr "Klikk her for å legge til en kontakt"
-
 #: addressbook/gui/widgets/e-minicard-control.c:280
 msgid "Save in addressbook"
 msgstr "Lagre i adressebok"
@@ -1355,7 +1311,6 @@ msgid "Margins"
 msgstr "Marger"
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr "Antall kolonner:"
 
@@ -1427,7 +1382,7 @@ msgstr "Stilnavn:"
 msgid "Top:"
 msgstr "Topp:"
 
-#: addressbook/printing/e-contact-print.glade.h:40 mail/mail-config.glade.h:67
+#: addressbook/printing/e-contact-print.glade.h:40 mail/mail-config.glade.h:70
 msgid "Type:"
 msgstr "Type:"
 
@@ -1447,13 +1402,13 @@ msgstr "Evolution kalender-komponent"
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr "Konfigurasjonsverktøy for evolutions kalender-komponent.\n"
 
-#: calendar/conduits/calendar/calendar-conduit.c:685
-#: calendar/conduits/todo/todo-conduit.c:500
+#: calendar/conduits/calendar/calendar-conduit.c:687
+#: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
 msgstr "Feil under kommunikasjon med kalendertjeneren"
 
-#: calendar/conduits/calendar/calendar-conduit.c:784
-#: calendar/conduits/calendar/calendar-conduit.c:787
+#: calendar/conduits/calendar/calendar-conduit.c:786
+#: calendar/conduits/calendar/calendar-conduit.c:789
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikke lese pilotens kalender-applikasjonsblokk"
 
@@ -1465,39 +1420,24 @@ msgstr "Evolution oppgaveliste-komponent"
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr "Konfigurasjonsverktøy for evolutions oppgavelistekomponent.\n"
 
-#: calendar/conduits/todo/todo-conduit.c:599
-#: calendar/conduits/todo/todo-conduit.c:602
+#: calendar/conduits/todo/todo-conduit.c:600
+#: calendar/conduits/todo/todo-conduit.c:603
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikke lese pilotens applikasjonsblokk for oppgaveliste"
 
-#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
-#: calendar/gui/alarm-notify.c:940
-msgid "Reminder of your appointment at "
-msgstr "Påminnelse om din avtale "
-
-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "Utsett"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "Ok"
-
-#: calendar/gui/calendar-commands.c:245
+#: calendar/gui/calendar-commands.c:248
 msgid "File not found"
 msgstr "Fil ikke funnet"
 
-#: calendar/gui/calendar-commands.c:269
+#: calendar/gui/calendar-commands.c:272
 msgid "Open calendar"
 msgstr "Åpne kalender"
 
-#: calendar/gui/calendar-commands.c:311
+#: calendar/gui/calendar-commands.c:314
 msgid "Save calendar"
 msgstr "Lagre kalender"
 
-#: calendar/gui/calendar-commands.c:448
+#: calendar/gui/calendar-commands.c:451
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -1505,7 +1445,7 @@ msgstr ""
 "konfigurasjon."
 
 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:332
+#: calendar/gui/calendar-model.c:335
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
@@ -1513,61 +1453,61 @@ msgstr "%a %d.%m.%Y"
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
+#: calendar/gui/calendar-model.c:339 calendar/gui/calendar-model.c:769
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d.%m.%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time,
 #. in 12-hour format.
-#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
+#: calendar/gui/calendar-model.c:343 calendar/gui/calendar-model.c:772
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d.%m.%Y %H:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:374
+#: calendar/gui/calendar-model.c:377
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:17
 msgid "Public"
 msgstr "Offentlig"
 
-#: calendar/gui/calendar-model.c:377
+#: calendar/gui/calendar-model.c:380
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:16
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:380
+#: calendar/gui/calendar-model.c:383
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:7
 msgid "Confidential"
 msgstr "Konfidensiell"
 
-#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
+#: calendar/gui/calendar-model.c:386 calendar/gui/calendar-model.c:554
 #: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: calendar/gui/calendar-model.c:471
+#: calendar/gui/calendar-model.c:474
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:471
+#: calendar/gui/calendar-model.c:474
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:476
 msgid "E"
 msgstr "Ø"
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:476
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:545
+#: calendar/gui/calendar-model.c:548
 msgid "Transparent"
 msgstr "Gjennomsiktig"
 
-#: calendar/gui/calendar-model.c:548
+#: calendar/gui/calendar-model.c:551
 msgid "Opaque"
 msgstr "Ugjennomsiktig"
 
-#: calendar/gui/calendar-model.c:774
+#: calendar/gui/calendar-model.c:777
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1579,7 +1519,7 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
+#: calendar/gui/calendar-model.c:878 calendar/gui/calendar-model.c:926
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
 #: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
@@ -1587,27 +1527,27 @@ msgstr "%d.%m.%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:893
+#: calendar/gui/calendar-model.c:896
 msgid "%I:%M:%S %p%n"
 msgstr "%I:%M:%S %p%n"
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:896
+#: calendar/gui/calendar-model.c:899
 msgid "%H:%M:%S%n"
 msgstr "%H:%M:%S%n"
 
 #. strptime format for time of day, without seconds, 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:900
+#: calendar/gui/calendar-model.c:903
 msgid "%I:%M %p%n"
 msgstr "%I:%M %p%n"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:903
+#: calendar/gui/calendar-model.c:906
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:1023
+#: calendar/gui/calendar-model.c:1026
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1617,47 +1557,47 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1063
+#: calendar/gui/calendar-model.c:1066
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Prosentverdien må være mellom 0 og 100, inklusive"
 
-#: calendar/gui/calendar-model.c:1103
+#: calendar/gui/calendar-model.c:1106
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "Prioriteten må være mellom 0 og 9, inklusive"
 
-#: calendar/gui/calendar-summary.c:97
+#: calendar/gui/calendar-summary.c:96
 msgid "%A, %e %B %Y"
 msgstr "%A, %e %B %Y"
 
-#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
+#: calendar/gui/calendar-summary.c:137 calendar/gui/calendar-summary.c:143
 msgid "%I:%M%p"
 msgstr "%I:%M%p"
 
-#: calendar/gui/calendar-summary.c:302
+#: calendar/gui/calendar-summary.c:301
 msgid "<b>Error loading calendar</b>"
 msgstr "<b>Feil under lasting av kalender</b>"
 
-#: calendar/gui/calendar-summary.c:314
+#: calendar/gui/calendar-summary.c:313
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr "<b>Feil under lasting av kalender:<br>Metoden er ikke støttet"
 
-#: calendar/gui/calendar-summary.c:484
+#: calendar/gui/calendar-summary.c:483
 msgid "Display"
 msgstr "Vis"
 
-#: calendar/gui/calendar-summary.c:489
+#: calendar/gui/calendar-summary.c:488
 msgid "Show appointments"
 msgstr "Vis avtaler"
 
-#: calendar/gui/calendar-summary.c:497
+#: calendar/gui/calendar-summary.c:496
 msgid "Show tasks"
 msgstr "Vis oppgaver"
 
-#: calendar/gui/calendar-summary.c:583
+#: calendar/gui/calendar-summary.c:582
 msgid "Loading Calendar"
 msgstr "Laster kalender"
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/control-factory.c:126
 msgid "The URI that the calendar will display"
 msgstr "URIen som kalenderen skal vise"
 
@@ -1674,9 +1614,9 @@ msgid "No summary available."
 msgstr "Ingen sammendrag tilgjengelig."
 
 #: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:8
+#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
 msgid "Close"
 msgstr "Lukk"
 
@@ -1684,6 +1624,10 @@ msgstr "Lukk"
 msgid "Edit appointment"
 msgstr "Rediger avtale:"
 
+#: calendar/gui/dialogs/alarm-notify.glade.h:3
+msgid "Snooze"
+msgstr "Utsett"
+
 #: calendar/gui/dialogs/alarm-notify.glade.h:4
 msgid "Snooze time (minutes)"
 msgstr "Utsett-tid (minutter)"
@@ -1757,7 +1701,7 @@ msgid "Display options"
 msgstr "Vis alternativer"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:159
+#: calendar/gui/e-calendar-table.c:158
 msgid "Due Date"
 msgstr "Ferdig-dato"
 
@@ -1774,7 +1718,6 @@ msgid "First day of week:"
 msgstr "Første dag i uken:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/gnome-month-item.c:741
 msgid "Fri"
 msgstr "Fre"
 
@@ -1804,7 +1747,6 @@ msgid "Items Not Yet Due:"
 msgstr "Oppføringer som ikke har gått ut:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#: calendar/gui/gnome-month-item.c:737
 msgid "Mon"
 msgstr "Man"
 
@@ -1826,7 +1768,7 @@ msgid "Pick a color"
 msgstr "Velg en farge"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:162
+#: calendar/gui/e-calendar-table.c:161
 msgid "Priority"
 msgstr "Prioritet"
 
@@ -1839,7 +1781,6 @@ msgid "Reminders"
 msgstr "Påminnelser"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: calendar/gui/gnome-month-item.c:742
 msgid "Sat"
 msgstr "Lør"
 
@@ -1864,9 +1805,7 @@ msgstr "Vis ukenummer"
 msgid "Start of day:"
 msgstr "Dagen starter:"
 
-#. Initialize by default to three-letter day names
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/gnome-month-item.c:736
 msgid "Sun"
 msgstr "Søn"
 
@@ -1880,7 +1819,6 @@ msgid "TaskPad"
 msgstr "Oppgaveblokk"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-#: calendar/gui/gnome-month-item.c:740
 msgid "Thu"
 msgstr "Tor"
 
@@ -1902,7 +1840,6 @@ msgid "Time format:"
 msgstr "Tidformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/gnome-month-item.c:738
 msgid "Tue"
 msgstr "Tir"
 
@@ -1916,7 +1853,6 @@ msgid "Visual Alarms"
 msgstr "Visuelle alarmer"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-#: calendar/gui/gnome-month-item.c:739
 msgid "Wed"
 msgstr "Ons"
 
@@ -1934,36 +1870,41 @@ msgid "minutes before they occur."
 msgstr "minutter i forveien."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: mail/mail-config.glade.h:76
 msgid "seconds."
 msgstr "sekunder"
 
-#: calendar/gui/dialogs/delete-comp.c:63
+#: calendar/gui/dialogs/delete-comp.c:68
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Er du sikker på at du vil slette avtalen `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:66
+#: calendar/gui/dialogs/delete-comp.c:71
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Er du sikker på at du vil slette denne avtalen uten tittel?"
 
-#: calendar/gui/dialogs/delete-comp.c:72
+#: calendar/gui/dialogs/delete-comp.c:77
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Er du sikker på at du vil slette oppgaven `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:75
+#: calendar/gui/dialogs/delete-comp.c:80
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Er du sikker på at du vil slette denne oppgaven uten tittel?"
 
-#: calendar/gui/dialogs/delete-comp.c:81
+#: calendar/gui/dialogs/delete-comp.c:86
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Er du sikker på at du vil slette journaloppføringen `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:84
+#: calendar/gui/dialogs/delete-comp.c:89
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Er du sikker på at du vil slette denne journaloppføringen uten tittel?"
 
+#: calendar/gui/dialogs/save-comp.c:50
+msgid "Do you want to save changes?"
+msgstr "Vil du lagre endringene?"
+
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:2
 #, no-c-format
 msgid "% Comp_lete:"
@@ -1999,10 +1940,10 @@ msgstr "Lav"
 
 #. add a "None" option to the stores menu
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
-#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
-#: mail/mail-config-druid.c:844 mail/mail-config.glade.h:41
-#: shell/e-shell-view.c:1093 widgets/misc/e-dateedit.c:421
+#: mail/mail-account-editor.c:675 mail/mail-account-editor.c:677
+#: mail/mail-account-editor.c:726 mail/mail-accounts.c:114
+#: mail/mail-config-druid.c:875 mail/mail-config.glade.h:42
+#: shell/e-shell-view.c:1119 widgets/misc/e-dateedit.c:421
 #: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
 msgid "None"
 msgstr "Ingen"
@@ -2055,335 +1996,175 @@ msgstr "_Status:"
 msgid "task-editor-dialog"
 msgstr "task-editor-dialog"
 
-#: calendar/gui/dialogs/task-editor.c:690
+#: calendar/gui/dialogs/task-editor.c:693
 msgid "Edit Task"
 msgstr "Redigér oppgave"
 
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
+#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:337
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
+#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:343
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
+#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:346
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgave - %s"
 
-#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
+#: calendar/gui/dialogs/task-editor.c:711 calendar/gui/event-editor.c:349
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaloppføring - %s"
 
-#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
-msgid "Do you want to save changes?"
-msgstr "Vil du lagre endringene?"
-
-#: calendar/gui/e-calendar-table.c:154
+#: calendar/gui/e-calendar-table.c:153
 msgid "Categories"
 msgstr "Kategorier"
 
-#: calendar/gui/e-calendar-table.c:155
+#: calendar/gui/e-calendar-table.c:154
 #: calendar/gui/event-editor-dialog.glade.h:5
 msgid "Classification"
 msgstr "Klassifisering"
 
-#: calendar/gui/e-calendar-table.c:156
+#: calendar/gui/e-calendar-table.c:155
 msgid "Completion Date"
 msgstr "Fullført dato"
 
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:156
 msgid "End Date"
 msgstr "Sluttdato"
 
-#: calendar/gui/e-calendar-table.c:158
+#: calendar/gui/e-calendar-table.c:157
 msgid "Start Date"
 msgstr "Startdato"
 
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:159
 msgid "Geographical Position"
 msgstr "Geografisk plassering"
 
-#: calendar/gui/e-calendar-table.c:161
+#: calendar/gui/e-calendar-table.c:160
 msgid "Precent complete"
 msgstr "Prosent fullført"
 
-#: calendar/gui/e-calendar-table.c:163
+#: calendar/gui/e-calendar-table.c:162
 msgid "Summary"
 msgstr "Sammendrag"
 
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:163
 msgid "Transparency"
 msgstr "Gjennomsiktighet"
 
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.c:164
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/e-calendar-table.c:165
 msgid "Alarms"
 msgstr "Alarmer"
 
-#: calendar/gui/e-calendar-table.c:167
-msgid "Click here to add a task"
-msgstr "Klikk her for å legge til en oppgave"
-
-#: calendar/gui/e-calendar-table.c:398
+#: calendar/gui/e-calendar-table.c:396
 msgid "Open..."
 msgstr "Åpne..."
 
-#: calendar/gui/e-calendar-table.c:399
+#: calendar/gui/e-calendar-table.c:397
 msgid "Open the task"
 msgstr "Åpne oppgaven"
 
-#: calendar/gui/e-calendar-table.c:401
+#: calendar/gui/e-calendar-table.c:399
 msgid "Mark Complete"
 msgstr "Merk som fullført"
 
-#: calendar/gui/e-calendar-table.c:402
+#: calendar/gui/e-calendar-table.c:400
 msgid "Mark the task complete"
 msgstr "Merk oppgaven som fullført"
 
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/e-calendar-table.c:403
 msgid "Delete the task"
 msgstr "Slett oppgaven"
 
-#: calendar/gui/e-day-view-time-item.c:517
+#: calendar/gui/e-day-view-time-item.c:516
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minutters oppdeling"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1270
 #: calendar/gui/e-week-view-main-item.c:321
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1284
 #: calendar/gui/e-week-view-main-item.c:330
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1297
 #: calendar/gui/e-week-view-main-item.c:344
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
-#: calendar/gui/print.c:610
+#: calendar/gui/e-day-view.c:552 calendar/gui/e-week-view.c:286
+#: calendar/gui/print.c:611
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
-#: calendar/gui/print.c:609
+#: calendar/gui/e-day-view.c:555 calendar/gui/e-week-view.c:289
+#: calendar/gui/print.c:610
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
-#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
-#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
+#: calendar/gui/e-day-view.c:3007 calendar/gui/e-day-view.c:3014
+#: calendar/gui/e-day-view.c:3023 calendar/gui/e-week-view.c:3210
+#: calendar/gui/e-week-view.c:3217 calendar/gui/e-week-view.c:3226
 msgid "New appointment..."
 msgstr "Ny avtale..."
 
-#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
-#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
+#: calendar/gui/e-day-view.c:3011 calendar/gui/e-day-view.c:3018
+#: calendar/gui/e-week-view.c:3214 calendar/gui/e-week-view.c:3221
 msgid "Edit this appointment..."
 msgstr "Redigér denne avtalen..."
 
-#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
-#: ui/evolution-event-editor.xml.h:15
+#: calendar/gui/e-day-view.c:3012 calendar/gui/e-week-view.c:3215
+#: ui/evolution-event-editor.xml.h:18
 msgid "Delete this appointment"
 msgstr "Slett denne avtalen"
 
-#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
+#: calendar/gui/e-day-view.c:3019 calendar/gui/e-week-view.c:3222
 msgid "Make this appointment movable"
 msgstr "Gjør denne avtalen flyttbar"
 
-#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
 msgid "Delete this occurrence"
 msgstr "Slett denne oppføringen"
 
-#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
+#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
 msgid "Delete all occurrences"
 msgstr "Slett alle oppføringer"
 
-#: calendar/gui/e-itip-control.c:152
-msgid "I couldn't update your calendar file!\n"
-msgstr "Kunne ikke oppdatere din kalenderfil!\n"
-
-#: calendar/gui/e-itip-control.c:158 calendar/gui/e-itip-control.c:501
-msgid "Component successfully updated."
-msgstr "Oppdatering av komponent fullført."
-
-#: calendar/gui/e-itip-control.c:164
-msgid "There was an error loading the calendar file."
-msgstr "Det oppsto en feil under lasting av kalenderfilen."
-
-#: calendar/gui/e-itip-control.c:188
-msgid "I couldn't open your calendar file!\n"
-msgstr "Kunne ikke åpne din kalenderfil!\n"
-
-#: calendar/gui/e-itip-control.c:449 calendar/gui/e-itip-control.c:520
-msgid "I couldn't load your calendar file!\n"
-msgstr "Kunne ikke laste din kalenderfil!\n"
-
-#: calendar/gui/e-itip-control.c:461
-msgid "I couldn't read your calendar file!\n"
-msgstr "Kunne ikke lese din kalenderfil!\n"
-
-#: calendar/gui/e-itip-control.c:474
-msgid "This is a reply from someone who was uninvited!"
-msgstr "Dette er et svar fra noen som ikke er invitert!"
-
-#: calendar/gui/e-itip-control.c:490
-msgid "I couldn't update your calendar store."
-msgstr "Kunne ikke oppdatere ditt kalenderlager."
-
-#: calendar/gui/e-itip-control.c:531
-msgid "I couldn't delete the calendar component!\n"
-msgstr "Kunne ikke slette kalenderkomponenten!\n"
-
-#: calendar/gui/e-itip-control.c:541
-msgid "Component successfully deleted."
-msgstr "Sletting av komponent fullført."
-
-#: calendar/gui/e-itip-control.c:685
-msgid "I don't recognize this type of calendar component."
-msgstr "Kan ikke kjenne igjen denne typen kalenderkomponent."
-
-#: calendar/gui/e-itip-control.c:771
-msgid "Add to Calendar"
-msgstr "Legg til i kalenderen"
-
-#: calendar/gui/e-itip-control.c:805
-msgid "Accept"
-msgstr "Akseptér"
-
-#: calendar/gui/e-itip-control.c:806
-msgid "Decline"
-msgstr "Avslå"
-
-#: calendar/gui/e-itip-control.c:807
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "Tentativ"
-
-#: calendar/gui/e-itip-control.c:851
-msgid "Update Calendar"
-msgstr "Oppdatér kalender"
-
-#: calendar/gui/e-itip-control.c:874
-msgid "Cancel Meeting"
-msgstr "Alys møte"
-
-#: calendar/gui/e-meeting-dialog.glade.h:2
-msgid "Attendee"
-msgstr "Deltaker"
-
-#: calendar/gui/e-meeting-dialog.glade.h:3
-msgid "Attendee address"
-msgstr "Deltakers adresse"
-
-#: calendar/gui/e-meeting-dialog.glade.h:4
-msgid "Attendees: "
-msgstr "Deltakere: "
-
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr ""
-"Avlys\n"
-"møte"
-
-#: calendar/gui/e-meeting-dialog.glade.h:7
-msgid "Chair"
-msgstr "Stol"
-
-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
-msgstr "Møteinvitasjoner"
-
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr "Ikke-deltaker"
-
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr "Valgfri deltaker"
-
-#: calendar/gui/e-meeting-dialog.glade.h:13
-msgid "Organizer: "
-msgstr "Organisator: "
-
-#: calendar/gui/e-meeting-dialog.glade.h:15
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
-"Publiser\n"
-"hendelse"
-
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid "RSVP"
-msgstr "RSVP"
-
-#: calendar/gui/e-meeting-dialog.glade.h:18
-msgid ""
-"Request\n"
-"Meeting"
-msgstr ""
-"Forespør\n"
-"møte"
-
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Required Participant"
-msgstr ""
-"Obligatorisk\n"
-"deltaker"
-
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid "Role"
-msgstr "Rolle"
-
-#: calendar/gui/e-meeting-dialog.glade.h:22
-msgid ""
-"Schedule\n"
-"Time"
-msgstr ""
-"Sett av\n"
-"tid"
-
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:22
-#: mail/message-list.c:1109
-msgid "Status"
-msgstr "Status"
-
-#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
-#: calendar/gui/e-tasks.c:492
+#: calendar/gui/e-tasks.c:139 calendar/gui/e-tasks.c:453
+#: calendar/gui/e-tasks.c:486
 msgid "All"
 msgstr "Alle"
 
-#: calendar/gui/e-tasks.c:146
+#: calendar/gui/e-tasks.c:145
 msgid "Category:"
 msgstr "Kategori:"
 
-#: calendar/gui/e-tasks.c:285
+#: calendar/gui/e-tasks.c:283
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kunne ikke laste oppgavene i `%s'"
 
-#: calendar/gui/e-tasks.c:297
+#: calendar/gui/e-tasks.c:295
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden som er nødvendig for å laste `%s' er ikke støttet"
@@ -2580,57 +2361,17 @@ msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Denne avtalen har gjeninntreffelser som ikke kan redigeres av Evolution."
 
-#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1093
+#: calendar/gui/event-editor.c:3091 calendar/gui/print.c:1091
+#: calendar/gui/print.c:1093 calendar/gui/print.c:1094
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "Evolution calendar executive summary component."
-msgstr "Evolution komponent for kalendersammendrag."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolution kalender iTip/iMip-visning"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution component for handling the calendar."
-msgstr "Evolution komponent for håndtering av kalenderen."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Factory for the Calendar Summary component."
-msgstr "Factory for kalenderens sammendragskomponent."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Evolution calendar component."
-msgstr "Factory for Evolution kalender-komponent."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the calendar iTip view control"
-msgstr "Factory for kalenderens iTip visningskontroll"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "description"
-msgstr "beskrivelse"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "name"
-msgstr "navn"
-
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Eksempel på Bonobo-kontroll som viser en kalender."
-
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:2
-msgid "Factory for the sample Calendar control"
-msgstr "Factory for eksempelkontroll for kalender"
-
-#: calendar/gui/gnome-cal.c:696
+#: calendar/gui/gnome-cal.c:694
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kunne ikke åpne mappen i `%s'"
 
-#: calendar/gui/gnome-cal.c:707
+#: calendar/gui/gnome-cal.c:705
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoden som er nødvendig for å åpne `%s' er ikke støttet"
@@ -2691,210 +2432,256 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/main.c:50
+#: calendar/gui/main.c:49
 msgid "Could not initialize GNOME"
 msgstr "Kunne ikke initiere GNOME"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:294
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:294
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:294
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:294
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:294
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:295
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:295
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:295
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:295
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:295
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:296
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:296
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:296
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:296
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:296
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:297
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:297
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:297
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:297
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:297
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:298
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:298
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:298
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:298
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:298
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:299
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:299
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:299
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:299
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:299
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:300
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:356
 msgid "Su"
 msgstr "Søn"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:356
 msgid "Mo"
 msgstr "Man"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:356
 msgid "Tu"
 msgstr "Tir"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:356
 msgid "We"
 msgstr "Ons"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:356
 msgid "Th"
 msgstr "Tor"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:356
 msgid "Fr"
 msgstr "Fre"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:356
 msgid "Sa"
 msgstr "Lør"
 
-#: calendar/gui/print.c:941
+#: calendar/gui/print.c:942
 msgid "Tasks"
 msgstr "Oppgaver"
 
 #. Day
-#: calendar/gui/print.c:1071
+#: calendar/gui/print.c:1072
 msgid "Current day (%a %b %d %Y)"
 msgstr "I dag (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1085 calendar/gui/print.c:1089
+#: calendar/gui/print.c:1086 calendar/gui/print.c:1090
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1086
+#: calendar/gui/print.c:1087
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1097
+#: calendar/gui/print.c:1098
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr "Denne uken (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1105
+#: calendar/gui/print.c:1106
 msgid "Current month (%b %Y)"
 msgstr "Denne måneden (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1112
+#: calendar/gui/print.c:1113
 msgid "Current year (%Y)"
 msgstr "Dette året (%Y)"
 
-#: calendar/gui/print.c:1149
+#: calendar/gui/print.c:1150
 msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
+#: calendar/gui/print.c:1315 mail/mail-callbacks.c:1035
 msgid "Print Preview"
 msgstr "Forhåndsvisning av utskrift"
 
-#: calendar/gui/tasks-control.c:105
+#: calendar/gui/tasks-control.c:104
 msgid "The URI of the tasks folder to display"
 msgstr "URIen til oppgavemappen skal vises"
 
-#: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
+#: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
 msgid "SMTWTFS"
 msgstr "SMTWTFS"
 
+#: camel/camel-filter-driver.c:767
+#, c-format
+msgid "Error parsing filter: %s: %s"
+msgstr "Feil under lesing av filter: %s: %s"
+
+#: camel/camel-filter-driver.c:772
+#, c-format
+msgid "Error executing filter: %s: %s"
+msgstr "Feil under kjøring av filter: %s: %s"
+
+#: camel/camel-filter-search.c:420 camel/camel-filter-search.c:426
+#, c-format
+msgid "Error executing filter search: %s: %s"
+msgstr "Feil under kjøring av filtersøk: %s: %s"
+
+#: camel/camel-folder-search.c:320
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Kan ikke tolke søkeuttrykket: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:330
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Feil under kjøring av søkeuttrykk: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:475 camel/camel-folder-search.c:503
+msgid "(match-all) requires a single bool result"
+msgstr "(treff-alle) krever et enkelt bool resultat"
+
+#: camel/camel-folder-search.c:547
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "Utfører spørrng på ukjent header: %s"
+
+#: camel/camel-folder-search.c:656 camel/camel-folder-search.c:693
+msgid "Invalid type in body-contains, expecting string"
+msgstr "Ugyldig type i body-contains, forventer streng"
+
 #. well, this is really only a programatic error
 #: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
 #: camel/camel-movemail.c:183
@@ -3011,6 +2798,11 @@ msgstr "(ukjent vert)"
 msgid "Operation cancelled"
 msgstr "Opreasjon avbrutt"
 
+#: camel/camel-search-private.c:101
+#, c-format
+msgid "Regular expression compilation failed: %s: %s"
+msgstr "Kompilering av vanlig uttrykk feilet: %s: %s"
+
 #: camel/camel-service.c:137
 #, c-format
 msgid "URL '%s' needs a username component"
@@ -3088,7 +2880,7 @@ msgstr "Uventet svar fra IMAP-tjener: %s"
 msgid "IMAP command failed: %s"
 msgstr "IMAP-kommando feilet: %s"
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:433
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
@@ -3378,66 +3170,66 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "MAppen `%s' er ikke tom. Ikke slettet."
 
-#: camel/providers/local/camel-mbox-summary.c:234
+#: camel/providers/local/camel-mbox-summary.c:240
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr "Kunne ikke åpne mappe: %s: lager sammendrag fra posisjon %ld: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:268
+#: camel/providers/local/camel-mbox-summary.c:274
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Fatal feil i lesing av postboksen nær posisjon %ld i mappe %s"
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:349
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Kan ikke lage sammendrag for mappe: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:477
-#: camel/providers/local/camel-mbox-summary.c:668
+#: camel/providers/local/camel-mbox-summary.c:483
+#: camel/providers/local/camel-mbox-summary.c:674
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "Kan ikke åpne mappe for å lage sammendrag: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:493
+#: camel/providers/local/camel-mbox-summary.c:499
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kan ikke åpne midlertidig postboks: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:514
-#: camel/providers/local/camel-mbox-summary.c:522
-#: camel/providers/local/camel-mbox-summary.c:701
-#: camel/providers/local/camel-mbox-summary.c:709
+#: camel/providers/local/camel-mbox-summary.c:520
+#: camel/providers/local/camel-mbox-summary.c:528
+#: camel/providers/local/camel-mbox-summary.c:707
+#: camel/providers/local/camel-mbox-summary.c:715
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Feil i sammendrag og mappe, selv etter synkronisering"
 
-#: camel/providers/local/camel-mbox-summary.c:565
+#: camel/providers/local/camel-mbox-summary.c:571
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Feil under skriving til midlertidig postboks: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:588
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Skriving til midlertidig postboks feilet: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-mbox-summary.c:759
+#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-mbox-summary.c:765
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kunne ikke lukke kildemappe %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:609
+#: camel/providers/local/camel-mbox-summary.c:615
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Kunne ikke lukke midlertidig mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:620
+#: camel/providers/local/camel-mbox-summary.c:626
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunne ikke endre navn på mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:830
+#: camel/providers/local/camel-mbox-summary.c:836
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ukjent feil: %s"
@@ -3629,7 +3421,7 @@ msgid "No such folder `%s'."
 msgstr "Ingen slik mappe `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:59
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -3679,7 +3471,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:52
+#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:54
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -3927,7 +3719,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
+#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:113
 msgid "attachment"
 msgstr "vedlegg"
 
@@ -3953,7 +3745,7 @@ msgstr "Legg til vedlegg..."
 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:1109
+#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1115
 msgid "Attachment"
 msgstr "Vedlegg"
 
@@ -3977,40 +3769,40 @@ msgstr "MIME-type:"
 msgid "Send as:"
 msgstr "Send som:"
 
-#: composer/e-msg-composer-hdrs.c:148 composer/e-msg-composer-hdrs.c:323
-#: mail/mail-format.c:624
+#: composer/e-msg-composer-hdrs.c:149 composer/e-msg-composer-hdrs.c:353
+#: mail/mail-format.c:626
 msgid "From:"
 msgstr "Fra:"
 
-#: composer/e-msg-composer-hdrs.c:267
+#: composer/e-msg-composer-hdrs.c:297
 msgid "Click here for the address book"
 msgstr "Klikk her for å få opp adresseboken"
 
-#: composer/e-msg-composer-hdrs.c:324
+#: composer/e-msg-composer-hdrs.c:354
 msgid "Enter the identity you wish to send this message from"
 msgstr "Skriv inn identiteten du ønsker å bruke ved sending av denne meldingen"
 
-#: composer/e-msg-composer-hdrs.c:328 mail/mail-format.c:628
+#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:630
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:329
+#: composer/e-msg-composer-hdrs.c:359
 msgid "Enter the recipients of the message"
 msgstr "Skriv inn mottakerene for meldingen"
 
-#: composer/e-msg-composer-hdrs.c:333 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:363 mail/mail-format.c:632
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:334
+#: composer/e-msg-composer-hdrs.c:364
 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:339
+#: composer/e-msg-composer-hdrs.c:369
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:340
+#: composer/e-msg-composer-hdrs.c:370
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4018,15 +3810,15 @@ 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:346 mail/mail-format.c:632
+#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:634
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:347
+#: composer/e-msg-composer-hdrs.c:377
 msgid "Enter the subject of the mail"
 msgstr "Skriv inn emnet for meldingen"
 
-#: composer/e-msg-composer.c:430
+#: composer/e-msg-composer.c:497
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -4035,38 +3827,38 @@ msgstr ""
 "Kunne ikke åpne signaturfilen %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:598
+#: composer/e-msg-composer.c:665
 msgid "Save as..."
 msgstr "Lagre som..."
 
-#: composer/e-msg-composer.c:609
+#: composer/e-msg-composer.c:676
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Feil under lagring av fil: %s"
 
-#: composer/e-msg-composer.c:629
+#: composer/e-msg-composer.c:696
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Feil under lasting av fil: %s"
 
-#: composer/e-msg-composer.c:651
+#: composer/e-msg-composer.c:718
 msgid "Saving changes to message..."
 msgstr "Lagre endringer i meldingen..."
 
-#: composer/e-msg-composer.c:653
+#: composer/e-msg-composer.c:720
 msgid "Save changes to message..."
 msgstr "Lagre endringer til meldingen..."
 
-#: composer/e-msg-composer.c:694
+#: composer/e-msg-composer.c:761
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Feil under lagring av brevet i 'Skisser': %s"
 
-#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:819 shell/e-shell-view-menu.c:183
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:758
+#: composer/e-msg-composer.c:825
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4076,27 +3868,27 @@ msgstr ""
 "\n"
 "Vil du lagre endringene?"
 
-#: composer/e-msg-composer.c:783
+#: composer/e-msg-composer.c:850
 msgid "Open file"
 msgstr "Åpne fil"
 
-#: composer/e-msg-composer.c:909
+#: composer/e-msg-composer.c:976
 msgid "That file does not exist."
 msgstr "Filen eksisterer ikke."
 
-#: composer/e-msg-composer.c:919
+#: composer/e-msg-composer.c:986
 msgid "That is not a regular file."
 msgstr "Er ikke en vanlig fil."
 
-#: composer/e-msg-composer.c:929
+#: composer/e-msg-composer.c:996
 msgid "That file exists but is not readable."
 msgstr "Filen eksisterer men er ikke lesbar."
 
-#: composer/e-msg-composer.c:939
+#: composer/e-msg-composer.c:1006
 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:961
+#: composer/e-msg-composer.c:1028
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4104,27 +3896,27 @@ msgstr ""
 "File en meget stor (mer enn 100K).\n"
 "Er du sikker på at du vil sette den inn?"
 
-#: composer/e-msg-composer.c:982
+#: composer/e-msg-composer.c:1049
 msgid "An error occurred while reading the file."
 msgstr "En feil oppsto under lesing fra filen."
 
-#: composer/e-msg-composer.c:1158 composer/e-msg-composer.c:1379
+#: composer/e-msg-composer.c:1292 composer/e-msg-composer.c:1527
 msgid "Compose a message"
 msgstr "Skriv en melding"
 
-#: composer/e-msg-composer.c:1458
+#: composer/e-msg-composer.c:1608
 msgid "Could not create composer window."
 msgstr "Kan ikke opprette komponeringsvinduet."
 
-#: composer/evolution-composer.c:346
+#: composer/evolution-composer.c:360
 msgid "Cannot initialize Evolution's composer."
 msgstr "Kan ikke initiere Evolutions composer."
 
-#: executive-summary/component/component-factory.c:152
+#: executive-summary/component/component-factory.c:159
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "Kan ikke initiere Evolutions sammendragskomponent."
 
-#: executive-summary/component/e-summary-callbacks.c:267
+#: executive-summary/component/e-summary-callbacks.c:285
 msgid ""
 "You can select a different HTML page for the background of the Executive "
 "Summary.\n"
@@ -4192,7 +3984,7 @@ msgstr "Flytt %s til neste rad"
 msgid "Configure %s"
 msgstr "Konfigurér %s"
 
-#: executive-summary/component/e-summary.c:919
+#: executive-summary/component/e-summary.c:916
 #, c-format
 msgid ""
 "Cannot open the HTML file:\n"
@@ -4201,7 +3993,7 @@ msgstr ""
 "Kan ikke åpne HTML-fil:\n"
 "%s"
 
-#: executive-summary/component/e-summary.c:933
+#: executive-summary/component/e-summary.c:930
 #, c-format
 msgid ""
 "Error reading data:\n"
@@ -4210,18 +4002,10 @@ msgstr ""
 "Feil under lesing av data:\n"
 "%s"
 
-#: executive-summary/component/e-summary.c:951
+#: executive-summary/component/e-summary.c:948
 msgid "File does not have a place for the services.\n"
 msgstr "Filen har ikke en plass til tjenestene.\n"
 
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr "Utseende"
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr "Bakgrunn:"
-
 #: executive-summary/component/main.c:59
 msgid ""
 "Executive summary component could not initialize Bonobo.\n"
@@ -4232,6 +4016,13 @@ msgstr ""
 "Hvis du så en advarsel angående RootPOA, betyr dette sannsynligvis\n"
 "at du kompilerte Bonobo mot GOAD i stedet for OAF."
 
+#: executive-summary/test-service/rdf-summary.c:455
+#: executive-summary/test-service/rdf-summary.c:491
+#: executive-summary/test-service/rdf-summary.c:536
+#: widgets/misc/e-messagebox.c:155
+msgid "Error"
+msgstr "Feil"
+
 #: filter/filter-datespec.c:62
 msgid "year"
 msgstr "år"
@@ -4401,7 +4192,7 @@ msgstr "Skriv inn URI for mappen"
 msgid "<click here to select a folder>"
 msgstr "<klikk her for å velge en mappe>"
 
-#: filter/filter-input.c:189
+#: filter/filter-input.c:185
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -4410,11 +4201,6 @@ msgstr ""
 "Feil i regulært uttrykk '%s':\n"
 "%s"
 
-#: filter/filter-message-search.c:384 filter/filter-message-search.c:452
-#, c-format
-msgid "Failed to perform regex search on message header: %s"
-msgstr "Feil under utførelse av søk etter vanlig uttrykk i meldingshode: %s"
-
 #: filter/filter-part.c:467
 msgid "Test"
 msgstr "Test"
@@ -4451,17 +4237,17 @@ msgstr "Legg til kriterie"
 msgid "Remove criterion"
 msgstr "Fjern kriterie"
 
-#: filter/filter-system-flag.c:67
+#: filter/filter-system-flag.c:63
 msgid "Replied to"
 msgstr "Svart til"
 
 #. { _("Deleted"), "Deleted" },
 #. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:70
+#: filter/filter-system-flag.c:66
 msgid "Important"
 msgstr "Viktig"
 
-#: filter/filter-system-flag.c:71
+#: filter/filter-system-flag.c:67
 msgid "Read"
 msgstr "Les"
 
@@ -4547,7 +4333,7 @@ msgid "Regex Match"
 msgstr "Treff på vanlig uttrykk"
 
 #: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1109
+#: mail/message-list.c:1115
 msgid "Score"
 msgstr "Poenggi"
 
@@ -4567,11 +4353,15 @@ msgstr "Kilde"
 msgid "Specific header"
 msgstr "Spesifikk header"
 
+#: filter/libfilter-i18n.h:22 mail/message-list.c:1115
+msgid "Status"
+msgstr "Status"
+
 #: filter/libfilter-i18n.h:23
 msgid "Stop Processing"
 msgstr "Stopp behandling"
 
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
+#: filter/libfilter-i18n.h:24 mail/message-list.c:1116
 msgid "Subject"
 msgstr "Emne"
 
@@ -4671,11 +4461,11 @@ msgstr "Legg til regel for VFolder"
 msgid "Edit VFolder Rule"
 msgstr "Redigér VFolder regel"
 
-#: mail/component-factory.c:286
+#: mail/component-factory.c:294
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikke initiere Evolutions e-postkomponent."
 
-#: mail/component-factory.c:322
+#: mail/component-factory.c:320
 msgid "Cannot register storage with shell"
 msgstr "Kan ikke registrere lagring i skallet"
 
@@ -4683,151 +4473,123 @@ msgstr "Kan ikke registrere lagring i skallet"
 msgid "Store search as vFolder"
 msgstr "Lagre søk som vMappe"
 
-#: mail/folder-browser.c:238
+#: mail/folder-browser.c:239
 msgid "Body or subject contains"
 msgstr "Kropp eller emne inneholder"
 
-#: mail/folder-browser.c:239
+#: mail/folder-browser.c:240
 msgid "Body contains"
 msgstr "Kropp inneholder"
 
-#: mail/folder-browser.c:240
+#: mail/folder-browser.c:241
 msgid "Subject contains"
 msgstr "Emne inneholder"
 
-#: mail/folder-browser.c:241
+#: mail/folder-browser.c:242
 msgid "Body does not contain"
 msgstr "Kropp inneholder ikke"
 
-#: mail/folder-browser.c:242
+#: mail/folder-browser.c:243
 msgid "Subject does not contain"
 msgstr "Emne inneholder ikke"
 
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:244
+msgid "Sender contains"
+msgstr "Sender inneholder"
+
+#: mail/folder-browser.c:656
 msgid "VFolder on Subject"
 msgstr "VFolder for emne"
 
-#: mail/folder-browser.c:646
+#: mail/folder-browser.c:657
 msgid "VFolder on Sender"
 msgstr "VFolder for sender"
 
-#: mail/folder-browser.c:647
+#: mail/folder-browser.c:658
 msgid "VFolder on Recipients"
 msgstr "VFolder for mottakere"
 
-#: mail/folder-browser.c:649
+#: mail/folder-browser.c:660
 msgid "Filter on Subject"
 msgstr "Filtrér etter emne"
 
-#: mail/folder-browser.c:650
+#: mail/folder-browser.c:661
 msgid "Filter on Sender"
 msgstr "Filtrér etter sender"
 
-#: mail/folder-browser.c:651
+#: mail/folder-browser.c:662
 msgid "Filter on Recipients"
 msgstr "Filtrér etter mottaker"
 
-#: mail/folder-browser.c:652 mail/folder-browser.c:766
+#: mail/folder-browser.c:663 mail/folder-browser.c:777
 msgid "Filter on Mailing List"
 msgstr "Filtrér etter e-postliste"
 
-#: mail/folder-browser.c:658 ui/evolution-message-composer.xml.h:10
+#: mail/folder-browser.c:669 ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Åpne"
 
-#: mail/folder-browser.c:660
+#: mail/folder-browser.c:671
 msgid "Save As..."
 msgstr "Lagre som..."
 
-#: mail/folder-browser.c:661 mail/mail-view.c:148
+#: mail/folder-browser.c:672 mail/mail-view.c:148
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:18
 #: ui/evolution-mail.xml.h:26 ui/evolution-tasks.xml.h:4
 msgid "Print"
 msgstr "Skriv ut"
 
-#: mail/folder-browser.c:663
+#: mail/folder-browser.c:674
 msgid "Reply to Sender"
 msgstr "Svar til sender"
 
-#: mail/folder-browser.c:664 mail/mail-view.c:141 ui/evolution-mail.xml.h:32
+#: mail/folder-browser.c:675 mail/mail-view.c:141 ui/evolution-mail.xml.h:32
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: mail/folder-browser.c:665 mail/mail-view.c:144 ui/evolution-mail.xml.h:12
+#: mail/folder-browser.c:676 mail/mail-view.c:144 ui/evolution-mail.xml.h:12
 msgid "Forward"
 msgstr "Videresend"
 
-#: mail/folder-browser.c:666 ui/evolution-mail.xml.h:13
+#: mail/folder-browser.c:677 ui/evolution-mail.xml.h:13
 msgid "Forward inline"
 msgstr "Videresend \"inline\""
 
-#: mail/folder-browser.c:668
+#: mail/folder-browser.c:679
 msgid "Mark as Read"
 msgstr "Markér som lest"
 
-#: mail/folder-browser.c:669
+#: mail/folder-browser.c:680
 msgid "Mark as Unread"
 msgstr "Merk som ulest"
 
-#: mail/folder-browser.c:671
+#: mail/folder-browser.c:682
 msgid "Move to Folder..."
 msgstr "Flytt til mappe..."
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:683
 msgid "Copy to Folder..."
 msgstr "Kopiér til mappe..."
 
-#: mail/folder-browser.c:674
+#: mail/folder-browser.c:685
 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:678
+#: mail/folder-browser.c:689
 msgid "Apply Filters"
 msgstr "Påfør filtre"
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:691
 msgid "Create Rule From Message"
 msgstr "Lage regel fra melding"
 
-#: mail/folder-browser.c:768
+#: mail/folder-browser.c:779
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrér etter e-postliste (%s)"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr "Evolution komponent for håndtering av e-post."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
-msgstr "Evolutions e-postredigering."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-msgstr "Evolution e-post komponent for sammendrag."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr "Evolution komponent for e-post mappevisning."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr "Evolution komponent for e-postmappe factory."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
-msgstr "Factory for Evolution meldingsredigering."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr "Factory for Evolution e-post komponent."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr "Factory for e-post sammendrag komponent."
-
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr "Aktivt lagringsformat:"
@@ -4842,23 +4604,23 @@ msgstr "Nytt lagringsformat:"
 
 #: mail/local-config.glade.h:4
 msgid ""
-"Note: When converting between mailbox formats, a failure (such as lack of "
-"disk space) may not be automatically recoverable.  Please use this feature "
-"with care."
+"Note: When converting between mailbox formats, a failure\n"
+"(such as lack of disk space) may not be automatically\n"
+"recoverable.  Please use this feature with care."
 msgstr ""
-"Merk: Ved konvertering mellom postboksformater, kan en feil (slik som mangel "
-"på diskplass) ikke nødvendigvis rettes opp igjen. Vennligst bruk denne "
-"funksjonen med forsiktighet."
+"Merk: Ved konvertering mellom postboksformater, kan en feil\n"
+"(slik som mangel på diskplass) ikke nødvendigvis rettes opp\n"
+"igjen. Vennligst bruk denne funksjonen med forsiktighet."
 
-#: mail/local-config.glade.h:5
+#: mail/local-config.glade.h:7
 msgid "maildir"
 msgstr "maildir"
 
-#: mail/local-config.glade.h:6
+#: mail/local-config.glade.h:8
 msgid "mbox"
 msgstr "mbox"
 
-#: mail/local-config.glade.h:7
+#: mail/local-config.glade.h:9
 msgid "mh"
 msgstr "mh"
 
@@ -4867,11 +4629,11 @@ msgid " (default)"
 msgstr " (forvalgt)"
 
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:347
+#: mail/mail-accounts.c:367
 msgid "Evolution Account Manager"
 msgstr "Kontohåndtering for Evolution"
 
-#: mail/mail-account-editor.c:274
+#: mail/mail-account-editor.c:266
 msgid ""
 "One or more of your servers are not configured correctly.\n"
 "Do you wish to save anyway?"
@@ -4880,7 +4642,7 @@ msgstr ""
 "Vil du lagre likevel?"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:634
+#: mail/mail-account-editor.c:626
 msgid "Evolution Account Editor"
 msgstr "Kontoredigering for Evolution"
 
@@ -4904,7 +4666,7 @@ msgstr "E-post fra %s"
 msgid "%s mailing list"
 msgstr "%s e-postliste"
 
-#: mail/mail-callbacks.c:83
+#: mail/mail-callbacks.c:82
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -4916,7 +4678,7 @@ msgstr ""
 "motta eller skrive meldinger.\n"
 "Vil du konfigurere den nå?"
 
-#: mail/mail-callbacks.c:136
+#: mail/mail-callbacks.c:135
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -4924,7 +4686,7 @@ msgstr ""
 "Du må konfigurere en identitet\n"
 "før du kan skrive e-post."
 
-#: mail/mail-callbacks.c:148
+#: mail/mail-callbacks.c:147
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -4932,15 +4694,11 @@ msgstr ""
 "Du må konfigurere en e-post-transport\n"
 "før du kan skrive e-post."
 
-#: mail/mail-callbacks.c:223
+#: mail/mail-callbacks.c:191
 msgid "You have not set a mail transport method"
 msgstr "Du har ikke satt en transportmetode for e-post"
 
-#: mail/mail-callbacks.c:232
-msgid "You have no Outbox configured"
-msgstr "Du har ikke konfigurert en utboks"
-
-#: mail/mail-callbacks.c:279
+#: mail/mail-callbacks.c:224
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -4948,27 +4706,27 @@ msgstr ""
 "Denne meldingen har ikke emne.\n"
 "Send likevel?"
 
-#: mail/mail-callbacks.c:345
+#: mail/mail-callbacks.c:290
 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:365
+#: mail/mail-callbacks.c:310
 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:594
+#: mail/mail-callbacks.c:535
 msgid "Forwarded message:\n"
 msgstr "Videresendt melding:\n"
 
-#: mail/mail-callbacks.c:675
+#: mail/mail-callbacks.c:618
 msgid "Move message(s) to"
 msgstr "Flytt melding(er) til"
 
-#: mail/mail-callbacks.c:677
+#: mail/mail-callbacks.c:620
 msgid "Copy message(s) to"
 msgstr "Kopiér melding(er) til"
 
-#: mail/mail-callbacks.c:812
+#: mail/mail-callbacks.c:755
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4976,11 +4734,11 @@ msgstr ""
 "Du kan kun redigere meldinger lagret\n"
 "i Skisser-katalogen."
 
-#: mail/mail-callbacks.c:845 mail/mail-display.c:79
+#: mail/mail-callbacks.c:788 mail/mail-display.c:83
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
-#: mail/mail-callbacks.c:849 mail/mail-display.c:83
+#: mail/mail-callbacks.c:792 mail/mail-display.c:87
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4988,15 +4746,15 @@ msgstr ""
 "En fil med samme navn eksisterer allerede.\n"
 "Overskriv den?"
 
-#: mail/mail-callbacks.c:893
+#: mail/mail-callbacks.c:836
 msgid "Save Message As..."
 msgstr "Lagre melding som..."
 
-#: mail/mail-callbacks.c:895
+#: mail/mail-callbacks.c:838
 msgid "Save Messages As..."
 msgstr "Lagre meldinger som..."
 
-#: mail/mail-callbacks.c:979
+#: mail/mail-callbacks.c:946
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -5005,11 +4763,11 @@ msgstr ""
 "Feil under lasting av filter-informasjon:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1028
+#: mail/mail-callbacks.c:995
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/mail-callbacks.c:1075
+#: mail/mail-callbacks.c:1042
 msgid "Printing of message failed"
 msgstr "Feil under utskrift av melding"
 
@@ -5134,98 +4892,106 @@ msgid "Make this my default account"
 msgstr "Bruk denne som standard konto"
 
 #: mail/mail-config.glade.h:38
+msgid "Mark messages as \"Read\" after:"
+msgstr "Merk melding som \"Lest\" etter:"
+
+#: mail/mail-config.glade.h:39
 msgid "Miscellaneous"
 msgstr "Forskjellig"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 msgid "News"
 msgstr "News"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:43
 msgid "Optional"
 msgstr "Valgfri"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Organization:"
 msgstr "Organisasjon:"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Outgoing Mail Server"
 msgstr "E-posttjener for utgående post"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Password:"
 msgstr "Passord:"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Plain Text"
 msgstr "Vanlig tekst"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Receiving Email"
 msgstr "Mottar e-post"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Remember my password"
 msgstr "Husk mitt passord"
 
-#: mail/mail-config.glade.h:50 mail/mail-format.c:626
+#: mail/mail-config.glade.h:52 mail/mail-format.c:628
 msgid "Reply-To:"
 msgstr "Svar-til:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Required"
 msgstr "Nødvendige"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Save password"
 msgstr "Lagre passord"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Select signature file"
 msgstr "Velg signaturfil"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
+msgid "Send mail in HTML format by default."
+msgstr "Send meldinger i HTML-format som standard."
+
+#: mail/mail-config.glade.h:58
 msgid "Sending Email"
 msgstr "Sender e-post"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 msgid "Server Configuration"
 msgstr "Tjenerkonfigurasjon"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 msgid "Server Type: "
 msgstr "Tjenertype: "
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "Server requires authentication"
 msgstr "Tjener krever autentisering"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:63
 msgid "Servers"
 msgstr "Tjenere"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:64
 msgid "Signature file:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Signature:"
 msgstr "Signatur:"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Sources"
 msgstr "Kilder"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 msgid "This server requires a secure connection (SSL)"
 msgstr "Denne tjeneren krever en sikker forbindelse (SSL)"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:68
 msgid "Type"
 msgstr "Type"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid ""
 "Type the name by which you would like to refer to these servers. For "
 "example: \"Work\" or \"Home\"."
@@ -5233,15 +4999,15 @@ msgstr ""
 "Skriv inn et referansenavn for disse tjenerene. For eksempel: \"Arbeid\" "
 "eller \"Hjemme\"."
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:71
 msgid "User Information"
 msgstr "Brukerinformasjon"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Username:"
 msgstr "Brukernavn:"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -5251,7 +5017,7 @@ msgstr ""
 "\n"
 "Klikk \"Neste\" for å begynne."
 
-#: mail/mail-config-druid.c:363
+#: mail/mail-config-druid.c:364
 #, c-format
 msgid ""
 "Failed to verify the incoming mail configuration.\n"
@@ -5260,7 +5026,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:629
+#: mail/mail-config-druid.c:459
+msgid "Namespace:"
+msgstr "Navneområde:"
+
+#: mail/mail-config-druid.c:644
 #, c-format
 msgid ""
 "Failed to verify the outgoing mail configuration.\n"
@@ -5270,101 +5040,99 @@ msgstr ""
 "Du vil kunne oppleve problemer ved sending av e-post gjennom %s"
 
 #. set window title
-#: mail/mail-config-druid.c:949
+#: mail/mail-config-druid.c:995
 msgid "Evolution Account Wizard"
 msgstr "Evolution kontoveiviser"
 
-#: mail/mail-display.c:98
-#, c-format
-msgid ""
-"Could not open file %s:\n"
-"%s"
-msgstr ""
-"Kan ikke åpne fil %s:\n"
-"%s"
-
-#: mail/mail-display.c:131
-#, c-format
-msgid "Could not write data: %s"
-msgstr "Kan ikke skrive data: %s"
-
-#: mail/mail-display.c:229
+#: mail/mail-display.c:189
 msgid "Save Attachment"
 msgstr "Lagre vedlegg"
 
-#: mail/mail-display.c:269
+#: mail/mail-display.c:229
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kunne ikke opprette midlertidig katalog: %s"
 
-#: mail/mail-display.c:311
+#: mail/mail-display.c:271
 msgid "Save to Disk..."
 msgstr "Lagre til disk..."
 
-#: mail/mail-display.c:313
+#: mail/mail-display.c:273
 #, c-format
 msgid "Open in %s..."
 msgstr "Åpne i %s..."
 
-#: mail/mail-display.c:315
+#: mail/mail-display.c:275
 msgid "View Inline"
 msgstr "Vis \"inline\""
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:302
 msgid "External Viewer"
 msgstr "Ekstern visning"
 
-#: mail/mail-display.c:365
+#: mail/mail-display.c:325
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Vis \"inline\" (via %s)"
 
-#: mail/mail-display.c:369
+#: mail/mail-display.c:329
 msgid "Hide"
 msgstr "Skjul"
 
-#: mail/mail-format.c:504
+#: mail/mail-format.c:505
 #, c-format
 msgid "%s attachment"
 msgstr "%s-vedlegg"
 
-#: mail/mail-format.c:856
+#: mail/mail-format.c:653
+msgid "Loading message content"
+msgstr "Leser meldingsinnhold"
+
+#: mail/mail-format.c:941
 msgid "Encrypted message not displayed"
 msgstr "Kryptert melding ikke vist"
 
-#: mail/mail-format.c:862
+#: mail/mail-format.c:947
 msgid "Encrypted message"
 msgstr "Kryptert melding"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:948
 msgid "Click icon to decrypt."
 msgstr "Klikk på ikonet for å dekryptere."
 
-#: mail/mail-format.c:1438
+#: mail/mail-format.c:1350
+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:1358
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr "Denne meldingen er digitalt signert men er beviselig ikke autentisk."
+
+#: mail/mail-format.c:1562
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peker til FTP-tjener (%s)"
 
-#: mail/mail-format.c:1450
+#: mail/mail-format.c:1574
 #, 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:1454
+#: mail/mail-format.c:1578
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peker til lokal fil (%s)"
 
-#: mail/mail-format.c:1488
+#: mail/mail-format.c:1612
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peker til ukjent ekstern data (\"%s\"-type)"
 
-#: mail/mail-format.c:1493
+#: mail/mail-format.c:1617
 msgid "Malformed external-body part."
 msgstr "Feilutformet del for ekstern-kropp."
 
-#: mail/mail-format.c:1663
+#: mail/mail-format.c:1788
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "Den %s, skrev %s:\n"
@@ -5433,7 +5201,7 @@ msgstr ""
 "Kan ikke registrer mappe '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:85
+#: mail/mail-mt.c:87
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -5442,7 +5210,7 @@ msgstr ""
 "Feil under '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:87
+#: mail/mail-mt.c:89
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -5451,147 +5219,121 @@ msgstr ""
 "Feil under utføring av operasjon:\n"
 "%s"
 
-#: mail/mail-mt.c:356 mail/mail-mt.c:385
+#: mail/mail-mt.c:385 mail/mail-mt.c:414
 msgid "Working"
 msgstr "Arbeider"
 
-#: mail/mail-ops.c:107
-#, c-format
-msgid "Fetching email from %s"
-msgstr "Henter e-post fra %s"
-
-#: mail/mail-ops.c:109
-#, c-format
-msgid "Fetch email from %s"
-msgstr "Hent e-post fra %s"
-
-#: mail/mail-ops.c:359
-#, c-format
-msgid "There is no new mail at %s."
-msgstr "Ingen ny e-post på %s."
-
-#: mail/mail-ops.c:430
-msgid "Filtering email on demand"
-msgstr "Filtrering av post etter behov"
-
-#: mail/mail-ops.c:432
-msgid "Filter email on demand"
-msgstr "Fi_ltrér e-post ved behov"
-
-#: mail/mail-ops.c:563
+#: mail/mail-ops.c:510
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender \"%s\""
 
-#: mail/mail-ops.c:565
+#: mail/mail-ops.c:512
 msgid "Sending message"
 msgstr "Sender melding"
 
-#: mail/mail-ops.c:682
-msgid "Sending queue"
-msgstr "Sender kø"
-
-#: mail/mail-ops.c:684
-msgid "Send queue"
-msgstr "Send kø"
-
-#: mail/mail-ops.c:819 mail/mail-ops.c:826
+#: mail/mail-ops.c:740 mail/mail-ops.c:747
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Legger til \"%s\""
 
-#: mail/mail-ops.c:823 mail/mail-ops.c:829
+#: mail/mail-ops.c:744 mail/mail-ops.c:750
 msgid "Appending a message without a subject"
 msgstr "Legger til en melding uten emne"
 
-#: mail/mail-ops.c:912
+#: mail/mail-ops.c:833
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Flytter meldinger fra \"%s\" til \"%s\""
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:835
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Kopierer meldinger fra \"%s\" til \"%s\""
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:838
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Flytt meldinger fra \"%s\" til \"%s\""
 
-#: mail/mail-ops.c:919
+#: mail/mail-ops.c:840
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Kopiér meldinger fra \"%s\" til \"%s\""
 
-#: mail/mail-ops.c:950
+#: mail/mail-ops.c:871
 msgid "Moving"
 msgstr "Flytter"
 
-#: mail/mail-ops.c:953
+#: mail/mail-ops.c:874
 msgid "Copying"
 msgstr "Kopiérer"
 
-#: mail/mail-ops.c:973
+#: mail/mail-ops.c:894
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s melding %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1048
+#: mail/mail-ops.c:969
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i \"%s\""
 
-#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
+#: mail/mail-ops.c:1035 mail/subscribe-dialog.c:359
 msgid "(No description)"
 msgstr "(Ingen beskrivelse)"
 
-#: mail/mail-ops.c:1179
+#: mail/mail-ops.c:1100
 msgid "Forwarded messages"
 msgstr "Videresendte meldinger"
 
-#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
+#: mail/mail-ops.c:1141 mail/mail-ops.c:1275
 #, c-format
 msgid "Opening folder %s"
 msgstr "Åpner mappe %s"
 
-#: mail/mail-ops.c:1351
+#: mail/mail-ops.c:1206
+#, c-format
+msgid "Opening store %s"
+msgstr "Åpner lager %s"
+
+#: mail/mail-ops.c:1337
 msgid "Synchronising folder"
 msgstr "Synkroniserer mappe"
 
-#: mail/mail-ops.c:1401
+#: mail/mail-ops.c:1387
 msgid "Expunging folder"
 msgstr "Tømmer mappe"
 
-#: mail/mail-ops.c:1450
+#: mail/mail-ops.c:1436
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Henter melding %s"
 
-#: mail/mail-ops.c:1517
+#: mail/mail-ops.c:1503
 msgid "Retrieving messages"
 msgstr "Henter meldinger"
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1513
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Henter melding nummer %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1675
+#: mail/mail-ops.c:1661
 #, c-format
 msgid "Loading %s Folder for %s"
 msgstr "Laster %s-mappe for %s"
 
-#: mail/mail-ops.c:1677
+#: mail/mail-ops.c:1663
 #, c-format
 msgid "Load %s Folder for %s"
 msgstr "Last %s-mappe for %s"
 
-#: mail/mail-ops.c:1843
+#: mail/mail-ops.c:1829
 msgid "Saving messages"
 msgstr "Lagrer meldinger"
 
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1908
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -5600,12 +5342,12 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1935
+#: mail/mail-ops.c:1921
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Lagrer melding %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1949
+#: mail/mail-ops.c:1935
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -5614,9 +5356,59 @@ msgstr ""
 "Feil under lagring av av meldinger til: %s:\n"
 " %s"
 
-#: mail/mail-search-dialogue.c:104
-msgid "Cancel"
-msgstr "Avbryt"
+#: mail/mail-ops.c:2009
+msgid "Saving attachment"
+msgstr "Lagrer vedlegg"
+
+#: mail/mail-ops.c:2024
+#, c-format
+msgid ""
+"Cannot create output file: %s:\n"
+" %s"
+msgstr ""
+"Kunne ikke opprette utfil: %s\n"
+" %s"
+
+#: mail/mail-ops.c:2052
+#, c-format
+msgid "Could not write data: %s"
+msgstr "Kan ikke skrive data: %s"
+
+#: mail/mail-search-dialogue.c:107
+msgid "_Search"
+msgstr "_Søk"
+
+#: mail/mail-send-recv.c:105
+msgid "Cancelling ..."
+msgstr "Avbryter..."
+
+#: mail/mail-send-recv.c:187
+msgid "Send & Receive mail"
+msgstr "Send og motta e-post"
+
+#: mail/mail-send-recv.c:190
+msgid "Receiving"
+msgstr "Mottar"
+
+#: mail/mail-send-recv.c:219
+msgid "Updating ..."
+msgstr "Oppdaterer..."
+
+#: mail/mail-send-recv.c:221 mail/mail-send-recv.c:261
+msgid "Waiting ..."
+msgstr "Venter..."
+
+#: mail/mail-send-recv.c:247
+msgid "Sending"
+msgstr "Sender"
+
+#: mail/mail-send-recv.c:407
+msgid "Cancelled."
+msgstr "Avbrutt"
+
+#: mail/mail-send-recv.c:411
+msgid "Complete."
+msgstr "Fullført."
 
 #: mail/mail-summary.c:111 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
@@ -5656,59 +5448,30 @@ msgstr "Kan ikke opprette dialogboks."
 msgid "User cancelled query."
 msgstr "Spørring avbrutt av bruker."
 
-#: mail/mail-tools.c:189
+#: mail/mail-tools.c:192
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Kunne ikke opprette midlertidig mbox `%s': %s"
 
-#. Get all uids of source
-#: mail/mail-tools.c:241
-#, c-format
-msgid "Examining %s"
-msgstr "Undersøker %s"
-
-#: mail/mail-tools.c:271
-#, c-format
-msgid ""
-"Could not read UID cache file \"%s\". You may receive duplicate messages."
-msgstr ""
-"Kunne ikke lese bufferfil for UID \"%s\". Du kan motta dupliserte meldinger."
-
-#: mail/mail-tools.c:300
-#, c-format
-msgid "Retrieving message %d of %d"
-msgstr "Henter melding %d av %d"
-
-#. Append it to dest
-#: mail/mail-tools.c:315
-#, c-format
-msgid "Writing message %d of %d"
-msgstr "Skriver melding %d av %d"
-
-#: mail/mail-tools.c:347
-#, c-format
-msgid "Saving changes to %s"
-msgstr "Lagrer endringer til %s"
-
-#: mail/mail-tools.c:381
+#: mail/mail-tools.c:250
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (videresendt melding)"
 
-#: mail/mail-tools.c:391
+#: mail/mail-tools.c:260
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (uten emne)"
 
-#: mail/mail-tools.c:427
+#: mail/mail-tools.c:277
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Videresendt melding - %s"
 
-#: mail/mail-tools.c:429
+#: mail/mail-tools.c:279
 msgid "Forwarded message (no subject)"
 msgstr "Videresendt melding (uten emne)"
 
-#: mail/mail-tools.c:530
+#: mail/mail-tools.c:380
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -5717,11 +5480,11 @@ msgstr ""
 "Kan ikk åpne lokasjon `%s':\n"
 "%s"
 
-#: mail/mail-vfolder.c:149
+#: mail/mail-vfolder.c:150
 msgid "VFolders"
 msgstr "VMapper"
 
-#: mail/mail-vfolder.c:298
+#: mail/mail-vfolder.c:303
 msgid "New VFolder"
 msgstr "Ny VFolder"
 
@@ -5751,112 +5514,112 @@ msgstr "Skriv ut den valgte meldingen"
 msgid "Delete this message"
 msgstr "Slett denne meldingen"
 
-#: mail/message-list.c:599
+#: mail/message-list.c:605
 msgid "Unseen"
 msgstr "Ulest"
 
-#: mail/message-list.c:602
+#: mail/message-list.c:608
 msgid "Seen"
 msgstr "Lest"
 
-#: mail/message-list.c:605
+#: mail/message-list.c:611
 msgid "Answered"
 msgstr "Besvart"
 
-#: mail/message-list.c:890
+#: mail/message-list.c:896
 #, c-format
 msgid "[ %s ]"
 msgstr "[ %s ]"
 
 #. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:902 mail/message-list.c:918
+#: mail/message-list.c:908 mail/message-list.c:924
 #, c-format
 msgid "%s, et al."
 msgstr "%s, et al."
 
-#: mail/message-list.c:905 mail/message-list.c:921
+#: mail/message-list.c:911 mail/message-list.c:927
 msgid "<unknown>"
 msgstr "<ukjent>"
 
-#: mail/message-list.c:973
+#: mail/message-list.c:979
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:980
+#: mail/message-list.c:986
 msgid "Today %l:%M %p"
 msgstr "Idag %l:%M %p"
 
-#: mail/message-list.c:989
+#: mail/message-list.c:995
 msgid "Yesterday %l:%M %p"
 msgstr "I går %l:%M %p"
 
-#: mail/message-list.c:1001
+#: mail/message-list.c:1007
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1009
+#: mail/message-list.c:1015
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1011
+#: mail/message-list.c:1017
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:1109
+#: mail/message-list.c:1115
 msgid "Flagged"
 msgstr "Merket"
 
-#: mail/message-list.c:1110
+#: mail/message-list.c:1116
 msgid "From"
 msgstr "Fra"
 
-#: mail/message-list.c:1110
+#: mail/message-list.c:1116
 msgid "Date"
 msgstr "Dato"
 
-#: mail/message-list.c:1110
+#: mail/message-list.c:1116
 msgid "Received"
 msgstr "Mottatt"
 
-#: mail/message-list.c:1111
+#: mail/message-list.c:1117
 msgid "To"
 msgstr "Til"
 
-#: mail/message-list.c:1111
+#: mail/message-list.c:1117
 msgid "Size"
 msgstr "Størrelse"
 
-#: mail/openpgp-utils.c:78
+#: mail/openpgp-utils.c:77
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Vennligst skriv inn din %s passphrase for %s"
 
-#: mail/openpgp-utils.c:81
+#: mail/openpgp-utils.c:80
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Vennligst skriv inn din %s passphrase"
 
-#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
-#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
+#: mail/openpgp-utils.c:431 mail/openpgp-utils.c:534 mail/openpgp-utils.c:738
+#: mail/openpgp-utils.c:887 mail/openpgp-utils.c:1043
 msgid "No GPG/PGP program available."
 msgstr "Ingen GPG/PGP-program tilgjengelig."
 
-#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
-#: mail/openpgp-utils.c:898
+#: mail/openpgp-utils.c:438 mail/openpgp-utils.c:543 mail/openpgp-utils.c:745
+#: mail/openpgp-utils.c:894
 msgid "No password provided."
 msgstr "Ingen passord gitt."
 
-#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
-#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
+#: mail/openpgp-utils.c:444 mail/openpgp-utils.c:551 mail/openpgp-utils.c:752
+#: mail/openpgp-utils.c:901 mail/openpgp-utils.c:1049
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Kunne ikke opprette rør til GPG/PGP: %s"
 
-#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
+#: mail/openpgp-utils.c:562 mail/openpgp-utils.c:607 mail/openpgp-utils.c:646
 msgid "No recipients specified"
 msgstr "Ingen mottakere spesifisert"
 
-#: mail/openpgp-utils.c:1065
+#: mail/openpgp-utils.c:1060
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Kunne ikke opprette midlertidig fil: %s"
@@ -5883,22 +5646,22 @@ msgstr "Henter lager for \"%s\""
 msgid "Get store for \"%s\""
 msgstr "Hent lager for \"%s\""
 
-#: mail/subscribe-dialog.c:289
+#: mail/subscribe-dialog.c:292
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Abonnerer på mappe \"%s\""
 
-#: mail/subscribe-dialog.c:293
+#: mail/subscribe-dialog.c:296
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Sletter abonnement på mappe \"%s\""
 
-#: mail/subscribe-dialog.c:297
+#: mail/subscribe-dialog.c:300
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr "Abonnér på mappe \"%s\""
 
-#: mail/subscribe-dialog.c:300
+#: mail/subscribe-dialog.c:303
 #, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr "Slett abonnement på mappe \"%s\""
@@ -6012,19 +5775,19 @@ msgstr "Ny..."
 msgid "(Untitled)"
 msgstr "(Uten navn)"
 
-#: shell/e-shell-view-menu.c:114
+#: shell/e-shell-view-menu.c:127
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy ble ikke funnet i din $PATH."
 
-#: shell/e-shell-view-menu.c:120
+#: shell/e-shell-view-menu.c:133
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy kunne ikke kjøres."
 
-#: shell/e-shell-view-menu.c:172
+#: shell/e-shell-view-menu.c:185
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:187
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -6034,24 +5797,24 @@ msgstr ""
 "for e-post, kalender og kontaktdatabaser for\n"
 "GNOME skrivebordsmiljøet."
 
-#: shell/e-shell-view-menu.c:334
+#: shell/e-shell-view-menu.c:347
 msgid "Go to folder..."
 msgstr "Gå til mappe..."
 
-#: shell/e-shell-view.c:140
+#: shell/e-shell-view.c:143
 msgid "(No folder displayed)"
 msgstr "(Ingen mappe vist)"
 
-#: shell/e-shell-view.c:468
+#: shell/e-shell-view.c:474
 msgid "Folders"
 msgstr "Mapper"
 
-#: shell/e-shell-view.c:1098
+#: shell/e-shell-view.c:1124
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1100
+#: shell/e-shell-view.c:1126
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution - %s [%s]"
@@ -6061,7 +5824,7 @@ msgstr "%s - Evolution - %s [%s]"
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikke sette opp lokal lagring -- %s"
 
-#: shell/e-shell.c:1212
+#: shell/e-shell.c:1238
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -6143,72 +5906,68 @@ msgstr "Aktiver denne snarveien"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Fjern denne snarveien fra snarveilinjen"
 
-#: shell/e-shortcuts.c:358
+#: shell/e-shortcuts.c:375
 msgid "Error saving shortcuts."
 msgstr "Feil under lagring av snarveier."
 
-#: shell/e-storage-set-view.c:338 ui/evolution-event-editor.xml.h:120
+#: 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:124 ui/evolution.xml.h:38
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:41
 msgid "_View"
 msgstr "_Vis"
 
-#: shell/e-storage-set-view.c:338
+#: shell/e-storage-set-view.c:345
 msgid "View the selected folder"
 msgstr "Vis den valgte mappen"
 
-#: shell/e-storage.c:138
+#: shell/e-storage.c:160
 msgid "(No name)"
 msgstr "(Uten navn)"
 
-#: shell/e-storage.c:389
+#: shell/e-storage.c:411
 msgid "No error"
 msgstr "Ingen feil"
 
-#: shell/e-storage.c:391
+#: shell/e-storage.c:413
 msgid "Generic error"
 msgstr "Vanlig feil"
 
-#: shell/e-storage.c:393
+#: shell/e-storage.c:415
 msgid "A folder with the same name already exists"
 msgstr "En mappe med samme navn eksisterer allerede"
 
-#: shell/e-storage.c:395
+#: shell/e-storage.c:417
 msgid "The specified folder type is not valid"
 msgstr "Spesifisert mappetype er ikke gyldig"
 
-#: shell/e-storage.c:397
+#: shell/e-storage.c:419
 msgid "I/O error"
 msgstr "I/U-feil"
 
-#: shell/e-storage.c:399
+#: shell/e-storage.c:421
 msgid "Not enough space to create the folder"
 msgstr "Ikke nok plass til å opprette mappen"
 
-#: shell/e-storage.c:401
+#: shell/e-storage.c:423
 msgid "The specified folder was not found"
 msgstr "Spesifisert mappe ble ikke funnet"
 
-#: shell/e-storage.c:403
+#: shell/e-storage.c:425
 msgid "Function not implemented in this storage"
 msgstr "Funksjonen er ikke implementert i dette lageret"
 
-#: shell/e-storage.c:405
+#: shell/e-storage.c:427
 msgid "Permission denied"
 msgstr "Tilgang nektet"
 
-#: shell/e-storage.c:407
+#: shell/e-storage.c:429
 msgid "Operation not supported"
 msgstr "Operasjonen er ikke støttet"
 
-#: shell/e-storage.c:409
+#: shell/e-storage.c:431
 msgid "The specified type is not supported in this storage"
 msgstr "Spesifisert type er ikke støttet for dette lageret"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr "Evolution skallet."
-
 #: shell/main.c:74
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -6268,16 +6027,94 @@ msgstr "Slå av."
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kunne ikke initialisere Bonobo komponentsystemet."
 
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/importer/importer.c:158
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+"Importerer %s\n"
+"Importerer ikke klar.\n"
+"Venter 5 sekunder før nytt forsøk."
+
+#: shell/importer/importer.c:177 shell/importer/importer.c:205
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+"Importerer %s\n"
+"Importerer oppføring %d."
+
+#: shell/importer/importer.c:312
+msgid "Importing"
+msgstr "Importerer"
+
+#: shell/importer/importer.c:320
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+"Importerer %s.\n"
+"Starter %s"
+
+#: shell/importer/importer.c:335
+#, c-format
+msgid "Error loading %s"
+msgstr "Feil under lasting av %s"
+
+#: shell/importer/importer.c:349
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+"Importerer %s\n"
+"Importerer oppføring 1."
+
+#: shell/importer/importer.c:420
+msgid "Automatic"
+msgstr "Automatisk"
+
+#: shell/importer/importer.c:470
+msgid "Filename:"
+msgstr "Filnavn:"
+
+#: shell/importer/importer.c:475
+msgid "Select a file"
+msgstr "Velg en fil"
+
+#: shell/importer/importer.c:485
+msgid "File type:"
+msgstr "Filtype:"
+
+#: shell/importer/importer.c:576
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+"Velg filen du vil importere inn i Evolution, og velg hvilken filtype den har "
+"fra listen.\n"
+"\n"
+"Du kan velge \"Automatisk\" hvis du ikke vet, og la Evolution forsøke å "
+"finne det ut."
+
 #: ui/evolution-addressbook.xml.h:2
-msgid "Create a new contact"
+msgid "Create new contact"
 msgstr "Opprett en ny kontakt"
 
 #: ui/evolution-addressbook.xml.h:4
 msgid "Delete a contact"
 msgstr "Slett en kontakt"
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-event-editor.xml.h:62
-#: ui/evolution-task-editor-dialog.xml.h:69
+#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
 msgid "Find"
 msgstr "Finn"
 
@@ -6285,10 +6122,9 @@ msgstr "Finn"
 msgid "Find a contact"
 msgstr "Finn en kontakt"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:14
-#: ui/evolution-tasks.xml.h:3
-msgid "New"
-msgstr "Ny"
+#: ui/evolution-addressbook.xml.h:7
+msgid "New contact"
+msgstr "Ny kontakt"
 
 #: ui/evolution-addressbook.xml.h:9
 msgid "Print contacts"
@@ -6322,8 +6158,8 @@ msgstr "S_kriv ut kontakter..."
 msgid "_Search for contacts"
 msgstr "_Søk etter kontakter"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-event-editor.xml.h:118
-#: ui/evolution-task-editor-dialog.xml.h:122
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-event-editor.xml.h:74
+#: ui/evolution-task-editor-dialog.xml.h:88
 msgid "_Tools"
 msgstr "_Verktøy"
 
@@ -6379,8 +6215,12 @@ msgstr "Gå til i dag"
 msgid "Month"
 msgstr "Måned"
 
-#: ui/evolution-calendar.xml.h:15 ui/evolution-event-editor.xml.h:69
-#: ui/evolution-task-editor-dialog.xml.h:76
+#: ui/evolution-calendar.xml.h:14
+msgid "New appointment"
+msgstr "Ny avtale"
+
+#: ui/evolution-calendar.xml.h:15 ui/evolution-event-editor.xml.h:29
+#: ui/evolution-task-editor-dialog.xml.h:32
 msgid "Next"
 msgstr "Neste"
 
@@ -6424,7 +6264,8 @@ msgstr "Idag"
 msgid "Week"
 msgstr "Uke"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution.xml.h:35
+#: ui/evolution-calendar.xml.h:27 ui/evolution-event-editor.xml.h:66
+#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
 msgid "_New"
 msgstr "_Ny"
 
@@ -6456,24 +6297,24 @@ msgstr "Hjelp"
 msgid "Print En_velope..."
 msgstr "Skriv ut konvolutt..."
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-task-editor-dialog.xml.h:83
+#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
+#: ui/evolution-task-editor-dialog.xml.h:40
 msgid "Print this item"
 msgstr "Skriv ut denne oppføringen"
 
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:77
-#: ui/evolution-task-editor-dialog.xml.h:84
+#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
+#: ui/evolution-task-editor-dialog.xml.h:41
 msgid "Print..."
 msgstr "Skriv ut..."
 
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:84
+#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
 #: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:91
+#: ui/evolution-task-editor-dialog.xml.h:51
 msgid "Save _As..."
 msgstr "L_agre som..."
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:85
-#: ui/evolution-task-editor-dialog.xml.h:92
+#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
+#: ui/evolution-task-editor-dialog.xml.h:52
 msgid "Save and Close"
 msgstr "Lagre og lukk"
 
@@ -6485,8 +6326,7 @@ msgstr "Lagre kontakten og lukk dialogboksen"
 msgid "Se_nd contact to other..."
 msgstr "Se_nd kontakt til andre..."
 
-#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:93
-#: ui/evolution-task-editor-dialog.xml.h:97
+#: ui/evolution-contact-editor.xml.h:12
 msgid "See online help"
 msgstr "Se hjelp"
 
@@ -6494,9 +6334,9 @@ msgstr "Se hjelp"
 msgid "Send _message to contact..."
 msgstr "Send _melding til kontakt..."
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:105
+#: 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:109 ui/evolution.xml.h:28
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
 msgid "_File"
 msgstr "_Fil"
 
@@ -6504,9 +6344,9 @@ msgstr "_Fil"
 msgid "_Print..."
 msgstr "S_kriv ut..."
 
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:116
+#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
 #: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:120
+#: ui/evolution-task-editor-dialog.xml.h:85
 msgid "_Save"
 msgstr "_Lagre"
 
@@ -6523,437 +6363,252 @@ msgid "Actio_ns"
 msgstr "Ha_ndlinger"
 
 #: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
+msgid "Address _Book... (FIXME)"
+msgstr "Addresse_bok..."
+
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
 msgid "C_lear"
 msgstr "T_øm"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:5
+#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
 msgid "C_ut"
 msgstr "Klipp _ut"
 
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:6
+#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
+msgid "Chec_k Names (FIXME)"
+msgstr "Sje_kk navn"
+
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
 msgid "Clear"
 msgstr "Tøm"
 
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:7
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
 msgid "Clear the selection"
 msgstr "Tøm utvalget"
 
-#: ui/evolution-event-editor.xml.h:9
+#: ui/evolution-event-editor.xml.h:11
 msgid "Close this appointment"
 msgstr "Lukk denne avtalen"
 
-#: ui/evolution-event-editor.xml.h:10 ui/evolution-mail.xml.h:3
-#: ui/evolution-task-editor-dialog.xml.h:10
+#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
+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-task-editor-dialog.xml.h:14
 msgid "Copy"
 msgstr "Kopiér"
 
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-task-editor-dialog.xml.h:11
+#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
 msgid "Copy the selection"
 msgstr "Kopiér utvalget"
 
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:12
+#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-task-editor-dialog.xml.h:13
+#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
 msgid "Cut the selection"
 msgstr "Klipp ut utvalget"
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:16
+#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
 msgid "Dump XML"
 msgstr "Dump XML"
 
-#: ui/evolution-event-editor.xml.h:17 ui/evolution-task-editor-dialog.xml.h:17
+#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
 msgid "Dump the UI Xml description"
 msgstr "Dump beskrivelse av grensesnittet som XML"
 
-#: ui/evolution-event-editor.xml.h:18 ui/evolution-task-editor-dialog.xml.h:18
-msgid "FIXME: Address _Book..."
-msgstr "Addresse_bok..."
-
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "FIXME: Ch_oose Form..."
-msgstr "Velg skjema..."
-
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "FIXME: Chec_k Names"
-msgstr "Sjek_k navn"
-
 #: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "FIXME: Cop_y to Folder..."
-msgstr "Kopiér til mappe..."
-
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:23
-msgid "FIXME: D_esign a Form..."
-msgstr "U_tform et skjema..."
-
-#: ui/evolution-event-editor.xml.h:23 ui/evolution-task-editor-dialog.xml.h:24
-msgid "FIXME: Define Print _Styles"
-msgstr "Definér utskrift_stiler"
-
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:25
-msgid "FIXME: Desi_gn This Form"
-msgstr "_Utform dette skjemaet"
-
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:26
-msgid "FIXME: Fi_rst Item in Folder"
+msgid "Fi_rst Item in Folder (FIXME)"
 msgstr "Fø_rste oppføring i mappe"
 
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:27
-msgid "FIXME: For_ward"
+#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
+msgid "For_ward (FIXME)"
 msgstr "_Videresend"
 
-#: ui/evolution-event-editor.xml.h:27
-msgid "FIXME: Forward as v_Calendar"
+#: ui/evolution-event-editor.xml.h:23
+msgid "Forward as v_Calendar (FIXME)"
 msgstr "Videresend som v_Calendar"
 
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:28
-msgid "FIXME: Help"
-msgstr "Hjelp"
-
-#: ui/evolution-event-editor.xml.h:29 ui/evolution-task-editor-dialog.xml.h:29
-msgid "FIXME: In_complete Task"
-msgstr "U_komplett oppgave"
-
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:30
-msgid "FIXME: Insert File"
-msgstr "Sett inn fil"
-
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:31
-msgid "FIXME: It_em..."
-msgstr "Opp_føring"
-
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:33
-msgid "FIXME: Paste _Special... "
-msgstr "Lim inn _spesial..."
-
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:34
-msgid "FIXME: Print Pre_view"
-msgstr "Forhåndsvisning av utskrift"
-
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:35
-msgid "FIXME: Pu_blish Form As..."
-msgstr "Pu_blisér skjema som..."
-
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:36
-msgid "FIXME: Publish _Form..."
-msgstr "Publisér skjema..."
-
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:37
-msgid "FIXME: Rec_urrence..."
-msgstr "Gjentakelse..."
-
-#: ui/evolution-event-editor.xml.h:37 ui/evolution-task-editor-dialog.xml.h:39
-msgid "FIXME: S_end"
-msgstr "_Send"
-
-#: ui/evolution-event-editor.xml.h:38 ui/evolution-task-editor-dialog.xml.h:42
-msgid "FIXME: Save Attac_hments..."
-msgstr "Lagre vedle_gg..."
-
-#: ui/evolution-event-editor.xml.h:39 ui/evolution-task-editor-dialog.xml.h:43
-msgid "FIXME: Script _Debugger"
-msgstr "Feilsøking i skript"
-
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-task-editor-dialog.xml.h:44
-msgid "FIXME: Task _Request"
-msgstr "Oppgavefo_respørsel"
-
-#: ui/evolution-event-editor.xml.h:41 ui/evolution-task-editor-dialog.xml.h:46
-msgid "FIXME: _Contact"
-msgstr "_Kontakt"
-
-#: ui/evolution-event-editor.xml.h:42 ui/evolution-task-editor-dialog.xml.h:47
-msgid "FIXME: _Customize..."
-msgstr "_Tilpass..."
-
-#: ui/evolution-event-editor.xml.h:43 ui/evolution-task-editor-dialog.xml.h:48
-msgid "FIXME: _File..."
-msgstr "_Fil..."
-
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-task-editor-dialog.xml.h:49
-msgid "FIXME: _Font..."
-msgstr "FIXME: Skri_fttyper..."
-
-#: ui/evolution-event-editor.xml.h:45 ui/evolution-task-editor-dialog.xml.h:50
-msgid "FIXME: _Formatting"
-msgstr "_Formatering"
-
-#: ui/evolution-event-editor.xml.h:46 ui/evolution-task-editor-dialog.xml.h:51
-msgid "FIXME: _Item"
-msgstr "_Oppføring"
-
-#: ui/evolution-event-editor.xml.h:47 ui/evolution-task-editor-dialog.xml.h:52
-msgid "FIXME: _Journal Entry"
-msgstr "_Journaloppføring"
-
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:53
-msgid "FIXME: _Last Item in Folder"
-msgstr "_Siste oppføring i mappe"
-
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:54
-msgid "FIXME: _Mail Message"
-msgstr "Send _melding"
-
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:56
-msgid "FIXME: _Memo Style"
-msgstr "_Notis-stil"
-
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:57
-msgid "FIXME: _Move to Folder..."
-msgstr "_Flytt til mappe..."
-
-#: ui/evolution-event-editor.xml.h:52
-msgid "FIXME: _New Appointment"
-msgstr "_Ny avtale"
-
-#: ui/evolution-event-editor.xml.h:53
-msgid "FIXME: _Note"
-msgstr "_Notis"
-
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:59
-msgid "FIXME: _Object..."
-msgstr "_Objekt..."
-
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:60
-msgid "FIXME: _Paragraph..."
-msgstr "_Avsnitt..."
-
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-task-editor-dialog.xml.h:62
-msgid "FIXME: _Spelling..."
-msgstr "_Stavekontroll..."
-
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-task-editor-dialog.xml.h:63
-msgid "FIXME: _Standard"
-msgstr "_Standard"
-
-#: ui/evolution-event-editor.xml.h:58 ui/evolution-task-editor-dialog.xml.h:64
-msgid "FIXME: _Task"
-msgstr "_Oppgave"
-
-#: ui/evolution-event-editor.xml.h:59 ui/evolution-task-editor-dialog.xml.h:65
-msgid "FIXME: _Unread Item"
-msgstr "_Ulest oppføring"
-
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-task-editor-dialog.xml.h:67
-msgid "FIXME: what goes here?"
-msgstr "Hva går her?"
-
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-message-composer.xml.h:6
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "F_ormat"
-msgstr "F_ormat"
-
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:70
-msgid "Find Again"
-msgstr "Finn igjen"
-
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:71
-msgid "Find _Again"
-msgstr "Finn ig_jen"
-
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:72
+#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
 msgid "Go to the next item"
 msgstr "Gå til neste oppføring"
 
-#: ui/evolution-event-editor.xml.h:66 ui/evolution-task-editor-dialog.xml.h:73
+#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
 msgid "Go to the previous item"
 msgstr "Gå til forrige oppføring"
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:74
+#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
+msgid "In_complete Task (FIXME)"
+msgstr "U_komplett oppgave"
+
+#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
 msgid "Modify the file's properties"
 msgstr "Endre filens egenskaper"
 
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:75
+#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
 msgid "N_ext"
 msgstr "N_este"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-task-editor-dialog.xml.h:77
+#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
 msgid "Paste"
 msgstr "Lim inn"
 
-#: ui/evolution-event-editor.xml.h:71 ui/evolution-task-editor-dialog.xml.h:78
+#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
 msgid "Paste the clipboard"
 msgstr "Lim inn fra utklippstavlen"
 
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:79
+#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
 msgid "Pre_vious"
 msgstr "Forri_ge"
 
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:80
+#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
 msgid "Previous"
 msgstr "Forrige"
 
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-task-editor-dialog.xml.h:81
+#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
+msgid "Print Pre_view"
+msgstr "Forhånds_visning av utskrift"
+
+#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
 msgid "Print S_etup..."
 msgstr "Skriveropps_ett..."
 
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:82
+#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
 msgid "Print Setup"
 msgstr "Skriveroppsett"
 
-#: ui/evolution-event-editor.xml.h:78 ui/evolution-task-editor-dialog.xml.h:85
+#: 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:79 ui/evolution-task-editor-dialog.xml.h:86
-msgid "Redo"
-msgstr "Gjenopprett"
-
-#: ui/evolution-event-editor.xml.h:80 ui/evolution-task-editor-dialog.xml.h:87
-msgid "Redo the undone action"
-msgstr "Gjenopprett angret handling"
-
-#: ui/evolution-event-editor.xml.h:81 ui/evolution-task-editor-dialog.xml.h:88
-msgid "Replace"
-msgstr "Erstatt"
-
-#: ui/evolution-event-editor.xml.h:82 ui/evolution-task-editor-dialog.xml.h:89
-msgid "Replace a string"
-msgstr "Erstattt en streng"
-
-#: ui/evolution-event-editor.xml.h:83 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:90
+#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
+#: ui/evolution-task-editor-dialog.xml.h:50
 msgid "Save"
 msgstr "Lagre"
 
-#: ui/evolution-event-editor.xml.h:86
+#: ui/evolution-event-editor.xml.h:43
 msgid "Save the appointment and close the dialog box"
 msgstr "Lagre avtalen og lukk dialogboksen"
 
-#: ui/evolution-event-editor.xml.h:87 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:93
+#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
+#: ui/evolution-task-editor-dialog.xml.h:53
 msgid "Save the current file"
 msgstr "Lagre aktiv fil"
 
-#: ui/evolution-event-editor.xml.h:88
+#: ui/evolution-event-editor.xml.h:45
 msgid "Schedule Meeting"
 msgstr "Sett opp møte"
 
-#: ui/evolution-event-editor.xml.h:89
+#: ui/evolution-event-editor.xml.h:46
 msgid "Schedule _Meeting"
 msgstr "Sett opp _møte"
 
-#: ui/evolution-event-editor.xml.h:90
+#: ui/evolution-event-editor.xml.h:47
 msgid "Schedule some sort of a meeting"
 msgstr "Sett opp ett eller annet møte"
 
-#: ui/evolution-event-editor.xml.h:91 ui/evolution-task-editor-dialog.xml.h:95
-msgid "Search again for the same string"
-msgstr "Søk etter samme streng på nytt"
-
-#: ui/evolution-event-editor.xml.h:92 ui/evolution-task-editor-dialog.xml.h:96
-msgid "Search for a string"
-msgstr "Søk etter en streng"
-
-#: ui/evolution-event-editor.xml.h:94 ui/evolution-task-editor-dialog.xml.h:98
+#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
 msgid "Select All"
 msgstr "Velg alle"
 
-#: ui/evolution-event-editor.xml.h:95 ui/evolution-task-editor-dialog.xml.h:99
+#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
 msgid "Select everything"
 msgstr "Velg alt"
 
-#: ui/evolution-event-editor.xml.h:96
-#: ui/evolution-task-editor-dialog.xml.h:100
+#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
 msgid "Setup the page settings for your current printer"
 msgstr "Redigér sideinnstillinger for aktiv skriver"
 
-#: ui/evolution-event-editor.xml.h:97
-#: ui/evolution-task-editor-dialog.xml.h:101
-msgid "Undo"
-msgstr "Angre"
-
-#: ui/evolution-event-editor.xml.h:98
-#: ui/evolution-task-editor-dialog.xml.h:102
-msgid "Undo the last action"
-msgstr "Angre siste handling"
+#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
+msgid "Task _Request (FIXME)"
+msgstr "_Oppgavefo_respørsel"
 
-#: ui/evolution-event-editor.xml.h:99 ui/evolution-message-composer.xml.h:34
-#: ui/evolution-task-editor-dialog.xml.h:103
+#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:34
+#: ui/evolution-task-editor-dialog.xml.h:63
 msgid "_About..."
 msgstr "_Om..."
 
-#: ui/evolution-event-editor.xml.h:100 ui/evolution-message-composer.xml.h:35
-#: ui/evolution-task-editor-dialog.xml.h:104
+#: 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
 msgid "_Close"
 msgstr "L_ukk"
 
-#: ui/evolution-event-editor.xml.h:101
-#: ui/evolution-task-editor-dialog.xml.h:105
+#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
+#: ui/evolution.xml.h:29
+msgid "_Contact (FIXME)"
+msgstr "_Kontakt"
+
+#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
 msgid "_Copy"
 msgstr "_Kopiér"
 
-#: ui/evolution-event-editor.xml.h:102 ui/evolution-message-composer.xml.h:36
-#: ui/evolution-task-editor-dialog.xml.h:106
+#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:36
+#: ui/evolution-task-editor-dialog.xml.h:68
 msgid "_Debug"
 msgstr "_Feilsøk"
 
-#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:37
-#: ui/evolution-subscribe.xml.h:10 ui/evolution-task-editor-dialog.xml.h:108
-#: ui/evolution.xml.h:27
+#: 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:106
-#: ui/evolution-task-editor-dialog.xml.h:110
-msgid "_Find..."
-msgstr "_Finn..."
-
-#: ui/evolution-event-editor.xml.h:107
-#: ui/evolution-task-editor-dialog.xml.h:111
-msgid "_Forms"
-msgstr "Sk_jemaer"
-
-#: ui/evolution-event-editor.xml.h:108 ui/evolution-message-composer.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:112 ui/evolution.xml.h:31
+#: 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
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ui/evolution-event-editor.xml.h:109
-#: ui/evolution-task-editor-dialog.xml.h:113
-msgid "_Insert"
-msgstr "Sett _inn"
+#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
+msgid "_Item (FIXME)"
+msgstr "_Oppgave"
+
+#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
+msgid "_Journal Entry (FIXME)"
+msgstr "_Journaloppføring"
+
+#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
+msgid "_Last Item in Folder (FIXME)"
+msgstr "_Siste oppføring i mappe"
+
+#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
+msgid "_Mail Message (FIXME)"
+msgstr "Send _melding"
 
-#: ui/evolution-event-editor.xml.h:110
-#: ui/evolution-task-editor-dialog.xml.h:114
-msgid "_Object"
-msgstr "_Objekt"
+#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
+msgid "_Move to Folder... (FIXME)"
+msgstr "Flytt til _mappe..."
 
-#: ui/evolution-event-editor.xml.h:111
-#: ui/evolution-task-editor-dialog.xml.h:115
+#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
+msgid "_Note (FIXME)"
+msgstr "_Notat"
+
+#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
 msgid "_Paste"
 msgstr "_Lim inn"
 
-#: ui/evolution-event-editor.xml.h:112
-#: ui/evolution-task-editor-dialog.xml.h:116 ui/evolution-tasks.xml.h:7
+#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
+#: ui/evolution-tasks.xml.h:7
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: ui/evolution-event-editor.xml.h:113
-#: ui/evolution-task-editor-dialog.xml.h:117
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-task-editor-dialog.xml.h:83
 msgid "_Properties..."
 msgstr "Egenska_per..."
 
-#: ui/evolution-event-editor.xml.h:114
-#: ui/evolution-task-editor-dialog.xml.h:118
-msgid "_Redo"
-msgstr "Gjenopp_rett"
-
-#: ui/evolution-event-editor.xml.h:115
-#: ui/evolution-task-editor-dialog.xml.h:119
-msgid "_Replace..."
-msgstr "E_rstatt..."
+#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
+msgid "_Select All"
+msgstr "_Velg alle"
 
-#: ui/evolution-event-editor.xml.h:117
-#: ui/evolution-task-editor-dialog.xml.h:121
-msgid "_Toolbars"
-msgstr "Verk_tøylinjer"
+#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
+#: ui/evolution.xml.h:40
+msgid "_Task (FIXME)"
+msgstr "_Oppgave"
 
-#: ui/evolution-event-editor.xml.h:119
-#: ui/evolution-task-editor-dialog.xml.h:123
-msgid "_Undo"
-msgstr "_Angre"
+#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
+msgid "_Unread Item (FIXME)"
+msgstr "_Ulest oppføring"
 
 #: ui/evolution-executive-summary.xml.h:1
 msgid "Add Service"
@@ -7180,7 +6835,7 @@ msgid "Attach"
 msgstr "Legg ved"
 
 #: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:9
+#: ui/evolution-task-editor-dialog.xml.h:12
 msgid "Close the current file"
 msgstr "Lukk aktiv fil"
 
@@ -7188,6 +6843,10 @@ msgstr "Lukk aktiv fil"
 msgid "Encrypt this message with PGP"
 msgstr "Kryptér denne meldingen med PGP"
 
+#: ui/evolution-message-composer.xml.h:6
+msgid "F_ormat"
+msgstr "F_ormat"
+
 #: ui/evolution-message-composer.xml.h:7
 msgid "HTML"
 msgstr "HTML"
@@ -7316,58 +6975,90 @@ msgstr "Abonnér"
 msgid "Unsubscribe"
 msgstr "Fjern abonnement"
 
-#: ui/evolution-task-editor-dialog.xml.h:15
+#: ui/evolution-task-editor-dialog.xml.h:5
+msgid "Assig_n Task (FIXME)"
+msgstr "Tildel _oppgave"
+
+#: ui/evolution-task-editor-dialog.xml.h:19
 msgid "Delete this task"
 msgstr "Slett denne oppgaven"
 
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "FIXME: Assig_n Task"
-msgstr "Tildel o_ppgave"
+#: ui/evolution-task-editor-dialog.xml.h:24
+msgid "Find Again"
+msgstr "Finn igjen"
 
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "FIXME: Meeting Re_quest"
+#: ui/evolution-task-editor-dialog.xml.h:29
+msgid "Meeting Re_quest (FIXME)"
 msgstr "Møteforesp_ørsel"
 
-#: ui/evolution-task-editor-dialog.xml.h:38
-msgid "FIXME: Reply to A_ll"
+#: ui/evolution-task-editor-dialog.xml.h:43
+msgid "Redo"
+msgstr "Gjenopprett"
+
+#: ui/evolution-task-editor-dialog.xml.h:44
+msgid "Redo the undone action"
+msgstr "Gjenopprett angret handling"
+
+#: ui/evolution-task-editor-dialog.xml.h:45
+msgid "Replace"
+msgstr "Erstatt"
+
+#: ui/evolution-task-editor-dialog.xml.h:46
+msgid "Replace a string"
+msgstr "Erstattt en streng"
+
+#: ui/evolution-task-editor-dialog.xml.h:47
+msgid "Reply to A_ll (FIXME)"
 msgstr "Svar til a_lle"
 
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "FIXME: S_end Status Report"
+#: ui/evolution-task-editor-dialog.xml.h:48
+msgid "S_end Status Report (FIXME)"
 msgstr "S_end statusrapport"
 
-#: ui/evolution-task-editor-dialog.xml.h:41
-msgid "FIXME: S_kip Occurrence"
+#: ui/evolution-task-editor-dialog.xml.h:49
+msgid "S_kip Occurrence (FIXME)"
 msgstr "Hopp over gjenta_kelse"
 
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "FIXME: _Appointment"
-msgstr "_Avtale"
+#: ui/evolution-task-editor-dialog.xml.h:54
+msgid "Save the task and close the dialog box"
+msgstr "Lagre oppgaven og lukk dialogboksen"
 
 #: ui/evolution-task-editor-dialog.xml.h:55
-msgid "FIXME: _Mark Complete"
-msgstr "_Merk som fullført"
+msgid "Search again for the same string"
+msgstr "Søk etter samme streng på nytt"
 
-#: ui/evolution-task-editor-dialog.xml.h:58
-msgid "FIXME: _New Task"
-msgstr "_Ny oppgave"
+#: ui/evolution-task-editor-dialog.xml.h:56
+msgid "Search for a string"
+msgstr "Søk etter en streng"
 
 #: ui/evolution-task-editor-dialog.xml.h:61
-msgid "FIXME: _Reply"
-msgstr "Sva_r"
+msgid "Undo"
+msgstr "Angre"
 
-#: ui/evolution-task-editor-dialog.xml.h:66
-msgid "FIXME: _note"
-msgstr "_notis"
+#: ui/evolution-task-editor-dialog.xml.h:62
+msgid "Undo the last action"
+msgstr "Angre siste handling"
 
-#: ui/evolution-task-editor-dialog.xml.h:94
-msgid "Save the task and close the dialog box"
-msgstr "Lagre oppgaven og lukk dialogboksen"
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
+msgid "_Appointment (FIXME)"
+msgstr "_Avtale"
+
+#: ui/evolution-task-editor-dialog.xml.h:77
+msgid "_Mark Complete (FIXME)"
+msgstr "_Merk som fullført"
+
+#: ui/evolution-task-editor-dialog.xml.h:84
+msgid "_Reply (FIXME)"
+msgstr "Sva_r"
 
 #: ui/evolution-tasks.xml.h:2
 msgid "Create a new task"
 msgstr "Opprett en ny oppgave"
 
+#: ui/evolution-tasks.xml.h:3
+msgid "New"
+msgstr "Ny"
+
 #: ui/evolution-tasks.xml.h:5
 msgid "Save task as something else"
 msgstr "Lagre oppgave som noe annet"
@@ -7380,134 +7071,126 @@ msgstr "Brukervalg for oppgaver..."
 msgid "About Evolution..."
 msgstr "Om Evolution..."
 
-#: ui/evolution.xml.h:2
+#: ui/evolution.xml.h:3
+msgid "Close this window"
+msgstr "Lukk dette vinduet"
+
+#: ui/evolution.xml.h:4
 msgid "Customi_ze..."
 msgstr "_Tilpass..."
 
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:5
 msgid "Customize"
 msgstr "Tilpass"
 
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:6
 msgid "Customize toolbars"
 msgstr "Tilpass verktøylinjer"
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:7
 msgid "Display a different folder"
 msgstr "Vis en annen mappe"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:8
 msgid "E_xit"
 msgstr "A_vslutt"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:9
 msgid "Evolution bar _shortcut"
 msgstr "Evolution-linje _snarvei"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Exit"
 msgstr "Avslutt"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "Avslutt programmet"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Getting _Started"
 msgstr "Kom _igang"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:13
 msgid "Import an external file format"
 msgstr "Importér et eksternt filformat"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 msgid "Main toolbar"
 msgstr "Hovedverktøylinje"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Show information about Evolution"
 msgstr "Vis informasjon om Evolution"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Show the _Folder Bar"
 msgstr "Vis _mappelinjen"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Show the _Shortcut Bar"
 msgstr "Vis _snarveilinjen"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Submit Bug Report"
 msgstr "Send inn feilrapport"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:19
 msgid "Submit _Bug Report"
 msgstr "Sen_d inn feilrapport"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit bug report using Bug Buddy."
 msgstr "Send inn feilrapport ved bruk av Bug Buddy."
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Toggle whether to show the folder bar"
 msgstr "Slå av/på visning av mappelinjen"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Slå av/på visning av snarveilinjen"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:23
 msgid "Using the C_ontact Manager"
 msgstr "Bruk av k_ontaktdatabasen"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 msgid "Using the _Calendar"
 msgstr "Bruk av _kalenderen"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Using the _Mailer"
 msgstr "Bruk av e-_postprogrammet"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "_About Evolution..."
 msgstr "_Om Evolution..."
 
-#: ui/evolution.xml.h:25
-msgid "_Appointment (FIXME)"
-msgstr "_Avtale"
-
-#: ui/evolution.xml.h:26
-msgid "_Contact (FIXME)"
-msgstr "_Kontakt"
-
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:32
 msgid "_Folder"
 msgstr "_Mappe"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:33
 msgid "_Go to Folder..."
 msgstr "_Gå til mappe..."
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:35
 msgid "_Import file..."
 msgstr "_Importér fil..."
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:36
 msgid "_Index"
 msgstr "_Indeks"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:37
 msgid "_Mail message"
 msgstr "Send _melding"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:39
 msgid "_Settings"
 msgstr "Inn_stillinger"
 
-#: ui/evolution.xml.h:37
-msgid "_Task (FIXME)"
-msgstr "_Oppgave"
-
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
@@ -7515,6 +7198,10 @@ msgstr "_Oppgave"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
+msgid "Tentative"
+msgstr "Tentativ"
+
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:387
 msgid "Busy"
 msgstr "Opptatt"
@@ -7594,11 +7281,11 @@ msgid "MTWTFSS"
 msgstr "MTWTFSS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
+#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-clipped-label.c:111
+#: widgets/misc/e-clipped-label.c:107
 msgid "..."
 msgstr "..."
 
@@ -7618,14 +7305,465 @@ msgstr "%H:%M"
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
-#: widgets/misc/e-search-bar.c:176
+#: widgets/misc/e-messagebox.c:141
+msgid "Information"
+msgstr "Informasjon"
+
+#: widgets/misc/e-messagebox.c:148
+msgid "Warning"
+msgstr "Advarsel"
+
+#: widgets/misc/e-messagebox.c:162
+msgid "Question"
+msgstr "Spørsmål"
+
+#: widgets/misc/e-messagebox.c:169
+msgid "Message"
+msgstr "Melding"
+
+#. Add the "Don't show this message again." checkbox
+#: widgets/misc/e-messagebox.c:213
+msgid "Don't show this message again."
+msgstr "Ikke vis denne meldingen igjen."
+
+#: widgets/misc/e-search-bar.c:135
 msgid "Sear_ch"
 msgstr "Sø_k"
 
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "Gruppe %i"
+#~ msgid "Note: When converting between mailbox formats, a failure\n"
+#~ msgstr "Merk: Ved konvertering mellom postboksformater, kan en feil\n"
+
+#~ msgid "Congratulations, your mail configuration is complete.\n"
+#~ msgstr "Gratulerer, konfigurasjon av e-post er fullført.\n"
+
+#~ msgid ""
+#~ "Could not open file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kan ikke åpne fil %s:\n"
+#~ "%s"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid "Cancel"
+#~ msgstr "Avbryt"
+
+#~ msgid "FIXME: Assig_n Task"
+#~ msgstr "Tildel o_ppgave"
+
+#~ msgid "FIXME: Ch_oose Form..."
+#~ msgstr "Velg skjema..."
+
+#~ msgid "FIXME: Chec_k Names"
+#~ msgstr "Sjek_k navn"
+
+#~ msgid "FIXME: Cop_y to Folder..."
+#~ msgstr "Kopiér til mappe..."
+
+#~ msgid "FIXME: D_esign a Form..."
+#~ msgstr "U_tform et skjema..."
+
+#~ msgid "FIXME: Define Print _Styles"
+#~ msgstr "Definér utskrift_stiler"
+
+#~ msgid "FIXME: Desi_gn This Form"
+#~ msgstr "_Utform dette skjemaet"
+
+#~ msgid "FIXME: For_ward"
+#~ msgstr "_Videresend"
+
+#~ msgid "FIXME: Help"
+#~ msgstr "Hjelp"
+
+#~ msgid "FIXME: In_complete Task"
+#~ msgstr "U_komplett oppgave"
+
+#~ msgid "FIXME: Insert File"
+#~ msgstr "Sett inn fil"
+
+#~ msgid "FIXME: It_em..."
+#~ msgstr "Opp_føring"
+
+#~ msgid "FIXME: Paste _Special... "
+#~ msgstr "Lim inn _spesial..."
+
+#~ msgid "FIXME: Print Pre_view"
+#~ msgstr "Forhåndsvisning av utskrift"
+
+#~ msgid "FIXME: Pu_blish Form As..."
+#~ msgstr "Pu_blisér skjema som..."
+
+#~ msgid "FIXME: Publish _Form..."
+#~ msgstr "Publisér skjema..."
+
+#~ msgid "FIXME: Rec_urrence..."
+#~ msgstr "Gjentakelse..."
+
+#~ msgid "FIXME: Reply to A_ll"
+#~ msgstr "Svar til a_lle"
+
+#~ msgid "FIXME: S_end"
+#~ msgstr "_Send"
+
+#~ msgid "FIXME: Save Attac_hments..."
+#~ msgstr "Lagre vedle_gg..."
+
+#~ msgid "FIXME: Script _Debugger"
+#~ msgstr "Feilsøking i skript"
+
+#~ msgid "FIXME: Task _Request"
+#~ msgstr "Oppgavefo_respørsel"
+
+#~ msgid "FIXME: _Appointment"
+#~ msgstr "_Avtale"
+
+#~ msgid "FIXME: _Contact"
+#~ msgstr "_Kontakt"
+
+#~ msgid "FIXME: _Customize..."
+#~ msgstr "_Tilpass..."
+
+#~ msgid "FIXME: _File..."
+#~ msgstr "_Fil..."
+
+#~ msgid "FIXME: _Font..."
+#~ msgstr "FIXME: Skri_fttyper..."
+
+#~ msgid "FIXME: _Formatting"
+#~ msgstr "_Formatering"
+
+#~ msgid "FIXME: _Item"
+#~ msgstr "_Oppføring"
+
+#~ msgid "FIXME: _Journal Entry"
+#~ msgstr "_Journaloppføring"
+
+#~ msgid "FIXME: _Mail Message"
+#~ msgstr "Send _melding"
+
+#~ msgid "FIXME: _Mark Complete"
+#~ msgstr "_Merk som fullført"
+
+#~ msgid "FIXME: _Memo Style"
+#~ msgstr "_Notis-stil"
+
+#~ msgid "FIXME: _Move to Folder..."
+#~ msgstr "_Flytt til mappe..."
+
+#~ msgid "FIXME: _New Task"
+#~ msgstr "_Ny oppgave"
+
+#~ msgid "FIXME: _Object..."
+#~ msgstr "_Objekt..."
+
+#~ msgid "FIXME: _Paragraph..."
+#~ msgstr "_Avsnitt..."
+
+#~ msgid "FIXME: _Reply"
+#~ msgstr "Sva_r"
+
+#~ msgid "FIXME: _Spelling..."
+#~ msgstr "_Stavekontroll..."
+
+#~ msgid "FIXME: _Standard"
+#~ msgstr "_Standard"
+
+#~ msgid "FIXME: _Task"
+#~ msgstr "_Oppgave"
+
+#~ msgid "FIXME: _Unread Item"
+#~ msgstr "_Ulest oppføring"
+
+#~ msgid "FIXME: _note"
+#~ msgstr "_notis"
+
+#~ msgid "FIXME: what goes here?"
+#~ msgstr "Hva går her?"
+
+#~ msgid "Find _Again"
+#~ msgstr "Finn ig_jen"
+
+#~ msgid "_Find..."
+#~ msgstr "_Finn..."
+
+#~ msgid "_Forms"
+#~ msgstr "Sk_jemaer"
+
+#~ msgid "_Insert"
+#~ msgstr "Sett _inn"
+
+#~ msgid "_Object"
+#~ msgstr "_Objekt"
+
+#~ msgid "_Redo"
+#~ msgstr "Gjenopp_rett"
+
+#~ msgid "_Replace..."
+#~ msgstr "E_rstatt..."
+
+#~ msgid "_Toolbars"
+#~ msgstr "Verk_tøylinjer"
+
+#~ msgid "_Undo"
+#~ msgstr "_Angre"
+
+#~ msgid "FIXME: _New Appointment"
+#~ msgstr "_Ny avtale"
+
+#~ msgid "FIXME: _Note"
+#~ msgstr "_Notis"
+
+#~ msgid "Group %i"
+#~ msgstr "Gruppe %i"
+
+#~ msgid "A sample Bonobo control which displays an addressbook."
+#~ msgstr "Eksempel på Bonobo-kontroll som viser en adressebok."
+
+#~ msgid "Control that displays an Evolution addressbook minicard."
+#~ msgstr "Kontroll som viser et minikort for Evolutions adressebok."
+
+#~ msgid "Evolution Addressbook minicard viewer"
+#~ msgstr "Evolution adressebok minikort visning"
+
+#~ msgid "Evolution component for handling contacts."
+#~ msgstr "Evolution komponent for håndtering av kontakter."
+
+#~ msgid "Factory for the Addressbook Minicard control"
+#~ msgstr "Factory for minikort kontroll for adressebok"
+
+#~ msgid "Factory for the Evolution addressbook component."
+#~ msgstr "Factory for Evolution adressebok-komponent."
+
+#~ msgid "Factory for the sample Addressbook control"
+#~ msgstr "Factory for eksempelkontroll for adressebok"
+
+#~ msgid "Evolution's addressbook name selection interface."
+#~ msgstr "Evolution adressebok-komponent"
+
+#~ msgid "Factory for the Addressbook's name selection interface"
+#~ msgstr "Factory for adressebokens grensesnitt for navnevalg"
+
+#~ msgid "Click here to add a contact"
+#~ msgstr "Klikk her for å legge til en kontakt"
+
+#~ msgid "Reminder of your appointment at "
+#~ msgstr "Påminnelse om din avtale "
+
+#~ msgid "Click here to add a task"
+#~ msgstr "Klikk her for å legge til en oppgave"
+
+#~ msgid "I couldn't update your calendar file!\n"
+#~ msgstr "Kunne ikke oppdatere din kalenderfil!\n"
+
+#~ msgid "Component successfully updated."
+#~ msgstr "Oppdatering av komponent fullført."
+
+#~ msgid "There was an error loading the calendar file."
+#~ msgstr "Det oppsto en feil under lasting av kalenderfilen."
+
+#~ msgid "I couldn't open your calendar file!\n"
+#~ msgstr "Kunne ikke åpne din kalenderfil!\n"
+
+#~ msgid "I couldn't load your calendar file!\n"
+#~ msgstr "Kunne ikke laste din kalenderfil!\n"
+
+#~ msgid "I couldn't read your calendar file!\n"
+#~ msgstr "Kunne ikke lese din kalenderfil!\n"
+
+#~ msgid "This is a reply from someone who was uninvited!"
+#~ msgstr "Dette er et svar fra noen som ikke er invitert!"
+
+#~ msgid "I couldn't update your calendar store."
+#~ msgstr "Kunne ikke oppdatere ditt kalenderlager."
+
+#~ msgid "I couldn't delete the calendar component!\n"
+#~ msgstr "Kunne ikke slette kalenderkomponenten!\n"
+
+#~ msgid "Component successfully deleted."
+#~ msgstr "Sletting av komponent fullført."
+
+#~ msgid "I don't recognize this type of calendar component."
+#~ msgstr "Kan ikke kjenne igjen denne typen kalenderkomponent."
+
+#~ msgid "Add to Calendar"
+#~ msgstr "Legg til i kalenderen"
+
+#~ msgid "Accept"
+#~ msgstr "Akseptér"
+
+#~ msgid "Decline"
+#~ msgstr "Avslå"
+
+#~ msgid "Update Calendar"
+#~ msgstr "Oppdatér kalender"
+
+#~ msgid "Attendee"
+#~ msgstr "Deltaker"
+
+#~ msgid "Attendee address"
+#~ msgstr "Deltakers adresse"
+
+#~ msgid "Attendees: "
+#~ msgstr "Deltakere: "
+
+#~ msgid ""
+#~ "Cancel\n"
+#~ "Meeting"
+#~ msgstr ""
+#~ "Avlys\n"
+#~ "møte"
+
+#~ msgid "Chair"
+#~ msgstr "Stol"
+
+#~ msgid "Meeting Invitations"
+#~ msgstr "Møteinvitasjoner"
+
+#~ msgid "Non-Participant"
+#~ msgstr "Ikke-deltaker"
+
+#~ msgid "Optional Participant"
+#~ msgstr "Valgfri deltaker"
+
+#~ msgid "Organizer: "
+#~ msgstr "Organisator: "
+
+#~ msgid ""
+#~ "Publish\n"
+#~ "Event"
+#~ msgstr ""
+#~ "Publiser\n"
+#~ "hendelse"
+
+#~ msgid "RSVP"
+#~ msgstr "RSVP"
+
+#~ msgid ""
+#~ "Request\n"
+#~ "Meeting"
+#~ msgstr ""
+#~ "Forespør\n"
+#~ "møte"
+
+#~ msgid "Required Participant"
+#~ msgstr ""
+#~ "Obligatorisk\n"
+#~ "deltaker"
+
+#~ msgid "Role"
+#~ msgstr "Rolle"
+
+#~ msgid ""
+#~ "Schedule\n"
+#~ "Time"
+#~ msgstr ""
+#~ "Sett av\n"
+#~ "tid"
+
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr "Evolution komponent for kalendersammendrag."
+
+#~ msgid "Evolution calendar iTip/iMip viewer"
+#~ msgstr "Evolution kalender iTip/iMip-visning"
+
+#~ msgid "Evolution component for handling the calendar."
+#~ msgstr "Evolution komponent for håndtering av kalenderen."
+
+#~ msgid "Factory for the Calendar Summary component."
+#~ msgstr "Factory for kalenderens sammendragskomponent."
+
+#~ msgid "Factory for the Evolution calendar component."
+#~ msgstr "Factory for Evolution kalender-komponent."
+
+#~ msgid "Factory for the calendar iTip view control"
+#~ msgstr "Factory for kalenderens iTip visningskontroll"
+
+#~ msgid "name"
+#~ msgstr "navn"
+
+#~ msgid "A sample Bonobo control which displays an calendar."
+#~ msgstr "Eksempel på Bonobo-kontroll som viser en kalender."
+
+#~ msgid "Factory for the sample Calendar control"
+#~ msgstr "Factory for eksempelkontroll for kalender"
+
+#~ msgid "Appearance"
+#~ msgstr "Utseende"
+
+#~ msgid "Background:"
+#~ msgstr "Bakgrunn:"
+
+#~ msgid "Failed to perform regex search on message header: %s"
+#~ msgstr "Feil under utførelse av søk etter vanlig uttrykk i meldingshode: %s"
+
+#~ msgid "Evolution component for handling mail."
+#~ msgstr "Evolution komponent for håndtering av e-post."
+
+#~ msgid "Evolution mail composer."
+#~ msgstr "Evolutions e-postredigering."
+
+#~ msgid "Evolution mail executive summary component."
+#~ msgstr "Evolution e-post komponent for sammendrag."
+
+#~ msgid "Evolution mail folder display component."
+#~ msgstr "Evolution komponent for e-post mappevisning."
+
+#~ msgid "Evolution mail folder factory component."
+#~ msgstr "Evolution komponent for e-postmappe factory."
+
+#~ msgid "Factory for the Evolution composer."
+#~ msgstr "Factory for Evolution meldingsredigering."
+
+#~ msgid "Factory for the Evolution mail component."
+#~ msgstr "Factory for Evolution e-post komponent."
+
+#~ msgid "Factory for the Mail Summary component."
+#~ msgstr "Factory for e-post sammendrag komponent."
+
+#~ msgid "You have no Outbox configured"
+#~ msgstr "Du har ikke konfigurert en utboks"
+
+#~ msgid "Fetching email from %s"
+#~ msgstr "Henter e-post fra %s"
+
+#~ msgid "Fetch email from %s"
+#~ msgstr "Hent e-post fra %s"
+
+#~ msgid "There is no new mail at %s."
+#~ msgstr "Ingen ny e-post på %s."
+
+#~ msgid "Filtering email on demand"
+#~ msgstr "Filtrering av post etter behov"
+
+#~ msgid "Filter email on demand"
+#~ msgstr "Fi_ltrér e-post ved behov"
+
+#~ msgid "Sending queue"
+#~ msgstr "Sender kø"
+
+#~ msgid "Send queue"
+#~ msgstr "Send kø"
+
+#~ msgid "Examining %s"
+#~ msgstr "Undersøker %s"
+
+#~ msgid ""
+#~ "Could not read UID cache file \"%s\". You may receive duplicate messages."
+#~ msgstr ""
+#~ "Kunne ikke lese bufferfil for UID \"%s\". Du kan motta dupliserte meldinger."
+
+#~ msgid "Retrieving message %d of %d"
+#~ msgstr "Henter melding %d av %d"
+
+#~ msgid "Writing message %d of %d"
+#~ msgstr "Skriver melding %d av %d"
+
+#~ msgid "Saving changes to %s"
+#~ msgstr "Lagrer endringer til %s"
+
+#~ msgid "The Evolution shell."
+#~ msgstr "Evolution skallet."
 
 #~ msgid "<b>Error loading calendar:<br>Calendar in use."
 #~ msgstr "<b>Feil under lasting av kalender:<br>Kalender i bruk."
@@ -7690,9 +7828,6 @@ msgstr "Gruppe %i"
 #~ msgid "Calendar Server"
 #~ msgstr "Kalendertjener"
 
-#~ msgid "Congratulations, your mail configuration is complete.\n"
-#~ msgstr "Gratulerer, konfigurasjon av e-post er fullført.\n"
-
 #~ msgid ""
 #~ "Enter your name and email address to be used in outgoing mail. You may also, "
 #~ "optionally, enter the name of your organization, and the name of a file to "
@@ -7807,9 +7942,6 @@ msgstr "Gruppe %i"
 #~ msgid "Mail Transport"
 #~ msgstr "E-post-transport"
 
-#~ msgid "Mark message as seen [ms]: "
-#~ msgstr "Merk melding som sett [ms]: "
-
 #~ msgid "News Servers"
 #~ msgstr "News-tjenere"
 
@@ -7903,9 +8035,6 @@ msgstr "Gruppe %i"
 #~ msgid "Rebuild message view"
 #~ msgstr "Gjenoppbygg meldingsvisningen"
 
-#~ msgid "Note: When converting between mailbox formats, a failure\n"
-#~ msgstr "Merk: Ved konvertering mellom postboksformater, kan en feil\n"
-
 #~ msgid "Page Set_up"
 #~ msgstr "Sideoppsett"
 
@@ -8402,9 +8531,6 @@ msgstr "Gruppe %i"
 #~ msgid "Preferred type: "
 #~ msgstr "Foretrukket type: "
 
-#~ msgid "Receiving Mail"
-#~ msgstr "Mottar e-post"
-
 #~ msgid "Sending Mail"
 #~ msgstr "Sender e-post"