Updated Norwegian (bokmål) translation.

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

	* no.po: Updated Norwegian (bokmål) translation.

svn path=/trunk/; revision=6789

2 files changed, 378 insertions, 344 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 37449679df..5ba7830c1d 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2000-12-05  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* no.po: Updated Norwegian (bokmål) translation.
+	
 2000-12-04  Valek Filippov  <frob@df.ru>
 
 	* ru.po: updated russian translation.
diff --git a/po/no.po b/po/no.po
index dba5e1520f..6db124e883 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-11-30 15:10+0100\n"
-"PO-Revision-Date: 2000-11-30 15:11+01:00\n"
+"POT-Creation-Date: 2000-12-05 12:25+0100\n"
+"PO-Revision-Date: 2000-12-05 12:28+01:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -305,8 +305,8 @@ msgstr ""
 #: addressbook/backend/ebook/test-client.c:29
 #: addressbook/conduit/address-conduit.c:1006
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1065
-#: calendar/conduits/todo/todo-conduit.c:939 calendar/gui/main.c:54
+#: calendar/conduits/calendar/calendar-conduit.c:1127
+#: calendar/conduits/todo/todo-conduit.c:938 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initialisere Bonobo"
 
@@ -438,14 +438,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook ikke lastet\n"
 
 #: addressbook/conduit/address-conduit.c:598
-#: calendar/conduits/calendar/calendar-conduit.c:648
-#: calendar/conduits/todo/todo-conduit.c:521
+#: calendar/conduits/calendar/calendar-conduit.c:710
+#: calendar/conduits/todo/todo-conduit.c:520
 msgid "Could not start wombat server"
 msgstr "Kunne ikke starte wombat tjener"
 
 #: addressbook/conduit/address-conduit.c:599
-#: calendar/conduits/calendar/calendar-conduit.c:649
-#: calendar/conduits/todo/todo-conduit.c:522
+#: calendar/conduits/calendar/calendar-conduit.c:711
+#: calendar/conduits/todo/todo-conduit.c:521
 msgid "Could not start wombat"
 msgstr "Kunne ikke starte wombat"
 
@@ -827,7 +827,7 @@ msgstr "_Etternavn:"
 msgid "_Suffix:"
 msgstr "_Suffiks:"
 
-#: addressbook/gui/component/addressbook.c:266
+#: addressbook/gui/component/addressbook.c:264
 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:272
+#: addressbook/gui/component/addressbook.c:270
 #: po/tmp/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "Som _tabell"
 
-#: addressbook/gui/component/addressbook.c:392
+#: addressbook/gui/component/addressbook.c:390
 msgid "Unable to open addressbook"
 msgstr "Kunne ikke åpne adresseboken"
 
-#: addressbook/gui/component/addressbook.c:397
+#: addressbook/gui/component/addressbook.c:395
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -853,7 +853,7 @@ msgid ""
 "correctness and reenter.  If not, you probably have\n"
 "attempted to access an LDAP server.  If you wish to be\n"
 "able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install evolution.\n"
+"OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 "Kunne ikke åpne denne adresseboken. Dette beyr at du\n"
 "har skrevet inn en ugyldig URI, eller at du har forsøkt\n"
@@ -865,27 +865,27 @@ msgstr ""
 "installere OpenLDAP, deretter må du kompilere og\n"
 "installere Evolution på nytt.\n"
 
-#: addressbook/gui/component/addressbook.c:507 mail/folder-browser.c:152
+#: addressbook/gui/component/addressbook.c:505 mail/folder-browser.c:152
 msgid "Show All"
 msgstr "Vis alle"
 
-#: addressbook/gui/component/addressbook.c:509 mail/folder-browser.c:154
+#: addressbook/gui/component/addressbook.c:507 mail/folder-browser.c:154
 msgid "Advanced..."
 msgstr "Avansert..."
 
-#: addressbook/gui/component/addressbook.c:539
+#: addressbook/gui/component/addressbook.c:537
 msgid "Any field contains"
 msgstr "Et felt inneholder"
 
-#: addressbook/gui/component/addressbook.c:540
+#: addressbook/gui/component/addressbook.c:538
 msgid "Name contains"
 msgstr "Navn inneholder"
 
-#: addressbook/gui/component/addressbook.c:541
+#: addressbook/gui/component/addressbook.c:539
 msgid "Email contains"
 msgstr "E-post inneholder"
 
-#: addressbook/gui/component/addressbook.c:627
+#: addressbook/gui/component/addressbook.c:625
 msgid "The URI that the Folder Browser will display"
 msgstr "URIen som mappeutforskeren vil vise"
 
@@ -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:604
-#: calendar/conduits/todo/todo-conduit.c:477
+#: calendar/conduits/calendar/calendar-conduit.c:666
+#: calendar/conduits/todo/todo-conduit.c:476
 msgid "Error while communicating with calendar server"
 msgstr "Feil under kommunikasjon med kalendertjeneren"
 
-#: calendar/conduits/calendar/calendar-conduit.c:703
-#: calendar/conduits/calendar/calendar-conduit.c:706
+#: calendar/conduits/calendar/calendar-conduit.c:765
+#: calendar/conduits/calendar/calendar-conduit.c:768
 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:576
-#: calendar/conduits/todo/todo-conduit.c:579
+#: calendar/conduits/todo/todo-conduit.c:575
+#: calendar/conduits/todo/todo-conduit.c:578
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikke lese pilotens applikasjonsblokk for oppgaveliste"
 
@@ -1462,7 +1462,7 @@ msgstr "Prosentverdien må være mellom 0 og 100, inklusive"
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "Prioriteten må være mellom 0 og 9, inklusive"
 
-#: calendar/gui/control-factory.c:126
+#: calendar/gui/control-factory.c:125
 msgid "The URI that the calendar will display"
 msgstr "URIen som kalenderen skal vise"
 
@@ -1593,7 +1593,7 @@ msgstr "Første dag i uken:"
 msgid "Fri"
 msgstr "Fre"
 
-#: calendar/gui/event-editor.c:397 po/tmp/cal-prefs-dialog.glade.h:28
+#: calendar/gui/event-editor.c:421 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:393 po/tmp/cal-prefs-dialog.glade.h:35
+#: calendar/gui/event-editor.c:417 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:19 po/tmp/cal-prefs-dialog.glade.h:39
+#: filter/libfilter-i18n.h:16 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:398 po/tmp/cal-prefs-dialog.glade.h:43
+#: calendar/gui/event-editor.c:422 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:399 po/tmp/cal-prefs-dialog.glade.h:49
+#: calendar/gui/event-editor.c:423 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:396 po/tmp/cal-prefs-dialog.glade.h:52
+#: calendar/gui/event-editor.c:420 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:394 po/tmp/cal-prefs-dialog.glade.h:57
+#: calendar/gui/event-editor.c:418 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:395 po/tmp/cal-prefs-dialog.glade.h:60
+#: calendar/gui/event-editor.c:419 po/tmp/cal-prefs-dialog.glade.h:60
 msgid "Wednesday"
 msgstr "Onsdag"
 
@@ -1742,21 +1742,21 @@ msgstr "sekunder"
 msgid "Edit Task"
 msgstr "Redigér oppgave"
 
