Updated Norwegian translation.

2001-07-11  Kjartan Maraas  <kmaraas@gnome.org>

	* no.po: Updated Norwegian translation.

svn path=/trunk/; revision=11006

3 files changed, 545 insertions, 507 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index cdef759b3e..d465a306f4 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-11  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* no.po: Updated Norwegian translation.
+	
 2001-07-11  Hector Garcia Alvarez <hector@scouts-es.org>
 
         * es.po: Updated Spanish translation.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b8a5eec16d..1b157807a4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -68,6 +68,7 @@ calendar/gui/dialogs/e-timezone-dialog.glade
 calendar/gui/dialogs/event-editor.c
 calendar/gui/dialogs/event-page.glade
 calendar/gui/dialogs/meeting-page.c
+calendar/gui/dialogs/meeting-page.etspec
 calendar/gui/dialogs/meeting-page.glade
 calendar/gui/dialogs/recurrence-page.c
 calendar/gui/dialogs/recurrence-page.glade
@@ -77,6 +78,7 @@ calendar/gui/dialogs/task-details-page.glade
 calendar/gui/dialogs/task-editor.c
 calendar/gui/dialogs/task-page.glade
 calendar/gui/e-calendar-table.c
+calendar/gui/e-calendar-table.etspec
 calendar/gui/e-day-view-time-item.c
 calendar/gui/e-day-view-top-item.c
 calendar/gui/e-day-view.c
diff --git a/po/no.po b/po/no.po
index c02ee710d8..cff2b0176e 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-applets 1.4.1\n"
-"POT-Creation-Date: 2001-07-10 21:47+0200\n"
-"PO-Revision-Date: 2001-07-10 01:50+0200\n"
+"POT-Creation-Date: 2001-07-11 15:50+0200\n"
+"PO-Revision-Date: 2001-07-11 15:20+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -553,7 +553,7 @@ msgstr "Adressebok-kilder"
 #: addressbook/gui/widgets/e-addressbook-view.c:606
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 #: calendar/gui/dialogs/recurrence-page.glade.h:5 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:8 mail/mail-config.glade.h:27
+#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:27
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-mail-message.xml.h:16 ui/evolution-tasks.xml.h:5
 msgid "Delete"
@@ -836,9 +836,9 @@ msgid "_Company:"
 msgstr "_Firma:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:1293 mail/mail-config.glade.h:103
-#: ui/evolution-mail-message.xml.h:78 ui/evolution-tasks.xml.h:15
-#: ui/evolution.xml.h:45
+#: calendar/gui/dialogs/meeting-page.c:1195 mail/folder-browser.c:1290
+#: mail/mail-config.glade.h:103 ui/evolution-mail-message.xml.h:78
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Slett"
 
@@ -1757,71 +1757,48 @@ msgstr "Alarm-tjeneste"
 msgid "Factory for the alarm notification service"
 msgstr "Factory for alarm-tjenesten"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:153
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
 #, c-format
 msgid "Notification about your appointment starting on %s and ending on %s"
 msgstr "Melding om din avtale på som starter %s og slutter %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:157
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
 #, c-format
 msgid "Notification about your appointment starting on %s"
 msgstr "Melding om din avtale som starter %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:162
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
 #, c-format
 msgid "Notification about your appointment ending on %s"
 msgstr "Melding om din avtale som slutter %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:166
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
 msgid "Notification about your appointment"
 msgstr "Melding om din avtale"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:173
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
 #, c-format
 msgid "Notification about your task starting on %s and ending on %s"
 msgstr "Melding om din oppgave som starter %s og slutter %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:177
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
 #, c-format
 msgid "Notification about your task starting on %s"
 msgstr "Melding om din oppgave som starter %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:182
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
 #, c-format
 msgid "Notification about your task ending on %s"
 msgstr "Melding om din oppgave som slutter %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:186
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
 msgid "Notification about your task"
 msgstr "Melding om din oppgave"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:193
-#, c-format
-msgid "Notification about your journal entry starting on %s and ending on %s"
-msgstr "Melding om din journaloppføring som starter %s og slutter %s"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:197
-#, c-format
-msgid "Notification about your journal entry starting on %s"
-msgstr "Melding om din journaloppføring som starter %s"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:202
-#, c-format
-msgid "Notification about your journal entry ending on %s"
-msgstr "Melding om din journaloppføring som slutter %s"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:206
-msgid "Notification about your journal entry"
-msgstr "Melding om din journaloppføring"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:285
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Alarm på %A %b %d %Y %H:%M"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:301
-msgid "No summary available."
-msgstr "Ingen sammendrag tilgjengelig."
-
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
@@ -1836,7 +1813,7 @@ msgid "Edit appointment"
 msgstr "Rediger avtale:"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: calendar/gui/alarm-notify/alarm-queue.c:914
+#: calendar/gui/alarm-notify/alarm-queue.c:991
 msgid "Snooze"
 msgstr "Utsett"
 
@@ -1844,15 +1821,19 @@ msgstr "Utsett"
 msgid "Snooze time (minutes)"
 msgstr "Utsett-tid (minutter)"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:623
-#: calendar/gui/alarm-notify/alarm-queue.c:922
-#: calendar/gui/alarm-notify/alarm-queue.c:978
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+msgid "No description available."
+msgstr "Ingen beskrivelse tilgjengelig."
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
 msgid "Reminder of your appointment at "
 msgstr "Påminnelse om din avtale "
 
 #. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:927
-#: calendar/gui/alarm-notify/alarm-queue.c:982
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
 msgid "Ok"
 msgstr "Ok"
 
@@ -1895,109 +1876,109 @@ msgstr ""
 "Kunne ikke opprette kalendervisning. Vennligst sjekk din ORBit og OAF "
 "konfigurasjon."
 
-#: calendar/gui/calendar-model.c:379 calendar/gui/calendar-model.c:974
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:989
+#: calendar/gui/e-calendar-table.c:346
 msgid "Public"
 msgstr "Offentlig"
 
-#: calendar/gui/calendar-model.c:382 calendar/gui/calendar-model.c:976
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:386 calendar/gui/calendar-model.c:991
+#: calendar/gui/e-calendar-table.c:347
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:385 calendar/gui/calendar-model.c:978
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:389 calendar/gui/calendar-model.c:993
+#: calendar/gui/e-calendar-table.c:348
 msgid "Confidential"
 msgstr "Konfidensiell"
 
-#: calendar/gui/calendar-model.c:388 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/calendar-model.c:392 calendar/gui/dialogs/alarm-page.c:349
 #: calendar/gui/dialogs/alarm-page.c:385
 #: camel/providers/smtp/camel-smtp-transport.c:222
 #: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: calendar/gui/calendar-model.c:479
+#: calendar/gui/calendar-model.c:489
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:479
+#: calendar/gui/calendar-model.c:489
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:481
+#: calendar/gui/calendar-model.c:491
 msgid "E"
 msgstr "Ø"
 
-#: calendar/gui/calendar-model.c:481
+#: calendar/gui/calendar-model.c:491
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:519 calendar/gui/calendar-model.c:1150
+#: calendar/gui/calendar-model.c:529 calendar/gui/calendar-model.c:1175
 #: calendar/gui/dialogs/task-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:448 mail/message-list.c:625
