[evolution/webkit] Updated Norwegian bokmål translation

From: Dan VrÃtil <dvratil src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution/webkit] Updated Norwegian bokmål translation
Date: Mon, 11 Jul 2011 14:35:56 +0000 (UTC)
commit 8163d564776fcf9951d9647868e7596d3b870ffe
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Wed May 4 11:39:11 2011 +0200

    Updated Norwegian bokmÃl translation

 po/nb.po | 3481 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 1753 insertions(+), 1728 deletions(-)
---
diff --git a/po/nb.po b/po/nb.po
index 2e24090..adab33d 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -5,13 +5,13 @@
 # Kjartan Maraas <kmaraas gnome org>, 1998-2011.
 # Terance Edward Sola <terance lyse net>, 2005.
 # Torstein Adolf Winterseth <kvikende fsfe org>, 2010.
-#: ../shell/main.c:615
+#: ../shell/main.c:627
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 2.91.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-01 18:23+0100\n"
-"PO-Revision-Date: 2011-03-01 18:32+0100\n"
+"POT-Creation-Date: 2011-05-04 11:23+0200\n"
+"PO-Revision-Date: 2011-05-04 11:38+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Norwegian BokmÃl <i18n-nb lister ping uio no>\n"
 "Language: Norsk bokmÃl\n"
@@ -87,7 +87,7 @@ msgid "Delete address book '{0}'?"
 msgstr "Slett adressebok Â{0}Â?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
 msgid "Do _Not Delete"
 msgstr "Ikke s_lett"
 
@@ -101,7 +101,7 @@ msgstr "Kunne ikke autentisere mot LDAP-tjener."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1276
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1277
 msgid "Failed to delete contact"
 msgstr "Klarte ikke Ã slette kontakt"
 
@@ -213,7 +213,7 @@ msgstr ""
 "Dine kontakter for {0} vil ikke vÃre tilgjengelige fÃr Evolution startes pÃ "
 "nytt."
 
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:609
+#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:610
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
 #: ../plugins/groupwise-features/properties.ui.h:9
 #: ../widgets/table/e-table-config.ui.h:18
@@ -238,7 +238,7 @@ msgstr "Br_uk som den er"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:574
-#: ../calendar/gui/e-calendar-view.c:2076
+#: ../calendar/gui/e-calendar-view.c:2078
 msgid "Anniversary"
 msgstr "Bryllupsdag"
 
@@ -249,8 +249,8 @@ msgstr "Bryllupsdag"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:573
-#: ../calendar/gui/e-calendar-view.c:2075 ../capplet/anjal-settings-main.c:116
-#: ../shell/main.c:133
+#: ../calendar/gui/e-calendar-view.c:2077 ../capplet/anjal-settings-main.c:77
+#: ../shell/main.c:134
 msgid "Birthday"
 msgstr "FÃdselsdag"
 
@@ -335,7 +335,7 @@ msgid "Nic_kname:"
 msgstr "_Kallenavn:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
-#: ../modules/calendar/e-memo-shell-migrate.c:260
+#: ../modules/calendar/e-memo-shell-migrate.c:261
 #: ../plugins/groupwise-features/camel-gw-listener.c:429
 #: ../plugins/groupwise-features/camel-gw-listener.c:454
 #: ../plugins/groupwise-features/camel-gw-listener.c:570
@@ -346,7 +346,7 @@ msgstr "Notater"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:69
 #: ../addressbook/gui/widgets/eab-contact-display.c:359
-#: ../calendar/gui/e-calendar-view.c:1781
+#: ../calendar/gui/e-calendar-view.c:1783
 msgid "Other"
 msgstr "Andre"
 
@@ -398,7 +398,7 @@ msgid "_Blog:"
 msgstr "_Blogg:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-#: ../calendar/gui/dialogs/event-page.c:880
+#: ../calendar/gui/dialogs/event-page.c:707
 #: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../plugins/itip-formatter/itip-view.c:1922
 msgid "_Calendar:"
@@ -676,7 +676,7 @@ msgid "_List name:"
 msgstr "_Listenavn:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:159
+#: ../mail/mail-config.ui.h:164
 msgid "_Select..."
 msgstr "_Velg â"
 
@@ -689,7 +689,7 @@ msgid "Contact List Members"
 msgstr "Kontaktlistemedlemmer"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:900
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1315
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1316
 msgid "_Members"
 msgstr "_Medlemmer"
 
@@ -761,20 +761,20 @@ msgstr "Flett kontakt"
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:920
-#: ../modules/calendar/e-cal-shell-view-actions.c:1693
+#: ../modules/addressbook/e-book-shell-view-actions.c:908
+#: ../modules/calendar/e-cal-shell-view-actions.c:1682
 #: ../modules/calendar/e-memo-shell-view-actions.c:774
 #: ../modules/calendar/e-task-shell-view-actions.c:973
 msgid "Any field contains"
 msgstr "Et felt inneholder"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/addressbook/e-book-shell-view-actions.c:915
 msgid "Email begins with"
 msgstr "E-post begynner med"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:922
 msgid "Name contains"
 msgstr "Navn inneholder"
 
@@ -789,11 +789,11 @@ msgid_plural "%d contacts"
 msgstr[0] "%d kontakt"
 msgstr[1] "%d kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:323
+#: ../addressbook/gui/widgets/e-addressbook-model.c:341
 msgid "Error getting book view"
 msgstr "Feil under henting av bokvisning"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:736
+#: ../addressbook/gui/widgets/e-addressbook-model.c:755
 msgid "Search Interrupted"
 msgstr "SÃk avbrutt"
 
@@ -814,7 +814,7 @@ msgid "Paste contacts from the clipboard"
 msgstr "Lim inn kontakter fra utklippstavlen"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:642
-#: ../modules/addressbook/e-book-shell-view-actions.c:745
+#: ../modules/addressbook/e-book-shell-view-actions.c:738
 msgid "Delete selected contacts"
 msgstr "Slett valgte kontakter"
 