-#: calendar/gui/dialogs/task-editor.c:662 calendar/gui/event-editor.c:319
+#: calendar/gui/dialogs/task-editor.c:662 calendar/gui/event-editor.c:320
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/task-editor.c:668 calendar/gui/event-editor.c:325
+#: calendar/gui/dialogs/task-editor.c:668 calendar/gui/event-editor.c:326
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: calendar/gui/dialogs/task-editor.c:671 calendar/gui/event-editor.c:328
+#: calendar/gui/dialogs/task-editor.c:671 calendar/gui/event-editor.c:329
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgave - %s"
 
-#: calendar/gui/dialogs/task-editor.c:674 calendar/gui/event-editor.c:331
+#: calendar/gui/dialogs/task-editor.c:674 calendar/gui/event-editor.c:332
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaloppføring - %s"
@@ -1799,7 +1799,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:1018
+#: po/tmp/task-editor-dialog.glade.h:17 shell/e-shell-view.c:1062
 #: widgets/misc/e-dateedit.c:422 widgets/misc/e-dateedit.c:1331
 #: widgets/misc/e-dateedit.c:1446
 msgid "None"
@@ -1865,7 +1865,7 @@ msgstr "Merk som fullført"
 msgid "Mark the task complete"
 msgstr "Merk oppgaven som fullført"
 
-#: calendar/gui/e-calendar-table.c:334 filter/libfilter-i18n.h:8
+#: calendar/gui/e-calendar-table.c:334 filter/libfilter-i18n.h:7
 #: mail/folder-browser.c:493 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
@@ -1938,37 +1938,37 @@ msgstr "Slett alle oppføringer"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/event-editor.c:313
+#: calendar/gui/event-editor.c:314
 msgid "Edit Appointment"
 msgstr "Rediger avtale"
 
-#: calendar/gui/event-editor.c:368
+#: calendar/gui/event-editor.c:391
 msgid "on"
 msgstr "på"
 
-#: calendar/gui/event-editor.c:392 calendar/gui/getdate.y:424
+#: calendar/gui/event-editor.c:416 calendar/gui/getdate.y:424
 #: filter/filter-datespec.c:65
 msgid "day"
 msgstr "dag"
 
-#: calendar/gui/event-editor.c:517
+#: calendar/gui/event-editor.c:541
 msgid "on the"
 msgstr "den"
 
-#: calendar/gui/event-editor.c:524
+#: calendar/gui/event-editor.c:548
 msgid "th"
 msgstr "de"
 
-#: calendar/gui/event-editor.c:678
+#: calendar/gui/event-editor.c:702
 msgid "occurrences"
 msgstr "gjentakelser"
 
-#: calendar/gui/event-editor.c:795
+#: calendar/gui/event-editor.c:819
 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:2875 calendar/gui/print.c:1085
+#: calendar/gui/event-editor.c:2939 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"
@@ -2598,11 +2598,11 @@ msgstr "Forhåndsvisning av utskrift"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: calendar/gui/weekday-picker.c:345 widgets/misc/e-calendar-item.c:416
+#: calendar/gui/weekday-picker.c:351 widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "MTWTFSS"
 
-#: calendar/gui/weekday-picker.c:347 calendar/gui/weekday-picker.c:437
+#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
 msgid "SMTWTFS"
 msgstr "SMTWTFS"
 
@@ -2730,12 +2730,12 @@ msgstr "URL '%s' må inneholde et vertsnavn"
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' må inneholde en sti"
 
-#: camel/camel-service.c:486
+#: camel/camel-service.c:488
 #, c-format
 msgid "No such host %s."
 msgstr "Ingen vert %s."
 
-#: camel/camel-service.c:489
+#: camel/camel-service.c:491
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr "Midlertidig ute av stand til å slå opp vertsnavn %s."
@@ -2779,7 +2779,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:349
+#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:382
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
@@ -2977,7 +2977,7 @@ msgstr "Feil i sammendrag, avbryter synkronisering"
 msgid "Summary mismatch, X-Evolution header missing"
 msgstr "Feil i sammendrag, X-Evolution topptekst mangler"
 
-#: camel/providers/local/camel-mbox-summary.c:560
+#: camel/providers/local/camel-mbox-summary.c:562
 #: camel/providers/mbox/camel-mbox-summary.c:776
 #, c-format
 msgid "Error writing to temp mailbox: %s"
@@ -2989,26 +2989,26 @@ msgstr "Feil under skriving til midlertidig postboks: %s"
 msgid "Cannot copy data to output file: %s"
 msgstr "Kan ikke kopiere data til utfil: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:593
-#: camel/providers/local/camel-mbox-summary.c:746
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-mbox-summary.c:748
 #: camel/providers/mbox/camel-mbox-summary.c:832
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kunne ikke lukke kildemappe %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:602
+#: camel/providers/local/camel-mbox-summary.c:604
 #: camel/providers/mbox/camel-mbox-summary.c:841
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Kunne ikke lukke midlertidig mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:613
+#: camel/providers/local/camel-mbox-summary.c:615
 #: camel/providers/mbox/camel-mbox-summary.c:849
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunne ikke endre navn på mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:815
+#: camel/providers/local/camel-mbox-summary.c:817
 #: camel/providers/mbox/camel-mbox-summary.c:861
 #, c-format
 msgid "Unknown error: %s"
@@ -3025,9 +3025,9 @@ msgstr "Kunne ikke laste eller opprette sammendrag"
 msgid "Cannot append message to mh folder: %s"
 msgstr "Kan ikke legge til melding i mh-mappe: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-maildir-folder.c:206
-#: camel/providers/local/camel-maildir-folder.c:214
+#: camel/providers/local/camel-maildir-folder.c:195
+#: camel/providers/local/camel-maildir-folder.c:204
+#: camel/providers/local/camel-maildir-folder.c:212
 #: camel/providers/local/camel-mbox-folder.c:311
 #: camel/providers/local/camel-mh-folder.c:183
 #: camel/providers/local/camel-mh-folder.c:189
@@ -3277,7 +3277,7 @@ msgstr ""
 "Kunne ikke koble til POP-tjener.\n"
 "Feil ved oversending av passord: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:553