+#: calendar/gui/e-calendar-table.c:368 mail/message-list.c:625
 msgid "High"
 msgstr "Høy"
 
-#: calendar/gui/calendar-model.c:521 calendar/gui/calendar-model.c:1152
-#: calendar/gui/calendar-model.c:1675
+#: calendar/gui/calendar-model.c:531 calendar/gui/calendar-model.c:1177
+#: calendar/gui/calendar-model.c:1700
 #: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:449 mail/message-list.c:624
+#: calendar/gui/e-calendar-table.c:369 mail/message-list.c:624
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:523 calendar/gui/calendar-model.c:1154
+#: calendar/gui/calendar-model.c:533 calendar/gui/calendar-model.c:1179
 #: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:450 mail/message-list.c:623
+#: calendar/gui/e-calendar-table.c:370 mail/message-list.c:623
 msgid "Low"
 msgstr "Lav"
 
-#: calendar/gui/calendar-model.c:559 calendar/gui/calendar-model.c:1206
-#: calendar/gui/e-calendar-table.c:502
+#: calendar/gui/calendar-model.c:569 calendar/gui/calendar-model.c:1231
+#: calendar/gui/e-calendar-table.c:422
 msgid "Transparent"
 msgstr "Gjennomsiktig"
 
-#: calendar/gui/calendar-model.c:562 calendar/gui/calendar-model.c:1208
-#: calendar/gui/e-calendar-table.c:501
+#: calendar/gui/calendar-model.c:572 calendar/gui/calendar-model.c:1233
+#: calendar/gui/e-calendar-table.c:421
 msgid "Opaque"
 msgstr "Ugjennomsiktig"
 
-#: calendar/gui/calendar-model.c:711 calendar/gui/calendar-model.c:1260
+#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1285
 #: calendar/gui/dialogs/task-page.glade.h:12
-#: calendar/gui/e-calendar-table.c:522
+#: calendar/gui/e-calendar-table.c:442
 msgid "Not Started"
 msgstr "Ikke startet"
 
-#: calendar/gui/calendar-model.c:714 calendar/gui/calendar-model.c:1262
+#: calendar/gui/calendar-model.c:729 calendar/gui/calendar-model.c:1287
 #: calendar/gui/dialogs/task-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:523
+#: calendar/gui/e-calendar-table.c:443
 msgid "In Progress"
 msgstr "Under arbeid"
 
-#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1264
+#: calendar/gui/calendar-model.c:732 calendar/gui/calendar-model.c:1289
 #: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:524
+#: calendar/gui/e-calendar-table.c:444
 msgid "Completed"
 msgstr "Fullført"
 
-#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1266
+#: calendar/gui/calendar-model.c:735 calendar/gui/calendar-model.c:1291
 #: calendar/gui/dialogs/task-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:525 camel/camel-service.c:544
+#: calendar/gui/e-calendar-table.c:445 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Avbrutt"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:870 e-util/e-time-utils.c:267
+#: calendar/gui/calendar-model.c:885 e-util/e-time-utils.c:267
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d.%m.%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:873 e-util/e-time-utils.c:276
+#: calendar/gui/calendar-model.c:888 e-util/e-time-utils.c:276
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d.%m.%Y %H:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:878
+#: calendar/gui/calendar-model.c:893
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -2008,7 +1989,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:958
+#: calendar/gui/calendar-model.c:973
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
@@ -2016,20 +1997,20 @@ msgstr ""
 "'Ingen'"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:972 calendar/gui/calendar-model.c:1204
-#: calendar/gui/calendar-model.c:1258
+#: calendar/gui/calendar-model.c:987 calendar/gui/calendar-model.c:1229
+#: calendar/gui/calendar-model.c:1283
 #: calendar/gui/dialogs/e-timezone-dialog.c:197
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:425 calendar/gui/e-calendar-table.c:500
+#: calendar/gui/e-calendar-table.c:345 calendar/gui/e-calendar-table.c:420
 #: mail/mail-account-gui.c:1360 mail/mail-accounts.c:129
 #: mail/mail-accounts.c:380 mail/mail-config.glade.h:56
-#: shell/e-shell-view.c:1402 widgets/misc/e-cell-date-edit.c:240
+#: shell/e-shell-view.c:1406 widgets/misc/e-cell-date-edit.c:240
 #: widgets/misc/e-dateedit.c:439 widgets/misc/e-dateedit.c:1369
 #: widgets/misc/e-dateedit.c:1484
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/calendar-model.c:1054
+#: calendar/gui/calendar-model.c:1079
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -2039,40 +2020,40 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1094
+#: calendar/gui/calendar-model.c:1119
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Prosentverdien må være mellom 0 og 100, inklusive"
 
-#: calendar/gui/calendar-model.c:1135
+#: calendar/gui/calendar-model.c:1160
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr "Prioriteten må være en av 'Høy', 'Normal', 'Lav' eller 'Udefinert'."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1148
+#: calendar/gui/calendar-model.c:1173
 #: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:451
+#: calendar/gui/e-calendar-table.c:371
 msgid "Undefined"
 msgstr "Udefinert"
 
-#: calendar/gui/calendar-model.c:1189
+#: calendar/gui/calendar-model.c:1214
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 "Gjennomsiktigheten må være en av 'Gjennomsiktig', 'Ugjennomsiktig' eller "
 "\"Ingen'."
 
-#: calendar/gui/calendar-model.c:1677
+#: calendar/gui/calendar-model.c:1702
 msgid "Recurring"
 msgstr "Gjeninntreffer"
 
-#: calendar/gui/calendar-model.c:1679
+#: calendar/gui/calendar-model.c:1704
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: calendar/gui/calendar-model.c:1685
+#: calendar/gui/calendar-model.c:1710
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1685
+#: calendar/gui/calendar-model.c:1710
 msgid "No"
 msgstr "Nei"
 
@@ -2270,11 +2251,12 @@ msgstr "Påminnelser"
 msgid "Summary:"
 msgstr "Sammendrag:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:35
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
 msgid "after"
 msgstr "etter"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:36
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
 msgid "before"
 msgstr "før"
 
@@ -2293,7 +2275,7 @@ msgstr "time(r)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:105
 msgid "minute(s)"
-msgstr "minutt"
+msgstr "minutt(er)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:18
 msgid "start of appointment"
@@ -2559,60 +2541,60 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Du har ikke gjort endringer. Oppdater redigering?"
 
-#: calendar/gui/dialogs/comp-editor-util.c:155
-#: calendar/gui/e-itip-control.c:546 calendar/gui/print.c:2237
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:546 calendar/gui/print.c:2115
 msgid " to "
 msgstr " til "
 
-#: calendar/gui/dialogs/comp-editor-util.c:159
-#: calendar/gui/e-itip-control.c:550 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:550 calendar/gui/print.c:2119
 msgid " (Completed "
 msgstr " (Fullført "
 
-#: calendar/gui/dialogs/comp-editor-util.c:161
-#: calendar/gui/e-itip-control.c:552 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:552 calendar/gui/print.c:2121
 msgid "Completed "
 msgstr "Fullført "
 
-#: calendar/gui/dialogs/comp-editor-util.c:166
-#: calendar/gui/e-itip-control.c:557 calendar/gui/print.c:2248
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:557 calendar/gui/print.c:2126
 msgid " (Due "
 msgstr " (Ferdig "
 
