Updated Norwegian translation.

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

	* no.po: Updated Norwegian translation.

svn path=/trunk/; revision=7169

2 files changed, 245 insertions, 219 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 52e3398c2c..fecb45e11a 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2000-12-25  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* no.po: Updated Norwegian translation.
+
 2000-12-23  Héctor García Álvarez <hector@scouts-es.org>
 
         * es.po: Updated Spanish translation.
diff --git a/po/no.po b/po/no.po
index cd11c96975..0dcb209203 100644
--- a/po/no.po
+++ b/po/no.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.8\n"
-"POT-Creation-Date: 2000-12-22 13:52+0100\n"
-"PO-Revision-Date: 2000-12-22 13:52+01:00\n"
+"POT-Creation-Date: 2000-12-25 10:46+0100\n"
+"PO-Revision-Date: 2000-12-25 10:49+01:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -307,7 +307,7 @@ msgstr ""
 #: addressbook/conduit/address-conduit.c:1083
 #: addressbook/gui/component/addressbook-factory.c:38
 #: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:53
+#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initialisere Bonobo"
 
@@ -783,14 +783,18 @@ msgid ""
 "\n"
 "Mr.\n"
 "Mrs.\n"
+"Ms.\n"
+"Miss\n"
 "Dr.\n"
 msgstr ""
 "\n"
 "Hr.\n"
 "Fru.\n"
+"Frk.\n"
+"Frøken\n"
 "Dr.\n"
 
-#: addressbook/contact-editor/fullname-strings.h:13
+#: addressbook/contact-editor/fullname-strings.h:15
 msgid ""
 "\n"
 "Sr.\n"
@@ -808,23 +812,23 @@ msgstr ""
 "III\n"
 "Esq.\n"
 
-#: addressbook/contact-editor/fullname-strings.h:21
+#: addressbook/contact-editor/fullname-strings.h:23
 msgid "_First:"
 msgstr "_Fornavn:"
 
-#: addressbook/contact-editor/fullname-strings.h:22
+#: addressbook/contact-editor/fullname-strings.h:24
 msgid "_Title:"
 msgstr "_Tittel:"
 
-#: addressbook/contact-editor/fullname-strings.h:23
+#: addressbook/contact-editor/fullname-strings.h:25
 msgid "_Middle:"
 msgstr "_Mellomnavn:"
 
-#: addressbook/contact-editor/fullname-strings.h:24
+#: addressbook/contact-editor/fullname-strings.h:26
 msgid "_Last:"
 msgstr "_Etternavn:"
 
-#: addressbook/contact-editor/fullname-strings.h:25
+#: addressbook/contact-editor/fullname-strings.h:27
 msgid "_Suffix:"
 msgstr "_Suffiks:"
 
@@ -1482,7 +1486,7 @@ msgstr "Lukk"
 msgid "Edit appointment"
 msgstr "Rediger avtale:"
 
-#: calendar/gui/gnome-cal.c:1476 po/tmp/alarm-notify.glade.h:8
+#: calendar/gui/gnome-cal.c:1333 po/tmp/alarm-notify.glade.h:8
 msgid "Snooze"
 msgstr "Utsett"
 
@@ -1728,26 +1732,16 @@ msgid "seconds."
 msgstr "sekunder"
 
 #: calendar/gui/dialogs/delete-comp.c:57
-msgid "appointment"
-msgstr "avtaler"
+msgid "Are you sure you want to delete the appointment"
+msgstr "Er du sikker på at du vil slette denne avtalen"
 
 #: calendar/gui/dialogs/delete-comp.c:61
-msgid "task"
-msgstr "oppgave"
+msgid "Are you sure you want to delete the task"
+msgstr "Er du sikker på at du vil slette denne oppgaven"
 
 #: calendar/gui/dialogs/delete-comp.c:65
-msgid "journal entry"
-msgstr "journaloppføring"
-
-#: calendar/gui/dialogs/delete-comp.c:74
-#, c-format
-msgid "Are you sure you want to delete the %s `%s'?"
-msgstr "Er du sikker på at du vil slette %s `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:77
-#, c-format
-msgid "Are you sure you want to delete this %s?"
-msgstr "Er du sikker på at du vil slette denne %s?"
+msgid "Are you sure you want to delete the journal entry"
+msgstr "Er du sikker på at du vil slette journaloppføringen"
 
 #.
 #. * Translatable strings file generated by extract-ui.