+#: camel/providers/pop3/camel-pop3-store.c:555
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ingen slik mappe `%s'."
@@ -3709,7 +3709,7 @@ msgstr ""
 "Feil i regulært uttrykk '%s':\n"
 "%s"
 
-#: filter/filter-message-search.c:377 filter/filter-message-search.c:445
+#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
 #, c-format
 msgid "Failed to perform regex search on message header: %s"
 msgstr "Feil under utførelse av søk etter vanlig uttrykk i meldingshode: %s"
@@ -3780,183 +3780,179 @@ msgid "vFolder Sources"
 msgstr "vFolder kilder"
 
 #. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2 mail/message-list.c:540
-msgid "Answered"
-msgstr "Besvart"
-
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:2
 msgid "Assign Colour"
 msgstr "Gi farge"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Gi poeng"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 msgid "Copy to Folder"
 msgstr "Kopiér til mappe"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:5
 msgid "Date received"
 msgstr "Dato mottatt"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:6
 msgid "Date sent"
 msgstr "Dato sendt"
 
-#: filter/libfilter-i18n.h:9
-msgid "Deleted"
-msgstr "Slettet"
-
-#: filter/libfilter-i18n.h:10
-msgid "Draft"
-msgstr "Skisse"
-
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:8
 msgid "Expression"
 msgstr "Uttrykk"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:9
 msgid "Flagged"
 msgstr "Merket"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:10
 msgid "Forward to Address"
 msgstr "Videresend til adresse"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:11
 msgid "Message Body"
 msgstr "Meldingskropp"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:12
 msgid "Message Header"
 msgstr "Meldingshode"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:13
 msgid "Message was received"
 msgstr "Meldingen ble mottatt"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:14
 msgid "Message was sent"
 msgstr "Meldingen ble sendt"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:15
 msgid "Move to Folder"
 msgstr "Flytt til mappe"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:17
+msgid "Read"
+msgstr "Les"
+
+#: filter/libfilter-i18n.h:18
 msgid "Recipients"
 msgstr "Mottakere"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:19
 msgid "Regex Match"
 msgstr "Treff på vanlig uttrykk"
 
-#: filter/libfilter-i18n.h:22 mail/message-list.c:537
-msgid "Seen"
-msgstr "Lest"
+#: filter/libfilter-i18n.h:20
+msgid "Replied to"
+msgstr "Svart til"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:21
 msgid "Sender"
 msgstr "Avsender"
 
-#: filter/libfilter-i18n.h:24
-msgid "Set Flag"
-msgstr "Sett flagg"
+#: filter/libfilter-i18n.h:22
+msgid "Set Status"
+msgstr "Sett status"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:23
 msgid "Source"
 msgstr "Kilde"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:24
 msgid "Specific header"
 msgstr "Spesifikk header"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:25
+msgid "Status"
+msgstr "Status"
+
+#: filter/libfilter-i18n.h:26
 msgid "Stop Processing"
 msgstr "Stopp behandling"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "Subject"
 msgstr "Emne"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "after"
 msgstr "etter"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "before"
 msgstr "før"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "contains"
 msgstr "inneholder"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "does not contain"
 msgstr "inneholder ikke"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "does not end with"
 msgstr "slutter ikke med"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "does not exist"
 msgstr "eksisterer ikke"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "does not sound like"
 msgstr "ligner ikke"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:35
 msgid "does not start with"
 msgstr "starter ikke med"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "ends with"
 msgstr "slutter med"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "exists"
 msgstr "eksisterer"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "is greater than"
 msgstr "er større enn"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "is less than"
 msgstr "er mindre enn"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:40
 msgid "is not"
 msgstr "er ikke"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:41
 msgid "is"
 msgstr "er"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:42
 msgid "on or after"
 msgstr "på eller etter"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:43
 msgid "on or before"
 msgstr "på eller før"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:44
 msgid "sounds like"
 msgstr "lyder som"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:45
 msgid "starts with"
 msgstr "starter med"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:46
 msgid "was after"
 msgstr "var etter"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:47
 msgid "was before"
 msgstr "var før"
 
@@ -4078,8 +4074,8 @@ msgid "Forward"
 msgstr "Videresend"
 
 #: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:18
-msgid "Forward as Attachment"
-msgstr "Videresend som vedlegg"
+msgid "Forward inline"
+msgstr "Videresend \"inline\""
 
 #: mail/folder-browser.c:488
 msgid "Mark as Read"
@@ -4229,7 +4225,7 @@ msgstr "Skriv ut melding"
 msgid "Printing of message failed"
 msgstr "Feil under utskrift av melding"
 
-#: mail/mail-config-gui.c:432
+#: mail/mail-config-gui.c:433
 msgid ""
 "Enter your name and email address to be used in outgoing mail. You may also, "
 "optionally, enter the name of your organization, and the name of a file to "
@@ -4238,59 +4234,63 @@ msgstr ""
 "Skriv inn ditt navn og din e-post adresse for bruk i utgående post. Du kan "
 "også skrive inn navnet på din organisasjon, og navnet på en signaturfil."
 
-#: mail/mail-config-gui.c:445
+#: mail/mail-config-gui.c:446
 msgid "Full name:"
 msgstr "Fullt navn:"
 
-#: mail/mail-config-gui.c:469
+#: mail/mail-config-gui.c:470
 msgid "Email address:"
 msgstr "E-post adresse:"
 
-#: mail/mail-config-gui.c:484
+#: mail/mail-config-gui.c:485
 msgid "Organization:"
 msgstr "Organisasjon:"
 
-#: mail/mail-config-gui.c:495
+#: mail/mail-config-gui.c:496
 msgid "Signature file:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config-gui.c:500 po/tmp/mail-config.glade.h:19
+#: mail/mail-config-gui.c:501 po/tmp/mail-config.glade.h:19
 msgid "Signature File"
 msgstr "Signaturfil"
 
-#: mail/mail-config-gui.c:906
+#: mail/mail-config-gui.c:922
 msgid "Server:"
 msgstr "Tjener:"
 
-#: mail/mail-config-gui.c:912
+#: mail/mail-config-gui.c:928
 msgid "Username:"
 msgstr "Brukernavn:"
 
-#: mail/mail-config-gui.c:918
+#: mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr "Sti:"
 
-#: mail/mail-config-gui.c:927
+#: mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr "Autentisering:"
 
-#: mail/mail-config-gui.c:940
+#: mail/mail-config-gui.c:956
 msgid "Detect supported types..."
 msgstr "Søk etter støttede typer..."
 
-#: mail/mail-config-gui.c:967
+#: mail/mail-config-gui.c:968
+msgid "Remember this password"
+msgstr "Husk dette passordet"
+
+#: mail/mail-config-gui.c:991
 msgid "Don't delete messages from server"
 msgstr "Ikke slett meldinger fra tjeneren"
 
-#: mail/mail-config-gui.c:979
+#: mail/mail-config-gui.c:1003
 msgid "Test Settings"
 msgstr "Prøv ut innstillinger"
 
-#: mail/mail-config-gui.c:1106
+#: mail/mail-config-gui.c:1130
 msgid "Mail source type:"
 msgstr "Type e-post-kilde:"
 
-#: mail/mail-config-gui.c:1111 mail/mail-config-gui.c:1159
+#: mail/mail-config-gui.c:1135 mail/mail-config-gui.c:1183
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -4304,11 +4304,11 @@ msgstr ""
 "Hvis tjeneren trenger autentisering, kan du klikke på \"Søk etter støttede "
 "typer...\" knappen etter at du har skrevet inn resten av informasjonen."
 
-#: mail/mail-config-gui.c:1130
+#: mail/mail-config-gui.c:1154
 msgid "News source type:"
 msgstr "Type news-kilde:"
 
-#: mail/mail-config-gui.c:1135
+#: mail/mail-config-gui.c:1159
 msgid ""
 "Select the kind of news server you have, and enter the relevant information "
 "about it.\n"
@@ -4322,54 +4322,54 @@ msgstr ""
 "Hvis tjeneren trenger autentisering, kan du klikke på \"Søk etter støttede "
 "typer...\"-knappen etter at du har skrevet inn resten av informasjonen."
 
-#: mail/mail-config-gui.c:1154
+#: mail/mail-config-gui.c:1178
 msgid "Mail transport type:"
 msgstr "Type e-post-transport"
 
-#: mail/mail-config-gui.c:1209
+#: mail/mail-config-gui.c:1233
 msgid "Add Identity"
 msgstr "Legg til identitet"
 
-#: mail/mail-config-gui.c:1211
+#: mail/mail-config-gui.c:1235
 msgid "Edit Identity"
 msgstr "Rediger identitet"
 
-#: mail/mail-config-gui.c:1309
+#: mail/mail-config-gui.c:1333
 msgid "Add Source"
 msgstr "Legg til kilde"
 
-#: mail/mail-config-gui.c:1311
+#: mail/mail-config-gui.c:1335
 msgid "Edit Source"
 msgstr "Rediger kilde"
 
-#: mail/mail-config-gui.c:1406
+#: mail/mail-config-gui.c:1430
 msgid "Add News Server"
 msgstr "Legg til news-tjener"
 
-#: mail/mail-config-gui.c:1408
+#: mail/mail-config-gui.c:1432
 msgid "Edit News Server"
 msgstr "Redigér news-tjener"
 
-#: mail/mail-config-gui.c:2229
+#: mail/mail-config-gui.c:2253
 #, c-format
 msgid "Testing \"%s\""
 msgstr "Tester \"%s\""
 
-#: mail/mail-config-gui.c:2231
+#: mail/mail-config-gui.c:2255
 #, c-format
 msgid "Test connection to \"%s\""
 msgstr "Test tilkobling til \"%s\""
 
-#: mail/mail-config-gui.c:2272
+#: mail/mail-config-gui.c:2296
 msgid "The connection was successful!"
 msgstr "Tilkoblingen var vellykket!"
 
-#: mail/mail-config-gui.c:2322
+#: mail/mail-config-gui.c:2346
 #, c-format
 msgid "Querying authorization capabilities of \"%s\""
 msgstr "Spør etter autorisasjonsegenskaper for \"%s\""
 
-#: mail/mail-config-gui.c:2324
+#: mail/mail-config-gui.c:2348
 #, c-format
 msgid "Query authorization at \"%s\""
 msgstr "Spør etter autorisasjon hos \"%s\""
@@ -4500,38 +4500,38 @@ msgstr ""
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: mail/mail-display.c:194
+#: mail/mail-display.c:192
 msgid "Save Attachment"
 msgstr "Lagre vedlegg"
 
-#: mail/mail-display.c:234
+#: mail/mail-display.c:232
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kunne ikke opprette midlertidig katalog: %s"
 
-#: mail/mail-display.c:276
+#: mail/mail-display.c:274
 msgid "Save to Disk..."
 msgstr "Lagre til disk..."
 
-#: mail/mail-display.c:278
+#: mail/mail-display.c:276
 #, c-format
 msgid "Open in %s..."
 msgstr "Åpne i %s..."
 
-#: mail/mail-display.c:280
+#: mail/mail-display.c:278
 msgid "View Inline"
 msgstr "Vis \"inline\""
 
-#: mail/mail-display.c:304
+#: mail/mail-display.c:302
 msgid "External Viewer"
 msgstr "Ekstern visning"
 
-#: mail/mail-display.c:327
+#: mail/mail-display.c:325
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Vis \"inline\" (via %s)"
 
-#: mail/mail-display.c:331
+#: mail/mail-display.c:329
 msgid "Hide"
 msgstr "Skjul"
 
@@ -4650,268 +4650,268 @@ msgstr "Henter e-post fra %s"
 msgid "Fetch email from %s"
 msgstr "Hent e-post fra %s"
 
-#: mail/mail-ops.c:333
+#: mail/mail-ops.c:330
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Ingen ny e-post på %s."
 
-#: mail/mail-ops.c:407
+#: mail/mail-ops.c:400
 msgid "Filtering email on demand"
 msgstr "Filtrering av post etter behov"
 
-#: mail/mail-ops.c:409
+#: mail/mail-ops.c:402
 msgid "Filter email on demand"
 msgstr "Fi_ltrér e-post ved behov"
 
-#: mail/mail-ops.c:544
+#: mail/mail-ops.c:537
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender \"%s\""
 
-#: mail/mail-ops.c:549
+#: mail/mail-ops.c:542
 msgid "Sending a message without a subject"
 msgstr "Sender en melding uten emne"
 
-#: mail/mail-ops.c:552
+#: mail/mail-ops.c:545
 #, c-format
 msgid "Send \"%s\""
 msgstr "Send \"%s\""
 
-#: mail/mail-ops.c:555
+#: mail/mail-ops.c:548
 msgid "Send a message without a subject"
 msgstr "Send en melding uten emne"
 
-#: mail/mail-ops.c:726
+#: mail/mail-ops.c:719
 msgid "Sending queue"
 msgstr "Sender kø"
 
-#: mail/mail-ops.c:728
+#: mail/mail-ops.c:721
 msgid "Send queue"
 msgstr "Send kø"
 
-#: mail/mail-ops.c:864 mail/mail-ops.c:871
+#: mail/mail-ops.c:857 mail/mail-ops.c:864
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Legger til \"%s\""
 
-#: mail/mail-ops.c:868 mail/mail-ops.c:874
+#: mail/mail-ops.c:861 mail/mail-ops.c:867
 msgid "Appending a message without a subject"
 msgstr "Legger til en melding uten emne"
 
-#: mail/mail-ops.c:946
+#: mail/mail-ops.c:939
 #, c-format
 msgid "Expunging \"%s\""
 msgstr "Fjerner \"%s\""
 
-#: mail/mail-ops.c:948
+#: mail/mail-ops.c:941
 #, c-format
 msgid "Expunge \"%s\""
 msgstr "Fjern \"%s\""
 
-#: mail/mail-ops.c:1007
+#: mail/mail-ops.c:1000
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Flytter meldinger fra \"%s\" til \"%s\""
 
-#: mail/mail-ops.c:1009
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Kopierer meldinger fra \"%s\" til \"%s\""
 
-#: mail/mail-ops.c:1012
+#: mail/mail-ops.c:1005
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Flytt meldinger fra \"%s\" til \"%s\""
 
-#: mail/mail-ops.c:1014
+#: mail/mail-ops.c:1007
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Kopiér meldinger fra \"%s\" til \"%s\""
 
-#: mail/mail-ops.c:1045
+#: mail/mail-ops.c:1038
 msgid "Moving"
 msgstr "Flytter"
 
-#: mail/mail-ops.c:1048
+#: mail/mail-ops.c:1041
 msgid "Copying"
 msgstr "Kopiérer"
 
-#: mail/mail-ops.c:1068
+#: mail/mail-ops.c:1061
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s melding %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1147
+#: mail/mail-ops.c:1140
 #, c-format
 msgid "Marking messages in folder \"%s\""
 msgstr "Merker meldinger i mappe \"%s"
 
-#: mail/mail-ops.c:1150
+#: mail/mail-ops.c:1143
 #, c-format
 msgid "Mark messages in folder \"%s\""
 msgstr "Merk meldinger i mappe \"%s\""
 
-#: mail/mail-ops.c:1181
+#: mail/mail-ops.c:1174
 #, c-format
 msgid "Marking message %d of %d"
 msgstr "Merker melding %d av %d"
 
-#: mail/mail-ops.c:1304
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i \"%s\""
 
-#: mail/mail-ops.c:1306
+#: mail/mail-ops.c:1299
 #, c-format
 msgid "Scan folders in \"%s\""
 msgstr "Skann foldere i \"%s\""
 
-#: mail/mail-ops.c:1375 mail/subscribe-dialog.c:339
+#: mail/mail-ops.c:1368 mail/subscribe-dialog.c:339
 msgid "(No description)"
 msgstr "(Ingen beskrivelse)"
 
-#: mail/mail-ops.c:1436
+#: mail/mail-ops.c:1429
 #, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr "Legger ved meldinger fra mappe \"%s\""
 
-#: mail/mail-ops.c:1439
+#: mail/mail-ops.c:1432
 #, c-format
 msgid "Attach messages from \"%s\""
 msgstr "Legg ved meldinger fra \"%s\""
 
-#: mail/mail-ops.c:1539
+#: mail/mail-ops.c:1532
 #, c-format
 msgid "Forwarding messages \"%s\""
 msgstr "Videresender meldinger \"%s\""
 
-#: mail/mail-ops.c:1543
+#: mail/mail-ops.c:1536
 msgid "Forwarding a message without a subject"
 msgstr "Videresender en melding uten emne"
 
-#: mail/mail-ops.c:1546
+#: mail/mail-ops.c:1539
 #, c-format
 msgid "Forward message \"%s\""
 msgstr "Videresend meldingen \"%s\""
 
-#: mail/mail-ops.c:1550
+#: mail/mail-ops.c:1543
 msgid "Forward a message without a subject"
 msgstr "Videresend en melding uten emne"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1590
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Henter melding nummer %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1613
+#: mail/mail-ops.c:1606
 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:1657
+#: mail/mail-ops.c:1650
 msgid "Forwarded message:\n"
 msgstr "Videresendt melding:\n"
 
-#: mail/mail-ops.c:1726
+#: mail/mail-ops.c:1719
 #, c-format
 msgid "Loading \"%s\""
 msgstr "Laster \"%s\""
 
-#: mail/mail-ops.c:1728
+#: mail/mail-ops.c:1721
 #, c-format
 msgid "Load \"%s\""
 msgstr "Last \"%s\""
 
-#: mail/mail-ops.c:1830
+#: mail/mail-ops.c:1824
 #, c-format
 msgid "Creating \"%s\""
 msgstr "Oppretter \"%s\""
 
-#: mail/mail-ops.c:1832
+#: mail/mail-ops.c:1826
 #, c-format
 msgid "Create \"%s\""
 msgstr "Opprett \"%s\""
 
-#: mail/mail-ops.c:1880
+#: mail/mail-ops.c:1874
 msgid "Exception while reporting result to shell component listener."
 msgstr "Unntak under rapportering av resultat til skallkomponentens lytter."
 
-#: mail/mail-ops.c:1926
+#: mail/mail-ops.c:1920
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr "Synkroniserer \"%s\""
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr "Synkronisér \"%s\""
 
-#: mail/mail-ops.c:1992
+#: mail/mail-ops.c:1986
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr "Viser melding-UID \"%s\""
 
-#: mail/mail-ops.c:1995
+#: mail/mail-ops.c:1989
 msgid "Clearing message display"
 msgstr "Tømmer meldingsvisning"
 
-#: mail/mail-ops.c:1998
+#: mail/mail-ops.c:1992
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr "Vis meldings-UID \"%s\""
 
-#: mail/mail-ops.c:2001
+#: mail/mail-ops.c:1995
 msgid "Clear message display"
 msgstr "Tøm meldingsvisning"
 
-#: mail/mail-ops.c:2114
+#: mail/mail-ops.c:2108
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr "Åpner meldinger fra mappe \"%s\""
 
-#: mail/mail-ops.c:2117
+#: mail/mail-ops.c:2111
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr "Åpne meldinger fra \"%s\""
 
-#: mail/mail-ops.c:2221
+#: mail/mail-ops.c:2215
 #, c-format
 msgid "Loading %s Folder"
 msgstr "Laster %s-mappe"
 
-#: mail/mail-ops.c:2223
+#: mail/mail-ops.c:2217
 #, c-format
 msgid "Load %s Folder"
 msgstr "Last %s-mappe"
 
-#: mail/mail-ops.c:2287
+#: mail/mail-ops.c:2281
 #, c-format
 msgid "Viewing messages from folder \"%s\""
 msgstr "Viser meldinger fra mappe \"%s\""
 
-#: mail/mail-ops.c:2290
+#: mail/mail-ops.c:2284
 #, c-format
 msgid "View messages from \"%s\""
 msgstr "Vis meldinger fra \"%s\""
 
-#: mail/mail-ops.c:2316
+#: mail/mail-ops.c:2310
 #, c-format
 msgid "Retrieving message %d of %d (uid \"%s\")"
 msgstr "Henter melding %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:2405
+#: mail/mail-ops.c:2399
 #, c-format
 msgid "Saving messages from folder \"%s\""
 msgstr "Lagrer meldinger fra mappe \"%s\""
 
-#: mail/mail-ops.c:2408
+#: mail/mail-ops.c:2402
 #, c-format
 msgid "Save messages from folder \"%s\""
 msgstr "Lagre meldinger fra mappe \"%s\""
 
-#: mail/mail-ops.c:2450
+#: mail/mail-ops.c:2444
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Lagrer melding %d av %d (uid \"%s\")"
@@ -4920,7 +4920,7 @@ msgstr "Lagrer melding %d av %d (uid \"%s\")"
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: mail/mail-summary.c:104 mail/mail-threads.c:703
+#: mail/mail-summary.c:104 mail/mail-threads.c:728
 msgid "Incomplete message written on pipe!"
 msgstr "Uferdig melding skrevet på rør!"
 
@@ -4933,7 +4933,7 @@ msgstr ""
 "Feil under forberedelser til %s:\n"
 "%s"
 
-#: mail/mail-threads.c:650
+#: mail/mail-threads.c:675
 #, c-format
 msgid ""
 "Error while `%s':\n"