-#: calendar/gui/dialogs/comp-editor-util.c:168
-#: calendar/gui/e-itip-control.c:559 calendar/gui/print.c:2250
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:559 calendar/gui/print.c:2128
 msgid "Due "
 msgstr "Ferdig "
 
-#: calendar/gui/dialogs/comp-editor.c:448
+#: calendar/gui/dialogs/comp-editor.c:449
 msgid "Edit Appointment"
 msgstr "Rediger avtale"
 
-#: calendar/gui/dialogs/comp-editor.c:453
+#: calendar/gui/dialogs/comp-editor.c:454
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:456
+#: calendar/gui/dialogs/comp-editor.c:457
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgave - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:459
+#: calendar/gui/dialogs/comp-editor.c:460
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaloppføring - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:473
+#: calendar/gui/dialogs/comp-editor.c:474
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/comp-editor.c:805 mail/mail-callbacks.c:1462
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1462
 #: mail/mail-display.c:98
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
-#: calendar/gui/dialogs/comp-editor.c:809 mail/mail-callbacks.c:1466
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1466
 #: mail/mail-display.c:102
 msgid ""
 "A file by that name already exists.\n"
@@ -2621,12 +2603,12 @@ msgstr ""
 "En fil med samme navn eksisterer allerede.\n"
 "Overskriv den?"
 
-#: calendar/gui/dialogs/comp-editor.c:872 ui/evolution-comp-editor.xml.h:14
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
 #: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Lagre som..."
 
-#: calendar/gui/dialogs/comp-editor.c:1025
+#: calendar/gui/dialogs/comp-editor.c:1026
 msgid "Unable to obtain current version!"
 msgstr "Kan ikke hente versjonsdata!"
 
@@ -2717,7 +2699,7 @@ msgstr "Varer he_le dagen"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
 #: calendar/gui/dialogs/task-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:248
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Klassifisering"
 
@@ -2759,10 +2741,50 @@ msgstr "S_lutt-tid:"
 msgid "_Start time:"
 msgstr "_Start-tid:"
 
-#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:613
 msgid "Sent By:"
 msgstr "Sendt av:"
 
+#: calendar/gui/dialogs/meeting-page.c:1190
+msgid "_Delegate To..."
+msgstr "_Deleger til..."
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+msgid "Attendee"
+msgstr "Deltaker"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+msgid "Common Name"
+msgstr "Vanlig navn"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+msgid "Language"
+msgstr "Språk"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+msgid "Member"
+msgstr "Medlem"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+msgid "Role"
+msgstr "Rolle"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:50
+#: mail/message-list.etspec.h:8
+msgid "Status"
+msgstr "Status"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:96
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "Type"
+
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 msgid "Change Organizer"
 msgstr "Endre organisator"
@@ -2781,8 +2803,8 @@ msgstr "Organisator:"
 msgid "Other Organizer"
 msgstr "Annen organisator"
 
-#: calendar/gui/dialogs/recurrence-page.c:434 calendar/gui/print.c:1978
-#: calendar/gui/print.c:1980 calendar/gui/print.c:1981
+#: calendar/gui/dialogs/recurrence-page.c:434 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
@@ -2933,155 +2955,165 @@ msgstr "_Prioritet:"
 msgid "_Status:"
 msgstr "_Status:"
 
-#: calendar/gui/e-calendar-table.c:247
-msgid "Categories"
-msgstr "Kategorier"
-
-#: calendar/gui/e-calendar-table.c:249
-msgid "Completion Date"
-msgstr "Fullført dato"
-
-#: calendar/gui/e-calendar-table.c:250
-msgid "End Date"
-msgstr "Sluttdato"
-
-#: calendar/gui/e-calendar-table.c:251
-msgid "Start Date"
-msgstr "Startdato"
-
-#: calendar/gui/e-calendar-table.c:252
-msgid "Due Date"
-msgstr "Ferdig-dato"
-
-#: calendar/gui/e-calendar-table.c:253
-msgid "Geographical Position"
-msgstr "Geografisk plassering"
-
-#: calendar/gui/e-calendar-table.c:254
-msgid "Percent complete"
-msgstr "Prosent fullført"
-
-#: calendar/gui/e-calendar-table.c:255
-msgid "Priority"
-msgstr "Prioritet"
-
-#: calendar/gui/e-calendar-table.c:256
-msgid "Summary"
-msgstr "Sammendrag"
-
-#: calendar/gui/e-calendar-table.c:257
-msgid "Transparency"
-msgstr "Gjennomsiktighet"
-
-#: calendar/gui/e-calendar-table.c:258
-msgid "URL"
-msgstr "URL"
-
-#: calendar/gui/e-calendar-table.c:259
-msgid "Alarms"
-msgstr "Alarmer"
-
-#: calendar/gui/e-calendar-table.c:260
-msgid "Click here to add a task"
-msgstr "Klikk her for å legge til en oppgave"
-
-#: calendar/gui/e-calendar-table.c:470
+#: calendar/gui/e-calendar-table.c:390
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-calendar-table.c:391
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:472
+#: calendar/gui/e-calendar-table.c:392
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:473
+#: calendar/gui/e-calendar-table.c:393
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:474
+#: calendar/gui/e-calendar-table.c:394
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:475
+#: calendar/gui/e-calendar-table.c:395
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-calendar-table.c:396
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:477
+#: calendar/gui/e-calendar-table.c:397
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:478
+#: calendar/gui/e-calendar-table.c:398
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:479
+#: calendar/gui/e-calendar-table.c:399
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:480
+#: calendar/gui/e-calendar-table.c:400
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:957
+#: calendar/gui/e-calendar-table.c:879
 msgid "Edit this task"
 msgstr "Rediger denne oppgaven"
 
-#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-calendar-table.c:968
-#: calendar/gui/e-day-view.c:3325 calendar/gui/e-week-view.c:3161
+#: calendar/gui/e-calendar-table.c:880 calendar/gui/e-calendar-table.c:890
+#: calendar/gui/e-day-view.c:3332 calendar/gui/e-week-view.c:3165
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-calendar.xml.h:10
 #: ui/evolution-mail-list.xml.h:4
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: calendar/gui/e-calendar-table.c:959 calendar/gui/e-calendar-table.c:969
-#: calendar/gui/e-day-view.c:3327 calendar/gui/e-week-view.c:3163
+#: calendar/gui/e-calendar-table.c:881 calendar/gui/e-calendar-table.c:891
+#: calendar/gui/e-day-view.c:3334 calendar/gui/e-week-view.c:3167
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-calendar.xml.h:5
 #: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:5
 msgid "Copy"
 msgstr "Kopier"
 
-#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-calendar-table.c:970
-#: calendar/gui/e-day-view.c:3300 calendar/gui/e-day-view.c:3329
-#: calendar/gui/e-week-view.c:3137 calendar/gui/e-week-view.c:3165
+#: calendar/gui/e-calendar-table.c:882 calendar/gui/e-calendar-table.c:892
+#: calendar/gui/e-day-view.c:3307 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3141 calendar/gui/e-week-view.c:3169
 #: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:26
 #: ui/evolution-mail-list.xml.h:12
 msgid "Paste"
 msgstr "Lim inn"
 
-#: calendar/gui/e-calendar-table.c:962
+#: calendar/gui/e-calendar-table.c:884
 msgid "Mark as complete"
 msgstr "Merk som fullført"
 