@@ -1881,7 +1875,7 @@ msgid "Mark the task complete"
 msgstr "Merk oppgaven som fullført"
 
 #: calendar/gui/e-calendar-table.c:342 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:608 mail/mail-view.c:165
+#: mail/folder-browser.c:608 mail/mail-view.c:160
 #: 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
@@ -1930,31 +1924,31 @@ msgstr "am"
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:2944 calendar/gui/e-day-view.c:2951
-#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3167
-#: calendar/gui/e-week-view.c:3174 calendar/gui/e-week-view.c:3183
+#: calendar/gui/e-day-view.c:2946 calendar/gui/e-day-view.c:2953
+#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3169
+#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
 msgid "New appointment..."
 msgstr "Ny avtale..."
 
-#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
-#: calendar/gui/e-week-view.c:3171 calendar/gui/e-week-view.c:3178
+#: calendar/gui/e-day-view.c:2950 calendar/gui/e-day-view.c:2957
+#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
 msgid "Edit this appointment..."
 msgstr "Redigér denne avtalen..."
 
-#: calendar/gui/e-day-view.c:2949 calendar/gui/e-week-view.c:3172
+#: calendar/gui/e-day-view.c:2951 calendar/gui/e-week-view.c:3174
 #: po/tmp/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "Slett denne avtalen"
 
-#: calendar/gui/e-day-view.c:2956 calendar/gui/e-week-view.c:3179
+#: calendar/gui/e-day-view.c:2958 calendar/gui/e-week-view.c:3181
 msgid "Make this appointment movable"
 msgstr "Gjør denne avtalen flyttbar"
 
-#: calendar/gui/e-day-view.c:2957 calendar/gui/e-week-view.c:3180
+#: calendar/gui/e-day-view.c:2959 calendar/gui/e-week-view.c:3182
 msgid "Delete this occurrence"
 msgstr "Slett denne oppføringen"
 
-#: calendar/gui/e-day-view.c:2958 calendar/gui/e-week-view.c:3181
+#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3183
 msgid "Delete all occurrences"
 msgstr "Slett alle oppføringer"
 
@@ -2159,56 +2153,33 @@ msgstr ""
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/gnome-cal.c:720 calendar/gui/gnome-cal.c:1484
-#: calendar/gui/gnome-cal.c:1540
+#: calendar/gui/gnome-cal.c:752 calendar/gui/gnome-cal.c:1341
+#: calendar/gui/gnome-cal.c:1397
 msgid "Reminder of your appointment at "
 msgstr "Påminnelse om din avtale "
 
-#: calendar/gui/gnome-cal.c:1158
+#: calendar/gui/gnome-cal.c:1022
 #, c-format
 msgid "Could not load the calendar in `%s'"
 msgstr "Kunne ikke laste kalenderen i `%s'"
 
-#: calendar/gui/gnome-cal.c:1169
+#: calendar/gui/gnome-cal.c:1033
 #, c-format
 msgid "Could not create a calendar in `%s'"
 msgstr "Kunne ikke opprette kalender i `%s'"
 
-#: calendar/gui/gnome-cal.c:1180
+#: calendar/gui/gnome-cal.c:1044
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden som er nødvendig for å laste `%s' er ikke støttet"
 
 #. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1489 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/gnome-cal.c:1346 calendar/gui/gnome-cal.c:1401
 #: mail/mail-search-dialogue.c:104
 msgid "Ok"
 msgstr "Ok"
 
-#: calendar/gui/goto.c:82
-msgid "Year:"
-msgstr "År:"
-
-#: calendar/gui/goto.c:270
-msgid "Go to date"
-msgstr "Gå til dato"
-
-#. Instructions
-#: calendar/gui/goto.c:281
-msgid ""
-"Please select the date you want to go to.\n"
-"When you click on a day, you will be taken\n"
-"to that date."
-msgstr ""
-"Vennligst velg datoen du vil gå til.\n"
-"Når du klikker på en dag vil du flytte\n"
-"deg til denne datoen."
-
-#: calendar/gui/goto.c:318
-msgid "Go to today"
-msgstr "Gå til idag"
-
-#: calendar/gui/main.c:48
+#: calendar/gui/main.c:49
 msgid "Could not initialize GNOME"
 msgstr "Kunne ikke initiere GNOME"
 
@@ -2400,7 +2371,7 @@ msgstr "Dette året (%Y)"
 msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:914
 msgid "Print Preview"
 msgstr "Forhåndsvisning av utskrift"
 
@@ -2494,61 +2465,61 @@ msgstr "Kunne ikke laste %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Kunne ikke laste %s: Ingen initieringskode i modulen."
 
-#: camel/camel-remote-store.c:182
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr "%s-tjener %s"
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s-tjeneste for %s på %s"
 
-#: camel/camel-remote-store.c:227
+#: camel/camel-remote-store.c:243
 #: camel/providers/smtp/camel-smtp-transport.c:162
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Kunne ikke koble til %s (port %d): %s"
 
-#: camel/camel-remote-store.c:228
+#: camel/camel-remote-store.c:244
 msgid "(unknown host)"
 msgstr "(ukjent vert)"
 
-#: camel/camel-remote-store.c:452
+#: camel/camel-remote-store.c:483
 msgid "Server disconnected."
 msgstr "Tjener koblet fra."
 
-#: camel/camel-service.c:120
+#: camel/camel-service.c:138
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' må inneholde et brukernavn"
 
-#: camel/camel-service.c:129
+#: camel/camel-service.c:147
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' må inneholde et vertsnavn"
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:156
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' må inneholde en sti"
 
-#: camel/camel-service.c:488
+#: camel/camel-service.c:526
 #, c-format
 msgid "No such host %s."
 msgstr "Ingen vert %s."
 
-#: camel/camel-service.c:491
+#: camel/camel-service.c:529
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr "Midlertidig ute av stand til å slå opp vertsnavn %s."
 
-#: camel/camel-session.c:272
+#: camel/camel-session.c:297
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Ingen tilbyder tilgjengelig for protokoll `%s'"
 
