Updated Norwegian translation. Major overhaul.

2001-04-25  Kjartan Maraas  <kmaraas@gnome.org>

	* no.po: Updated Norwegian translation.
	* POTFILES.in: Major overhaul.

svn path=/trunk/; revision=9555

3 files changed, 991 insertions, 836 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 174d092538..2d35f6396f 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-25  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* no.po: Updated Norwegian translation.
+	* POTFILES.in: Major overhaul.
+	
 2001-04-25  Christian Rose  <menthos@menthos.com>
 
 	* sv.po: Updated Swedish translation.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c8d4f8d4c3..e9ea552983 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,67 +1,68 @@
-addressbook/backend/ebook/e-card-simple.c
 addressbook/backend/ebook/e-card.c
+addressbook/backend/ebook/e-card-simple.c
+addressbook/backend/ebook/e-destination.c
 addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in
 addressbook/backend/ebook/load-gnomecard-addressbook.c
 addressbook/backend/ebook/load-pine-addressbook.c
-addressbook/backend/ebook/test-client-list.c
 addressbook/backend/ebook/test-client.c
+addressbook/backend/ebook/test-client-list.c
 addressbook/conduit/address-conduit.c
 addressbook/contact-editor/contact-editor.glade
-addressbook/contact-editor/e-contact-editor-confirm-delete.glade
 addressbook/contact-editor/e-contact-editor.c
+addressbook/contact-editor/e-contact-editor-confirm-delete.glade
 addressbook/contact-editor/e-contact-quick-add.c
 addressbook/contact-editor/fulladdr.glade
 addressbook/contact-editor/fullname.glade
-addressbook/gui/component/addressbook-factory.c
 addressbook/gui/component/addressbook.c
-addressbook/gui/component/addressbook-storage.c
 addressbook/gui/component/addressbook-config.c
 addressbook/gui/component/addressbook-config.glade
+addressbook/gui/component/addressbook-factory.c
+addressbook/gui/component/addressbook-storage.c
 addressbook/gui/component/e-address-widget.c
 addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in
-addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in
 addressbook/gui/component/select-names/e-select-names-popup.c
+addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in
 addressbook/gui/component/select-names/select-names.glade
 addressbook/gui/search/e-addressbook-search-dialog.c
 addressbook/gui/widgets/alphabet.glade
 addressbook/gui/widgets/e-addressbook-view.c
+addressbook/gui/widgets/e-minicard.c
 addressbook/gui/widgets/e-minicard-control.c
 addressbook/gui/widgets/e-minicard-view.c
-addressbook/gui/widgets/e-minicard.c
 addressbook/gui/widgets/gal-view-factory-minicard.c
 addressbook/printing/e-contact-print.glade
 calendar/cal-util/timeutil.c
 calendar/conduits/calendar/calendar-conduit.c
 calendar/conduits/todo/todo-conduit.c
+calendar/gui/alarm-notify/alarm-queue.c
 #calendar/gui/alarm-notify.c
+calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in
+calendar/gui/alarm-notify/notify-main.c
 calendar/gui/calendar-commands.c
 calendar/gui/calendar-model.c
 calendar/gui/calendar-summary.c
 calendar/gui/control-factory.c
-calendar/gui/alarm-notify/alarm-queue.c
-calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in
-calendar/gui/alarm-notify/notify-main.c
 calendar/gui/dialogs/alarm-notify-dialog.c
 calendar/gui/dialogs/alarm-notify.glade
 calendar/gui/dialogs/cal-prefs-dialog.glade
 calendar/gui/dialogs/delete-comp.c
 calendar/gui/dialogs/save-comp.c
-calendar/gui/dialogs/task-editor-dialog.glade
 calendar/gui/dialogs/task-editor.c
+calendar/gui/dialogs/task-editor-dialog.glade
 calendar/gui/e-calendar-table.c
+calendar/gui/e-day-view.c
 calendar/gui/e-day-view-time-item.c
 calendar/gui/e-day-view-top-item.c
-calendar/gui/e-day-view.c
 calendar/gui/e-itip-control.c
 calendar/gui/e-itip-control.glade
 calendar/gui/e-meeting-dialog.glade
 calendar/gui/e-tasks.c
-calendar/gui/e-week-view-main-item.c
-calendar/gui/e-week-view.c
-calendar/gui/event-editor-dialog.glade
 calendar/gui/event-editor.c
-calendar/gui/GNOME_Evolution_Calendar.oaf.in
+calendar/gui/event-editor-dialog.glade
+calendar/gui/e-week-view.c
+calendar/gui/e-week-view-main-item.c
 calendar/gui/gnome-cal.c
+calendar/gui/GNOME_Evolution_Calendar.oaf.in
 calendar/gui/goto.c
 calendar/gui/goto-dialog.glade
 calendar/gui/main.c
@@ -83,26 +84,35 @@ camel/camel-sasl-anonymous.c
 camel/camel-sasl-cram-md5.c
 camel/camel-sasl-digest-md5.c
 camel/camel-sasl-kerberos4.c
+camel/camel-sasl-login.c
 camel/camel-sasl-plain.c
 camel/camel-search-private.c
 camel/camel-service.c
 camel/camel-session.c
 camel/camel-store.c
+camel/camel-tcp-stream-ssl.c
 camel/camel-url.c
 camel/camel-vee-folder.c
+camel/camel-vtrash-folder.c
+#camel/providers/cache/camel-cache-map.c
+#camel/providers/cache/camel-cache-store.c
+camel/providers/imap/camel-imap-message-cache.c
 camel/providers/imap/camel-imap-command.c
 camel/providers/imap/camel-imap-folder.c
 camel/providers/imap/camel-imap-provider.c
 camel/providers/imap/camel-imap-store.c
 camel/providers/local/camel-local-provider.c
 camel/providers/local/camel-local-store.c
+camel/providers/local/camel-local-summary.c
 camel/providers/local/camel-maildir-folder.c
 camel/providers/local/camel-maildir-store.c
+camel/providers/local/camel-maildir-summary.c
 camel/providers/local/camel-mbox-folder.c
 camel/providers/local/camel-mbox-store.c
 camel/providers/local/camel-mbox-summary.c
 camel/providers/local/camel-mh-folder.c
 camel/providers/local/camel-mh-store.c
+camel/providers/local/camel-mh-summary.c
 camel/providers/nntp/camel-nntp-auth.c
 camel/providers/nntp/camel-nntp-folder.c
 camel/providers/nntp/camel-nntp-grouplist.c
@@ -118,20 +128,20 @@ camel/providers/smtp/camel-smtp-transport.c
 composer/e-msg-composer-attachment-bar.c
 composer/e-msg-composer-attachment.c
 composer/e-msg-composer-attachment.glade
-composer/e-msg-composer-hdrs.c
 composer/e-msg-composer.c
+composer/e-msg-composer-hdrs.c
 composer/evolution-composer.c
 data/evolution.desktop.in
 data/evolution.keys.in
 default_user/searches.xml
 e-util/e-time-utils.c
-executive-summary/GNOME_Evolution_Summary.oaf.in
 executive-summary/component/component-factory.c
+executive-summary/component/e-summary.c
 executive-summary/component/e-summary-callbacks.c
 executive-summary/component/e-summary-url.c
-executive-summary/component/e-summary.c
 executive-summary/component/executive-summary-config.glade
 executive-summary/component/main.c
+executive-summary/GNOME_Evolution_Summary.oaf.in
 executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in
 executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in
 executive-summary/test-service/rdf-summary.c
@@ -139,29 +149,35 @@ filter/filter-datespec.c
 filter/filter-editor.c
 filter/filter-filter.c
 filter/filter-folder.c
+filter/filter.glade
 filter/filter-input.c
 filter/filter-option.c
 filter/filter-part.c
 filter/filter-rule.c
-filter/filter.glade
 filter/libfilter-i18n.h
+filter/rule-editor.c
 filter/score-editor.c
 filter/score-rule.c
 filter/vfolder-editor.c
 filter/vfolder-rule.c
 mail/component-factory.c
-mail/folder-browser-factory.c
 mail/folder-browser.c
+mail/folder-browser-factory.c
 mail/GNOME_Evolution_Mail.oaf.in
+mail/importers/elm-importer.c
+mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in
+mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in
+mail/importers/netscape-importer.c
+mail/importers/pine-importer.c
 mail/local-config.glade
-mail/mail-accounts.c
 mail/mail-account-editor.c
 mail/mail-account-gui.c
+mail/mail-accounts.c
 mail/mail-autofilter.c
 mail/mail-callbacks.c
 mail/mail-config.c
-mail/mail-config.glade
 mail/mail-config-druid.c
+mail/mail-config.glade
 mail/mail-crypto.c
 mail/mail-display.c
 mail/mail-format.c
@@ -177,21 +193,22 @@ mail/message-browser.c
 mail/message-list.c
 mail/session.c
 mail/subscribe-dialog.c
-shell/glade/e-shell-folder-creation-dialog.glade
-shell/importer/importer.c
-shell/importer/import.glade
 shell/e-setup.c
+shell/e-shell.c
 shell/e-shell-folder-creation-dialog.c
 shell/e-shell-folder-selection-dialog.c
 shell/e-shell-folder-title-bar.c
-shell/e-shell-view-menu.c
 shell/e-shell-view.c
-shell/e-shell.c
-shell/e-shortcuts-view.c
+shell/e-shell-view-menu.c
 shell/e-shortcuts.c
-shell/e-storage-set-view.c
+shell/e-shortcuts-view.c
 shell/e-storage.c
+shell/e-storage-set-view.c
+shell/glade/e-shell-folder-creation-dialog.glade
 shell/GNOME_Evolution_Shell.oaf.in
+shell/importer/importer.c
+shell/importer/import.glade
+shell/importer/intelligent.c
 shell/main.c
 ui/evolution-addressbook.xml
 ui/evolution-calendar.xml
@@ -204,11 +221,14 @@ 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
+views/addressbook/galview.xml
+views/mail/galview.xml
+views/tasks/galview.xml
 widgets/meeting-time-sel/e-meeting-time-sel.c
+widgets/meeting-time-sel/e-meeting-time-sel-item.c
 widgets/menus/gal-view-menus.c
-widgets/misc/e-calendar-item.c
 widgets/misc/e-calendar.c