-#: calendar/gui/e-calendar-table.c:963
+#: calendar/gui/e-calendar-table.c:885
 msgid "Delete this task"
 msgstr "Slett denne oppgaven"
 
-#: calendar/gui/e-calendar-table.c:972
+#: calendar/gui/e-calendar-table.c:894
 msgid "Mark tasks as complete"
 msgstr "Merk oppgaven som fullført"
 
-#: calendar/gui/e-calendar-table.c:973 ui/evolution-tasks.xml.h:6
+#: calendar/gui/e-calendar-table.c:895 ui/evolution-tasks.xml.h:6
 msgid "Delete selected tasks"
 msgstr "Slett valgte oppgaver"
 
+#: calendar/gui/e-calendar-table.c:1242
+msgid "Click here to add a task"
+msgstr "Klikk her for å legge til en oppgave"
+
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
+msgstr "% ferdig"
+
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
+msgstr "Alarmer"
+
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategorier"
+
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:692
+#: camel/camel-filter-driver.c:804
+msgid "Complete"
+msgstr "Fullført"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
+msgstr "Fullført dato"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
+msgstr "Ferdig-dato"
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
+msgstr "Sluttdato"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr "Geografisk plassering"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "Prioritet"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
+msgstr "Startdato"
+
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
+msgstr "Sammendrag"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
+msgid "Task sort"
+msgstr "Oppgavesortering"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
+msgstr "Gjennomsiktighet"
+
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL"
+
 #: calendar/gui/e-day-view-time-item.c:519
 #, c-format
 msgid "%02i minute divisions"
@@ -3089,72 +3121,72 @@ 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:285 calendar/gui/e-day-view.c:1328
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1602
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 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:289 calendar/gui/e-day-view.c:1342
+#: calendar/gui/e-day-view-top-item.c:289 calendar/gui/e-day-view.c:1344
 #: 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:293 calendar/gui/e-day-view.c:1355
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:575 calendar/gui/e-week-view.c:308
-#: calendar/gui/print.c:785
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:308
+#: calendar/gui/print.c:759
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:578 calendar/gui/e-week-view.c:311
-#: calendar/gui/print.c:787
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:311
+#: calendar/gui/print.c:761
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3305 ui/evolution-calendar.xml.h:21
+#: calendar/gui/e-day-view.c:3312 ui/evolution-calendar.xml.h:21
 msgid "New Appointment"
 msgstr "Ny avtale"
 
-#: calendar/gui/e-day-view.c:3307 calendar/gui/e-week-view.c:3144
+#: calendar/gui/e-day-view.c:3314 calendar/gui/e-week-view.c:3148
 msgid "New All Day Event"
 msgstr "Ny avtale som varer hele dagen"
 
-#: calendar/gui/e-day-view.c:3312 calendar/gui/e-week-view.c:3149
+#: calendar/gui/e-day-view.c:3319 calendar/gui/e-week-view.c:3153
 msgid "Go to Today"
 msgstr "Gå til idag"
 
-#: calendar/gui/e-day-view.c:3314 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-day-view.c:3321 calendar/gui/e-week-view.c:3155
 msgid "Go to Date..."
 msgstr "Gå til dato..."
 
-#: calendar/gui/e-day-view.c:3321 calendar/gui/e-week-view.c:3157
+#: calendar/gui/e-day-view.c:3328 calendar/gui/e-week-view.c:3161
 #: shell/e-shortcuts-view.c:468 ui/evolution-calendar.xml.h:24
 #: ui/evolution-message-composer.xml.h:12
 msgid "Open"
 msgstr "Åpne"
 
-#: calendar/gui/e-day-view.c:3323 calendar/gui/e-week-view.c:3159
+#: calendar/gui/e-day-view.c:3330 calendar/gui/e-week-view.c:3163
 msgid "Delete this Appointment"
 msgstr "Slett denne avtalen"
 
-#: calendar/gui/e-day-view.c:3338 calendar/gui/e-week-view.c:3179
+#: calendar/gui/e-day-view.c:3345 calendar/gui/e-week-view.c:3183
 msgid "Make this Occurrence Movable"
 msgstr "Gjør denne avtalen flyttbar"
 
-#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3181
+#: calendar/gui/e-day-view.c:3347 calendar/gui/e-week-view.c:3185
 msgid "Delete this Occurrence"
 msgstr "Slett denne oppføringen"
 
-#: calendar/gui/e-day-view.c:3342
+#: calendar/gui/e-day-view.c:3349
 msgid "Delete all Occurrences"
 msgstr "Slett alle oppføringer"
 
@@ -3298,16 +3330,16 @@ msgstr "Metoden som er nødvendig for å laste `%s' er ikke støttet"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1586
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
 #: my-evolution/e-summary-calendar.c:230
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/e-week-view.c:3142 calendar/gui/e-week-view.c:3170
+#: calendar/gui/e-week-view.c:3146 calendar/gui/e-week-view.c:3174
 msgid "New Appointment..."
 msgstr "Ny avtale..."
 
-#: calendar/gui/e-week-view.c:3183
+#: calendar/gui/e-week-view.c:3187
 msgid "Delete All Occurrences"
 msgstr "Slett alle oppføringer"
 
@@ -3327,12 +3359,12 @@ msgstr "Kommentar inneholder"
 msgid "Has category"
 msgstr "Har kategori"
 
-#: calendar/gui/gnome-cal.c:1054
+#: calendar/gui/gnome-cal.c:1060
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kunne ikke åpne mappen i `%s'"
 
-#: calendar/gui/gnome-cal.c:1065
+#: calendar/gui/gnome-cal.c:1071
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoden som er nødvendig for å åpne `%s' er ikke støttet"
@@ -3397,208 +3429,208 @@ msgstr "September"
 msgid "An organizer must be set."
 msgstr "En organisator må oppgis."
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:457
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:516
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "Søn"
 
-#: calendar/gui/print.c:516
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "Man"
 
-#: calendar/gui/print.c:516
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "Tir"
 
-#: calendar/gui/print.c:516
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "Ons"
 
-#: calendar/gui/print.c:517
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "Tor"
 
-#: calendar/gui/print.c:517
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "Fre"
 
-#: calendar/gui/print.c:517
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "Lør"
 
-#: calendar/gui/print.c:1847 my-evolution/e-summary-tasks.c:156
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:156
 #: my-evolution/e-summary-tasks.c:172 shell/e-shortcuts.c:1015
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Oppgaver"
 
 #. Day
-#: calendar/gui/print.c:1954
+#: calendar/gui/print.c:1815
 msgid "Current day (%a %b %d %Y)"
 msgstr "I dag (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1973 calendar/gui/print.c:1977
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1974
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1985
+#: calendar/gui/print.c:1846
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr "Denne uken (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1993
+#: calendar/gui/print.c:1854
 msgid "Current month (%b %Y)"
 msgstr "Denne måneden (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:2000
+#: calendar/gui/print.c:1861
 msgid "Current year (%Y)"
 msgstr "Dette året (%Y)"
 
-#: calendar/gui/print.c:2321
+#: calendar/gui/print.c:2199
 msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