@@ -822,34 +822,34 @@ msgstr "Slett valgte kontakter"
 msgid "Select all visible contacts"
 msgstr "Velg alle synlige kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1294
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1295
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Er du sikker pÃ at du vil slette disse kontaktlistene?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1298
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Er du sikker pÃ at du vil slette denne kontaktlisten?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1302
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Er du sikker pÃ at du vil slette denne kontaktlisten (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1308
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1309
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Er du sikker pÃ at du vil slette disse kontaktene?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1312
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1313
 msgid "Are you sure you want to delete this contact?"
 msgstr "Er du sikker pÃ at du vil slette denne kontakten?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1316
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1317
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Er du sikker pÃ at du vil slette denne kontakten (%s)?"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1473
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1474
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -864,11 +864,11 @@ msgstr[1] ""
 "Hvis du Ãpner %d kontakter vil dette Ãpne %d vinduer ogsÃ.\n"
 "Vil du virkelig vise alle disse kontaktene?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1481
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1482
 msgid "_Don't Display"
 msgstr "Ikke _vis"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1482
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1483
 msgid "Display _All Contacts"
 msgstr "Vis _alle kontakter"
 
@@ -1152,17 +1152,17 @@ msgid "Copy _Email Address"
 msgstr "Kopier _e-postadresse"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:174
-#: ../widgets/misc/e-web-view.c:397
+#: ../widgets/misc/e-web-view.c:404
 msgid "Copy the email address to the clipboard"
 msgstr "Kopier e-postadresser til utklippstavlen"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:179
-#: ../widgets/misc/e-web-view.c:402
+#: ../widgets/misc/e-web-view.c:409
 msgid "_Send New Message To..."
 msgstr "_Send ny melding til â"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:404
+#: ../widgets/misc/e-web-view.c:411
 msgid "Send a mail message to this address"
 msgstr "Send en e-postmelding til denne adressen"
 
@@ -1235,13 +1235,13 @@ msgstr "Nettdagbok"
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:577
-#: ../capplet/settings/mail-capplet-shell.c:361
+#: ../capplet/settings/mail-capplet-shell.c:345
 #: ../modules/addressbook/e-book-shell-backend.c:112
 #: ../modules/addressbook/e-book-shell-migrate.c:143
 #: ../modules/calendar/e-cal-shell-backend.c:128
 #: ../modules/calendar/e-cal-shell-migrate.c:161
 #: ../modules/calendar/e-memo-shell-backend.c:112
-#: ../modules/calendar/e-memo-shell-migrate.c:117
+#: ../modules/calendar/e-memo-shell-migrate.c:116
 #: ../modules/calendar/e-task-shell-backend.c:112
 #: ../modules/calendar/e-task-shell-migrate.c:128
 msgid "Personal"
@@ -1260,7 +1260,7 @@ msgid "Blog"
 msgstr "Weblogg"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:1055
-#: ../widgets/misc/e-web-view.c:854
+#: ../widgets/misc/e-web-view.c:890
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klikk for Ã sende melding til %s"
@@ -1909,7 +1909,7 @@ msgid "_Save Changes"
 msgstr "_Lagre endringer"
 
 #: ../calendar/calendar.error.xml.h:86
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:158
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:159
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Send"
@@ -1918,8 +1918,8 @@ msgstr "_Send"
 msgid "_Send Notice"
 msgstr "_Send melding"
 
-#: ../calendar/common/authentication.c:53
-#: ../calendar/gui/e-meeting-store.c:1775
+#: ../calendar/common/authentication.c:75
+#: ../calendar/gui/e-meeting-store.c:1823
 #: ../plugins/caldav/caldav-browse-server.c:921
 #: ../plugins/google-account-setup/google-source.c:439
 #: ../plugins/publish-calendar/publish-calendar.c:332
@@ -1967,8 +1967,8 @@ msgstr "Lukk _alle"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1631
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1641
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1632
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1642
 #: ../plugins/itip-formatter/itip-view.c:1044
 msgid "Location:"
 msgstr "Sted:"
@@ -1977,7 +1977,7 @@ msgstr "Sted:"
 msgid "Snooze _time:"
 msgstr "_Tid for utsettelse av alarm:"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:883
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:910
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:5
 msgid "_Dismiss"
 msgstr "_Lukk"
@@ -2007,33 +2007,33 @@ msgstr "sted for avtalen"
 msgid "minutes"
 msgstr "minutter"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1612
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1486
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1613
 msgid "No summary available."
 msgstr "Sammendrag er ikke tilgjengelig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1494
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1496
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1495
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1497
 msgid "No description available."
 msgstr "Ingen beskrivelse tilgjengelig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1504
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1505
 msgid "No location information available."
 msgstr "Stedsinformasjon er ikke tilgjengelig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1548
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1549
 #, c-format
 msgid "You have %d alarm"
 msgid_plural "You have %d alarms"
 msgstr[0] "Du har %d alarm"
 msgstr[1] "Du har %d alarmer"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1737
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1770
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1741
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1774
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1741
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1745
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2045,7 +2045,7 @@ msgstr ""
 "er konfigurert til Ã sende e-post. Evolution vil vise\n"
 "en vanlig dialog med pÃminnelsen i stedet."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1776
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1780
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2061,7 +2061,7 @@ msgstr ""
 "\n"
 "Er du sikker pÃ at du vil kjÃre dette programmet?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1791
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1795
 msgid "Do not ask me about this program again."
 msgstr "Ikke spÃr meg om dette programmet igjen."
 
@@ -2144,7 +2144,7 @@ msgid "Classification"
 msgstr "Klassifisering"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:242
-#: ../calendar/gui/e-cal-model.c:771 ../calendar/gui/e-task-table.c:494
+#: ../calendar/gui/e-cal-model.c:773 ../calendar/gui/e-task-table.c:494
 #: ../calendar/gui/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "Konfidensiell"
@@ -2152,7 +2152,7 @@ msgstr "Konfidensiell"
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
 #: ../modules/plugin-manager/evolution-plugin-manager.c:68
-#: ../widgets/misc/e-attachment-tree-view.c:520
+#: ../widgets/misc/e-attachment-tree-view.c:522
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "Beskrivelse"
@@ -2186,13 +2186,13 @@ msgid "Organizer"
 msgstr "Organisator"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:241
-#: ../calendar/gui/e-cal-model.c:769 ../calendar/gui/e-task-table.c:493
+#: ../calendar/gui/e-cal-model.c:771 ../calendar/gui/e-task-table.c:493
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Privat"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:240
-#: ../calendar/gui/e-cal-model.c:760 ../calendar/gui/e-cal-model.c:767
+#: ../calendar/gui/e-cal-model.c:762 ../calendar/gui/e-cal-model.c:769
 #: ../calendar/gui/e-task-table.c:492 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Offentlig"
@@ -2283,7 +2283,7 @@ msgstr "Egendefinert lyd for varsel"
 msgid "Mes_sage:"
 msgstr "Be_skjed:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:72
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:75
 msgid "Options"
 msgstr "Alternativer"
 
@@ -2371,11 +2371,11 @@ msgstr "Type:"
 msgid "_Type:"
 msgstr "_Type:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:232 ../mail/mail-config.ui.h:152
+#: ../calendar/gui/dialogs/calendar-setup.c:232 ../mail/mail-config.ui.h:156
 #: ../modules/addressbook/ldap-config.ui.h:26
 #: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
-#: ../widgets/misc/e-signature-script-dialog.c:278
+#: ../widgets/misc/e-signature-script-dialog.c:280
 msgid "_Name:"
 msgstr "_Navn:"
 
@@ -2398,10 +2398,10 @@ msgstr "Fa_rge:"
 #: ../calendar/gui/dialogs/calendar-setup.c:375
 #: ../calendar/gui/dialogs/calendar-setup.c:386
 #: ../calendar/gui/dialogs/calendar-setup.c:397
-#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:51
+#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:52
 #: ../modules/addressbook/addressbook-config.c:1010
 #: ../modules/calendar/e-calendar-preferences.ui.h:19
-#: ../plugins/itip-formatter/itip-formatter.c:2818
+#: ../plugins/itip-formatter/itip-formatter.c:2816
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
@@ -2486,7 +2486,7 @@ 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-page.c:444
+#: ../calendar/gui/dialogs/comp-editor-page.c:458
 #, c-format
 msgid "Validation error: %s"
 msgstr "Valideringsfeil: %s"
@@ -2540,23 +2540,23 @@ msgstr "Behold opprinnelig oppfÃring?"
 msgid "Click here to close the current window"
 msgstr "Klikk her for Ã lukke dette vinduet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1012 ../mail/e-mail-browser.c:132
+#: ../calendar/gui/dialogs/comp-editor.c:1012 ../mail/e-mail-browser.c:133
 #: ../shell/e-shell-window-actions.c:1433
-#: ../widgets/misc/e-focus-tracker.c:114 ../widgets/misc/e-focus-tracker.c:551
-#: ../widgets/misc/e-web-view.c:414 ../widgets/misc/e-web-view.c:1067
+#: ../widgets/misc/e-focus-tracker.c:114 ../widgets/misc/e-focus-tracker.c:552
+#: ../widgets/misc/e-web-view.c:421 ../widgets/misc/e-web-view.c:1209
 msgid "Copy the selection"
 msgstr "Kopier utvalget"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1019 ../mail/e-mail-browser.c:139
+#: ../calendar/gui/dialogs/comp-editor.c:1019 ../mail/e-mail-browser.c:140
 #: ../shell/e-shell-window-actions.c:1440
-#: ../widgets/misc/e-focus-tracker.c:107 ../widgets/misc/e-focus-tracker.c:546
-#: ../widgets/misc/e-web-view.c:1061
+#: ../widgets/misc/e-focus-tracker.c:107 ../widgets/misc/e-focus-tracker.c:547
+#: ../widgets/misc/e-web-view.c:1203
 msgid "Cut the selection"
 msgstr "Klipp ut utvalget"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1026
 #: ../shell/e-shell-window-actions.c:1447
-#: ../widgets/misc/e-focus-tracker.c:128 ../widgets/misc/e-focus-tracker.c:561
+#: ../widgets/misc/e-focus-tracker.c:128 ../widgets/misc/e-focus-tracker.c:562
 msgid "Delete the selection"
 msgstr "Slett utvalget"
 
@@ -2564,10 +2564,10 @@ msgstr "Slett utvalget"
 msgid "Click here to view help available"
 msgstr "klikk her for Ã vise tilgjengelig hjelp"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1040 ../mail/e-mail-browser.c:146
+#: ../calendar/gui/dialogs/comp-editor.c:1040 ../mail/e-mail-browser.c:147
 #: ../shell/e-shell-window-actions.c:1482
-#: ../widgets/misc/e-focus-tracker.c:121 ../widgets/misc/e-focus-tracker.c:556
-#: ../widgets/misc/e-web-view.c:1073
+#: ../widgets/misc/e-focus-tracker.c:121 ../widgets/misc/e-focus-tracker.c:557
+#: ../widgets/misc/e-web-view.c:1215
 msgid "Paste the clipboard"
 msgstr "Lim inn fra utklippstavlen"
 
@@ -2575,9 +2575,9 @@ msgstr "Lim inn fra utklippstavlen"
 msgid "Click here to save the current window"
 msgstr "Klikk her for Ã lagre dette vinduet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1068 ../mail/e-mail-browser.c:153
+#: ../calendar/gui/dialogs/comp-editor.c:1068 ../mail/e-mail-browser.c:154
 #: ../shell/e-shell-window-actions.c:1552
-#: ../widgets/misc/e-focus-tracker.c:135 ../widgets/misc/e-focus-tracker.c:566
+#: ../widgets/misc/e-focus-tracker.c:135 ../widgets/misc/e-focus-tracker.c:567
 msgid "Select all text"
 msgstr "Velg all tekst"
 
@@ -2587,14 +2587,14 @@ msgstr "K_lassifisering"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1082
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:167
+#: ../mail/e-mail-browser.c:168
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
 #: ../shell/e-shell-window-actions.c:1580
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1089 ../mail/e-mail-browser.c:160
+#: ../calendar/gui/dialogs/comp-editor.c:1089 ../mail/e-mail-browser.c:161
 #: ../shell/e-shell-window-actions.c:1587
 #: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
@@ -2614,7 +2614,7 @@ msgstr "Sett _inn"
 msgid "_Options"
 msgstr "_Alternativer"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117 ../mail/e-mail-browser.c:174
+#: ../calendar/gui/dialogs/comp-editor.c:1117 ../mail/e-mail-browser.c:175
 #: ../shell/e-shell-window-actions.c:1629 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "_Vis"
@@ -2705,25 +2705,25 @@ msgstr "SlÃr av/pÃ visning av deltakertype-feltet"
 msgid "Recent _Documents"
 msgstr "Siste _dokumenter"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1935
+#: ../calendar/gui/dialogs/comp-editor.c:1936
 #: ../composer/e-composer-actions.c:504
 msgid "Attach"
 msgstr "Legg ved"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2264
-#: ../calendar/gui/dialogs/comp-editor.c:2427
-#: ../calendar/gui/dialogs/comp-editor.c:3402
+#: ../calendar/gui/dialogs/comp-editor.c:2269
+#: ../calendar/gui/dialogs/comp-editor.c:2432
+#: ../calendar/gui/dialogs/comp-editor.c:3407
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Endringer som gjÃres i denne oppfÃringen kan bli forkastet hvis det kommer "
 "enoppdatering"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3366
+#: ../calendar/gui/dialogs/comp-editor.c:3371
 #: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "vedlegg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3434
+#: ../calendar/gui/dialogs/comp-editor.c:3439
 msgid "Unable to use current version!"
 msgstr "Kan ikke bruke denne versjonen!"
 
@@ -2855,7 +2855,7 @@ msgid "Send Options"
 msgstr "Alternativer for sending"
 
 #: ../calendar/gui/dialogs/event-editor.c:242
-#: ../calendar/gui/dialogs/task-editor.c:124
+#: ../calendar/gui/dialogs/task-editor.c:128
 msgid "Insert advanced send options"
 msgstr "Sett inn avanserte alternativer for sending"
 
@@ -2885,85 +2885,79 @@ msgstr "Avtale"
 msgid "Attendees"
 msgstr "Deltakere"
 
-#: ../calendar/gui/dialogs/event-editor.c:581
+#: ../calendar/gui/dialogs/event-editor.c:582
 msgid "Print this event"
 msgstr "Skriv ut denne hendelsen"
 
-#: ../calendar/gui/dialogs/event-page.c:764
+#: ../calendar/gui/dialogs/event-page.c:554
 msgid "Event's start time is in the past"
 msgstr "Starttid for hendelsen er passert"
 
-#: ../calendar/gui/dialogs/event-page.c:805
+#: ../calendar/gui/dialogs/event-page.c:632
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "Hendelsen kan ikke redigeres fordi kalenderen er skrivebeskyttet"
 
-#: ../calendar/gui/dialogs/event-page.c:809
+#: ../calendar/gui/dialogs/event-page.c:636
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "Hendelsen kan ikke redigeres i sin helhet fordi du ikke er organisator"
 
-#: ../calendar/gui/dialogs/event-page.c:821
-#: ../calendar/gui/dialogs/event-page.c:2779
+#: ../calendar/gui/dialogs/event-page.c:648
+#: ../calendar/gui/dialogs/event-page.c:2869
 msgid "This event has alarms"
 msgstr "Denne hendelsen har varsel"
 
-#: ../calendar/gui/dialogs/event-page.c:888
+#: ../calendar/gui/dialogs/event-page.c:715
 #: ../calendar/gui/dialogs/event-page.ui.h:8
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganisator:"
 
-#: ../calendar/gui/dialogs/event-page.c:935
-msgid "_Delegatees"
-msgstr "_Delegater"
-
-#: ../calendar/gui/dialogs/event-page.c:937
-msgid "Atte_ndees"
-msgstr "De_ltakere"
-
-#: ../calendar/gui/dialogs/event-page.c:1154
+#: ../calendar/gui/dialogs/event-page.c:1113
 msgid "Event with no start date"
 msgstr "Hendelse uten startdato"
 
-#: ../calendar/gui/dialogs/event-page.c:1157
+#: ../calendar/gui/dialogs/event-page.c:1116
 msgid "Event with no end date"
 msgstr "Hendelse uten sluttdato"
 
-#: ../calendar/gui/dialogs/event-page.c:1328
-#: ../calendar/gui/dialogs/memo-page.c:670
-#: ../calendar/gui/dialogs/task-page.c:904
+#: ../calendar/gui/dialogs/event-page.c:1287
+#: ../calendar/gui/dialogs/memo-page.c:692
+#: ../calendar/gui/dialogs/task-page.c:845
 msgid "Start date is wrong"
 msgstr "Startdato er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1338
+#: ../calendar/gui/dialogs/event-page.c:1297
 msgid "End date is wrong"
 msgstr "Sluttdato er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1361
+#: ../calendar/gui/dialogs/event-page.c:1320
 msgid "Start time is wrong"
 msgstr "Tid for start er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1368
+#: ../calendar/gui/dialogs/event-page.c:1327
 msgid "End time is wrong"
 msgstr "Tid for slutt er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1532
-#: ../calendar/gui/dialogs/memo-page.c:711
-#: ../calendar/gui/dialogs/task-page.c:966
-msgid "The organizer selected no longer has an account."
-msgstr "Valgt organisator har ingen konto lenger."
-
-#: ../calendar/gui/dialogs/event-page.c:1538
-#: ../calendar/gui/dialogs/memo-page.c:717
-#: ../calendar/gui/dialogs/task-page.c:972
+#: ../calendar/gui/dialogs/event-page.c:1491
+#: ../calendar/gui/dialogs/memo-page.c:733
+#: ../calendar/gui/dialogs/task-page.c:907
 msgid "An organizer is required."
 msgstr "En organisator kreves."
 
-#: ../calendar/gui/dialogs/event-page.c:1563
-#: ../calendar/gui/dialogs/task-page.c:996
+#: ../calendar/gui/dialogs/event-page.c:1525
+#: ../calendar/gui/dialogs/task-page.c:941
 msgid "At least one attendee is required."
 msgstr "Minst en deltaker kreves."
 
-#: ../calendar/gui/dialogs/event-page.c:2653
+#: ../calendar/gui/dialogs/event-page.c:1724
+msgid "_Delegatees"
+msgstr "_Delegater"
+
+#: ../calendar/gui/dialogs/event-page.c:1726
+msgid "Atte_ndees"
+msgstr "De_ltakere"
+
+#: ../calendar/gui/dialogs/event-page.c:2743
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kunne ikke Ãpne kalender Â%sÂ."
@@ -2974,47 +2968,47 @@ msgstr "Kunne ikke Ãpne kalender Â%sÂ."
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2697
-#: ../calendar/gui/dialogs/memo-page.c:930
-#: ../calendar/gui/dialogs/task-page.c:1786
+#: ../calendar/gui/dialogs/event-page.c:2787
+#: ../calendar/gui/dialogs/memo-page.c:956
+#: ../calendar/gui/dialogs/task-page.c:1849
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Du opptrer pÃ vegne av %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3008
+#: ../calendar/gui/dialogs/event-page.c:3098
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d dag fÃr avtalen"
 msgstr[1] "%d dager fÃr avtalen"
 
-#: ../calendar/gui/dialogs/event-page.c:3014
+#: ../calendar/gui/dialogs/event-page.c:3104
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d time fÃr avtalen"
 msgstr[1] "%d timer fÃr avtalen"
 
-#: ../calendar/gui/dialogs/event-page.c:3020
+#: ../calendar/gui/dialogs/event-page.c:3110
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minutt fÃr avtalen"
 msgstr[1] "%d minutter fÃr avtalen"
 
-#: ../calendar/gui/dialogs/event-page.c:3039
+#: ../calendar/gui/dialogs/event-page.c:3129
 msgid "Customize"
 msgstr "Tilpass"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:3045
+#: ../calendar/gui/dialogs/event-page.c:3135
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "Ingen"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:2
 #: ../calendar/gui/dialogs/task-page.ui.h:1
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "Atte_ndees..."
 msgstr "De_ltakere â"
 
@@ -3038,7 +3032,7 @@ msgstr "_Varsel"
 #: ../calendar/gui/dialogs/event-page.ui.h:12
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../widgets/misc/e-attachment-dialog.c:342
+#: ../widgets/misc/e-attachment-dialog.c:343
 msgid "_Description:"
 msgstr "_Beskrivelse:"
 
@@ -3089,30 +3083,30 @@ msgstr "til"
 msgid "Memo"
 msgstr "Notat"
 
-#: ../calendar/gui/dialogs/memo-editor.c:155
+#: ../calendar/gui/dialogs/memo-editor.c:156
 msgid "Print this memo"
 msgstr "Skriv ut dette notatet"
 
-#: ../calendar/gui/dialogs/memo-page.c:336
+#: ../calendar/gui/dialogs/memo-page.c:387
 msgid "Memo's start date is in the past"
 msgstr "Startdato for notatet er passert"
 
-#: ../calendar/gui/dialogs/memo-page.c:374
+#: ../calendar/gui/dialogs/memo-page.c:425
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "Notatet kan ikke redigeres fordi valgt notatliste er skrivebeskyttet"
 
-#: ../calendar/gui/dialogs/memo-page.c:378
+#: ../calendar/gui/dialogs/memo-page.c:429
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "Notatet kan ikke redigeres i sin helhet fordi du ikke er organisator"
 
-#: ../calendar/gui/dialogs/memo-page.c:891
+#: ../calendar/gui/dialogs/memo-page.c:917
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Kan ikke Ãpne notater i Â%sÂ."
 
-#: ../calendar/gui/dialogs/memo-page.c:1062 ../em-format/em-format-quote.c:283
-#: ../em-format/em-format.c:1048 ../mail/em-format-html.c:2395
-#: ../mail/em-format-html.c:2460 ../mail/em-format-html.c:2484
+#: ../calendar/gui/dialogs/memo-page.c:1088 ../em-format/em-format-quote.c:283
+#: ../em-format/em-format.c:1053 ../mail/em-format-html.c:2479
+#: ../mail/em-format-html.c:2544 ../mail/em-format-html.c:2568
 #: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:72
 msgid "To"
 msgstr "Til"
@@ -3132,7 +3126,7 @@ msgid "T_o:"
 msgstr "T_il:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:421
+#: ../calendar/gui/dialogs/task-page.c:332
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "_Gruppe:"
@@ -3173,22 +3167,22 @@ msgstr "Denne og fremtidige instanser"
 msgid "All Instances"
 msgstr "Alle instanser"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:562
+#: ../calendar/gui/dialogs/recurrence-page.c:563
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Denne avtalen har gjeninntreffelser som ikke kan redigeres av Evolution."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:894
+#: ../calendar/gui/dialogs/recurrence-page.c:895
 msgid "Recurrence date is invalid"
 msgstr "Gjenintreffingsdato er ugyldig"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:934
+#: ../calendar/gui/dialogs/recurrence-page.c:935
 msgid "End time of the recurrence was before event's start"
 msgstr "Tid for slutt av gjentakelse var fÃr hendelsens start"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:964
+#: ../calendar/gui/dialogs/recurrence-page.c:965
 msgid "on"
 msgstr "pÃ"
 
@@ -3196,7 +3190,7 @@ msgstr "pÃ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1022
+#: ../calendar/gui/dialogs/recurrence-page.c:1023
 msgid "first"
 msgstr "fÃrste"
 
@@ -3205,7 +3199,7 @@ msgstr "fÃrste"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1028
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "second"
 msgstr "sekund"
 
@@ -3213,7 +3207,7 @@ msgstr "sekund"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1033
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "third"
 msgstr "tredje"
 
@@ -3221,7 +3215,7 @@ msgstr "tredje"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1038
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "fourth"
 msgstr "fjerde"
 
@@ -3229,7 +3223,7 @@ msgstr "fjerde"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1043
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 msgid "fifth"
 msgstr "femte"
 
@@ -3237,13 +3231,13 @@ msgstr "femte"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
+#: ../calendar/gui/dialogs/recurrence-page.c:1049
 msgid "last"
 msgstr "siste"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1072
+#: ../calendar/gui/dialogs/recurrence-page.c:1073
 msgid "Other Date"
 msgstr "Annen dato"
 
@@ -3251,7 +3245,7 @@ msgstr "Annen dato"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1078
+#: ../calendar/gui/dialogs/recurrence-page.c:1079
 msgid "1st to 10th"
 msgstr "FÃrste til tiende"
 
@@ -3259,7 +3253,7 @@ msgstr "FÃrste til tiende"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
 msgid "11th to 20th"
 msgstr "ellevte til tjuende"
 
@@ -3267,48 +3261,48 @@ msgstr "ellevte til tjuende"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1090
+#: ../calendar/gui/dialogs/recurrence-page.c:1091
 msgid "21st to 31st"
 msgstr "tjuefÃrste til trettifÃrste"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
 msgid "day"
 msgstr "dag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../modules/calendar/e-calendar-preferences.ui.h:22
 msgid "Monday"
 msgstr "Mandag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/dialogs/recurrence-page.c:1119
 #: ../modules/calendar/e-calendar-preferences.ui.h:48
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/dialogs/recurrence-page.c:1120
 #: ../modules/calendar/e-calendar-preferences.ui.h:42
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
+#: ../calendar/gui/dialogs/recurrence-page.c:1121
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
 msgid "Friday"
 msgstr "Fredag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1121
+#: ../calendar/gui/dialogs/recurrence-page.c:1122
 #: ../modules/calendar/e-calendar-preferences.ui.h:26
 msgid "Saturday"
 msgstr "LÃrdag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1122
+#: ../calendar/gui/dialogs/recurrence-page.c:1123
 #: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "Sunday"
 msgstr "SÃndag"
@@ -3316,31 +3310,31 @@ msgstr "SÃndag"
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1244
+#: ../calendar/gui/dialogs/recurrence-page.c:1245
 msgid "on the"
 msgstr "den"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1418
+#: ../calendar/gui/dialogs/recurrence-page.c:1419
 msgid "occurrences"
 msgstr "gjentakelser"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2122
+#: ../calendar/gui/dialogs/recurrence-page.c:2123
 msgid "Add exception"
 msgstr "Legg til unntak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2163
+#: ../calendar/gui/dialogs/recurrence-page.c:2164
 msgid "Could not get a selection to modify."
 msgstr "Fant ikke et utvalg Ã endre."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2169
+#: ../calendar/gui/dialogs/recurrence-page.c:2170
 msgid "Modify exception"
 msgstr "Endre unntak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2213
+#: ../calendar/gui/dialogs/recurrence-page.c:2214
 msgid "Could not get a selection to delete."
 msgstr "Fant ikke et utvalg Ã slette."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2347
+#: ../calendar/gui/dialogs/recurrence-page.c:2348
 msgid "Date/Time"
 msgstr "Dato/klokkeslett"
 
@@ -3352,7 +3346,7 @@ msgstr "Hver"
 msgid "Exceptions"
 msgstr "Unntak"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:79
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:82
 msgid "Preview"
 msgstr "ForhÃndsvis"
 
@@ -3415,15 +3409,15 @@ msgstr "Varsle _kun nye deltakere"
 msgid "Completed date is wrong"
 msgstr "Dato for ferdigstilling er feil"
 
-#: ../calendar/gui/dialogs/task-details-page.c:485
+#: ../calendar/gui/dialogs/task-details-page.c:486
 msgid "Web Page"
 msgstr "Nettside"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
 #: ../calendar/gui/e-cal-component-preview.c:294
-#: ../calendar/gui/e-cal-model-tasks.c:438
-#: ../calendar/gui/e-cal-model-tasks.c:712 ../calendar/gui/e-task-table.c:210
+#: ../calendar/gui/e-cal-model-tasks.c:439
+#: ../calendar/gui/e-cal-model-tasks.c:713 ../calendar/gui/e-task-table.c:210
 #: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:596
 #: ../calendar/gui/print.c:3262 ../mail/em-sync-stream.c:152
 #: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
@@ -3434,9 +3428,9 @@ msgstr "Avbrutt"
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
 #: ../calendar/gui/e-cal-component-preview.c:291
-#: ../calendar/gui/e-cal-model-tasks.c:436
-#: ../calendar/gui/e-cal-model-tasks.c:710
-#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
+#: ../calendar/gui/e-cal-model-tasks.c:437
+#: ../calendar/gui/e-cal-model-tasks.c:711
+#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
 #: ../calendar/gui/e-task-table.c:208 ../calendar/gui/e-task-table.c:223
 #: ../calendar/gui/e-task-table.c:595 ../calendar/gui/print.c:3259
 #: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:367
@@ -3447,16 +3441,16 @@ msgstr "FullfÃrt"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
 #: ../calendar/gui/e-cal-component-preview.c:313
 #: ../calendar/gui/e-task-table.c:516 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1228 ../widgets/misc/e-send-options.ui.h:13
+#: ../mail/message-list.c:1222 ../widgets/misc/e-send-options.ui.h:13
 msgid "High"
 msgstr "HÃy"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
 #: ../calendar/gui/e-cal-component-preview.c:288
-#: ../calendar/gui/e-cal-model-tasks.c:434
-#: ../calendar/gui/e-cal-model-tasks.c:708
-#: ../calendar/gui/e-cal-model-tasks.c:785 ../calendar/gui/e-task-table.c:206
+#: ../calendar/gui/e-cal-model-tasks.c:435
+#: ../calendar/gui/e-cal-model-tasks.c:709
+#: ../calendar/gui/e-cal-model-tasks.c:786 ../calendar/gui/e-task-table.c:206
 #: ../calendar/gui/e-task-table.c:221 ../calendar/gui/e-task-table.c:594
 #: ../calendar/gui/print.c:3256
 msgid "In Progress"
@@ -3466,15 +3460,15 @@ msgstr "Under arbeid"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
 #: ../calendar/gui/e-cal-component-preview.c:317
 #: ../calendar/gui/e-task-table.c:518 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1226 ../widgets/misc/e-send-options.ui.h:14
+#: ../mail/message-list.c:1220 ../widgets/misc/e-send-options.ui.h:14
 msgid "Low"
 msgstr "Lav"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
 #: ../calendar/gui/e-cal-component-preview.c:315
-#: ../calendar/gui/e-cal-model.c:1517 ../calendar/gui/e-task-table.c:517
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1227
+#: ../calendar/gui/e-cal-model.c:1522 ../calendar/gui/e-task-table.c:517
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1221
 #: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
 msgstr "Normal"
@@ -3482,8 +3476,8 @@ msgstr "Normal"
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
 #: ../calendar/gui/e-cal-component-preview.c:298
-#: ../calendar/gui/e-cal-model-tasks.c:432
-#: ../calendar/gui/e-cal-model-tasks.c:706 ../calendar/gui/e-task-table.c:204
+#: ../calendar/gui/e-cal-model-tasks.c:433
+#: ../calendar/gui/e-cal-model-tasks.c:707 ../calendar/gui/e-task-table.c:204
 #: ../calendar/gui/e-task-table.c:219 ../calendar/gui/e-task-table.c:593
 #: ../calendar/gui/print.c:3253 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
@@ -3501,7 +3495,7 @@ msgstr "Stat_us:"
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1829
+#: ../calendar/gui/e-calendar-view.c:1831
 #: ../calendar/gui/e-meeting-list-view.c:596
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
@@ -3529,59 +3523,59 @@ msgstr "_Prioritet:"
 msgid "_Web Page:"
 msgstr "_Nettside:"
 
-#: ../calendar/gui/dialogs/task-editor.c:112
+#: ../calendar/gui/dialogs/task-editor.c:116
 msgid "_Status Details"
 msgstr "Detaljert _status"
 
-#: ../calendar/gui/dialogs/task-editor.c:114
+#: ../calendar/gui/dialogs/task-editor.c:118
 msgid "Click to change or view the status details of the task"
 msgstr "Klikk for Ã endre/vise detaljer om status for oppgaven"
 
-#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../calendar/gui/dialogs/task-editor.c:126
 #: ../plugins/groupwise-features/mail-send-options.c:200
 msgid "_Send Options"
 msgstr "Alternativer for _sending"
 
-#: ../calendar/gui/dialogs/task-editor.c:327 ../calendar/gui/print.c:3174
+#: ../calendar/gui/dialogs/task-editor.c:319 ../calendar/gui/print.c:3174
 #: ../widgets/misc/e-send-options.c:526
 msgid "Task"
 msgstr "Oppgave"
 
-#: ../calendar/gui/dialogs/task-editor.c:330
+#: ../calendar/gui/dialogs/task-editor.c:322
 msgid "Task Details"
 msgstr "Oppgavedetaljer"
 
-#: ../calendar/gui/dialogs/task-editor.c:372
+#: ../calendar/gui/dialogs/task-editor.c:364
 msgid "Print this task"
 msgstr "Skriv ut denne oppgaven"
 
-#: ../calendar/gui/dialogs/task-page.c:338
+#: ../calendar/gui/dialogs/task-page.c:249
 msgid "Task's start date is in the past"
 msgstr "Startdato for oppgaven er passert"
 
-#: ../calendar/gui/dialogs/task-page.c:339
+#: ../calendar/gui/dialogs/task-page.c:250
 msgid "Task's due date is in the past"
 msgstr "Ferdigdato for oppgaven er passert"
 
-#: ../calendar/gui/dialogs/task-page.c:374
+#: ../calendar/gui/dialogs/task-page.c:285
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr ""
 "Oppgaven kan ikke redigeres fordi valgt oppgaveliste er skrivebeskyttet"
 
-#: ../calendar/gui/dialogs/task-page.c:378
+#: ../calendar/gui/dialogs/task-page.c:289
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "Oppgaven kan ikke redigeres i sin helhet fordi du ikke er organisator"
 
-#: ../calendar/gui/dialogs/task-page.c:429
+#: ../calendar/gui/dialogs/task-page.c:340
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "Organi_sator:"
 
-#: ../calendar/gui/dialogs/task-page.c:877
+#: ../calendar/gui/dialogs/task-page.c:818
 msgid "Due date is wrong"
 msgstr "Ferdigdato er feil"
 
-#: ../calendar/gui/dialogs/task-page.c:1743
+#: ../calendar/gui/dialogs/task-page.c:1806
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Kan ikke Ãpne oppgaver i Â%sÂ."
@@ -3705,7 +3699,7 @@ msgstr "Status:"
 msgid "Priority:"
 msgstr "Prioritet:"
 
-#: ../calendar/gui/e-cal-component-preview.c:336 ../mail/mail-config.ui.h:36
+#: ../calendar/gui/e-cal-component-preview.c:336 ../mail/mail-config.ui.h:37
 msgid "Description:"
 msgstr "Beskrivelse:"
 
@@ -3741,11 +3735,11 @@ msgid "Free"
 msgstr "Ledig"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:544 ../calendar/gui/e-task-table.c:571
+#: ../calendar/gui/e-meeting-time-sel.c:546 ../calendar/gui/e-task-table.c:571
 msgid "Busy"
 msgstr "Opptatt"
 
-#: ../calendar/gui/e-cal-model-tasks.c:654
+#: ../calendar/gui/e-cal-model-tasks.c:655
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3756,44 +3750,44 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:704
+#: ../calendar/gui/e-cal-model-tasks.c:705
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "Ingen"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1060 ../calendar/gui/e-cal-model.c:1523
+#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1528
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:187
-#: ../calendar/gui/e-meeting-store.c:1026
+#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:188
+#: ../calendar/gui/e-meeting-store.c:1028
 msgid "Yes"
 msgstr "Ja"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1060 ../calendar/gui/e-cal-model.c:1523
+#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1528
 #: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:189
+#: ../calendar/gui/e-meeting-store.c:190
 msgid "No"
 msgstr "Nei"
 
-#: ../calendar/gui/e-cal-model.c:773 ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-cal-model.c:775 ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:170
-#: ../calendar/gui/e-meeting-store.c:233 ../calendar/gui/print.c:1092
+#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:171
+#: ../calendar/gui/e-meeting-store.c:234 ../calendar/gui/print.c:1092
 #: ../calendar/gui/print.c:1109 ../e-util/e-charset.c:52
 #: ../modules/plugin-manager/evolution-plugin-manager.c:98
-#: ../plugins/itip-formatter/itip-formatter.c:457
-#: ../plugins/itip-formatter/itip-formatter.c:2485
+#: ../plugins/itip-formatter/itip-formatter.c:458
+#: ../plugins/itip-formatter/itip-formatter.c:2483
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../calendar/gui/e-cal-model.c:1519
+#: ../calendar/gui/e-cal-model.c:1524
 msgid "Recurring"
 msgstr "Gjeninntreffer"
 
-#: ../calendar/gui/e-cal-model.c:1521
+#: ../calendar/gui/e-cal-model.c:1526
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: ../calendar/gui/e-cal-model.c:2639
+#: ../calendar/gui/e-cal-model.c:2644
 #, c-format
 msgid "Opening %s"
 msgstr "Ãpner %s"
@@ -3833,7 +3827,7 @@ msgstr "Startdato"
 #: ../calendar/gui/e-meeting-list-view.c:559
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:578
+#: ../widgets/misc/e-attachment-tree-view.c:580
 msgid "Type"
 msgstr "Type"
 
@@ -3863,41 +3857,41 @@ msgstr "Sletter valgte objekter"
 msgid "Updating objects"
 msgstr "Oppdaterer objekter"
 
-#: ../calendar/gui/e-calendar-view.c:1776
+#: ../calendar/gui/e-calendar-view.c:1778
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
-#: ../plugins/itip-formatter/itip-formatter.c:2473
+#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
+#: ../plugins/itip-formatter/itip-formatter.c:2471
 msgid "Accepted"
 msgstr "Godtatt"
 
-#: ../calendar/gui/e-calendar-view.c:1777
+#: ../calendar/gui/e-calendar-view.c:1779
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
-#: ../plugins/itip-formatter/itip-formatter.c:2479
+#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
+#: ../plugins/itip-formatter/itip-formatter.c:2477
 msgid "Declined"
 msgstr "AvslÃtt"
 
-#: ../calendar/gui/e-calendar-view.c:1778
+#: ../calendar/gui/e-calendar-view.c:1780
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
-#: ../calendar/gui/e-meeting-time-sel.c:543
+#: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
+#: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "Tentative"
 msgstr "Tentativ"
 
-#: ../calendar/gui/e-calendar-view.c:1779
+#: ../calendar/gui/e-calendar-view.c:1781
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
-#: ../plugins/itip-formatter/itip-formatter.c:2482
+#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
+#: ../plugins/itip-formatter/itip-formatter.c:2480
 msgid "Delegated"
 msgstr "Delegert"
 
-#: ../calendar/gui/e-calendar-view.c:1780
+#: ../calendar/gui/e-calendar-view.c:1782
 msgid "Needs action"
 msgstr "Krever handling"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1924 ../calendar/gui/e-memo-table.c:538
+#: ../calendar/gui/e-calendar-view.c:1926 ../calendar/gui/e-memo-table.c:538
 #: ../calendar/gui/e-task-table.c:759
 #, c-format
 msgid "Organizer: %s <%s>"
@@ -3905,20 +3899,20 @@ msgstr "Organisator: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1928 ../calendar/gui/e-memo-table.c:543
+#: ../calendar/gui/e-calendar-view.c:1930 ../calendar/gui/e-memo-table.c:543
 #: ../calendar/gui/e-task-table.c:762
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisator: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1944 ../calendar/gui/print.c:3208
+#: ../calendar/gui/e-calendar-view.c:1946 ../calendar/gui/print.c:3208
 #, c-format
 msgid "Location: %s"
 msgstr "Sted: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1975
+#: ../calendar/gui/e-calendar-view.c:1977
 #, c-format
 msgid "Time: %s %s"
 msgstr "Tidspunkt: %s %s"
@@ -3946,17 +3940,17 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:744
+#: ../calendar/gui/e-day-view-time-item.c:745
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minutters oppdeling"
 
-#: ../calendar/gui/e-day-view-time-item.c:765
+#: ../calendar/gui/e-day-view-time-item.c:766
 msgid "Show the second time zone"
 msgstr "Vis den andre tidssonen"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:782
+#: ../calendar/gui/e-day-view-time-item.c:783
 #: ../modules/calendar/e-calendar-preferences.ui.h:76
 #: ../modules/calendar/e-calendar-preferences.c:175
 #: ../modules/calendar/e-calendar-preferences.c:224
@@ -3964,8 +3958,8 @@ msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Ingen"
 
-#: ../calendar/gui/e-day-view-time-item.c:809
-#: ../calendar/gui/e-timezone-entry.c:315
+#: ../calendar/gui/e-day-view-time-item.c:810
+#: ../calendar/gui/e-timezone-entry.c:316
 #: ../modules/calendar/e-calendar-preferences.c:251
 msgid "Select..."
 msgstr "Velg â"
@@ -3976,7 +3970,7 @@ msgstr "Velg â"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:840 ../calendar/gui/e-day-view.c:1793
+#: ../calendar/gui/e-day-view-top-item.c:841 ../calendar/gui/e-day-view.c:1793
 #: ../calendar/gui/e-week-view-main-item.c:208 ../calendar/gui/print.c:1866
 msgid "%A %d %B"
 msgstr "%A %d %B"
@@ -3987,7 +3981,7 @@ msgstr "%A %d %B"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:844 ../calendar/gui/e-day-view.c:1810
+#: ../calendar/gui/e-day-view-top-item.c:845 ../calendar/gui/e-day-view.c:1810
 #: ../calendar/gui/e-week-view-main-item.c:217
 #: ../calendar/gui/ea-gnome-calendar.c:200
 #: ../modules/calendar/e-cal-shell-view-private.c:1005
@@ -3999,7 +3993,7 @@ msgstr "%a %d %b"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1826
+#: ../calendar/gui/e-day-view-top-item.c:849 ../calendar/gui/e-day-view.c:1826
 #: ../calendar/gui/e-week-view-main-item.c:231
 #: ../calendar/gui/ea-gnome-calendar.c:230
 #: ../modules/calendar/e-cal-shell-view-private.c:1041
@@ -4043,56 +4037,56 @@ msgid "Resources"
 msgstr "Ressurser"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:127
-#: ../calendar/gui/e-meeting-store.c:1020 ../calendar/gui/print.c:1088
+#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
+#: ../calendar/gui/e-meeting-store.c:1022 ../calendar/gui/print.c:1088
 msgid "Individual"
 msgstr "Individuell"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:112 ../calendar/gui/e-meeting-store.c:129
+#: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
 #: ../calendar/gui/print.c:1089 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "Gruppe"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
+#: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
 #: ../calendar/gui/print.c:1090
 msgid "Resource"
 msgstr "Ressurs"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
+#: ../calendar/gui/e-meeting-store.c:117 ../calendar/gui/e-meeting-store.c:134
 #: ../calendar/gui/print.c:1091
 msgid "Room"
 msgstr "Rom"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:145 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
 #: ../calendar/gui/print.c:1105
 msgid "Chair"
 msgstr "Styremedlem"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:147 ../calendar/gui/e-meeting-store.c:164
-#: ../calendar/gui/e-meeting-store.c:1023 ../calendar/gui/print.c:1106
+#: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
+#: ../calendar/gui/e-meeting-store.c:1025 ../calendar/gui/print.c:1106
 msgid "Required Participant"
 msgstr "Obligatorisk deltaker"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
 #: ../calendar/gui/print.c:1107
 msgid "Optional Participant"
 msgstr "Valgfri deltaker"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:169
 #: ../calendar/gui/print.c:1108
 msgid "Non-Participant"
 msgstr "Ikke-deltaker"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
-#: ../calendar/gui/e-meeting-store.c:1033
+#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:1035
 msgid "Needs Action"
 msgstr "Trenger handling"
 
@@ -4107,18 +4101,18 @@ msgstr "Deltaker                          "
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
+#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/e-meeting-store.c:231
 msgid "In Process"
 msgstr "Under arbeid"
 
-#: ../calendar/gui/e-meeting-store.c:1762
+#: ../calendar/gui/e-meeting-store.c:1810
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr ""
 "Oppgi passord for Ã se pÃ ledig-/opptatt-informasjon pÃ tjener %s som bruker "
 "%s"
 
-#: ../calendar/gui/e-meeting-store.c:1771
+#: ../calendar/gui/e-meeting-store.c:1819
 #, c-format
 msgid "Failure reason: %s"
 msgstr "FeilÃrsak: %s"
@@ -4126,7 +4120,7 @@ msgstr "FeilÃrsak: %s"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:431
-#: ../calendar/gui/e-meeting-time-sel.c:2378
+#: ../calendar/gui/e-meeting-time-sel.c:2380
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
@@ -4135,7 +4129,7 @@ msgstr "%A, %d %B, %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:435
-#: ../calendar/gui/e-meeting-time-sel.c:2409
+#: ../calendar/gui/e-meeting-time-sel.c:2411
 msgid "%a %m/%d/%Y"
 msgstr "%a %d.%m.%Y"
 
@@ -4145,63 +4139,63 @@ msgstr "%a %d.%m.%Y"
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:547
 msgid "Out of Office"
 msgstr "Borte fra kontoret"
 
-#: ../calendar/gui/e-meeting-time-sel.c:546
+#: ../calendar/gui/e-meeting-time-sel.c:548
 msgid "No Information"
 msgstr "Ingen informasjon"
 
-#: ../calendar/gui/e-meeting-time-sel.c:582
+#: ../calendar/gui/e-meeting-time-sel.c:584
 msgid "O_ptions"
 msgstr "Al_ternativer"
 
-#: ../calendar/gui/e-meeting-time-sel.c:600
+#: ../calendar/gui/e-meeting-time-sel.c:602
 msgid "Show _only working hours"
 msgstr "K_un vis arbeidstid"
 
-#: ../calendar/gui/e-meeting-time-sel.c:611
+#: ../calendar/gui/e-meeting-time-sel.c:613
 msgid "Show _zoomed out"
 msgstr "Vis _zoomet ut"
 
-#: ../calendar/gui/e-meeting-time-sel.c:627
+#: ../calendar/gui/e-meeting-time-sel.c:629
 msgid "_Update free/busy"
 msgstr "_Oppdater ledig/opptatt"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:644
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:660
+#: ../calendar/gui/e-meeting-time-sel.c:662
 msgid "_Autopick"
 msgstr "_Autovelg"
 
-#: ../calendar/gui/e-meeting-time-sel.c:675
+#: ../calendar/gui/e-meeting-time-sel.c:677
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:693
+#: ../calendar/gui/e-meeting-time-sel.c:695
 msgid "_All people and resources"
 msgstr "_Alle personer og ressurser"
 
-#: ../calendar/gui/e-meeting-time-sel.c:703
+#: ../calendar/gui/e-meeting-time-sel.c:705
 msgid "All _people and one resource"
 msgstr "Alle _personer og en ressurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:713
+#: ../calendar/gui/e-meeting-time-sel.c:715
 msgid "_Required people"
 msgstr "_Obligatoriske personer"
 
-#: ../calendar/gui/e-meeting-time-sel.c:722
+#: ../calendar/gui/e-meeting-time-sel.c:724
 msgid "Required people and _one resource"
 msgstr "Obligatoriske personer _og en ressurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:771
+#: ../calendar/gui/e-meeting-time-sel.c:773
 msgid "_Start time:"
 msgstr "_Start-tid:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:811
+#: ../calendar/gui/e-meeting-time-sel.c:813
 msgid "_End time:"
 msgstr "S_lutt-tid:"
 
@@ -4321,7 +4315,7 @@ msgstr "Slett valgte oppgaver"
 msgid "Select all visible tasks"
 msgstr "Velg alle synlige oppgaver"
 
-#: ../calendar/gui/e-timezone-entry.c:326
+#: ../calendar/gui/e-timezone-entry.c:327
 msgid "Select Timezone"
 msgstr "Velg tidssone"
 
@@ -4541,32 +4535,32 @@ msgstr "Velg i _dag"
 msgid "September"
 msgstr "September"
 
-#: ../calendar/gui/itip-utils.c:422 ../calendar/gui/itip-utils.c:477
-#: ../calendar/gui/itip-utils.c:573
+#: ../calendar/gui/itip-utils.c:504 ../calendar/gui/itip-utils.c:559
+#: ../calendar/gui/itip-utils.c:655
 msgid "An organizer must be set."
 msgstr "En organisator mÃ oppgis."
 
-#: ../calendar/gui/itip-utils.c:469
+#: ../calendar/gui/itip-utils.c:551
 msgid "At least one attendee is necessary"
 msgstr "Minst en deltaker kreves"
 
-#: ../calendar/gui/itip-utils.c:657 ../calendar/gui/itip-utils.c:811
+#: ../calendar/gui/itip-utils.c:740 ../calendar/gui/itip-utils.c:901
 msgid "Event information"
 msgstr "Hendelsesinformasjon"
 
-#: ../calendar/gui/itip-utils.c:660 ../calendar/gui/itip-utils.c:814
+#: ../calendar/gui/itip-utils.c:743 ../calendar/gui/itip-utils.c:904
 msgid "Task information"
 msgstr "Oppgaveinformasjon"
 
-#: ../calendar/gui/itip-utils.c:663 ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:746 ../calendar/gui/itip-utils.c:907
 msgid "Memo information"
 msgstr "Informasjon om notat"
 
-#: ../calendar/gui/itip-utils.c:666 ../calendar/gui/itip-utils.c:835
+#: ../calendar/gui/itip-utils.c:749 ../calendar/gui/itip-utils.c:925
 msgid "Free/Busy information"
 msgstr "Ledig/opptatt-informasjon"
 
-#: ../calendar/gui/itip-utils.c:669
+#: ../calendar/gui/itip-utils.c:752
 msgid "Calendar information"
 msgstr "Kalenderinformasjon"
 
@@ -4574,7 +4568,7 @@ msgstr "Kalenderinformasjon"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:706
+#: ../calendar/gui/itip-utils.c:789
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Godtatt"
@@ -4583,7 +4577,7 @@ msgstr "Godtatt"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:713
+#: ../calendar/gui/itip-utils.c:796
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Akseptert tentativt"
@@ -4595,7 +4589,7 @@ msgstr "Akseptert tentativt"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:720 ../calendar/gui/itip-utils.c:768
+#: ../calendar/gui/itip-utils.c:803 ../calendar/gui/itip-utils.c:851
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "AvslÃtt"
@@ -4604,7 +4598,7 @@ msgstr "AvslÃtt"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:727
+#: ../calendar/gui/itip-utils.c:810
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegert"
@@ -4612,7 +4606,7 @@ msgstr "Delegert"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:740
+#: ../calendar/gui/itip-utils.c:823
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Oppdatert"
@@ -4620,7 +4614,7 @@ msgstr "Oppdatert"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:830
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Avbryt"
@@ -4628,7 +4622,7 @@ msgstr "Avbryt"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:754
+#: ../calendar/gui/itip-utils.c:837
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Oppdater"
@@ -4636,30 +4630,30 @@ msgstr "Oppdater"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:761
+#: ../calendar/gui/itip-utils.c:844
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Motforslag"
 
-#: ../calendar/gui/itip-utils.c:832
+#: ../calendar/gui/itip-utils.c:922
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Ledig/opptatt-informasjon (%s til %s)"
 
-#: ../calendar/gui/itip-utils.c:840
+#: ../calendar/gui/itip-utils.c:930
 msgid "iCalendar information"
 msgstr "iCalendar-informasjon"
 
-#: ../calendar/gui/itip-utils.c:865
+#: ../calendar/gui/itip-utils.c:955
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
 "Klarer ikke Ã booke en ressurs. Den nye hendelsen er i konflikt med en annen."
 
-#: ../calendar/gui/itip-utils.c:869
+#: ../calendar/gui/itip-utils.c:959
 msgid "Unable to book a resource, error: "
 msgstr "Kan ikke booke en ressurs. Feil: "
 
-#: ../calendar/gui/itip-utils.c:1032
+#: ../calendar/gui/itip-utils.c:1120
 msgid "You must be an attendee of the event."
 msgstr "Du mÃ vÃre en deltager i hendelsen."
 
@@ -4787,6 +4781,7 @@ msgstr "30"
 msgid "31st"
 msgstr "31"
 
+#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
 #: ../calendar/gui/print.c:612
 msgid "Su"
 msgstr "SÃ."
@@ -4815,22 +4810,34 @@ msgstr "Fr."
 msgid "Sa"
 msgstr "LÃ."
 
+#. Translators: This is part of "START to END" text,
+#. * where START and END are date/times.
 #: ../calendar/gui/print.c:3001
 msgid " to "
 msgstr " til "
 
+#. Translators: This is part of "START to END
+#. * (Completed COMPLETED)", where COMPLETED is a
+#. * completed date/time.
 #: ../calendar/gui/print.c:3011
 msgid " (Completed "
 msgstr " (FullfÃrt "
 
+#. Translators: This is part of "Completed COMPLETED",
+#. * where COMPLETED is a completed date/time.
 #: ../calendar/gui/print.c:3017
 msgid "Completed "
 msgstr "FullfÃrt "
 
+#. Translators: This is part of "START (Due DUE)",
+#. * where START and DUE are dates/times.
 #: ../calendar/gui/print.c:3027
 msgid " (Due "
 msgstr " (Ferdig "
 
+#. Translators: This is part of "Due DUE",
+#. * where DUE is a date/time due the event
+#. * should be finished.
 #: ../calendar/gui/print.c:3034
 msgid "Due "
 msgstr "Ferdig "
@@ -4896,7 +4903,7 @@ msgstr "Avtaler og mÃter"
 
 #: ../calendar/importers/icalendar-importer.c:350
 #: ../calendar/importers/icalendar-importer.c:707
-#: ../plugins/itip-formatter/itip-formatter.c:1958
+#: ../plugins/itip-formatter/itip-formatter.c:1959
 msgid "Opening calendar"
 msgstr "Ãpner kalender"
 
@@ -6792,35 +6799,35 @@ msgstr ""
 "Skriv inn adressene som skal motta en kopi av meldingen uten Ã vises i "
 "mottakerlisten for meldingen."
 
-#: ../composer/e-composer-header-table.c:1002
+#: ../composer/e-composer-header-table.c:1004
 msgid "Fr_om:"
 msgstr "Fr_a:"
 
-#: ../composer/e-composer-header-table.c:1011
+#: ../composer/e-composer-header-table.c:1013
 msgid "_Reply-To:"
 msgstr "Sva_r-til:"
 
-#: ../composer/e-composer-header-table.c:1015
+#: ../composer/e-composer-header-table.c:1017
 msgid "_To:"
 msgstr "_Til:"
 
-#: ../composer/e-composer-header-table.c:1020
+#: ../composer/e-composer-header-table.c:1022
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:1025
+#: ../composer/e-composer-header-table.c:1027
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:1030
+#: ../composer/e-composer-header-table.c:1032
 msgid "_Post To:"
 msgstr "_Post til:"
 
-#: ../composer/e-composer-header-table.c:1034
+#: ../composer/e-composer-header-table.c:1036
 msgid "S_ubject:"
 msgstr "Em_ne:"
 
-#: ../composer/e-composer-header-table.c:1043
+#: ../composer/e-composer-header-table.c:1045
 msgid "Si_gnature:"
 msgstr "Si_gnatur:"
 
@@ -6869,17 +6876,17 @@ msgstr ""
 "Kan ikke kryptere utgÃende melding: Sertifikat for kryptering ikke satt for "
 "denne kontoen"
 
-#: ../composer/e-msg-composer.c:1675 ../composer/e-msg-composer.c:2058
+#: ../composer/e-msg-composer.c:1680 ../composer/e-msg-composer.c:2063
 msgid "Compose Message"
 msgstr "Skriv melding"
 
-#: ../composer/e-msg-composer.c:4115
+#: ../composer/e-msg-composer.c:4121
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
 "Redigering inneholder en meldingskropp som ikke er tekst, og som ikke kan "
 "redigeres."
 
-#: ../composer/e-msg-composer.c:4820
+#: ../composer/e-msg-composer.c:4826
 msgid "Untitled Message"
 msgstr "Melding uten navn"
 
@@ -6987,7 +6994,7 @@ msgstr "Lagrer melding til Utboks."
 msgid "The file '{0}' is not a regular file and cannot be sent in a message."
 msgstr "Filen Â{0}Â er ikke en vanlig fil og kan ikke sendes i en melding."
 
-#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:117
+#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:118
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "Feilen som ble rapportert var &quot;{0}&quot;."
 
@@ -7040,27 +7047,15 @@ msgstr "_Lagre til Utboks"
 msgid "_Try Again"
 msgstr "_PrÃv igjen"
 
-#: ../capplet/anjal-settings-main.c:216
-msgid "Run Anjal in a window"
-msgstr "KjÃr Anjal i et vindu"
-
-#: ../capplet/anjal-settings-main.c:217
-msgid "Make Anjal the default email client"
-msgstr "Bruk Anjal som _forvalgt e-postklient"
-
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:224
+#: ../capplet/anjal-settings-main.c:151
 msgid "ID of the socket to embed in"
 msgstr "ID for pluggen vi skal koble til"
 
-#: ../capplet/anjal-settings-main.c:225
+#: ../capplet/anjal-settings-main.c:152
 msgid "socket"
 msgstr "plugg"
 
-#: ../capplet/anjal-settings-main.c:238
-msgid "Anjal email client"
-msgstr "Anjal e-postprogram"
-
 #: ../capplet/settings/mail-account-view.c:77
 msgid "Please enter your full name."
 msgstr "Vennligst oppgi ditt fulle navn."
@@ -7179,7 +7174,7 @@ msgstr ""
 "posten din."
 
 #: ../capplet/settings/mail-account-view.c:613
-#: ../mail/em-account-editor.c:2089 ../mail/em-account-editor.c:2210
+#: ../mail/em-account-editor.c:2167 ../mail/em-account-editor.c:2288
 msgid "Identity"
 msgstr "Identitet"
 
@@ -7231,7 +7226,7 @@ msgid "Back - Receiving options"
 msgstr "Tilbake - Alternativer for mottak"
 
 #: ../capplet/settings/mail-account-view.c:618
-#: ../mail/em-account-editor.c:3041
+#: ../mail/em-account-editor.c:3119
 msgid "Defaults"
 msgstr "Forvalg"
 
@@ -7302,23 +7297,23 @@ msgstr "Lukk fane"
 msgid "Account Wizard"
 msgstr "Kontoveiviser"
 
-#: ../capplet/settings/mail-capplet-shell.c:209
+#: ../capplet/settings/mail-capplet-shell.c:208
 msgid "Evolution account assistant"
 msgstr "Evolution kontoassistent"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:353 ../mail/e-mail-migrate.c:680
-#: ../mail/e-mail-store.c:228 ../mail/em-folder-tree-model.c:146
+#: ../capplet/settings/mail-capplet-shell.c:337 ../mail/e-mail-migrate.c:694
+#: ../mail/e-mail-store.c:230 ../mail/em-folder-tree-model.c:146
 #: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
 #: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:161
-#: ../mail/em-folder-tree-model.c:163 ../mail/mail-vfolder.c:218
-#: ../mail/message-list.c:1721
+#: ../mail/em-folder-tree-model.c:163 ../mail/mail-vfolder.c:219
+#: ../mail/message-list.c:1712
 #: ../modules/addressbook/e-book-shell-backend.c:92
 #: ../modules/addressbook/e-book-shell-migrate.c:135
 #: ../modules/calendar/e-cal-shell-backend.c:103
 #: ../modules/calendar/e-cal-shell-migrate.c:150
 #: ../modules/calendar/e-memo-shell-backend.c:92
-#: ../modules/calendar/e-memo-shell-migrate.c:106
+#: ../modules/calendar/e-memo-shell-migrate.c:105
 #: ../modules/calendar/e-task-shell-backend.c:92
 #: ../modules/calendar/e-task-shell-migrate.c:117
 msgid "On This Computer"
@@ -7349,7 +7344,7 @@ msgstr "Varsling om kalenderhendelser"
 msgid "Evolution Alarm Notify"
 msgstr "Evolution varslingstjeneste"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:951
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:957
 #: ../modules/mailto-handler/evolution-mailto-handler.c:212
 #: ../shell/e-shell-window-private.c:253
 msgid "Evolution"
@@ -7489,7 +7484,7 @@ msgstr "Synlig"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:196
-#: ../modules/calendar/e-cal-shell-view-actions.c:1796
+#: ../modules/calendar/e-cal-shell-view-actions.c:1811
 #: ../plugins/itip-formatter/itip-view.c:191
 #: ../widgets/table/e-cell-date-edit.c:308
 msgid "Today"
@@ -7605,7 +7600,7 @@ msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "Utskriftssystemet rapporterte ingen detaljer om feilen."
 
-#: ../e-util/e-signature.c:703
+#: ../e-util/e-signature.c:707
 msgid "Autogenerated"
 msgstr "Generert automatisk"
 
@@ -7629,15 +7624,15 @@ msgstr "Vil du overskrive den?"
 msgid "File exists \"{0}\"."
 msgstr "Filen Â{0}Â eksisterer."
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:157
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:158
 msgid "_Overwrite"
 msgstr "_Overskriv"
 
-#: ../e-util/e-util.c:146
+#: ../e-util/e-util.c:141
 msgid "Could not open the link."
 msgstr "Kunne ikke Ãpne lenken."
 
-#: ../e-util/e-util.c:193
+#: ../e-util/e-util.c:188
 msgid "Could not display help for Evolution."
 msgstr "Kunne ikke vise hjelp for Evolution."
 
@@ -7650,31 +7645,31 @@ msgstr "GConf-feil: %s"
 msgid "All further errors shown only on terminal."
 msgstr "Alle videre feil blir kun vist pÃ konsollet."
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1046
-#: ../mail/e-mail-tag-editor.c:324 ../mail/message-list.etspec.h:7
+#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1051
+#: ../mail/e-mail-tag-editor.c:325 ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:70
 msgid "From"
 msgstr "Fra"
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1047
+#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1052
 #: ../modules/mail/em-mailer-prefs.c:71
 msgid "Reply-To"
 msgstr "Svar-til"
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1049
-#: ../mail/em-format-html.c:2396 ../mail/em-format-html.c:2464
-#: ../mail/em-format-html.c:2487 ../modules/mail/em-mailer-prefs.c:73
+#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1054
+#: ../mail/em-format-html.c:2480 ../mail/em-format-html.c:2548
+#: ../mail/em-format-html.c:2571 ../modules/mail/em-mailer-prefs.c:73
 msgid "Cc"
 msgstr "Cc"
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1050
-#: ../mail/em-format-html.c:2397 ../mail/em-format-html.c:2468
-#: ../mail/em-format-html.c:2490 ../modules/mail/em-mailer-prefs.c:74
+#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1055
+#: ../mail/em-format-html.c:2481 ../mail/em-format-html.c:2552
+#: ../mail/em-format-html.c:2574 ../modules/mail/em-mailer-prefs.c:74
 msgid "Bcc"
 msgstr "Bcc"
 
-#: ../em-format/em-format-quote.c:427 ../em-format/em-format.c:1051
-#: ../mail/e-mail-tag-editor.c:329 ../mail/em-filter-i18n.h:74
+#: ../em-format/em-format-quote.c:427 ../em-format/em-format.c:1056
+#: ../mail/e-mail-tag-editor.c:330 ../mail/em-filter-i18n.h:74
 #: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:75
 #: ../plugins/groupwise-features/notification.ui.h:2
 #: ../plugins/groupwise-features/properties.ui.h:5 ../smime/lib/e-cert.c:1140
@@ -7682,74 +7677,74 @@ msgid "Subject"
 msgstr "Emne"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:438 ../mail/em-format-html.c:2584
-#: ../modules/mail/em-mailer-prefs.c:1119
+#: ../em-format/em-format-quote.c:438 ../mail/em-format-html.c:2668
+#: ../modules/mail/em-mailer-prefs.c:1124
 msgid "Mailer"
 msgstr "E-postprogram"
 
-#: ../em-format/em-format-quote.c:519 ../mail/em-composer-utils.c:1159
+#: ../em-format/em-format-quote.c:519 ../mail/em-composer-utils.c:1199
 msgid "-------- Forwarded Message --------"
 msgstr "---------Videresendt melding-------"
 
-#: ../em-format/em-format.c:1052 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:76 ../widgets/misc/e-dateedit.c:522
-#: ../widgets/misc/e-dateedit.c:544
+#: ../em-format/em-format.c:1057 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:76 ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:545
 msgid "Date"
 msgstr "Dato"
 
-#: ../em-format/em-format.c:1053 ../modules/mail/em-mailer-prefs.c:77
+#: ../em-format/em-format.c:1058 ../modules/mail/em-mailer-prefs.c:77
 msgid "Newsgroups"
 msgstr "Nyhetsgrupper"
 
-#: ../em-format/em-format.c:1054 ../modules/mail/em-mailer-prefs.c:78
+#: ../em-format/em-format.c:1059 ../modules/mail/em-mailer-prefs.c:78
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "Ansikt"
 
-#: ../em-format/em-format.c:1451
+#: ../em-format/em-format.c:1456
 #, c-format
 msgid "%s attachment"
 msgstr "%s-vedlegg"
 
-#: ../em-format/em-format.c:1555
+#: ../em-format/em-format.c:1567
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Kunne ikke lese S/MIME-melding: Ukjent feil"
 
-#: ../em-format/em-format.c:1737 ../em-format/em-format.c:1931
+#: ../em-format/em-format.c:1749 ../em-format/em-format.c:1943
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
 
-#: ../em-format/em-format.c:1747
+#: ../em-format/em-format.c:1759
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Krypteringstype for multipart/encrypted som ikke er stÃttet"
 
-#: ../em-format/em-format.c:1767
+#: ../em-format/em-format.c:1779
 msgid "Could not parse PGP/MIME message"
 msgstr "Kunne ikke lese PGP/MIME-melding"
 
-#: ../em-format/em-format.c:1768
+#: ../em-format/em-format.c:1780
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Kunne ikke lese PGP/MIME-melding: Ukjent feil"
 
-#: ../em-format/em-format.c:1956
+#: ../em-format/em-format.c:1968
 msgid "Unsupported signature format"
 msgstr "UstÃttet signaturformat"
 
-#: ../em-format/em-format.c:1969 ../em-format/em-format.c:2141
+#: ../em-format/em-format.c:1981 ../em-format/em-format.c:2160
 msgid "Error verifying signature"
 msgstr "Feil under verifisering av signatur"
 
-#: ../em-format/em-format.c:1970 ../em-format/em-format.c:2128
-#: ../em-format/em-format.c:2142
+#: ../em-format/em-format.c:1982 ../em-format/em-format.c:2147
+#: ../em-format/em-format.c:2161
 msgid "Unknown error verifying signature"
 msgstr "Ukjent feil under verifisering av signatur"
 
-#: ../em-format/em-format.c:2233
+#: ../em-format/em-format.c:2252
 msgid "Could not parse PGP message: "
 msgstr "Kunne ikke lese PGP-melding:"
 
-#: ../em-format/em-format.c:2239 ../mail/em-folder-tree.c:656
-#: ../mail/mail-ops.c:624 ../plugins/caldav/caldav-browse-server.c:210
+#: ../em-format/em-format.c:2258 ../mail/em-folder-tree.c:655
+#: ../mail/mail-ops.c:658 ../plugins/caldav/caldav-browse-server.c:210
 #: ../plugins/caldav/caldav-browse-server.c:1407 ../plugins/face/face.c:169
 #: ../smime/gui/certificate-manager.c:100
 msgid "Unknown error"
@@ -7927,12 +7922,12 @@ msgstr "Ta _med trÃder"
 msgid "A_dd Condition"
 msgstr "Legg til _kriterie"
 
-#: ../filter/e-filter-rule.c:1129 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:316
+#: ../filter/e-filter-rule.c:1130 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:321
 msgid "Incoming"
 msgstr "Innkommende"
 
-#: ../filter/e-filter-rule.c:1129 ../mail/em-utils.c:317
+#: ../filter/e-filter-rule.c:1130 ../mail/em-utils.c:322
 msgid "Outgoing"
 msgstr "UtgÃende"
 
@@ -7964,7 +7959,7 @@ msgstr "Mangler dato."
 msgid "Missing file name."
 msgstr "Mangler filnavn."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:83
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:84
 msgid "Missing name."
 msgstr "Mangler navn."
 
@@ -8058,7 +8053,7 @@ msgid "years"
 msgstr "Ãr"
 
 #: ../mail/e-mail-attachment-bar.c:86 ../mail/e-mail-attachment-bar.c:91
-#: ../mail/em-format-html-display.c:1049 ../mail/mail-config.ui.h:13
+#: ../mail/em-format-html-display.c:1156 ../mail/mail-config.ui.h:14
 #: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:124
 #: ../widgets/misc/e-attachment-paned.c:129
 msgid "Attachment"
@@ -8066,23 +8061,23 @@ msgid_plural "Attachments"
 msgstr[0] "Vedlegg"
 msgstr[1] "Vedlegg"
 
-#: ../mail/e-mail-attachment-bar.c:602
-#: ../widgets/misc/e-attachment-paned.c:617
+#: ../mail/e-mail-attachment-bar.c:604
+#: ../widgets/misc/e-attachment-paned.c:619
 msgid "Icon View"
 msgstr "Ikonvisning"
 
-#: ../mail/e-mail-attachment-bar.c:604
-#: ../widgets/misc/e-attachment-paned.c:619
+#: ../mail/e-mail-attachment-bar.c:606
+#: ../widgets/misc/e-attachment-paned.c:621
 msgid "List View"
 msgstr "Listevisning"
 
-#: ../mail/e-mail-browser.c:125 ../shell/e-shell-window-actions.c:1405
+#: ../mail/e-mail-browser.c:126 ../shell/e-shell-window-actions.c:1405
 #: ../shell/e-shell-window-actions.c:1412
 #: ../shell/e-shell-window-actions.c:1419
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
-#: ../mail/e-mail-browser.c:282
+#: ../mail/e-mail-browser.c:283
 msgid "(No Subject)"
 msgstr "(Uten emne)"
 
@@ -8107,7 +8102,12 @@ msgstr "Opprett _sÃkemappe"
 msgid "Saving message to folder '%s'"
 msgstr "Lagrer melding til mappe Â%sÂ"
 
-#: ../mail/e-mail-label-dialog.c:218
+#: ../mail/e-mail-folder-utils.c:230
+#, c-format
+msgid "Invalid folder URI '%s'"
+msgstr "Ugyldig URI for mappe Â%sÂ"
+
+#: ../mail/e-mail-label-dialog.c:219
 msgid "_Label name:"
 msgstr "Etikett_navn:"
 
@@ -8144,7 +8144,7 @@ msgstr "Legg til etikett"
 msgid "Edit Label"
 msgstr "Rediger etikett"
 
-#: ../mail/e-mail-label-manager.c:345
+#: ../mail/e-mail-label-manager.c:346
 msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
@@ -8152,11 +8152,11 @@ msgstr ""
 "Merk: Understrek i etikettnavnet brukes som\n"
 "hurtigtastidentifikator i menyen."
 
-#: ../mail/e-mail-label-tree-view.c:82
+#: ../mail/e-mail-label-tree-view.c:84
 msgid "Color"
 msgstr "Farge"
 
-#: ../mail/e-mail-label-tree-view.c:92
+#: ../mail/e-mail-label-tree-view.c:94
 #: ../modules/plugin-manager/evolution-plugin-manager.c:66
 #: ../plugins/caldav/caldav-browse-server.c:1296
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
@@ -8166,52 +8166,53 @@ msgid "Name"
 msgstr "Navn"
 
 #: ../mail/e-mail-local.c:35 ../mail/em-folder-properties.c:285
-#: ../mail/em-folder-tree-model.c:737 ../mail/em-folder-tree.c:3132
-#: ../modules/mail/e-mail-shell-view-private.c:1118
-#: ../modules/mail/e-mail-shell-view-private.c:1129
+#: ../mail/em-folder-tree-model.c:715 ../mail/em-folder-tree.c:3157
+#: ../modules/mail/e-mail-shell-view-private.c:1207
+#: ../modules/mail/e-mail-shell-view-private.c:1218
 msgid "Inbox"
 msgstr "Innboks"
 
-#: ../mail/e-mail-local.c:36 ../mail/em-folder-tree-model.c:729
-#: ../modules/mail/e-mail-shell-view-private.c:1116
+#: ../mail/e-mail-local.c:36 ../mail/em-folder-tree-model.c:707
+#: ../modules/mail/e-mail-shell-view-private.c:1205
 msgid "Drafts"
 msgstr "Skisser"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-tree-model.c:741
-#: ../modules/mail/e-mail-shell-view-private.c:1120
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-tree-model.c:719
+#: ../modules/mail/e-mail-shell-view-private.c:1209
 msgid "Outbox"
 msgstr "Utboks"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:743
-#: ../modules/mail/e-mail-shell-view-private.c:1122
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:721
+#: ../modules/mail/e-mail-shell-view-private.c:1211
 msgid "Sent"
 msgstr "Sendt"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:732
-#: ../modules/mail/e-mail-shell-view-private.c:1124
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:710
+#: ../modules/mail/e-mail-shell-view-private.c:1213
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:581
+#: ../plugins/templates/templates.c:881 ../plugins/templates/templates.c:1158
+#: ../plugins/templates/templates.c:1168
 msgid "Templates"
 msgstr "Maler"
 
-#: ../mail/e-mail-migrate.c:131
+#: ../mail/e-mail-migrate.c:128
 msgid "Migrating..."
 msgstr "Flytter â"
 
-#: ../mail/e-mail-migrate.c:164
+#: ../mail/e-mail-migrate.c:161
 msgid "Migration"
 msgstr "Flytting"
 
-#: ../mail/e-mail-migrate.c:204
+#: ../mail/e-mail-migrate.c:201
 #, c-format
 msgid "Migrating '%s':"
 msgstr "Flytter Â%sÂ:"
 
-#: ../mail/e-mail-migrate.c:660
+#: ../mail/e-mail-migrate.c:672
 msgid "Migrating Folders"
 msgstr "Flytter mapper"
 
-#: ../mail/e-mail-migrate.c:661
+#: ../mail/e-mail-migrate.c:673
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -8223,28 +8224,24 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrere dine mapper â"
 
-#: ../mail/e-mail-migrate.c:1126
+#: ../mail/e-mail-migrate.c:1140
 #, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "Kunne ikke opprette lokale e-postmapper i Â%sÂ: %s"
 
-#: ../mail/e-mail-notebook-view.c:562
+#: ../mail/e-mail-notebook-view.c:581
 msgid "Please select a folder"
 msgstr "Vennligst velg en mappe"
 
-#. XXX e-error should provide a widget layout and API suitable
-#. *     for packing additional widgets to the right of the alert
-#. *     icon.  But for now, screw it.
-#: ../mail/e-mail-reader-utils.c:111
-#: ../modules/calendar/e-task-shell-view-actions.c:576
-msgid "Do not ask me again"
-msgstr "Ikke spÃr meg igjen"
+#: ../mail/e-mail-reader-utils.c:109
+msgid "Do not warn me again"
+msgstr "Ikke varsle meg igjen"
 
 #: ../mail/e-mail-reader.c:306 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: ../mail/e-mail-reader.c:306 ../mail/em-folder-utils.c:421
+#: ../mail/e-mail-reader.c:306 ../mail/em-folder-utils.c:450
 msgid "C_opy"
 msgstr "K_opier"
 
@@ -8265,25 +8262,24 @@ msgstr[1] ""
 "Mappen Â%sÂ inneholder %d duplikatmeldinger. Er du sikker pÃ at du vil "
 "slette dem?"
 
-#: ../mail/e-mail-reader.c:986 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:977 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "Flytt til mappe"
 
-#: ../mail/e-mail-reader.c:986 ../mail/em-folder-utils.c:421
+#: ../mail/e-mail-reader.c:977 ../mail/em-folder-utils.c:450
 msgid "_Move"
 msgstr "_Flytt"
 
-#. Check buttons
-#: ../mail/e-mail-reader.c:1265 ../mail/e-mail-reader.c:1423
-#: ../mail/e-mail-reader.c:1467
+#: ../mail/e-mail-reader.c:1261 ../mail/e-mail-reader.c:1427
+#: ../mail/e-mail-reader.c:1464
 msgid "_Do not ask me again."
 msgstr "_Ikke spÃr meg igjen."
 
-#: ../mail/e-mail-reader.c:1472
+#: ../mail/e-mail-reader.c:1470
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Alltid ignorer Reply-To: for e-postlister."
 
-#: ../mail/e-mail-reader.c:1581
+#: ../mail/e-mail-reader.c:1586
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Lagre melding"
@@ -8295,7 +8291,7 @@ msgstr[1] "Lagre meldinger"
 #. * Subject. The extension ".mbox" is appended to this
 #. * string, thus it will be something like "Message.mbox"
 #. * at the end.
-#: ../mail/e-mail-reader.c:1602
+#: ../mail/e-mail-reader.c:1607
 #: ../plugins/groupwise-features/notification.ui.h:1
 #: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Message"
@@ -8303,557 +8299,553 @@ msgid_plural "Messages"
 msgstr[0] "Melding"
 msgstr[1] "Meldinger"
 
-#: ../mail/e-mail-reader.c:1876
+#: ../mail/e-mail-reader.c:1879
 msgid "A_dd Sender to Address Book"
 msgstr "L_egg til avsender i adressebok"
 
-#: ../mail/e-mail-reader.c:1878
+#: ../mail/e-mail-reader.c:1881
 msgid "Add sender to address book"
 msgstr "Legg til avsender i adressebok"
 
-#: ../mail/e-mail-reader.c:1883
+#: ../mail/e-mail-reader.c:1886
 msgid "Check for _Junk"
 msgstr "Sjekk etter _uÃnsket e-post"
 
-#: ../mail/e-mail-reader.c:1885
+#: ../mail/e-mail-reader.c:1888
 msgid "Filter the selected messages for junk status"
 msgstr "Filtrer valgte meldinger etter uÃnsket e-poststatus"
 
-#: ../mail/e-mail-reader.c:1890
+#: ../mail/e-mail-reader.c:1893
 msgid "_Copy to Folder..."
 msgstr "K_opier til mappe â"
 
-#: ../mail/e-mail-reader.c:1892
+#: ../mail/e-mail-reader.c:1895
 msgid "Copy selected messages to another folder"
 msgstr "Kopier valgte meldinger til en annen mappe"
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:1900
 msgid "_Delete Message"
 msgstr "_Slett melding"
 
-#: ../mail/e-mail-reader.c:1899
+#: ../mail/e-mail-reader.c:1902
 msgid "Mark the selected messages for deletion"
 msgstr "Merk valgte meldinger for sletting"
 
-#: ../mail/e-mail-reader.c:1904
+#: ../mail/e-mail-reader.c:1907
 msgid "Filter on Mailing _List..."
 msgstr "Filtrer pÃ e-post_liste â"
 
-#: ../mail/e-mail-reader.c:1906
+#: ../mail/e-mail-reader.c:1909
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Lag en regel for Ã filtrere meldinger til denne meldingslisten"
 
-#: ../mail/e-mail-reader.c:1911
+#: ../mail/e-mail-reader.c:1914
 msgid "Filter on _Recipients..."
 msgstr "Filtrer pÃ mottake_re â"
 
-#: ../mail/e-mail-reader.c:1913
+#: ../mail/e-mail-reader.c:1916
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Lag en regel for Ã filtrere meldinger til disse mottakerene"
 
-#: ../mail/e-mail-reader.c:1918
+#: ../mail/e-mail-reader.c:1921
 msgid "Filter on Se_nder..."
 msgstr "Filtrer pÃ se_nder â"
 
-#: ../mail/e-mail-reader.c:1920
+#: ../mail/e-mail-reader.c:1923
 msgid "Create a rule to filter messages from this sender"
 msgstr "Lag en regel for Ã filtrere meldinger fra denne avsenderen"
 
-#: ../mail/e-mail-reader.c:1925
+#: ../mail/e-mail-reader.c:1928
 msgid "Filter on _Subject..."
 msgstr "Filtrer pÃ e_mne â"
 
-#: ../mail/e-mail-reader.c:1927
+#: ../mail/e-mail-reader.c:1930
 msgid "Create a rule to filter messages with this subject"
 msgstr "Lag en regel for filtrering av meldinger med dette emnet"
 
-#: ../mail/e-mail-reader.c:1932
+#: ../mail/e-mail-reader.c:1935
 msgid "A_pply Filters"
 msgstr "_PÃfÃr filtre"
 
-#: ../mail/e-mail-reader.c:1934
+#: ../mail/e-mail-reader.c:1937
 msgid "Apply filter rules to the selected messages"
 msgstr "Aktiver filterregler pÃ de valgte meldingene"
 
-#: ../mail/e-mail-reader.c:1939
+#: ../mail/e-mail-reader.c:1942
 msgid "_Find in Message..."
 msgstr "_Finn i melding â"
 
-#: ../mail/e-mail-reader.c:1941
+#: ../mail/e-mail-reader.c:1944
 msgid "Search for text in the body of the displayed message"
 msgstr "SÃk etter tekst i kroppen av vist melding"
 
-#: ../mail/e-mail-reader.c:1946
+#: ../mail/e-mail-reader.c:1949
 msgid "_Clear Flag"
 msgstr "F_jern flagg"
 
-#: ../mail/e-mail-reader.c:1948
+#: ../mail/e-mail-reader.c:1951
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Fjern flagg for oppfÃlging fra valgte meldinger"
 
-#: ../mail/e-mail-reader.c:1953
+#: ../mail/e-mail-reader.c:1956
 msgid "_Flag Completed"
 msgstr "Merk som _fullfÃrt"
 
-#: ../mail/e-mail-reader.c:1955
+#: ../mail/e-mail-reader.c:1958
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Sett flagg for oppfÃlging til fullfÃrt pÃ valgte meldinger"
 
-#: ../mail/e-mail-reader.c:1960
+#: ../mail/e-mail-reader.c:1963
 msgid "Follow _Up..."
 msgstr "FÃlg _opp â"
 
-#: ../mail/e-mail-reader.c:1962
+#: ../mail/e-mail-reader.c:1965
 msgid "Flag the selected messages for follow-up"
 msgstr "Merk valgte meldinger for oppfÃlging"
 
-#: ../mail/e-mail-reader.c:1967
+#: ../mail/e-mail-reader.c:1970
 msgid "_Attached"
 msgstr "L_agt ved"
 
-#: ../mail/e-mail-reader.c:1969 ../mail/e-mail-reader.c:1976
+#: ../mail/e-mail-reader.c:1972 ../mail/e-mail-reader.c:1979
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Videresend den valgte meldingen til noen som et vedlegg"
 
-#: ../mail/e-mail-reader.c:1974
+#: ../mail/e-mail-reader.c:1977
 msgid "Forward As _Attached"
 msgstr "Videresend s_om vedlegg"
 
-#: ../mail/e-mail-reader.c:1981
+#: ../mail/e-mail-reader.c:1984
 msgid "_Inline"
 msgstr "_I meldingen"
 
-#: ../mail/e-mail-reader.c:1983 ../mail/e-mail-reader.c:1990
+#: ../mail/e-mail-reader.c:1986 ../mail/e-mail-reader.c:1993
 msgid "Forward the selected message in the body of a new message"
 msgstr "Videresend den valgte meldingen i kroppen av en ny melding"
 
-#: ../mail/e-mail-reader.c:1988
+#: ../mail/e-mail-reader.c:1991
 msgid "Forward As _Inline"
 msgstr "V_ideresend som vedlegg"
 
-#: ../mail/e-mail-reader.c:1995
+#: ../mail/e-mail-reader.c:1998
 msgid "_Quoted"
 msgstr "_Sitert"
 
-#: ../mail/e-mail-reader.c:1997 ../mail/e-mail-reader.c:2004
+#: ../mail/e-mail-reader.c:2000 ../mail/e-mail-reader.c:2007
 msgid "Forward the selected message quoted like a reply"
 msgstr "Videresend den valgte meldingen sitert som et svar"
 
-#: ../mail/e-mail-reader.c:2002
+#: ../mail/e-mail-reader.c:2005
 msgid "Forward As _Quoted"
 msgstr "Videresend s_om sitat"
 
-#: ../mail/e-mail-reader.c:2009
+#: ../mail/e-mail-reader.c:2012
 msgid "_Load Images"
 msgstr "_Last bilder"
 
-#: ../mail/e-mail-reader.c:2011
+#: ../mail/e-mail-reader.c:2014
 msgid "Force images in HTML mail to be loaded"
 msgstr "Tvungen lasting av bilder i HTML e-post"
 
-#: ../mail/e-mail-reader.c:2016
+#: ../mail/e-mail-reader.c:2019
 msgid "_Important"
 msgstr "V_iktig"
 
-#: ../mail/e-mail-reader.c:2018
+#: ../mail/e-mail-reader.c:2021
 msgid "Mark the selected messages as important"
 msgstr "Merk valgte meldinger som viktige"
 
-#: ../mail/e-mail-reader.c:2023
+#: ../mail/e-mail-reader.c:2026
 msgid "_Junk"
 msgstr "_UÃnsket e-post"
 
-#: ../mail/e-mail-reader.c:2025
+#: ../mail/e-mail-reader.c:2028
 msgid "Mark the selected messages as junk"
 msgstr "Merk valgte meldinger som uÃnsket e-post"
 
-#: ../mail/e-mail-reader.c:2030
+#: ../mail/e-mail-reader.c:2033
 msgid "_Not Junk"
 msgstr "_Ikke uÃnsket e-post"
 
-#: ../mail/e-mail-reader.c:2032
+#: ../mail/e-mail-reader.c:2035
 msgid "Mark the selected messages as not being junk"
 msgstr "Merk valgte meldinger som Ãnsket e-post"
 
-#: ../mail/e-mail-reader.c:2037
+#: ../mail/e-mail-reader.c:2040
 msgid "_Read"
 msgstr "_Les"
 
-#: ../mail/e-mail-reader.c:2039
+#: ../mail/e-mail-reader.c:2042
 msgid "Mark the selected messages as having been read"
 msgstr "Merk valgte meldinger som lest"
 
-#: ../mail/e-mail-reader.c:2044
+#: ../mail/e-mail-reader.c:2047
 msgid "Uni_mportant"
 msgstr "_Ikke viktig"
 
-#: ../mail/e-mail-reader.c:2046
+#: ../mail/e-mail-reader.c:2049
 msgid "Mark the selected messages as unimportant"
 msgstr "Merk valgte meldinger som uviktige"
 
-#: ../mail/e-mail-reader.c:2051
+#: ../mail/e-mail-reader.c:2054
 msgid "_Unread"
 msgstr "_Ulest"
 
-#: ../mail/e-mail-reader.c:2053
+#: ../mail/e-mail-reader.c:2056
 msgid "Mark the selected messages as not having been read"
 msgstr "Merk valgte meldinger som ulest"
 
-#: ../mail/e-mail-reader.c:2058
+#: ../mail/e-mail-reader.c:2061
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding â"
 
-#: ../mail/e-mail-reader.c:2060
+#: ../mail/e-mail-reader.c:2063
 msgid "Open the selected messages in the composer for editing"
 msgstr "Ãpne valgte meldinger i redigeringskomponenten"
 
-#: ../mail/e-mail-reader.c:2065
+#: ../mail/e-mail-reader.c:2068
 msgid "Compose _New Message"
 msgstr "Skriv _ny melding"
 
-#: ../mail/e-mail-reader.c:2067
+#: ../mail/e-mail-reader.c:2070
 msgid "Open a window for composing a mail message"
 msgstr "Ãpne et vindu for Ã skrive en e-post melding"
 
-#: ../mail/e-mail-reader.c:2072
+#: ../mail/e-mail-reader.c:2075
 msgid "_Open in New Window"
 msgstr "_Ãpne i _nytt vindu"
 
-#: ../mail/e-mail-reader.c:2074
+#: ../mail/e-mail-reader.c:2077
 msgid "Open the selected messages in a new window"
 msgstr "Ãpne valgte meldinger i et nytt vindu"
 
-#: ../mail/e-mail-reader.c:2079
+#: ../mail/e-mail-reader.c:2082
 msgid "_Move to Folder..."
 msgstr "Fl_ytt til mappe â"
 
-#: ../mail/e-mail-reader.c:2081
+#: ../mail/e-mail-reader.c:2084
 msgid "Move selected messages to another folder"
 msgstr "Flytt valgte meldinger til en annen mappe"
 
-#: ../mail/e-mail-reader.c:2086
+#: ../mail/e-mail-reader.c:2089
 msgid "_Switch to Folder"
 msgstr "_Bytt til mappe"
 
-#: ../mail/e-mail-reader.c:2088
+#: ../mail/e-mail-reader.c:2091
 msgid "Display the parent folder"
 msgstr "Vis opphavsmappe"
 
-#: ../mail/e-mail-reader.c:2093
+#: ../mail/e-mail-reader.c:2096
 msgid "Switch to _next tab"
 msgstr "Bytt til _neste fane"
 
-#: ../mail/e-mail-reader.c:2095
+#: ../mail/e-mail-reader.c:2098
 msgid "Switch to the next tab"
 msgstr "Bytt til neste fane"
 
-#: ../mail/e-mail-reader.c:2100
+#: ../mail/e-mail-reader.c:2103
 msgid "Switch to _previous tab"
 msgstr "Bytt til _forrige fane"
 
-#: ../mail/e-mail-reader.c:2102
+#: ../mail/e-mail-reader.c:2105
 msgid "Switch to the previous tab"
 msgstr "Bytt til forrige fane"
 
-#: ../mail/e-mail-reader.c:2107
+#: ../mail/e-mail-reader.c:2110
 msgid "Cl_ose current tab"
 msgstr "L_ukk aktiv fane"
 
-#: ../mail/e-mail-reader.c:2109
+#: ../mail/e-mail-reader.c:2112
 msgid "Close current tab"
 msgstr "Lukk aktiv fane"
 
-#: ../mail/e-mail-reader.c:2114
+#: ../mail/e-mail-reader.c:2117
 msgid "_Next Message"
 msgstr "_Neste melding"
 
-#: ../mail/e-mail-reader.c:2116
+#: ../mail/e-mail-reader.c:2119
 msgid "Display the next message"
 msgstr "Vis neste melding"
 
-#: ../mail/e-mail-reader.c:2121
+#: ../mail/e-mail-reader.c:2124
 msgid "Next _Important Message"
 msgstr "Neste v_iktige melding"
 
-#: ../mail/e-mail-reader.c:2123
+#: ../mail/e-mail-reader.c:2126
 msgid "Display the next important message"
 msgstr "Vis neste viktige melding"
 
-#: ../mail/e-mail-reader.c:2128
+#: ../mail/e-mail-reader.c:2131
 msgid "Next _Thread"
 msgstr "Neste _trÃd"
 
-#: ../mail/e-mail-reader.c:2130
+#: ../mail/e-mail-reader.c:2133
 msgid "Display the next thread"
 msgstr "Vis neste trÃd"
 
-#: ../mail/e-mail-reader.c:2135
+#: ../mail/e-mail-reader.c:2138
 msgid "Next _Unread Message"
 msgstr "Neste _uleste melding"
 
-#: ../mail/e-mail-reader.c:2137
+#: ../mail/e-mail-reader.c:2140
 msgid "Display the next unread message"
 msgstr "Vis neste uleste melding"
 
-#: ../mail/e-mail-reader.c:2142
+#: ../mail/e-mail-reader.c:2145
 msgid "_Previous Message"
 msgstr "_Forrige melding"
 
-#: ../mail/e-mail-reader.c:2144
+#: ../mail/e-mail-reader.c:2147
 msgid "Display the previous message"
 msgstr "Vis forrige melding"
 
-#: ../mail/e-mail-reader.c:2149
+#: ../mail/e-mail-reader.c:2152
 msgid "Pr_evious Important Message"
 msgstr "Forrig_e viktige melding"
 
-#: ../mail/e-mail-reader.c:2151
+#: ../mail/e-mail-reader.c:2154
 msgid "Display the previous important message"
 msgstr "Vis forrige viktige melding"
 
-#: ../mail/e-mail-reader.c:2156
+#: ../mail/e-mail-reader.c:2159
 msgid "Previous T_hread"
 msgstr "Forrige trÃ_d"
 
-#: ../mail/e-mail-reader.c:2158
+#: ../mail/e-mail-reader.c:2161
 msgid "Display the previous thread"
 msgstr "Vis forrige trÃd"
 
-#: ../mail/e-mail-reader.c:2163
+#: ../mail/e-mail-reader.c:2166
 msgid "P_revious Unread Message"
 msgstr "Fo_rrige uleste melding"
 
-#: ../mail/e-mail-reader.c:2165
+#: ../mail/e-mail-reader.c:2168
 msgid "Display the previous unread message"
 msgstr "Vis forrige uleste melding"
 
-#: ../mail/e-mail-reader.c:2172
+#: ../mail/e-mail-reader.c:2175
 msgid "Print this message"
 msgstr "Skriv ut denne meldingen"
 
-#: ../mail/e-mail-reader.c:2179
+#: ../mail/e-mail-reader.c:2182
 msgid "Preview the message to be printed"
 msgstr "ForhÃndsvis meldingen som skal skrives ut"
 
-#: ../mail/e-mail-reader.c:2184
+#: ../mail/e-mail-reader.c:2187
 msgid "Re_direct"
 msgstr "Om_diriger"
 
-#: ../mail/e-mail-reader.c:2186
+#: ../mail/e-mail-reader.c:2189
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Omdiriger (bounce) den valgte meldingen til noen"
 
-#: ../mail/e-mail-reader.c:2191
+#: ../mail/e-mail-reader.c:2194
 msgid "Remo_ve Attachments"
 msgstr "Fjern _vedlegg"
 
-#: ../mail/e-mail-reader.c:2193
+#: ../mail/e-mail-reader.c:2196
 msgid "Remove attachments"
 msgstr "Fjern vedlegg"
 
-#: ../mail/e-mail-reader.c:2198
+#: ../mail/e-mail-reader.c:2201
 msgid "Remove Du_plicate Messages"
 msgstr "Fjern du_plikatmeldinger"
 
-#: ../mail/e-mail-reader.c:2200
+#: ../mail/e-mail-reader.c:2203
 msgid "Checks selected messages for duplicates"
 msgstr "Sjekk valgte meldinger for duplikater"
 
-#: ../mail/e-mail-reader.c:2205 ../mail/mail.error.xml.h:102
+#: ../mail/e-mail-reader.c:2208 ../mail/mail.error.xml.h:103
 #: ../modules/calendar/e-cal-shell-view-actions.c:1465
 #: ../modules/mail/e-mail-attachment-handler.c:179
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: ../mail/e-mail-reader.c:2207
+#: ../mail/e-mail-reader.c:2210
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Skriv et svar til alle mottakere av den valgte meldingen"
 
-#: ../mail/e-mail-reader.c:2212 ../mail/mail.error.xml.h:103
+#: ../mail/e-mail-reader.c:2215 ../mail/mail.error.xml.h:104
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: ../mail/e-mail-reader.c:2214
+#: ../mail/e-mail-reader.c:2217
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Skriv et svar til e-postlisten for den valgte meldingen"
 
-#: ../mail/e-mail-reader.c:2219
+#: ../mail/e-mail-reader.c:2222
 #: ../modules/mail/e-mail-attachment-handler.c:186
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsender"
 
-#: ../mail/e-mail-reader.c:2221
+#: ../mail/e-mail-reader.c:2224
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Skriv et svar til avsender av den valgte meldingen"
 
-#: ../mail/e-mail-reader.c:2226
+#: ../mail/e-mail-reader.c:2229
 msgid "_Save as mbox..."
 msgstr "Lagre _som mbox â"
 
-#: ../mail/e-mail-reader.c:2228
+#: ../mail/e-mail-reader.c:2231
 msgid "Save selected messages as an mbox file"
 msgstr "Lagre valgte meldinger som en mbox-fil"
 
-#: ../mail/e-mail-reader.c:2233
+#: ../mail/e-mail-reader.c:2236
 msgid "Search Folder from Mailing _List..."
 msgstr "SÃkemappe pÃ e-post_liste â"
 
-#: ../mail/e-mail-reader.c:2235
+#: ../mail/e-mail-reader.c:2238
 msgid "Create a search folder for this mailing list"
 msgstr "Lag en sÃkemappe for denne e-postlisten"
 
-#: ../mail/e-mail-reader.c:2240
+#: ../mail/e-mail-reader.c:2243
 msgid "Search Folder from Recipien_ts..."
 msgstr "SÃkemappe fra mo_ttakere â"
 
-#: ../mail/e-mail-reader.c:2242
+#: ../mail/e-mail-reader.c:2245
 msgid "Create a search folder for these recipients"
 msgstr "Lag en sÃkemappe for disse mottakerene"
 
-#: ../mail/e-mail-reader.c:2247
+#: ../mail/e-mail-reader.c:2250
 msgid "Search Folder from Sen_der..."
 msgstr "SÃkemappe for avsen_der â"
 
-#: ../mail/e-mail-reader.c:2249
+#: ../mail/e-mail-reader.c:2252
 msgid "Create a search folder for this sender"
 msgstr "Lag en sÃkemappe for denne avsenderen"
 
-#: ../mail/e-mail-reader.c:2254
+#: ../mail/e-mail-reader.c:2257
 msgid "Search Folder from S_ubject..."
 msgstr "SÃkemappe for _emne â"
 
-#: ../mail/e-mail-reader.c:2256
+#: ../mail/e-mail-reader.c:2259
 msgid "Create a search folder for this subject"
 msgstr "Lag en sÃkemappe for dette emnet"
 
-#: ../mail/e-mail-reader.c:2261
+#: ../mail/e-mail-reader.c:2264
 msgid "_Message Source"
 msgstr "_Meldingskilde"
 
-#: ../mail/e-mail-reader.c:2263
+#: ../mail/e-mail-reader.c:2266
 msgid "Show the raw email source of the message"
 msgstr "Vis e-post meldingen i sin rÃe form"
 
-#: ../mail/e-mail-reader.c:2275
+#: ../mail/e-mail-reader.c:2278
 msgid "_Undelete Message"
 msgstr "_Angre sletting av melding"
 
-#: ../mail/e-mail-reader.c:2277
+#: ../mail/e-mail-reader.c:2280
 msgid "Undelete the selected messages"
 msgstr "Angre sletting av valgte meldinger"
 
-#: ../mail/e-mail-reader.c:2282
+#: ../mail/e-mail-reader.c:2285
 msgid "_Normal Size"
 msgstr "_Normal stÃrrelse"
 
-#: ../mail/e-mail-reader.c:2284
+#: ../mail/e-mail-reader.c:2287
 msgid "Reset the text to its original size"
 msgstr "Ta teksten tilbake til sin opprinnelige stÃrrelse"
 
-#: ../mail/e-mail-reader.c:2289
+#: ../mail/e-mail-reader.c:2292
 msgid "_Zoom In"
 msgstr "_Zoom inn"
 
-#: ../mail/e-mail-reader.c:2291
+#: ../mail/e-mail-reader.c:2294
 msgid "Increase the text size"
 msgstr "StÃrre tekst"
 
-#: ../mail/e-mail-reader.c:2296
+#: ../mail/e-mail-reader.c:2299
 msgid "Zoom _Out"
 msgstr "Zoom _ut"
 
-#: ../mail/e-mail-reader.c:2298
+#: ../mail/e-mail-reader.c:2301
 msgid "Decrease the text size"
 msgstr "Mindre skrift"
 
-#: ../mail/e-mail-reader.c:2305
+#: ../mail/e-mail-reader.c:2308
 msgid "Create R_ule"
 msgstr "Opprett _regel"
 
-#: ../mail/e-mail-reader.c:2312
+#: ../mail/e-mail-reader.c:2315
 msgid "Ch_aracter Encoding"
 msgstr "Tegn_koding"
 
-#: ../mail/e-mail-reader.c:2319
+#: ../mail/e-mail-reader.c:2322
 msgid "F_orward As"
 msgstr "Videresend s_om"
 
-#: ../mail/e-mail-reader.c:2326
+#: ../mail/e-mail-reader.c:2329
 msgid "_Group Reply"
 msgstr "_Gruppesvar"
 
-#: ../mail/e-mail-reader.c:2333
+#: ../mail/e-mail-reader.c:2336
 msgid "_Go To"
 msgstr "_GÃ til"
 
-#: ../mail/e-mail-reader.c:2340
+#: ../mail/e-mail-reader.c:2343
 msgid "Mar_k As"
 msgstr "Mer_k som"
 
-#: ../mail/e-mail-reader.c:2347
+#: ../mail/e-mail-reader.c:2350
 msgid "_Message"
 msgstr "_Melding"
 
-#: ../mail/e-mail-reader.c:2354
+#: ../mail/e-mail-reader.c:2357
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../mail/e-mail-reader.c:2379
+#: ../mail/e-mail-reader.c:2382
 msgid "Mark for Follo_w Up..."
 msgstr "Merk for oppfÃl_ging â"
 
-#: ../mail/e-mail-reader.c:2387
+#: ../mail/e-mail-reader.c:2390
 msgid "Mark as _Important"
 msgstr "Merk som v_iktig"
 
-#: ../mail/e-mail-reader.c:2391
+#: ../mail/e-mail-reader.c:2394
 msgid "Mark as _Junk"
 msgstr "Merk som _uÃnsket e-post"
 
-#: ../mail/e-mail-reader.c:2395
+#: ../mail/e-mail-reader.c:2398
 msgid "Mark as _Not Junk"
 msgstr "Merk som _gyldig melding"
 
-#: ../mail/e-mail-reader.c:2399
+#: ../mail/e-mail-reader.c:2402
 msgid "Mar_k as Read"
 msgstr "Mer_k som lest"
 
-#: ../mail/e-mail-reader.c:2403
+#: ../mail/e-mail-reader.c:2406
 msgid "Mark as Uni_mportant"
 msgstr "_Merk som uviktig"
 
-#: ../mail/e-mail-reader.c:2407
+#: ../mail/e-mail-reader.c:2410
 msgid "Mark as _Unread"
 msgstr "Merk som _ulest"
 
-#: ../mail/e-mail-reader.c:2451
+#: ../mail/e-mail-reader.c:2454
 msgid "_Caret Mode"
 msgstr "MarkÃr_modus"
 
-#: ../mail/e-mail-reader.c:2453
+#: ../mail/e-mail-reader.c:2456
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Vis en blinkende markÃr i kroppen av meldinger som vises"
 
-#: ../mail/e-mail-reader.c:2459
+#: ../mail/e-mail-reader.c:2462
 msgid "All Message _Headers"
 msgstr "Alle meldings_hoder"
 
-#: ../mail/e-mail-reader.c:2461
+#: ../mail/e-mail-reader.c:2464
 msgid "Show messages with all email headers"
 msgstr "Vis meldinger med alle meldingshoder"
 
-#: ../mail/e-mail-reader.c:2699
-msgid "Unable to retrieve message"
-msgstr "Kunne ikke hente ut melding"
-
-#: ../mail/e-mail-reader.c:2761 ../mail/mail-ops.c:2068
+#: ../mail/e-mail-reader.c:2757 ../mail/mail-ops.c:2020
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Henter melding Â%sÂ"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:3379 ../mail/mail-config.ui.h:31
+#: ../mail/e-mail-reader.c:3344 ../mail/mail-config.ui.h:32
 #: ../plugins/google-account-setup/google-source.c:304
 #: ../plugins/google-account-setup/google-source.c:538
 #: ../plugins/google-account-setup/google-source.c:674
@@ -8861,100 +8853,100 @@ msgstr "Henter melding Â%sÂ"
 msgid "Default"
 msgstr "Forvalgt"
 
-#: ../mail/e-mail-reader.c:3550
+#: ../mail/e-mail-reader.c:3518
 #: ../modules/mail/e-mail-attachment-handler.c:172
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: ../mail/e-mail-reader.c:3551
+#: ../mail/e-mail-reader.c:3519
 msgid "Forward the selected message to someone"
 msgstr "Videresend den valgte meldingen til noen"
 
-#: ../mail/e-mail-reader.c:3570
+#: ../mail/e-mail-reader.c:3538
 msgid "Group Reply"
 msgstr "Gruppesvar"
 
-#: ../mail/e-mail-reader.c:3571
+#: ../mail/e-mail-reader.c:3539
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Svar til e-postlisten eller til alle mottakere"
 
-#: ../mail/e-mail-reader.c:3616 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3584 ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:746
 msgid "Delete"
 msgstr "Slett"
 
-#: ../mail/e-mail-reader.c:3649
+#: ../mail/e-mail-reader.c:3617
 #: ../modules/calendar/e-cal-shell-view-actions.c:1311
 #: ../widgets/misc/e-calendar.c:201
 msgid "Next"
 msgstr "Neste"
 
-#: ../mail/e-mail-reader.c:3653
+#: ../mail/e-mail-reader.c:3621
 #: ../modules/calendar/e-cal-shell-view-actions.c:1304
 #: ../widgets/misc/e-calendar.c:177
 msgid "Previous"
 msgstr "Forrige"
 
-#: ../mail/e-mail-reader.c:3663 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:3630 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "Svar"
 
-#: ../mail/e-mail-reader.c:4298
+#: ../mail/e-mail-reader.c:4254
 #, c-format
 msgid "Folder '%s'"
 msgstr "Mappe Â%sÂ"
 
-#: ../mail/e-mail-session.c:643
+#: ../mail/e-mail-session.c:647
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Skriv inn passord for %s"
 
-#: ../mail/e-mail-session.c:645
+#: ../mail/e-mail-session.c:649
 msgid "Enter Passphrase"
 msgstr "Skriv inn passord"
 
-#: ../mail/e-mail-session.c:648
+#: ../mail/e-mail-session.c:652
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Skriv inn passord for %s"
 
-#: ../mail/e-mail-session.c:650
+#: ../mail/e-mail-session.c:654
 msgid "Enter Password"
 msgstr "Skriv inn passord"
 
-#: ../mail/e-mail-session.c:701
+#: ../mail/e-mail-session.c:705
 #, c-format
 msgid "User canceled operation."
 msgstr "Operasjon avbrutt av bruker."
 
-#: ../mail/e-mail-session.c:871
+#: ../mail/e-mail-session.c:820
 #, c-format
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr "Ingen mÃladresse oppgitt. Videresending av meldingen ble avbrutt."
 
-#: ../mail/e-mail-session.c:880
+#: ../mail/e-mail-session.c:829
 #, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "Fant ingen konto Ã bruke. Videresending av meldingen ble avbrutt."
 
-#: ../mail/e-mail-session.c:1283 ../mail/mail-ops.c:1220
+#: ../mail/e-mail-session.c:1233 ../mail/mail-ops.c:1253
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "Ãpner mappe Â%sÂ"
 
-#: ../mail/e-mail-session.c:1299
+#: ../mail/e-mail-session.c:1249
 #, c-format
 msgid "Invalid folder: %s"
 msgstr "Ugyldig mappe: %s"
 
-#: ../mail/e-mail-session-utils.c:490 ../mail/mail-ops.c:605
+#: ../mail/e-mail-session-utils.c:485 ../mail/mail-ops.c:637
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Feil under pÃfÃring av utgÃende filtre: %s"
 
-#: ../mail/e-mail-session-utils.c:514 ../mail/e-mail-session-utils.c:548
-#: ../mail/mail-ops.c:622 ../mail/mail-ops.c:653
+#: ../mail/e-mail-session-utils.c:509 ../mail/e-mail-session-utils.c:543
+#: ../mail/mail-ops.c:656 ../mail/mail-ops.c:687
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -8963,17 +8955,17 @@ msgstr ""
 "Kunne ikke legge til i %s: %s\n"
 "Legger til i lokal ÂSendtÂ-mappe i stedet."
 
-#: ../mail/e-mail-session-utils.c:568 ../mail/mail-ops.c:673
+#: ../mail/e-mail-session-utils.c:563 ../mail/mail-ops.c:707
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Kunne ikke legge til i lokal Sendt-mappe: %s"
 
-#: ../mail/e-mail-session-utils.c:779 ../mail/mail-ops.c:774
-#: ../mail/mail-ops.c:866
+#: ../mail/e-mail-session-utils.c:774 ../mail/mail-ops.c:806
+#: ../mail/mail-ops.c:898
 msgid "Sending message"
 msgstr "Sender melding"
 
-#: ../mail/e-mail-session-utils.c:850
+#: ../mail/e-mail-session-utils.c:845
 #, c-format
 msgid "Unsubscribing from folder '%s'"
 msgstr "Fjerner abonnement pÃ mappe Â%sÂ"
@@ -8988,13 +8980,13 @@ msgstr "Kobler fra Â%sÂ"
 msgid "Reconnecting to '%s'"
 msgstr "Kobler til Â%sÂ pÃ nytt"
 
-#: ../mail/e-mail-tag-editor.c:290
+#: ../mail/e-mail-tag-editor.c:291
 msgid "Flag to Follow Up"
 msgstr "Merk for oppfÃlging"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:563 ../mail/mail-config.ui.h:69
+#: ../mail/em-account-editor.c:568 ../mail/mail-config.ui.h:72
 #: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "Ingen kryptering"
@@ -9002,7 +8994,7 @@ msgstr "Ingen kryptering"
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:567 ../mail/mail-config.ui.h:126
+#: ../mail/em-account-editor.c:572 ../mail/mail-config.ui.h:130
 #: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "TLS-kryptering"
@@ -9010,40 +9002,40 @@ msgstr "TLS-kryptering"
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:571 ../mail/mail-config.ui.h:91
+#: ../mail/em-account-editor.c:576 ../mail/mail-config.ui.h:94
 #: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "SSL-kryptering"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:834 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:839 ../widgets/misc/e-signature-combo-box.c:75
 msgctxt "mail-signature"
 msgid "None"
 msgstr "Ingen"
 
-#: ../mail/em-account-editor.c:915
+#: ../mail/em-account-editor.c:920
 msgid "Never"
 msgstr "Aldri"
 
-#: ../mail/em-account-editor.c:916
+#: ../mail/em-account-editor.c:921
 msgid "Always"
 msgstr "Alltid"
 
-#: ../mail/em-account-editor.c:917
+#: ../mail/em-account-editor.c:922
 msgid "Ask for each message"
 msgstr "SpÃr for hver melding"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1699 ../widgets/misc/e-account-tree-view.c:127
+#: ../mail/em-account-editor.c:1742 ../widgets/misc/e-account-tree-view.c:127
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "Ingen"
 
-#: ../mail/em-account-editor.c:2086
+#: ../mail/em-account-editor.c:2164
 msgid "Mail Configuration"
 msgstr "E-post-konfigurasjon"
 
-#: ../mail/em-account-editor.c:2087
+#: ../mail/em-account-editor.c:2165
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -9053,7 +9045,7 @@ msgstr ""
 "\n"
 "Klikk ÂFramoverÂ for Ã begynne."
 
-#: ../mail/em-account-editor.c:2090
+#: ../mail/em-account-editor.c:2168
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -9063,19 +9055,19 @@ msgstr ""
 "under mÃ ikke nÃdvendigvis fylles ut, hvis du ikke Ãnsker Ã inkludere denne "
 "informasjonen i meldingene du sender."
 
-#: ../mail/em-account-editor.c:2092 ../mail/em-account-editor.c:2255
+#: ../mail/em-account-editor.c:2170 ../mail/em-account-editor.c:2333
 msgid "Receiving Email"
 msgstr "Innkommende e-post"
 
-#: ../mail/em-account-editor.c:2093
+#: ../mail/em-account-editor.c:2171
 msgid "Please configure the following account settings."
 msgstr "Vennligst konfigurer fÃlgende kontoinnstillinger."
 
-#: ../mail/em-account-editor.c:2095 ../mail/em-account-editor.c:2755
+#: ../mail/em-account-editor.c:2173 ../mail/em-account-editor.c:2833
 msgid "Sending Email"
 msgstr "UtgÃende e-post"
 
-#: ../mail/em-account-editor.c:2096
+#: ../mail/em-account-editor.c:2174
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -9083,11 +9075,11 @@ msgstr ""
 "Vennligst skriv inn informasjon om mÃten du sender e-post. Hvis du ikke er "
 "sikker, kontakt din systemadministrator eller din Internett tjenestetilbyder."
 
-#: ../mail/em-account-editor.c:2098 ../mail/mail-config.ui.h:1
+#: ../mail/em-account-editor.c:2176 ../mail/mail-config.ui.h:1
 msgid "Account Information"
 msgstr "Kontoinformasjon"
 
-#: ../mail/em-account-editor.c:2099
+#: ../mail/em-account-editor.c:2177
 msgid ""
 "Please enter a descriptive name for this account below.\n"
 "This name will be used for display purposes only."
@@ -9095,11 +9087,11 @@ msgstr ""
 "Vennligst oppgi et beskrivende navn for denne kontoen i feltet under.\n"
 "Dette navnet vil kun bli brukt som et visningsnavn."
 
-#: ../mail/em-account-editor.c:2103
+#: ../mail/em-account-editor.c:2181
 msgid "Done"
 msgstr "Ferdig"
 
-#: ../mail/em-account-editor.c:2104
+#: ../mail/em-account-editor.c:2182
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -9113,36 +9105,36 @@ msgstr ""
 "\n"
 "Klikk ÂBrukÂ for Ã lagre dine innstillinger."
 
-#: ../mail/em-account-editor.c:2569
+#: ../mail/em-account-editor.c:2647
 msgid "Check for _new messages every"
 msgstr "Se etter _nye meldinger hver(t)"
 
-#: ../mail/em-account-editor.c:2577
+#: ../mail/em-account-editor.c:2655
 msgid "minu_tes"
 msgstr "minu_tter"
 
-#: ../mail/em-account-editor.c:2860
+#: ../mail/em-account-editor.c:2938
 msgid "Please select a folder from the current account."
 msgstr "Vennligst velg en mappe fra valgt konto."
 
-#: ../mail/em-account-editor.c:3170 ../mail/mail-config.ui.h:98
+#: ../mail/em-account-editor.c:3248 ../mail/mail-config.ui.h:101
 msgid "Security"
 msgstr "Sikkerhet"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:3216 ../mail/em-account-editor.c:3284
+#: ../mail/em-account-editor.c:3294 ../mail/em-account-editor.c:3362
 msgid "Receiving Options"
 msgstr "Alternativer for mottak"
 
-#: ../mail/em-account-editor.c:3217 ../mail/em-account-editor.c:3285
+#: ../mail/em-account-editor.c:3295 ../mail/em-account-editor.c:3363
 msgid "Checking for New Messages"
 msgstr "Ser etter nye meldinger"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see mail/em-composer-utils.c:attribvars array
-#: ../mail/em-composer-utils.c:1154
+#: ../mail/em-composer-utils.c:1193
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -9150,35 +9142,35 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Day}.${Month}.${Year} kl. ${24Hour}.${Minute} "
 "${TimeZone}, skrev ${Sender}:"
 
