Updated Norwegian translation.

2000-12-11  Kjartan Maraas  <kmaraas@gnome.org>

	* no.po: Updated Norwegian translation.

svn path=/trunk/; revision=6904

1 files changed, 335 insertions, 347 deletions

diff --git a/po/no.po b/po/no.po
index 6db124e883..eaeac9e1fa 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.4\n"
-"POT-Creation-Date: 2000-12-05 12:25+0100\n"
-"PO-Revision-Date: 2000-12-05 12:28+01:00\n"
+"POT-Creation-Date: 2000-12-11 14:54+0100\n"
+"PO-Revision-Date: 2000-12-11 14:55+01:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -303,10 +303,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:1006
+#: addressbook/conduit/address-conduit.c:991
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1127
-#: calendar/conduits/todo/todo-conduit.c:938 calendar/gui/main.c:54
+#: calendar/conduits/calendar/calendar-conduit.c:1136
+#: calendar/conduits/todo/todo-conduit.c:945 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initialisere Bonobo"
 
@@ -429,28 +429,28 @@ msgstr ""
 "En feil oppsto under forsøk på å hente\n"
 "pilot-listen fra gnome-pilot daemonen"
 
-#: addressbook/conduit/address-conduit.c:196
+#: addressbook/conduit/address-conduit.c:197
 msgid "Cursor could not be loaded\n"
 msgstr "Markøren kunne ikke lokaliseres\n"
 
-#: addressbook/conduit/address-conduit.c:209
+#: addressbook/conduit/address-conduit.c:210
 msgid "EBook not loaded\n"
 msgstr "EBook ikke lastet\n"
 
-#: addressbook/conduit/address-conduit.c:598
-#: calendar/conduits/calendar/calendar-conduit.c:710
-#: calendar/conduits/todo/todo-conduit.c:520
+#: addressbook/conduit/address-conduit.c:583
+#: calendar/conduits/calendar/calendar-conduit.c:715
+#: calendar/conduits/todo/todo-conduit.c:523
 msgid "Could not start wombat server"
 msgstr "Kunne ikke starte wombat tjener"
 
-#: addressbook/conduit/address-conduit.c:599
-#: calendar/conduits/calendar/calendar-conduit.c:711
-#: calendar/conduits/todo/todo-conduit.c:521
+#: addressbook/conduit/address-conduit.c:584
+#: calendar/conduits/calendar/calendar-conduit.c:716
+#: calendar/conduits/todo/todo-conduit.c:524
 msgid "Could not start wombat"
 msgstr "Kunne ikke starte wombat"
 
-#: addressbook/conduit/address-conduit.c:631
-#: addressbook/conduit/address-conduit.c:634
+#: addressbook/conduit/address-conduit.c:616
+#: addressbook/conduit/address-conduit.c:619
 msgid "Could not read pilot's Address application block"
 msgstr "Kunne ikke lese pilotens adresseapplikasjonsblokk"
 
@@ -827,7 +827,7 @@ msgstr "_Etternavn:"
 msgid "_Suffix:"
 msgstr "_Suffiks:"
 
-#: addressbook/gui/component/addressbook.c:264
+#: addressbook/gui/component/addressbook.c:263
 msgid "As _Minicards"
 msgstr "Som _minikort"
 
@@ -835,16 +835,16 @@ msgstr "Som _minikort"
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/addressbook.c:270
+#: addressbook/gui/component/addressbook.c:269
 #: po/tmp/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "Som _tabell"
 
-#: addressbook/gui/component/addressbook.c:390
+#: addressbook/gui/component/addressbook.c:386
 msgid "Unable to open addressbook"
 msgstr "Kunne ikke åpne adresseboken"
 
-#: addressbook/gui/component/addressbook.c:395
+#: addressbook/gui/component/addressbook.c:391
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -865,27 +865,27 @@ msgstr ""
 "installere OpenLDAP, deretter må du kompilere og\n"
 "installere Evolution på nytt.\n"
 
-#: addressbook/gui/component/addressbook.c:505 mail/folder-browser.c:152
+#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:136
 msgid "Show All"
 msgstr "Vis alle"
 
-#: addressbook/gui/component/addressbook.c:507 mail/folder-browser.c:154
+#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:138
 msgid "Advanced..."
 msgstr "Avansert..."
 
-#: addressbook/gui/component/addressbook.c:537
+#: addressbook/gui/component/addressbook.c:533
 msgid "Any field contains"
 msgstr "Et felt inneholder"
 
-#: addressbook/gui/component/addressbook.c:538
+#: addressbook/gui/component/addressbook.c:534
 msgid "Name contains"
 msgstr "Navn inneholder"
 
-#: addressbook/gui/component/addressbook.c:539
+#: addressbook/gui/component/addressbook.c:535
 msgid "Email contains"
 msgstr "E-post inneholder"
 
-#: addressbook/gui/component/addressbook.c:625
+#: addressbook/gui/component/addressbook.c:621
 msgid "The URI that the Folder Browser will display"
 msgstr "URIen som mappeutforskeren vil vise"
 
@@ -1050,7 +1050,7 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:415
+#: addressbook/gui/widgets/e-addressbook-view.c:417
 #: addressbook/gui/widgets/e-minicard.c:338
 msgid "Save as VCard"
 msgstr "Lagre som VCard"
@@ -1251,14 +1251,14 @@ msgid "label26"
 msgstr "etikett26"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:538
-#: calendar/gui/e-week-view.c:287 calendar/gui/print.c:605
+#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:550
+#: calendar/gui/e-week-view.c:288 calendar/gui/print.c:605
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:541
-#: calendar/gui/e-week-view.c:290 calendar/gui/print.c:604
+#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:553
+#: calendar/gui/e-week-view.c:291 calendar/gui/print.c:604
 msgid "pm"
 msgstr "pm"
 
@@ -1270,13 +1270,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:666
-#: calendar/conduits/todo/todo-conduit.c:476
+#: calendar/conduits/calendar/calendar-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:479
 msgid "Error while communicating with calendar server"
 msgstr "Feil under kommunikasjon med kalendertjeneren"
 
-#: calendar/conduits/calendar/calendar-conduit.c:765
-#: calendar/conduits/calendar/calendar-conduit.c:768
+#: calendar/conduits/calendar/calendar-conduit.c:770
+#: calendar/conduits/calendar/calendar-conduit.c:773
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikke lese pilotens kalender-applikasjonsblokk"
 
@@ -1288,8 +1288,8 @@ 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:575
 #: calendar/conduits/todo/todo-conduit.c:578
+#: calendar/conduits/todo/todo-conduit.c:581
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikke lese pilotens applikasjonsblokk for oppgaveliste"
 
@@ -1348,7 +1348,7 @@ msgstr "Lagre kalender"
 #. strftime format of a weekday and a date.
 #: calendar/gui/calendar-model.c:282
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2495
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2498
 msgid "%a %m/%d/%Y"
 msgstr "%a %d.%m.%Y"
 