@@ -4942,19 +4942,19 @@ msgstr ""
 "Feil under `%s':\n"
 "%s"
 
-#: mail/mail-threads.c:707
+#: mail/mail-threads.c:732
 msgid "Error reading commands from dispatching thread."
 msgstr "Feil under lesing av kommandoer fra utsender-tråd."
 
-#: mail/mail-threads.c:772
+#: mail/mail-threads.c:797
 msgid "Corrupted message from dispatching thread?"
 msgstr "Korrupt melding fra utsender-tråd?"
 
-#: mail/mail-threads.c:891
+#: mail/mail-threads.c:916
 msgid "Could not create dialog box."
 msgstr "Kan ikke opprette dialogboks."
 
-#: mail/mail-threads.c:902
+#: mail/mail-threads.c:927
 msgid "User cancelled query."
 msgstr "Spørring avbrutt av bruker."
 
@@ -5054,15 +5054,38 @@ msgstr "Skriv ut den valgte meldingen"
 msgid "Delete this message"
 msgstr "Slett denne meldingen"
 
-#: mail/message-list.c:534
+#: mail/message-list.c:554
 msgid "Unseen"
 msgstr "Ulest"
 
-#: mail/message-list.c:2089
+#: mail/message-list.c:557
+msgid "Seen"
+msgstr "Lest"
+
+#: mail/message-list.c:560
+msgid "Answered"
+msgstr "Besvart"
+
+#: mail/message-list.c:828
+#, 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
+#, c-format
+msgid "%s, et al."
+msgstr "%s, et al."
+
+#: mail/message-list.c:842 mail/message-list.c:857
+msgid "<unknown>"
+msgstr "<ukjent>"
+
+#: mail/message-list.c:2140
 msgid "Rebuilding message view"
 msgstr "Bygger opp meldingsvisningen på nytt"
 