-#: ../mail/em-composer-utils.c:1164
+#: ../mail/em-composer-utils.c:1204
 msgid "-----Original Message-----"
 msgstr "-----Opprinnelig melding-----"
 
-#. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
-#: ../mail/em-composer-utils.c:1821
+#. Translators: First %s is an email address, second %s
+#. * is the subject of the email, third %s is the date.
+#: ../mail/em-composer-utils.c:1866
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "Din melding til %s om Â%sÂ den %s er har blitt lest."
 
-#. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1871
+#: ../mail/em-composer-utils.c:1920
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "Varsling om ny e-post for Â%sÂ"
 
-#: ../mail/em-composer-utils.c:2291
+#: ../mail/em-composer-utils.c:2380
 msgid "an unknown sender"
 msgstr "en ukjent avsender"
 
-#: ../mail/em-composer-utils.c:2715
+#: ../mail/em-composer-utils.c:2813
 msgid "Posting destination"
 msgstr "Destinasjon for post"
 
-#: ../mail/em-composer-utils.c:2716
+#: ../mail/em-composer-utils.c:2814
 msgid "Choose folders to post the message to."
 msgstr "Velg mapper meldingen skal postes til."
 
-#: ../mail/em-filter-folder-element.c:337
+#: ../mail/em-filter-folder-element.c:339
 msgid "Select Folder"
 msgstr "Velg mappe"
 