-#: calendar/gui/print.c:2409 calendar/gui/print.c:2501
+#: calendar/gui/print.c:2287 calendar/gui/print.c:2379
 #: mail/mail-callbacks.c:1798 my-evolution/e-summary.c:478
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:31
 #: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "Forhåndsvisning av utskrift"
 
-#: calendar/gui/print.c:2438
+#: calendar/gui/print.c:2316
 msgid "Print Item"
 msgstr "Skriv ut oppføring"
 
-#: calendar/gui/print.c:2519
+#: calendar/gui/print.c:2397
 msgid "Print Setup"
 msgstr "Skriveroppsett"
 
@@ -3702,52 +3734,48 @@ msgstr "Du må arbeide tilknyttet for å fullføre denne operasjonen"
 msgid "Syncing folders"
 msgstr "Synkroniserer mapper"
 
-#: camel/camel-filter-driver.c:635
+#: camel/camel-filter-driver.c:637
 msgid "Unable to open spool folder"
 msgstr "Kunne ikke åpne spool-mappen"
 
-#: camel/camel-filter-driver.c:644
+#: camel/camel-filter-driver.c:646
 msgid "Unable to process spool folder"
 msgstr "Kan ikke prosessere spool-mappen"
 
-#: camel/camel-filter-driver.c:658
+#: camel/camel-filter-driver.c:660
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Henter melding %d (%d%%)"
 
-#: camel/camel-filter-driver.c:662 camel/camel-filter-driver.c:672
+#: camel/camel-filter-driver.c:664 camel/camel-filter-driver.c:677
 #, c-format
 msgid "Failed on message %d"
 msgstr "Feilet på melding %d"
 
-#: camel/camel-filter-driver.c:663
+#: camel/camel-filter-driver.c:665
 msgid "Cannot open message"
 msgstr "Kan ikke åpne melding"
 
-#: camel/camel-filter-driver.c:683 camel/camel-filter-driver.c:794
+#: camel/camel-filter-driver.c:688 camel/camel-filter-driver.c:799
 msgid "Syncing folder"
 msgstr "Synkroniserer mappe"
 
-#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:799
-msgid "Complete"
-msgstr "Fullført"
-
-#: camel/camel-filter-driver.c:753
+#: camel/camel-filter-driver.c:758
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Henter melding %d av %d"
 
-#: camel/camel-filter-driver.c:758 camel/camel-filter-driver.c:776
+#: camel/camel-filter-driver.c:763 camel/camel-filter-driver.c:781
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Feilet på melding %d av %d"
 
-#: camel/camel-filter-driver.c:876
+#: camel/camel-filter-driver.c:881
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Feil under lesing av filter: %s: %s"
 
-#: camel/camel-filter-driver.c:882
+#: camel/camel-filter-driver.c:887
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Feil under kjøring av filter: %s: %s"
@@ -3829,56 +3857,56 @@ msgstr "Feil under låsing ved bruk av fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Feil under låsing ved bruk av flock(2): %s"
 
-#: camel/camel-movemail.c:104
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Kunne ikke sjekke e-post fil %s: %s"
 
-#: camel/camel-movemail.c:118
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Kunne ikke åpne postfil %s: %s"
 
-#: camel/camel-movemail.c:126
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Kunne ikke åpne midlertidig postfil %s: %s"
 
-#: camel/camel-movemail.c:151
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Feil under lesing av postfil: %s"
-
-#: camel/camel-movemail.c:162
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Feil under skriving av midlertidig fil: %s"
-
-#: camel/camel-movemail.c:181
+#: camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Kunne ikke lagre post i midlertidig fil %s: %s"
 
-#: camel/camel-movemail.c:211
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Kunne ikke opprette rør: %s"
 
-#: camel/camel-movemail.c:223
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Kunne ikke kjøre fork: %s"
 
-#: camel/camel-movemail.c:261
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail-programmet feilet: %s"
 
-#: camel/camel-movemail.c:262
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(Ukjent feil)"
 
-#: camel/camel-movemail.c:492
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "Feil under lesing av postfil: %s"
+
+#: camel/camel-movemail.c:274
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "Feil under skriving av midlertidig fil: %s"
+
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Feil under kopiering midlertidig meldingsfil: %s"
@@ -4338,7 +4366,7 @@ msgstr "Ser etter nye meldinger"
 msgid "Check for new messages in all folders"
 msgstr "Se etter nye meldinger i alle mapper"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:642
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:646
 msgid "Folders"
 msgstr "Mapper"
 
@@ -4482,7 +4510,7 @@ msgstr "Kunne ikke slette sammendragsfil for mappe `%s': %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Kunne ikke slette indeksfil for mappe `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:404
+#: camel/providers/local/camel-local-summary.c:405
 #: camel/providers/local/camel-spool-summary.c:1153
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Kunne ikke legge til melding i sammendraget: ukjent grunn"
@@ -5532,7 +5560,7 @@ msgstr ""
 
 #: composer/e-msg-composer.c:1169
 msgid ""
-"Evolution has found unsaved files from a previous sesiion.\n"
+"Evolution has found unsaved files from a previous session.\n"
 "Would you like to attempt recovery?"
 msgstr ""
 "Evolution har funnet ikke-lagrede filer fra en tidligere sesjon.\n"
@@ -5894,201 +5922,196 @@ msgstr "med alle lokaleog aktive eksterne mapper"
 msgid "with all local folders"
 msgstr "med alle lokale mapper"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
+#: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "Tilegn farge"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Gi poeng"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 msgid "Attachments"
 msgstr "Vedlegg"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "inneholder"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Dato mottatt"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Dato sendt"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Slettet"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "inneholder ikke"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr "slutter ikke med"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr "eksisterer ikke"
+
+#: filter/libfilter-i18n.h:16
+msgid "does not sound like"
+msgstr "ligner ikke"
+
+#: filter/libfilter-i18n.h:17
+msgid "does not start with"
+msgstr "starter ikke med"
+
+#: filter/libfilter-i18n.h:18
 msgid "Do Not Exist"
 msgstr "Eksisterer ikke"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:19
 msgid "Draft"
 msgstr "Skisse"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:20
+msgid "ends with"
+msgstr "slutter med"
+
+#: filter/libfilter-i18n.h:21
 msgid "Exist"
 msgstr "Eksisterer"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:22
+msgid "exists"
+msgstr "eksisterer"
+
+#: filter/libfilter-i18n.h:23
 msgid "Expression"
 msgstr "Uttrykk"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:24
 msgid "Forward to Address"
 msgstr "Videresend til adresse"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr "Viktig"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:26
+msgid "is"
+msgstr "er"
+
+#: filter/libfilter-i18n.h:27
+msgid "is greater than"
+msgstr "er større enn"
+
+#: filter/libfilter-i18n.h:28
+msgid "is less than"
+msgstr "er mindre enn"
+
+#: filter/libfilter-i18n.h:29
+msgid "is not"
+msgstr "er ikke"
+
+#: filter/libfilter-i18n.h:30
 msgid "Mailing list"
 msgstr "E-postliste"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:31
 msgid "Message Body"
 msgstr "Meldingskropp"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:32
 msgid "Message Header"
 msgstr "Meldingshode"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:33
 msgid "Message was received"
 msgstr "Meldingen ble mottatt"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:34
 msgid "Message was sent"
 msgstr "Meldingen ble sendt"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:35
 msgid "Move to Folder"
 msgstr "Flytt til mappe"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:36