-#: mail/message-list.c:2091
+#: mail/message-list.c:2142
 msgid "Rebuild message view"
 msgstr "Gjenoppbygg meldingsvisningen"
 
@@ -5239,25 +5262,25 @@ msgstr ""
 msgid "Go to folder..."
 msgstr "Gå til mappe..."
 
-#: shell/e-shell-view.c:136
+#: shell/e-shell-view.c:140
 msgid "(No folder displayed)"
 msgstr "(Ingen mappe vist)"
 
-#: shell/e-shell-view.c:417
+#: shell/e-shell-view.c:444
 msgid "Folders"
 msgstr "Mapper"
 
-#: shell/e-shell-view.c:1022
+#: shell/e-shell-view.c:1066
 #, c-format
 msgid "Evolution - %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell.c:339
+#: shell/e-shell.c:372
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikke sette opp lokal lagring -- %s"
 
-#: shell/e-shell.c:1160
+#: shell/e-shell.c:1208
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -5335,56 +5358,56 @@ msgstr "Fjern denne snarveien fra snarveilinjen"
 msgid "Error saving shortcuts."
 msgstr "Feil under lagring av snarveier."
 
-#: shell/e-storage.c:128
+#: shell/e-storage.c:134
 msgid "(No name)"
 msgstr "(Uten navn)"
 