@@ -9295,7 +9287,7 @@ msgstr "er ikke satt"
 msgid "is set"
 msgstr "er satt"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:60
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:63
 msgid "Junk"
 msgstr "UÃnsket e-post"
 
@@ -9466,11 +9458,11 @@ msgstr "Egenskaper for mappe"
 msgid "<click here to select a folder>"
 msgstr "<klikk her for Ã velge en mappe>"
 
-#: ../mail/em-folder-selector.c:261
+#: ../mail/em-folder-selector.c:269
 msgid "C_reate"
 msgstr "Opp_rett"
 
-#: ../mail/em-folder-selector.c:265
+#: ../mail/em-folder-selector.c:273
 msgid "Folder _name:"
 msgstr "Mappe_navn:"
 
@@ -9478,7 +9470,7 @@ msgstr "Mappe_navn:"
 #: ../mail/em-folder-tree-model.c:147 ../mail/em-folder-tree-model.c:150
 #: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:158
 #: ../mail/em-folder-tree-model.c:165 ../mail/em-folder-tree-model.c:167
-#: ../mail/mail-vfolder.c:1164 ../mail/mail-vfolder.c:1239
+#: ../mail/mail-vfolder.c:1182 ../mail/mail-vfolder.c:1257
 msgid "Search Folders"
 msgstr "SÃkemapper"
 
@@ -9487,7 +9479,7 @@ msgstr "SÃkemapper"
 msgid "UNMATCHED"
 msgstr "UTEN TREFF"
 
-#: ../mail/em-folder-tree-model.c:807 ../mail/em-folder-tree-model.c:1084
+#: ../mail/em-folder-tree-model.c:787 ../mail/em-folder-tree-model.c:1063
 msgid "Loading..."
 msgstr "Laster â"
 
@@ -9496,74 +9488,74 @@ msgstr "Laster â"
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i Â%sÂ"
 
-#: ../mail/em-folder-tree.c:625
+#: ../mail/em-folder-tree.c:624
 msgid "Folder names cannot contain '/'"
 msgstr "Mappenavn kan ikke inneholde tegnet Â/Â"
 
-#: ../mail/em-folder-tree.c:1245
+#: ../mail/em-folder-tree.c:1249
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1481
+#: ../mail/em-folder-tree.c:1486
 msgid "Mail Folder Tree"
 msgstr "Tre for e-postmapper"
 
-#: ../mail/em-folder-tree.c:1937 ../mail/em-folder-utils.c:90
+#: ../mail/em-folder-tree.c:1942 ../mail/em-folder-utils.c:90
 #, c-format
 msgid "Moving folder %s"
 msgstr "Flytter mappe %s"
 
-#: ../mail/em-folder-tree.c:1941 ../mail/em-folder-utils.c:92
+#: ../mail/em-folder-tree.c:1946 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopierer mappe %s"
 
-#: ../mail/em-folder-tree.c:1950 ../mail/message-list.c:2243
+#: ../mail/em-folder-tree.c:1955 ../mail/message-list.c:2230
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flytter meldinger til mappe %s"
 
-#: ../mail/em-folder-tree.c:1954 ../mail/message-list.c:2245
+#: ../mail/em-folder-tree.c:1959 ../mail/message-list.c:2232
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer meldinger til mappe %s"
 
-#: ../mail/em-folder-tree.c:1973
+#: ../mail/em-folder-tree.c:1978
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan ikke slippe melding(er) toppnivÃ for lageret"
 
-#: ../mail/em-folder-utils.c:422
+#: ../mail/em-folder-utils.c:451
 msgid "Move Folder To"
 msgstr "Flytt mappe til"
 
-#: ../mail/em-folder-utils.c:422
+#: ../mail/em-folder-utils.c:451
 msgid "Copy Folder To"
 msgstr "Kopier mappe til"
 
-#: ../mail/em-folder-utils.c:571
+#: ../mail/em-folder-utils.c:600
 #: ../plugins/groupwise-features/share-folder-common.c:138
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "Oppretter mappe Â%sÂ"
 
-#: ../mail/em-folder-utils.c:741
+#: ../mail/em-folder-utils.c:772
 msgid "Create Folder"
 msgstr "Opprett mappe"
 
-#: ../mail/em-folder-utils.c:742
-#: ../plugins/groupwise-features/install-shared.c:178
-#: ../plugins/groupwise-features/share-folder-common.c:353
+#: ../mail/em-folder-utils.c:773
+#: ../plugins/groupwise-features/install-shared.c:189
+#: ../plugins/groupwise-features/share-folder-common.c:362
 msgid "Specify where to create the folder:"
 msgstr "Spesifiser hvor mappen skal opprettes:"
 
-#: ../mail/em-format-html-display.c:84 ../mail/em-format-html.c:1600
+#: ../mail/em-format-html-display.c:85 ../mail/em-format-html.c:1684
 msgid "Unsigned"
 msgstr "Usignert"
 
-#: ../mail/em-format-html-display.c:84
+#: ../mail/em-format-html-display.c:85
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -9571,11 +9563,11 @@ msgstr ""
 "Denne meldingen er ikke signert. Du har ingen garanti for at meldingen er "
 "autentisk."
 
-#: ../mail/em-format-html-display.c:85 ../mail/em-format-html.c:1601
+#: ../mail/em-format-html-display.c:86 ../mail/em-format-html.c:1685
 msgid "Valid signature"
 msgstr "Gyldig signatur"
 
-#: ../mail/em-format-html-display.c:85
+#: ../mail/em-format-html-display.c:86
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -9583,11 +9575,11 @@ msgstr ""
 "Denne meldingen er signert og gyldig hvilket betyr denne meldingen hÃyst "
 "sannsynlig er autentisk."
 
-#: ../mail/em-format-html-display.c:86 ../mail/em-format-html.c:1602
+#: ../mail/em-format-html-display.c:87 ../mail/em-format-html.c:1686
 msgid "Invalid signature"
 msgstr "Ugyldig signatur"
 
-#: ../mail/em-format-html-display.c:86
+#: ../mail/em-format-html-display.c:87
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -9595,11 +9587,11 @@ msgstr ""
 "Signaturen for denne meldingen kan ikke verifiseres. Den kan vÃre endret "
 "under overfÃring."
 
-#: ../mail/em-format-html-display.c:87 ../mail/em-format-html.c:1603
+#: ../mail/em-format-html-display.c:88 ../mail/em-format-html.c:1687
 msgid "Valid signature, but cannot verify sender"
 msgstr "Gyldig signatur, men kan ikke verifisere avsender"
 
-#: ../mail/em-format-html-display.c:87
+#: ../mail/em-format-html-display.c:88
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -9607,11 +9599,11 @@ msgstr ""
 "Denne meldingen er signert med en gyldig signatur, men avsender av meldingen "
 "kan ikke verifiseres."
 
-#: ../mail/em-format-html-display.c:88 ../mail/em-format-html.c:1604
+#: ../mail/em-format-html-display.c:89 ../mail/em-format-html.c:1688
 msgid "Signature exists, but need public key"
 msgstr "Signatur eksisterer, men trenger offentlig nÃkkel"
 
-#: ../mail/em-format-html-display.c:88
+#: ../mail/em-format-html-display.c:89
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -9619,11 +9611,11 @@ msgstr ""
 "Denne meldingen er signert med en gyldig signatur, men det finnes ingen "
 "tilhÃrende offentlig nÃkkel."
 
-#: ../mail/em-format-html-display.c:95 ../mail/em-format-html.c:1610
+#: ../mail/em-format-html-display.c:96 ../mail/em-format-html.c:1694
 msgid "Unencrypted"
 msgstr "Ukryptert"
 
-#: ../mail/em-format-html-display.c:95
+#: ../mail/em-format-html-display.c:96
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -9631,11 +9623,11 @@ msgstr ""
 "Denne meldingen er ikke kryptert. Innholdet kan vises under overfÃring over "
 "Internett."
 
-#: ../mail/em-format-html-display.c:96 ../mail/em-format-html.c:1611
+#: ../mail/em-format-html-display.c:97 ../mail/em-format-html.c:1695
 msgid "Encrypted, weak"
 msgstr "Kryptert, svak"
 
-#: ../mail/em-format-html-display.c:96
+#: ../mail/em-format-html-display.c:97
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -9645,11 +9637,11 @@ msgstr ""
 "vanskelig, men ikke umulig for en utenforstÃende Ã se innholdet i denne "
 "meldingen pÃ noenlunde kort tid."
 
-#: ../mail/em-format-html-display.c:97 ../mail/em-format-html.c:1612
+#: ../mail/em-format-html-display.c:98 ../mail/em-format-html.c:1696
 msgid "Encrypted"
 msgstr "Kryptert"
 
-#: ../mail/em-format-html-display.c:97
+#: ../mail/em-format-html-display.c:98
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -9657,11 +9649,11 @@ msgstr ""
 "Denne meldingen er kryptert. Det vil vÃre vanskelig for en utenforstÃende Ã "
 "se innholdet i denne meldingen."
 
-#: ../mail/em-format-html-display.c:98 ../mail/em-format-html.c:1613
+#: ../mail/em-format-html-display.c:99 ../mail/em-format-html.c:1697
 msgid "Encrypted, strong"
 msgstr "Kryptert, sterk"
 
-#: ../mail/em-format-html-display.c:98
+#: ../mail/em-format-html-display.c:99
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -9670,15 +9662,15 @@ msgstr ""
 "Denne meldingen er kryptert med en sterk algoritme. Det vil vÃre meget "
 "vanskelig for en utenforstÃende Ã se innholdet i denne meldingen pÃ kort tid."
 
-#: ../mail/em-format-html-display.c:234 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:237 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "_Vis sertifikat"
 
-#: ../mail/em-format-html-display.c:247
+#: ../mail/em-format-html-display.c:250
 msgid "This certificate is not viewable"
 msgstr "Dette sertifikatet kan ikke vises"
 
-#: ../mail/em-format-html-display.c:502
+#: ../mail/em-format-html-display.c:539
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -9686,28 +9678,28 @@ msgstr ""
 "Evolution kan ikke rendre denne e-posten da den er for stor. Du kan vise den "
 "uformattert eller Ãpne den i et eksternt redigeringsprogram."
 
-#: ../mail/em-format-html-display.c:745
+#: ../mail/em-format-html-display.c:806
 msgid "Completed on"
 msgstr "FullfÃrt"
 
-#: ../mail/em-format-html-display.c:753
+#: ../mail/em-format-html-display.c:814
 msgid "Overdue:"
 msgstr "UtgÃtt:"
 
 #. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:757
+#: ../mail/em-format-html-display.c:818
 msgid "by"
 msgstr "innen"
 
-#: ../mail/em-format-html-display.c:974 ../mail/em-format-html-display.c:1021
+#: ../mail/em-format-html-display.c:1081 ../mail/em-format-html-display.c:1128
 msgid "View _Unformatted"
 msgstr "Vis uformattert"
 
-#: ../mail/em-format-html-display.c:976
+#: ../mail/em-format-html-display.c:1083
 msgid "Hide _Unformatted"
 msgstr "Skjul _uformatterte"
 
-#: ../mail/em-format-html-display.c:1041
+#: ../mail/em-format-html-display.c:1148
 msgid "O_pen With"
 msgstr "Ã_pne med"
 
@@ -9716,55 +9708,63 @@ msgstr "Ã_pne med"
 msgid "Page %d of %d"
 msgstr "Side %d av %d"
 
-#: ../mail/em-format-html.c:161
+#: ../mail/em-format-html.c:166
 msgid "Formatting message"
 msgstr "Formatterer melding"
 
-#: ../mail/em-format-html.c:360
+#: ../mail/em-format-html.c:365
 msgid "Formatting Message..."
 msgstr "Formatterer melding â"
 
-#: ../mail/em-format-html.c:1444 ../mail/em-format-html.c:1454
+#: ../mail/em-format-html.c:1528 ../mail/em-format-html.c:1538
 #, c-format
 msgid "Retrieving '%s'"
 msgstr "Henter Â%sÂ"
 
-#: ../mail/em-format-html.c:1975
+#: ../mail/em-format-html.c:2059
 msgid "Unknown external-body part."
 msgstr "Ukjent del av ekstern kropp."
 
-#: ../mail/em-format-html.c:1983
+#: ../mail/em-format-html.c:2067
 msgid "Malformed external-body part."
 msgstr "Feilutformet del for ekstern kropp."
 
-#: ../mail/em-format-html.c:2013
+#: ../mail/em-format-html.c:2097
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peker til FTP-tjener (%s)"
 
-#: ../mail/em-format-html.c:2024
+#: ../mail/em-format-html.c:2108
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Peker til lokal fil (%s) gyldig pÃ nettsted Â%sÂ"
 
-#: ../mail/em-format-html.c:2026
+#: ../mail/em-format-html.c:2110
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peker til lokal fil (%s)"
 
-#: ../mail/em-format-html.c:2047
+#: ../mail/em-format-html.c:2131
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Peker til eksterne data (%s)"
 
-#: ../mail/em-format-html.c:2058
+#: ../mail/em-format-html.c:2142
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peker til ukjente eksterne data (Â%sÂ-type)"
 
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user example com"
+#: ../mail/em-format-html.c:2816
+#: ../plugins/mail-notification/mail-notification.c:406
+#, c-format
+msgid "From: %s"
+msgstr "Fra: %s"
+
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
-#: ../mail/em-format-html.c:2762
+#: ../mail/em-format-html.c:2893
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "Denne meldingen ble sendt av %s pÃ vegne av %s"
@@ -9800,12 +9800,12 @@ msgid "Su_bscribe"
 msgstr "A_bonner"
 
 #: ../mail/em-subscription-editor.c:1226
-#: ../modules/mail/e-mail-shell-view-actions.c:1178
+#: ../modules/mail/e-mail-shell-view-actions.c:1172
 msgid "Unsubscribe from the selected folder"
 msgstr "Fjern abonnement pÃ valgt mappe"
 
 #: ../mail/em-subscription-editor.c:1227
-#: ../modules/mail/e-mail-shell-view-actions.c:1176
+#: ../modules/mail/e-mail-shell-view-actions.c:1170
 msgid "_Unsubscribe"
 msgstr "_Fjern abonnement"
 
@@ -9837,23 +9837,23 @@ msgstr "Stopp aktiv operasjon"
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:101
+#: ../mail/em-utils.c:102
 #, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "Er du sikker pÃ at du vil Ãpne %d melding samtidig?"
 msgstr[1] "Er du sikker pÃ at du vil Ãpne %d meldinger samtidig?"
 
-#: ../mail/em-utils.c:153
+#: ../mail/em-utils.c:158
 #: ../modules/mailto-handler/evolution-mailto-handler.c:151
 msgid "_Do not show this message again"
 msgstr "Ikke vis _denne meldingen igjen"
 
-#: ../mail/em-utils.c:326
+#: ../mail/em-utils.c:333
 msgid "Message Filters"
 msgstr "Meldingsfiltre"
 
-#: ../mail/em-utils.c:882
+#: ../mail/em-utils.c:913
 #, c-format
 msgid "Messages from %s"
 msgstr "Meldinger fra %s"
@@ -9862,7 +9862,7 @@ msgstr "Meldinger fra %s"
 msgid "Search _Folders"
 msgstr "SÃke_mapper"
 
-#: ../mail/em-vfolder-rule.c:609
+#: ../mail/em-vfolder-rule.c:610
 msgid "Add Folder"
 msgstr "Legg til mappe"
 
@@ -10055,17 +10055,23 @@ msgstr "Forvalgt bredde for e-postleservinduet."
 
 #: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
+"Describes wheter message headers in paned view should be collapsed or "
+"expanded by default. \"0\" = expanded \"1\" = collapsed"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:45
+msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 msgstr ""
 "Bestemmer om oppslag for filtrering av uÃnsket e-post kun skal slÃs opp i "
 "lokale adressebÃker"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "Bestemmer om avsenders e-post skal slÃs opp i adresseboken"
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -10077,13 +10083,13 @@ msgstr ""
 "som er merket for automatisk fullfÃring. Operasjonen kan vÃre treg hvils "
 "eksterne adressebÃker som LDAP er merket for automatisk fullfÃring."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Bestemmer om egendefinerte meldingshoder skal brukes for Ã se etter uÃnsket "
 "e-post"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -10093,7 +10099,7 @@ msgstr ""
 "post. Hvis dette alternativet er aktivert og meldingshodene finnes vil  "
 "dette forbedre hastigheten for denne sjekken."
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -10101,47 +10107,47 @@ msgstr ""
 "Bestemmer om samme skrift skal brukes for bÃde ÂFraÂ og ÂEmneÂ-linjene i "
 "ÂMeldingerÂ-kolonnen i vertikal visning."
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Directory for loading/attaching files to composer."
 msgstr "Katalog for Ã laste/legge ved filer i redigering av ny e-post."
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Directory for saving mail component files."
 msgstr "Katalog for Ã lagre komponentfiler for e-post."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "SlÃ av eller pÃ bruk av ellipse for mappenavn i sidelinjen"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Display only message texts not exceeding certain size"
 msgstr "Vis kun meldingstekst som ikke overstiger en bestemt stÃrrelse"
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Do not add signature delimiter"
 msgstr "Ikke legg til skillelinje for signatur"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Vis indikatorer for stavefeil mens du skriver."
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Empty Junk folders on exit"
 msgstr "TÃm mappe for uÃnsket e-post nÃr programmet avsluttes"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Empty Trash folders on exit"
 msgstr "TÃm papirkurven nÃr programmet avsluttes"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "TÃm alle mapper for uÃnsket e-post nÃr programmet avsluttes."
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "TÃm alle papirkurver nÃr programmet avsluttes."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -10149,32 +10155,32 @@ msgstr ""
 "SlÃ pÃ animerte bilder i HTML-meldinger. Mange brukere synes at animerte "
 "bilder er plagsomme og foretrekker Ã se et statisk bilde i stedet."
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 "SlÃ pÃ skrivemerkemodus slik at insettingspunktet vises nÃr du leser e-post."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid "Enable or disable magic space bar"
 msgstr "Aktiver eller deaktiver magisk mellomrom"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "SlÃ av/pÃ spÃrring ved merking av flere meldinger."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable or disable type ahead search feature"
 msgstr "Aktiver eller deaktiver funksjon for Ã sÃke mens du skriver"
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid "Enable search folders"
 msgstr "Aktiver sÃkemapper"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Enable search folders on startup."
 msgstr "Aktiver sÃkemapper ved oppstart."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -10182,7 +10188,7 @@ msgstr ""
 "SlÃr pÃ sÃkefunksjonen for sidelinjen for Ã muliggjÃre interaktive sÃk etter "
 "mappenavn."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -10190,29 +10196,30 @@ msgstr ""
 "Aktiver dette for Ã bruke mellomrom-tasten til Ã gÃ forover i "
 "meldingsvisning, meldingsliste og mapper."
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid ""
 "Enable to display only message texts not exceeding size defined in "
 "'message_text_part_limit' key."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Enable to use a similar message list view settings for all folders"
-msgstr "SlÃ pÃ for Ã bruke like innstillinger for meldingslistevisning i alle mapper"
+msgstr ""
+"SlÃ pÃ for Ã bruke like innstillinger for meldingslistevisning i alle mapper"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr "SlÃ pÃ for Ã bruke en lignende meldingslistevisning for alle mapper."
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Enable/disable caret mode"
 msgstr "Aktiver/deaktiver markÃrmodus"
 
-#: ../mail/evolution-mail.schemas.in.h:73 ../mail/mail-config.ui.h:44
+#: ../mail/evolution-mail.schemas.in.h:74 ../mail/mail-config.ui.h:45
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Bruk samme koding for filnavn som Outlook/GMail"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid ""
 "Encode file names in the mail headers same as Outlook or GMail do, to let "
 "them display correctly file names with UTF-8 letters sent by Evolution, "
@@ -10220,31 +10227,31 @@ msgid ""
 "standard."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "Flush Outbox after filtering"
 msgstr "TÃm utboks etter filtrering"
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "Forward message."
 msgstr "Videresend melding."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "Group Reply replies to list"
 msgstr "Gruppesvar svarer til listen"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "Height of the message-list pane"
 msgstr "HÃyde pÃ e-postlistefeltet"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Height of the message-list pane."
 msgstr "HÃyde pÃ e-postlistefeltet."
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Skjuler per-mappe forhÃndsvisning og fjerner utvalget"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -10252,7 +10259,7 @@ msgstr ""
 "SpÃr brukeren om han virkelig vil gjÃre det hvis han prÃver Ã Ãpne 10 eller "
 "flere e-poster pÃ en gang."
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
@@ -10263,11 +10270,11 @@ msgstr ""
 "enhver MIME-type i denne listen som har en tilsvarende Bonobo-komponent for "
 "visnin."
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Ignore list Reply-To:"
 msgstr "Ignorer Reply-To: for lister"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid ""
 "Initial height of the \"Filter Editor\" window. The value updates as the "
 "user resizes the window vertically."
@@ -10275,7 +10282,7 @@ msgstr ""
 "Initiell hÃyde for ÂFilterredigeringÂ-vinduet. Verdien oppdateres ettersom "
 "bruker endrer stÃrrelse pÃ vinduet vertikalt."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid ""
 "Initial height of the \"Folder Subscriptions\" window. The value updates as "
 "the user resizes the window vertically."
@@ -10283,7 +10290,7 @@ msgstr ""
 "Initiell hÃyde for vinduet ÂAbonnement pÃ mapperÂ. Verdien oppdateres "
 "ettersom bruker endrer stÃrrelse pÃ vinduet vertikalt."
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid ""
 "Initial height of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window vertically."
@@ -10291,7 +10298,7 @@ msgstr ""
 "Initiell hÃyde for ÂRediger sÃkemapperÂ-vinduet. Verdien oppdateres ettersom "
 "bruker endrer stÃrrelse pÃ vinduet vertikalt."
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -10299,7 +10306,7 @@ msgstr ""
 "Initiell hÃyde for ÂSend og motta e-postÂ-vinduet. Verdien oppdateres "
 "ettersom bruker endrer stÃrrelse pÃ vinduet vertikalt."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid ""
 "Initial maximize state of the \"Filter Editor\" window. The value updates "
 "when the user maximizes or unmaximizes the window. Note, this particular "
@@ -10307,7 +10314,7 @@ msgid ""
 "maximized. This key exists only as an implementation detail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid ""
 "Initial maximize state of the \"Folder Subscriptions\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -10315,7 +10322,7 @@ msgid ""
 "window cannot be maximized. This key exists only as an implementation detail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid ""
 "Initial maximize state of the \"Search Folder Editor\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -10323,7 +10330,7 @@ msgid ""
 "window cannot be maximized. This key exists only as an implementation detail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -10332,7 +10339,7 @@ msgid ""
 "detail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid ""
 "Initial width of the \"Filter Editor\" window. The value updates as the user "
 "resizes the window horizontally."
@@ -10340,7 +10347,7 @@ msgstr ""
 "Initiell bredde pÃ ÂMeldingsfiltreÂ-vinduet. Verdien oppdateres ettersom "
 "bruker endrer stÃrrelse pÃ vinduet horisontalt."
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid ""
 "Initial width of the \"Folder Subscriptions\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -10348,7 +10355,7 @@ msgstr ""
 "Initiell bredde pÃ ÂAbonnement pÃ mapperÂ-vinduet. Verdien oppdateres "
 "ettersom bruker endrer stÃrrelse pÃ vinduet horisontalt."
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -10356,7 +10363,7 @@ msgstr ""
 "Initiell bredde pÃ ÂSÃkemapperÂ-vinduet. Verdien oppdateres ettersom bruker "
 "endrer stÃrrelse pÃ vinduet horisontalt."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -10364,7 +10371,7 @@ msgstr ""
 "Initiell bredde pÃ ÂSend og motta e-postÂ-vinduet. Verdien oppdateres "
 "ettersom bruker endrer stÃrrelse pÃ vinduet horisontalt."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid ""
 "Instead of the normal \"Reply to All\" behaviour, this option will make the "
 "'Group Reply' toolbar button try to reply only to the mailing list through "
@@ -10372,7 +10379,7 @@ msgid ""
 "replying."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -10382,7 +10389,7 @@ msgstr ""
 "en sÃkemappe sletter meldingene permanent, og ikke bare fjerner dem fra "
 "sÃkeresultatene."
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
@@ -10390,20 +10397,20 @@ msgstr ""
 "Aktiverer/deaktiverer funksjonen som varsler om at du sender et privat svar "
 "pÃ en melding som har kommet via en e-postliste."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
 msgstr "SlÃr av/pÃ varsel om at du sender et svar til mange personer."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending "
 "a private reply to a message which arrived via a mailing list, but the list "
 "sets a Reply-To: header which redirects your reply back to the list"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
@@ -10411,40 +10418,40 @@ msgstr ""
 "Aktiverer/deaktiverer funksjonen som varsler om at du prÃver Ã sende en "
 "melding til mottakere som ikke er oppgitt som e-postadresser"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Last time Empty Junk was run"
 msgstr "Siste gang mapper for uÃnsket e-post ble tÃmt"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Last time Empty Trash was run"
 msgstr "Siste gang papirkurven ble tÃmt"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Layout style"
 msgstr "Stil for utforming"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:106
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
 msgid "Level beyond which the message should be logged."
 msgstr "Over dette nivÃet skal meldingen logges."
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "List of Labels and their associated colors"
 msgstr "Liste over etiketter og deres assosierte farger"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "Liste over MIME-typer som skal se etter bonobo-komponentvisere"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "List of accepted licenses"
 msgstr "Liste med godtatte lisenser"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "List of accounts"
 msgstr "Liste med kontoer"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -10453,15 +10460,15 @@ msgstr ""
 "innholder strenger som er undermapper relativt til /apps/evolution/mail/"
 "accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "List of custom headers and whether they are enabled."
 msgstr "Liste over tillpassede topptekster og om de er slÃtt pÃ."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "List of dictionary language codes used for spell checking."
 msgstr "Liste med sprÃkkoder for ordliste som skal brukes for stavekontroll."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -10470,15 +10477,15 @@ msgstr ""
 "inneholder strenger som inneholder Âname:colorÂ hvor ÂcolorÂ bruker HTML hex "
 "koding."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "List of protocol names whose license has been accepted."
 msgstr "Liste over protokollnavn som har en godkjent lisens."
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Load images for HTML messages over HTTP"
 msgstr "Last bilder for HTML-meldinger og HTTP"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
@@ -10488,144 +10495,144 @@ msgstr ""
 "last bilder fra nettet Â1Â - Last bilder i e-poster fra kontakter Â2Â - "
 "Alltid last bilder fra nettet."
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Log filter actions"
 msgstr "LoggfÃr filterhandlinger"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Log filter actions to the specified log file."
 msgstr "Logg filterhandlinger til oppgitt loggfil."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Logfile to log filter actions"
 msgstr "Loggfil med filterhandlinger"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Logfile to log filter actions."
 msgstr "Loggfil med filterhandlinger."
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Mail browser height"
 msgstr "HÃyde pÃ e-postleser"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Mail browser maximized"
 msgstr "E-postleser maksimert"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Mail browser width"
 msgstr "Bredde pÃ e-postleser"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Mark as Seen after specified timeout"
 msgstr "Merk som ÂlestÂ etter spesifisert tidsgrense"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Mark as Seen after specified timeout."
 msgstr "Merk som ÂsettÂ etter spesifisert tidsgrense."
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Mark citations in the message \"Preview\""
 msgstr "Merk sitat in e-posten ÂForhÃndsvisningÂ"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Merk sitat in e-posten ÂForhÃndsvisningÂ."
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Message text limit for display"
 msgstr "Grense for tekst i meldingsvisning"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Stil pÃ e-postvisning (ÂnormalÂ, Âfull headersÂ, ÂsourceÂ)"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Minimum days between emptying the junk on exit"
 msgstr ""
 "Minimum antall dager mellom tÃmming av mapper for uÃnsket e-post ved "
 "avslutting"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Minimum antall dager mellom tÃmming av papirkurven ved avslutting"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr ""
 "Minste tidsperiode mellom tÃmming av mapper for uÃnsket e-post ved "
 "avslutting, i dager."
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 "Minste tidsperiode mellom tÃmming av papirkurven ved avslutting, i dager."
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Antall adresser som skal vises i Til/Cc/Bcc"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Original message."
 msgstr "Opprinnelig melding."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Path where picture gallery should search for its content"
 msgstr "Sti for sÃk etter innhold til bildegalleri"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid ""
 "Possible values are: never - to never close browser window always - to "
 "always close browser window ask - (or any other value) will ask user"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr ""
 "Varsle fÃr utsending til mottakere som ikke er oppgitt som e-postadresser"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Prompt on empty subject"
 msgstr "Stopp og spÃr ved tomt emne"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Stopp og spÃr fÃr en mappe blir tÃmt."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Stopp og spÃr nÃr en en e-post uten emne skal bli sendt."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Prompt when deleting messages in search folder"
 msgstr "SpÃr ved sletting av meldinger fra sÃkemappe"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "SpÃr nÃr e-postlister stikker av med private svar"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Prompt when replying privately to list messages"
 msgstr "SpÃr ved privat svar til meldinger fra e-postlister"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Prompt when replying to many recipients"
 msgstr "SpÃr ved svar til mange mottakere"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Prompt when user expunges"
 msgstr "Stopp og spÃr fÃr tÃmming"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Prompt when user only fills Bcc"
 msgstr "Stopp og spÃr nÃr bare ÂBccÂ er utfylt"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "SpÃr nÃr bruker prÃver Ã Ãpne 10 eller flere meldinger samtidig"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -10633,126 +10640,126 @@ msgstr ""
 "SpÃr nÃr bruker prÃver Ã sende HTML-meldinger til mottakere som ikke Ãnsker "
 "Ã motta HTML-meldinger."
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "SpÃr nÃr bruker prÃver Ã sende en melding uten Til- eller Cc-mottakere."
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "SpÃr nÃr bruker prÃver Ã sende uÃnsket HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Prompt while marking multiple messages"
 msgstr "SpÃr ved merking av flere meldinger"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Put personalized signatures at the top of replies"
 msgstr "Plasser personlige signaturer pÃ toppen av svar"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Put the cursor at the bottom of replies"
 msgstr "Plasser markÃr ved bunnen av svar"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Gjenkjenn smilefjes i tekst og erstatt dem med bilder."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Recognize links in text and replace them."
 msgstr "Gjenkjenn lenker i tekst og erstatt dem."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Run junk test on incoming mail."
 msgstr "Sjekk om innkommende e-post er uÃnsket."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Save directory"
 msgstr "Lagre katalog"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Search for the sender photo in local address books"
 msgstr "SÃk etter bilde av avsender i lokale adressebÃker"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Send HTML mail by default"
 msgstr "Send HTML e-post som forvalg"
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Send HTML mail by default."
 msgstr "Send HTML e-post som forvalg."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Sender email-address column in the message list"
 msgstr "Kolonne for avsenders e-postadresse i meldingslisten"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Server synchronization interval"
 msgstr "Intervall for serversynkronisering"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Vis ÂBccÂ feltet nÃr meldinger sendes"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "Vis ÂCcÂ feltet nÃr meldinger sendes"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "Vis ÂFraÂ feltet nÃr du poster til en nyhetsgruppe"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "Vis ÂSvar-tilÂ feltet nÃr du poster til en nyhetsgruppe"
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Vis ÂSvar-tilÂ feltet nÃr meldinger sendes"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "Show Animations"
 msgstr "Vis animasjoner"
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Show all message headers"
 msgstr "Vis alle meldingshoder"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "Show all the headers when viewing a messages."
 msgstr "Vis alle meldingshoder nÃr en melding vises."
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Show animated images as animations."
 msgstr "Vis animerte bilder som animasjoner."
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Vis slettede meldinger i meldingslisten (gjennomstreket)."
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Show deleted messages in the message-list"
 msgstr "Vis slettede meldinger i meldingslisten"
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Show image animations"
 msgstr "Vis bildeanimasjoner"
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Show original \"Date\" header value."
 msgstr "Vis opprinnelig verdi for ÂDateÂ-meldingshode."
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Show photo of the sender"
 msgstr "Vis bilde av avsender"
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -10760,7 +10767,7 @@ msgstr ""
 "Vis ÂBccÂ-feltet nÃr en melding sendes. Dette kontrolleres fra ÂVisÂ-menyen "
 "nÃr en e-postkonto velges."
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -10768,7 +10775,7 @@ msgstr ""
 "Vis ÂCcÂ-feltet nÃr en melding sendes. Dette kontrolleres fra ÂVisÂ-menyen "
 "nÃr en e-postkonto velges."
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -10776,7 +10783,7 @@ msgstr ""
 "Vis ÂFraÂ-feltet nÃr en melding sendes til en nyhetsgruppe. Dette "
 "kontrolleres fra ÂVisÂ-menyen nÃr en e-postkonto velges."
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -10784,7 +10791,7 @@ msgstr ""
 "Vis ÂSvar-tilÂ-feltet nÃr en melding sendes til en nyhetsgruppe. Dette "
 "kontrolleres fra ÂVisÂ-menyen nÃr en e-postkonto velges."
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -10792,24 +10799,24 @@ msgstr ""
 "Vis ÂSvar-tilÂ-feltet nÃr en melding sendes. Dette kontrolleres fra ÂVisÂ-"
 "menyen nÃr en e-postkonto velges."
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "Vis avsenders e-postadresse i en egen kolonne i meldingslisten."
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
 "format and local time zone."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Vis bilde av avsender i meldingsomrÃdet."
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid ""
 "Some mailing lists set a Reply-To: header to trick users into sending "
 "replies to the list, even when they ask Evolution to make a private reply. "