-#: camel/camel-session.c:360
+#: camel/camel-session.c:388
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2572,7 +2543,7 @@ msgstr "URL-streng `%s' inneholder en ugyldig protokoll"
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "Portnummer i URL `%s' er ikke-numerisk"
 
-#: camel/providers/imap/camel-imap-auth.c:127
+#: camel/providers/imap/camel-imap-auth.c:133
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -2581,44 +2552,44 @@ msgstr ""
 "Fikk ikke Kerberos \"ticket\":\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-auth.c:198
+#: camel/providers/imap/camel-imap-auth.c:205
 msgid "Bad authentication response from server."
 msgstr "Ugyldig svar på autentisering fra tjener."
 
-#: camel/providers/imap/camel-imap-command.c:226
+#: camel/providers/imap/camel-imap-command.c:231
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Uventet svar fra IMAP-tjener: %s"
 
-#: camel/providers/imap/camel-imap-command.c:234
+#: camel/providers/imap/camel-imap-command.c:239
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-kommando feilet: %s"
 
-#: camel/providers/imap/camel-imap-command.c:235 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
-#: camel/providers/imap/camel-imap-command.c:281
+#: camel/providers/imap/camel-imap-command.c:286
 msgid "Server response ended too soon."
 msgstr "Svar fra tjener ble avsluttet for tidlig."
 
-#: camel/providers/imap/camel-imap-command.c:417
+#: camel/providers/imap/camel-imap-command.c:422
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Svar fra IMAP-tjener inneholdt ikke %s-informasjon"
 
-#: camel/providers/imap/camel-imap-command.c:453
+#: camel/providers/imap/camel-imap-command.c:458
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Uventet svar 'OK' fra IMAP-tjener: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:220
+#: camel/providers/imap/camel-imap-folder.c:198
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Kunne ikke laste sammendrag for %s"
 
-#: camel/providers/imap/camel-imap-folder.c:579
+#: camel/providers/imap/camel-imap-folder.c:542
 msgid "Could not find message body in FETCH response."
 msgstr "Kunne ikke finne meldingskropp i FETCH-svar."
 
@@ -2630,35 +2601,35 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "For lesing og lagring av e-post på IMAP-tjenere."
 
-#: camel/providers/imap/camel-imap-store.c:234
+#: camel/providers/imap/camel-imap-store.c:246
 #: camel/providers/nntp/camel-nntp-store.c:293
 #: camel/providers/pop3/camel-pop3-store.c:148
 msgid "Password"
 msgstr "Passord"
 
-#: camel/providers/imap/camel-imap-store.c:236
+#: camel/providers/imap/camel-imap-store.c:248
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Dette valget vil la deg koble til en IMAP-tjener ved å bruke et "
 "klartekst-passord."
 
-#: camel/providers/imap/camel-imap-store.c:245
+#: camel/providers/imap/camel-imap-store.c:257
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/providers/imap/camel-imap-store.c:247
+#: camel/providers/imap/camel-imap-store.c:259
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 "Dette lar deg koble til IMAP-tjeneren ved å bruke Kerberos 4 som "
 "autentisering."
 