+widgets/misc/e-calendar-item.c
 widgets/misc/e-cell-date-edit.c
 widgets/misc/e-clipped-label.c
 widgets/misc/e-dateedit.c
@@ -216,8 +236,5 @@ widgets/misc/e-filter-bar.c
 widgets/misc/e-filter-bar.h
 widgets/misc/e-messagebox.c
 widgets/misc/e-search-bar.c
-views/addressbook/galview.xml
-views/mail/galview.xml
-views/tasks/galview.xml
 wombat/GNOME_Evolution_Wombat.oaf.in
 wombat/wombat.c
diff --git a/po/no.po b/po/no.po
index 5b8c36134e..92d8669856 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.8\n"
-"POT-Creation-Date: 2001-04-23 20:48-0400\n"
-"PO-Revision-Date: 2001-04-23 21:01-04:00\n"
+"POT-Creation-Date: 2001-04-24 15:16-0400\n"
+"PO-Revision-Date: 2001-04-24 15:20-04:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -299,6 +299,10 @@ msgstr ""
 "\n"
 "Offentlig nøkkel: "
 
+#: addressbook/backend/ebook/e-destination.c:232
+msgid "???"
+msgstr "???"
+
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
 msgid "Factory to import GnomeCard files into Evolution."
 msgstr "Factory for import av GnomeCard-filer til Evolution."
@@ -492,10 +496,6 @@ msgstr "Ekte_felle:"
 msgid "_This is the mailing address"
 msgstr "De_tte er postadressen"
 
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "Slett kontakt?"
-
 #: addressbook/contact-editor/e-contact-editor.c:603
 msgid "This contact belongs to these categories:"
 msgstr "Denne kontakten hører til disse kategoriene:"
@@ -598,6 +598,10 @@ msgstr "E-post 2"
 msgid "Email 3"
 msgstr "E-post 3"
 
+#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "Slett kontakt?"
+
 #: addressbook/contact-editor/e-contact-quick-add.c:233
 msgid "Contact Quick-Add"
 msgstr "Hurtigkontakt"
@@ -790,10 +794,6 @@ msgstr "E-post inneholder"
 msgid "The URI that the Folder Browser will display"
 msgstr "URIen som mappeutforskeren vil vise"
 
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
-msgstr "Andre kontakter"
-
 #: addressbook/gui/component/addressbook-config.c:148
 msgid "LDAP Server"
 msgstr "LDAP-tjener"
@@ -942,8 +942,8 @@ msgstr "Adressebok-kilder"
 #: addressbook/gui/widgets/e-minicard.c:673
 #: calendar/gui/e-meeting-dialog.glade.h:8
 #: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/folder-browser.c:597
-#: mail/mail-config.glade.h:19 mail/mail-view.c:156
+#: filter/libfilter-i18n.h:11 mail/folder-browser.c:616
+#: mail/mail-config.glade.h:19 mail/message-browser.c:190
 #: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
 #: ui/evolution-mail.xml.h:11 ui/evolution-task-editor-dialog.xml.h:18
 msgid "Delete"
@@ -963,6 +963,10 @@ msgstr "Navn"
 msgid "URI"
 msgstr "URI"
 
+#: addressbook/gui/component/addressbook-storage.c:99
+msgid "Other Contacts"
+msgstr "Andre kontakter"
+
 #: addressbook/gui/component/e-address-widget.c:365
 msgid "Disable Queries"
 msgstr "Deaktiver spørringer"
@@ -1025,14 +1029,6 @@ msgstr "Factory for Evolution adressebok-komponent."
 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/e-select-names-popup.c:131
 #: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:401
 #: filter/filter-rule.c:549 filter/filter.glade.h:9
@@ -1044,6 +1040,14 @@ msgstr "Fjern"
 msgid "Remove All"
 msgstr "Fjern alle"
 
+#: 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..."
@@ -1190,8 +1194,8 @@ msgid "Send message to contact"
 msgstr "Send melding til kontakt"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:576
-#: addressbook/gui/widgets/e-minicard.c:671 mail/folder-browser.c:572
-#: mail/mail-view.c:154 ui/evolution-addressbook.xml.h:9
+#: addressbook/gui/widgets/e-minicard.c:671 mail/folder-browser.c:591
+#: mail/message-browser.c:187 ui/evolution-addressbook.xml.h:9
 #: ui/evolution-calendar.xml.h:23 ui/evolution-mail.xml.h:51
 #: ui/evolution-tasks.xml.h:4
 msgid "Print"
@@ -1520,6 +1524,47 @@ msgstr "Kunne ikke lese pilotens kalender-applikasjonsblokk"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikke lese pilotens applikasjonsblokk for oppgaveliste"
 
+#: calendar/gui/alarm-notify/alarm-queue.c:586
+#: calendar/gui/alarm-notify/alarm-queue.c:885
+#: calendar/gui/alarm-notify/alarm-queue.c:941
+msgid "Reminder of your appointment at "
+msgstr "Påminnelse om din avtale "
+
+#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/dialogs/alarm-notify.glade.h:3
+msgid "Snooze"
+msgstr "Utsett"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:890
+#: calendar/gui/alarm-notify/alarm-queue.c:945
+msgid "Ok"
+msgstr "Ok"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr "Alarm-tjeneste"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+msgid "Factory for the alarm notification service"
+msgstr "Factory for alarm-tjenesten"
+
+#: calendar/gui/alarm-notify/notify-main.c:56
+#, c-format
+msgid ""
+"It is %s.  The Unix time is %ld right now.  We just thought you may like to "
+"know."
+msgstr ""
+"Det er %s. Unix tiden er %ld akkurat nå. Vi bare tenkte du ville vite det."
+
+#: calendar/gui/alarm-notify/notify-main.c:94 calendar/gui/main.c:52
+msgid "Could not initialize GNOME"
+msgstr "Kunne ikke initiere GNOME"
+
+#: calendar/gui/alarm-notify/notify-main.c:109
+msgid "Could not create the alarm notify service factory"
+msgstr "Kunne ikke opprette factory for alarm-tjenesten"
+
 #: calendar/gui/calendar-commands.c:266
 msgid "File not found"
 msgstr "Fil ikke funnet"
@@ -1578,20 +1623,20 @@ msgstr "V"
 
 #: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1063
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:662
+#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:690
 msgid "High"
 msgstr "Høy"
 
 #: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1065
 #: calendar/gui/calendar-model.c:1569
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:661
+#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:689
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1067
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:660
+#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:688
 msgid "Low"
 msgstr "Lav"
 
@@ -1664,8 +1709,8 @@ msgstr ""
 #: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:973
 #: mail/mail-accounts.c:120 mail/mail-accounts.c:164
 #: mail/mail-config.glade.h:37 shell/e-shell-view.c:1179
-#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:430
-#: widgets/misc/e-dateedit.c:1339 widgets/misc/e-dateedit.c:1454
+#: widgets/misc/e-cell-date-edit.c:237 widgets/misc/e-dateedit.c:432
+#: widgets/misc/e-dateedit.c:1341 widgets/misc/e-dateedit.c:1456
 msgid "None"
 msgstr "Ingen"
 
@@ -1765,46 +1810,6 @@ msgstr "Laster kalender"
 msgid "The URI that the calendar will display"
 msgstr "URIen som kalenderen skal vise"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
-msgstr "Påminnelse om din avtale "
-
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "Utsett"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
-msgstr "Ok"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
-msgstr "Alarm-tjeneste"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-msgid "Factory for the alarm notification service"
-msgstr "Factory for alarm-tjenesten"
-
-#: calendar/gui/alarm-notify/notify-main.c:56
-#, c-format
-msgid ""
-"It is %s.  The Unix time is %ld right now.  We just thought you may like to "
-"know."
-msgstr "Det er %s. Unix tiden er %ld akkurat nå. Vi bare tenkte du ville vite det."
-
-#: calendar/gui/alarm-notify/notify-main.c:94 calendar/gui/main.c:52
-msgid "Could not initialize GNOME"
-msgstr "Kunne ikke initiere GNOME"
-
-#: calendar/gui/alarm-notify/notify-main.c:109
-msgid "Could not create the alarm notify service factory"
-msgstr "Kunne ikke opprette factory for alarm-tjenesten"
-
 #: calendar/gui/dialogs/alarm-notify-dialog.c:189
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Alarm på %A %b %d %Y %H:%M"
@@ -2108,6 +2113,29 @@ msgstr "Er du sikker på at du vil slette denne journaloppføringen uten tittel?"
 msgid "Do you want to save changes?"
 msgstr "Vil du lagre endringene?"
 
+#: calendar/gui/dialogs/task-editor.c:707
+msgid "Edit Task"
+msgstr "Redigér oppgave"
+
+#: calendar/gui/dialogs/task-editor.c:713 calendar/gui/event-editor.c:382
+msgid "No summary"
+msgstr "Ingen sammendrag"
+
+#: calendar/gui/dialogs/task-editor.c:719 calendar/gui/event-editor.c:388
+#, c-format
+msgid "Appointment - %s"
+msgstr "Avtale - %s"
+
+#: calendar/gui/dialogs/task-editor.c:722 calendar/gui/event-editor.c:391
+#, c-format
+msgid "Task - %s"
+msgstr "Oppgave - %s"
+
+#: calendar/gui/dialogs/task-editor.c:725 calendar/gui/event-editor.c:394
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Journaloppføring - %s"
+
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:2
 #, no-c-format
 msgid "% Comp_lete:"
@@ -2181,29 +2209,6 @@ msgstr "_Prioritet:"
 msgid "_Status:"
 msgstr "_Status:"
 
-#: calendar/gui/dialogs/task-editor.c:707
-msgid "Edit Task"
-msgstr "Redigér oppgave"
-
-#: calendar/gui/dialogs/task-editor.c:713 calendar/gui/event-editor.c:382
-msgid "No summary"
-msgstr "Ingen sammendrag"
-
-#: calendar/gui/dialogs/task-editor.c:719 calendar/gui/event-editor.c:388
-#, c-format
-msgid "Appointment - %s"
-msgstr "Avtale - %s"
-
-#: calendar/gui/dialogs/task-editor.c:722 calendar/gui/event-editor.c:391
-#, c-format
-msgid "Task - %s"
-msgstr "Oppgave - %s"
-
-#: calendar/gui/dialogs/task-editor.c:725 calendar/gui/event-editor.c:394
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Journaloppføring - %s"
-
 #: calendar/gui/e-calendar-table.c:157
 msgid "Categories"
 msgstr "Kategorier"