@@ -1593,7 +1593,7 @@ msgstr "Første dag i uken:"
 msgid "Fri"
 msgstr "Fre"
 
-#: calendar/gui/event-editor.c:421 po/tmp/cal-prefs-dialog.glade.h:28
+#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:28
 msgid "Friday"
 msgstr "Fredag"
 
@@ -1621,7 +1621,7 @@ msgstr "Oppføringer som ikke har gått ut:"
 msgid "Mon"
 msgstr "Man"
 
-#: calendar/gui/event-editor.c:417 po/tmp/cal-prefs-dialog.glade.h:35
+#: calendar/gui/event-editor.c:433 po/tmp/cal-prefs-dialog.glade.h:35
 msgid "Monday"
 msgstr "Mandag"
 
@@ -1637,7 +1637,7 @@ msgstr "Utgåtte oppføringer:"
 msgid "Pick a color"
 msgstr "Velg en farge"
 
-#: filter/libfilter-i18n.h:16 po/tmp/cal-prefs-dialog.glade.h:39
+#: filter/libfilter-i18n.h:15 po/tmp/cal-prefs-dialog.glade.h:39
 msgid "Priority"
 msgstr "Prioritet"
 
@@ -1653,7 +1653,7 @@ msgstr "Påminnelser"
 msgid "Sat"
 msgstr "Lør"
 
-#: calendar/gui/event-editor.c:422 po/tmp/cal-prefs-dialog.glade.h:43
+#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:43
 msgid "Saturday"
 msgstr "Lørdag"
 
@@ -1678,7 +1678,7 @@ msgstr "Dagen starter:"
 msgid "Sun"
 msgstr "Søn"
 
-#: calendar/gui/event-editor.c:423 po/tmp/cal-prefs-dialog.glade.h:49
+#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:49
 msgid "Sunday"
 msgstr "Søndag"
 
@@ -1690,7 +1690,7 @@ msgstr "Oppgaveblokk"
 msgid "Thu"
 msgstr "Tor"
 
-#: calendar/gui/event-editor.c:420 po/tmp/cal-prefs-dialog.glade.h:52
+#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:52
 msgid "Thursday"
 msgstr "Torsdag"
 
@@ -1710,7 +1710,7 @@ msgstr "Tidformat:"
 msgid "Tue"
 msgstr "Tir"
 
-#: calendar/gui/event-editor.c:418 po/tmp/cal-prefs-dialog.glade.h:57
+#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:57
 msgid "Tuesday"
 msgstr "Tirsdag"
 
@@ -1722,7 +1722,7 @@ msgstr "Visuelle alarmer"
 msgid "Wed"
 msgstr "Ons"
 
-#: calendar/gui/event-editor.c:419 po/tmp/cal-prefs-dialog.glade.h:60
+#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:60
 msgid "Wednesday"
 msgstr "Onsdag"
 
@@ -1738,29 +1738,33 @@ msgstr "minutter i forveien."
 msgid "seconds."
 msgstr "sekunder"
 
-#: calendar/gui/dialogs/task-editor.c:656
+#: calendar/gui/dialogs/task-editor.c:695
 msgid "Edit Task"
 msgstr "Redigér oppgave"
 
-#: calendar/gui/dialogs/task-editor.c:662 calendar/gui/event-editor.c:320
+#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:335
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/task-editor.c:668 calendar/gui/event-editor.c:326
+#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:341
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: calendar/gui/dialogs/task-editor.c:671 calendar/gui/event-editor.c:329
+#: calendar/gui/dialogs/task-editor.c:710 calendar/gui/event-editor.c:344
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgave - %s"
 
-#: calendar/gui/dialogs/task-editor.c:674 calendar/gui/event-editor.c:332
+#: calendar/gui/dialogs/task-editor.c:713 calendar/gui/event-editor.c:347
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaloppføring - %s"
 
+#: calendar/gui/dialogs/task-editor.c:1307 calendar/gui/event-editor.c:3277
+msgid "Do you want to save changes?"
+msgstr "Vil du lagre endringene?"
+
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -1799,7 +1803,7 @@ msgstr "Lav"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: po/tmp/task-editor-dialog.glade.h:17 shell/e-shell-view.c:1062
+#: po/tmp/task-editor-dialog.glade.h:17 shell/e-shell-view.c:1073
 #: widgets/misc/e-dateedit.c:422 widgets/misc/e-dateedit.c:1331
 #: widgets/misc/e-dateedit.c:1446
 msgid "None"
@@ -1849,31 +1853,31 @@ msgstr "_Status:"
 msgid "task-editor-dialog"
 msgstr "task-editor-dialog"
 
-#: calendar/gui/e-calendar-table.c:328
+#: calendar/gui/e-calendar-table.c:336
 msgid "Open..."
 msgstr "Åpne..."
 
-#: calendar/gui/e-calendar-table.c:329
+#: calendar/gui/e-calendar-table.c:337
 msgid "Open the task"
 msgstr "Åpne oppgaven"
 
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/e-calendar-table.c:339
 msgid "Mark Complete"
 msgstr "Merk som fullført"
 
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/e-calendar-table.c:340
 msgid "Mark the task complete"
 msgstr "Merk oppgaven som fullført"
 
-#: calendar/gui/e-calendar-table.c:334 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:493 mail/mail-view.c:165
+#: calendar/gui/e-calendar-table.c:342 filter/libfilter-i18n.h:7
+#: mail/folder-browser.c:479 mail/mail-view.c:165
 #: po/tmp/event-editor-dialog.glade.h:12 po/tmp/evolution-addressbook.xml.h:8
 #: po/tmp/evolution-event-editor.xml.h:19 po/tmp/evolution-mail.xml.h:11
 #: po/tmp/filter.glade.h:7 po/tmp/mail-config.glade.h:8
 msgid "Delete"
 msgstr "Slett"
 
-#: calendar/gui/e-calendar-table.c:335
+#: calendar/gui/e-calendar-table.c:343
 msgid "Delete the task"
 msgstr "Slett oppgaven"
 
@@ -1884,50 +1888,50 @@ 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:261 calendar/gui/e-day-view.c:1196
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1208
 #: calendar/gui/e-week-view-main-item.c:325
 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:265 calendar/gui/e-day-view.c:1210
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1222
 #: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1223
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1235
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:2931 calendar/gui/e-day-view.c:2938
-#: calendar/gui/e-day-view.c:2947 calendar/gui/e-week-view.c:3164
-#: calendar/gui/e-week-view.c:3171 calendar/gui/e-week-view.c:3180
+#: calendar/gui/e-day-view.c:2941 calendar/gui/e-day-view.c:2948
+#: calendar/gui/e-day-view.c:2957 calendar/gui/e-week-view.c:3165
+#: calendar/gui/e-week-view.c:3172 calendar/gui/e-week-view.c:3181
 msgid "New appointment..."
 msgstr "Ny avtale..."
 