+msgid "on or after"
+msgstr "på eller etter"
+
+#: filter/libfilter-i18n.h:37
+msgid "on or before"
+msgstr "på eller før"
+
+#: filter/libfilter-i18n.h:38
 msgid "Read"
 msgstr "Les"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:39
 msgid "Recipients"
 msgstr "Mottakere"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:40
 msgid "Regex Match"
 msgstr "Treff på vanlig uttrykk"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:41
 msgid "Replied to"
 msgstr "Svart til"
 
-#: filter/libfilter-i18n.h:26 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:6
 msgid "Score"
 msgstr "Poenggi"
 
-#: filter/libfilter-i18n.h:27 mail/mail-callbacks.c:1062
+#: filter/libfilter-i18n.h:43 mail/mail-callbacks.c:1062
 msgid "Sender"
 msgstr "Avsender"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:44
 msgid "Set Status"
 msgstr "Sett status"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:45
 msgid "Size (kB)"
 msgstr "Størrelse (kB)"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:46
+msgid "sounds like"
+msgstr "lyder som"
+
+#: filter/libfilter-i18n.h:47
 msgid "Source Account"
 msgstr "Kildekonto"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:48
 msgid "Specific header"
 msgstr "Spesifikk header"
 
-#: filter/libfilter-i18n.h:32 mail/message-list.etspec.h:8
-msgid "Status"
-msgstr "Status"
+#: filter/libfilter-i18n.h:49
+msgid "starts with"
+msgstr "starter med"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:51
 msgid "Stop Processing"
 msgstr "Stopp behandling"
 
-#: filter/libfilter-i18n.h:34 mail/mail-format.c:861
+#: filter/libfilter-i18n.h:52 mail/mail-format.c:861
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Emne"
 
-#: filter/libfilter-i18n.h:37
-msgid "contains"
-msgstr "inneholder"
-
-#: filter/libfilter-i18n.h:38
-msgid "does not contain"
-msgstr "inneholder ikke"
-
-#: filter/libfilter-i18n.h:39
-msgid "does not end with"
-msgstr "slutter ikke med"
-
-#: filter/libfilter-i18n.h:40
-msgid "does not exist"
-msgstr "eksisterer ikke"
-
-#: filter/libfilter-i18n.h:41
-msgid "does not sound like"
-msgstr "ligner ikke"
-
-#: filter/libfilter-i18n.h:42
-msgid "does not start with"
-msgstr "starter ikke med"
-
-#: filter/libfilter-i18n.h:43
-msgid "ends with"
-msgstr "slutter med"
-
-#: filter/libfilter-i18n.h:44
-msgid "exists"
-msgstr "eksisterer"
-
-#: filter/libfilter-i18n.h:45
-msgid "is greater than"
-msgstr "er større enn"
-
-#: filter/libfilter-i18n.h:46
-msgid "is less than"
-msgstr "er mindre enn"
-
-#: filter/libfilter-i18n.h:47
-msgid "is not"
-msgstr "er ikke"
-
-#: filter/libfilter-i18n.h:48
-msgid "is"
-msgstr "er"
-
-#: filter/libfilter-i18n.h:49
-msgid "on or after"
-msgstr "på eller etter"
-
-#: filter/libfilter-i18n.h:50
-msgid "on or before"
-msgstr "på eller før"
-
-#: filter/libfilter-i18n.h:51
-msgid "sounds like"
-msgstr "lyder som"
-
-#: filter/libfilter-i18n.h:52
-msgid "starts with"
-msgstr "starter med"
-
 #: filter/libfilter-i18n.h:53
 msgid "was after"
 msgstr "var etter"
@@ -6113,28 +6136,19 @@ msgstr "Rediger regel"
 msgid "Score Rules"
 msgstr "Poengregler"
 
-#: importers/elm-importer.c:501 importers/evolution-gnomecard-importer.c:228
-#: importers/netscape-importer.c:751 importers/pine-importer.c:638
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:751 importers/pine-importer.c:627
 #: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
 #: shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Importer"
 
-#: importers/elm-importer.c:506 importers/netscape-importer.c:756
-#: importers/pine-importer.c:643 my-evolution/my-evolution.glade.h:12
+#: importers/elm-importer.c:475 importers/netscape-importer.c:756
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:12
 msgid "Mail"
 msgstr "Post"
 
-#: importers/elm-importer.c:510
-msgid "Elm Aliases"
-msgstr "Elm alias"
-
-#: importers/elm-importer.c:517 importers/pine-importer.c:660
-#: shell/importer/intelligent.c:199
-msgid "Don't ask me again"
-msgstr "Ikke spør meg igjen"
-
-#: importers/elm-importer.c:550
+#: importers/elm-importer.c:498
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -6142,11 +6156,11 @@ msgstr ""
 "Evolution har funnet Elm e-post filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: importers/elm-importer.c:579
+#: importers/elm-importer.c:527
 msgid "Elm mail"
 msgstr "Elm e-post"
 
-#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:653
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
 msgid "Addressbook"
 msgstr "Adressebok"
 
@@ -6158,7 +6172,7 @@ msgstr ""
 "Evolution har funnet GnomeCard filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: importers/netscape-importer.c:761 importers/pine-importer.c:648
+#: importers/netscape-importer.c:761
 msgid "Settings"
 msgstr "Innstillinger"
 
@@ -6170,7 +6184,7 @@ msgstr ""
 "Evolution har funnet Netscape e-post filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: importers/pine-importer.c:697
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -6178,7 +6192,7 @@ msgstr ""
 "Evolution har funnet Pine e-post filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: importers/pine-importer.c:725
+#: importers/pine-importer.c:691
 msgid "Pine mail"
 msgstr "Pine e-post"
 
@@ -6244,121 +6258,121 @@ msgstr "Kunne ikke opprette midlertidig katalog: %s"
 msgid "Store search as vFolder"
 msgstr "Lagre søk som vMappe"
 
-#: mail/folder-browser.c:1227
+#: mail/folder-browser.c:1224
 msgid "VFolder on _Subject"
 msgstr "VFolder på e_mne"
 
-#: mail/folder-browser.c:1230
+#: mail/folder-browser.c:1227
 msgid "VFolder on Se_nder"
 msgstr "VFolder for se_nder"
 
-#: mail/folder-browser.c:1233
+#: mail/folder-browser.c:1230
 msgid "VFolder on _Recipients"
 msgstr "VFolder for mottake_re"
 
-#: mail/folder-browser.c:1236
+#: mail/folder-browser.c:1233
 msgid "VFolder on Mailing _List"
 msgstr "VFolder på e-post_liste"
 
-#: mail/folder-browser.c:1242
+#: mail/folder-browser.c:1239
 msgid "Filter on Sub_ject"
 msgstr "Filtrer på em_ne"
 
-#: mail/folder-browser.c:1245
+#: mail/folder-browser.c:1242
 msgid "Filter on Sen_der"
 msgstr "Filtrer på sen_der"
 
-#: mail/folder-browser.c:1248
+#: mail/folder-browser.c:1245
 msgid "Filter on Re_cipients"
 msgstr "Filtrer på motta_ker"
 
-#: mail/folder-browser.c:1251
+#: mail/folder-browser.c:1248
 msgid "Filter on _Mailing List"
 msgstr "Filtrer på e-_postliste"
 