@@ -2328,10 +2333,17 @@ msgstr "Slett denne oppgaven"
 msgid "Delete the task"
 msgstr "Slett oppgaven"
 
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minutters oppdeling"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
+#: calendar/gui/print.c:617
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
+#: calendar/gui/print.c:616
+msgid "pm"
+msgstr "pm"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
@@ -2354,18 +2366,6 @@ msgstr "%a %d %b"
 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:570 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:617
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
-#: calendar/gui/print.c:616
-msgid "pm"
-msgstr "pm"
-
 #: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
 msgid "New Appointment"
 msgstr "Ny avtale"
@@ -2383,7 +2383,7 @@ msgid "Go to Date..."
 msgstr "Gå til dato..."
 
 #: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
-#: mail/folder-browser.c:566 ui/evolution-calendar.xml.h:19
+#: mail/folder-browser.c:585 ui/evolution-calendar.xml.h:19
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Åpne"
@@ -2409,6 +2409,11 @@ msgstr "Slett denne oppføringen"
 msgid "Delete all Occurrences"
 msgstr "Slett alle oppføringer"
 
+#: calendar/gui/e-day-view-time-item.c:519
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i minutters oppdeling"
+
 #: calendar/gui/e-itip-control.c:161
 msgid "I couldn't update your calendar file!\n"
 msgstr "Kunne ikke oppdatere din kalenderfil!\n"
@@ -2597,7 +2602,7 @@ msgstr ""
 "tid"
 
 #: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:49
-#: mail/message-list.c:1054
+#: mail/message-list.c:1082
 msgid "Status"
 msgstr "Status"
 
@@ -2620,20 +2625,120 @@ msgstr "Kunne ikke laste oppgavene i `%s'"
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden som er nødvendig for å laste `%s' er ikke støttet"
 
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342
-msgid "%d %B"
-msgstr "%d %B"
+#: calendar/gui/event-editor.c:376
+msgid "Edit Appointment"
+msgstr "Rediger avtale"
 
-#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
-msgid "New Appointment..."
-msgstr "Ny avtale..."
+#: calendar/gui/event-editor.c:454
+msgid "on"
+msgstr "på"
 
-#: calendar/gui/e-week-view.c:3314
-msgid "Delete All Occurrences"
-msgstr "Slett alle oppføringer"
+#: calendar/gui/event-editor.c:479 filter/filter-datespec.c:81
+msgid "day"
+msgstr "dag"
+
+#: calendar/gui/event-editor.c:606
+msgid "on the"
+msgstr "den"
+
+#: calendar/gui/event-editor.c:613
+msgid "th"
+msgstr "de"
+
+#: calendar/gui/event-editor.c:759
+msgid "occurrences"
+msgstr "gjentakelser"
+
+#: calendar/gui/event-editor.c:876
+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:1548
+#, c-format
+msgid " %d days"
+msgstr " %d dager"
+
+#: calendar/gui/event-editor.c:1550
+msgid " 1 day"
+msgstr " 1 dag"
+
+#: calendar/gui/event-editor.c:1553
+#, c-format
+msgid " %d weeks"
+msgstr " %d uker"
+
+#: calendar/gui/event-editor.c:1555
+msgid " 1 week"
+msgstr " 1 uke"
+
+#: calendar/gui/event-editor.c:1558
+#, c-format
+msgid " %d hours"
+msgstr " %d timer"
+
+#: calendar/gui/event-editor.c:1560
+msgid " 1 hour"
+msgstr " 1 time"
+
+#: calendar/gui/event-editor.c:1563
+#, c-format
+msgid " %d minutes"
+msgstr " %d minutter"
+
+#: calendar/gui/event-editor.c:1565
+msgid " 1 minute"
+msgstr " 1 minutt"
+
+#: calendar/gui/event-editor.c:1568
+#, c-format
+msgid " %d seconds"
+msgstr " %d  sekunder"
+
+#: calendar/gui/event-editor.c:1570
+msgid " 1 second"
+msgstr " 1 sekund"
+
+#: calendar/gui/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor.c:1593
+msgid "Play a sound"
+msgstr "Spill en lyd"
+
+#: calendar/gui/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor.c:1596
+msgid "Show a dialog"
+msgstr "Vis en dialog"
+
+#: calendar/gui/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor.c:1599
+msgid "Send an email"
+msgstr "Send en melding"
+
+#: calendar/gui/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor.c:1602
+msgid "Run a program"
+msgstr "Kjør et program"
+
+#: calendar/gui/event-editor.c:1617
+msgid " before start of appointment"
+msgstr " før avtalen starter"
+
+#: calendar/gui/event-editor.c:1619
+msgid " after start of appointment"
+msgstr " etter avtalens start"
+
+#: calendar/gui/event-editor.c:1627
+msgid " before end of appointment"
+msgstr " før avtalens slutt"
+
+#: calendar/gui/event-editor.c:1629
+msgid " after end of appointment"
+msgstr " etter avtalens slutt"
+
+#: calendar/gui/event-editor.c:3137 calendar/gui/print.c:1097
+#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
+msgid "%a %b %d %Y"
+msgstr "%a %b %d %Y"
 
 #: calendar/gui/event-editor-dialog.glade.h:1
 msgid "A_ll day event"
@@ -2667,11 +2772,6 @@ msgstr "Endre"
 msgid "No recurrence"
 msgstr "Ingen gjeninntreffelse"
 
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1593
-msgid "Play a sound"
-msgstr "Spill en lyd"
-
 #: calendar/gui/event-editor-dialog.glade.h:15
 msgid "Preview"
 msgstr "Forhåndsvis"
@@ -2688,25 +2788,10 @@ msgstr "Regel for gjenintreffelse"
 msgid "Reminder"
 msgstr "Påminnelse"
 
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1602
-msgid "Run a program"
-msgstr "Kjør et program"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1599
-msgid "Send an email"
-msgstr "Send en melding"
-
 #: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
 msgid "Settings..."
 msgstr "Innstillinger..."
 
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1596
-msgid "Show a dialog"
-msgstr "Vis en dialog"
-
 #: calendar/gui/event-editor-dialog.glade.h:26
 msgid "Simple recurrence"
 msgstr "Enkel gjeninntreffelse"
@@ -2776,100 +2861,50 @@ msgstr "uke(r)"
 msgid "year(s)"
 msgstr "år"
 
-#: calendar/gui/event-editor.c:376
-msgid "Edit Appointment"
-msgstr "Rediger avtale"
-
-#: calendar/gui/event-editor.c:454
-msgid "on"
-msgstr "på"
-
-#: calendar/gui/event-editor.c:479 filter/filter-datespec.c:81
-msgid "day"
-msgstr "dag"
-
-#: calendar/gui/event-editor.c:606
-msgid "on the"
-msgstr "den"
-
-#: calendar/gui/event-editor.c:613
-msgid "th"
-msgstr "de"
-
-#: calendar/gui/event-editor.c:759
-msgid "occurrences"
-msgstr "gjentakelser"
+#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
+msgid "New Appointment..."
+msgstr "Ny avtale..."
 
-#: calendar/gui/event-editor.c:876
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-"Denne avtalen har gjeninntreffelser som ikke kan redigeres av Evolution."
+#: calendar/gui/e-week-view.c:3314
+msgid "Delete All Occurrences"
+msgstr "Slett alle oppføringer"
 
-#: calendar/gui/event-editor.c:1548
-#, c-format
-msgid " %d days"
-msgstr " %d dager"
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/e-week-view-main-item.c:342
+msgid "%d %B"
+msgstr "%d %B"
 
-#: calendar/gui/event-editor.c:1550
-msgid " 1 day"
-msgstr " 1 dag"
+#: calendar/gui/gnome-cal.c:223
+msgid "Show all "
+msgstr "Vis alle "
 
-#: calendar/gui/event-editor.c:1553
-#, c-format
-msgid " %d weeks"
-msgstr " %d uker"
+#: calendar/gui/gnome-cal.c:237
+msgid "Summary contains"
+msgstr "Sammendrag inneholder"
 
-#: calendar/gui/event-editor.c:1555
-msgid " 1 week"
-msgstr " 1 uke"
+#: calendar/gui/gnome-cal.c:238
+msgid "Description contains"
+msgstr "Beskrivelse inneholder"
 
-#: calendar/gui/event-editor.c:1558
-#, c-format
-msgid " %d hours"
-msgstr " %d timer"
+#: calendar/gui/gnome-cal.c:239
+msgid "Comment contains"
+msgstr "Kommentar inneholder"
 
-#: calendar/gui/event-editor.c:1560
-msgid " 1 hour"
-msgstr " 1 time"
+#: calendar/gui/gnome-cal.c:240
+msgid "Has category"
+msgstr "Har kategori"
 
-#: calendar/gui/event-editor.c:1563
+#: calendar/gui/gnome-cal.c:843
 #, c-format
-msgid " %d minutes"
-msgstr " %d minutter"
-
-#: calendar/gui/event-editor.c:1565
-msgid " 1 minute"
-msgstr " 1 minutt"
+msgid "Could not open the folder in `%s'"
+msgstr "Kunne ikke åpne mappen i `%s'"
 
-#: calendar/gui/event-editor.c:1568
+#: calendar/gui/gnome-cal.c:854
 #, c-format
-msgid " %d seconds"
-msgstr " %d  sekunder"
-
-#: calendar/gui/event-editor.c:1570
-msgid " 1 second"
-msgstr " 1 sekund"
-
-#: calendar/gui/event-editor.c:1617
-msgid " before start of appointment"
-msgstr " før avtalen starter"
-
-#: calendar/gui/event-editor.c:1619
-msgid " after start of appointment"
-msgstr " etter avtalens start"
-
-#: calendar/gui/event-editor.c:1627
-msgid " before end of appointment"
-msgstr " før avtalens slutt"
-
-#: calendar/gui/event-editor.c:1629
-msgid " after end of appointment"
-msgstr " etter avtalens slutt"
-
-#: calendar/gui/event-editor.c:3137 calendar/gui/print.c:1097
-#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
+msgid "The method required to open `%s' is not supported"
+msgstr "Metoden som er nødvendig for å åpne `%s' er ikke støttet"
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
 msgid "A sample Bonobo control which displays an calendar."