-#: camel/providers/imap/camel-imap-store.c:333
+#: camel/providers/imap/camel-imap-store.c:345
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sVennligst skriv inn IMAP-passord for %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:359
+#: camel/providers/imap/camel-imap-store.c:373
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2669,7 +2640,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:539
+#: camel/providers/imap/camel-imap-store.c:564
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kan ikke opprette katalog %s: %s"
@@ -2754,12 +2725,12 @@ 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: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-maildir-folder.c:207
+#: camel/providers/local/camel-maildir-folder.c:215
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:189
-#: camel/providers/local/camel-mh-folder.c:197
+#: camel/providers/local/camel-mh-folder.c:192
+#: camel/providers/local/camel-mh-folder.c:200
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2769,13 +2740,13 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
 msgid "No such message"
 msgstr "Ingen slik melding"
 
-#: camel/providers/local/camel-maildir-folder.c:213
-#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-maildir-folder.c:216
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "Invalid message contents"
 msgstr "Ugyldig meldingsinnhold"
 
@@ -2822,19 +2793,19 @@ msgstr "Kunne ikke slette mappe `%s': %s"
 msgid "not a maildir directory"
 msgstr "ikke en maildir katalog"
 
-#: camel/providers/local/camel-mbox-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:201
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Kan ikke åpne postboks: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:251
+#: camel/providers/local/camel-mbox-folder.c:257
 #, c-format
 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:327
-#: camel/providers/local/camel-mbox-folder.c:357
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:333
+#: camel/providers/local/camel-mbox-folder.c:365
+#: camel/providers/local/camel-mbox-folder.c:378
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -2843,11 +2814,11 @@ msgstr ""
 "Kan ikke hente melding: %s fra mappe %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:358
+#: camel/providers/local/camel-mbox-folder.c:366
 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:369
+#: camel/providers/local/camel-mbox-folder.c:379
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Oppbygging av melding feilet: Korrupt postboks?"
 
@@ -2900,56 +2871,56 @@ msgstr "Kunne ikke åpne mappe: %s: lager sammendrag fra posisjon %ld: %s"
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Fatal feil i lesing av postboksen nær posisjon %ld i mappe %s"
 
-#: camel/providers/local/camel-mbox-summary.c:341
+#: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 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:661
+#: camel/providers/local/camel-mbox-summary.c:477
+#: camel/providers/local/camel-mbox-summary.c:668
 #, 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:491
+#: camel/providers/local/camel-mbox-summary.c:493
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kan ikke åpne midlertidig postboks: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:512
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-mbox-summary.c:691
-#: camel/providers/local/camel-mbox-summary.c:699
+#: camel/providers/local/camel-mbox-summary.c:514
+#: camel/providers/local/camel-mbox-summary.c:522
+#: camel/providers/local/camel-mbox-summary.c:701
+#: camel/providers/local/camel-mbox-summary.c:709
 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:562
+#: camel/providers/local/camel-mbox-summary.c:565
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Feil under skriving til midlertidig postboks: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:579
+#: camel/providers/local/camel-mbox-summary.c:582
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Skriving til midlertidig postboks feilet: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:595
-#: camel/providers/local/camel-mbox-summary.c:748
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-mbox-summary.c:759
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kunne ikke lukke kildemappe %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:604
+#: camel/providers/local/camel-mbox-summary.c:609
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Kunne ikke lukke midlertidig mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:615
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunne ikke endre navn på mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:817
+#: camel/providers/local/camel-mbox-summary.c:830
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ukjent feil: %s"
@@ -2982,7 +2953,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:144
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
 msgstr "Melding %s ikke funnet"
@@ -3036,16 +3007,16 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Kunne ikke åpne eller opprette .newsrc-fil for %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:179
+#: camel/providers/pop3/camel-pop3-folder.c:180
 msgid "Could not open folder: message listing was incomplete."
 msgstr "Kunne ikke åpne mappe: meldingslisten var ikke komplett."
 
-#: camel/providers/pop3/camel-pop3-folder.c:273
+#: camel/providers/pop3/camel-pop3-folder.c:274
 #, c-format
 msgid "No message with uid %s"
 msgstr "Ingen melding med uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:288
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Kunne ikke hente melding fra POP-tjener %s: %s"
@@ -4052,7 +4023,7 @@ msgstr "Filtrér etter sender"
 msgid "Filter on Recipients"
 msgstr "Filtrér etter mottaker"
 