-#: mail/folder-browser.c:1260
+#: mail/folder-browser.c:1257
 msgid "_Open"
 msgstr "_Åpne"
 
-#: mail/folder-browser.c:1262
+#: mail/folder-browser.c:1259
 msgid "Resend"
 msgstr "Send på nytt"
 
-#: mail/folder-browser.c:1264 ui/evolution-calendar.xml.h:54
+#: mail/folder-browser.c:1261 ui/evolution-calendar.xml.h:54
 #: ui/evolution-mail-message.xml.h:86 ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "Lagre _som..."
 
-#: mail/folder-browser.c:1266 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1263 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: mail/folder-browser.c:1271 ui/evolution-mail-message.xml.h:85
+#: mail/folder-browser.c:1268 ui/evolution-mail-message.xml.h:85
 msgid "_Reply to Sender"
 msgstr "Sva_r til sender"
 
-#: mail/folder-browser.c:1273 ui/evolution-mail-message.xml.h:61
+#: mail/folder-browser.c:1270 ui/evolution-mail-message.xml.h:61
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:60
+#: mail/folder-browser.c:1272 ui/evolution-mail-message.xml.h:60
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/folder-browser.c:1277
+#: mail/folder-browser.c:1274
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: mail/folder-browser.c:1280
+#: mail/folder-browser.c:1277
 msgid "Mar_k as Read"
 msgstr "Mer_k som lest"
 
-#: mail/folder-browser.c:1282
+#: mail/folder-browser.c:1279
 msgid "Mark as U_nread"
 msgstr "Merk som _ulest"
 
-#: mail/folder-browser.c:1284
+#: mail/folder-browser.c:1281
 msgid "Mark as _Important"
 msgstr "Merk som v_iktig"
 
-#: mail/folder-browser.c:1289
+#: mail/folder-browser.c:1286
 msgid "_Move to Folder..."
 msgstr "Fl_ytt til mappe..."
 
-#: mail/folder-browser.c:1291
+#: mail/folder-browser.c:1288
 msgid "_Copy to Folder..."
 msgstr "K_opier til mappe..."
 
-#: mail/folder-browser.c:1295 ui/evolution-mail-message.xml.h:87
+#: mail/folder-browser.c:1292 ui/evolution-mail-message.xml.h:87
 msgid "_Undelete"
 msgstr "A_ngre slett"
 
-#: mail/folder-browser.c:1300
+#: mail/folder-browser.c:1297
 msgid "Add Sender to Address Book"
 msgstr "Legg til sender i adressebok"
 
-#: mail/folder-browser.c:1305
+#: mail/folder-browser.c:1302
 msgid "Apply Filters"
 msgstr "Påfør filtre"
 
-#: mail/folder-browser.c:1309
+#: mail/folder-browser.c:1306
 msgid "Create Ru_le From Message"
 msgstr "Lage rege_l fra melding"
 
-#: mail/folder-browser.c:1448
+#: mail/folder-browser.c:1445
 msgid "Filter on Mailing List"
 msgstr "Filtrer etter e-postliste"
 
-#: mail/folder-browser.c:1449
+#: mail/folder-browser.c:1446
 msgid "VFolder on Mailing List"
 msgstr "VFolder på e-postliste"
 
-#: mail/folder-browser.c:1451
+#: mail/folder-browser.c:1448
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrer etter e-postliste (%s)"
 
-#: mail/folder-browser.c:1452
+#: mail/folder-browser.c:1449
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VFolder på e-postliste (%s)"
@@ -6462,7 +6476,7 @@ msgid "Are you sure you want to delete this news account?"
 msgstr "Er du sikker på at du vil slette denne diskusjonsgruppekontoen?"
 
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:709
+#: mail/mail-accounts.c:716
 msgid "Evolution Account Manager"
 msgstr "Kontohåndtering for Evolution"
 
@@ -6680,7 +6694,7 @@ msgstr ""
 msgid "Evolution Account Wizard"
 msgstr "Evolution kontoveiviser"
 
-#: mail/mail-config.c:1563 mail/mail-config.c:1566
+#: mail/mail-config.c:1583 mail/mail-config.c:1586
 msgid "Connecting to server..."
 msgstr "Kobler til tjener..."
 
@@ -6850,8 +6864,8 @@ msgid "Make this my default account"
 msgstr "Bruk denne som standard konto"
 
 #: mail/mail-config.glade.h:51
-msgid "Mark messages as \"Read\" after:"
-msgstr "Merk melding som \"Lest\" etter:"
+msgid "Mark messages as \"Read\" after"
+msgstr "Merk melding som \"Lest\" etter"
 
 #: mail/mail-config.glade.h:52
 msgid "NNTP Server:"
@@ -6993,11 +7007,6 @@ msgstr "Spesielle mapper"
 msgid "Standard Unix mbox"
 msgstr "Standard Unix mbox"
 
-#: mail/mail-config.glade.h:96
-#: shell/glade/e-active-connection-dialog.glade.h:5
-msgid "Type"
-msgstr "Type"
-
 #: mail/mail-config.glade.h:97
 msgid "Use secure connection (SSL)"
 msgstr "Bruk sikker forbindelse (SSL)"
@@ -7106,19 +7115,19 @@ msgstr "Ekstern visning"
 msgid "Loading message content"
 msgstr "Laster meldingsinnhold"
 
-#: mail/mail-display.c:1397
+#: mail/mail-display.c:1411
 msgid "Open Link in Browser"
 msgstr "Åpne lenke i nettleser"
 
-#: mail/mail-display.c:1399
+#: mail/mail-display.c:1413
 msgid "Copy Link Location"
 msgstr "Kopier lokasjon for lenke"
 
-#: mail/mail-display.c:1401
+#: mail/mail-display.c:1415
 msgid "Save Link as (FIXME)"
 msgstr "Lagre lenke som"
 
-#: mail/mail-display.c:1403
+#: mail/mail-display.c:1417
 msgid "Save Image as"
 msgstr "Lagre bilde som"
 
@@ -9001,7 +9010,7 @@ msgstr "Vis detaljer"
 msgid "Cancel Operation"
 msgstr "Alys operasjon"
 
-#: shell/e-setup.c:125 shell/e-setup.c:195
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "Evolution installasjon"
 
@@ -9023,15 +9032,15 @@ msgstr ""
 msgid "Could not update files correctly"
 msgstr "Kunne ikke oppdatere filene."
 
-#: shell/e-setup.c:199
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Dette ser ut til å være første gang du kjører Evolution."
 
-#: shell/e-setup.c:200
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr "Vennligst klikk \"OK\" for å installere Evolutions brukerfiler under"
 
-#: shell/e-setup.c:219
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -9042,7 +9051,7 @@ msgstr ""
 "%s\n"
 "Feil: %s"
 
-#: shell/e-setup.c:234
+#: shell/e-setup.c:235
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -9051,7 +9060,7 @@ msgstr ""
 "En feil oppsto under kopiering av filer til\n"
 "`%s'."
 
-#: shell/e-setup.c:299
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -9062,7 +9071,7 @@ msgstr ""
 "Venligst flytt denne for å tillate installasjon\n"
 "av Evolution's brukerfiler."
 
-#: shell/e-setup.c:313
+#: shell/e-setup.c:322
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -9076,7 +9085,7 @@ msgstr ""
 "kan kjøre.\n"
 "Vil du fjerne denne katalogen?"
 