@@ -2903,36 +2938,6 @@ msgstr "Factory for kalenderens iTip visningskontroll"
 msgid "Factory for the sample Calendar control"
 msgstr "Factory for eksempelkontroll for kalender"
 
-#: calendar/gui/gnome-cal.c:223
-msgid "Show all "
-msgstr "Vis alle "
-
-#: calendar/gui/gnome-cal.c:237
-msgid "Summary contains"
-msgstr "Sammendrag inneholder"
-
-#: calendar/gui/gnome-cal.c:238
-msgid "Description contains"
-msgstr "Beskrivelse inneholder"
-
-#: calendar/gui/gnome-cal.c:239
-msgid "Comment contains"
-msgstr "Kommentar inneholder"
-
-#: calendar/gui/gnome-cal.c:240
-msgid "Has category"
-msgstr "Har kategori"
-
-#: calendar/gui/gnome-cal.c:843
-#, c-format
-msgid "Could not open the folder in `%s'"
-msgstr "Kunne ikke åpne mappen i `%s'"
-
-#: calendar/gui/gnome-cal.c:854
-#, 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"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -3173,7 +3178,7 @@ msgstr "Dette året (%Y)"
 msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1464
+#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1467
 #: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
 #: ui/evolution-mail.xml.h:53
 msgid "Print Preview"
@@ -3626,10 +3631,18 @@ msgstr ""
 msgid "Bad authentication response from server."
 msgstr "Ugyldig svar på autentisering fra tjener."
 
-#: camel/camel-sasl-plain.c:34
+#: camel/camel-sasl-login.c:32
+msgid "NT Login"
+msgstr "NT-pålogging"
+
+#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
 msgstr "Dette valget vil koble til tjeneren ved bruk av et passord."
 
+#: camel/camel-sasl-login.c:127
+msgid "Unknown authentication state."
+msgstr "Ukjent autentiseringstilstand."
+
 #: camel/camel-search-private.c:110
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
@@ -3698,6 +3711,41 @@ msgstr ""
 msgid "Trash"
 msgstr "Søppel"
 
+#: camel/camel-tcp-stream-ssl.c:348
+#, c-format
+msgid ""
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
+msgstr ""
+"E-post: %s\n"
+"Vanlig navn: %s\n"
+"Organisasjonsenhet: %s\n"
+"Organisasjon: %s\n"
+"Lokasjon: %s\n"
+"Stat: %s\n"
+"Land: %s"
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-ssl.c:364
+#, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+"Ugyldig sertifikat fra %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Vil du akseptere likevel?"
+
 #: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -3713,6 +3761,15 @@ msgstr "Ingen slik melding %s i %s"
 msgid "No such message: %s"
 msgstr "Ingen slik melding: %s"
 
+#: camel/camel-vtrash-folder.c:109
+msgid "You cannot copy messages from this trash folder."
+msgstr "Du kan ikke kopiere meldinger fra denne søppel-katalogen."
+
+#: camel/providers/imap/camel-imap-message-cache.c:130
+#, c-format
+msgid "Could not open cache directory: %s"
+msgstr "Kan ikke åpne cache-katalog: %s"
+
 #: camel/providers/imap/camel-imap-command.c:209
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
@@ -3912,6 +3969,10 @@ msgstr "Kunne ikke slette sammendragsfil for mappe `%s': %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Kunne ikke slette indeksfil for mappe `%s': %s"
 
+#: camel/providers/local/camel-local-summary.c:404
+msgid "Unable to add message to summary: unknown reason"
+msgstr "Kunne ikke legge til melding i sammendraget: ukjent grunn"
+
 #: camel/providers/local/camel-maildir-folder.c:150
 #: camel/providers/local/camel-maildir-folder.c:158
 #: camel/providers/local/camel-maildir-folder.c:169
@@ -3988,6 +4049,12 @@ msgstr "Kunne ikke slette mappe `%s': %s"
 msgid "not a maildir directory"
 msgstr "ikke en maildir katalog"
 
+#: camel/providers/local/camel-maildir-summary.c:405
+#: camel/providers/local/camel-maildir-summary.c:526
+#, c-format
+msgid "Cannot open maildir directory path: %s: %s"
+msgstr "Kan ikke åpne maildir katalogsti: %s: %s"
+
 #: camel/providers/local/camel-mbox-folder.c:152
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
@@ -4147,6 +4214,11 @@ msgstr "Kan ikke legge til melding i mh-mappe: %s: %s"
 msgid "`%s' is not a directory."
 msgstr "`%s' er ikke en katalog."
 
+#: camel/providers/local/camel-mh-summary.c:218
+#, c-format
+msgid "Cannot open MH directory path: %s: %s"
+msgstr "Kan ikke åpne MH-katalogsti: %s: %s"
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
@@ -4702,7 +4774,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:1054
+#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1082
 msgid "Attachment"
 msgstr "Vedlegg"
 
@@ -4726,59 +4798,6 @@ msgstr "MIME-type:"
 msgid "Send as:"
 msgstr "Send som:"
 
-#: composer/e-msg-composer-hdrs.c:321
-msgid "Click here for the address book"
-msgstr "Klikk her for å få opp adresseboken"
-
-#.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:719
-msgid "From:"
-msgstr "Fra:"
-
-#.
-#. * Reply-To:
-#.
-#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:721
-msgid "Reply-To:"
-msgstr "Svar-til:"
-
-#.
-#. * Subject:
-#.
-#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:643
-msgid "Subject:"
-msgstr "Emne:"
-
-#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:723
-msgid "To:"
-msgstr "Til:"
-
-#: composer/e-msg-composer-hdrs.c:384
-msgid "Enter the recipients of the message"
-msgstr "Skriv inn mottakerene for meldingen"
-
-#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:725
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:388
-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:391
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:392
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Skriv inn adressene som skal motta en kopi av meldingen uten å komme til "
-"syne i mottakerlisten for meldingen."
-
 #: composer/e-msg-composer.c:529
 #, c-format
 msgid ""
@@ -4865,6 +4884,59 @@ msgstr "Skriv en melding"
 msgid "Could not create composer window."
 msgstr "Kan ikke opprette komponeringsvinduet."
 
+#: composer/e-msg-composer-hdrs.c:321
+msgid "Click here for the address book"
+msgstr "Klikk her for å få opp adresseboken"
+
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:745
+msgid "From:"
+msgstr "Fra:"
+
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:747
+msgid "Reply-To:"
+msgstr "Svar-til:"
+
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:643
+msgid "Subject:"
+msgstr "Emne:"
+
+#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:749
+msgid "To:"
+msgstr "Til:"
+
+#: composer/e-msg-composer-hdrs.c:384
+msgid "Enter the recipients of the message"
+msgstr "Skriv inn mottakerene for meldingen"
+
+#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:751
+msgid "Cc:"
+msgstr "Cc:"
+
+#: composer/e-msg-composer-hdrs.c:388
+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:391
+msgid "Bcc:"
+msgstr "Bcc:"
+
+#: composer/e-msg-composer-hdrs.c:392
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+"Skriv inn adressene som skal motta en kopi av meldingen uten å komme til "
+"syne i mottakerlisten for meldingen."
+
 #: composer/evolution-composer.c:355
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -4892,7 +4964,7 @@ msgstr "kalenderinformasjon"
 #. strptime format for a date.
 #: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1282 widgets/misc/e-dateedit.c:1463
+#: widgets/misc/e-dateedit.c:1284 widgets/misc/e-dateedit.c:1465
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
@@ -4921,7 +4993,7 @@ msgstr "%H:%M%n"
 #. strftime format of a weekday and a date.
 #: e-util/e-time-utils.c:269
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2503
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
 msgstr "%a %d.%m.%Y"
 
@@ -4939,8 +5011,8 @@ msgstr "%a %m/%d/%Y %I:%M %p"
 
 #. strftime format of a time in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1257
-#: widgets/misc/e-dateedit.c:1316 widgets/misc/e-dateedit.c:1495
+#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1259
+#: widgets/misc/e-dateedit.c:1318 widgets/misc/e-dateedit.c:1497
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -4951,8 +5023,8 @@ msgstr "%H:%M:%S"
 
 #. strftime format of a time in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1260
-#: widgets/misc/e-dateedit.c:1319 widgets/misc/e-dateedit.c:1498
+#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1262
+#: widgets/misc/e-dateedit.c:1321 widgets/misc/e-dateedit.c:1500
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -4961,18 +5033,32 @@ msgstr "%I:%M %p"
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "Evolution-komponent for sammendrag."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "Factory for Evolutions sammendrag-komponent."
-
 #: executive-summary/component/component-factory.c:152
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "Kan ikke initiere Evolutions sammendragskomponent."
 
+#: executive-summary/component/e-summary.c:924
+#, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+"Kan ikke åpne HTML-fil:\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:938
+#, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr ""
+"Feil under lesing av data:\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:956
+msgid "File does not have a place for the services.\n"
+msgstr "Filen har ikke en plass til tjenestene.\n"
+
 #: executive-summary/component/e-summary-callbacks.c:290
 msgid ""
 "You can select a different HTML page for the background of the Executive "
@@ -5041,28 +5127,6 @@ msgstr "Flytt %s til neste rad"
 msgid "Configure %s"
 msgstr "Konfigurér %s"
 
-#: executive-summary/component/e-summary.c:924
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Kan ikke åpne HTML-fil:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:938
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"Feil under lesing av data:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:956
-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"
@@ -5081,6 +5145,14 @@ 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/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr "Evolution-komponent for sammendrag."
+
+#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
+msgid "Factory for the Evolution executive summary component."
+msgstr "Factory for Evolutions sammendrag-komponent."
+
 #: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
 msgid "Factory for the RDF summary."
 msgstr "Factory RDF-sammendrag."