@@ -10820,39 +10827,43 @@ msgid ""
 "Post: header, if there is one."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Spell check inline"
 msgstr "Stavekontroll i meldingen"
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Spell checking color"
 msgstr "Farge for stavekontroll"
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid "Spell checking languages"
 msgstr "SprÃk for stavekontroll"
 
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:192
+msgid "State of message headers in paned view"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid "Terminal font"
 msgstr "Terminalskrift"
 
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid "The default plugin for Junk hook"
 msgstr "Forvalgt tillegg for uÃnsket e-post"
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:195
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "Sist gang mapper for uÃnsket e-post ble tÃmt i dager siden 1 januar 1970 "
 "(epoch)."
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:196
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Sist gang papirkurven ble tÃmt, i dager siden 1 januar, 1970 (Epoch)."
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. \"0\" (Classic View) places the preview pane below the "
@@ -10860,33 +10871,33 @@ msgid ""
 "message list."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "The terminal font for mail display."
 msgstr "Terminalskrift for meldingsvisning."
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid ""
 "The text that is inserted when forwarding a message, saying that the "
 "forwarded message follows."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid ""
 "The text that is inserted when replying to a message (top posting), saying "
 "that the original message follows."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid ""
 "The text that is inserted when replying to a message, attributing the "
 "message to the original author."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "The variable width font for mail display."
 msgstr "Skrift med variabel bredde for meldingsvisning."
 
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -10894,7 +10905,7 @@ msgstr ""
 "Denne har tre mulige verdier. Â0Â for feil. Â1Â for advarsler. Â2Â for "
 "feilsÃkingsmeldinger."
 
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid ""
 "This decides the max size of the message text that will be displayed under "
 "Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
@@ -10904,7 +10915,7 @@ msgstr ""
 "Forvalg er 4MB / 4096 KB og oppgis i KB. Verdien brukes kun hvis nÃkkelen "
 "Âforce_message_limitÂ er slÃtt pÃ."
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -10914,7 +10925,7 @@ msgstr ""
 "tillegg er aktivert. Hvis forvalgt tillegg deaktiveres vil ikke de andre "
 "brukes."
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -10923,7 +10934,7 @@ msgstr ""
 "Dette fjerner markering fra e-posten i listen og fjerner forhÃndsvisning for "
 "den mappen."
 
-#: ../mail/evolution-mail.schemas.in.h:205
+#: ../mail/evolution-mail.schemas.in.h:207
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -10935,18 +10946,18 @@ msgstr ""
 "&lt;header enabled&gt; - sett ÂenabledÂ hvis toppteksten skal vises i e-"
 "postvisningen. "
 
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../mail/evolution-mail.schemas.in.h:208
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
 "mail sent by known contacts from junk filtering."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:207
+#: ../mail/evolution-mail.schemas.in.h:209
 msgid "This option would help in improving the speed of fetching."
 msgstr "Dette valget vil Ãke hastigheten ved henting."
 
-#: ../mail/evolution-mail.schemas.in.h:208
+#: ../mail/evolution-mail.schemas.in.h:210
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -10954,7 +10965,7 @@ msgstr ""
 "Setter antall adresser som skal vises i forvalgt listevisning for meldinger. "
 "Etter dette vises ÂâÂ."
 
-#: ../mail/evolution-mail.schemas.in.h:209
+#: ../mail/evolution-mail.schemas.in.h:211
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Requires a restart to apply."
@@ -10963,7 +10974,7 @@ msgstr ""
 "sammenslÃtt tilstand som forvalg. Evolution mÃ startes pÃ nytt hvis denne "
 "endres."
 
-#: ../mail/evolution-mail.schemas.in.h:210
+#: ../mail/evolution-mail.schemas.in.h:212
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -10973,99 +10984,99 @@ msgstr ""
 "melding i hver trÃd i stedet for meldingens dato. Evolution mÃ startes pÃ "
 "nytt."
 
-#: ../mail/evolution-mail.schemas.in.h:211
+#: ../mail/evolution-mail.schemas.in.h:213
 msgid ""
 "This value can be an empty string, which means it'll use the system Picture "
 "folder, usually set to ~/Pictures. This folder will be also used when the "
 "set path is not pointing to the existent folder."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:212
+#: ../mail/evolution-mail.schemas.in.h:214
 msgid "Thread the message-list based on Subject"
 msgstr "Lag trÃder av e-postlisten basert pÃ emne"
 
-#: ../mail/evolution-mail.schemas.in.h:213
+#: ../mail/evolution-mail.schemas.in.h:215
 msgid "Timeout for marking message as seen"
 msgstr "Tidsgrense for Ã merke e-post som sett"
 
-#: ../mail/evolution-mail.schemas.in.h:214
+#: ../mail/evolution-mail.schemas.in.h:216
 msgid "Timeout for marking message as seen."
 msgstr "Tidsavbrydd Ã merke e-poster som sett."
 
-#: ../mail/evolution-mail.schemas.in.h:215
+#: ../mail/evolution-mail.schemas.in.h:217
 msgid "UID string of the default account."
 msgstr "UID-streng for forvalgt konto."
 
-#: ../mail/evolution-mail.schemas.in.h:216
+#: ../mail/evolution-mail.schemas.in.h:218
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "Farge for understreking av feilstavede ord ved bruk av stavekontroll."
 
-#: ../mail/evolution-mail.schemas.in.h:217
+#: ../mail/evolution-mail.schemas.in.h:219
 msgid "Use SpamAssassin daemon and client"
 msgstr "Bruk SpamAssassin tjener og klient"
 
-#: ../mail/evolution-mail.schemas.in.h:218
+#: ../mail/evolution-mail.schemas.in.h:220
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Bruk SpamAssassin tjener og klient (spamd/spamc)."
 
-#: ../mail/evolution-mail.schemas.in.h:219
+#: ../mail/evolution-mail.schemas.in.h:221
 msgid "Use custom fonts"
 msgstr "Bruk egendefinerte skrifter"
 
-#: ../mail/evolution-mail.schemas.in.h:220
+#: ../mail/evolution-mail.schemas.in.h:222
 msgid "Use custom fonts for displaying mail."
 msgstr "Bruk tilpassede skrifttyper for e-postvisning."
 
-#: ../mail/evolution-mail.schemas.in.h:221
+#: ../mail/evolution-mail.schemas.in.h:223
 msgid "Use only local spam tests."
 msgstr "Bruk bare lokale tester for uÃnsket e-post."
 