-#: shell/e-setup.c:338
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -9316,35 +9325,35 @@ msgstr "Arbeid \"online\""
 msgid "Work offline"
 msgstr "Arbeid \"offline\""
 
-#: shell/e-shell-view.c:173
+#: shell/e-shell-view.c:177
 msgid "(No folder displayed)"
 msgstr "(Ingen mappe vist)"
 
 #. Special case for My Evolution
-#: shell/e-shell-view.c:1391 shell/e-storage-set-view.c:1441
+#: shell/e-shell-view.c:1395 shell/e-storage-set-view.c:1441
 msgid "My Evolution"
 msgstr "Min Evolution"
 
-#: shell/e-shell-view.c:1408
+#: shell/e-shell-view.c:1412
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1410
+#: shell/e-shell-view.c:1414
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution - %s [%s]"
 
-#: shell/e-shell-view.c:1448
+#: shell/e-shell-view.c:1452
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Evolution er koblet til. Klikk på denne knappen for å arbeide frakoblet."
 
-#: shell/e-shell-view.c:1455
+#: shell/e-shell-view.c:1459
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution er i ferd med å koble fra."
 
-#: shell/e-shell-view.c:1461
+#: shell/e-shell-view.c:1465
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Evolution er frakoblet. Klikk på denne knappen for å arbeide tilkoblet."
@@ -9600,6 +9609,14 @@ msgstr "Importerere"
 msgid "Don't import"
 msgstr "Ikke importer"
 
+#: shell/importer/intelligent.c:199
+msgid "Don't ask me again"
+msgstr "Ikke spør meg igjen"
+
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr "Evolution har funnet følgende datakilder:"
+
 #: shell/main.c:89
 #, no-c-format
 msgid ""
@@ -9736,8 +9753,7 @@ msgid "_Paste"
 msgstr "_Lim inn"
 
 #: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:53
-#: ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:13 ui/my-evolution.xml.h:5
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "S_kriv ut..."
 
@@ -9941,17 +9957,15 @@ msgid "Print S_etup"
 msgstr "Skriveropps_ett"
 
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
-#: ui/evolution-contact-list-editor.xml.h:5
 msgid "Print this item"
 msgstr "Skriv ut denne oppføringen"
 
 #: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
-#: ui/evolution-contact-list-editor.xml.h:6
 msgid "Print..."
 msgstr "Skriv ut..."
 
 #: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:5
 msgid "Save and Close"
 msgstr "Lagre og lukk"
 
@@ -9972,7 +9986,7 @@ msgid "_Action"
 msgstr "H_andling"
 
 #: ui/evolution-comp-editor.xml.h:21 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-contact-list-editor.xml.h:12
+#: ui/evolution-contact-list-editor.xml.h:9
 #: ui/evolution-mail-messagedisplay.xml.h:10
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
@@ -9999,12 +10013,11 @@ msgid "Help"
 msgstr "Hjelp"
 
 #: ui/evolution-contact-editor.xml.h:5
-#: ui/evolution-contact-list-editor.xml.h:4
 msgid "Print En_velope..."
 msgstr "Skriv ut konvolutt..."
 
 #: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:4
 #: ui/evolution-message-composer.xml.h:20
 msgid "Save _As..."
 msgstr "L_agre som..."
@@ -10026,27 +10039,27 @@ msgid "Send _message to contact..."
 msgstr "Send _melding til kontakt..."
 
 #: ui/evolution-contact-editor.xml.h:16
-#: ui/evolution-contact-list-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:10
 #: ui/evolution-message-composer.xml.h:54
 #: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Lagre"
 
 #: ui/evolution-contact-list-editor.xml.h:2
-msgid "Delete this group"
-msgstr "Slett denne gruppen"
+msgid "Delete this list"
+msgstr "Slett denne listen"
 
-#: ui/evolution-contact-list-editor.xml.h:9
-msgid "Save the group and close the dialog box"
-msgstr "Lagre gruppen og lukk dialogboksen"
+#: ui/evolution-contact-list-editor.xml.h:6
+msgid "Save the list and close the dialog box"
+msgstr "Lagre listen og lukk dialogboksen"
 
-#: ui/evolution-contact-list-editor.xml.h:10
-msgid "Se_nd group to other..."
-msgstr "Se_nd gruppen til andre..."
+#: ui/evolution-contact-list-editor.xml.h:7
+msgid "Se_nd list to other..."
+msgstr "Se_nd liste til andre..."
 
-#: ui/evolution-contact-list-editor.xml.h:11
-msgid "Send _message to group..."
-msgstr "Send _melding til gruppe..."
+#: ui/evolution-contact-list-editor.xml.h:8
+msgid "Send _message to list..."
+msgstr "Send _melding til liste..."
 
 #: ui/evolution-event-editor.xml.h:1
 msgid "Cancel Mee_ting"
@@ -11371,6 +11384,37 @@ msgstr "init_corba(): kunne ikke initiere GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 
+#~ msgid ""
+#~ "Notification about your journal entry starting on %s and ending on %s"
+#~ msgstr "Melding om din journaloppføring som starter %s og slutter %s"
+
+#~ msgid "Notification about your journal entry starting on %s"
+#~ msgstr "Melding om din journaloppføring som starter %s"
+
+#~ msgid "Notification about your journal entry ending on %s"
+#~ msgstr "Melding om din journaloppføring som slutter %s"
+
+#~ msgid "Notification about your journal entry"
+#~ msgstr "Melding om din journaloppføring"
+
+#~ msgid "Percent complete"
+#~ msgstr "Prosent fullført"
+
+#~ msgid "Elm Aliases"
+#~ msgstr "Elm alias"
+
+#~ msgid "Delete this group"
+#~ msgstr "Slett denne gruppen"
+
+#~ msgid "Save the group and close the dialog box"
+#~ msgstr "Lagre gruppen og lukk dialogboksen"
+
+#~ msgid "Se_nd group to other..."
+#~ msgstr "Se_nd gruppen til andre..."
+
+#~ msgid "Send _message to group..."
+#~ msgstr "Send _melding til gruppe..."
+
 #~ msgid "Show a dialog"
 #~ msgstr "Vis en dialog"
 
@@ -12297,9 +12341,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Edit keymap"
 #~ msgstr "Rediger tastaturkart"
 
-#~ msgid "Language"
-#~ msgstr "Språk"
-
 #~ msgid "Country"
 #~ msgstr "Land"
 
@@ -14223,9 +14264,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Schedule Meeting"
 #~ msgstr "Sett opp møte"
 
-#~ msgid "Attendee"
-#~ msgstr "Deltaker"
-
 #~ msgid "Attendee address"
 #~ msgstr "Deltakers adresse"
 
@@ -14258,17 +14296,11 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ "Publiser\n"
 #~ "hendelse"
 
-#~ msgid "RSVP"
-#~ msgstr "RSVP"
-
 #~ msgid "Required Participant"
 #~ msgstr ""
 #~ "Obligatorisk\n"
 #~ "deltaker"
 
-#~ msgid "Role"
-#~ msgstr "Rolle"
-
 #~ msgid "Could not test lock file for %s: %s"
 #~ msgstr "Kunne ikke sjekke låsfil for %s: %s"