@@ -5273,6 +5345,46 @@ msgstr "Skriv inn URI for mappen"
 msgid "<click here to select a folder>"
 msgstr "<klikk her for å velge en mappe>"
 
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "Redigér filtre"
+
+#: filter/filter.glade.h:5
+msgid "Edit VFolders"
+msgstr "Redigér VFoldere"
+
+#: filter/filter.glade.h:7
+msgid "Incoming"
+msgstr "Innkommende"
+
+#: filter/filter.glade.h:8
+msgid "Outgoing"
+msgstr "Utgående"
+
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+msgid "Virtual Folders"
+msgstr "Virtuelle mapper"
+
+#: filter/filter.glade.h:11
+msgid "specific folders only"
+msgstr "kun spesifikke mapper"
+
+#: filter/filter.glade.h:12
+msgid "vFolder Sources"
+msgstr "vFolder kilder"
+
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr "med alle aktive eksterne mapper"
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr "med alle lokaleog aktive eksterne mapper"
+
+#: filter/filter.glade.h:15
+msgid "with all local folders"
+msgstr "med alle lokale mapper"
+
 #: filter/filter-input.c:193
 #, c-format
 msgid ""
@@ -5322,46 +5434,6 @@ msgstr "innkommende"
 msgid "outgoing"
 msgstr "utgående"
 
-#: filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Redigér filtre"
-
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "Redigér VFoldere"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "Innkommende"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "Utgående"
-
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
-msgid "Virtual Folders"
-msgstr "Virtuelle mapper"
-
-#: filter/filter.glade.h:11
-msgid "specific folders only"
-msgstr "kun spesifikke mapper"
-
-#: filter/filter.glade.h:12
-msgid "vFolder Sources"
-msgstr "vFolder kilder"
-
-#: filter/filter.glade.h:13
-msgid "with all active remote folders"
-msgstr "med alle aktive eksterne mapper"
-
-#: filter/filter.glade.h:14
-msgid "with all local and active remote folders"
-msgstr "med alle lokaleog aktive eksterne mapper"
-
-#: filter/filter.glade.h:15
-msgid "with all local folders"
-msgstr "med alle lokale mapper"
-
 #: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "Gi farge"
@@ -5511,7 +5583,7 @@ msgid "Replied to"
 msgstr "Svart til"
 
 #: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.c:1054
+#: mail/message-list.c:1082
 msgid "Score"
 msgstr "Poenggi"
 
@@ -5543,7 +5615,7 @@ msgstr "starter med"
 msgid "Stop Processing"
 msgstr "Stopp behandling"
 
-#: filter/libfilter-i18n.h:51 mail/message-list.c:1055
+#: filter/libfilter-i18n.h:51 mail/message-list.c:1083
 msgid "Subject"
 msgstr "Emne"
 
@@ -5555,6 +5627,18 @@ msgstr "var etter"
 msgid "was before"
 msgstr "var før"
 
+#: filter/rule-editor.c:147
+msgid "Rules"
+msgstr "Regler"
+
+#: filter/rule-editor.c:240
+msgid "Add Rule"
+msgstr "Legg til regel"
+
+#: filter/rule-editor.c:298
+msgid "Edit Rule"
+msgstr "Rediger regel"
+
 #: filter/score-editor.c:130
 msgid "Score Rules"
 msgstr "Poengregler"
@@ -5567,93 +5651,85 @@ msgstr "Kan ikke initiere Evolutions e-postkomponent."
 msgid "Cannot register storage with shell"
 msgstr "Kan ikke registrere lagring i skallet"
 
-#: mail/folder-browser-factory.c:211
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "Egenskaper for \"%s\""
-
-#: mail/folder-browser-factory.c:213 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "Egenskaper"
-
-#: mail/folder-browser.c:225
+#: mail/folder-browser.c:244
 msgid "Store search as vFolder"
 msgstr "Lagre søk som vMappe"
 
-#: mail/folder-browser.c:533
+#: mail/folder-browser.c:552
 msgid "VFolder on Subject"
 msgstr "VFolder for emne"
 
-#: mail/folder-browser.c:536
+#: mail/folder-browser.c:555
 msgid "VFolder on Sender"
 msgstr "VFolder for sender"
 
-#: mail/folder-browser.c:539
+#: mail/folder-browser.c:558
 msgid "VFolder on Recipients"
 msgstr "VFolder for mottakere"
 
-#: mail/folder-browser.c:542 mail/folder-browser.c:733
+#: mail/folder-browser.c:561 mail/folder-browser.c:752
 msgid "VFolder on Mailing List"
 msgstr "VFolder på e-postliste"
 
-#: mail/folder-browser.c:548
+#: mail/folder-browser.c:567
 msgid "Filter on Subject"
 msgstr "Filtrér etter emne"
 
-#: mail/folder-browser.c:551
+#: mail/folder-browser.c:570
 msgid "Filter on Sender"
 msgstr "Filtrér etter sender"
 
-#: mail/folder-browser.c:554
+#: mail/folder-browser.c:573
 msgid "Filter on Recipients"
 msgstr "Filtrér etter mottaker"
 
-#: mail/folder-browser.c:557 mail/folder-browser.c:732
+#: mail/folder-browser.c:576 mail/folder-browser.c:751
 msgid "Filter on Mailing List"
 msgstr "Filtrér etter e-postliste"
 
-#: mail/folder-browser.c:568
+#: mail/folder-browser.c:587
 msgid "Resend"
 msgstr "Send på nytt"
 
-#: mail/folder-browser.c:570
+#: mail/folder-browser.c:589
 msgid "Save As..."
 msgstr "Lagre som..."
 
-#: mail/folder-browser.c:577
+#: mail/folder-browser.c:596
 msgid "Reply to Sender"
 msgstr "Svar til sender"
 
-#: mail/folder-browser.c:579 mail/mail-view.c:147 ui/evolution-mail.xml.h:61
+#: mail/folder-browser.c:598 mail/message-browser.c:179
+#: ui/evolution-mail.xml.h:61
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:25
+#: mail/folder-browser.c:600 mail/message-browser.c:182
+#: ui/evolution-mail.xml.h:25
 msgid "Forward"
 msgstr "Videresend"
 
-#: mail/folder-browser.c:583 ui/evolution-mail.xml.h:27
+#: mail/folder-browser.c:602 ui/evolution-mail.xml.h:27
 msgid "Forward inline"
 msgstr "Videresend \"inline\""
 
-#: mail/folder-browser.c:586
+#: mail/folder-browser.c:605
 msgid "Mark as Read"
 msgstr "Markér som lest"
 
-#: mail/folder-browser.c:588
+#: mail/folder-browser.c:607
 msgid "Mark as Unread"
 msgstr "Merk som ulest"
 
-#: mail/folder-browser.c:593
+#: mail/folder-browser.c:612
 msgid "Move to Folder..."
 msgstr "Flytt til mappe..."
 
-#: mail/folder-browser.c:595
+#: mail/folder-browser.c:614
 msgid "Copy to Folder..."
 msgstr "Kopiér til mappe..."
 
-#: mail/folder-browser.c:599 ui/evolution-mail.xml.h:82
+#: mail/folder-browser.c:618 ui/evolution-mail.xml.h:82
 msgid "Undelete"
 msgstr "Angre slett"
 
@@ -5661,24 +5737,34 @@ msgstr "Angre slett"
 #. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
 #. { "",                               NULL,
 #. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:609 ui/evolution-mail.xml.h:1
+#: mail/folder-browser.c:628 ui/evolution-mail.xml.h:1
 msgid "Apply Filters"
 msgstr "Påfør filtre"
 
-#: mail/folder-browser.c:613
+#: mail/folder-browser.c:632
 msgid "Create Rule From Message"
 msgstr "Lage regel fra melding"
 
-#: mail/folder-browser.c:735
+#: mail/folder-browser.c:754
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrér etter e-postliste (%s)"
 
-#: mail/folder-browser.c:736
+#: mail/folder-browser.c:755
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VFolder på e-postliste (%s)"
 
+#: mail/folder-browser-factory.c:211
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "Egenskaper for \"%s\""
+
+#: mail/folder-browser-factory.c:213 ui/evolution-event-editor.xml.h:39
+#: ui/evolution-task-editor-dialog.xml.h:42
+msgid "Properties"
+msgstr "Egenskaper"
+
 #: mail/GNOME_Evolution_Mail.oaf.in.h:1
 msgid "Evolution component for handling mail."
 msgstr "Evolution komponent for håndtering av e-post."
@@ -5711,6 +5797,54 @@ msgstr "Factory for Evolution e-post komponent."
 msgid "Factory for the Mail Summary component."
 msgstr "Factory for e-post sammendrag komponent."
 
+#: mail/importers/elm-importer.c:420
+msgid ""
+"Evolution has found Elm mail files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution har funnet Elm e-post filer.\n"
+"Vil du importere dem til Evolution?"
+
+#: mail/importers/elm-importer.c:430
+msgid "Elm mail"
+msgstr "Elm e-post"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
+msgid "Factory to import mbox into Evolution"
+msgstr "Factory for å importere mbox til Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+msgid "Imports mbox files into Evolution"
+msgstr "Importerer mbox-filer til Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+msgid "Factory to import Outlook Express 4 mails into Evolution"
+msgstr "Factory for å importere Outlook Express 4-meldinger til Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
+msgid "Imports Outlook Express 4 files into Evolution"
+msgstr "Importerer Outlook Express 4-filer til Evolution"
+
+#: mail/importers/netscape-importer.c:440
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution har funnet Netscape e-post filer.\n"
+"Vil du importere dem til Evolution?"
+
+#: mail/importers/pine-importer.c:385
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution har funnet Pine e-post filer.\n"
+"Vil du importere dem til Evolution?"
+
+#: mail/importers/pine-importer.c:395
+msgid "Pine mail"
+msgstr "Pine e-post"
+
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr "Aktivt lagringsformat:"
@@ -5745,6 +5879,15 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
+#: mail/mail-account-editor.c:105
+msgid "You have not filled in all of the required information."
+msgstr "Du har ikke fylt ut all nødvendig informasjon."
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:173
+msgid "Evolution Account Editor"
+msgstr "Kontoredigering for Evolution"
+
 #: mail/mail-accounts.c:121 mail/mail-accounts.c:165
 msgid " (default)"
 msgstr " (forvalgt)"
@@ -5770,15 +5913,6 @@ msgstr "Er du sikker på at du vil slette denne diskusjonsgruppekontoen?"
 msgid "Evolution Account Manager"
 msgstr "Kontohåndtering for Evolution"
 