-#: calendar/gui/e-day-view.c:2935 calendar/gui/e-day-view.c:2942
-#: calendar/gui/e-week-view.c:3168 calendar/gui/e-week-view.c:3175
+#: calendar/gui/e-day-view.c:2945 calendar/gui/e-day-view.c:2952
+#: calendar/gui/e-week-view.c:3169 calendar/gui/e-week-view.c:3176
 msgid "Edit this appointment..."
 msgstr "Redigér denne avtalen..."
 
-#: calendar/gui/e-day-view.c:2936 calendar/gui/e-week-view.c:3169
+#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
 #: po/tmp/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "Slett denne avtalen"
 
-#: calendar/gui/e-day-view.c:2943 calendar/gui/e-week-view.c:3176
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
 msgid "Make this appointment movable"
 msgstr "Gjør denne avtalen flyttbar"
 
-#: calendar/gui/e-day-view.c:2944 calendar/gui/e-week-view.c:3177
+#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
 msgid "Delete this occurrence"
 msgstr "Slett denne oppføringen"
 
-#: calendar/gui/e-day-view.c:2945 calendar/gui/e-week-view.c:3178
+#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
 msgid "Delete all occurrences"
 msgstr "Slett alle oppføringer"
 
@@ -1938,53 +1942,41 @@ msgstr "Slett alle oppføringer"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/event-editor.c:314
+#: calendar/gui/event-editor.c:329
 msgid "Edit Appointment"
 msgstr "Rediger avtale"
 
-#: calendar/gui/event-editor.c:391
+#: calendar/gui/event-editor.c:407
 msgid "on"
 msgstr "på"
 
-#: calendar/gui/event-editor.c:416 calendar/gui/getdate.y:424
+#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
 #: filter/filter-datespec.c:65
 msgid "day"
 msgstr "dag"
 
-#: calendar/gui/event-editor.c:541
+#: calendar/gui/event-editor.c:559
 msgid "on the"
 msgstr "den"
 
-#: calendar/gui/event-editor.c:548
+#: calendar/gui/event-editor.c:566
 msgid "th"
 msgstr "de"
 
-#: calendar/gui/event-editor.c:702
+#: calendar/gui/event-editor.c:722
 msgid "occurrences"
 msgstr "gjentakelser"
 
-#: calendar/gui/event-editor.c:819
+#: calendar/gui/event-editor.c:839
 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:2939 calendar/gui/print.c:1085
+#: calendar/gui/event-editor.c:3079 calendar/gui/print.c:1085
 #: calendar/gui/print.c:1087 calendar/gui/print.c:1088
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#. todo
-#.
-#. get the apply button to work right
-#.
-#. make the properties stuff unglobal
-#.
-#. figure out why alarm units aren't sticking between edits
-#.
-#. closing the dialog window with the wm caused a crash
-#. Gtk-WARNING **: invalid cast from `(unknown)' to `GnomeDialog'
-#. on line 669:  gnome_dialog_close (GNOME_DIALOG(dialog->dialog));
-#.
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -2592,7 +2584,7 @@ msgstr "Dette året (%Y)"
 msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:934
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:957
 msgid "Print Preview"
 msgstr "Forhåndsvisning av utskrift"
 
@@ -2779,7 +2771,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:225 shell/e-storage.c:382
+#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
@@ -2802,7 +2794,7 @@ msgstr "Uventet svar 'OK' fra IMAP-tjener: %s"
 msgid "Could not load summary for %s"
 msgstr "Kunne ikke laste sammendrag for %s"
 
-#: camel/providers/imap/camel-imap-folder.c:581
+#: camel/providers/imap/camel-imap-folder.c:585
 msgid "Could not find message body in FETCH response."
 msgstr "Kunne ikke finne meldingskropp i FETCH-svar."
 
@@ -3124,7 +3116,7 @@ msgstr "Feil under sending av brukernavn til tjener"
 msgid "Server rejected username/password"
 msgstr "Tjeneren godtok ikke brukernavn/passord"
 
-#: camel/providers/nntp/camel-nntp-folder.c:140
+#: camel/providers/nntp/camel-nntp-folder.c:144
 #, c-format
 msgid "Message %s not found."
 msgstr "Melding %s ikke funnet"
@@ -3370,7 +3362,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:118
+#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
 msgid "attachment"
 msgstr "vedlegg"
 
@@ -3413,7 +3405,7 @@ msgid "MIME type:"
 msgstr "MIME-type:"
 
 #: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:290
-#: mail/mail-format.c:622
+#: mail/mail-format.c:621
 msgid "From:"
 msgstr "Fra:"
 
@@ -3425,7 +3417,7 @@ msgstr "Klikk her for å få opp adresseboken"
 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:295 mail/mail-format.c:626
+#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:625
 msgid "To:"
 msgstr "Til:"
 
@@ -3433,7 +3425,7 @@ msgstr "Til:"
 msgid "Enter the recipients of the message"
 msgstr "Skriv inn mottakerene for meldingen"
 
-#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:628
+#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
 msgid "Cc:"
 msgstr "Cc:"
 
@@ -3453,7 +3445,7 @@ msgstr ""
 "Skriv inn adressene som skal motta en kopi av meldingen uten å komme til "
 "syne i mottakerlisten for meldingen."
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
 msgid "Subject:"
 msgstr "Emne:"
 
@@ -3470,38 +3462,38 @@ msgstr ""
 "Kunne ikke åpne signaturfilen %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:595
+#: composer/e-msg-composer.c:598
 msgid "Save as..."
 msgstr "Lagre som..."
 
-#: composer/e-msg-composer.c:606
+#: composer/e-msg-composer.c:609
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Feil under lagring av fil: %s"
 
-#: composer/e-msg-composer.c:626
+#: composer/e-msg-composer.c:629
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Feil under lasting av fil: %s"
 
-#: composer/e-msg-composer.c:648
+#: composer/e-msg-composer.c:651
 msgid "Saving changes to message..."
 msgstr "Lagre endringer i meldingen..."
 
-#: composer/e-msg-composer.c:650
+#: composer/e-msg-composer.c:653
 msgid "Save changes to message..."
 msgstr "Lagre endringer til meldingen..."
 
-#: composer/e-msg-composer.c:691
+#: composer/e-msg-composer.c:694
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Feil under lagring av brevet i 'Skisser': %s"
 
-#: composer/e-msg-composer.c:735 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:738 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:741
+#: composer/e-msg-composer.c:744
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3511,27 +3503,27 @@ msgstr ""
 "\n"
 "Vil du lagre endringene?"
 
-#: composer/e-msg-composer.c:763
+#: composer/e-msg-composer.c:766
 msgid "Open file"
 msgstr "Åpne fil"
 
-#: composer/e-msg-composer.c:889
+#: composer/e-msg-composer.c:892
 msgid "That file does not exist."
 msgstr "Filen eksisterer ikke."
 