-#: ../mail/evolution-mail.schemas.in.h:222
+#: ../mail/evolution-mail.schemas.in.h:224
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Bruk bare lokale tester for uÃnsket e-post (ingen DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:223
+#: ../mail/evolution-mail.schemas.in.h:225
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
 "message or the bottom."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:224
+#: ../mail/evolution-mail.schemas.in.h:226
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
 "the message or the bottom."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:225
+#: ../mail/evolution-mail.schemas.in.h:227
 msgid "Variable width font"
 msgstr "Skrift for variabel bredde"
 
-#: ../mail/evolution-mail.schemas.in.h:226
+#: ../mail/evolution-mail.schemas.in.h:228
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr ""
 "Om en forespÃrsel om lesekvittering skal legges til alle meldinger som "
 "forvalg."
 
-#: ../mail/evolution-mail.schemas.in.h:227
+#: ../mail/evolution-mail.schemas.in.h:229
 msgid ""
 "Whether check for new messages in all active accounts regardless of the "
 "account \"Check for new messages every X minutes\" option when Evolution is "
 "started. This option is used only together with 'send_recv_on_start' option."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:228
+#: ../mail/evolution-mail.schemas.in.h:230
 msgid ""
 "Whether check for new messages when Evolution is started. This includes also "
 "sending messages from Outbox."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:229
+#: ../mail/evolution-mail.schemas.in.h:231
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "SlÃ av eller pÃ bruk av ellipse for mappenavn i sidelinjen."
 
-#: ../mail/evolution-mail.schemas.in.h:230
+#: ../mail/evolution-mail.schemas.in.h:232
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -11073,22 +11084,22 @@ msgstr ""
 "Om e-poster skal sorteres etter emner nÃr de ikke inneholder ÂIn-Reply-ToÂ "
 "eller referansetopptekster."
 
-#: ../mail/evolution-mail.schemas.in.h:231
+#: ../mail/evolution-mail.schemas.in.h:233
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Om trÃder sorteres basert pÃ siste melding i den trÃden"
 
-#: ../mail/evolution-mail.schemas.in.h:232
+#: ../mail/evolution-mail.schemas.in.h:234
 msgid ""
 "Whether to flush Outbox after filtering is done. Outbox flush will happen "
 "only when there was used any 'Forward to' filter action and approximately "
 "one minute after the last action invocation."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:233
+#: ../mail/evolution-mail.schemas.in.h:235
 msgid "Width of the message-list pane"
 msgstr "Bredde pÃ e-postlistefeltet"
 
-#: ../mail/evolution-mail.schemas.in.h:234
+#: ../mail/evolution-mail.schemas.in.h:236
 msgid "Width of the message-list pane."
 msgstr "Bredde pÃ e-postlistefeltet."
 
@@ -11097,7 +11108,7 @@ msgid "Importing Elm data"
 msgstr "Importerer data fra Elm"
 
 #: ../mail/importers/elm-importer.c:339 ../mail/importers/pine-importer.c:415
-#: ../modules/mail/e-mail-shell-view.c:1044
+#: ../modules/mail/e-mail-shell-view.c:1038
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
 #: ../widgets/misc/e-send-options.c:511
 msgid "Mail"
@@ -11112,19 +11123,19 @@ msgid "Import mail from Elm."
 msgstr "Importer e-post fra Elm."
 
 #: ../mail/importers/evolution-mbox-importer.c:127
-#: ../plugins/dbx-import/dbx-importer.c:227
+#: ../plugins/dbx-import/dbx-importer.c:242
 msgid "_Destination folder:"
 msgstr "_MÃlmappe:"
 
 #: ../mail/importers/evolution-mbox-importer.c:133
-#: ../plugins/dbx-import/dbx-importer.c:237
-#: ../plugins/pst-import/pst-importer.c:320
+#: ../plugins/dbx-import/dbx-importer.c:252
+#: ../plugins/pst-import/pst-importer.c:318
 msgid "Select folder"
 msgstr "Velg mappe"
 
 #: ../mail/importers/evolution-mbox-importer.c:134
-#: ../plugins/dbx-import/dbx-importer.c:238
-#: ../plugins/pst-import/pst-importer.c:320
+#: ../plugins/dbx-import/dbx-importer.c:253
+#: ../plugins/pst-import/pst-importer.c:318
 msgid "Select folder to import into"
 msgstr "Velg mappe Ã importere til"
 
@@ -11139,7 +11150,7 @@ msgid "From"
 msgstr "Fra"
 
 #: ../mail/importers/evolution-mbox-importer.c:452
-#: ../shell/e-shell-utils.c:253
+#: ../shell/e-shell-utils.c:217
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
@@ -11153,9 +11164,9 @@ msgstr "Importerer postboks"
 
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:150
-#: ../plugins/dbx-import/dbx-importer.c:574
-#: ../plugins/pst-import/pst-importer.c:482
-#: ../plugins/pst-import/pst-importer.c:591
+#: ../plugins/dbx-import/dbx-importer.c:593
+#: ../plugins/pst-import/pst-importer.c:480
+#: ../plugins/pst-import/pst-importer.c:589
 #, c-format
 msgid "Importing '%s'"
 msgstr "Importerer Â%sÂ"
@@ -11182,27 +11193,27 @@ msgstr "Import fra Pine for Evolutions"
 msgid "Import mail from Pine."
 msgstr "Importer e-post fra Pine."
 
-#: ../mail/mail-autofilter.c:72
+#: ../mail/mail-autofilter.c:73
 #, c-format
 msgid "Mail to %s"
 msgstr "Send til %s"
 
-#: ../mail/mail-autofilter.c:238 ../mail/mail-autofilter.c:280
+#: ../mail/mail-autofilter.c:239 ../mail/mail-autofilter.c:281
 #, c-format
 msgid "Mail from %s"
 msgstr "E-post fra %s"
 
-#: ../mail/mail-autofilter.c:264
+#: ../mail/mail-autofilter.c:265
 #, c-format
 msgid "Subject is %s"
 msgstr "Emne er %s"
 
-#: ../mail/mail-autofilter.c:303
+#: ../mail/mail-autofilter.c:304
 #, c-format
 msgid "%s mailing list"
 msgstr "%s e-postliste"
 
-#: ../mail/mail-autofilter.c:394
+#: ../mail/mail-autofilter.c:405
 msgid "Add Filter Rule"
 msgstr "Legg til filterregel"
 
@@ -11211,7 +11222,7 @@ msgstr "Legg til filterregel"
 #. * folder. For more than one filter rule is each of
 #. * them on a separate line, with four spaces in front
 #. * of its name, without quotes.
-#: ../mail/mail-autofilter.c:492
+#: ../mail/mail-autofilter.c:503
 #, c-format
 msgid ""
 "The filter rule \"%s\" has been modified to account for the deleted folder\n"
@@ -11236,445 +11247,463 @@ msgstr "Legg til n_y signatur â"
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "All_tid signer utgÃende meldinger nÃr denne kontoen brukes"
 
+#: ../mail/mail-config.ui.h:4
+msgid ""
+"All new emails with header that matches given content will be automatically "
+"filtered as junk"
+msgstr "Alle nye meldinger med meldingshode som er lik gitt innhold vil automatisk bli filtrert som uÃnsket"
+
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:6
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr "En e-postliste tillates Ã o_mdirigere private svar til listen"
 
-#: ../mail/mail-config.ui.h:6
+#: ../mail/mail-config.ui.h:7
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "Send krypterte me_ldinger til meg selv nÃr kryptert e-post sendes"
 
-#: ../mail/mail-config.ui.h:7
+#: ../mail/mail-config.ui.h:8
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "All_tid _kopi (cc) til:"
 
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.ui.h:9
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Alltid _blindkopi (bcc) til:"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:10
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Alltid s_tol pÃ nÃkler i min nÃkkelring ved kryptering"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:11
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Alltid krypter til _meg selv ved sending av krypterte meldinger"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
 msgstr "Allti_d be om lesekvittering"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
 msgid "Apply the same _view settings to all folders"
 msgstr "Bruk samme _visningsinnstillinger for alle mapper"
 
-#: ../mail/mail-config.ui.h:14
+#: ../mail/mail-config.ui.h:15
 #: ../modules/addressbook/addressbook-config.c:1018
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:16
 msgid "Automatically insert _emoticon images"
 msgstr "S_ett inn smilefjes automatisk"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:17
 msgid "C_haracter set:"
 msgstr "Te_gnsett:"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:18
 msgid "Ch_eck for Supported Types"
 msgstr "Sj_ekk stÃttede typer"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:19
 msgid "Check cu_stom headers for junk"
 msgstr "_Sjekk egendefinerte meldingshoder for uÃnsket e-post"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:20
 msgid "Check for new _messages on start"
 msgstr "Se etter nye _meldinger ved oppstart"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:21
 msgid "Check for new messa_ges in all active accounts"
 msgstr "Se etter nye meldin_ger i alle aktive kontoer"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:22
 msgid "Check incoming _messages for junk"
 msgstr "Sjekk om innkommende _meldinger er uÃnsket"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:23
 msgid "Check spelling while I _type"
 msgstr "Sjekk s_taving mens jeg skriver"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:24
 msgid "Cle_ar"
 msgstr "_TÃm"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:25
 msgid "Clea_r"
 msgstr "TÃ_m"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:26
 msgid "Color for _misspelled words:"
 msgstr "_Farge for feilstavede ord:"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:27
 msgid "Composing Messages"
 msgstr "Skriver meldinger"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:28
 #: ../modules/plugin-manager/evolution-plugin-manager.c:157
 msgid "Configuration"
 msgstr "Konfigurasjon"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:29
 msgid "Confirm _when expunging a folder"
 msgstr "_Bekreft ved tÃmming av en mappe"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:30
 msgid "Confirmations"
 msgstr "Bekreftelser"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:31
 #: ../modules/addressbook/autocompletion-config.c:155
 #: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgid "Date/Time Format"
 msgstr "Fromat for dato ogklokkeslett"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:33
 msgid "Default Behavior"
 msgstr "Forvalgt oppfÃrsel"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:34
 msgid "Default character e_ncoding:"
 msgstr "Forvalgt teg_nkoding:"
 
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:35
 msgid "Delete Mail"
 msgstr "Slett e-post"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:36
 msgid "Delete junk messages on e_xit"
 msgstr "Slett uÃnsket e-post nÃr programmet a_vsluttes"
 
-#: ../mail/mail-config.ui.h:37
+#: ../mail/mail-config.ui.h:38
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Signer _utgÃende meldinger digitalt (som forvalg)"
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:39
 msgid "Displayed Message Headers"
 msgstr "Viste meldingshoder"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:40
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "Ikke mer_k meldinger som uÃnsket hvis avsender finnes i adresseboken"
 
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:41
 msgid "Do not quote"
 msgstr "Ikke siter"
 
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:42
 msgid "Drafts _Folder:"
 msgstr "Mappe _for skisser:"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:43
 msgid "Email _Address:"
 msgstr "E-post_adresse:"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:44
 msgid "Empty trash folders on e_xit"
 msgstr "_TÃm papirkurven nÃr programmet avsluttes"
 
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:46
 msgid "Encry_ption certificate:"
 msgstr "Sertifikat for kry_ptering:"
 
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:47
 msgid "Encrypt out_going messages (by default)"
 msgstr "Krypter ut_gÃende meldinger (som forvalg)"
 
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:48
 msgid "F_all back to threading messages by subject"
 msgstr "F_all tilbake til trÃding av meldinger etter emne"
 
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:49
 msgid "Fix_ed Width Font:"
 msgstr "Skrift med fast br_edde:"
 
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:50
 msgid "Format messages in _HTML"
 msgstr "Formater meldinger med _HTML"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:51
 msgid "Full Nam_e:"
 msgstr "_Fullt navn:"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:53
 msgid "Group Reply goes only to mailing list, if possible"
 msgstr "Gruppesvar gÃr kun til e-postliste hvis mulig"
 
-#: ../mail/mail-config.ui.h:53
+#: ../mail/mail-config.ui.h:54
 msgid "HTML Messages"
 msgstr "HTML-meldinger"
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:55
 msgid "H_TTP Proxy:"
 msgstr "H_TTP-proxy:"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:56
+msgid "Header content"
+msgstr "Innhold i meldingshode"
+
+#: ../mail/mail-config.ui.h:57
+msgid "Header name"
+msgstr "Navn pÃ meldingshode"
+
+#: ../mail/mail-config.ui.h:58
 msgid "Headers"
 msgstr "Meldingshoder"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:59
 msgid "Highlight _quotations with"
 msgstr "_Merk sitering med"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:60
 msgid "Ignore Reply-To: for mailing lists"
 msgstr "Ignorer Reply-To: for e-postlister"
 
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:61
 msgid "Inline"
 msgstr "I meldingen"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:62
 msgid "Inline (Outlook style)"
 msgstr "I meldingen (som i Outlook)"
 
-#: ../mail/mail-config.ui.h:61 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:64 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Etiketter"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:65
 msgid "Languages Table"
 msgstr "SprÃktabell"
 
-#: ../mail/mail-config.ui.h:63
+#: ../mail/mail-config.ui.h:66
 msgid "Loading Images"
 msgstr "Laster bilder"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:67
 msgid "Mail Headers Table"
 msgstr "Tabell med meldingshoder"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:68
 msgid "Mailbox location"
 msgstr "Plassering av postboks"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:69
 msgid "Message Display"
 msgstr "Meldingsvisning"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:70
 msgid "Message Receipts"
 msgstr "Meldingsmottakere"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:71
 msgid "No _Proxy for:"
 msgstr "Ingen _proxy for:"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:73
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 "Alternativet vil ignoreres hvis det finnes treff for egendefinerte "
 "meldingshoder for uÃnsket e-post."
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:74
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "Valgfri informasjon"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:76
 msgid "Or_ganization:"
 msgstr "Or_ganisasjon:"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:77
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-nÃ_kkel ID:"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:78
 msgid "Pass_word:"
 msgstr "Pass_ord:"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:79
 #: ../modules/calendar/e-calendar-preferences.ui.h:23
 msgid "Pick a color"
 msgstr "Velg en farge"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:80
 msgid "Port:"
 msgstr "Port:"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:81
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:83
 msgid "Proxy Settings"
 msgstr "Innstillinger for proxy"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:84
 msgid "Quoted"
 msgstr "Sitert"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:85
 msgid "Re_member password"
 msgstr "_Husk passord"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:86
 msgid "Re_ply-To:"
 msgstr "S_var-til:"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:87
 msgid "Remember _password"
 msgstr "Husk _passord"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:88
 msgid "Replies and Forwards"
 msgstr "Svar og videresending"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:89
 msgid "Required Information"
 msgstr "NÃdvendig informasjon"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:90
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:91
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:92
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:93
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:95
 msgid "SSL is not supported in this build of Evolution"
 msgstr "SSL er ikke stÃttet i denne versjonen av Evolution  "
 
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:96
 msgid "S_earch for sender photograph only in local address books"
 msgstr "Kun sÃk etter bilde av avs_ender i lokale adressebÃker"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:97
 msgid "S_elect..."
 msgstr "V_elg â"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:98
 msgid "S_end message receipts:"
 msgstr "Send kvittering for m_eldinger:"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:99
 msgid "S_tandard Font:"
 msgstr "Forvalg_t skrift:"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:100
 msgid "Secure MIME (S/MIME)"
 msgstr "Sikker MIME (S/MIME)"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:102
 msgid "Select HTML fixed width font"
 msgstr "Velg skrift med fast bredde for HTML"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:103
 msgid "Select HTML variable width font"
 msgstr "Velg skrift med variabel bredde for HTML"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:104
 msgid "Sender Photograph"
 msgstr "Bilde av avsender"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:106
 msgid "Sending a _private reply to a mailing list message"
 msgstr "Ved sending av _privat svar til meldinger fra e-postlister"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:108
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr "Sender en melding med mottakere oppgitt uten e-postadresser"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:110
 msgid "Sending a message with an _empty subject line"
 msgstr "Ved sending av en melding med tomt _emnefelt"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:112
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "Ved sending av en melding med kun _Bcc-mottakere definert"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:114
 msgid "Sending a reply to a large _number of recipients"
 msgstr "Ved sending av svar til et stort a_ntall mottakere"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:115
 msgid "Sent _Messages Folder:"
 msgstr "Mappe for sendte _meldinger:"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:116
 msgid "Ser_ver requires authentication"
 msgstr "Tjener kre_ver autentisering"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:117
 msgid "Server Configuration"
 msgstr "Tjenerkonfigurasjon"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:118
 msgid "Server _Type:"
 msgstr "Tjener_type:"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:119
+msgid "Set custom junk header"
+msgstr "Sett egendefinert meldingshode for uÃnsket e-post"
+
+#: ../mail/mail-config.ui.h:120
 msgid "Si_gning algorithm:"
 msgstr "Si_gneringsalgoritme:"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:121
 msgid "Sig_natures"
 msgstr "Sig_naturer"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:122
 msgid "Sig_ning certificate:"
 msgstr "Sertifikat for sig_nering:"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:123
 msgid "Signat_ure:"
 msgstr "Signat_ur:"
 
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:124
 msgid "Signatures"
 msgstr "Signaturer"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:125
 msgid "Signing _algorithm:"
 msgstr "Signerings_algoritme:"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:126
 msgid "Special Folders"
 msgstr "Spesielle mapper"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:127
 msgid "Spell Checking"
 msgstr "Stavekontroll"
 
-#: ../mail/mail-config.ui.h:124
+#: ../mail/mail-config.ui.h:128
 msgid "Start _typing at the bottom on replying"
 msgstr "S_tart skriving under meldingen ved svar"
 
-#: ../mail/mail-config.ui.h:125
+#: ../mail/mail-config.ui.h:129
 msgid "Start up"
 msgstr "Oppstart"
 
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:131
 msgid "T_ype:"
 msgstr "T_ype:"
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:132
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -11682,7 +11711,7 @@ msgstr ""
 "SprÃklisten som vises her reflekterer kun de sprÃkene du har installert en "
 "ordbok for."
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:133
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -11692,7 +11721,7 @@ msgstr ""
 "signatur. Navnet du oppgir vil kun brukes\n"
 "for visning pÃ skjermen."
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:136
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
@@ -11700,7 +11729,7 @@ msgstr ""
 "SpÃr om bekreftelse fÃr utfÃring av fÃlgende avkryssede handlinger for Ã "
 "hjelpe med Ã unngÃ uhell og flauser med e-post:"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:137
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -11708,144 +11737,152 @@ msgstr ""
 "Skriv navnet du vil referere til denne kontoen.\n"
 "For eksempel ÂArbeidÂ eller ÂPersonligÂ"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:139
 msgid "Us_ername:"
 msgstr "Bruk_ernavn:"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:140
 msgid "Use Authe_ntication"
 msgstr "Bruk aute_ntisering"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:141
 msgid "User _Name:"
 msgstr "Bruker_navn:"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:142
 msgid "_Add Signature"
 msgstr "_Legg til signatur"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:143
 msgid "_Always load images from the Internet"
 msgstr "_Alltid last bilder fra Internett"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:144
 msgid "_Authentication Type"
 msgstr "_Autentiseringstype"
 
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:145
 msgid "_Default junk plugin:"
 msgstr "_Forvalgt tillegg for uÃnsket e-post:"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:146
 msgid "_Direct connection to the Internet"
 msgstr "_Direkte tilkobling til internett"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:147
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Ikke signer _mÃteforespÃrsler (for kompatibilitet med Outlook)"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:148
 msgid "_Forward style:"
 msgstr "_Videresendingsstil:"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:149
 msgid "_Junk Folder:"
 msgstr "Mappe for _uÃnsket e-post:"
 
-#: ../mail/mail-config.ui.h:146
+#: ../mail/mail-config.ui.h:150
 msgid "_Keep signature above the original message on replying"
 msgstr "_Plasser signaturen over opprinnelig melding ved svar"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:151
 msgid "_Languages"
 msgstr "_SprÃk"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:152
 msgid "_Load images only in messages from contacts"
 msgstr "_Last kun bilder i meldinger fra kontakter"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:153
 msgid "_Lookup in local address book only"
 msgstr "S_lÃ kun opp i lokale adressebokmapper"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:154
 msgid "_Make this my default account"
 msgstr "_Bruk denne som forvalgt konto"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:155
 msgid "_Manual proxy configuration:"
 msgstr "_Manuell konfigurasjon av proxy:"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:157
 msgid "_Never load images from the Internet"
 msgstr "Aldri last bilder fra Internett"
 
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:158
 msgid "_Path:"
 msgstr "S_ti:"
 
-#: ../mail/mail-config.ui.h:155
+#: ../mail/mail-config.ui.h:159 ../modules/addressbook/ldap-config.ui.h:27
+msgid "_Port:"
+msgstr "_Port:"
+
+#: ../mail/mail-config.ui.h:160
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "S_pÃr ved sending av HTML-meldinger til kontakter som ikke Ãnsker dem"
 
-#: ../mail/mail-config.ui.h:156
+#: ../mail/mail-config.ui.h:161
 msgid "_Reply style:"
 msgstr "Sva_rstil:"
 
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:162
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:163
 msgid "_Secure HTTP Proxy:"
 msgstr "_Sikker HTTP-proxy:"
 
-#: ../mail/mail-config.ui.h:160 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:165 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "Tj_ener:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:167
 msgid "_Show animated images"
 msgstr "Vi_s animerte bilder"
 
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:168
 msgid "_Show the photograph of sender in the message preview"
 msgstr "Vi_s bilde av avsender i forhÃndsvisning av meldingen"
 
-#: ../mail/mail-config.ui.h:164
+#: ../mail/mail-config.ui.h:169
 msgid "_Trash Folder:"
 msgstr "Mappe for _papirkurv:"
 
-#: ../mail/mail-config.ui.h:165
+#: ../mail/mail-config.ui.h:170
 msgid "_Use Secure Connection:"
 msgstr "Br_uk sikker forbindelse:"
 
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:171
 msgid "_Use system defaults"
 msgstr "Br_uk systemets forvalg"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:172
 msgid "_Use the same fonts as other applications"
 msgstr "Br_uk samme skrifter som andre programmer"
 
-#: ../mail/mail-config.ui.h:168 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:173 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:169 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:174 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:170
+#: ../mail/mail-config.ui.h:175
 msgid "color"
 msgstr "farge"
 
-#: ../mail/mail-config.ui.h:171
+#: ../mail/mail-config.ui.h:176
 msgid "description"
 msgstr "beskrivelse"
 
+#: ../mail/mail-config.ui.h:177
+msgid "gtk-ok"
+msgstr "gtk-ok"
+
 #: ../mail/mail-dialogs.ui.h:1
 msgid "All active remote folders"
 msgstr "Alle aktive eksterne mapper"
@@ -11942,179 +11979,174 @@ msgstr "_Flagg:"
 msgid "_Tick this to accept the license agreement"
 msgstr "_Kryss av her for Ã godta lisensen"
 
-#: ../mail/mail-folder-cache.c:789
+#: ../mail/mail-folder-cache.c:784
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinger %s"
 
-#: ../mail/mail-ops.c:85
+#: ../mail/mail-ops.c:84
 msgid "Filtering Selected Messages"
 msgstr "Filtrerer valgte meldinger"
 
-#: ../mail/mail-ops.c:226
+#: ../mail/mail-ops.c:227
 msgid "Fetching Mail"
 msgstr "Henter e-post"
 
-#: ../mail/mail-ops.c:785
+#: ../mail/mail-ops.c:817
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
 
-#: ../mail/mail-ops.c:831
+#: ../mail/mail-ops.c:863
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Feil under sending av %d av %d meldinger"
 
-#: ../mail/mail-ops.c:833 ../mail/mail-send-recv.c:787
+#: ../mail/mail-ops.c:865 ../mail/mail-send-recv.c:814
 msgid "Canceled."
 msgstr "Avbrutt."
 
-#: ../mail/mail-ops.c:835 ../mail/mail-send-recv.c:789
+#: ../mail/mail-ops.c:867 ../mail/mail-send-recv.c:816
 msgid "Complete."
 msgstr "FullfÃrt."
 
-#: ../mail/mail-ops.c:941
+#: ../mail/mail-ops.c:974
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Flytter meldinger til Â%sÂ"
 
-#: ../mail/mail-ops.c:941
+#: ../mail/mail-ops.c:974
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Kopierer meldinger til Â%sÂ"
 
-#: ../mail/mail-ops.c:1062
+#: ../mail/mail-ops.c:1095
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "Skanner mapper i Â%sÂ"
 
-#: ../mail/mail-ops.c:1178
+#: ../mail/mail-ops.c:1211
 msgid "Forwarded messages"
 msgstr "Videresendte meldinger"
 
-#: ../mail/mail-ops.c:1295
+#: ../mail/mail-ops.c:1328
 #, c-format
 msgid "Retrieving quota information for folder '%s'"
 msgstr "Henter kvoteinformasjon for mappe Â%sÂ"
 
-#: ../mail/mail-ops.c:1370
-#, c-format
-msgid "Opening store '%s'"
-msgstr "Ãpner lager Â%sÂ"
-
-#: ../mail/mail-ops.c:1446
+#: ../mail/mail-ops.c:1402
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Fjerner mappe Â%sÂ"
 
-#: ../mail/mail-ops.c:1609
+#: ../mail/mail-ops.c:1565
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrer mappe Â%sÂ"
 
-#: ../mail/mail-ops.c:1678
+#: ../mail/mail-ops.c:1637
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "TÃmmer og lagrer konto Â%sÂ"
 
-#: ../mail/mail-ops.c:1679
+#: ../mail/mail-ops.c:1638
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Lagrer konto Â%sÂ"
 
-#: ../mail/mail-ops.c:1737
+#: ../mail/mail-ops.c:1696
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Oppdaterer mappe Â%sÂ"
 
-#: ../mail/mail-ops.c:1901
+#: ../mail/mail-ops.c:1866
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "TÃmmer mappe Â%sÂ"
 
-#: ../mail/mail-ops.c:1973
+#: ../mail/mail-ops.c:1933
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "TÃmmer sÃppel i Â%sÂ"
 
-#: ../mail/mail-ops.c:1974
+#: ../mail/mail-ops.c:1934
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
-#: ../mail/mail-ops.c:2147
+#: ../mail/mail-ops.c:2099
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Henter %d melding"
 msgstr[1] "Henter %d melding(er)"
 
-#: ../mail/mail-ops.c:2240
+#: ../mail/mail-ops.c:2192
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Lagrer %d melding"
 msgstr[1] "Lagrer %d meldinger"
 
-#: ../mail/mail-ops.c:2336
+#: ../mail/mail-ops.c:2288
 #, c-format
 msgid "Error saving messages to: %s:\n"
 msgstr "Feil under lagring av av meldinger til: %s:\n"
 
-#: ../mail/mail-ops.c:2411
+#: ../mail/mail-ops.c:2363
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Forbereder konto Â%sÂ for frakoblet bruk"
 
-#: ../mail/mail-ops.c:2502
+#: ../mail/mail-ops.c:2453
 msgid "Checking Service"
 msgstr "Sjekker tjeneste"
 
-#: ../mail/mail-ops.c:2582
+#: ../mail/mail-ops.c:2531
 #, c-format
 msgid "Disconnecting %s"
 msgstr "Kobler fra %s"
 
-#: ../mail/mail-ops.c:2639
+#: ../mail/mail-ops.c:2588
 #, c-format
 msgid "Removing attachments"
 msgstr "Fjerner vedlegg"
 
-#: ../mail/mail-ops.c:2686
+#: ../mail/mail-ops.c:2635
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "Filen Â%sÂ ble fjernet."
 
-#: ../mail/mail-send-recv.c:190
+#: ../mail/mail-send-recv.c:191
 msgid "Canceling..."
 msgstr "Avbryter â"
 
-#: ../mail/mail-send-recv.c:435
+#: ../mail/mail-send-recv.c:437
 msgid "Send & Receive Mail"
 msgstr "Send & motta e-post"
 
-#: ../mail/mail-send-recv.c:451
+#: ../mail/mail-send-recv.c:453
 msgid "Cancel _All"
 msgstr "Avbryt _alle"
 
-#: ../mail/mail-send-recv.c:568
+#: ../mail/mail-send-recv.c:577
 msgid "Updating..."
 msgstr "Oppdaterer â"
 
-#: ../mail/mail-send-recv.c:568 ../mail/mail-send-recv.c:652
+#: ../mail/mail-send-recv.c:577 ../mail/mail-send-recv.c:670
 msgid "Waiting..."
 msgstr "Venter â"
 
-#: ../mail/mail-send-recv.c:902
+#: ../mail/mail-send-recv.c:929
 #, c-format
 msgid "Checking for new mail"
 msgstr "Ser etter nye meldinger"
 
-#: ../mail/mail-tools.c:69
+#: ../mail/mail-tools.c:71
 #, c-format
 msgid "Could not create spool directory '%s': %s"
 msgstr "Kan ikke opprette spool-katalog Â%sÂ: %s"
 
-#: ../mail/mail-tools.c:102
+#: ../mail/mail-tools.c:105
 #, c-format
 msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "PrÃver Ã bruke movemail pÃ en kilde, Â%sÂ, som ikke er i mbox-format"
@@ -12128,17 +12160,17 @@ msgstr "Videresendt melding - %s"
 msgid "Forwarded message"
 msgstr "Videresendt melding"
 
-#: ../mail/mail-vfolder.c:86
+#: ../mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Setter opp sÃkemappe: %s"
 
-#: ../mail/mail-vfolder.c:235
+#: ../mail/mail-vfolder.c:236
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Oppdaterer sÃkemapper for Â%s:%sÂ"
 
-#: ../mail/mail-vfolder.c:242
+#: ../mail/mail-vfolder.c:243
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Oppdaterer sÃkemapper for Â%sÂ"
@@ -12148,7 +12180,7 @@ msgstr "Oppdaterer sÃkemapper for Â%sÂ"
 #. * removed folder. For more than one search folder is
 #. * each of them on a separate line, with four spaces
 #. * in front of its name, without quotes.
-#: ../mail/mail-vfolder.c:718
+#: ../mail/mail-vfolder.c:727
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
@@ -12166,11 +12198,11 @@ msgstr[1] ""
 "%s ble oppdatert fordi de brukte en mappe som ble slettet\n"
 "Â%sÂ."
 
-#: ../mail/mail-vfolder.c:1297
+#: ../mail/mail-vfolder.c:1315
 msgid "Edit Search Folder"
 msgstr "Rediger sÃkemappe"
 
-#: ../mail/mail-vfolder.c:1408
+#: ../mail/mail-vfolder.c:1426
 msgid "New Search Folder"
 msgstr "Ny sÃkemappe"
 
@@ -12382,56 +12414,52 @@ msgstr "Lukk meldingsvinduet."
 msgid "Could not save signature file."
 msgstr "Kunne ikke lagre signaturfil."
 
-#: ../mail/mail.error.xml.h:45
-msgid "Delete messages in Search Folder \"{0}\"?"
-msgstr "Slett meldinger i sÃkemappe Â{0}Â?"
-
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:46
 msgid "Do _Not Disable"
 msgstr "I_kke slÃ av"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:47
 msgid "Do _Not Send"
 msgstr "Ikke se_nd"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:48
 msgid "Do _Not Synchronize"
 msgstr "Ikke sy_nkroniser"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:49
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr "Vil du synkronisere mapper som er merket for frakoblet bruk lokalt?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:50
 msgid "Do you want to mark all messages as read?"
 msgstr "Vil du merke alle meldinger som lest?"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:51
 msgid "Do you wish to save your changes?"
 msgstr "Vil du lagre dine endringer?"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:52
 msgid "Enter password."
 msgstr "Oppgi passord."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:53
 msgid "Error loading filter definitions."
 msgstr "Feil under lasting av filterdefinisjoner."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:54
 msgid "Error while performing operation."
 msgstr "Feil under utfÃring av operasjon."
 
 #. Translators: the {0} is replaced with an operation name, which failed.
 #. It can be basically anything run asynchronously, like "Fetching Mail",
 #. "Sending message" and others, mostly from mail-ops.c file.
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:58
 msgid "Error while {0}."
 msgstr "Feil under {0}."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:59
 msgid ""
 "Evolution's local mail format has changed from mbox to Maildir. Your local "
 "mail must be migrated to the new format before Evolution can proceed. Do you "
@@ -12449,10 +12477,14 @@ msgstr ""
 "slette denne etter Ã ha sjekket at data ble migrert uten problemer. "
 "Vennligst sjekk at det er nok plass hvis du velger Ã migrere."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:62
 msgid "Evolution's local mail format has changed."
 msgstr "Evolutions lokale e-postformat er endret."
 
+#: ../mail/mail.error.xml.h:63
+msgid "Failed to open folder."
+msgstr "Klarte ikke Ã Ãpne mappe."
+
 #: ../mail/mail.error.xml.h:64
 msgid "Failed to unsubscribe from folder."
 msgstr "Klarte ikke Ã fjerne abonnement pÃ mappe."
@@ -12540,34 +12572,41 @@ msgstr ""
 "Til: eller Cc:."
 
 #: ../mail/mail.error.xml.h:82
+msgid ""
+"Messages shown in Search Folders are not copies. Deleting them from a Search "
+"Folder will delete the actual messages from the folder or folders in which "
+"they physically reside. Do you really want to delete these messages?"
+msgstr "Meldinger som vises i sÃkemapper er ikke kopier. Hvis du sletter dem fra en sÃkemappe sletter du de faktiske meldingene fra dine lokale eller eksterne mapper. Vil du virkelig slette disse meldingene?"
+
+#: ../mail/mail.error.xml.h:83
 msgid "Missing folder."
 msgstr "Mangler mappe."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
 msgid "N_ever"
 msgstr "A_ldri"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:86
 msgid "No duplicate messages found."
 msgstr "Ingen duplikatmeldinger funnet."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:87
 msgid "No sources selected."
 msgstr "Ingen kilder valgt."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:88
 msgid "Opening too many messages at once may take a long time."
 msgstr "Hvis du Ãpner for mange meldinger pÃ en gang kan dette ta lang tid."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:89
 msgid "Please check your account settings and try again."
 msgstr "Vennligst sjekk innstillingene for kontoen og prÃv igjen."
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:90
 msgid "Please enable the account or send using another account."
 msgstr "Vennligst sjekk kontoen eller send fra en annen konto."
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:91
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -12575,7 +12614,7 @@ msgstr ""
 "Vennligst oppgi en gyldig e-postadresse i Til:-feltet. Du kan sÃke etter e-"
 "postadresser ved Ã klikke pÃ Til:-knappen ved siden av inntastingsfeltet."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:92
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -12584,63 +12623,63 @@ msgstr ""
 "Sjekk at fÃlgende mottakere kan og Ãnsker Ã motta e-post som HTML:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:94
 msgid "Please provide an unique name to identify this signature."
 msgstr "Oppgi et unikt navn for Ã identifisere denne signaturen."
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:95
 msgid "Please wait."
 msgstr "Vennligst vent."
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:96
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Det oppsto et problem under migrering av gammel meldingsmappe Â{0}Â."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:97
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "SpÃr tjener etter en liste med stÃttede autentiseringsmekanismer."
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:98
 msgid "Read receipt requested."
 msgstr "Lesekvittering etterspurt."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:99
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Vil du virkelig slette mappen Â{0}Â og alle undermapper?"
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:100
 msgid "Really delete folder \"{0}\"?"
 msgstr "Vil du virkelig slette mappen Â{0}Â?"
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:101
 msgid "Remove duplicate messages?"
 msgstr "Fjern duplikatmeldinger?"
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:102
 msgid "Reply _Privately"
 msgstr "Svar _privat"
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:105
 msgid "Search Folders automatically updated."
 msgstr "SÃkemapper oppdatert automatisk."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:106
 msgid "Send private reply?"
 msgstr "Send privat svar?"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:107
 msgid "Send reply to all recipients?"
 msgstr "Send svar til alle mottakere?"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:108
 msgid "Signature Already Exists"
 msgstr "Signaturen eksisterer allerede"
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:109
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Synkroniser mapper lokalt for frakoblet bruk?"
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -12648,7 +12687,7 @@ msgstr ""
 "Systemmapper kreves for at Evolution skal fungere korrekt og du kan ikke "
 "endre navn pÃ, flytte eller slette disse."
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -12664,7 +12703,7 @@ msgstr ""
 "meldingen likevel. For Ã unngÃ dette bÃr du legge inn minst en mottaker i "
 "Til: eller Cc:."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:114
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -12672,7 +12711,7 @@ msgstr ""
 "FÃlgende mottaker ble ikke gjenkjent som en gyldig e-postadresse:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -12680,11 +12719,15 @@ msgstr ""
 "FÃlgende mottakere ble ikke gjenkjent som gyldige e-postadresser:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:119
 msgid "The script file must exist and be executable."
 msgstr "Skriptfilen mÃ eksistere og vÃre kjÃrbar."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:120
+msgid "These messages are not copies."
+msgstr "Disse meldingene er ikke kopier."
+
+#: ../mail/mail.error.xml.h:121
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -12692,20 +12735,20 @@ msgstr ""
 "Denne mappen er lagt til implisitt. GÃ til redigering av sÃkemapper og legg "
 "den inn eksplisitt hvis det er nÃdvendig."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:123
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr ""
 "Denne meldingen kan ikke sendes fordi kontoen du sender med ikke er aktiv"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:124
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "Denne meldingen kan ikke sendes fordi du ikke har oppgitt noen mottakere"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:125
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -12713,25 +12756,25 @@ msgstr ""
 "Tjener stÃtter ikke denne typen autentisering. Det kan hende den ikke "
 "stÃtter autentisering i det hele tatt."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:126
 msgid "This signature has been changed, but has not been saved."
 msgstr "Denne signaturen er endret, men er ikke lagret."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:127
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr "Dette vil merke alle meldinger i valgt mappe med undermapper som lest."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:128
 msgid "This will mark all messages as read in the selected folder."
 msgstr "Dette vil merke alle meldinger i valgt mappe som lest."
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:129
 msgid "Unable to connect to the GroupWise server."
 msgstr "Kunne ikke koble til GroupWise-tjener."
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:130
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -12739,33 +12782,27 @@ msgstr ""
 "Kan ikke Ãpne skisse-mappen for denne kontoen. Vil du bruke forvalgt mappe "
 "for skisser i stedet?"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:131
 msgid "Unable to read license file."
 msgstr "Kan ikke lese lisensfilen."
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:132
+msgid "Unable to retrieve message."
+msgstr "Kunne ikke hente melding."
+
+#: ../mail/mail.error.xml.h:133
 msgid "Use _Default"
 msgstr "Bruk _forvalg"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:134
 msgid "Use default drafts folder?"
 msgstr "Bruk forvalgt mappe for skisser?"
 
-#: ../mail/mail.error.xml.h:132
-msgid ""
-"Warning: Deleting messages from a Search Folder will delete the actual "
-"message from one of your local or remote folders.\n"
-"Do you really want to do this?"
-msgstr ""
-"Advarsel: Hvis du sletter meldinger fra en sÃkemappe sletter du de faktiske "
-"meldingene fra dine lokale eller eksterne mapper.\n"
-"Vil du virkelig gjÃre dette?"
-
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:135
 msgid "Would you like to close the message window?"
 msgstr "Vil du lukke meldingsvinduet?"
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:136
 msgid ""
 "You are replying privately to a message which arrived via a mailing list, "
 "but the list is trying to redirect your reply to go back to the list. Are "
@@ -12775,7 +12812,7 @@ msgstr ""
 "Ã omdirigere ditt svar tilbake til listen. Er du sikker pÃ at du vil "
 "fortsette?"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:137
 msgid ""
 "You are replying to a message which arrived via a mailing list, but you are "
 "replying privately to the sender; not to the list. Are you sure you want to "
@@ -12784,7 +12821,7 @@ msgstr ""
 "Du svarer pÃ en melding som kom via en e-postliste, men du svarer privat til "
 "avsender og ikke til listen. Er du sikker pÃ at du vil fortsette?"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:138
 msgid ""
 "You are replying to a message which was sent to many recipients. Are you "
 "sure you want to reply to ALL of them?"
@@ -12792,31 +12829,31 @@ msgstr ""
 "Du svarer pÃ en melding som ble sendt til mange mottakere. Er du sikker pÃ "
 "at du vil svare til ALLE mottakerene?"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:139
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Du har ikke tilstrekkelige rettigheter til Ã slette denne meldingen."
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:140
 msgid "You have not filled in all of the required information."
 msgstr "Du har ikke fylt ut all nÃdvendig informasjon."
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:141
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Du har usendte meldinger. Vil du avslutte likevel?"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:142
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan ikke opprette to kontoer med samme navn."
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:143
 msgid "You must name this Search Folder."
 msgstr "Du mÃ gi navn til denne sÃkemappen."
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:144
 msgid "You must specify a folder."
 msgstr "Du mÃ oppgi en mappe."
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:145
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -12826,145 +12863,149 @@ msgstr ""
 "Enten ved Ã velge mappene individuelt og/eller Ã velge alle lokale mapper, "
 "alle eksterne mapper eller begge deler."
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:147
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Din pÃlogging pÃ tjener Â{0}Â som Â{0}Â feilet."
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:148
 msgid "_Always"
 msgstr "_Alltid"
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:149
 msgid "_Append"
 msgstr "_Legg til"
 
-#: ../mail/mail.error.xml.h:149
+#: ../mail/mail.error.xml.h:150
 #: ../plugins/groupwise-features/junk-settings.ui.h:5
 #: ../plugins/publish-calendar/publish-calendar.c:600
 msgid "_Disable"
 msgstr "_Deaktiver"
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:151
 msgid "_Discard changes"
 msgstr "_Forkast endringene"
 
-#: ../mail/mail.error.xml.h:151
-#: ../modules/mail/e-mail-shell-view-actions.c:1071
+#: ../mail/mail.error.xml.h:152
+#: ../modules/mail/e-mail-shell-view-actions.c:1065
 msgid "_Empty Trash"
 msgstr "_TÃm papirkurven"
 
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:153
 msgid "_Exit Evolution"
 msgstr "Avslutt _Evolution"
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:154
 msgid "_Expunge"
 msgstr "T_Ãm"
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:155
 msgid "_Migrate Now"
 msgstr "_Migrer nÃ"
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:156
 msgid "_No"
 msgstr "_Nei"
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:157
 msgid "_Open Messages"
 msgstr "_Ãpne meldinger"
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:160
 msgid "_Send Receipt"
 msgstr "_Send kvittering"
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:161
 msgid "_Synchronize"
 msgstr "_Synkroniser"
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:162
 msgid "_Yes"
 msgstr "_Ja"
 
-#: ../mail/message-list.c:1215
+#: ../mail/mail.error.xml.h:163
+msgid "{0}"
+msgstr "{0}"
+
+#: ../mail/message-list.c:1209
 msgid "Unseen"
 msgstr "Ulest"
 
-#: ../mail/message-list.c:1216
+#: ../mail/message-list.c:1210
 msgid "Seen"
 msgstr "Lest"
 
-#: ../mail/message-list.c:1217
+#: ../mail/message-list.c:1211
 msgid "Answered"
 msgstr "Besvart"
 
-#: ../mail/message-list.c:1218
+#: ../mail/message-list.c:1212
 msgid "Forwarded"
 msgstr "Videresendt"
 
-#: ../mail/message-list.c:1219
+#: ../mail/message-list.c:1213
 msgid "Multiple Unseen Messages"
 msgstr "Flere uleste meldinger"
 
-#: ../mail/message-list.c:1220
+#: ../mail/message-list.c:1214
 msgid "Multiple Messages"
 msgstr "Flere meldinger"
 
-#: ../mail/message-list.c:1224
+#: ../mail/message-list.c:1218
 msgid "Lowest"
 msgstr "Lavest"
 
-#: ../mail/message-list.c:1225
+#: ../mail/message-list.c:1219
 msgid "Lower"
 msgstr "Lavere"
 
-#: ../mail/message-list.c:1229
+#: ../mail/message-list.c:1223
 msgid "Higher"
 msgstr "HÃyere"
 
-#: ../mail/message-list.c:1230
+#: ../mail/message-list.c:1224
 msgid "Highest"
 msgstr "HÃyest"
 
-#: ../mail/message-list.c:1849 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1836 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1856 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1843 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "I dag %l:%M %p"
 
-#: ../mail/message-list.c:1865
+#: ../mail/message-list.c:1852
 msgid "Yesterday %l:%M %p"
 msgstr "I gÃr %l:%M %p"
 
-#: ../mail/message-list.c:1877
+#: ../mail/message-list.c:1864
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: ../mail/message-list.c:1885
+#: ../mail/message-list.c:1872
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H.%M"
 
-#: ../mail/message-list.c:1887
+#: ../mail/message-list.c:1874
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2671
+#: ../mail/message-list.c:2656
 msgid "Select all visible messages"
 msgstr "Velg alle synlige meldinger"
 
-#: ../mail/message-list.c:2829 ../mail/message-list.etspec.h:10
+#: ../mail/message-list.c:2814 ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Meldinger"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4497 ../mail/message-list.c:4921
+#: ../mail/message-list.c:4486 ../mail/message-list.c:4900
 msgid "Generating message list"
 msgstr "Genererer meldingsliste"
 
-#: ../mail/message-list.c:4736
+#: ../mail/message-list.c:4719
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -12972,7 +13013,7 @@ msgstr ""
 "Ingen meldinger passer dine sÃkekriterier. Du kan enten tÃmme sÃket med "
 "menyoppfÃringen SÃk->TÃm eller endre det."
 
-#: ../mail/message-list.c:4738
+#: ../mail/message-list.c:4721
 msgid "There are no messages in this folder."
 msgstr "Det er ingen meldinger i denne mappen."
 
@@ -13001,7 +13042,7 @@ msgid "Sent Messages"
 msgstr "Sendte meldinger"
 
 #: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:566
+#: ../widgets/misc/e-attachment-tree-view.c:568
 msgid "Size"
 msgstr "StÃrrelse"
 
@@ -13010,27 +13051,27 @@ msgid "Subject - Trimmed"
 msgstr "Forkortet emne"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1508
+#: ../modules/mail/e-mail-shell-view-actions.c:1502
 msgid "Body contains"
 msgstr "Kropp inneholder"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1515
+#: ../modules/mail/e-mail-shell-view-actions.c:1509
 msgid "Message contains"
 msgstr "Melding inneholder"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1522
+#: ../modules/mail/e-mail-shell-view-actions.c:1516
 msgid "Recipients contain"
 msgstr "Mottakere inneholder"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1529
+#: ../modules/mail/e-mail-shell-view-actions.c:1523
 msgid "Sender contains"
 msgstr "Avsender inneholder"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1536
+#: ../modules/mail/e-mail-shell-view-actions.c:1530
 msgid "Subject contains"
 msgstr "Emne inneholder"
 
@@ -13155,11 +13196,14 @@ msgstr "EFolderList XML for listen med URIer for fullfÃring"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
 msgid "Position of the contact preview pane when oriented horizontally."
-msgstr "Posisjon for forhÃndsvisningsomrÃdet for kontakter med horisontal orientering."
+msgstr ""
+"Posisjon for forhÃndsvisningsomrÃdet for kontakter med horisontal "
+"orientering."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
 msgid "Position of the contact preview pane when oriented vertically."
-msgstr "Posisjon for forhÃndsvisningsomrÃdet for kontakter med vertikal orientering."
+msgstr ""
+"Posisjon for forhÃndsvisningsomrÃdet for kontakter med vertikal orientering."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
 msgid "Primary address book"
@@ -13216,7 +13260,7 @@ msgstr "Om forhÃndsvisningsomrÃdet skal vises."
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
 #: ../modules/addressbook/autocompletion-config.c:161
-#: ../modules/mail/em-mailer-prefs.c:1140
+#: ../modules/mail/em-mailer-prefs.c:1145
 msgid "_Table column:"
 msgstr "Kolonne i _tabell:"
 
@@ -13240,7 +13284,7 @@ msgid "_Contact"
 msgstr "_Kontakt"
 
 #: ../modules/addressbook/e-book-shell-backend.c:278
-#: ../modules/addressbook/e-book-shell-view-actions.c:773
+#: ../modules/addressbook/e-book-shell-view-actions.c:766
 msgid "Create a new contact"
 msgstr "Opprett en ny kontakt"
 
@@ -13250,7 +13294,7 @@ msgid "Contact _List"
 msgstr "Kontakt_liste"
 
 #: ../modules/addressbook/e-book-shell-backend.c:285
-#: ../modules/addressbook/e-book-shell-view-actions.c:780
+#: ../modules/addressbook/e-book-shell-view-actions.c:773
 msgid "Create a new contact list"
 msgstr "Opprett en ny kontaktliste"
 
@@ -13272,7 +13316,7 @@ msgstr "Opprett en ny adressebok"
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: ../modules/addressbook/e-book-shell-backend.c:321
+#: ../modules/addressbook/e-book-shell-backend.c:322
 msgid "Certificates"
 msgstr "Sertifikater"
 
@@ -13322,7 +13366,7 @@ msgstr "Vis egenskaper for valgt adressebok"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1360
 #: ../modules/calendar/e-memo-shell-view-actions.c:626
 #: ../modules/calendar/e-task-shell-view-actions.c:750
-#: ../modules/mail/e-mail-shell-view-actions.c:1155
+#: ../modules/mail/e-mail-shell-view-actions.c:1149
 msgid "_Rename..."
 msgstr "End_re navn â"
 
@@ -13330,174 +13374,174 @@ msgstr "End_re navn â"
 msgid "Rename the selected address book"
 msgstr "Endre navn pÃ valgt adressebok"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:722
-msgid "S_ave Address Book as vCard"
-msgstr "L_agre adressebok som vCard"
-
 #: ../modules/addressbook/e-book-shell-view-actions.c:724
-msgid "Save the contacts of the selected address book as a vCard"
-msgstr "Lagre kontakter i valgt adressebok som vCard"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:731
 msgid "Stop loading"
 msgstr "Stopp lasting"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:736
+#: ../modules/addressbook/e-book-shell-view-actions.c:729
 msgid "_Copy Contact To..."
 msgstr "_Kopier kontakt til â"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:738
+#: ../modules/addressbook/e-book-shell-view-actions.c:731
 msgid "Copy selected contacts to another address book"
 msgstr "Kopier valgte kontakter til en annen adressebok"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:743
+#: ../modules/addressbook/e-book-shell-view-actions.c:736
 msgid "_Delete Contact"
 msgstr "_Slett kontakt"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:750
+#: ../modules/addressbook/e-book-shell-view-actions.c:743
 msgid "_Find in Contact..."
 msgstr "_Finn i kontakt â"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:752
+#: ../modules/addressbook/e-book-shell-view-actions.c:745
 msgid "Search for text in the displayed contact"
 msgstr "SÃk etter tekst i innholdet av vist kontakt"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:757
+#: ../modules/addressbook/e-book-shell-view-actions.c:750
 msgid "_Forward Contact..."
 msgstr "_Videresend kontakt â"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:759
+#: ../modules/addressbook/e-book-shell-view-actions.c:752
 msgid "Send selected contacts to another person"
 msgstr "Send valgte kontakter til en annen person"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:764
+#: ../modules/addressbook/e-book-shell-view-actions.c:757
 msgid "_Move Contact To..."
 msgstr "_Flytt kontakt til â"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:766
+#: ../modules/addressbook/e-book-shell-view-actions.c:759
 msgid "Move selected contacts to another address book"
 msgstr "Flytt valgte kontakter til en annen adressebok"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:771
+#: ../modules/addressbook/e-book-shell-view-actions.c:764
 msgid "_New Contact..."
 msgstr "_Ny kontakt â"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:778
+#: ../modules/addressbook/e-book-shell-view-actions.c:771
 msgid "New Contact _List..."
 msgstr "Ny kontakt_liste â"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:785
+#: ../modules/addressbook/e-book-shell-view-actions.c:778
 msgid "_Open Contact"
 msgstr "_Ãpne kontakt"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:787
+#: ../modules/addressbook/e-book-shell-view-actions.c:780
 msgid "View the current contact"
 msgstr "Vis aktiv kontakt"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:792
+#: ../modules/addressbook/e-book-shell-view-actions.c:785
 msgid "_Send Message to Contact..."
 msgstr "_Send melding til kontakt â"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:794
+#: ../modules/addressbook/e-book-shell-view-actions.c:787
 msgid "Send a message to the selected contacts"
 msgstr "Send en melding til valgte kontakter"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:801
-#: ../modules/calendar/e-cal-shell-view-actions.c:1502
+#: ../modules/addressbook/e-book-shell-view-actions.c:794
+#: ../modules/calendar/e-cal-shell-view-actions.c:1495
 #: ../modules/calendar/e-task-shell-view-actions.c:808
 msgid "_Actions"
 msgstr "H_andlinger"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:808
+#: ../modules/addressbook/e-book-shell-view-actions.c:801
 #: ../modules/calendar/e-memo-shell-view-actions.c:663
 #: ../modules/calendar/e-task-shell-view-actions.c:815
-#: ../modules/mail/e-mail-shell-view-actions.c:1320
+#: ../modules/mail/e-mail-shell-view-actions.c:1314
 msgid "_Preview"
 msgstr "_ForhÃndsvis"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:817
-#: ../modules/calendar/e-cal-shell-view-actions.c:1519
+#: ../modules/addressbook/e-book-shell-view-actions.c:810
+#: ../modules/calendar/e-cal-shell-view-actions.c:1512
 #: ../modules/calendar/e-memo-shell-view-actions.c:676
 #: ../modules/calendar/e-task-shell-view-actions.c:828
 msgid "_Delete"
 msgstr "_Slett"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:821
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
 msgid "_Properties"
 msgstr "Egenska_per â"
 
-#. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:830
-#: ../modules/addressbook/e-book-shell-view-actions.c:976
-msgid "_Save as vCard..."
-msgstr "Lagre _som vCard â"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:858
+#: ../modules/addressbook/e-book-shell-view-actions.c:846
 msgid "Contact _Preview"
 msgstr "_ForhÃndsvisning av kontakt"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
+#: ../modules/addressbook/e-book-shell-view-actions.c:848
 msgid "Show contact preview window"
 msgstr "Vis vindu for forhÃndsvisning av kontakter"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:879
+#: ../modules/addressbook/e-book-shell-view-actions.c:867
 #: ../modules/calendar/e-memo-shell-view-actions.c:733
 #: ../modules/calendar/e-task-shell-view-actions.c:897
-#: ../modules/mail/e-mail-shell-view-actions.c:1418
+#: ../modules/mail/e-mail-shell-view-actions.c:1412
 msgid "_Classic View"
 msgstr "_Klassisk visning"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:881
+#: ../modules/addressbook/e-book-shell-view-actions.c:869
 msgid "Show contact preview below the contact list"
 msgstr "Vis forhÃndsvisning av kontakt under kontaktlisten"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:886
+#: ../modules/addressbook/e-book-shell-view-actions.c:874
 #: ../modules/calendar/e-memo-shell-view-actions.c:740
 #: ../modules/calendar/e-task-shell-view-actions.c:904
-#: ../modules/mail/e-mail-shell-view-actions.c:1425
+#: ../modules/mail/e-mail-shell-view-actions.c:1419
 msgid "_Vertical View"
 msgstr "_Vertikal visning"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:888
+#: ../modules/addressbook/e-book-shell-view-actions.c:876
 msgid "Show contact preview alongside the contact list"
 msgstr "Vis forhÃndsvisning av kontakt ved siden av kontaktlisten"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:896
-#: ../modules/calendar/e-cal-shell-view-actions.c:1662
+#: ../modules/addressbook/e-book-shell-view-actions.c:884
+#: ../modules/calendar/e-cal-shell-view-actions.c:1651
 #: ../modules/calendar/e-memo-shell-view-actions.c:750
 #: ../modules/calendar/e-task-shell-view-actions.c:921
 msgid "Any Category"
 msgstr "Enhver kategori"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:903
-#: ../modules/calendar/e-cal-shell-view-actions.c:1676
+#: ../modules/addressbook/e-book-shell-view-actions.c:891
+#: ../modules/calendar/e-cal-shell-view-actions.c:1665
 #: ../modules/calendar/e-memo-shell-view-actions.c:757
 #: ../modules/calendar/e-task-shell-view-actions.c:956
 msgid "Unmatched"
 msgstr "Ingen treff"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:913
-#: ../modules/calendar/e-cal-shell-view-actions.c:1686
+#: ../modules/addressbook/e-book-shell-view-actions.c:901
+#: ../modules/calendar/e-cal-shell-view-actions.c:1675
 #: ../modules/calendar/e-memo-shell-view-actions.c:767
 #: ../modules/calendar/e-task-shell-view-actions.c:966
-#: ../modules/mail/e-mail-shell-view-actions.c:1501
-#: ../shell/e-shell-content.c:633
+#: ../modules/mail/e-mail-shell-view-actions.c:1495
+#: ../shell/e-shell-content.c:634
 msgid "Advanced Search"
 msgstr "Avansert sÃk"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:946
+#: ../modules/addressbook/e-book-shell-view-actions.c:934
 msgid "Print all shown contacts"
 msgstr "Skriv ut alle viste kontakter"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:953
+#: ../modules/addressbook/e-book-shell-view-actions.c:941
 msgid "Preview the contacts to be printed"
 msgstr "ForhÃndsvis kontaktene som skal skrives ut"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:960
+#: ../modules/addressbook/e-book-shell-view-actions.c:948
 msgid "Print selected contacts"
 msgstr "Skriv ut valgte kontakter"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:978
+#: ../modules/addressbook/e-book-shell-view-actions.c:963
+msgid "S_ave Address Book as vCard"
+msgstr "L_agre adressebok som vCard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:965
+msgid "Save the contacts of the selected address book as a vCard"
+msgstr "Lagre kontakter i valgt adressebok som vCard"
+
+#. Translators: This is an action label
+#: ../modules/addressbook/e-book-shell-view-actions.c:971
+#: ../modules/addressbook/e-book-shell-view-actions.c:981
+msgid "_Save as vCard..."
+msgstr "Lagre _som vCard â"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:973
 msgid "Save selected contacts as a vCard"
 msgstr "Lagre valgte kontakter som et vCard"
 
@@ -13618,10 +13662,6 @@ msgstr "_Finn mulige sÃkebaser"
 msgid "_Login method:"
 msgstr "Metode for pÃ_logging:"
 
-#: ../modules/addressbook/ldap-config.ui.h:27
-msgid "_Port:"
-msgstr "_Port:"
-
 #: ../modules/addressbook/ldap-config.ui.h:28
 msgid "_Search scope:"
 msgstr "_SÃkeomrÃde:"
@@ -13748,7 +13788,7 @@ msgid "Template:"
 msgstr "Mal:"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:43
-#: ../widgets/misc/e-dateedit.c:591
+#: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "Tid"
 
@@ -13766,7 +13806,7 @@ msgid "Wee_k starts on:"
 msgstr "Uk_en starter pÃ:"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:51
-#: ../modules/calendar/e-cal-shell-view-actions.c:1645
+#: ../modules/calendar/e-cal-shell-view-actions.c:1634
 msgid "Work Week"
 msgstr "Arbeidsuke"
 
@@ -14057,15 +14097,19 @@ msgstr ""
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
 msgid "Position of the memo preview pane when oriented vertically."
-msgstr "Posisjon for forhÃndsvisningsomrÃdet for notater med vertikal orientering."
+msgstr ""
+"Posisjon for forhÃndsvisningsomrÃdet for notater med vertikal orientering."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
 msgid "Position of the task preview pane when oriented horizontally."
-msgstr "Posisjon for forhÃndsvisningsomrÃdet for oppgaver med horisontall orientering."
+msgstr ""
+"Posisjon for forhÃndsvisningsomrÃdet for oppgaver med horisontall "
+"orientering."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
 msgid "Position of the task preview pane when oriented vertically."
-msgstr "Posisjon for forhÃndsvisningsomrÃdet for oppgaver med vertikal orientering."
+msgstr ""
+"Posisjon for forhÃndsvisningsomrÃdet for oppgaver med vertikal orientering."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
 msgid ""
@@ -14139,7 +14183,9 @@ msgstr "Vis kategorifelt ved redigering av hendelse/mÃte/oppgave"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:70
 msgid "Show days with recurrent events in italic font in bottom left calendar."
-msgstr "Vis dager med gjentakende hendelser i kursiv skrift i kalenderen nederst til venstre."
+msgstr ""
+"Vis dager med gjentakende hendelser i kursiv skrift i kalenderen nederst til "
+"venstre."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
 msgid "Show display alarms in notification tray"
@@ -14437,7 +14483,7 @@ msgstr "I_mporter til oppgaver"
 #: ../modules/calendar/e-cal-shell-backend.c:107
 #: ../modules/calendar/e-cal-shell-migrate.c:194
 #: ../modules/calendar/e-memo-shell-backend.c:94
-#: ../modules/calendar/e-memo-shell-migrate.c:149
+#: ../modules/calendar/e-memo-shell-migrate.c:148
 #: ../modules/calendar/e-task-shell-backend.c:94
 #: ../modules/calendar/e-task-shell-migrate.c:160
 msgid "On The Web"
@@ -14492,7 +14538,7 @@ msgid "Create a new calendar"
 msgstr "Opprett en ny kalender"
 
 #: ../modules/calendar/e-cal-shell-backend.c:750
-#: ../plugins/itip-formatter/itip-formatter.c:2809
+#: ../plugins/itip-formatter/itip-formatter.c:2807
 msgid "Calendar and Tasks"
 msgstr "Kalender og oppgaver"
 
@@ -14509,7 +14555,7 @@ msgid "Calendar Selector"
 msgstr "Kalendervelger"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:995
+#: ../modules/calendar/e-cal-shell-sidebar.c:998
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Ãpner kalender pÃ %s"
@@ -14701,95 +14747,95 @@ msgid "_Reply"
 msgstr "Sva_r"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1472
-#: ../modules/calendar/e-cal-shell-view-memopad.c:278
-msgid "Save as iCalendar..."
-msgstr "Lagre som iCalendar â"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1479
 msgid "_Schedule Meeting..."
 msgstr "_Sett opp mÃte â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1481
+#: ../modules/calendar/e-cal-shell-view-actions.c:1474
 msgid "Converts an appointment to a meeting"
 msgstr "Konverter en avtale til et mÃte"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1486
+#: ../modules/calendar/e-cal-shell-view-actions.c:1479
 msgid "Conv_ert to Appointment..."
 msgstr "Konv_erter til avtale â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1488
+#: ../modules/calendar/e-cal-shell-view-actions.c:1481
 msgid "Converts a meeting to an appointment"
 msgstr "Konverterer et mÃte til en avtale"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1493
+#: ../modules/calendar/e-cal-shell-view-actions.c:1486
 msgid "Quit"
 msgstr "Avslutt"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1617
+#: ../modules/calendar/e-cal-shell-view-actions.c:1606
 msgid "Day"
 msgstr "Dag"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
+#: ../modules/calendar/e-cal-shell-view-actions.c:1608
 msgid "Show one day"
 msgstr "Vis en dag"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1624
+#: ../modules/calendar/e-cal-shell-view-actions.c:1613
 msgid "List"
 msgstr "Liste"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
+#: ../modules/calendar/e-cal-shell-view-actions.c:1615
 msgid "Show as list"
 msgstr "Vis som liste"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1631
+#: ../modules/calendar/e-cal-shell-view-actions.c:1620
 msgid "Month"
 msgstr "MÃned"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
+#: ../modules/calendar/e-cal-shell-view-actions.c:1622
 msgid "Show one month"
 msgstr "Vis en mÃned"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1638
+#: ../modules/calendar/e-cal-shell-view-actions.c:1627
 msgid "Week"
 msgstr "Uke"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
+#: ../modules/calendar/e-cal-shell-view-actions.c:1629
 msgid "Show one week"
 msgstr "Vis en uke"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1647
+#: ../modules/calendar/e-cal-shell-view-actions.c:1636
 msgid "Show one work week"
 msgstr "Vis en arbeidsuke"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1655
+#: ../modules/calendar/e-cal-shell-view-actions.c:1644
 msgid "Active Appointments"
 msgstr "Aktive avtaler"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1669
+#: ../modules/calendar/e-cal-shell-view-actions.c:1658
 msgid "Next 7 Days' Appointments"
 msgstr "Avtaler for de neste 7 dagene"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1700
+#: ../modules/calendar/e-cal-shell-view-actions.c:1689
 #: ../modules/calendar/e-memo-shell-view-actions.c:781
 #: ../modules/calendar/e-task-shell-view-actions.c:980
 msgid "Description contains"
 msgstr "Beskrivelse inneholder"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1707
+#: ../modules/calendar/e-cal-shell-view-actions.c:1696
 #: ../modules/calendar/e-memo-shell-view-actions.c:788
 #: ../modules/calendar/e-task-shell-view-actions.c:987
 msgid "Summary contains"
 msgstr "Sammendrag inneholder"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1719
+#: ../modules/calendar/e-cal-shell-view-actions.c:1708
 msgid "Print this calendar"
 msgstr "Skriv ut denne kalenderen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1726
+#: ../modules/calendar/e-cal-shell-view-actions.c:1715
 msgid "Preview the calendar to be printed"
 msgstr "ForhÃndsvis kalenderen som skal skrives ut"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1799
+#: ../modules/calendar/e-cal-shell-view-actions.c:1737
+#: ../modules/calendar/e-cal-shell-view-memopad.c:291
+msgid "Save as iCalendar..."
+msgstr "Lagre som iCalendar â"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1814
 msgid "Go To"
 msgstr "GÃ til"
 
@@ -14828,7 +14874,7 @@ msgstr "Vis valgt notat"
 msgid "Open _Web Page"
 msgstr "_Ãpne nettside"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:290
+#: ../modules/calendar/e-cal-shell-view-memopad.c:283
 #: ../modules/calendar/e-memo-shell-view-actions.c:814
 msgid "Print the selected memo"
 msgstr "Skriv ut valgt notat"
@@ -14887,17 +14933,17 @@ msgstr "_Ãpne oppgave"
 msgid "View the selected task"
 msgstr "Vis valgt oppgave"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:365
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:370
+#: ../modules/calendar/e-task-shell-view-actions.c:1013
+msgid "Print the selected task"
+msgstr "Skriv ut valgt oppgave"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:378
 #: ../modules/calendar/e-memo-shell-view-actions.c:829
 #: ../modules/calendar/e-task-shell-view-actions.c:1028
 msgid "_Save as iCalendar..."
 msgstr "_Lagre som iCalendar â"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:377
-#: ../modules/calendar/e-task-shell-view-actions.c:1013
-msgid "Print the selected task"
-msgstr "Skriv ut valgt oppgave"
-
 #: ../modules/calendar/e-calendar-preferences.c:437
 msgid "Selected Calendars for Alarms"
 msgstr "Kalendere valgt for varsel"
@@ -14943,7 +14989,7 @@ msgid "Memo List Selector"
 msgstr "Valgt av notatliste"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:882
+#: ../modules/calendar/e-memo-shell-sidebar.c:885
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Ãpner notat pÃ %s"
@@ -15067,7 +15113,7 @@ msgid "Task List Selector"
 msgstr "Valg av oppgaveliste"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:882
+#: ../modules/calendar/e-task-shell-sidebar.c:885
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Ãpner oppgaver pÃ %s"
@@ -15089,6 +15135,10 @@ msgstr ""
 "\n"
 "Vil du virkelig slette disse oppgavene?"
 
+#: ../modules/calendar/e-task-shell-view-actions.c:576
+msgid "Do not ask me again"
+msgstr "Ikke spÃr meg igjen"
+
 #: ../modules/calendar/e-task-shell-view-actions.c:694
 msgid "_Delete Task"
 msgstr "_Slett oppgave"
@@ -15213,426 +15263,426 @@ msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "Ingen"
 
-#: ../modules/mail/e-mail-shell-backend.c:183
+#: ../modules/mail/e-mail-shell-backend.c:211
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "E-post_melding"
 
-#: ../modules/mail/e-mail-shell-backend.c:185
+#: ../modules/mail/e-mail-shell-backend.c:213
 msgid "Compose a new mail message"
 msgstr "Skriv en ny e-postmelding"
 
-#: ../modules/mail/e-mail-shell-backend.c:193
+#: ../modules/mail/e-mail-shell-backend.c:221
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "E-post_mappe"
 
-#: ../modules/mail/e-mail-shell-backend.c:195
+#: ../modules/mail/e-mail-shell-backend.c:223
 msgid "Create a new mail folder"
 msgstr "Opprett en ny e-postmappe"
 
-#: ../modules/mail/e-mail-shell-backend.c:494
+#: ../modules/mail/e-mail-shell-backend.c:522
 msgid "Mail Accounts"
 msgstr "E-post-konti"
 
-#: ../modules/mail/e-mail-shell-backend.c:502
+#: ../modules/mail/e-mail-shell-backend.c:530
 msgid "Mail Preferences"
 msgstr "Brukervalg for e-post"
 
-#: ../modules/mail/e-mail-shell-backend.c:510
+#: ../modules/mail/e-mail-shell-backend.c:538
 msgid "Composer Preferences"
 msgstr "Brukervalg for redigering"
 
-#: ../modules/mail/e-mail-shell-backend.c:518
+#: ../modules/mail/e-mail-shell-backend.c:546
 msgid "Network Preferences"
 msgstr "Brukervalg for nettverk"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1064
-#: ../modules/mail/e-mail-shell-view.c:953
+#: ../modules/mail/e-mail-shell-view-actions.c:1058
+#: ../modules/mail/e-mail-shell-view.c:947
 msgid "_Disable Account"
 msgstr "_Deaktiver konto"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1066
+#: ../modules/mail/e-mail-shell-view-actions.c:1060
 msgid "Disable this account"
 msgstr "Deaktiver denne kontoen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1073
+#: ../modules/mail/e-mail-shell-view-actions.c:1067
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Fjern alle slettede meldinger fra alle mapper permanent"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1078
+#: ../modules/mail/e-mail-shell-view-actions.c:1072
 msgid "C_reate Search Folder From Search..."
 msgstr "Opp_rett sÃkemappe fra sÃk â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1085
+#: ../modules/mail/e-mail-shell-view-actions.c:1079
 msgid "_Download Messages for Offline Usage"
 msgstr "Last ne_d meldinger for frakoblet bruk"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1087
+#: ../modules/mail/e-mail-shell-view-actions.c:1081
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 "Last ned meldinger fra kontoer og mapper som er merket for frakoblet bruk"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1092
+#: ../modules/mail/e-mail-shell-view-actions.c:1086
 msgid "Fl_ush Outbox"
 msgstr "T_Ãm utboks"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1099
+#: ../modules/mail/e-mail-shell-view-actions.c:1093
 msgid "_Copy Folder To..."
 msgstr "_Kopier mappe til â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1101
+#: ../modules/mail/e-mail-shell-view-actions.c:1095
 msgid "Copy the selected folder into another folder"
 msgstr "Kopier valgt mappe til en annen mappe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1108
+#: ../modules/mail/e-mail-shell-view-actions.c:1102
 msgid "Permanently remove this folder"
 msgstr "Fjern denne mappen permanent"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1113
+#: ../modules/mail/e-mail-shell-view-actions.c:1107
 msgid "E_xpunge"
 msgstr "T_Ãm"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1115
+#: ../modules/mail/e-mail-shell-view-actions.c:1109
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Fjern alle slettede meldinger fra denne mappen permanent"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1120
+#: ../modules/mail/e-mail-shell-view-actions.c:1114
 msgid "Mar_k All Messages as Read"
 msgstr "Mer_k alle meldinger som lest"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1122
+#: ../modules/mail/e-mail-shell-view-actions.c:1116
 msgid "Mark all messages in the folder as read"
 msgstr "Merk alle meldinger i en mappe som lest"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1127
+#: ../modules/mail/e-mail-shell-view-actions.c:1121
 msgid "_Move Folder To..."
 msgstr "Flytt _mappe til â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1129
+#: ../modules/mail/e-mail-shell-view-actions.c:1123
 msgid "Move the selected folder into another folder"
 msgstr "Flytt valgt mappe til en annen mappe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1134
+#: ../modules/mail/e-mail-shell-view-actions.c:1128
 msgid "_New..."
 msgstr "_Ny â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1136
+#: ../modules/mail/e-mail-shell-view-actions.c:1130
 msgid "Create a new folder for storing mail"
 msgstr "Lag en ny mappe for lagring av meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1143
+#: ../modules/mail/e-mail-shell-view-actions.c:1137
 msgid "Change the properties of this folder"
 msgstr "Endre egenskaper for denne mappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1150
+#: ../modules/mail/e-mail-shell-view-actions.c:1144
 msgid "Refresh the folder"
 msgstr "Oppdater mappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1157
+#: ../modules/mail/e-mail-shell-view-actions.c:1151
 msgid "Change the name of this folder"
 msgstr "Endre navn pÃ denne mappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1162
+#: ../modules/mail/e-mail-shell-view-actions.c:1156
 msgid "Select Message _Thread"
 msgstr "Velg meldings_trÃd"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1164
+#: ../modules/mail/e-mail-shell-view-actions.c:1158
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Velg alle meldinger i samme trÃd som den valgte meldingen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1169
+#: ../modules/mail/e-mail-shell-view-actions.c:1163
 msgid "Select Message S_ubthread"
 msgstr "Velg _undertrÃd for melding"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1171
+#: ../modules/mail/e-mail-shell-view-actions.c:1165
 msgid "Select all replies to the currently selected message"
 msgstr "Velg alle svar til den valgt melding"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1183
+#: ../modules/mail/e-mail-shell-view-actions.c:1177
 msgid "Empty _Trash"
 msgstr "TÃm _papirkurven"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1185
+#: ../modules/mail/e-mail-shell-view-actions.c:1179
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Fjern alle slettede meldinger fra alle kontoer permanent"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1190
+#: ../modules/mail/e-mail-shell-view-actions.c:1184
 msgid "_New Label"
 msgstr "_Ny etikett"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1199
+#: ../modules/mail/e-mail-shell-view-actions.c:1193
 msgid "N_one"
 msgstr "_Ingen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1213
+#: ../modules/mail/e-mail-shell-view-actions.c:1207
 msgid "_Manage Subscriptions"
 msgstr "_HÃndter abonnement"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1215
-#: ../modules/mail/e-mail-shell-view-actions.c:1299
+#: ../modules/mail/e-mail-shell-view-actions.c:1209
+#: ../modules/mail/e-mail-shell-view-actions.c:1293
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Abonner eller fjern abonnement pÃ mapper pÃ eksterne tjenere"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1220
-#: ../modules/mail/e-mail-shell-view-actions.c:1241
+#: ../modules/mail/e-mail-shell-view-actions.c:1214
+#: ../modules/mail/e-mail-shell-view-actions.c:1235
 msgid "Send / _Receive"
 msgstr "Send / _motta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1222
+#: ../modules/mail/e-mail-shell-view-actions.c:1216
 msgid "Send queued items and retrieve new items"
 msgstr "Send kÃlagte oppfÃringer og hent nye oppfÃringer"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1227
+#: ../modules/mail/e-mail-shell-view-actions.c:1221
 msgid "R_eceive All"
 msgstr "Motta all_e"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1229
+#: ../modules/mail/e-mail-shell-view-actions.c:1223
 msgid "Receive new items from all accounts"
 msgstr "Motta nye oppfÃringer fra alle kontoer"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1234
+#: ../modules/mail/e-mail-shell-view-actions.c:1228
 msgid "_Send All"
 msgstr "_Send alle"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1236
+#: ../modules/mail/e-mail-shell-view-actions.c:1230
 msgid "Send queued items in all accounts"
 msgstr "Send kÃlagte oppfÃringer i alle kontoer"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1262
-#: ../widgets/misc/e-activity-proxy.c:310
+#: ../modules/mail/e-mail-shell-view-actions.c:1256
+#: ../widgets/misc/e-activity-proxy.c:306
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1264
+#: ../modules/mail/e-mail-shell-view-actions.c:1258
 msgid "Cancel the current mail operation"
 msgstr "Avbryt aktiv e-postoperasjon"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1269
+#: ../modules/mail/e-mail-shell-view-actions.c:1263
 msgid "Collapse All _Threads"
 msgstr "SlÃ sammen alle _trÃder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1271
+#: ../modules/mail/e-mail-shell-view-actions.c:1265
 msgid "Collapse all message threads"
 msgstr "SlÃ sammen alle meldingstrÃder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1276
+#: ../modules/mail/e-mail-shell-view-actions.c:1270
 msgid "E_xpand All Threads"
 msgstr "Ut_vid alle trÃder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1278
+#: ../modules/mail/e-mail-shell-view-actions.c:1272
 msgid "Expand all message threads"
 msgstr "Utvid alle meldingstrÃder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1283
+#: ../modules/mail/e-mail-shell-view-actions.c:1277
 msgid "_Message Filters"
 msgstr "_Meldingsfiltre"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1285
+#: ../modules/mail/e-mail-shell-view-actions.c:1279
 msgid "Create or edit rules for filtering new mail"
 msgstr "Opprett eller rediger regler for filtrering av ny e-post"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1290
+#: ../modules/mail/e-mail-shell-view-actions.c:1284
 msgid "Search F_olders"
 msgstr "SÃk i _mapper"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1292
+#: ../modules/mail/e-mail-shell-view-actions.c:1286
 msgid "Create or edit search folder definitions"
 msgstr "Opprett eller rediger sÃkemappedefinisjoner"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1297
+#: ../modules/mail/e-mail-shell-view-actions.c:1291
 msgid "_Subscriptions..."
 msgstr "_Abonnement â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1306
+#: ../modules/mail/e-mail-shell-view-actions.c:1300
 msgid "F_older"
 msgstr "M_appe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1313
+#: ../modules/mail/e-mail-shell-view-actions.c:1307
 msgid "_Label"
 msgstr "_Etikett"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1353
+#: ../modules/mail/e-mail-shell-view-actions.c:1347
 msgid "_New Folder..."
 msgstr "_Ny mappe â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1381
+#: ../modules/mail/e-mail-shell-view-actions.c:1375
 msgid "Show Message _Preview"
 msgstr "Vis _forhÃndsvisning av melding"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1383
+#: ../modules/mail/e-mail-shell-view-actions.c:1377
 msgid "Show message preview pane"
 msgstr "Vis omrÃde for forhÃndsvisning av melding"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1389
+#: ../modules/mail/e-mail-shell-view-actions.c:1383
 msgid "Show _Deleted Messages"
 msgstr "Vis slette_de meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1391
+#: ../modules/mail/e-mail-shell-view-actions.c:1385
 msgid "Show deleted messages with a line through them"
 msgstr "Vis slettede meldinger som gjennomstreket i meldingslisten."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1397
+#: ../modules/mail/e-mail-shell-view-actions.c:1391
 msgid "_Group By Threads"
 msgstr "_Grupper etter trÃder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1399
+#: ../modules/mail/e-mail-shell-view-actions.c:1393
 msgid "Threaded message list"
 msgstr "Meldingsliste med trÃder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1420
+#: ../modules/mail/e-mail-shell-view-actions.c:1414
 msgid "Show message preview below the message list"
 msgstr "Vis meldingen under meldingslisten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1427
+#: ../modules/mail/e-mail-shell-view-actions.c:1421
 msgid "Show message preview alongside the message list"
 msgstr "Vis meldingen ved siden av meldingslisten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1435
+#: ../modules/mail/e-mail-shell-view-actions.c:1429
 msgid "All Messages"
 msgstr "Alle meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1442
+#: ../modules/mail/e-mail-shell-view-actions.c:1436
 msgid "Important Messages"
 msgstr "Viktige meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1449
+#: ../modules/mail/e-mail-shell-view-actions.c:1443
 msgid "Last 5 Days' Messages"
 msgstr "Meldinger fra de siste 5 dagene"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1456
+#: ../modules/mail/e-mail-shell-view-actions.c:1450
 msgid "Messages Not Junk"
 msgstr "Meldinger som ikke er uÃnsket e-post"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1463
+#: ../modules/mail/e-mail-shell-view-actions.c:1457
 msgid "Messages with Attachments"
 msgstr "Meldinger med vedlegg"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1470
+#: ../modules/mail/e-mail-shell-view-actions.c:1464
 msgid "No Label"
 msgstr "Ingen etikett"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1477
+#: ../modules/mail/e-mail-shell-view-actions.c:1471
 msgid "Read Messages"
 msgstr "Leste meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1484
+#: ../modules/mail/e-mail-shell-view-actions.c:1478
 msgid "Recent Messages"
 msgstr "Nye meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1491
+#: ../modules/mail/e-mail-shell-view-actions.c:1485
 msgid "Unread Messages"
 msgstr "Uleste meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1543
+#: ../modules/mail/e-mail-shell-view-actions.c:1537
 msgid "Subject or Addresses contain"
 msgstr "Emne eller adresser inneholder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1553
+#: ../modules/mail/e-mail-shell-view-actions.c:1547
 msgid "All Accounts"
 msgstr "Alle konti"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1560
+#: ../modules/mail/e-mail-shell-view-actions.c:1554
 msgid "Current Account"
 msgstr "Denne kontoen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1567
+#: ../modules/mail/e-mail-shell-view-actions.c:1561
 msgid "Current Folder"
 msgstr "Denne mappen"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1049
+#: ../modules/mail/e-mail-shell-view-private.c:1138
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d valgt, "
 msgstr[1] "%d valgt, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1060
+#: ../modules/mail/e-mail-shell-view-private.c:1149
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d slettet"
 msgstr[1] "%d slettet"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1066
-#: ../modules/mail/e-mail-shell-view-private.c:1073
+#: ../modules/mail/e-mail-shell-view-private.c:1155
+#: ../modules/mail/e-mail-shell-view-private.c:1162
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d uÃnsket e-post"
 msgstr[1] "%d uÃnsket e-poster"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1079
+#: ../modules/mail/e-mail-shell-view-private.c:1168
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d skisse"
 msgstr[1] "%d skisser"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1085
+#: ../modules/mail/e-mail-shell-view-private.c:1174
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d usendt"
 msgstr[1] "%d usendte"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1091
+#: ../modules/mail/e-mail-shell-view-private.c:1180
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d sendt"
 msgstr[1] "%d sendt"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1103
+#: ../modules/mail/e-mail-shell-view-private.c:1192
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d ulest, "
 msgstr[1] "%d uleste, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1106
+#: ../modules/mail/e-mail-shell-view-private.c:1195
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d totalt"
 msgstr[1] "%d totalt"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1126
+#: ../modules/mail/e-mail-shell-view-private.c:1215
 msgid "Trash"
 msgstr "Papirkurv"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1600
+#: ../modules/mail/e-mail-shell-view-private.c:1683
 msgid "Send / Receive"
 msgstr "Send / motta"
 
-#: ../modules/mail/e-mail-shell-view.c:563
+#: ../modules/mail/e-mail-shell-view.c:555
 msgid "All Account Search"
 msgstr "SÃk i alle konti"
 
-#: ../modules/mail/e-mail-shell-view.c:746
+#: ../modules/mail/e-mail-shell-view.c:735
 msgid "Account Search"
 msgstr "SÃk i konto"
 
-#: ../modules/mail/e-mail-shell-view.c:951
+#: ../modules/mail/e-mail-shell-view.c:945
 msgid "Proxy _Logout"
 msgstr "_Logg ut proxy"
 
-#: ../modules/mail/em-account-prefs.c:215
+#: ../modules/mail/em-account-prefs.c:213
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontoassistent"
 
-#: ../modules/mail/em-account-prefs.c:264
+#: ../modules/mail/em-account-prefs.c:262
 msgid "Account Editor"
 msgstr "Kontoredigering"
 
-#: ../modules/mail/em-composer-prefs.c:502
+#: ../modules/mail/em-composer-prefs.c:490
 #: ../modules/plugin-manager/evolution-plugin-manager.c:356
 #: ../plugins/publish-calendar/publish-calendar.c:831
 #: ../widgets/misc/e-account-tree-view.c:220
 msgid "Enabled"
 msgstr "Aktivert"
 
-#: ../modules/mail/em-composer-prefs.c:506
+#: ../modules/mail/em-composer-prefs.c:494
 msgid "Language(s)"
 msgstr "SprÃk"
 
@@ -15652,50 +15702,38 @@ msgstr "En gang i uken"
 msgid "Once per month"
 msgstr "En gang i mÃneden"
 
-#: ../modules/mail/em-mailer-prefs.c:174
-msgid "Add Custom Junk Header"
-msgstr "Legg til egendefinert meldingshoder for uÃnsket e-post"
-
-#: ../modules/mail/em-mailer-prefs.c:182
-msgid "Header Name:"
-msgstr "Navn pÃ meldingshode:"
-
-#: ../modules/mail/em-mailer-prefs.c:183
-msgid "Header Value Contains:"
-msgstr "Verdi i meldingshode inneholder:"
-
-#: ../modules/mail/em-mailer-prefs.c:283
+#: ../modules/mail/em-mailer-prefs.c:288
 msgid "Header"
 msgstr "Topptekst"
 
-#: ../modules/mail/em-mailer-prefs.c:287
+#: ../modules/mail/em-mailer-prefs.c:292
 msgid "Contains Value"
 msgstr "Inneholder verdi"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:693 ../modules/mail/em-mailer-prefs.c:766
+#: ../modules/mail/em-mailer-prefs.c:698 ../modules/mail/em-mailer-prefs.c:771
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "Tillegg %s er tilgjengelig og filen er installert."
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:701 ../modules/mail/em-mailer-prefs.c:775
+#: ../modules/mail/em-mailer-prefs.c:706 ../modules/mail/em-mailer-prefs.c:780
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr ""
 "%s-tillegg er ikke tilgjengelig. Vennligst sjekk om pakken er installert."
 
-#: ../modules/mail/em-mailer-prefs.c:739
+#: ../modules/mail/em-mailer-prefs.c:744
 msgid "No junk plugin available"
 msgstr "Ingen tillegg for uÃnsket e-post tilgjengelig"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1142
+#: ../modules/mail/em-mailer-prefs.c:1147
 msgid "_Date header:"
 msgstr "_Datohode:"
 
-#: ../modules/mail/em-mailer-prefs.c:1143
+#: ../modules/mail/em-mailer-prefs.c:1148
 msgid "Show _original header value"
 msgstr "Vis _opprinnelig verdi for hode"
 
@@ -15840,13 +15878,12 @@ msgstr ""
 "Liste med hint om ting Ã se etter i meldingskroppen for tillegg for "
 "vedleggspÃminnelse"
 
-#. Check buttons
-#: ../plugins/attachment-reminder/attachment-reminder.c:117
+#: ../plugins/attachment-reminder/attachment-reminder.c:121
 msgid "_Do not show this message again."
 msgstr "Ikke vis _denne meldingen igjen."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:451
-#: ../plugins/templates/templates.c:411
+#: ../plugins/attachment-reminder/attachment-reminder.c:453
+#: ../plugins/templates/templates.c:415
 msgid "Keywords"
 msgstr "NÃkkelord"
 
@@ -15863,8 +15900,8 @@ msgid "Message has no attachments"
 msgstr "Melding har ingen vedlegg"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
-msgid "_Add attachment..."
-msgstr "_Legg til vedlegg â"
+msgid "_Add Attachment..."
+msgstr "L_egg til vedlegg â"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Edit Message"
@@ -15886,23 +15923,23 @@ msgstr "Lyd i e-post"
 msgid "Play audio attachments directly in mail messages."
 msgstr "Spill av lyd-vedlegg direkte i e-postmeldinger."
 
-#: ../plugins/backup-restore/backup-restore.c:183
+#: ../plugins/backup-restore/backup-restore.c:186
 msgid "Select name of the Evolution backup file"
 msgstr "Velg navn pÃ sikkerhetskopifilen for Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:216
+#: ../plugins/backup-restore/backup-restore.c:219
 msgid "_Restart Evolution after backup"
 msgstr "Sta_rt Evolution pÃ nytt etter sikkerhetskopiering"
 
-#: ../plugins/backup-restore/backup-restore.c:242
+#: ../plugins/backup-restore/backup-restore.c:245
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Velg navn pÃ sikkerhetskopifil for Evolution som skal gjenopprettes"
 
-#: ../plugins/backup-restore/backup-restore.c:255
+#: ../plugins/backup-restore/backup-restore.c:258
 msgid "_Restart Evolution after restore"
 msgstr "Sta_rt Evolution pÃ nytt etter gjenoppretting"
 
-#: ../plugins/backup-restore/backup-restore.c:323
+#: ../plugins/backup-restore/backup-restore.c:326
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
@@ -15912,35 +15949,35 @@ msgstr ""
 "kalendere, oppgaver, notater og adressebÃker kan gjenopprettes. Dine "
 "personlige innstillinger, filtre osv, blir ogsÃ lagret."
 
-#: ../plugins/backup-restore/backup-restore.c:330
+#: ../plugins/backup-restore/backup-restore.c:333
 msgid "_Restore Evolution from the backup file"
 msgstr "Gjenopp_rett Evolution fra sikkerhetskopifil"
 
-#: ../plugins/backup-restore/backup-restore.c:337
+#: ../plugins/backup-restore/backup-restore.c:340
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Velg Evolution-arkiv som skal gjenopprettes:"
 
-#: ../plugins/backup-restore/backup-restore.c:340
+#: ../plugins/backup-restore/backup-restore.c:343
 msgid "Choose a file to restore"
 msgstr "Velg en fil som skal gjenopprettes"
 
-#: ../plugins/backup-restore/backup-restore.c:348
+#: ../plugins/backup-restore/backup-restore.c:351
 msgid "Restore from backup"
 msgstr "Gjenopprett fra sikkerhetskopi"
 
-#: ../plugins/backup-restore/backup-restore.c:386
+#: ../plugins/backup-restore/backup-restore.c:389
 msgid "_Back up Evolution Data..."
 msgstr "Ta si_kkerhetskopi av data for Evolution â"
 
-#: ../plugins/backup-restore/backup-restore.c:388
+#: ../plugins/backup-restore/backup-restore.c:391
 msgid "Back up Evolution data and settings to an archive file"
 msgstr "Sikkerhetskopier data og innstillinger for Evolution til en arkivfil"
 
-#: ../plugins/backup-restore/backup-restore.c:393
+#: ../plugins/backup-restore/backup-restore.c:396
 msgid "R_estore Evolution Data..."
 msgstr "Gjenopp_rett data for Evolution â"
 
-#: ../plugins/backup-restore/backup-restore.c:395
+#: ../plugins/backup-restore/backup-restore.c:398
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Gjenopprett data og innstillinger fra en arkivfil"
 
@@ -16490,7 +16527,7 @@ msgstr "Legg til et kart som viser plasseringen for kontaktene nÃr mulig."
 msgid "Map for contacts"
 msgstr "Kart for kontakter"
 
-#: ../plugins/dbx-import/dbx-importer.c:258
+#: ../plugins/dbx-import/dbx-importer.c:273
 msgid "Importing Outlook Express data"
 msgstr "Importerer data fra Outlook Express"
 
@@ -16607,7 +16644,7 @@ msgid "Key"
 msgstr "NÃkkel"
 
 #: ../plugins/email-custom-header/email-custom-header.c:903
-#: ../plugins/templates/templates.c:417
+#: ../plugins/templates/templates.c:421
 msgid "Values"
 msgstr "Verdier"
 
@@ -16783,8 +16820,8 @@ msgstr ""
 "%s"
 
 #: ../plugins/google-account-setup/google-source.c:549
-#: ../plugins/mail-to-task/mail-to-task.c:736
-#: ../plugins/mail-to-task/mail-to-task.c:955
+#: ../plugins/mail-to-task/mail-to-task.c:737
+#: ../plugins/mail-to-task/mail-to-task.c:956
 msgid "Unknown error."
 msgstr "Ukjent feil."
 
@@ -16818,48 +16855,48 @@ msgstr "Oppgi passord for %s (bruker %s)"
 msgid "Failed to authenticate.\n"
 msgstr "Kunne ikke autentisere.\n"
 
-#: ../plugins/groupwise-features/gw-ui.c:112
+#: ../plugins/groupwise-features/gw-ui.c:114
 msgid "New _Shared Folder..."
 msgstr "Ny _delt mappe â"
 
-#: ../plugins/groupwise-features/gw-ui.c:119
+#: ../plugins/groupwise-features/gw-ui.c:121
 msgid "_Proxy Login..."
 msgstr "_Brukernavn for proxy â"
 
-#: ../plugins/groupwise-features/gw-ui.c:170
+#: ../plugins/groupwise-features/gw-ui.c:172
 msgid "Junk Mail Settings..."
 msgstr "Innstillinger for uÃnsket e-post â"
 
-#: ../plugins/groupwise-features/gw-ui.c:177
+#: ../plugins/groupwise-features/gw-ui.c:179
 msgid "Track Message Status..."
 msgstr "Spor status pÃ melding â"
 
-#: ../plugins/groupwise-features/gw-ui.c:183
+#: ../plugins/groupwise-features/gw-ui.c:185
 msgid "Retract Mail"
 msgstr "Kall tilbake e-post"
 
-#: ../plugins/groupwise-features/gw-ui.c:331
+#: ../plugins/groupwise-features/gw-ui.c:333
 msgid "Accept"
 msgstr "Godta"
 
-#: ../plugins/groupwise-features/gw-ui.c:338
+#: ../plugins/groupwise-features/gw-ui.c:340
 msgid "Accept Tentatively"
 msgstr "Godta tentativt"
 
-#: ../plugins/groupwise-features/gw-ui.c:345
+#: ../plugins/groupwise-features/gw-ui.c:347
 msgid "Decline"
 msgstr "AvslÃ"
 
-#: ../plugins/groupwise-features/gw-ui.c:352
+#: ../plugins/groupwise-features/gw-ui.c:354
 msgid "Rese_nd Meeting..."
 msgstr "Se_nd mÃte pÃ nytt â"
 
-#: ../plugins/groupwise-features/install-shared.c:178
-#: ../plugins/groupwise-features/share-folder-common.c:353
+#: ../plugins/groupwise-features/install-shared.c:189
+#: ../plugins/groupwise-features/share-folder-common.c:362
 msgid "Create folder"
 msgstr "Opprett mappe"
 
-#: ../plugins/groupwise-features/install-shared.c:230
+#: ../plugins/groupwise-features/install-shared.c:241
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -16884,11 +16921,11 @@ msgstr ""
 "Klikk ÂBrukÂ for Ã installere den delte mappen\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:242
+#: ../plugins/groupwise-features/install-shared.c:253
 msgid "Install the shared folder"
 msgstr "Installer delt mappe"
 
-#: ../plugins/groupwise-features/install-shared.c:246
+#: ../plugins/groupwise-features/install-shared.c:257
 msgid "Shared Folder Installation"
 msgstr "Installering av delt mappe"
 
@@ -17139,8 +17176,8 @@ msgstr "Kontonavn"
 msgid "Proxy Login"
 msgstr "Proxy-innlogging"
 
-#: ../plugins/groupwise-features/proxy-login.c:208
-#: ../plugins/groupwise-features/proxy-login.c:251
+#: ../plugins/groupwise-features/proxy-login.c:209
+#: ../plugins/groupwise-features/proxy-login.c:252
 #: ../plugins/groupwise-features/proxy.c:494
 #: ../plugins/groupwise-features/send-options.c:84
 #, c-format
@@ -17148,22 +17185,22 @@ msgid "%sEnter password for %s (user %s)"
 msgstr "%sSkriv inn passord for %s (bruker %s)"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:698
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "Proxy-fanen vil kun vÃre tilgjengelig nÃr kontoen er tilkoblet."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:704
+#: ../plugins/groupwise-features/proxy.c:702
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Proxyfanen vil kun vÃre tilgjengelig nÃr kontoen er aktivert."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:709
+#: ../plugins/groupwise-features/proxy.c:707
 msgctxt "GW"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../plugins/groupwise-features/proxy.c:935
+#: ../plugins/groupwise-features/proxy.c:931
 #: ../plugins/groupwise-features/share-folder.c:694
 msgid "Add User"
 msgstr "Legg til bruker"
@@ -17172,16 +17209,16 @@ msgstr "Legg til bruker"
 msgid "Advanced send options"
 msgstr "Avanserte alternativer for sending"
 
-#: ../plugins/groupwise-features/share-folder-common.c:316
+#: ../plugins/groupwise-features/share-folder-common.c:329
 #: ../plugins/groupwise-features/share-folder.c:729
 msgid "Users"
 msgstr "Brukere"
 
-#: ../plugins/groupwise-features/share-folder-common.c:317
+#: ../plugins/groupwise-features/share-folder-common.c:330
 msgid "Enter the users and set permissions"
 msgstr "Oppgi brukere og sett rettigheter"
 
-#: ../plugins/groupwise-features/share-folder-common.c:418
+#: ../plugins/groupwise-features/share-folder-common.c:427
 msgid "Sharing"
 msgstr "Deling"
 
@@ -17254,12 +17291,12 @@ msgstr "Bilde i e-postmeldingen"
 msgid "View image attachments directly in mail messages."
 msgstr "Vis bildevedlegg direkte i e-postmeldinger."
 
-#: ../plugins/imap-features/imap-headers.c:329
+#: ../plugins/imap-features/imap-headers.c:333
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "Egendefinerte meldingshoder"
 
-#: ../plugins/imap-features/imap-headers.c:342
+#: ../plugins/imap-features/imap-headers.c:346
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "IMAP-meldingshoder"
@@ -17310,145 +17347,145 @@ msgstr "IMAP-funksjoner"
 
 #. Translators: The first '%s' is replaced with a calendar name,
 #. the second '%s' with an error message
-#: ../plugins/itip-formatter/itip-formatter.c:485
+#: ../plugins/itip-formatter/itip-formatter.c:486
 #, c-format
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "Kunne ikke Ãpne kalender Â%sÂ (%s)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:654
+#: ../plugins/itip-formatter/itip-formatter.c:655
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "En avtale i kalender Â%sÂ er i konflikt med dette mÃtet"
 
-#: ../plugins/itip-formatter/itip-formatter.c:690
+#: ../plugins/itip-formatter/itip-formatter.c:691
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Fant avtalen i kalender Â%sÂ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:789
+#: ../plugins/itip-formatter/itip-formatter.c:790
 msgid "Unable to find any calendars"
 msgstr "Kan ikke finne noen kalendere"
 
-#: ../plugins/itip-formatter/itip-formatter.c:796
+#: ../plugins/itip-formatter/itip-formatter.c:797
 msgid "Unable to find this meeting in any calendar"
 msgstr "Kan ikke finne dette mÃtet i noen kalender"
 
-#: ../plugins/itip-formatter/itip-formatter.c:800
+#: ../plugins/itip-formatter/itip-formatter.c:801
 msgid "Unable to find this task in any task list"
 msgstr "Kan ikke finne denne oppgaven i noen oppgaveliste"
 
-#: ../plugins/itip-formatter/itip-formatter.c:804
+#: ../plugins/itip-formatter/itip-formatter.c:805
 msgid "Unable to find this memo in any memo list"
 msgstr "Kan ikke finne dette notatet i noen notatliste"
 
-#: ../plugins/itip-formatter/itip-formatter.c:880
+#: ../plugins/itip-formatter/itip-formatter.c:881
 msgid "Opening the calendar. Please wait.."
 msgstr "Ãpner kalender. Vennligst vent â"
 
-#: ../plugins/itip-formatter/itip-formatter.c:883
+#: ../plugins/itip-formatter/itip-formatter.c:884
 msgid "Searching for an existing version of this appointment"
 msgstr "SÃker etter en eksisterende versjon av denne avtalen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1166
+#: ../plugins/itip-formatter/itip-formatter.c:1167
 msgid "Unable to parse item"
 msgstr "Kunne ikke lese oppfÃring"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1255
+#: ../plugins/itip-formatter/itip-formatter.c:1256
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Kunne ikke sende oppfÃring til kalender Â%sÂ. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1267
+#: ../plugins/itip-formatter/itip-formatter.c:1268
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Sendt til kalender Â%sÂ som godtatt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1271
+#: ../plugins/itip-formatter/itip-formatter.c:1272
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Sendt til kalender Â%sÂ som tentativ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1277
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Sendt til kalender Â%sÂ som avslÃtt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1281
+#: ../plugins/itip-formatter/itip-formatter.c:1282
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Sendt til kalender Â%sÂ som avlyst"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1375
+#: ../plugins/itip-formatter/itip-formatter.c:1376
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organisator har fjernet delegat %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1382
+#: ../plugins/itip-formatter/itip-formatter.c:1383
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Avlysningsvarsel sendt til delegat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1385
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Kunne ikke sende avlysningsmelding til delegaten"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1495
+#: ../plugins/itip-formatter/itip-formatter.c:1496
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Deltakerstatus kunne ikke oppdateres pga ugyldig status"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1524
+#: ../plugins/itip-formatter/itip-formatter.c:1525
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Kan ikke oppdatere deltaker. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1528
+#: ../plugins/itip-formatter/itip-formatter.c:1529
 msgid "Attendee status updated"
 msgstr "Deltakerstatus oppdatert"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1532
+#: ../plugins/itip-formatter/itip-formatter.c:1533
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Deltakerstatus kan ikke oppdateres fordi oppfÃringen ikke eksisterer lenger"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1554
+#: ../plugins/itip-formatter/itip-formatter.c:1555
 msgid "Meeting information sent"
 msgstr "Informasjon om mÃte sendt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1557
+#: ../plugins/itip-formatter/itip-formatter.c:1558
 msgid "Task information sent"
 msgstr "Informasjon om oppgave sendt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1560
+#: ../plugins/itip-formatter/itip-formatter.c:1561
 msgid "Memo information sent"
 msgstr "Informasjon om notat sendt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1569
+#: ../plugins/itip-formatter/itip-formatter.c:1570
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Kan ikke sende mÃteinformasjon. MÃtet eksisterer ikke"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1572
+#: ../plugins/itip-formatter/itip-formatter.c:1573
 msgid "Unable to send task information, the task does not exist"
 msgstr "Kan ikke sende informasjon om oppgave. Oppgaven eksisterer ikke"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1575
+#: ../plugins/itip-formatter/itip-formatter.c:1576
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Kan ikke sende informasjon om notat. Notatet eksisterer ikke"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1640
+#: ../plugins/itip-formatter/itip-formatter.c:1641
 msgid "calendar.ics"
 msgstr "kalender.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1645
+#: ../plugins/itip-formatter/itip-formatter.c:1646
 msgid "Save Calendar"
 msgstr "Lagre kalender"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1703
-#: ../plugins/itip-formatter/itip-formatter.c:1714
+#: ../plugins/itip-formatter/itip-formatter.c:1704
+#: ../plugins/itip-formatter/itip-formatter.c:1715
 msgid "The calendar attached is not valid"
 msgstr "Vedlagt kalender er ugyldig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1704
-#: ../plugins/itip-formatter/itip-formatter.c:1715
+#: ../plugins/itip-formatter/itip-formatter.c:1705
+#: ../plugins/itip-formatter/itip-formatter.c:1716
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17456,15 +17493,15 @@ msgstr ""
 "Meldingen pÃstÃr at den inneholder en kalender, men kalenderen er ikke en "
 "gyldig iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1755
-#: ../plugins/itip-formatter/itip-formatter.c:1783
-#: ../plugins/itip-formatter/itip-formatter.c:1892
-msgid "The item in the calendar is not valid"
-msgstr "OppfÃringen i kalenderen er ikke gyldig"
-
 #: ../plugins/itip-formatter/itip-formatter.c:1756
 #: ../plugins/itip-formatter/itip-formatter.c:1784
 #: ../plugins/itip-formatter/itip-formatter.c:1893
+msgid "The item in the calendar is not valid"
+msgstr "OppfÃringen i kalenderen er ikke gyldig"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1757
+#: ../plugins/itip-formatter/itip-formatter.c:1785
+#: ../plugins/itip-formatter/itip-formatter.c:1894
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17472,11 +17509,11 @@ msgstr ""
 "Meldingen inneholder en kalender, men kalenderen inneholder ingen hendelser, "
 "oppgaver eller ledig/opptatt-informasjon"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1797
+#: ../plugins/itip-formatter/itip-formatter.c:1798
 msgid "The calendar attached contains multiple items"
 msgstr "Vedlagt kalender inneholder flere oppfÃringer"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1798
+#: ../plugins/itip-formatter/itip-formatter.c:1799
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17484,40 +17521,40 @@ msgstr ""
 "Du mÃ lagre filen og importere kalenderen for Ã prosessere alle disse "
 "oppfÃringene"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2460
+#: ../plugins/itip-formatter/itip-formatter.c:2458
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ingen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2476
+#: ../plugins/itip-formatter/itip-formatter.c:2474
 msgid "Tentatively Accepted"
 msgstr "Akseptert tentativt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2594
+#: ../plugins/itip-formatter/itip-formatter.c:2592
 msgid "This meeting recurs"
 msgstr "Dettee mÃtet gjeninntreffer"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2597
+#: ../plugins/itip-formatter/itip-formatter.c:2595
 msgid "This task recurs"
 msgstr "Denne oppgaven gjeninntreffer"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2600
+#: ../plugins/itip-formatter/itip-formatter.c:2598
 msgid "This memo recurs"
 msgstr "Dette notatet gjeninntreffer"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2834
+#: ../plugins/itip-formatter/itip-formatter.c:2832
 msgid "_Delete message after acting"
 msgstr "_Slett melding etter utfÃrt handling"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2844
-#: ../plugins/itip-formatter/itip-formatter.c:2877
+#: ../plugins/itip-formatter/itip-formatter.c:2842
+#: ../plugins/itip-formatter/itip-formatter.c:2875
 msgid "Conflict Search"
 msgstr "SÃk etter konflikter"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2859
+#: ../plugins/itip-formatter/itip-formatter.c:2857
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Velg kalendere som skal gjennomsÃkes for Ã finne mÃtekonflikter"
 
@@ -18093,7 +18130,7 @@ msgstr "Om en melding skal vises over ikonet nÃr nye meldinger ankommer."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Im nye meldinger kun skal varsles i innboksen."
 
-#: ../plugins/mail-notification/mail-notification.c:390
+#: ../plugins/mail-notification/mail-notification.c:395
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18108,66 +18145,59 @@ msgstr[1] ""
 "Du har mottatt %d nye meldinger\n"
 "i %s."
 
-#. Translators: "From:" is preceding a new mail
-#. * sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:402
-#, c-format
-msgid "From: %s"
-msgstr "Fra: %s"
-
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:415
+#: ../plugins/mail-notification/mail-notification.c:419
 #, c-format
 msgid "Subject: %s"
 msgstr "Emne: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:425
+#: ../plugins/mail-notification/mail-notification.c:429
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Du har mottatt %d ny melding."
 msgstr[1] "Du har mottatt %d nye meldinger."
 
-#: ../plugins/mail-notification/mail-notification.c:438
-#: ../plugins/mail-notification/mail-notification.c:446
-#: ../plugins/mail-notification/mail-notification.c:449
+#: ../plugins/mail-notification/mail-notification.c:442
+#: ../plugins/mail-notification/mail-notification.c:450
+#: ../plugins/mail-notification/mail-notification.c:453
 msgid "New email"
 msgstr "Ny e-post"
 
-#: ../plugins/mail-notification/mail-notification.c:498
+#: ../plugins/mail-notification/mail-notification.c:502
 msgid "Show icon in _notification area"
 msgstr "Vis ikon i varslingsomrÃdet"
 
-#: ../plugins/mail-notification/mail-notification.c:528
+#: ../plugins/mail-notification/mail-notification.c:532
 msgid "Popup _message together with the icon"
 msgstr "Vis _melding sammen med ikonet"
 
-#: ../plugins/mail-notification/mail-notification.c:715
+#: ../plugins/mail-notification/mail-notification.c:719
 msgid "_Play sound when new messages arrive"
 msgstr "S_pill en lydfil nÃr nye meldinger ankommer"
 
-#: ../plugins/mail-notification/mail-notification.c:745
+#: ../plugins/mail-notification/mail-notification.c:749
 msgid "_Beep"
 msgstr "_Pip"
 
-#: ../plugins/mail-notification/mail-notification.c:758
+#: ../plugins/mail-notification/mail-notification.c:762
 msgid "Use sound _theme"
 msgstr "Bruk lyd_tema"
 
-#: ../plugins/mail-notification/mail-notification.c:777
+#: ../plugins/mail-notification/mail-notification.c:781
 msgid "Play _file:"
 msgstr "Spill av lyd_fil:"
 
-#: ../plugins/mail-notification/mail-notification.c:788
+#: ../plugins/mail-notification/mail-notification.c:792
 msgid "Select sound file"
 msgstr "Velg en lydfil"
 
-#: ../plugins/mail-notification/mail-notification.c:846
+#: ../plugins/mail-notification/mail-notification.c:850
 msgid "Notify new messages for _Inbox only"
 msgstr "Varslingsmelding kun for _innboks"
 
-#: ../plugins/mail-notification/mail-notification.c:855
+#: ../plugins/mail-notification/mail-notification.c:859
 msgid "Generate a _D-Bus message"
 msgstr "Genererer en _D-Bus-melding"
 
@@ -18185,7 +18215,7 @@ msgstr "Varsler nÃr nye meldinger ankommer."
 msgid "Created from a mail by %s"
 msgstr "Opprettet av en e-post fra %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:489
+#: ../plugins/mail-to-task/mail-to-task.c:490
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -18194,7 +18224,7 @@ msgstr ""
 "Valgt kalender inneholder hendelsen Â%sÂ allerede. Vil du redigere den gamle "
 "hendelsen?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:492
+#: ../plugins/mail-to-task/mail-to-task.c:493
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -18203,7 +18233,7 @@ msgstr ""
 "Valgt oppgaveliste inneholder oppgave Â%sÂ allerede. Vil du redigere den "
 "gamle oppgaven?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:495
+#: ../plugins/mail-to-task/mail-to-task.c:496
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -18215,7 +18245,7 @@ msgstr ""
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
 #. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:515
+#: ../plugins/mail-to-task/mail-to-task.c:516
 msgid ""
 "Selected calendar contains some events for the given mails already. Would "
 "you like to create new events anyway?"
@@ -18226,7 +18256,7 @@ msgstr ""
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
 #. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:521
+#: ../plugins/mail-to-task/mail-to-task.c:522
 msgid ""
 "Selected task list contains some tasks for the given mails already. Would "
 "you like to create new tasks anyway?"
@@ -18237,7 +18267,7 @@ msgstr ""
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
 #. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:527
+#: ../plugins/mail-to-task/mail-to-task.c:528
 msgid ""
 "Selected memo list contains some memos for the given mails already. Would "
 "you like to create new memos anyway?"
@@ -18248,7 +18278,7 @@ msgstr ""
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
 #. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:548
+#: ../plugins/mail-to-task/mail-to-task.c:549
 msgid ""
 "Selected calendar contains an event for the given mail already. Would you "
 "like to create new event anyway?"
@@ -18265,7 +18295,7 @@ msgstr[1] ""
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
 #. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:557
+#: ../plugins/mail-to-task/mail-to-task.c:558
 msgid ""
 "Selected task list contains a task for the given mail already. Would you "
 "like to create new task anyway?"
@@ -18282,7 +18312,7 @@ msgstr[1] ""
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
 #. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:566
+#: ../plugins/mail-to-task/mail-to-task.c:567
 msgid ""
 "Selected memo list contains a memo for the given mail already. Would you "
 "like to create new memo anyway?"
@@ -18296,25 +18326,25 @@ msgstr[1] ""
 "Valgt notatliste inneholder notater for gitte meldinger allerede. Vil du "
 "lage nye notater likevel?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:625
+#: ../plugins/mail-to-task/mail-to-task.c:626
 msgid "[No Summary]"
 msgstr "[Ingen sammendrag]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:636
+#: ../plugins/mail-to-task/mail-to-task.c:637
 msgid "Invalid object returned from a server"
 msgstr "Ugyldig objekt returnert fra en tjener"
 
-#: ../plugins/mail-to-task/mail-to-task.c:707
+#: ../plugins/mail-to-task/mail-to-task.c:708
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "En feil oppsto under prosessering: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:736
+#: ../plugins/mail-to-task/mail-to-task.c:737
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Kan ikke Ãpne kalender. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:743
+#: ../plugins/mail-to-task/mail-to-task.c:744
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -18322,7 +18352,7 @@ msgstr ""
 "Valgt kilde er skrivebeskyttet og hendelser kan ikke opprettes der. Velg en "
 "annen kilde."
 
-#: ../plugins/mail-to-task/mail-to-task.c:746
+#: ../plugins/mail-to-task/mail-to-task.c:747
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18330,7 +18360,7 @@ msgstr ""
 "Valgt kilde er skrivebeskyttet og oppgaver kan ikke opprettes der. Velg en "
 "annen kilde."
 
-#: ../plugins/mail-to-task/mail-to-task.c:749
+#: ../plugins/mail-to-task/mail-to-task.c:750
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -18338,40 +18368,40 @@ msgstr ""
 "Valgt kilde er skrivebeskyttet og notater kan ikke opprettes der. Velg en "
 "annen kilde."
 
-#: ../plugins/mail-to-task/mail-to-task.c:955
+#: ../plugins/mail-to-task/mail-to-task.c:956
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "Fant ikke kildeliste %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1074
+#: ../plugins/mail-to-task/mail-to-task.c:1075
 msgid "Create an _Event"
 msgstr "Lag en h_endelse"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1076
+#: ../plugins/mail-to-task/mail-to-task.c:1077
 msgid "Create a new event from the selected message"
 msgstr " Lag en ny hendelse fra den valgte meldingen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1081
+#: ../plugins/mail-to-task/mail-to-task.c:1082
 msgid "Create a Mem_o"
 msgstr "Lag et n_otat"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1083
+#: ../plugins/mail-to-task/mail-to-task.c:1084
 msgid "Create a new memo from the selected message"
 msgstr "Lag et nytt notat fra den valgte meldingen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1088
+#: ../plugins/mail-to-task/mail-to-task.c:1089
 msgid "Create a _Task"
 msgstr "Lag en o_ppgave"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1090
+#: ../plugins/mail-to-task/mail-to-task.c:1091
 msgid "Create a new task from the selected message"
 msgstr "Lag en ny oppgave fra den valgte meldingen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1098
+#: ../plugins/mail-to-task/mail-to-task.c:1099
 msgid "Create a _Meeting"
 msgstr "Lag et _mÃte"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1100
+#: ../plugins/mail-to-task/mail-to-task.c:1101
 msgid "Create a new meeting from the selected message"
 msgstr "Lag et nytt mÃte fra den valgte meldingen"
 
@@ -18379,55 +18409,55 @@ msgstr "Lag et nytt mÃte fra den valgte meldingen"
 msgid "Convert a mail message to a task."
 msgstr "Konverter en e-postmelding til en oppgave."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:294
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:295
 msgid "Get List _Archive"
 msgstr "Hent liste_arkiv"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:296
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:297
 msgid "Get an archive of the list this message belongs to"
 msgstr "FÃ et arkiv av listen denne e-posten hÃrer til"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:301
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:302
 msgid "Get List _Usage Information"
 msgstr "Hent informasjon om br_uk av liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:303
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:304
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "FÃ informasjon om bruken av e-postlisten som denne e-posten hÃrer til"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:308
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:309
 msgid "Contact List _Owner"
 msgstr "Eier av k_ontaktliste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:310
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:311
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "Kontakt eieren til e-postlisten som denne e-posten hÃrer til"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:315
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:316
 msgid "_Post Message to List"
 msgstr "_Skriv e-post til liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:317
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:318
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "Skriv en e-post til e-postlisten som denne e-posten hÃrer til"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:322
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:323
 msgid "_Subscribe to List"
 msgstr "_Abonner pÃ listen"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:324
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:325
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "Abonner pÃ e-postlisten som denne e-posten hÃrer til"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:329
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:330
 msgid "_Unsubscribe from List"
 msgstr "_Fjern abonnement pÃ listen"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:331
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:332
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "Avslutt abonnementet pÃ e-postlisten som denne meldingen tilhÃrer"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:338
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:339
 msgid "Mailing _List"
 msgstr "E-post_liste"
 
@@ -18565,19 +18595,19 @@ msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr ""
 "Vis e-postmeldinger som vanlig tekst, selv om de inneholder HTML-innhold."
 
-#: ../plugins/prefer-plain/prefer-plain.c:225
+#: ../plugins/prefer-plain/prefer-plain.c:241
 msgid "Show HTML if present"
 msgstr "Vis HTML hvis det finnes"
 
-#: ../plugins/prefer-plain/prefer-plain.c:225
+#: ../plugins/prefer-plain/prefer-plain.c:241
 msgid "Let Evolution choose the best part to show."
 msgstr "La Evolution velge den beste delen Ã vise."
 
-#: ../plugins/prefer-plain/prefer-plain.c:226
+#: ../plugins/prefer-plain/prefer-plain.c:242
 msgid "Show plain text if present"
 msgstr "Vis ren tekst hvis det finnes"
 
-#: ../plugins/prefer-plain/prefer-plain.c:226
+#: ../plugins/prefer-plain/prefer-plain.c:242
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
@@ -18585,33 +18615,25 @@ msgstr ""
 "Vis tekstdelen hvis den finnes. La Evolution velge hvilken del som skal "
 "vises ellers."
 
-#: ../plugins/prefer-plain/prefer-plain.c:227
+#: ../plugins/prefer-plain/prefer-plain.c:243
 msgid "Only ever show plain text"
 msgstr "Vis kun ren tekst"
 
-#: ../plugins/prefer-plain/prefer-plain.c:227
+#: ../plugins/prefer-plain/prefer-plain.c:243
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
 msgstr ""
 "Alltid vis ren tekst delen og vis de andre delene som vedlegg hvis forespurt."
 
-#: ../plugins/prefer-plain/prefer-plain.c:274
+#: ../plugins/prefer-plain/prefer-plain.c:290
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "Vis _undertrykte HTML-deler som vedlegg"
 
-#: ../plugins/prefer-plain/prefer-plain.c:294
+#: ../plugins/prefer-plain/prefer-plain.c:310
 msgid "HTML _Mode"
 msgstr "HTML-_modus"
 
-#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
-msgid "Evolution Profiler"
-msgstr "Evolution profilering"
-
-#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
-msgid "Profile data events in Evolution (for developers only)."
-msgstr "Profiler datahendelser i Evolution (kun for utviklere)."
-
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Import Outlook messages from PST file"
 msgstr "Importer Outlook-meldinger fra PST-fil"
@@ -18624,35 +18646,35 @@ msgstr "Outlook PST-import"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook personlige mapper (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:311
+#: ../plugins/pst-import/pst-importer.c:309
 msgid "_Mail"
 msgstr "_E-post"
 
-#: ../plugins/pst-import/pst-importer.c:327
+#: ../plugins/pst-import/pst-importer.c:325
 msgid "Destination folder:"
 msgstr "MÃlmappe:"
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:333
+#: ../plugins/pst-import/pst-importer.c:331
 msgid "_Address Book"
 msgstr "_Adressebok"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:340
+#: ../plugins/pst-import/pst-importer.c:338
 msgid "A_ppointments"
 msgstr "A_vtaler"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:346 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:344 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Oppgaver"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:352
+#: ../plugins/pst-import/pst-importer.c:350
 msgid "_Journal entries"
 msgstr "_JournaloppfÃringer"
 
-#: ../plugins/pst-import/pst-importer.c:367
+#: ../plugins/pst-import/pst-importer.c:365
 msgid "Importing Outlook data"
 msgstr "Importerer data fra Outlook"
 
@@ -18709,11 +18731,11 @@ msgstr "Er du sikker pÃ at du vil fjerne denne plasseringen?"
 #. To Translators: This is shown to a user when creation of a new thread,
 #. where the publishing should be done, fails. Basically, this shouldn't
 #. ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1055
+#: ../plugins/publish-calendar/publish-calendar.c:1057
 msgid "Could not create publish thread."
 msgstr "Kunne ikke opprette trÃd for publisering."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1063
+#: ../plugins/publish-calendar/publish-calendar.c:1065
 msgid "_Publish Calendar Information"
 msgstr "_Publiser kalenderinformasjon"
 
@@ -18811,11 +18833,11 @@ msgstr "iCal"
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "Kunne ikke publisere kalender: Kalendermotor eksisterer ikke lenger"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:475
+#: ../plugins/publish-calendar/url-editor-dialog.c:484
 msgid "New Location"
 msgstr "Ny adresse"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:477
+#: ../plugins/publish-calendar/url-editor-dialog.c:486
 msgid "Edit Location"
 msgstr "Rediger adresse"
 
@@ -19010,18 +19032,21 @@ msgstr ""
 "meldingskropp."
 
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-msgid "Drafts based template plugin"
-msgstr "Tillegg for Ã lage maler av skisser"
+msgid ""
+"Drafts based template plugin. You can use variables like $ORIG[subject], "
+"$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from "
+"an email you are replying to."
+msgstr "Tillegg for maler basert pÃ skisser. Du kan bruke variabler som $ORIG[subject], $ORIG[from], $ORIG[to] eller $ORIG[body], der disse vil bli erstattet av verdier fra en e-post du svarer pÃ."
 
-#: ../plugins/templates/templates.c:635
+#: ../plugins/templates/templates.c:941
 msgid "No Title"
 msgstr "Ingen tittel"
 
-#: ../plugins/templates/templates.c:746
+#: ../plugins/templates/templates.c:1042
 msgid "Save as _Template"
 msgstr "Lagre som _mal"
 
-#: ../plugins/templates/templates.c:748
+#: ../plugins/templates/templates.c:1044
 msgid "Save as Template"
 msgstr "Lagre som mal"
 
@@ -19239,7 +19264,7 @@ msgstr "Sidelinjen er synlig"
 msgid "Skip development warning dialog"
 msgstr "Hopp over varseldialogen om utviklingsversjonen"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:371
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:373
 msgid "Start in offline mode"
 msgstr "Start i frakoblet modus"
 
@@ -19391,11 +19416,11 @@ msgstr "Knappestil for vindu"
 msgid "Window buttons are visible"
 msgstr "Vindusknapper er synlige"
 
-#: ../shell/e-shell-content.c:694 ../shell/e-shell-content.c:695
+#: ../shell/e-shell-content.c:695 ../shell/e-shell-content.c:696
 msgid "Searches"
 msgstr "SÃk"
 
-#: ../shell/e-shell-content.c:737
+#: ../shell/e-shell-content.c:738
 msgid "Save Search"
 msgstr "Lagre sÃk"
 
@@ -19403,31 +19428,31 @@ msgstr "Lagre sÃk"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:934
+#: ../shell/e-shell-searchbar.c:935
 msgid "Sho_w:"
 msgstr "_Vis:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:967
+#: ../shell/e-shell-searchbar.c:968
 msgid "Sear_ch:"
 msgstr "SÃ_k:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1030
+#: ../shell/e-shell-searchbar.c:1031
 msgid "i_n"
 msgstr " _i"
 
-#: ../shell/e-shell-utils.c:255
+#: ../shell/e-shell-utils.c:219
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:257
+#: ../shell/e-shell-utils.c:221
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
-#: ../shell/e-shell-utils.c:278
+#: ../shell/e-shell-utils.c:242
 msgid "All Files (*)"
 msgstr "Alle filer (*)"
 
@@ -19707,29 +19732,29 @@ msgid "Execute these search parameters"
 msgstr "KjÃr disse sÃkeparameterene"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:584
+#: ../shell/e-shell-window-private.c:580
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:434
+#: ../shell/e-shell-window.c:438
 msgid "New"
 msgstr "Ny"
 
-#: ../shell/e-shell.c:257
+#: ../shell/e-shell.c:314
 msgid "Preparing to go offline..."
 msgstr "Forbereder frakoblet bruk â"
 
-#: ../shell/e-shell.c:310
+#: ../shell/e-shell.c:367
 msgid "Preparing to go online..."
 msgstr "Forbereder tilkoblet bruk â"
 
-#: ../shell/e-shell.c:372
+#: ../shell/e-shell.c:429
 msgid "Preparing to quit..."
 msgstr "Forbereder avslutting â"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:188
+#: ../shell/main.c:189
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19764,7 +19789,7 @@ msgstr ""
 "Vi hÃper at du nyter resultatene av vÃrt harde arbeid, og vi venter i\n"
 "spenning pÃ at du tilbyr din hjelp!\n"
 
-#: ../shell/main.c:212
+#: ../shell/main.c:213
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19772,13 +19797,13 @@ msgstr ""
 "Takk\n"
 "Evolution utviklerene\n"
 
-#: ../shell/main.c:219
+#: ../shell/main.c:220
 msgid "Do not tell me again"
 msgstr "Ikke gi beskjed igjen"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:365
+#: ../shell/main.c:367
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -19786,51 +19811,51 @@ msgstr ""
 "Start Evolution med oppgitt komponent. Tilgjengelige valg er ÂmailÂ, "
 "ÂcalendarÂ, ÂcontactsÂ, ÂtasksÂ og ÂmemosÂ"
 
-#: ../shell/main.c:369
+#: ../shell/main.c:371
 msgid "Apply the given geometry to the main window"
 msgstr "Bruk oppgitt geometri pÃ hovedvinduet"
 
-#: ../shell/main.c:373
+#: ../shell/main.c:375
 msgid "Start in online mode"
 msgstr "Start i tilkoblet modus"
 
-#: ../shell/main.c:375
+#: ../shell/main.c:377
 msgid "Ignore network availability"
 msgstr "Ignorer nettverkstilgjengelighet"
 
-#: ../shell/main.c:377
+#: ../shell/main.c:379
 msgid "Start in \"express\" mode"
 msgstr "Start i ÂekspressÂ-modus"
 
-#: ../shell/main.c:380
+#: ../shell/main.c:382
 msgid "Forcibly shut down Evolution"
 msgstr "Tvungen nedstenging av Evolution"
 
-#: ../shell/main.c:383
+#: ../shell/main.c:385
 msgid "Send the debugging output of all components to a file."
 msgstr "Send feilsÃkingsutskrift for alle komponentene til en fil."
 
-#: ../shell/main.c:385
+#: ../shell/main.c:387
 msgid "Disable loading of any plugins."
 msgstr "SlÃ av lasting av tillegg."
 
-#: ../shell/main.c:387
+#: ../shell/main.c:389
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Deaktiver forhÃndsvisningsomrÃdet for e-post, kontakter og oppgaver."
 
-#: ../shell/main.c:391
+#: ../shell/main.c:393
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "Importer URIer eller filnavn gitt som argumenter."
 
-#: ../shell/main.c:393
+#: ../shell/main.c:395
 msgid "Request a running Evolution process to quit"
 msgstr "Be en kjÃrende Evolution-prosess om Ã stenge ned"
 
-#: ../shell/main.c:557 ../shell/main.c:565
+#: ../shell/main.c:569 ../shell/main.c:577
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution personlig informasjonshÃndterer og e-postklient"
 
-#: ../shell/main.c:627
+#: ../shell/main.c:640
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19839,7 +19864,7 @@ msgstr ""
 "%s: --online og --offline kan ikke brukes samtidig.\n"
 "  Bruk Â%s --helpÂ for mer informasjon.\n"
 
-#: ../shell/main.c:633
+#: ../shell/main.c:646
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -19955,31 +19980,31 @@ msgstr ""
 msgid "Not a launchable item"
 msgstr "Ikke en oppstartbar oppfÃring"
 
-#: ../smclient/eggsmclient.c:223
+#: ../smclient/eggsmclient.c:224
 msgid "Disable connection to session manager"
 msgstr "SlÃ av tilkobling til ÃkthÃndterer"
 
-#: ../smclient/eggsmclient.c:226
+#: ../smclient/eggsmclient.c:227
 msgid "Specify file containing saved configuration"
 msgstr "Oppgi fil som inneholder lagret konfigurasjon"
 
-#: ../smclient/eggsmclient.c:226
+#: ../smclient/eggsmclient.c:227
 msgid "FILE"
 msgstr "FIL"
 
-#: ../smclient/eggsmclient.c:229
+#: ../smclient/eggsmclient.c:230
 msgid "Specify session management ID"
 msgstr "Oppgi ÃkthÃndterings-ID"
 
-#: ../smclient/eggsmclient.c:229
+#: ../smclient/eggsmclient.c:230
 msgid "ID"
 msgstr "ID"
 
-#: ../smclient/eggsmclient.c:250
+#: ../smclient/eggsmclient.c:251
 msgid "Session management options:"
 msgstr "Alternativer for ÃkthÃndtering:"
 
-#: ../smclient/eggsmclient.c:251
+#: ../smclient/eggsmclient.c:252
 msgid "Show session management options"
 msgstr "Vis alternativer for ÃkthÃndtering"
 
@@ -20635,7 +20660,7 @@ msgstr "Type visning"
 msgid "Type of view:"
 msgstr "Type visning:"
 
-#: ../widgets/misc/e-account-manager.c:348
+#: ../widgets/misc/e-account-manager.c:349
 msgid "De_fault"
 msgstr "_Forvalgt"
 
@@ -20643,28 +20668,28 @@ msgstr "_Forvalgt"
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../widgets/misc/e-attachment-dialog.c:303
+#: ../widgets/misc/e-attachment-dialog.c:304
 msgid "Attachment Properties"
 msgstr "Egenskaper for vedlegg"
 
-#: ../widgets/misc/e-attachment-dialog.c:325
+#: ../widgets/misc/e-attachment-dialog.c:326
 msgid "_Filename:"
 msgstr "_Filnavn:"
 
-#: ../widgets/misc/e-attachment-dialog.c:360
+#: ../widgets/misc/e-attachment-dialog.c:361
 msgid "MIME Type:"
 msgstr "MIME-type:"
 
-#: ../widgets/misc/e-attachment-dialog.c:368
-#: ../widgets/misc/e-attachment-store.c:529
+#: ../widgets/misc/e-attachment-dialog.c:369
+#: ../widgets/misc/e-attachment-store.c:556
 msgid "_Suggest automatic display of attachment"
 msgstr "Fore_slÃ automatisk visning av vedlegg"
 
-#: ../widgets/misc/e-attachment-handler-image.c:96
+#: ../widgets/misc/e-attachment-handler-image.c:91
 msgid "Could not set as background"
 msgstr "Kunne ikke sette som bakgrunn"
 
-#: ../widgets/misc/e-attachment-handler-image.c:148
+#: ../widgets/misc/e-attachment-handler-image.c:141
 msgid "Set as _Background"
 msgstr "Sett som _bakgrunn"
 
@@ -20683,12 +20708,12 @@ msgid "Send the selected attachments somewhere"
 msgstr "Send valgte vedlegg til noen"
 
 #: ../widgets/misc/e-attachment-icon-view.c:158
-#: ../widgets/misc/e-attachment-tree-view.c:541
+#: ../widgets/misc/e-attachment-tree-view.c:543
 msgid "Loading"
 msgstr "Laster"
 
 #: ../widgets/misc/e-attachment-icon-view.c:170
-#: ../widgets/misc/e-attachment-tree-view.c:553
+#: ../widgets/misc/e-attachment-tree-view.c:555
 msgid "Saving"
 msgstr "Lagrer"
 
@@ -20697,27 +20722,27 @@ msgid "Hide Attachment _Bar"
 msgstr "Skjul ve_dleggsfelt"
 
 #: ../widgets/misc/e-attachment-paned.c:95
-#: ../widgets/misc/e-attachment-paned.c:633
+#: ../widgets/misc/e-attachment-paned.c:635
 msgid "Show Attachment _Bar"
 msgstr "Vis ve_dleggsfelt"
 
-#: ../widgets/misc/e-attachment-store.c:517
+#: ../widgets/misc/e-attachment-store.c:544
 msgid "Add Attachment"
 msgstr "Legg til vedlegg"
 
-#: ../widgets/misc/e-attachment-store.c:520
+#: ../widgets/misc/e-attachment-store.c:547
 msgid "A_ttach"
 msgstr "Le_gg ved"
 
-#: ../widgets/misc/e-attachment-store.c:583
+#: ../widgets/misc/e-attachment-store.c:610
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Lagre vedlegg"
 msgstr[1] "Lagre vedlegg"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:612
-#: ../widgets/misc/e-attachment.c:1805 ../widgets/misc/e-attachment.c:2347
+#: ../widgets/misc/e-attachment-store.c:639
+#: ../widgets/misc/e-attachment.c:1806 ../widgets/misc/e-attachment.c:2348
 msgid "attachment.dat"
 msgstr "vedlegg.dat"
 
@@ -20759,48 +20784,48 @@ msgstr "Ãpne dette vedlegget i %s"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:993
+#: ../widgets/misc/e-attachment.c:994
 msgid "Attached message"
 msgstr "Vedlagt melding"
 
-#: ../widgets/misc/e-attachment.c:1848 ../widgets/misc/e-attachment.c:2649
+#: ../widgets/misc/e-attachment.c:1849 ../widgets/misc/e-attachment.c:2650
 msgid "A load operation is already in progress"
 msgstr "En lasteoperasjon er allerede i gang"
 
-#: ../widgets/misc/e-attachment.c:1856 ../widgets/misc/e-attachment.c:2657
+#: ../widgets/misc/e-attachment.c:1857 ../widgets/misc/e-attachment.c:2658
 msgid "A save operation is already in progress"
 msgstr "En lagreoperasjon er allerede i gang"
 
-#: ../widgets/misc/e-attachment.c:1948
+#: ../widgets/misc/e-attachment.c:1949
 #, c-format
 msgid "Could not load '%s'"
 msgstr "Kunne ikke laste Â%sÂ"
 
-#: ../widgets/misc/e-attachment.c:1951
+#: ../widgets/misc/e-attachment.c:1952
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Kunne ikke laste vedlegget"
 
-#: ../widgets/misc/e-attachment.c:2227
+#: ../widgets/misc/e-attachment.c:2228
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Kunne ikke Ãpne Â%sÂ"
 
-#: ../widgets/misc/e-attachment.c:2230
+#: ../widgets/misc/e-attachment.c:2231
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Kunne ikke Ãpne vedlegget"
 
-#: ../widgets/misc/e-attachment.c:2665
+#: ../widgets/misc/e-attachment.c:2666
 msgid "Attachment contents not loaded"
 msgstr "Vedleggets innhold ble ikke lastet"
 
-#: ../widgets/misc/e-attachment.c:2741
+#: ../widgets/misc/e-attachment.c:2742
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Kunne ikke lagre Â%sÂ"
 
-#: ../widgets/misc/e-attachment.c:2744
+#: ../widgets/misc/e-attachment.c:2745
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Kunne ikke lagre vedlegget"
@@ -20827,52 +20852,52 @@ msgstr "Tegnkoding"
 msgid "Enter the character set to use"
 msgstr "Skriv inn tegnsett som skal brukes"
 
-#: ../widgets/misc/e-charset-combo-box.c:334
+#: ../widgets/misc/e-charset-combo-box.c:335
 msgid "Other..."
 msgstr "Andre â"
 
-#: ../widgets/misc/e-dateedit.c:500
+#: ../widgets/misc/e-dateedit.c:501
 msgid "Date and Time"
 msgstr "Dato og klokkeslett"
 
-#: ../widgets/misc/e-dateedit.c:521
+#: ../widgets/misc/e-dateedit.c:522
 msgid "Text entry to input date"
 msgstr "Tekstfelt for Ã oppgi dato"
 
-#: ../widgets/misc/e-dateedit.c:543
+#: ../widgets/misc/e-dateedit.c:544
 msgid "Click this button to show a calendar"
 msgstr "Klikk pÃ denne knappen for Ã vise en kalender"
 
-#: ../widgets/misc/e-dateedit.c:590
+#: ../widgets/misc/e-dateedit.c:591
 msgid "Drop-down combination box to select time"
 msgstr "Kombinasjonsboks med nedtrekksmeny for Ã velge tid"
 
-#: ../widgets/misc/e-dateedit.c:662
+#: ../widgets/misc/e-dateedit.c:663
 msgid "No_w"
 msgstr "N_Ã"
 
-#: ../widgets/misc/e-dateedit.c:668
+#: ../widgets/misc/e-dateedit.c:669
 msgid "_Today"
 msgstr "I _dag"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../widgets/misc/e-dateedit.c:676
+#: ../widgets/misc/e-dateedit.c:677
 msgid "_None"
 msgstr "I_ngen"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1685 ../widgets/misc/e-dateedit.c:1917
+#: ../widgets/misc/e-dateedit.c:1686 ../widgets/misc/e-dateedit.c:1918
 msgctxt "date"
 msgid "None"
 msgstr "Ingen"
 
-#: ../widgets/misc/e-dateedit.c:1812
+#: ../widgets/misc/e-dateedit.c:1813
 msgid "Invalid Date Value"
 msgstr "Ugyldig datoverdi"
 
-#: ../widgets/misc/e-dateedit.c:1856
+#: ../widgets/misc/e-dateedit.c:1857
 msgid "Invalid Time Value"
 msgstr "Ugyldig verdi for tid"
 
@@ -21007,7 +21032,7 @@ msgstr ""
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "Evolution er frakoblet fordi nettverket ikke er tilgjengelig."
 
-#: ../widgets/misc/e-preferences-window.c:274
+#: ../widgets/misc/e-preferences-window.c:275
 msgid "Evolution Preferences"
 msgstr "Evolution brukervalg"
 
@@ -21016,43 +21041,43 @@ msgstr "Evolution brukervalg"
 msgid "Matches: %d"
 msgstr "Treff pÃ: %d"
 
-#: ../widgets/misc/e-search-bar.c:556
+#: ../widgets/misc/e-search-bar.c:557
 msgid "Close the find bar"
 msgstr "Lukk sÃkelinjen"
 
-#: ../widgets/misc/e-search-bar.c:564
+#: ../widgets/misc/e-search-bar.c:565
 msgid "Fin_d:"
 msgstr "Fin_n:"
 
-#: ../widgets/misc/e-search-bar.c:576
+#: ../widgets/misc/e-search-bar.c:577
 msgid "Clear the search"
 msgstr "TÃm sÃket"
 
-#: ../widgets/misc/e-search-bar.c:600
+#: ../widgets/misc/e-search-bar.c:601
 msgid "_Previous"
 msgstr "_Forrige"
 
-#: ../widgets/misc/e-search-bar.c:606
+#: ../widgets/misc/e-search-bar.c:607
 msgid "Find the previous occurrence of the phrase"
 msgstr "Finn forrige oppfÃring av teksten"
 
-#: ../widgets/misc/e-search-bar.c:619
+#: ../widgets/misc/e-search-bar.c:620
 msgid "_Next"
 msgstr "_Neste"
 
-#: ../widgets/misc/e-search-bar.c:625
+#: ../widgets/misc/e-search-bar.c:626
 msgid "Find the next occurrence of the phrase"
 msgstr "Finn neste oppfÃring av teksten"
 
-#: ../widgets/misc/e-search-bar.c:638
+#: ../widgets/misc/e-search-bar.c:639
 msgid "Mat_ch case"
 msgstr "Tre_ff pÃ smÃ/store bokstaver"
 
-#: ../widgets/misc/e-search-bar.c:666
+#: ../widgets/misc/e-search-bar.c:667
 msgid "Reached bottom of page, continued from top"
 msgstr "NÃdde bunnen av siden og fortsatte fra toppen"
 
-#: ../widgets/misc/e-search-bar.c:688
+#: ../widgets/misc/e-search-bar.c:689
 msgid "Reached top of page, continued from bottom"
 msgstr "NÃdde toppen av siden og fortsatte fra bunnen"
 
@@ -21192,8 +21217,8 @@ msgid "None"
 msgstr "Ingen"
 
 #: ../widgets/misc/e-signature-editor.c:134
-#: ../widgets/misc/e-signature-editor.c:559
-#: ../widgets/misc/e-signature-manager.c:348
+#: ../widgets/misc/e-signature-editor.c:560
+#: ../widgets/misc/e-signature-manager.c:368
 #: ../widgets/misc/e-signature-script-dialog.c:215
 msgid "Unnamed"
 msgstr "Uten navn"
@@ -21202,27 +21227,27 @@ msgstr "Uten navn"
 msgid "_Save and Close"
 msgstr "L_agre og lukk"
 
-#: ../widgets/misc/e-signature-editor.c:426
+#: ../widgets/misc/e-signature-editor.c:427
 msgid "Edit Signature"
 msgstr "Rediger signatur"
 
-#: ../widgets/misc/e-signature-editor.c:441
+#: ../widgets/misc/e-signature-editor.c:442
 msgid "_Signature Name:"
 msgstr "Navn pÃ _signatur:"
 
-#: ../widgets/misc/e-signature-manager.c:293
+#: ../widgets/misc/e-signature-manager.c:313
 msgid "Add Signature Script"
 msgstr "Legg til signaturskript"
 
-#: ../widgets/misc/e-signature-manager.c:358
+#: ../widgets/misc/e-signature-manager.c:378
 msgid "Edit Signature Script"
 msgstr "Rediger signaturskript"
 
-#: ../widgets/misc/e-signature-manager.c:576
+#: ../widgets/misc/e-signature-manager.c:598
 msgid "Add _Script"
 msgstr "Legg til _skript"
 
-#: ../widgets/misc/e-signature-script-dialog.c:262
+#: ../widgets/misc/e-signature-script-dialog.c:264
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -21232,11 +21257,11 @@ msgstr ""
 "signatur. Navnet du oppgir vil kun brukes for\n"
 "visning pÃ skjermen."
 
-#: ../widgets/misc/e-signature-script-dialog.c:307
+#: ../widgets/misc/e-signature-script-dialog.c:309
 msgid "S_cript:"
 msgstr "S_kript:"
 
-#: ../widgets/misc/e-signature-script-dialog.c:338
+#: ../widgets/misc/e-signature-script-dialog.c:340
 msgid "Script file must be executable."
 msgstr "Skriptfilen mÃ vÃre kjÃrbar."
 
@@ -21244,41 +21269,41 @@ msgstr "Skriptfilen mÃ vÃre kjÃrbar."
 msgid "Click here to go to URL"
 msgstr "Klikk her for Ã vise URL"
 
-#: ../widgets/misc/e-web-view.c:375
+#: ../widgets/misc/e-web-view.c:382
 msgid "_Copy Link Location"
 msgstr "_Kopier adressen til lenke"
 
-#: ../widgets/misc/e-web-view.c:377
+#: ../widgets/misc/e-web-view.c:384
 msgid "Copy the link to the clipboard"
 msgstr "Kopier lenken til utklippstavlen"
 
-#: ../widgets/misc/e-web-view.c:385
+#: ../widgets/misc/e-web-view.c:392
 msgid "_Open Link in Browser"
 msgstr "_Ãpne lenke i nettleser"
 
-#: ../widgets/misc/e-web-view.c:387
+#: ../widgets/misc/e-web-view.c:394
 msgid "Open the link in a web browser"
 msgstr "Ãpne lenken i en nettleser"
 
-#: ../widgets/misc/e-web-view.c:395
+#: ../widgets/misc/e-web-view.c:402
 msgid "_Copy Email Address"
 msgstr "_Kopier e-postadresse"
 
-#: ../widgets/misc/e-web-view.c:424 ../widgets/misc/e-web-view.c:1079
+#: ../widgets/misc/e-web-view.c:431 ../widgets/misc/e-web-view.c:1221
 msgid "Select all text and images"
 msgstr "Velg all tekst og alle bilder"
 
-#: ../widgets/misc/e-web-view.c:856 ../widgets/misc/e-web-view.c:858
-#: ../widgets/misc/e-web-view.c:860
+#: ../widgets/misc/e-web-view.c:892 ../widgets/misc/e-web-view.c:894
+#: ../widgets/misc/e-web-view.c:896
 #, c-format
 msgid "Click to call %s"
 msgstr "Klikk for Ã ringe %s"
 
-#: ../widgets/misc/e-web-view.c:862
+#: ../widgets/misc/e-web-view.c:898
 msgid "Click to hide/unhide addresses"
 msgstr "Klikk for Ã skjule/vise adresser"
 
-#: ../widgets/misc/e-web-view.c:864
+#: ../widgets/misc/e-web-view.c:900
 #, c-format
 msgid "Click to open %s"
 msgstr "Klikk for Ã Ãpne %s"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]