-#: mail/mail-account-editor.c:105
-msgid "You have not filled in all of the required information."
-msgstr "Du har ikke fylt ut all nødvendig informasjon."
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:173
-msgid "Evolution Account Editor"
-msgstr "Kontoredigering for Evolution"
-
 #: mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
@@ -5803,7 +5937,7 @@ msgstr "%s e-postliste"
 msgid "Add Filter Rule"
 msgstr "Legg til filterregel"
 
-#: mail/mail-callbacks.c:94
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5815,7 +5949,7 @@ msgstr ""
 "motta eller skrive meldinger.\n"
 "Vil du konfigurere den nå?"
 
-#: mail/mail-callbacks.c:147
+#: mail/mail-callbacks.c:148
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5823,7 +5957,7 @@ msgstr ""
 "Du må konfigurere en identitet\n"
 "før du kan skrive e-post."
 
-#: mail/mail-callbacks.c:159
+#: mail/mail-callbacks.c:160
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -5831,11 +5965,11 @@ msgstr ""
 "Du må konfigurere en e-post-transport\n"
 "før du kan skrive e-post."
 
-#: mail/mail-callbacks.c:203
+#: mail/mail-callbacks.c:204
 msgid "You have not set a mail transport method"
 msgstr "Du har ikke satt en transportmetode for e-post"
 
-#: mail/mail-callbacks.c:236
+#: mail/mail-callbacks.c:237
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -5843,32 +5977,32 @@ msgstr ""
 "Denne meldingen har ikke emne.\n"
 "Send likevel?"
 
-#: mail/mail-callbacks.c:309
+#: 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:352
+#: mail/mail-callbacks.c:353
 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:592
+#: mail/mail-callbacks.c:593
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "Den %s, skrev %s:\n"
 
-#: mail/mail-callbacks.c:774
+#: mail/mail-callbacks.c:775
 msgid "Forwarded message:\n"
 msgstr "Videresendt melding:\n"
 
-#: mail/mail-callbacks.c:877
+#: mail/mail-callbacks.c:878
 msgid "Move message(s) to"
 msgstr "Flytt melding(er) til"
 
-#: mail/mail-callbacks.c:879
+#: mail/mail-callbacks.c:880
 msgid "Copy message(s) to"
 msgstr "Kopiér melding(er) til"
 
-#: mail/mail-callbacks.c:1147
+#: mail/mail-callbacks.c:1148
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -5876,7 +6010,7 @@ msgstr ""
 "Du kan kun redigere meldinger lagret\n"
 "i Skisser-katalogen."
 
-#: mail/mail-callbacks.c:1179
+#: mail/mail-callbacks.c:1180
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -5884,11 +6018,11 @@ msgstr ""
 "Du kan kun sende meldinger på nytt\n"
 "som er lagret i sendt-katalogen."
 
-#: mail/mail-callbacks.c:1212 mail/mail-display.c:90
+#: mail/mail-callbacks.c:1213 mail/mail-display.c:90
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
-#: mail/mail-callbacks.c:1216 mail/mail-display.c:94
+#: mail/mail-callbacks.c:1217 mail/mail-display.c:94
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -5896,15 +6030,15 @@ msgstr ""
 "En fil med samme navn eksisterer allerede.\n"
 "Overskriv den?"
 
-#: mail/mail-callbacks.c:1260
+#: mail/mail-callbacks.c:1261
 msgid "Save Message As..."
 msgstr "Lagre melding som..."
 
-#: mail/mail-callbacks.c:1262
+#: mail/mail-callbacks.c:1263
 msgid "Save Messages As..."
 msgstr "Lagre meldinger som..."
 
-#: mail/mail-callbacks.c:1375
+#: mail/mail-callbacks.c:1378
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -5913,11 +6047,11 @@ msgstr ""
 "Feil under lasting av filter-informasjon:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1424 ui/evolution-mail.xml.h:52
+#: mail/mail-callbacks.c:1427 ui/evolution-mail.xml.h:52
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/mail-callbacks.c:1471
+#: mail/mail-callbacks.c:1474
 msgid "Printing of message failed"
 msgstr "Feil under utskrift av melding"
 
@@ -5925,6 +6059,55 @@ msgstr "Feil under utskrift av melding"
 msgid "Connecting to server..."
 msgstr "Kobler til tjener..."
 
+#: mail/mail-config-druid.c:99
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+"Vennligst skriv inn ditt navn og din e-post adresse under. De \"valgfrie\" "
+"feltene under må ikke nødvendigvis fylles ut, hvis du ikke ønsker å "
+"inkludere denne informasjonen i e-post du sender."
+
+#: mail/mail-config-druid.c:101
+msgid ""
+"Please enter information about your incoming mail server below. If you don't "
+"know what kind of server you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+"Vennligst skriv inn informasjon om din tjener for innkommende e-post under. "
+"Hvis du ikke vet hvilken type tjener du bruker, kontakt din "
+"systemadministrator eller Internett tjenestetilbyder."
+
+#: mail/mail-config-druid.c:105
+msgid ""
+"Please enter information about your outgoing mail protocol below. If you "
+"don't know which protocol you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+"Vennligst skriv inn informasjon om protokoll for utgående e-post under. Hvis "
+"du ikke vet hvilken protokoll du bruker, kontakt din systemadministrator "
+"eller Internett tjenestetilbyder."
+
+#: mail/mail-config-druid.c:107
+msgid ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
+msgstr ""
+"Du er nesten ferdig med konfigurasjonsprosessen. Verdiene for identitet, "
+"inkommende e-post-tjener og metode for utgående e-post-transport du har "
+"oppgitt vil grupperes sammen til en Evolution e-post-konto. Vennligst oppgi "
+"et navn for denne kontoen i feltet under. Dette navnet blir kun brukt for "
+"visning på skjermen."
+
+#. set window title
+#: mail/mail-config-druid.c:445
+msgid "Evolution Account Wizard"
+msgstr "Evolution kontoveiviser"
+
 #: mail/mail-config.glade.h:1
 msgid " Check for supported types "
 msgstr "Søk etter støttede typer..."
@@ -6149,55 +6332,6 @@ msgstr ""
 msgid "_Edit"
 msgstr "R_edigér"
 
-#: mail/mail-config-druid.c:99
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
-msgstr ""
-"Vennligst skriv inn ditt navn og din e-post adresse under. De \"valgfrie\" "
-"feltene under må ikke nødvendigvis fylles ut, hvis du ikke ønsker å "
-"inkludere denne informasjonen i e-post du sender."
-
-#: mail/mail-config-druid.c:101
-msgid ""
-"Please enter information about your incoming mail server below. If you don't "
-"know what kind of server you use, contact your system administrator or "
-"Internet Service Provider."
-msgstr ""
-"Vennligst skriv inn informasjon om din tjener for innkommende e-post under. "
-"Hvis du ikke vet hvilken type tjener du bruker, kontakt din "
-"systemadministrator eller Internett tjenestetilbyder."
-
-#: mail/mail-config-druid.c:105
-msgid ""
-"Please enter information about your outgoing mail protocol below. If you "
-"don't know which protocol you use, contact your system administrator or "
-"Internet Service Provider."
-msgstr ""
-"Vennligst skriv inn informasjon om protokoll for utgående e-post under. Hvis "
-"du ikke vet hvilken protokoll du bruker, kontakt din systemadministrator "
-"eller Internett tjenestetilbyder."
-
-#: mail/mail-config-druid.c:107
-msgid ""
-"You are almost done with the mail configuration process. The identity, "
-"incoming mail server and outgoing mail transport method which you provided "
-"will be grouped together to make an Evolution mail account. Please enter a "
-"name for this account in the space below. This name will be used for display "
-"purposes only."
-msgstr ""
-"Du er nesten ferdig med konfigurasjonsprosessen. Verdiene for identitet, "
-"inkommende e-post-tjener og metode for utgående e-post-transport du har "
-"oppgitt vil grupperes sammen til en Evolution e-post-konto. Vennligst oppgi "
-"et navn for denne kontoen i feltet under. Dette navnet blir kun brukt for "
-"visning på skjermen."
-
-#. set window title
-#: mail/mail-config-druid.c:445
-msgid "Evolution Account Wizard"
-msgstr "Evolution kontoveiviser"
-
 #: mail/mail-display.c:194
 msgid "Save Attachment"
 msgstr "Lagre vedlegg"
@@ -6254,55 +6388,55 @@ msgstr "%s-vedlegg"
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
 
-#: mail/mail-format.c:746
+#: mail/mail-format.c:772
 msgid "Loading message content"
 msgstr "Laster meldingsinnhold"
 
-#: mail/mail-format.c:1040
+#: mail/mail-format.c:1066
 msgid "No GPG/PGP program configured."
 msgstr "Ingen GPG/PGP-program konfigurert."
 
-#: mail/mail-format.c:1055
+#: mail/mail-format.c:1081
 msgid "Encrypted message not displayed"
 msgstr "Kryptert melding ikke vist"
 
-#: mail/mail-format.c:1061
+#: mail/mail-format.c:1087
 msgid "Encrypted message"
 msgstr "Kryptert melding"
 
-#: mail/mail-format.c:1062
+#: mail/mail-format.c:1088
 msgid "Click icon to decrypt."
 msgstr "Klikk på ikonet for å dekryptere."
 
-#: mail/mail-format.c:1152 mail/mail-format.c:1540
+#: mail/mail-format.c:1178 mail/mail-format.c:1566
 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:1160 mail/mail-format.c:1548
+#: mail/mail-format.c:1186 mail/mail-format.c:1574
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "Denne meldingen er digitalt signert, men kan ikke finnes autentisk."
 
-#: mail/mail-format.c:1761
+#: mail/mail-format.c:1787
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peker til FTP-tjener (%s)"
 
-#: mail/mail-format.c:1773
+#: mail/mail-format.c:1799
 #, 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:1777
+#: mail/mail-format.c:1803
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peker til lokal fil (%s)"
 