-#: composer/e-msg-composer.c:899
+#: composer/e-msg-composer.c:902
 msgid "That is not a regular file."
 msgstr "Er ikke en vanlig fil."
 
-#: composer/e-msg-composer.c:909
+#: composer/e-msg-composer.c:912
 msgid "That file exists but is not readable."
 msgstr "Filen eksisterer men er ikke lesbar."
 
-#: composer/e-msg-composer.c:919
+#: composer/e-msg-composer.c:922
 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:941
+#: composer/e-msg-composer.c:944
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3539,15 +3531,15 @@ msgstr ""
 "File en meget stor (mer enn 100K).\n"
 "Er du sikker på at du vil sette den inn?"
 
-#: composer/e-msg-composer.c:962
+#: composer/e-msg-composer.c:965
 msgid "An error occurred while reading the file."
 msgstr "En feil oppsto under lesing fra filen."
 
-#: composer/e-msg-composer.c:1339
+#: composer/e-msg-composer.c:1342
 msgid "Compose a message"
 msgstr "Skriv en melding"
 
-#: composer/e-msg-composer.c:1416
+#: composer/e-msg-composer.c:1419
 msgid "Could not create composer window."
 msgstr "Kan ikke opprette komponeringsvinduet."
 
@@ -3645,8 +3637,8 @@ msgstr "Sammenligne med"
 msgid "<click here to select a date>"
 msgstr "<klikk her for å velge en dato>"
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:284
-#: mail/mail-autofilter.c:333
+#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:335
 msgid "Add Filter Rule"
 msgstr "Legg til filterregel"
 
@@ -3726,31 +3718,31 @@ msgstr "Regelnavn: "
 msgid "Untitled"
 msgstr "Uten navn"
 
-#: filter/filter-rule.c:538
+#: filter/filter-rule.c:540
 msgid "If"
 msgstr "Hvis"
 
-#: filter/filter-rule.c:555
+#: filter/filter-rule.c:557
 msgid "Execute actions"
 msgstr "Utfør handlinger"
 
-#: filter/filter-rule.c:559
+#: filter/filter-rule.c:561
 msgid "if all criteria are met"
 msgstr "hvis alle kriterier er møtt"
 
-#: filter/filter-rule.c:564
+#: filter/filter-rule.c:566
 msgid "if any criteria are met"
 msgstr "hvis et kriterie er møtt"
 
-#: filter/filter-rule.c:575
+#: filter/filter-rule.c:577
 msgid "Add criterion"
 msgstr "Legg til kriterie"
 
-#: filter/filter-rule.c:581
+#: filter/filter-rule.c:583
 msgid "Remove criterion"
 msgstr "Fjern kriterie"
 
-#: mail/folder-browser.c:479 po/tmp/filter.glade.h:8
+#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
 #: po/tmp/mail-config.glade.h:9
 msgid "Edit"
 msgstr "Redigér"
@@ -3805,154 +3797,142 @@ msgid "Expression"
 msgstr "Uttrykk"
 
 #: filter/libfilter-i18n.h:9
-msgid "Flagged"
-msgstr "Merket"
-
-#: filter/libfilter-i18n.h:10
 msgid "Forward to Address"
 msgstr "Videresend til adresse"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:10
 msgid "Message Body"
 msgstr "Meldingskropp"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 msgid "Message Header"
 msgstr "Meldingshode"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
 msgid "Message was received"
 msgstr "Meldingen ble mottatt"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
 msgid "Message was sent"
 msgstr "Meldingen ble sendt"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
 msgid "Move to Folder"
 msgstr "Flytt til mappe"
 
-#: filter/libfilter-i18n.h:17
-msgid "Read"
-msgstr "Les"
-
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:16
 msgid "Recipients"
 msgstr "Mottakere"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:17
 msgid "Regex Match"
 msgstr "Treff på vanlig uttrykk"
 
-#: filter/libfilter-i18n.h:20
-msgid "Replied to"
-msgstr "Svart til"
-
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:18
 msgid "Sender"
 msgstr "Avsender"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:19
 msgid "Set Status"
 msgstr "Sett status"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:20
 msgid "Source"
 msgstr "Kilde"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:21
 msgid "Specific header"
 msgstr "Spesifikk header"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:22
 msgid "Status"
 msgstr "Status"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:23
 msgid "Stop Processing"
 msgstr "Stopp behandling"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:24
 msgid "Subject"
 msgstr "Emne"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:25
 msgid "after"
 msgstr "etter"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:26
 msgid "before"
 msgstr "før"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:27
 msgid "contains"
 msgstr "inneholder"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:28
 msgid "does not contain"
 msgstr "inneholder ikke"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:29
 msgid "does not end with"
 msgstr "slutter ikke med"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:30
 msgid "does not exist"
 msgstr "eksisterer ikke"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:31
 msgid "does not sound like"
 msgstr "ligner ikke"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:32
 msgid "does not start with"
 msgstr "starter ikke med"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:33
 msgid "ends with"
 msgstr "slutter med"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:34
 msgid "exists"
 msgstr "eksisterer"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:35
 msgid "is greater than"
 msgstr "er større enn"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:36
 msgid "is less than"
 msgstr "er mindre enn"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:37
 msgid "is not"
 msgstr "er ikke"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:38
 msgid "is"
 msgstr "er"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:39
 msgid "on or after"
 msgstr "på eller etter"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:40
 msgid "on or before"
 msgstr "på eller før"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:41
 msgid "sounds like"
 msgstr "lyder som"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:42
 msgid "starts with"
 msgstr "starter med"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:43
 msgid "was after"
 msgstr "var etter"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:44
 msgid "was before"
 msgstr "var før"
 
@@ -3976,138 +3956,130 @@ msgstr "Legg til regel for VFolder"
 msgid "Edit VFolder Rule"
 msgstr "Redigér VFolder regel"
 
-#: mail/component-factory.c:233
+#: mail/component-factory.c:203
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikke initiere Evolutions e-postkomponent."
 
-#: mail/component-factory.c:239
-msgid "Cannot initialize Evolution's mail summary component."
-msgstr "Kan ikke initiere Evolution's e-postsammendrag-komponent."
-
-#: mail/component-factory.c:244
-msgid "Cannot initialize Evolution's mail storage hash."
-msgstr "Kan ikke initiere Evolutions e-postlagrings-hash."
-
-#: mail/component-factory.c:282
+#: mail/component-factory.c:242
 msgid "Cannot register storage with shell"
 msgstr "Kan ikke registrere lagring i skallet"
 
-#: mail/folder-browser.c:156 po/tmp/evolution-event-editor.xml.h:88
+#: mail/folder-browser.c:140 po/tmp/evolution-event-editor.xml.h:88
 #: po/tmp/evolution-message-composer.xml.h:17
 msgid "Save"
 msgstr "Lagre"
 
-#: mail/folder-browser.c:169
+#: mail/folder-browser.c:153
 msgid "Body or subject contains"
 msgstr "Kropp eller emne inneholder"
 