-#: shell/e-storage.c:327
+#: shell/e-storage.c:360
 msgid "No error"
 msgstr "Ingen feil"
 
-#: shell/e-storage.c:329
+#: shell/e-storage.c:362
 msgid "Generic error"
 msgstr "Vanlig feil"
 
-#: shell/e-storage.c:331
+#: shell/e-storage.c:364
 msgid "A folder with the same name already exists"
 msgstr "En mappe med samme navn eksisterer allerede"
 
-#: shell/e-storage.c:333
+#: shell/e-storage.c:366
 msgid "The specified folder type is not valid"
 msgstr "Spesifisert mappetype er ikke gyldig"
 
-#: shell/e-storage.c:335
+#: shell/e-storage.c:368
 msgid "I/O error"
 msgstr "I/U-feil"
 
-#: shell/e-storage.c:337
+#: shell/e-storage.c:370
 msgid "Not enough space to create the folder"
 msgstr "Ikke nok plass til å opprette mappen"
 
-#: shell/e-storage.c:339
+#: shell/e-storage.c:372
 msgid "The specified folder was not found"
 msgstr "Spesifisert mappe ble ikke funnet"
 
-#: shell/e-storage.c:341
+#: shell/e-storage.c:374
 msgid "Function not implemented in this storage"
 msgstr "Funksjonen er ikke implementert i dette lageret"
 
-#: shell/e-storage.c:343
+#: shell/e-storage.c:376
 msgid "Permission denied"
 msgstr "Tilgang nektet"
 
-#: shell/e-storage.c:345
+#: shell/e-storage.c:378
 msgid "Operation not supported"
 msgstr "Operasjonen er ikke støttet"
 
-#: shell/e-storage.c:347
+#: shell/e-storage.c:380
 msgid "The specified type is not supported in this storage"
 msgstr "Spesifisert type er ikke støttet for dette lageret"
 
 #: po/tmp/evolution-event-editor.xml.h:125
-#: po/tmp/evolution-message-composer.xml.h:45 po/tmp/evolution.xml.h:36
+#: po/tmp/evolution-message-composer.xml.h:45 po/tmp/evolution.xml.h:34
 #: shell/e-storage-set-view.c:235
 msgid "_View"
 msgstr "_Vis"
@@ -5393,7 +5416,7 @@ msgstr "_Vis"
 msgid "View the selected folder"
 msgstr "Vis den valgte mappen"
 
-#: shell/main.c:70
+#: shell/main.c:74
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -5432,7 +5455,7 @@ msgstr ""
 "Vi håper at du nyter resultatene av vårt harde arbeid, og vi venter i\n"
 "spenning på at du tilbyr din hjelp!\n"
 
-#: shell/main.c:97
+#: shell/main.c:101
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -5440,15 +5463,15 @@ msgstr ""
 "Takk\n"
 "Evolution utviklerene\n"
 
-#: shell/main.c:122
+#: shell/main.c:132
 msgid "Cannot initialize the Evolution shell."
 msgstr "Kan ikke initialisere Evolution skallet."
 
-#: shell/main.c:144
+#: shell/main.c:177
 msgid "Disable."
 msgstr "Slå av."
 
-#: shell/main.c:164
+#: shell/main.c:197
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kunne ikke initialisere Bonobo komponentsystemet."
 
@@ -5481,7 +5504,7 @@ msgstr "Finn"
 msgid "Find a contact"
 msgstr "Finn en kontakt"
 
-#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:18
+#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:19
 msgid "New"
 msgstr "Ny"
 
@@ -5506,18 +5529,14 @@ msgid "View all contacts"
 msgstr "Vis alle kontakter"
 
 #: po/tmp/evolution-addressbook.xml.h:19
-msgid "_New Contact"
-msgstr "_Ny kontakt"
-
-#: po/tmp/evolution-addressbook.xml.h:20
 msgid "_Print Contacts..."
 msgstr "S_kriv ut kontakter..."
 
-#: po/tmp/evolution-addressbook.xml.h:21
+#: po/tmp/evolution-addressbook.xml.h:20
 msgid "_Search for contacts"
 msgstr "_Søk etter kontakter"
 
-#: po/tmp/evolution-addressbook.xml.h:22
+#: po/tmp/evolution-addressbook.xml.h:21
 #: po/tmp/evolution-event-editor.xml.h:123
 msgid "_Tools"
 msgstr "_Verktøy"
@@ -5535,49 +5554,49 @@ msgid "Alter preferences"
 msgstr "Endre brukervalg"
 
 #: po/tmp/evolution-calendar.xml.h:8
+msgid "Ca_lendar"
+msgstr "Ka_lender"
+
+#: po/tmp/evolution-calendar.xml.h:9
 msgid "Calendar Preferences..."
 msgstr "Brukervalg for kalender..."
 
-#: po/tmp/evolution-calendar.xml.h:9
+#: po/tmp/evolution-calendar.xml.h:10
 msgid "Create a new appointment"
 msgstr "Opprett en ny avtale"
 
-#: po/tmp/evolution-calendar.xml.h:10
+#: po/tmp/evolution-calendar.xml.h:11
 msgid "Create a new calendar"
 msgstr "Opprett en ny kalender"
 
-#: po/tmp/evolution-calendar.xml.h:11
+#: po/tmp/evolution-calendar.xml.h:12
 msgid "Day"
 msgstr "Dag"
 
-#: po/tmp/evolution-calendar.xml.h:12
+#: po/tmp/evolution-calendar.xml.h:13
 msgid "Go back in time"
 msgstr "Gå tilbake i tid"
 