-#: mail/mail-format.c:1811
+#: mail/mail-format.c:1837
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peker til ukjent ekstern data (\"%s\"-type)"
 
-#: mail/mail-format.c:1816
+#: mail/mail-format.c:1842
 msgid "Malformed external-body part."
 msgstr "Feilutformet del for ekstern-kropp."
 
@@ -6603,115 +6737,133 @@ msgstr "Ny VFolder"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:60
+#: mail/message-browser.c:176 ui/evolution-mail.xml.h:60
 msgid "Reply"
 msgstr "Svar"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:66
+#: mail/message-browser.c:176 ui/evolution-mail.xml.h:66
 msgid "Reply to the sender of this message"
 msgstr "Svar til avsender av denne meldingen"
 
-#: mail/mail-view.c:147 ui/evolution-mail.xml.h:64
+#: mail/message-browser.c:179 ui/evolution-mail.xml.h:64
 msgid "Reply to all recipients of this message"
 msgstr "Svar til alle mottakere av denne meldingen"
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:29
+#: mail/message-browser.c:182 ui/evolution-mail.xml.h:29
 msgid "Forward this message"
 msgstr "Videresend denne meldingen"
 
-#: mail/mail-view.c:154 ui/evolution-mail.xml.h:57
+#: mail/message-browser.c:187 ui/evolution-mail.xml.h:57
 msgid "Print the selected message"
 msgstr "Skriv ut den valgte meldingen"
 
-#: mail/mail-view.c:156 ui/evolution-mail.xml.h:13
+#: mail/message-browser.c:190 ui/evolution-mail.xml.h:13
 msgid "Delete this message"
 msgstr "Slett denne meldingen"
 
-#: mail/message-list.c:650
+#: mail/message-browser.c:195 ui/evolution-event-editor.xml.h:33
+#: ui/evolution-task-editor-dialog.xml.h:36
+msgid "Previous"
+msgstr "Forrige"
+
+#: mail/message-browser.c:195
+msgid "Previous message"
+msgstr "Forrige melding"
+
+#: mail/message-browser.c:198 ui/evolution-calendar.xml.h:18
+#: ui/evolution-event-editor.xml.h:29 ui/evolution-task-editor-dialog.xml.h:32
+msgid "Next"
+msgstr "Neste"
+
+#: mail/message-browser.c:198
+msgid "Next message"
+msgstr "Neste melding"
+
+#: mail/message-list.c:678
 msgid "Unseen"
 msgstr "Ulest"
 
-#: mail/message-list.c:651
+#: mail/message-list.c:679
 msgid "Seen"
 msgstr "Lest"
 
-#: mail/message-list.c:652
+#: mail/message-list.c:680
 msgid "Answered"
 msgstr "Besvart"
 
-#: mail/message-list.c:653
+#: mail/message-list.c:681
 msgid "Multiple Unseen Messages"
 msgstr "Flere uleste meldinger"
 
-#: mail/message-list.c:654
+#: mail/message-list.c:682
 msgid "Multiple Messages"
 msgstr "Flere meldinger"
 
-#: mail/message-list.c:658
+#: mail/message-list.c:686
 msgid "Lowest"
 msgstr "Lavest"
 
-#: mail/message-list.c:659
+#: mail/message-list.c:687
 msgid "Lower"
 msgstr "Lavere"
 
-#: mail/message-list.c:663
+#: mail/message-list.c:691
 msgid "Higher"
 msgstr "Høyere"
 
-#: mail/message-list.c:664
+#: mail/message-list.c:692
 msgid "Highest"
 msgstr "Høyest"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:942
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:921
+#: mail/message-list.c:949
 msgid "Today %l:%M %p"
 msgstr "Idag %l:%M %p"
 
-#: mail/message-list.c:930
+#: mail/message-list.c:958
 msgid "Yesterday %l:%M %p"
 msgstr "I går %l:%M %p"
 
-#: mail/message-list.c:942
+#: mail/message-list.c:970
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:978
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:952
+#: mail/message-list.c:980
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:1054
+#: mail/message-list.c:1082
 msgid "Flagged"
 msgstr "Merket"
 
-#: mail/message-list.c:1055
+#: mail/message-list.c:1083
 msgid "From"
 msgstr "Fra"
 
-#: mail/message-list.c:1055
+#: mail/message-list.c:1083
 msgid "Date"
 msgstr "Dato"
 
-#: mail/message-list.c:1055
+#: mail/message-list.c:1083
 msgid "Received"
 msgstr "Mottatt"
 
-#: mail/message-list.c:1056
+#: mail/message-list.c:1084
 msgid "To"
 msgstr "Til"
 
-#: mail/message-list.c:1056
+#: mail/message-list.c:1084
 msgid "Size"
 msgstr "Størrelse"
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:47
 msgid "Folder"
 msgstr "Mappe"
 
@@ -6743,137 +6895,6 @@ msgstr "Fjerner abonnement på mappe \"%s\""
 msgid "Manage Subscriptions"
 msgstr "Håndter abonnement"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Mappenavn:"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder type:"
-msgstr "Mappetype:"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Specify where to create the folder:"
-msgstr "Spesifiser hvor mappen skal opprettes:"
-
-#: shell/importer/importer.c:87
-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 ønsker å importere til Evolution og velg hvilken type fil det "
-"er fra listen.\n"
-"\n"
-"Du kan velge \"Automatisk\" hvis du ikke vet, så vil Evolution prøve å finne "
-"ut hvilken type det er for deg."
-
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:182
-#, 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:202 shell/importer/importer.c:233
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-"Importerer %s\n"
-"Importerer oppføring %d."
-
-#: shell/importer/importer.c:341
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-"Ingen importerer som kan håndtere\n"
-"%s"
-
-#: shell/importer/importer.c:351
-msgid "Importing"
-msgstr "Importerer"
-
-#: shell/importer/importer.c:359
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-"Importerer %s.\n"
-"Starter %s"
-
-#: shell/importer/importer.c:372
-#, c-format
-msgid "Error starting %s"
-msgstr "Feil under start av %s"
-
-#: shell/importer/importer.c:387
-#, c-format
-msgid "Error loading %s"
-msgstr "Feil under lasting av %s"
-
-#: shell/importer/importer.c:402
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-"Importerer %s\n"
-"Importerer oppføring 1."
-
-#: shell/importer/importer.c:473
-msgid "Automatic"
-msgstr "Automatisk"
-
-#: shell/importer/importer.c:523
-msgid "Filename:"
-msgstr "Filnavn:"
-
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
-msgid "Select a file"
-msgstr "Velg en fil"
-
-#: shell/importer/importer.c:538
-msgid "File type:"
-msgstr "Filtype:"
-
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
-msgid "Import"
-msgstr "Importér"
-
-#: shell/importer/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr "Klikk \"Importer\" for å starte import av filen til Evolution."
-
-#: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
-msgstr "Importverktøy for Evolution"
-
-#: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
-msgstr "Importverktøy for Evolution"
-
-#: shell/importer/import.glade.h:6
-msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
-"importing external files into Evolution."
-msgstr ""
-"Velkommen til Evolutions importverktøy.\n"
-"Gjennom denne veiviseren vil du ledes gjennom import av\n"
-"eksterne filer til Evolution."
-
 #: shell/e-setup.c:118 shell/e-setup.c:191
 msgid "Evolution installation"
 msgstr "Evolution installasjon"
@@ -6950,6 +6971,20 @@ msgstr ""
 "Evolution-katalogen. Venligst flytt den for å \n"
 "tillate installasjon av Evolution's brukerfiler."
 
+#: shell/e-shell.c:379
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Kan ikke sette opp lokal lagring -- %s"
+
+#: shell/e-shell.c:1249
+#, c-format
+msgid ""
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+"Ops! Visningen for `%s' døde uventet. :-(\n"
+"Dette betyr sannsynligvis at komponenten %s har krasjet."
+
 #: shell/e-shell-folder-creation-dialog.c:99
 #, c-format
 msgid ""
@@ -6983,6 +7018,20 @@ msgstr "Ny..."
 msgid "(Untitled)"
 msgstr "(Uten navn)"
 
+#: shell/e-shell-view.c:148
+msgid "(No folder displayed)"
+msgstr "(Ingen mappe vist)"
+
+#: shell/e-shell-view.c:1184
+#, c-format
+msgid "%s - Evolution %s"
+msgstr "%s - Evolution %s"
+
+#: shell/e-shell-view.c:1186
+#, c-format
+msgid "%s - Evolution %s [%s]"
+msgstr "%s - Evolution - %s [%s]"
+
 #: shell/e-shell-view-menu.c:173
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy ble ikke funnet i din $PATH."
@@ -7009,33 +7058,9 @@ msgstr ""
 msgid "Go to folder..."
 msgstr "Gå til mappe..."
 
-#: shell/e-shell-view.c:148
-msgid "(No folder displayed)"
-msgstr "(Ingen mappe vist)"
-
-#: shell/e-shell-view.c:1184
-#, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
-
-#: shell/e-shell-view.c:1186
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution - %s [%s]"
-
-#: shell/e-shell.c:378
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Kan ikke sette opp lokal lagring -- %s"
-
-#: shell/e-shell.c:1248
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
-msgstr ""
-"Ops! Visningen for `%s' døde uventet. :-(\n"
-"Dette betyr sannsynligvis at komponenten %s har krasjet."
+#: shell/e-shortcuts.c:381
+msgid "Error saving shortcuts."
+msgstr "Feil under lagring av snarveier."
 
 #: shell/e-shortcuts-view.c:134
 msgid "Create new shortcut group"
@@ -7110,20 +7135,6 @@ msgstr "Aktiver denne snarveien"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Fjern denne snarveien fra snarveilinjen"
 
-#: shell/e-shortcuts.c:379
-msgid "Error saving shortcuts."
-msgstr "Feil under lagring av snarveier."
-
-#: shell/e-storage-set-view.c:649 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:44
-msgid "_View"
-msgstr "_Vis"
-
-#: shell/e-storage-set-view.c:649
-msgid "View the selected folder"
-msgstr "Vis den valgte mappen"
-
 #: shell/e-storage.c:178
 msgid "(No name)"
 msgstr "(Uten navn)"
@@ -7172,10 +7183,155 @@ msgstr "Operasjonen er ikke støttet"
 msgid "The specified type is not supported in this storage"
 msgstr "Spesifisert type er ikke støttet for dette lageret"
 
+#: shell/e-storage-set-view.c:650 ui/evolution-event-editor.xml.h:76
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:44
+msgid "_View"
+msgstr "_Vis"
+
+#: shell/e-storage-set-view.c:650
+msgid "View the selected folder"
+msgstr "Vis den valgte mappen"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "Mappenavn:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder type:"
+msgstr "Mappetype:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Specify where to create the folder:"
+msgstr "Spesifiser hvor mappen skal opprettes:"
+
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
 msgid "The Evolution shell."
 msgstr "Evolution skallet."
 
+#: shell/importer/importer.c:87
+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 ønsker å importere til Evolution og velg hvilken type fil det "
+"er fra listen.\n"
+"\n"
+"Du kan velge \"Automatisk\" hvis du ikke vet, så vil Evolution prøve å finne "
+"ut hvilken type det er for deg."
+
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/importer/importer.c:182
+#, 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:202 shell/importer/importer.c:233
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+"Importerer %s\n"
+"Importerer oppføring %d."
+
+#: shell/importer/importer.c:341
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+"Ingen importerer som kan håndtere\n"
+"%s"
+
+#: shell/importer/importer.c:351
+msgid "Importing"
+msgstr "Importerer"
+
+#: shell/importer/importer.c:359
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+"Importerer %s.\n"
+"Starter %s"
+
+#: shell/importer/importer.c:372
+#, c-format
+msgid "Error starting %s"
+msgstr "Feil under start av %s"
+
+#: shell/importer/importer.c:387
+#, c-format
+msgid "Error loading %s"
+msgstr "Feil under lasting av %s"
+
+#: shell/importer/importer.c:402
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+"Importerer %s\n"
+"Importerer oppføring 1."
+
+#: shell/importer/importer.c:473
+msgid "Automatic"
+msgstr "Automatisk"
+
+#: shell/importer/importer.c:523
+msgid "Filename:"
+msgstr "Filnavn:"
+
+#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
+msgid "Select a file"
+msgstr "Velg en fil"
+
+#: shell/importer/importer.c:538
+msgid "File type:"
+msgstr "Filtype:"
+
+#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
+msgid "Import"
+msgstr "Importér"
+
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr "Klikk \"Importer\" for å starte import av filen til Evolution."
+
+#: shell/importer/import.glade.h:2
+msgid "Evolution Import Utility"
+msgstr "Importverktøy for Evolution"
+
+#: shell/importer/import.glade.h:3
+msgid "Evolution Importer Utility"
+msgstr "Importverktøy for Evolution"
+
+#: shell/importer/import.glade.h:6
+msgid ""
+"Welcome to the Evolution Import Utility.\n"
+"With this wizard you will be guided through the process of\n"
+"importing external files into Evolution."
+msgstr ""
+"Velkommen til Evolutions importverktøy.\n"
+"Gjennom denne veiviseren vil du ledes gjennom import av\n"
+"eksterne filer til Evolution."
+
+#: shell/importer/intelligent.c:143
+msgid "Don't ask me again"
+msgstr "Ikke spør meg igjen"
+
 #: shell/main.c:83
 #, no-c-format
 msgid ""
@@ -7365,11 +7521,6 @@ msgstr "Måned"
 msgid "New _Event"
 msgstr "Ny avtal_e"
 
-#: ui/evolution-calendar.xml.h:18 ui/evolution-event-editor.xml.h:29
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "Neste"
-
 #: ui/evolution-calendar.xml.h:20
 msgid "Open Calendar"
 msgstr "Åpne kalender"
@@ -7414,8 +7565,8 @@ msgstr "Vis 1 uke"
 msgid "Show the working week"
 msgstr "Vis arbeidsuken"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:226
-#: widgets/misc/e-dateedit.c:422
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:229
+#: widgets/misc/e-dateedit.c:424
 msgid "Today"
 msgstr "Idag"
 
@@ -7639,10 +7790,6 @@ msgstr "Lim inn fra utklippstavlen"
 msgid "Pre_vious"
 msgstr "Forri_ge"
 
-#: 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:34 ui/evolution-task-editor-dialog.xml.h:37
 msgid "Print Pre_view"
 msgstr "Forhåndsvisning av utskrift"
@@ -7884,7 +8031,8 @@ msgstr "Videresend den valgte meldingen til noen"
 
 #: ui/evolution-mail.xml.h:30
 msgid "Forward this message in-line with your mail, so you can edit it"
-msgstr "Videresend denne meldingen \"in-line\" med din e-post, så du kan redigere den"
+msgstr ""
+"Videresend denne meldingen \"in-line\" med din e-post, så du kan redigere den"
 
 #: ui/evolution-mail.xml.h:31
 msgid "Full _Headers"
@@ -8551,89 +8699,121 @@ msgstr "_Ny mappe"
 msgid "_Shortcut Bar"
 msgstr "_Snarveilinje"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2475
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
+#: views/addressbook/galview.xml.h:1
+msgid "Adress Cards"
+msgstr "Adressekort"
+
+#: views/addressbook/galview.xml.h:2
+msgid "By Company"
+msgstr "Etter firma"
+
+#: views/addressbook/galview.xml.h:3
+msgid "Phone List"
+msgstr "Telefonliste"
+
+#: views/mail/galview.xml.h:1
+msgid "By Sender"
+msgstr "Etter avsender"
+
+#: views/mail/galview.xml.h:2
+msgid "By Status"
+msgstr "Etter status"
+
+#: views/mail/galview.xml.h:3
+msgid "By Subject"
+msgstr "Etter emne"
+
+#: views/mail/galview.xml.h:4
+msgid "Messages"
+msgstr "Meldinger"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:390
+#: views/tasks/galview.xml.h:2
+msgid "With Category"
+msgstr "Med kategori"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr "Tentativ"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:391
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "Opptatt"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr "Ute"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:395
 msgid "No Information"
 msgstr "Ingen informasjon"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:409
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:411
 msgid "_Invite Others..."
 msgstr "_Inviter andre..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:429
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:431
 msgid "_Options"
 msgstr "_Alternativer"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:446
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:448
 msgid "Show _Only Working Hours"
 msgstr "Vis k_un arbeidstid"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:459
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:461
 msgid "Show _Zoomed Out"
 msgstr "Vis _zoomet ut"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:477
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:479
 msgid "_Update Free/Busy"
 msgstr "_Oppdater fri/ledig"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:495
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:497
 msgid "_<<"
 msgstr "_<<"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:512
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:514
 msgid "_Autopick"
 msgstr "_Autovelg"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:526
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:528
 msgid ">_>"
 msgstr ">_>"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:543
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:545
 msgid "_All People and Resources"
 msgstr "_Alle mennesker og ressurser"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:556
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:558
 msgid "All _People and One Resource"
 msgstr "Alle _mennesker og en ressurs"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:569
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:571
 msgid "_Required People"
 msgstr "_Nødvendige mennesker"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:582
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:584
 msgid "Required People and _One Resource"
 msgstr "Nødvendige mennesker _og en ressurs"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:605
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:607
 msgid "Meeting _start time:"
 msgstr "Tid for møtets _start:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:629
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:631
 msgid "Meeting _end time:"
 msgstr "Tid for møtets slutt:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:742
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:744
 msgid "All Attendees"
 msgstr "Alle deltakere"
 
+#. 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:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
+
 #: widgets/menus/gal-view-menus.c:177
 msgid "_Current View"
 msgstr "_Aktiv visning"
@@ -8644,29 +8824,29 @@ msgstr "Definer visninger"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
+#: widgets/misc/e-calendar-item.c:422
 msgid "MTWTFSS"
 msgstr "MTOTFLS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
+#: widgets/misc/e-calendar-item.c:1061 widgets/misc/e-calendar-item.c:2756
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:218 widgets/misc/e-dateedit.c:416
+#: widgets/misc/e-cell-date-edit.c:221 widgets/misc/e-dateedit.c:418
 msgid "Now"
 msgstr "nå"
 
-#: widgets/misc/e-cell-date-edit.c:242
+#: widgets/misc/e-cell-date-edit.c:245
 msgid "OK"
 msgstr "OK"
 
-#: widgets/misc/e-cell-date-edit.c:723
+#: widgets/misc/e-cell-date-edit.c:726
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Datoen må skrives inn på formatet: %s"
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
@@ -8707,38 +8887,6 @@ msgstr "Ikke vis denne meldingen igjen."
 msgid "Sear_ch"
 msgstr "Sø_k"
 
-#: views/addressbook/galview.xml.h:1
-msgid "Adress Cards"
-msgstr "Adressekort"
-
-#: views/addressbook/galview.xml.h:2
-msgid "By Company"
-msgstr "Etter firma"
-
-#: views/addressbook/galview.xml.h:3
-msgid "Phone List"
-msgstr "Telefonliste"
-
-#: views/mail/galview.xml.h:1
-msgid "By Sender"
-msgstr "Etter avsender"
-
-#: views/mail/galview.xml.h:2
-msgid "By Status"
-msgstr "Etter status"
-
-#: views/mail/galview.xml.h:3
-msgid "By Subject"
-msgstr "Etter emne"
-
-#: views/mail/galview.xml.h:4
-msgid "Messages"
-msgstr "Meldinger"
-
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
-msgstr "Med kategori"
-
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 msgid "The Personal Addressbook Server"
 msgstr "Personlig adressebok-tjener"
@@ -8977,27 +9125,12 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Edit Filter Rule"
 #~ msgstr "Redigér filterregel"
 
-#~ msgid "Add Rule"
-#~ msgstr "Legg til regel"
-
 #~ msgid "Add VFolder Rule"
 #~ msgstr "Legg til regel for VFolder"
 
 #~ msgid "Edit VFolder Rule"
 #~ msgstr "Redigér VFolder regel"
 
-#~ msgid "Factory to import Outlook Express 4 mails into Evolution"
-#~ msgstr "Factory for å importere Outlook Express 4-meldinger til Evolution"
-
-#~ msgid "Factory to import mbox into Evolution"
-#~ msgstr "Factory for å importere mbox til Evolution"
-
-#~ msgid "Imports Outlook Express 4 files into Evolution"
-#~ msgstr "Importerer Outlook Express 4-filer til Evolution"
-
-#~ msgid "Imports mbox files into Evolution"
-#~ msgstr "Importerer mbox-filer til Evolution"
-
 #~ msgid "Disabled"
 #~ msgstr "Slått av"