-#: mail/folder-browser.c:170
+#: mail/folder-browser.c:154
 msgid "Body contains"
 msgstr "Kropp inneholder"
 
-#: mail/folder-browser.c:171
+#: mail/folder-browser.c:155
 msgid "Subject contains"
 msgstr "Emne inneholder"
 
-#: mail/folder-browser.c:172
+#: mail/folder-browser.c:156
 msgid "Body does not contain"
 msgstr "Kropp inneholder ikke"
 
-#: mail/folder-browser.c:173
+#: mail/folder-browser.c:157
 msgid "Subject does not contain"
 msgstr "Emne inneholder ikke"
 
-#: mail/folder-browser.c:467
+#: mail/folder-browser.c:453
 msgid "VFolder on Subject"
 msgstr "VFolder for emne"
 
-#: mail/folder-browser.c:468
+#: mail/folder-browser.c:454
 msgid "VFolder on Sender"
 msgstr "VFolder for sender"
 
-#: mail/folder-browser.c:469
+#: mail/folder-browser.c:455
 msgid "VFolder on Recipients"
 msgstr "VFolder for mottakere"
 
-#: mail/folder-browser.c:471
+#: mail/folder-browser.c:457
 msgid "Filter on Subject"
 msgstr "Filtrér etter emne"
 
-#: mail/folder-browser.c:472
+#: mail/folder-browser.c:458
 msgid "Filter on Sender"
 msgstr "Filtrér etter sender"
 
-#: mail/folder-browser.c:473
+#: mail/folder-browser.c:459
 msgid "Filter on Recipients"
 msgstr "Filtrér etter mottaker"
 
-#: mail/folder-browser.c:474 mail/folder-browser.c:558
+#: mail/folder-browser.c:460 mail/folder-browser.c:544
 msgid "Filter on Mailing List"
 msgstr "Filtrér etter e-postliste"
 
-#: mail/folder-browser.c:478 po/tmp/evolution-message-composer.xml.h:15
+#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:15
 msgid "Open"
 msgstr "Åpne"
 
-#: mail/folder-browser.c:480
+#: mail/folder-browser.c:466
 msgid "Save As..."
 msgstr "Lagre som..."
 
-#: mail/folder-browser.c:481 mail/mail-view.c:163
+#: mail/folder-browser.c:467 mail/mail-view.c:163
 #: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
 #: po/tmp/evolution-mail.xml.h:28
 msgid "Print"
 msgstr "Skriv ut"
 
-#: mail/folder-browser.c:483
+#: mail/folder-browser.c:469
 msgid "Reply to Sender"
 msgstr "Svar til sender"
 
-#: mail/folder-browser.c:484 mail/mail-view.c:156
+#: mail/folder-browser.c:470 mail/mail-view.c:156
 #: po/tmp/evolution-mail.xml.h:34
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: mail/folder-browser.c:485 mail/mail-view.c:159
+#: mail/folder-browser.c:471 mail/mail-view.c:159
 #: po/tmp/evolution-mail.xml.h:17
 msgid "Forward"
 msgstr "Videresend"
 
-#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:18
+#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
 msgid "Forward inline"
 msgstr "Videresend \"inline\""
 
-#: mail/folder-browser.c:488
+#: mail/folder-browser.c:474
 msgid "Mark as Read"
 msgstr "Markér som lest"
 
-#: mail/folder-browser.c:489
+#: mail/folder-browser.c:475
 msgid "Mark as Unread"
 msgstr "Merk som ulest"
 
-#: mail/folder-browser.c:491
+#: mail/folder-browser.c:477
 msgid "Move to Folder..."
 msgstr "Flytt til mappe..."
 
-#: mail/folder-browser.c:492
+#: mail/folder-browser.c:478
 msgid "Copy to Folder..."
 msgstr "Kopiér til mappe..."
 
-#: mail/folder-browser.c:494
+#: mail/folder-browser.c:480
 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:498
+#: mail/folder-browser.c:484
 msgid "Apply Filters"
 msgstr "Påfør filtre"
 
-#: mail/folder-browser.c:500 po/tmp/evolution-mail.xml.h:10
+#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:10
 msgid "Create Rule From Message"
 msgstr "Lage regel fra melding"
 
-#: mail/folder-browser.c:560
+#: mail/folder-browser.c:546
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrér etter e-postliste (%s)"
@@ -4127,7 +4099,7 @@ msgstr "Emne er %s"
 msgid "Mail from %s"
 msgstr "E-post fra %s"
 
-#: mail/mail-autofilter.c:329
+#: mail/mail-autofilter.c:331
 #, c-format
 msgid "%s mailing list"
 msgstr "%s e-postliste"
@@ -4184,15 +4156,15 @@ msgstr ""
 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:542
+#: mail/mail-callbacks.c:543
 msgid "Move message(s) to"
 msgstr "Flytt melding(er) til"
 
-#: mail/mail-callbacks.c:544
+#: mail/mail-callbacks.c:545
 msgid "Copy message(s) to"
 msgstr "Kopiér melding(er) til"
 
-#: mail/mail-callbacks.c:659
+#: mail/mail-callbacks.c:660
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4200,15 +4172,27 @@ msgstr ""
 "Du kan kun redigere meldinger lagret\n"
 "i Skisser-katalogen."
 
-#: mail/mail-callbacks.c:720
+#: mail/mail-callbacks.c:694 mail/mail-display.c:72
+msgid "Overwrite file?"
+msgstr "Overskriv fil?"
+
+#: mail/mail-callbacks.c:698 mail/mail-display.c:76
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"En fil med samme navn eksisterer allerede.\n"
+"Overskriv den?"
+
+#: mail/mail-callbacks.c:743
 msgid "Save Message As..."
 msgstr "Lagre melding som..."
 
-#: mail/mail-callbacks.c:722
+#: mail/mail-callbacks.c:745
 msgid "Save Messages As..."
 msgstr "Lagre meldinger som..."
 
-#: mail/mail-callbacks.c:849
+#: mail/mail-callbacks.c:872
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4217,11 +4201,11 @@ msgstr ""
 "Feil under lasting av filter-informasjon:\n"
 "%s"
 
-#: mail/mail-callbacks.c:894
+#: mail/mail-callbacks.c:917
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/mail-callbacks.c:941
+#: mail/mail-callbacks.c:964
 msgid "Printing of message failed"
 msgstr "Feil under utskrift av melding"
 
@@ -4474,19 +4458,7 @@ msgstr "Kunne ikke opprette rør til GPG/PGP: %s"
 msgid "No GPG/PGP program available."
 msgstr "Ingen GPG/PGP-program tilgjengelig."
 
-#: mail/mail-display.c:68
-msgid "Overwrite file?"
-msgstr "Overskriv fil?"
-
-#: mail/mail-display.c:72
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"En fil med samme navn eksisterer allerede.\n"
-"Overskriv den?"
-
-#: mail/mail-display.c:86
+#: mail/mail-display.c:90
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -4495,127 +4467,127 @@ msgstr ""
 "Kan ikke åpne fil %s:\n"
 "%s"
 