-#: po/tmp/evolution-calendar.xml.h:13
+#: po/tmp/evolution-calendar.xml.h:14
 msgid "Go forward in time"
 msgstr "Gå fremover i tid"
 
-#: po/tmp/evolution-calendar.xml.h:14
+#: po/tmp/evolution-calendar.xml.h:15
 msgid "Go to"
 msgstr "Gå til"
 
-#: po/tmp/evolution-calendar.xml.h:15
+#: po/tmp/evolution-calendar.xml.h:16
 msgid "Go to a specific date"
 msgstr "Gå til en spesifikk dato"
 
-#: po/tmp/evolution-calendar.xml.h:16
+#: po/tmp/evolution-calendar.xml.h:17
 msgid "Go to present time"
 msgstr "Gå til i dag"
 
-#: po/tmp/evolution-calendar.xml.h:17
+#: po/tmp/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Måned"
 
-#: po/tmp/evolution-calendar.xml.h:19
-msgid "New Ca_lendar"
-msgstr "Ny ka_lender"
-
 #: po/tmp/evolution-calendar.xml.h:20 po/tmp/evolution-event-editor.xml.h:74
 msgid "Next"
 msgstr "Neste"
@@ -5622,27 +5641,19 @@ msgstr "Idag"
 msgid "Week"
 msgstr "Uke"
 
-#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:33
+#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:31
 msgid "_New"
 msgstr "_Ny"
 
 #: po/tmp/evolution-calendar.xml.h:33
-msgid "_New appointment..."
-msgstr "_Ny avtale..."
-
-#: po/tmp/evolution-calendar.xml.h:34
-msgid "_Open"
-msgstr "_Åpne"
-
-#: po/tmp/evolution-calendar.xml.h:35
 msgid "_Open Calendar"
 msgstr "_Åpne kalender"
 
-#: po/tmp/evolution-calendar.xml.h:36
+#: po/tmp/evolution-calendar.xml.h:34
 msgid "_Print this calendar"
 msgstr "S_kriv ut denne kalenderen"
 
-#: po/tmp/evolution-calendar.xml.h:37
+#: po/tmp/evolution-calendar.xml.h:35
 msgid "_Save Calendar As"
 msgstr "Lagre kalender _som"
 
@@ -5703,7 +5714,7 @@ msgstr "Send _melding til kontakt..."
 #: po/tmp/evolution-contact-editor.xml.h:19
 #: po/tmp/evolution-event-editor.xml.h:110
 #: po/tmp/evolution-message-composer.xml.h:40
-#: po/tmp/evolution-subscribe.xml.h:16 po/tmp/evolution.xml.h:27
+#: po/tmp/evolution-subscribe.xml.h:16 po/tmp/evolution.xml.h:25
 msgid "_File"
 msgstr "_Fil"
 
@@ -6092,7 +6103,7 @@ msgstr "_Feilsøk"
 
 #: po/tmp/evolution-event-editor.xml.h:109
 #: po/tmp/evolution-message-composer.xml.h:39
-#: po/tmp/evolution-subscribe.xml.h:15 po/tmp/evolution.xml.h:26
+#: po/tmp/evolution-subscribe.xml.h:15 po/tmp/evolution.xml.h:24
 msgid "_Edit"
 msgstr "R_edigér"
 
@@ -6105,7 +6116,7 @@ msgid "_Forms"
 msgstr "Sk_jemaer"
 
 #: po/tmp/evolution-event-editor.xml.h:113
-#: po/tmp/evolution-message-composer.xml.h:41 po/tmp/evolution.xml.h:30
+#: po/tmp/evolution-message-composer.xml.h:41 po/tmp/evolution.xml.h:28
 msgid "_Help"
 msgstr "_Hjelp"
 
@@ -6182,12 +6193,12 @@ msgid "Get Mail"
 msgstr "Hent e-post"
 
 #: po/tmp/evolution-mail.xml.h:21
-msgid "Mail _Filters..."
-msgstr "E-post _filtre..."
+msgid "Mail _Filters"
+msgstr "E-post _filtre"
 
 #: po/tmp/evolution-mail.xml.h:22
-msgid "Manage Subscriptions..."
-msgstr "Håndtér abonnement..."
+msgid "Manage Subscriptions"
+msgstr "Håndtér abonnement"
 
 #: po/tmp/evolution-mail.xml.h:23
 msgid "Mar_k As Read"
@@ -6286,8 +6297,8 @@ msgid "_Invert Selection"
 msgstr "Re_versér utvalg"
 
 #: po/tmp/evolution-mail.xml.h:54
-msgid "_Mail Configuration..."
-msgstr "_E-post konfigurasjon..."
+msgid "_Mail Configuration"
+msgstr "E-post-ko_nfigurasjon"
 
 #: po/tmp/evolution-mail.xml.h:55
 msgid "_Message"
@@ -6326,8 +6337,8 @@ msgid "_VFolder on Subject"
 msgstr "_VFolder for emne"
 
 #: po/tmp/evolution-mail.xml.h:64
-msgid "_Virtual Folder Editor..."
-msgstr "Redigering av _virtuelle mapper..."
+msgid "_Virtual Folder Editor"
+msgstr "Redigering av _virtuelle mapper"
 
 #.
 #. * Translatable strings file generated by extract-ui.
@@ -6466,106 +6477,98 @@ msgstr "Fjern abonnement"
 #. * DO NOT compile this file as part of your application.
 #.
 #: po/tmp/evolution.xml.h:6
-msgid "Create a new folder"
-msgstr "Opprett en ny mappe"
-
-#: po/tmp/evolution.xml.h:7
 msgid "Display a different folder"
 msgstr "Vis en annen mappe"
 
-#: po/tmp/evolution.xml.h:8
+#: po/tmp/evolution.xml.h:7
 msgid "E_xit"
 msgstr "A_vslutt"
 
-#: po/tmp/evolution.xml.h:9
+#: po/tmp/evolution.xml.h:8
 msgid "Evolution bar _shortcut"
 msgstr "Evolution-linje _snarvei"
 
-#: po/tmp/evolution.xml.h:10
+#: po/tmp/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Avslutt programmet"
 
-#: po/tmp/evolution.xml.h:11
+#: po/tmp/evolution.xml.h:10
 msgid "Getting _Started"
 msgstr "Kom _igang"
 
-#: po/tmp/evolution.xml.h:12
+#: po/tmp/evolution.xml.h:11
 msgid "Show information about Evolution"
 msgstr "Vis informasjon om Evolution"
 
-#: po/tmp/evolution.xml.h:13
+#: po/tmp/evolution.xml.h:12
 msgid "Show the _Folder Bar"
 msgstr "Vis _mappelinjen"
 
-#: po/tmp/evolution.xml.h:14
+#: po/tmp/evolution.xml.h:13
 msgid "Show the _Shortcut Bar"
 msgstr "Vis _snarveilinjen"
 
-#: po/tmp/evolution.xml.h:15
+#: po/tmp/evolution.xml.h:14
 msgid "Submit _Bug Report"
 msgstr "Sen_d inn feilrapport"
 