-#: mail/folder-browser.c:573 mail/folder-browser.c:690
+#: mail/folder-browser.c:573 mail/folder-browser.c:692
 msgid "Filter on Mailing List"
 msgstr "Filtrér etter e-postliste"
 
@@ -4073,11 +4044,11 @@ msgstr "Skjul leste"
 msgid "Hide deleted"
 msgstr "Skjul slettede"
 
-#: mail/folder-browser.c:586 mail/folder-browser.c:701
+#: mail/folder-browser.c:586 mail/folder-browser.c:703
 msgid "Hide Subject"
 msgstr "Skjul emne"
 
-#: mail/folder-browser.c:588 mail/folder-browser.c:707
+#: mail/folder-browser.c:588 mail/folder-browser.c:709
 msgid "Hide from Sender"
 msgstr "Skjul fra sender"
 
@@ -4089,7 +4060,7 @@ msgstr "Åpne"
 msgid "Save As..."
 msgstr "Lagre som..."
 
-#: mail/folder-browser.c:596 mail/mail-view.c:163
+#: mail/folder-browser.c:596 mail/mail-view.c:158
 #: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
 #: po/tmp/evolution-mail.xml.h:32
 msgid "Print"
@@ -4099,12 +4070,12 @@ msgstr "Skriv ut"
 msgid "Reply to Sender"
 msgstr "Svar til sender"
 
-#: mail/folder-browser.c:599 mail/mail-view.c:156
+#: mail/folder-browser.c:599 mail/mail-view.c:151
 #: po/tmp/evolution-mail.xml.h:38
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: mail/folder-browser.c:600 mail/mail-view.c:159
+#: mail/folder-browser.c:600 mail/mail-view.c:154
 #: po/tmp/evolution-mail.xml.h:17
 msgid "Forward"
 msgstr "Videresend"
@@ -4147,17 +4118,17 @@ msgstr "Lage regel fra melding"
 msgid "Hide Messages"
 msgstr "Skjul meldinger"
 
-#: mail/folder-browser.c:692
+#: mail/folder-browser.c:694
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrér etter e-postliste (%s)"
 
-#: mail/folder-browser.c:698
+#: mail/folder-browser.c:700
 #, c-format
 msgid "Hide Subject \"%s\""
 msgstr "Skjul emne \"%s\""
 
-#: mail/folder-browser.c:704
+#: mail/folder-browser.c:706
 #, c-format
 msgid "Hide from Sender <%s>"
 msgstr "Skjul fra sender <%s>"
@@ -4242,7 +4213,7 @@ msgstr "Flytt melding(er) til"
 msgid "Copy message(s) to"
 msgstr "Kopiér melding(er) til"
 
-#: mail/mail-callbacks.c:665
+#: mail/mail-callbacks.c:669
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4250,11 +4221,11 @@ msgstr ""
 "Du kan kun redigere meldinger lagret\n"
 "i Skisser-katalogen."
 
-#: mail/mail-callbacks.c:699 mail/mail-display.c:74
+#: mail/mail-callbacks.c:703 mail/mail-display.c:74
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
-#: mail/mail-callbacks.c:703 mail/mail-display.c:78
+#: mail/mail-callbacks.c:707 mail/mail-display.c:78
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4262,15 +4233,15 @@ msgstr ""
 "En fil med samme navn eksisterer allerede.\n"
 "Overskriv den?"
 
-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:752
 msgid "Save Message As..."
 msgstr "Lagre melding som..."
 
-#: mail/mail-callbacks.c:750
+#: mail/mail-callbacks.c:754
 msgid "Save Messages As..."
 msgstr "Lagre meldinger som..."
 
-#: mail/mail-callbacks.c:877
+#: mail/mail-callbacks.c:829
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4279,11 +4250,11 @@ msgstr ""
 "Feil under lasting av filter-informasjon:\n"
 "%s"
 
-#: mail/mail-callbacks.c:922
+#: mail/mail-callbacks.c:874
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/mail-callbacks.c:969
+#: mail/mail-callbacks.c:921
 msgid "Printing of message failed"
 msgstr "Feil under utskrift av melding"
 
@@ -4695,26 +4666,26 @@ msgstr "Registrerer lokal mappe"
 msgid "Register local folder"
 msgstr "Registrér lokal mappe"
 
-#: mail/mail-ops.c:79
+#: mail/mail-ops.c:82
 #, c-format
 msgid "Fetching email from %s"
 msgstr "Henter e-post fra %s"
 