-#: mail/mail-display.c:98
+#: mail/mail-display.c:113
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: mail/mail-display.c:192
+#: mail/mail-display.c:218
 msgid "Save Attachment"
 msgstr "Lagre vedlegg"
 
-#: mail/mail-display.c:232
+#: mail/mail-display.c:258
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kunne ikke opprette midlertidig katalog: %s"
 
-#: mail/mail-display.c:274
+#: mail/mail-display.c:300
 msgid "Save to Disk..."
 msgstr "Lagre til disk..."
 
-#: mail/mail-display.c:276
+#: mail/mail-display.c:302
 #, c-format
 msgid "Open in %s..."
 msgstr "Åpne i %s..."
 
-#: mail/mail-display.c:278
+#: mail/mail-display.c:304
 msgid "View Inline"
 msgstr "Vis \"inline\""
 
-#: mail/mail-display.c:302
+#: mail/mail-display.c:328
 msgid "External Viewer"
 msgstr "Ekstern visning"
 
-#: mail/mail-display.c:325
+#: mail/mail-display.c:351
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Vis \"inline\" (via %s)"
 
-#: mail/mail-display.c:329
+#: mail/mail-display.c:355
 msgid "Hide"
 msgstr "Skjul"
 
-#: mail/mail-format.c:501
+#: mail/mail-format.c:500
 #, c-format
 msgid "%s attachment"
 msgstr "%s-vedlegg"
 
-#: mail/mail-format.c:624
+#: mail/mail-format.c:623
 msgid "Reply-To:"
 msgstr "Svar-til:"
 
-#: mail/mail-format.c:846
+#: mail/mail-format.c:845
 msgid "No GPG/PGP support available in this copy of Evolution."
 msgstr "Ingen GPG/PGP-støtte tilgjengelig i denne versjonen av Evolution."
 
-#: mail/mail-format.c:858
+#: mail/mail-format.c:857
 msgid "Encrypted message not displayed"
 msgstr "Kryptert melding ikke vist"
 
-#: mail/mail-format.c:864
+#: mail/mail-format.c:863
 msgid "Encrypted message"
 msgstr "Kryptert melding"
 
-#: mail/mail-format.c:865
+#: mail/mail-format.c:864
 msgid "Click icon to decrypt."
 msgstr "Klikk på ikonet for å dekryptere."
 
-#: mail/mail-format.c:1467
+#: mail/mail-format.c:1466
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peker til FTP-tjener (%s)"
 
-#: mail/mail-format.c:1479
+#: mail/mail-format.c:1478
 #, 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:1483
+#: mail/mail-format.c:1482
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peker til lokal fil (%s)"
 