-#: po/tmp/evolution.xml.h:16
-msgid "Submit bug report using Bug Buddy"
-msgstr "Send inn feilrapport ved bruk av Bug Buddy"
+#: po/tmp/evolution.xml.h:15
+msgid "Submit bug report using Bug Buddy."
+msgstr "Send inn feilrapport ved bruk av Bug Buddy."
 
-#: po/tmp/evolution.xml.h:17
+#: po/tmp/evolution.xml.h:16
 msgid "Toggle whether to show the folder bar"
 msgstr "Slå av/på visning av mappelinjen"
 
-#: po/tmp/evolution.xml.h:18
+#: po/tmp/evolution.xml.h:17
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Slå av/på visning av snarveilinjen"
 
-#: po/tmp/evolution.xml.h:19
+#: po/tmp/evolution.xml.h:18
 msgid "Using the C_ontact Manager"
 msgstr "Bruk av k_ontaktdatabasen"
 
-#: po/tmp/evolution.xml.h:20
+#: po/tmp/evolution.xml.h:19
 msgid "Using the _Calendar"
 msgstr "Bruk av _kalenderen"
 
-#: po/tmp/evolution.xml.h:21
+#: po/tmp/evolution.xml.h:20
 msgid "Using the _Mailer"
 msgstr "Bruk av e-_postprogrammet"
 
-#: po/tmp/evolution.xml.h:22
+#: po/tmp/evolution.xml.h:21
 msgid "_About Evolution..."
 msgstr "_Om Evolution..."
 
-#: po/tmp/evolution.xml.h:23
+#: po/tmp/evolution.xml.h:22
 msgid "_Appointment (FIXME)"
 msgstr "_Avtale"
 
-#: po/tmp/evolution.xml.h:24
+#: po/tmp/evolution.xml.h:23
 msgid "_Contact (FIXME)"
 msgstr "_Kontakt"
 
-#: po/tmp/evolution.xml.h:25
-msgid "_Create New Folder..."
-msgstr "Opprett ny mappe..."
-
-#: po/tmp/evolution.xml.h:28
+#: po/tmp/evolution.xml.h:26
 msgid "_Folder"
 msgstr "_Mappe"
 
-#: po/tmp/evolution.xml.h:29
+#: po/tmp/evolution.xml.h:27
 msgid "_Go to Folder..."
 msgstr "_Gå til mappe..."
 
-#: po/tmp/evolution.xml.h:31
+#: po/tmp/evolution.xml.h:29
 msgid "_Index"
 msgstr "_Indeks"
 
-#: po/tmp/evolution.xml.h:32
+#: po/tmp/evolution.xml.h:30
 msgid "_Mail message (FIXME)"
 msgstr "Send _melding"
 
-#: po/tmp/evolution.xml.h:34
+#: po/tmp/evolution.xml.h:32
 msgid "_Settings"
 msgstr "Inn_stillinger"
 
-#: po/tmp/evolution.xml.h:35
+#: po/tmp/evolution.xml.h:33
 msgid "_Task (FIXME)"
 msgstr "_Oppgave"
 
@@ -6758,20 +6761,20 @@ 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-maildir-folder.c:150
-#: camel/providers/local/camel-maildir-folder.c:158
-#: camel/providers/local/camel-maildir-folder.c:169
+#: camel/providers/local/camel-maildir-folder.c:148
+#: camel/providers/local/camel-maildir-folder.c:156
+#: camel/providers/local/camel-maildir-folder.c:167
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Kan ikke legge til melding i maildir mappe: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
+#: camel/providers/local/camel-maildir-folder.c:195
 #: camel/providers/local/camel-mbox-folder.c:311
 #: camel/providers/local/camel-mh-folder.c:183
 msgid "No such message"
 msgstr "Ingen slik melding"
 
-#: camel/providers/local/camel-maildir-folder.c:215
+#: camel/providers/local/camel-maildir-folder.c:213
 #: camel/providers/local/camel-mh-folder.c:198
 msgid "Invalid message contents"
 msgstr "Ugyldig meldingsinnhold"
@@ -6795,9 +6798,9 @@ msgstr "Kan ikke åpne postboks: %s: %s\n"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Kan ikke legge til melding i mbox-filen: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:328
-#: camel/providers/local/camel-mbox-folder.c:358
-#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:327
+#: camel/providers/local/camel-mbox-folder.c:357
+#: camel/providers/local/camel-mbox-folder.c:368
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6806,11 +6809,11 @@ msgstr ""
 "Kan ikke hente melding: %s fra mappe %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:359
+#: camel/providers/local/camel-mbox-folder.c:358
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Mappen ser ut til å ha blitt korrupt og kan ikke repareres."
 
-#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:369
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Oppbygging av melding feilet: Korrupt postboks?"
 
@@ -6830,19 +6833,19 @@ msgid "Cannot summarise folder: %s: %s"
 msgstr "Kan ikke lage sammendrag for mappe: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:475
-#: camel/providers/local/camel-mbox-summary.c:659
+#: camel/providers/local/camel-mbox-summary.c:661
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "Kan ikke åpne mappe for å lage sammendrag: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:512
 #: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-mbox-summary.c:689
-#: camel/providers/local/camel-mbox-summary.c:697
+#: camel/providers/local/camel-mbox-summary.c:691
+#: camel/providers/local/camel-mbox-summary.c:699
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Feil i sammendrag og mappe, selv etter synkronisering"
 
-#: camel/providers/local/camel-mbox-summary.c:577
+#: camel/providers/local/camel-mbox-summary.c:579
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Skriving til midlertidig postboks feilet: %s: %s"
@@ -6853,6 +6856,39 @@ 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 "Deleted"
+#~ msgstr "Slettet"
+
+#~ msgid "Draft"
+#~ msgstr "Skisse"
+
+#~ msgid "Set Flag"
+#~ msgstr "Sett flagg"
+
+#~ msgid "Forward as Attachment"
+#~ msgstr "Videresend som vedlegg"
+
+#~ msgid "_New Contact"
+#~ msgstr "_Ny kontakt"
+
+#~ msgid "New Ca_lendar"
+#~ msgstr "Ny ka_lender"
+
+#~ msgid "_New appointment..."
+#~ msgstr "_Ny avtale..."
+
+#~ msgid "_Open"
+#~ msgstr "_Åpne"
+
+#~ msgid "_Mail Configuration..."
+#~ msgstr "_E-post konfigurasjon..."
+
+#~ msgid "Create a new folder"
+#~ msgstr "Opprett en ny mappe"
+
+#~ msgid "_Create New Folder..."
+#~ msgstr "Opprett ny mappe..."
+
 #~ msgid "Monday\n"
 #~ msgstr "Mandag\n"
 
@@ -7100,9 +7136,6 @@ msgstr "Kan ikke legge til melding i mh-mappe: %s: %s"
 #~ msgid "Receiving Mail"
 #~ msgstr "Mottar e-post"
 
-#~ msgid "Remember my password"
-#~ msgstr "Husk mitt passord"
-
 #~ msgid "Reply-to:"
 #~ msgstr "Svar-til:"
 
@@ -7446,6 +7479,3 @@ msgstr "Kan ikke legge til melding i mh-mappe: %s: %s"
 
 #~ msgid "Run filter \"%s\""
 #~ msgstr "Kjør filter \"%s\""
-
-#~ msgid "[%s] %s"
-#~ msgstr "[%s] %s"