-#: mail/mail-ops.c:81
+#: mail/mail-ops.c:84
 #, c-format
 msgid "Fetch email from %s"
 msgstr "Hent e-post fra %s"
 
-#: mail/mail-ops.c:331
+#: mail/mail-ops.c:329
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Ingen ny e-post på %s."
 
-#: mail/mail-ops.c:401
+#: mail/mail-ops.c:399
 msgid "Filtering email on demand"
 msgstr "Filtrering av post etter behov"
 
-#: mail/mail-ops.c:403
+#: mail/mail-ops.c:401
 msgid "Filter email on demand"
 msgstr "Fi_ltrér e-post ved behov"
 
@@ -4811,166 +4782,166 @@ msgstr "Merk meldinger i mappe \"%s\""
 msgid "Marking message %d of %d"
 msgstr "Merker melding %d av %d"
 
-#: mail/mail-ops.c:1295
+#: mail/mail-ops.c:1296
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i \"%s\""
 
-#: mail/mail-ops.c:1297
+#: mail/mail-ops.c:1298
 #, c-format
 msgid "Scan folders in \"%s\""
 msgstr "Skann foldere i \"%s\""
 
-#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
+#: mail/mail-ops.c:1367 mail/subscribe-dialog.c:339
 msgid "(No description)"
 msgstr "(Ingen beskrivelse)"
 
-#: mail/mail-ops.c:1432
+#: mail/mail-ops.c:1433
 #, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr "Legger ved meldinger fra mappe \"%s\""
 
-#: mail/mail-ops.c:1435
+#: mail/mail-ops.c:1436
 #, c-format
 msgid "Attach messages from \"%s\""
 msgstr "Legg ved meldinger fra \"%s\""
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1536
 #, c-format
 msgid "Forwarding messages \"%s\""
 msgstr "Videresender meldinger \"%s\""
 
-#: mail/mail-ops.c:1539
+#: mail/mail-ops.c:1540
 msgid "Forwarding a message without a subject"
 msgstr "Videresender en melding uten emne"
 
-#: mail/mail-ops.c:1542
+#: mail/mail-ops.c:1543
 #, c-format
 msgid "Forward message \"%s\""
 msgstr "Videresend meldingen \"%s\""
 
-#: mail/mail-ops.c:1546
+#: mail/mail-ops.c:1547
 msgid "Forward a message without a subject"
 msgstr "Videresend en melding uten emne"
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1594
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Henter melding nummer %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1610
+#: mail/mail-ops.c:1611
 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:1665
+#: mail/mail-ops.c:1666
 msgid "Forwarded messages"
 msgstr "Videresendte meldinger"
 
-#: mail/mail-ops.c:1679
+#: mail/mail-ops.c:1680
 msgid "Forwarded message:\n"
 msgstr "Videresendt melding:\n"
 
-#: mail/mail-ops.c:1748
+#: mail/mail-ops.c:1749
 #, c-format
 msgid "Loading \"%s\""
 msgstr "Laster \"%s\""
 
-#: mail/mail-ops.c:1750
+#: mail/mail-ops.c:1751
 #, c-format
 msgid "Load \"%s\""
 msgstr "Last \"%s\""
 
-#: mail/mail-ops.c:1853
+#: mail/mail-ops.c:1854
 #, c-format
 msgid "Creating \"%s\""
 msgstr "Oppretter \"%s\""
 
-#: mail/mail-ops.c:1855
+#: mail/mail-ops.c:1856
 #, c-format
 msgid "Create \"%s\""
 msgstr "Opprett \"%s\""
 
-#: mail/mail-ops.c:1903
+#: mail/mail-ops.c:1904
 msgid "Exception while reporting result to shell component listener."
 msgstr "Unntak under rapportering av resultat til skallkomponentens lytter."
 
-#: mail/mail-ops.c:1949
+#: mail/mail-ops.c:1950
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr "Synkroniserer \"%s\""
 
-#: mail/mail-ops.c:1951
+#: mail/mail-ops.c:1952
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr "Synkronisér \"%s\""
 
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2017
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr "Viser melding-UID \"%s\""
 
-#: mail/mail-ops.c:2018
+#: mail/mail-ops.c:2020
 msgid "Clearing message display"
 msgstr "Tømmer meldingsvisning"
 
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:2023
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr "Vis meldings-UID \"%s\""
 
-#: mail/mail-ops.c:2024
+#: mail/mail-ops.c:2026
 msgid "Clear message display"
 msgstr "Tøm meldingsvisning"
 