-#: mail/mail-format.c:1517
+#: mail/mail-format.c:1516
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peker til ukjent ekstern data (\"%s\"-type)"
 
-#: mail/mail-format.c:1522
+#: mail/mail-format.c:1521
 msgid "Malformed external-body part."
 msgstr "Feilutformet del for ekstern-kropp."
 
-#: mail/mail-format.c:1692
+#: mail/mail-format.c:1691
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "Den %s, skrev %s:\n"
 
-#: mail/mail-local.c:194
+#: mail/mail-local.c:202
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Endrer mappe \"%s\" til \"%s\"-format"
 
-#: mail/mail-local.c:198
+#: mail/mail-local.c:206
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Endre mappe \"%s\" til \"%s\"-format"
 
-#: mail/mail-local.c:254
+#: mail/mail-local.c:261
 msgid "Closing current folder"
 msgstr "Lukker aktiv mappe"
 
-#: mail/mail-local.c:286
+#: mail/mail-local.c:293
 msgid "Renaming old folder and opening"
 msgstr "Endrer navn på gammel mappe og gjenåpner"
 
-#: mail/mail-local.c:307
+#: mail/mail-local.c:314
 msgid "Creating new folder"
 msgstr "Oppretter en ny mappe"
 
-#: mail/mail-local.c:322
+#: mail/mail-local.c:329
 msgid "Copying messages"
 msgstr "Kopierer meldinger"
 
-#: mail/mail-local.c:334
+#: mail/mail-local.c:341
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -4624,7 +4596,7 @@ msgstr ""
 "Kan ikke lagre metainformasjon for mappe; du vil sannsynligvis\n"
 "ikke kunne åpne denne mappen igjen: %s"
 
-#: mail/mail-local.c:370
+#: mail/mail-local.c:372
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -4632,286 +4604,290 @@ msgstr ""
 "Hvis du ikke kan åpne denne postboksen igjen må\n"
 "du reparere den manuelt."
 
-#: mail/mail-local.c:669
+#: mail/mail-local.c:781
 msgid "Registering local folder"
 msgstr "Registrerer lokal mappe"
 
-#: mail/mail-local.c:671
+#: mail/mail-local.c:783
 msgid "Register local folder"
 msgstr "Registrér lokal mappe"
 
-#: mail/mail-ops.c:78
+#: mail/mail-ops.c:79
 #, c-format
 msgid "Fetching email from %s"
 msgstr "Henter e-post fra %s"
 
-#: mail/mail-ops.c:80
+#: mail/mail-ops.c:81
 #, c-format
 msgid "Fetch email from %s"
 msgstr "Hent e-post fra %s"
 
-#: mail/mail-ops.c:330
+#: mail/mail-ops.c:331
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Ingen ny e-post på %s."
 
-#: mail/mail-ops.c:400
+#: mail/mail-ops.c:401
 msgid "Filtering email on demand"
 msgstr "Filtrering av post etter behov"
 
-#: mail/mail-ops.c:402
+#: mail/mail-ops.c:403
 msgid "Filter email on demand"
 msgstr "Fi_ltrér e-post ved behov"
 
-#: mail/mail-ops.c:537
+#: mail/mail-ops.c:538
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender \"%s\""
 
-#: mail/mail-ops.c:542
+#: mail/mail-ops.c:543
 msgid "Sending a message without a subject"
 msgstr "Sender en melding uten emne"
 
-#: mail/mail-ops.c:545
+#: mail/mail-ops.c:546
 #, c-format
 msgid "Send \"%s\""
 msgstr "Send \"%s\""
 
-#: mail/mail-ops.c:548
+#: mail/mail-ops.c:549
 msgid "Send a message without a subject"
 msgstr "Send en melding uten emne"
 
-#: mail/mail-ops.c:719
+#: mail/mail-ops.c:720
 msgid "Sending queue"
 msgstr "Sender kø"
 
-#: mail/mail-ops.c:721
+#: mail/mail-ops.c:722
 msgid "Send queue"
 msgstr "Send kø"
 
-#: mail/mail-ops.c:857 mail/mail-ops.c:864
+#: mail/mail-ops.c:858 mail/mail-ops.c:865
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Legger til \"%s\""
 
-#: mail/mail-ops.c:861 mail/mail-ops.c:867
+#: mail/mail-ops.c:862 mail/mail-ops.c:868
 msgid "Appending a message without a subject"
 msgstr "Legger til en melding uten emne"
 
-#: mail/mail-ops.c:939
+#: mail/mail-ops.c:940
 #, c-format
 msgid "Expunging \"%s\""
 msgstr "Fjerner \"%s\""
 
-#: mail/mail-ops.c:941
+#: mail/mail-ops.c:942
 #, c-format
 msgid "Expunge \"%s\""
 msgstr "Fjern \"%s\""
 
-#: mail/mail-ops.c:1000
+#: mail/mail-ops.c:1001
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Flytter meldinger fra \"%s\" til \"%s\""
 
-#: mail/mail-ops.c:1002
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Kopierer meldinger fra \"%s\" til \"%s\""
 
-#: mail/mail-ops.c:1005
+#: mail/mail-ops.c:1006
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Flytt meldinger fra \"%s\" til \"%s\""
 
-#: mail/mail-ops.c:1007
+#: mail/mail-ops.c:1008
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Kopiér meldinger fra \"%s\" til \"%s\""
 
-#: mail/mail-ops.c:1038
+#: mail/mail-ops.c:1039
 msgid "Moving"
 msgstr "Flytter"
 
-#: mail/mail-ops.c:1041
+#: mail/mail-ops.c:1042
 msgid "Copying"
 msgstr "Kopiérer"
 
-#: mail/mail-ops.c:1061
+#: mail/mail-ops.c:1062
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s melding %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1140
+#: mail/mail-ops.c:1141
 #, c-format
 msgid "Marking messages in folder \"%s\""
 msgstr "Merker meldinger i mappe \"%s"
 
-#: mail/mail-ops.c:1143
+#: mail/mail-ops.c:1144
 #, c-format
 msgid "Mark messages in folder \"%s\""
 msgstr "Merk meldinger i mappe \"%s\""
 
-#: mail/mail-ops.c:1174
+#: mail/mail-ops.c:1175
 #, c-format
 msgid "Marking message %d of %d"
 msgstr "Merker melding %d av %d"
 
-#: mail/mail-ops.c:1297
+#: mail/mail-ops.c:1298
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i \"%s\""
 
-#: mail/mail-ops.c:1299
+#: mail/mail-ops.c:1300
 #, c-format
 msgid "Scan folders in \"%s\""
 msgstr "Skann foldere i \"%s\""
 
-#: mail/mail-ops.c:1368 mail/subscribe-dialog.c:339
+#: mail/mail-ops.c:1369 mail/subscribe-dialog.c:339
 msgid "(No description)"
 msgstr "(Ingen beskrivelse)"
 
-#: mail/mail-ops.c:1429
+#: mail/mail-ops.c:1430
 #, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr "Legger ved meldinger fra mappe \"%s\""
 
-#: mail/mail-ops.c:1432
+#: mail/mail-ops.c:1433
 #, c-format
 msgid "Attach messages from \"%s\""
 msgstr "Legg ved meldinger fra \"%s\""
 
-#: mail/mail-ops.c:1532
+#: mail/mail-ops.c:1533
 #, c-format
 msgid "Forwarding messages \"%s\""
 msgstr "Videresender meldinger \"%s\""
 
-#: mail/mail-ops.c:1536
+#: mail/mail-ops.c:1537
 msgid "Forwarding a message without a subject"
 msgstr "Videresender en melding uten emne"
 
-#: mail/mail-ops.c:1539
+#: mail/mail-ops.c:1540
 #, c-format
 msgid "Forward message \"%s\""
 msgstr "Videresend meldingen \"%s\""
 
-#: mail/mail-ops.c:1543
+#: mail/mail-ops.c:1544
 msgid "Forward a message without a subject"
 msgstr "Videresend en melding uten emne"
 
-#: mail/mail-ops.c:1590
+#: mail/mail-ops.c:1591
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Henter melding nummer %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1606
+#: mail/mail-ops.c:1608
 msgid ""
 "Failed to generate mime part from message while generating forwarded message."
 msgstr ""
 "Kunne ikke generere MIME-del fra melding under generering av videresendt "
 "melding."
 
-#: mail/mail-ops.c:1650
+#: mail/mail-ops.c:1663
+msgid "Forwarded messages"
+msgstr "Videresendte meldinger"
+
+#: mail/mail-ops.c:1677
 msgid "Forwarded message:\n"
 msgstr "Videresendt melding:\n"
 
-#: mail/mail-ops.c:1719
+#: mail/mail-ops.c:1746
 #, c-format
 msgid "Loading \"%s\""
 msgstr "Laster \"%s\""
 
-#: mail/mail-ops.c:1721
+#: mail/mail-ops.c:1748
 #, c-format
 msgid "Load \"%s\""
 msgstr "Last \"%s\""
 
-#: mail/mail-ops.c:1824
+#: mail/mail-ops.c:1851
 #, c-format
 msgid "Creating \"%s\""
 msgstr "Oppretter \"%s\""
 
-#: mail/mail-ops.c:1826
+#: mail/mail-ops.c:1853
 #, c-format
 msgid "Create \"%s\""
 msgstr "Opprett \"%s\""
 
-#: mail/mail-ops.c:1874
+#: mail/mail-ops.c:1901
 msgid "Exception while reporting result to shell component listener."
 msgstr "Unntak under rapportering av resultat til skallkomponentens lytter."
 
-#: mail/mail-ops.c:1920
+#: mail/mail-ops.c:1947
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr "Synkroniserer \"%s\""
 
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1949
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr "Synkronisér \"%s\""
 
-#: mail/mail-ops.c:1986
+#: mail/mail-ops.c:2013
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr "Viser melding-UID \"%s\""
 
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:2016
 msgid "Clearing message display"
 msgstr "Tømmer meldingsvisning"
 
-#: mail/mail-ops.c:1992
+#: mail/mail-ops.c:2019
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr "Vis meldings-UID \"%s\""
 
-#: mail/mail-ops.c:1995
+#: mail/mail-ops.c:2022
 msgid "Clear message display"
 msgstr "Tøm meldingsvisning"
 
-#: mail/mail-ops.c:2108
+#: mail/mail-ops.c:2135
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr "Åpner meldinger fra mappe \"%s\""
 
-#: mail/mail-ops.c:2111
+#: mail/mail-ops.c:2138
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr "Åpne meldinger fra \"%s\""
 
-#: mail/mail-ops.c:2215
+#: mail/mail-ops.c:2242
 #, c-format
 msgid "Loading %s Folder"
 msgstr "Laster %s-mappe"
 
-#: mail/mail-ops.c:2217
+#: mail/mail-ops.c:2244
 #, c-format
 msgid "Load %s Folder"
 msgstr "Last %s-mappe"
 
-#: mail/mail-ops.c:2281
+#: mail/mail-ops.c:2308
 #, c-format
 msgid "Viewing messages from folder \"%s\""
 msgstr "Viser meldinger fra mappe \"%s\""
 
-#: mail/mail-ops.c:2284
+#: mail/mail-ops.c:2311
 #, c-format
 msgid "View messages from \"%s\""
 msgstr "Vis meldinger fra \"%s\""
 
-#: mail/mail-ops.c:2310
+#: mail/mail-ops.c:2337
 #, c-format
 msgid "Retrieving message %d of %d (uid \"%s\")"
 msgstr "Henter melding %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:2399
+#: mail/mail-ops.c:2426
 #, c-format
 msgid "Saving messages from folder \"%s\""
 msgstr "Lagrer meldinger fra mappe \"%s\""
 
-#: mail/mail-ops.c:2402
+#: mail/mail-ops.c:2429
 #, c-format
 msgid "Save messages from folder \"%s\""
 msgstr "Lagre meldinger fra mappe \"%s\""
 
-#: mail/mail-ops.c:2444
+#: mail/mail-ops.c:2472
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Lagrer melding %d av %d (uid \"%s\")"
@@ -5054,38 +5030,38 @@ msgstr "Skriv ut den valgte meldingen"
 msgid "Delete this message"
 msgstr "Slett denne meldingen"
 
-#: mail/message-list.c:554
+#: mail/message-list.c:574
 msgid "Unseen"
 msgstr "Ulest"
 
-#: mail/message-list.c:557
+#: mail/message-list.c:577
 msgid "Seen"
 msgstr "Lest"
 
-#: mail/message-list.c:560
+#: mail/message-list.c:580
 msgid "Answered"
 msgstr "Besvart"
 
-#: mail/message-list.c:828
+#: mail/message-list.c:848
 #, 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:840 mail/message-list.c:855
+#: mail/message-list.c:860 mail/message-list.c:875
 #, c-format
 msgid "%s, et al."
 msgstr "%s, et al."
 
-#: mail/message-list.c:842 mail/message-list.c:857
+#: mail/message-list.c:862 mail/message-list.c:877
 msgid "<unknown>"
 msgstr "<ukjent>"
 
-#: mail/message-list.c:2140
+#: mail/message-list.c:2159
 msgid "Rebuilding message view"
 msgstr "Bygger opp meldingsvisningen på nytt"
 
-#: mail/message-list.c:2142
+#: mail/message-list.c:2161
 msgid "Rebuild message view"
 msgstr "Gjenoppbygg meldingsvisningen"
 
@@ -5266,11 +5242,11 @@ msgstr "Gå til mappe..."
 msgid "(No folder displayed)"
 msgstr "(Ingen mappe vist)"
 
-#: shell/e-shell-view.c:444
+#: shell/e-shell-view.c:455
 msgid "Folders"
 msgstr "Mapper"
 
-#: shell/e-shell-view.c:1066
+#: shell/e-shell-view.c:1077
 #, c-format
 msgid "Evolution - %s"
 msgstr "Evolution - %s"
@@ -5358,51 +5334,51 @@ msgstr "Fjern denne snarveien fra snarveilinjen"
 msgid "Error saving shortcuts."
 msgstr "Feil under lagring av snarveier."
 
-#: shell/e-storage.c:134
+#: shell/e-storage.c:138
 msgid "(No name)"
 msgstr "(Uten navn)"
 
-#: shell/e-storage.c:360
+#: shell/e-storage.c:389
 msgid "No error"
 msgstr "Ingen feil"
 
-#: shell/e-storage.c:362
+#: shell/e-storage.c:391
 msgid "Generic error"
 msgstr "Vanlig feil"
 
-#: shell/e-storage.c:364
+#: shell/e-storage.c:393
 msgid "A folder with the same name already exists"
 msgstr "En mappe med samme navn eksisterer allerede"
 
-#: shell/e-storage.c:366
+#: shell/e-storage.c:395
 msgid "The specified folder type is not valid"
 msgstr "Spesifisert mappetype er ikke gyldig"
 
-#: shell/e-storage.c:368
+#: shell/e-storage.c:397
 msgid "I/O error"
 msgstr "I/U-feil"
 
-#: shell/e-storage.c:370
+#: shell/e-storage.c:399
 msgid "Not enough space to create the folder"
 msgstr "Ikke nok plass til å opprette mappen"
 
-#: shell/e-storage.c:372
+#: shell/e-storage.c:401
 msgid "The specified folder was not found"
 msgstr "Spesifisert mappe ble ikke funnet"
 
-#: shell/e-storage.c:374
+#: shell/e-storage.c:403
 msgid "Function not implemented in this storage"
 msgstr "Funksjonen er ikke implementert i dette lageret"
 
-#: shell/e-storage.c:376
+#: shell/e-storage.c:405
 msgid "Permission denied"
 msgstr "Tilgang nektet"
 
-#: shell/e-storage.c:378
+#: shell/e-storage.c:407
 msgid "Operation not supported"
 msgstr "Operasjonen er ikke støttet"
 
-#: shell/e-storage.c:380
+#: shell/e-storage.c:409
 msgid "The specified type is not supported in this storage"
 msgstr "Spesifisert type er ikke støttet for dette lageret"
 
@@ -5467,11 +5443,11 @@ msgstr ""
 msgid "Cannot initialize the Evolution shell."
 msgstr "Kan ikke initialisere Evolution skallet."
 
-#: shell/main.c:177
+#: shell/main.c:178
 msgid "Disable."
 msgstr "Slå av."
 
-#: shell/main.c:197
+#: shell/main.c:198
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kunne ikke initialisere Bonobo komponentsystemet."
 
@@ -6651,7 +6627,7 @@ 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:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2468
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2470
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -6856,6 +6832,21 @@ msgstr "Skriving til midlertidig postboks feilet: %s: %s"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Kan ikke legge til melding i mh-mappe: %s: %s"
 
+#~ msgid "Cannot initialize Evolution's mail summary component."
+#~ msgstr "Kan ikke initiere Evolution's e-postsammendrag-komponent."
+
+#~ msgid "Cannot initialize Evolution's mail storage hash."
+#~ msgstr "Kan ikke initiere Evolutions e-postlagrings-hash."
+
+#~ msgid "Flagged"
+#~ msgstr "Merket"
+
+#~ msgid "Read"
+#~ msgstr "Les"
+
+#~ msgid "Replied to"
+#~ msgstr "Svart til"
+
 #~ msgid "Deleted"
 #~ msgstr "Slettet"
 
@@ -7459,9 +7450,6 @@ msgstr "Kan ikke legge til melding i mh-mappe: %s: %s"
 #~ msgid "label8"
 #~ msgstr "etikett8"
 
-#~ msgid "About to save changes to message..."
-#~ msgstr "Lagrer endringer til meldingen..."
-
 #~ msgid "Load a previously saved message"
 #~ msgstr "Les en tidligere lagret melding"