-#: mail/mail-ops.c:2137
+#: mail/mail-ops.c:2217
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr "Åpner meldinger fra mappe \"%s\""
 
-#: mail/mail-ops.c:2140
+#: mail/mail-ops.c:2220
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr "Åpne meldinger fra \"%s\""
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2324
 #, c-format
 msgid "Loading %s Folder"
 msgstr "Laster %s-mappe"
 
-#: mail/mail-ops.c:2246
+#: mail/mail-ops.c:2326
 #, c-format
 msgid "Load %s Folder"
 msgstr "Last %s-mappe"
 
-#: mail/mail-ops.c:2310
+#: mail/mail-ops.c:2390
 #, c-format
 msgid "Viewing messages from folder \"%s\""
 msgstr "Viser meldinger fra mappe \"%s\""
 
-#: mail/mail-ops.c:2313
+#: mail/mail-ops.c:2393
 #, c-format
 msgid "View messages from \"%s\""
 msgstr "Vis meldinger fra \"%s\""
 
-#: mail/mail-ops.c:2346
+#: mail/mail-ops.c:2426
 #, c-format
 msgid "Retrieving message %d of %d (uid \"%s\")"
 msgstr "Henter melding %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:2437
+#: mail/mail-ops.c:2517
 #, c-format
 msgid "Saving messages from folder \"%s\""
 msgstr "Lagrer meldinger fra mappe \"%s\""
 
-#: mail/mail-ops.c:2440
+#: mail/mail-ops.c:2520
 #, c-format
 msgid "Save messages from folder \"%s\""
 msgstr "Lagre meldinger fra mappe \"%s\""
 
-#: mail/mail-ops.c:2483
+#: mail/mail-ops.c:2563
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Lagrer melding %d av %d (uid \"%s\")"
@@ -5046,30 +5017,30 @@ msgstr "Henter melding %d av %d"
 msgid "Writing message %d of %d"
 msgstr "Skriver melding %d av %d"
 
-#: mail/mail-tools.c:343
+#: mail/mail-tools.c:346
 #, c-format
 msgid "Saving changes to %s"
 msgstr "Lagrer endringer til %s"
 
-#: mail/mail-tools.c:380
+#: mail/mail-tools.c:383
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (videresendt melding)"
 
-#: mail/mail-tools.c:390
+#: mail/mail-tools.c:393
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (uten emne)"
 
-#: mail/mail-tools.c:429
+#: mail/mail-tools.c:432
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Videresendt melding - %s"
 
-#: mail/mail-tools.c:431
+#: mail/mail-tools.c:434
 msgid "Forwarded message (no subject)"
 msgstr "Videresendt melding (uten emne)"
 
-#: mail/mail-tools.c:534
+#: mail/mail-tools.c:537
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -5088,62 +5059,86 @@ msgstr "Ny VFolder"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:37
+#: mail/mail-view.c:148 po/tmp/evolution-mail.xml.h:37
 msgid "Reply"
 msgstr "Svar"
 
-#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:42
+#: mail/mail-view.c:148 po/tmp/evolution-mail.xml.h:42
 msgid "Reply to the sender of this message"
 msgstr "Svar til avsender av denne meldingen"
 
-#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:41
+#: mail/mail-view.c:151 po/tmp/evolution-mail.xml.h:41
 msgid "Reply to all recipients of this message"
 msgstr "Svar til alle mottakere av denne meldingen"
 
-#: mail/mail-view.c:159 po/tmp/evolution-mail.xml.h:19
+#: mail/mail-view.c:154 po/tmp/evolution-mail.xml.h:19
 msgid "Forward this message"
 msgstr "Videresend denne meldingen"
 
-#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:36
+#: mail/mail-view.c:158 po/tmp/evolution-mail.xml.h:36
 msgid "Print the selected message"
 msgstr "Skriv ut den valgte meldingen"
 
-#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
+#: mail/mail-view.c:160 po/tmp/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "Slett denne meldingen"
 
-#: mail/message-list.c:575
+#: mail/message-list.c:590
 msgid "Unseen"
 msgstr "Ulest"
 
-#: mail/message-list.c:578
+#: mail/message-list.c:593
 msgid "Seen"
 msgstr "Lest"
 
-#: mail/message-list.c:581
+#: mail/message-list.c:596
 msgid "Answered"
 msgstr "Besvart"
 
-#: mail/message-list.c:849
+#: mail/message-list.c:881
 #, 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:861 mail/message-list.c:876
+#: mail/message-list.c:893 mail/message-list.c:909
 #, c-format
 msgid "%s, et al."
 msgstr "%s, et al."
 
-#: mail/message-list.c:863 mail/message-list.c:878
+#: mail/message-list.c:896 mail/message-list.c:912
 msgid "<unknown>"
 msgstr "<ukjent>"
 
-#: mail/message-list.c:2253
+#: mail/message-list.c:965
+msgid "?"
+msgstr "?"
+
+#: mail/message-list.c:972
+msgid "Today %l:%M %p"
+msgstr "Idag %l:%M %p"
+
+#: mail/message-list.c:981
+msgid "Yesterday %l:%M %p"
+msgstr "I går %l:%M %p"
+
+#: mail/message-list.c:993
+msgid "%a %l:%M %p"
+msgstr "%a %l:%M %p"
+
+#: mail/message-list.c:1001
+msgid "%b %d %l:%M %p"
+msgstr "%b %d %l:%M %p"
+
+#: mail/message-list.c:1003
+msgid "%b %d %Y"
+msgstr "%b %d %Y"
+
+#: mail/message-list.c:2347
 msgid "Rebuilding message view"
 msgstr "Bygger opp meldingsvisningen på nytt"
 
-#: mail/message-list.c:2255
+#: mail/message-list.c:2349
 msgid "Rebuild message view"
 msgstr "Gjenoppbygg meldingsvisningen"
 
@@ -6263,12 +6258,12 @@ msgid "Hide _Selected messages"
 msgstr "_Skjul valgte meldinger"
 
 #: po/tmp/evolution-mail.xml.h:25
-msgid "Mail _Filters"
-msgstr "E-post _filtre"
+msgid "Mail _Filters..."
+msgstr "E-post _filtre..."
 
 #: po/tmp/evolution-mail.xml.h:26
-msgid "Manage Subscriptions"
-msgstr "Håndtér abonnement"
+msgid "Manage Subscriptions..."
+msgstr "Håndtér abonnement..."
 
 #: po/tmp/evolution-mail.xml.h:27
 msgid "Mar_k As Read"
@@ -6371,8 +6366,8 @@ msgid "_Invert Selection"
 msgstr "Re_versér utvalg"
 
 #: po/tmp/evolution-mail.xml.h:59
-msgid "_Mail Configuration"
-msgstr "E-post-ko_nfigurasjon"
+msgid "_Mail Configuration..."
+msgstr "_E-post konfigurasjon..."
 
 #: po/tmp/evolution-mail.xml.h:60
 msgid "_Message"
@@ -6411,8 +6406,8 @@ msgid "_VFolder on Subject"
 msgstr "_VFolder for emne"
 
 #: po/tmp/evolution-mail.xml.h:69
-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.
@@ -6743,12 +6738,12 @@ msgstr "Alle deltakere"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:416
+#: widgets/misc/e-calendar-item.c:421
 msgid "MTWTFSS"
 msgstr "MTWTFSS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -6777,6 +6772,36 @@ msgstr "%I:%M %p"
 msgid "Group %i"
 msgstr "Gruppe %i"
 
+#~ msgid "appointment"
+#~ msgstr "avtaler"
+
+#~ msgid "task"
+#~ msgstr "oppgave"
+
+#~ msgid "journal entry"
+#~ msgstr "journaloppføring"
+
+#~ msgid "Year:"
+#~ msgstr "År:"
+
+#~ msgid "Go to date"
+#~ msgstr "Gå til dato"
+
+#~ msgid ""
+#~ "Please select the date you want to go to.\n"
+#~ "When you click on a day, you will be taken\n"
+#~ "to that date."
+#~ msgstr ""
+#~ "Vennligst velg datoen du vil gå til.\n"
+#~ "Når du klikker på en dag vil du flytte\n"
+#~ "deg til denne datoen."
+
+#~ msgid "Go to today"
+#~ msgstr "Gå til idag"
+
+#~ msgid "_Mail Configuration"
+#~ msgstr "E-post-ko_nfigurasjon"
+
 #~ msgid "_Save Calendar As"
 #~ msgstr "Lagre kalender _som"
 
@@ -7012,9 +7037,6 @@ msgstr "Gruppe %i"
 #~ msgid "_Open"
 #~ msgstr "_Åpne"
 
-#~ msgid "_Mail Configuration..."
-#~ msgstr "_E-post konfigurasjon..."
-
 #~ msgid "Create a new folder"
 #~ msgstr "Opprett en ny mappe"