Updated Norwegian bokmål translation

1 files changed, 392 insertions, 373 deletions

diff --git a/po/nb.po b/po/nb.po
index 7fe0619e77..7f4525235d 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -4,13 +4,13 @@
 # Terance Edward Sola <terance@lyse.net>, 2005.
 #
 #
-#: ../shell/main.c:519
+#: ../shell/main.c:534
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 2.31.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-19 14:01+0200\n"
-"PO-Revision-Date: 2010-07-19 14:13+0200\n"
+"POT-Creation-Date: 2010-08-04 14:17+0200\n"
+"PO-Revision-Date: 2010-08-04 14:18+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmal <i18n-nb@lister.ping.uio.no>\n"
 "Language: \n"
@@ -99,7 +99,7 @@ msgstr "Kunne ikke autentisere mot LDAP-tjener."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1273
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1277
 msgid "Failed to delete contact"
 msgstr "Klarte ikke å slette kontakt"
 
@@ -247,7 +247,7 @@ msgstr "Bryllupsdag"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
 #: ../calendar/gui/e-calendar-view.c:2021 ../capplet/anjal-settings-main.c:118
-#: ../shell/main.c:118
+#: ../shell/main.c:123
 msgid "Birthday"
 msgstr "Fødselsdag"
 
@@ -797,54 +797,54 @@ msgstr "Søk avbrutt"
 msgid "Error modifying card"
 msgstr "Feil ved endring av kort"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:622
+#: ../addressbook/gui/widgets/e-addressbook-view.c:626
 msgid "Cut selected contacts to the clipboard"
 msgstr "Klipp ut valgte kontakter til utklippstavlen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:628
+#: ../addressbook/gui/widgets/e-addressbook-view.c:632
 msgid "Copy selected contacts to the clipboard"
 msgstr "Kopier valgte kontakter til utklippstavlen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:634
+#: ../addressbook/gui/widgets/e-addressbook-view.c:638
 msgid "Paste contacts from the clipboard"
 msgstr "Lim inn kontakter fra utklippstavlen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../addressbook/gui/widgets/e-addressbook-view.c:644
 #: ../modules/addressbook/e-book-shell-view-actions.c:729
 msgid "Delete selected contacts"
 msgstr "Slett valgte kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:646
+#: ../addressbook/gui/widgets/e-addressbook-view.c:650
 msgid "Select all visible contacts"
 msgstr "Velg alle synlige kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1291
+#: ../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:1295
+#: ../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:1299
+#: ../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:1305
+#: ../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:1309
+#: ../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:1313
+#: ../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)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1468
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1472
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -853,11 +853,11 @@ msgstr ""
 "Åpning av %d kontakter vil medføre at %d nye vinduer vil\n"
 "vises på skjermen. Vil du virkelig vise alle disse kontaktene?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1473
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1477
 msgid "_Don't Display"
 msgstr "Ikke _vis"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1474
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1478
 msgid "Display _All Contacts"
 msgstr "Vis _alle kontakter"
 
@@ -1981,7 +1981,7 @@ msgstr "A_vvis"
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
 #: ../calendar/gui/dialogs/comp-editor.c:1060
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:153
+#: ../mail/e-mail-browser.c:152
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
 #: ../shell/e-shell-window-actions.c:1607
 #: ../widgets/menus/gal-define-views.ui.h:5
@@ -3409,14 +3409,14 @@ 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:990 ../mail/e-mail-browser.c:118
+#: ../calendar/gui/dialogs/comp-editor.c:990 ../mail/e-mail-browser.c:117
 #: ../shell/e-shell-window-actions.c:1453
 #: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
 #: ../widgets/misc/e-web-view.c:408 ../widgets/misc/e-web-view.c:1061
 msgid "Copy the selection"
 msgstr "Kopier utvalget"
 
-#: ../calendar/gui/dialogs/comp-editor.c:997 ../mail/e-mail-browser.c:125
+#: ../calendar/gui/dialogs/comp-editor.c:997 ../mail/e-mail-browser.c:124
 #: ../shell/e-shell-window-actions.c:1460
 #: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
 #: ../widgets/misc/e-web-view.c:1055
@@ -3433,7 +3433,7 @@ msgstr "Slett utvalget"
 msgid "Click here to view help available"
 msgstr "klikk her for å vise tilgjengelig hjelp"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1018 ../mail/e-mail-browser.c:132
+#: ../calendar/gui/dialogs/comp-editor.c:1018 ../mail/e-mail-browser.c:131
 #: ../shell/e-shell-window-actions.c:1502
 #: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
 #: ../widgets/misc/e-web-view.c:1067
@@ -3444,7 +3444,7 @@ 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:1046 ../mail/e-mail-browser.c:139
+#: ../calendar/gui/dialogs/comp-editor.c:1046 ../mail/e-mail-browser.c:138
 #: ../shell/e-shell-window-actions.c:1572
 #: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
 msgid "Select all text"
@@ -3454,7 +3454,7 @@ msgstr "Velg all tekst"
 msgid "_Classification"
 msgstr "K_lassifisering"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1067 ../mail/e-mail-browser.c:146
+#: ../calendar/gui/dialogs/comp-editor.c:1067 ../mail/e-mail-browser.c:145
 #: ../shell/e-shell-window-actions.c:1614
 #: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
@@ -3474,7 +3474,7 @@ msgstr "Sett _inn"
 msgid "_Options"
 msgstr "_Alternativer"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1095 ../mail/e-mail-browser.c:160
+#: ../calendar/gui/dialogs/comp-editor.c:1095 ../mail/e-mail-browser.c:159
 #: ../shell/e-shell-window-actions.c:1656 ../smime/gui/smime-ui.ui.h:45
 msgid "_View"
 msgstr "_Vis"
@@ -3966,8 +3966,8 @@ msgid "Unable to open memos in '%s'."
 msgstr "Kan ikke åpne notater i «%s»."
 
 #: ../calendar/gui/dialogs/memo-page.c:1078 ../em-format/em-format-quote.c:215
-#: ../em-format/em-format.c:942 ../mail/em-format-html.c:2284
-#: ../mail/em-format-html.c:2343 ../mail/em-format-html.c:2367
+#: ../em-format/em-format.c:944 ../mail/em-format-html.c:2289
+#: ../mail/em-format-html.c:2348 ../mail/em-format-html.c:2372
 #: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:80
 msgid "To"
 msgstr "Til"
@@ -4268,7 +4268,7 @@ msgstr "Fullført"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
 #: ../calendar/gui/e-cal-component-preview.c:314
 #: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1172 ../widgets/misc/e-send-options.ui.h:13
+#: ../mail/message-list.c:1183 ../widgets/misc/e-send-options.ui.h:13
 msgid "High"
 msgstr "Høy"
 
@@ -4287,7 +4287,7 @@ msgstr "Under arbeid"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
 #: ../calendar/gui/e-cal-component-preview.c:318
 #: ../calendar/gui/e-task-table.c:513 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1170 ../widgets/misc/e-send-options.ui.h:14
+#: ../mail/message-list.c:1181 ../widgets/misc/e-send-options.ui.h:14
 msgid "Low"
 msgstr "Lav"
 
@@ -4295,7 +4295,7 @@ msgstr "Lav"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
 #: ../calendar/gui/e-cal-component-preview.c:316
 #: ../calendar/gui/e-cal-model.c:1269 ../calendar/gui/e-task-table.c:512
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1171
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1182
 #: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
 msgstr "Normal"
@@ -5449,7 +5449,7 @@ msgid "Member"
 msgstr "Medlem"
 
 #: ../calendar/gui/e-memo-table.c:412
-#: ../modules/calendar/e-cal-shell-content.c:468
+#: ../modules/calendar/e-cal-shell-content.c:473
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
 #: ../modules/calendar/e-memo-shell-view.c:289
@@ -5508,7 +5508,7 @@ msgstr "%d%%"
 #: ../calendar/gui/e-task-table.c:629 ../calendar/gui/print.c:2052
 #: ../calendar/importers/icalendar-importer.c:81
 #: ../calendar/importers/icalendar-importer.c:828
-#: ../modules/calendar/e-cal-shell-content.c:429
+#: ../modules/calendar/e-cal-shell-content.c:434
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
 #: ../modules/calendar/e-task-shell-view.c:437
@@ -8424,7 +8424,7 @@ msgid "Back - Receiving options"
 msgstr "Tilbake - Alternativer for mottak"
 
 #: ../capplet/settings/mail-account-view.c:613
-#: ../mail/em-account-editor.c:2983 ../mail/mail-config.ui.h:34
+#: ../mail/em-account-editor.c:2985 ../mail/mail-config.ui.h:34
 msgid "Defaults"
 msgstr "Forvalg"
 
@@ -8507,7 +8507,7 @@ msgstr "Evolution kontoassistent"
 #: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
 #: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:163
 #: ../mail/em-folder-tree-model.c:165 ../mail/mail-vfolder.c:207
-#: ../mail/message-list.c:1655
+#: ../mail/message-list.c:1666
 #: ../modules/addressbook/e-book-shell-backend.c:95
 #: ../modules/addressbook/e-book-shell-migrate.c:130
 #: ../modules/calendar/e-cal-shell-backend.c:102
@@ -8544,7 +8544,7 @@ msgstr "Varsling om kalenderhendelser"
 msgid "Evolution Alarm Notify"
 msgstr "Evolution varslingstjeneste"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:865
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:845
 #: ../shell/e-shell-window-private.c:253
 msgid "Evolution"
 msgstr "Evolution"
@@ -8764,12 +8764,12 @@ msgstr "Loggmeldinger:"
 msgid "Log Level"
 msgstr "Loggnivå"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2741
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2757
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Meldinger"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:111
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
 #: ../shell/e-shell-window-actions.c:1425
 #: ../shell/e-shell-window-actions.c:1432
 #: ../shell/e-shell-window-actions.c:1439
@@ -8815,7 +8815,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:701
+#: ../e-util/e-signature.c:732
 msgid "Autogenerated"
 msgstr "Generert automatisk"
 
@@ -8860,30 +8860,30 @@ 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:215 ../em-format/em-format.c:940
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:942
 #: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:78
 msgid "From"
 msgstr "Fra"
 
-#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:941
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:943
 #: ../modules/mail/em-mailer-prefs.c:79
 msgid "Reply-To"
 msgstr "Svar-til"
 
-#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:943
-#: ../mail/em-format-html.c:2285 ../mail/em-format-html.c:2347
-#: ../mail/em-format-html.c:2370 ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:945
+#: ../mail/em-format-html.c:2290 ../mail/em-format-html.c:2352
+#: ../mail/em-format-html.c:2375 ../modules/mail/em-mailer-prefs.c:81
 msgid "Cc"
 msgstr "Cc"
 
-#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:944
-#: ../mail/em-format-html.c:2286 ../mail/em-format-html.c:2351
-#: ../mail/em-format-html.c:2373 ../modules/mail/em-mailer-prefs.c:82
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:946
+#: ../mail/em-format-html.c:2291 ../mail/em-format-html.c:2356
+#: ../mail/em-format-html.c:2378 ../modules/mail/em-mailer-prefs.c:82
 msgid "Bcc"
 msgstr "Bcc"
 
-#: ../em-format/em-format-quote.c:347 ../em-format/em-format.c:945
+#: ../em-format/em-format-quote.c:347 ../em-format/em-format.c:947
 #: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
 #: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:83
 #: ../plugins/groupwise-features/properties.ui.h:6 ../smime/lib/e-cert.c:1140
@@ -8891,7 +8891,7 @@ msgid "Subject"
 msgstr "Emne"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:358 ../mail/em-format-html.c:2467
+#: ../em-format/em-format-quote.c:358 ../mail/em-format-html.c:2472
 #: ../modules/mail/em-mailer-prefs.c:1144
 msgid "Mailer"
 msgstr "E-postprogram"
@@ -8900,64 +8900,64 @@ msgstr "E-postprogram"
 msgid "-------- Forwarded Message --------"
 msgstr "---------Videresendt melding-------"
 
-#: ../em-format/em-format.c:946 ../mail/message-list.etspec.h:2
+#: ../em-format/em-format.c:948 ../mail/message-list.etspec.h:2
 #: ../modules/mail/em-mailer-prefs.c:84 ../widgets/misc/e-dateedit.c:524
 #: ../widgets/misc/e-dateedit.c:546
 msgid "Date"
 msgstr "Dato"
 
-#: ../em-format/em-format.c:947 ../modules/mail/em-mailer-prefs.c:85
+#: ../em-format/em-format.c:949 ../modules/mail/em-mailer-prefs.c:85
 msgid "Newsgroups"
 msgstr "Nyhetsgrupper"
 
-#: ../em-format/em-format.c:948 ../modules/mail/em-mailer-prefs.c:86
+#: ../em-format/em-format.c:950 ../modules/mail/em-mailer-prefs.c:86
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "Ansikt"
 
-#: ../em-format/em-format.c:1310
+#: ../em-format/em-format.c:1312
 #, c-format
 msgid "%s attachment"
 msgstr "%s-vedlegg"
 
-#: ../em-format/em-format.c:1370
+#: ../em-format/em-format.c:1372
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Kunne ikke lese S/MIME-melding: Ukjent feil"
 
-#: ../em-format/em-format.c:1525 ../em-format/em-format.c:1699
+#: ../em-format/em-format.c:1527 ../em-format/em-format.c:1701
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
 
-#: ../em-format/em-format.c:1533
+#: ../em-format/em-format.c:1535
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Krypteringstype for multipart/encrypted som ikke er støttet"
 
-#: ../em-format/em-format.c:1546
+#: ../em-format/em-format.c:1548
 msgid "Could not parse PGP/MIME message"
 msgstr "Kunne ikke lese PGP/MIME-melding"
 
-#: ../em-format/em-format.c:1547
+#: ../em-format/em-format.c:1549
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Kunne ikke lese PGP/MIME-melding: Ukjent feil"
 
-#: ../em-format/em-format.c:1723
+#: ../em-format/em-format.c:1725
 msgid "Unsupported signature format"
 msgstr "Ustøttet signaturformat"
 
-#: ../em-format/em-format.c:1733 ../em-format/em-format.c:1889
+#: ../em-format/em-format.c:1735 ../em-format/em-format.c:1891
 msgid "Error verifying signature"
 msgstr "Feil under verifisering av signatur"
 
-#: ../em-format/em-format.c:1734 ../em-format/em-format.c:1877
-#: ../em-format/em-format.c:1890
+#: ../em-format/em-format.c:1736 ../em-format/em-format.c:1879
+#: ../em-format/em-format.c:1892
 msgid "Unknown error verifying signature"
 msgstr "Ukjent feil under verifisering av signatur"
 
-#: ../em-format/em-format.c:1970
+#: ../em-format/em-format.c:1972
 msgid "Could not parse PGP message: "
 msgstr "Kunne ikke lese PGP-melding:"
 
-#: ../em-format/em-format.c:1976 ../plugins/caldav/caldav-browse-server.c:203
+#: ../em-format/em-format.c:1978 ../plugins/caldav/caldav-browse-server.c:203
 #: ../plugins/caldav/caldav-browse-server.c:1254 ../plugins/face/face.c:169
 #: ../smime/gui/certificate-manager.c:100
 msgid "Unknown error"
@@ -9282,7 +9282,7 @@ msgstr "Ikonvisning"
 msgid "List View"
 msgstr "Listevisning"
 
-#: ../mail/e-mail-browser.c:266
+#: ../mail/e-mail-browser.c:265
 msgid "(No Subject)"
 msgstr "(Uten emne)"
 
@@ -9362,7 +9362,7 @@ msgstr "Navn"
 
 #: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:283
 #: ../mail/em-folder-tree-model.c:700 ../mail/em-folder-tree.c:2759
-#: ../modules/mail/e-mail-shell-view-private.c:959
+#: ../modules/mail/e-mail-shell-view-private.c:1008
 msgid "Inbox"
 msgstr "Innboks"
 
@@ -9418,6 +9418,10 @@ msgstr ""
 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:559
+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.
@@ -9426,33 +9430,33 @@ msgstr "Kunne ikke opprette lokale e-postmapper i «%s»: %s"
 msgid "Do not ask me again"
 msgstr "Ikke spør meg igjen"
 
-#: ../mail/e-mail-reader.c:265 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:270 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: ../mail/e-mail-reader.c:265 ../mail/em-folder-utils.c:402
+#: ../mail/e-mail-reader.c:270 ../mail/em-folder-utils.c:402
 msgid "C_opy"
 msgstr "K_opier"
 
-#: ../mail/e-mail-reader.c:639 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:644 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "Flytt til mappe"
 
-#: ../mail/e-mail-reader.c:639 ../mail/em-folder-utils.c:402
+#: ../mail/e-mail-reader.c:644 ../mail/em-folder-utils.c:402
 msgid "_Move"
 msgstr "_Flytt"
 
 #. Check buttons
-#: ../mail/e-mail-reader.c:854 ../mail/e-mail-reader.c:964
-#: ../mail/e-mail-reader.c:998
+#: ../mail/e-mail-reader.c:876 ../mail/e-mail-reader.c:987
+#: ../mail/e-mail-reader.c:1028
 msgid "_Do not ask me again."
 msgstr "_Ikke spør meg igjen."
 
-#: ../mail/e-mail-reader.c:1002
+#: ../mail/e-mail-reader.c:1033
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Alltid ignorer Reply-To: for e-postlister."
 
-#: ../mail/e-mail-reader.c:1087
+#: ../mail/e-mail-reader.c:1123
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Lagre melding"
@@ -9464,508 +9468,508 @@ 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:1108
+#: ../mail/e-mail-reader.c:1144
 #: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Melding"
 msgstr[1] "Meldinger"
 
-#: ../mail/e-mail-reader.c:1366
+#: ../mail/e-mail-reader.c:1408
 msgid "A_dd Sender to Address Book"
 msgstr "L_egg til avsender i adressebok"
 
-#: ../mail/e-mail-reader.c:1368
+#: ../mail/e-mail-reader.c:1410
 msgid "Add sender to address book"
 msgstr "Legg til avsender i adressebok"
 
-#: ../mail/e-mail-reader.c:1373
+#: ../mail/e-mail-reader.c:1415
 msgid "Check for _Junk"
 msgstr "Sjekk etter _uønsket e-post"
 
-#: ../mail/e-mail-reader.c:1375
+#: ../mail/e-mail-reader.c:1417
 msgid "Filter the selected messages for junk status"
 msgstr "Filtrer valgte meldinger etter uønsket e-poststatus"
 
-#: ../mail/e-mail-reader.c:1380
+#: ../mail/e-mail-reader.c:1422
 msgid "_Copy to Folder..."
 msgstr "K_opier til mappe..."
 
-#: ../mail/e-mail-reader.c:1382
+#: ../mail/e-mail-reader.c:1424
 msgid "Copy selected messages to another folder"
 msgstr "Kopier valgte meldinger til en annen mappe"
 
-#: ../mail/e-mail-reader.c:1387
+#: ../mail/e-mail-reader.c:1429
 msgid "_Delete Message"
 msgstr "_Slett melding"
 
-#: ../mail/e-mail-reader.c:1389
+#: ../mail/e-mail-reader.c:1431
 msgid "Mark the selected messages for deletion"
 msgstr "Merk valgte meldinger for sletting"
 
-#: ../mail/e-mail-reader.c:1394
+#: ../mail/e-mail-reader.c:1436
 msgid "Filter on Mailing _List..."
 msgstr "Filtrer på e-post_liste..."
 
-#: ../mail/e-mail-reader.c:1396
+#: ../mail/e-mail-reader.c:1438
 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:1401
+#: ../mail/e-mail-reader.c:1443
 msgid "Filter on _Recipients..."
 msgstr "Filtrer på mottake_re..."
 
-#: ../mail/e-mail-reader.c:1403
+#: ../mail/e-mail-reader.c:1445
 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:1408
+#: ../mail/e-mail-reader.c:1450
 msgid "Filter on Se_nder..."
 msgstr "Filtrer på se_nder..."
 
-#: ../mail/e-mail-reader.c:1410
+#: ../mail/e-mail-reader.c:1452
 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:1415
+#: ../mail/e-mail-reader.c:1457
 msgid "Filter on _Subject..."
 msgstr "Filtrer på e_mne..."
 
-#: ../mail/e-mail-reader.c:1417
+#: ../mail/e-mail-reader.c:1459
 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:1422
+#: ../mail/e-mail-reader.c:1464
 msgid "A_pply Filters"
 msgstr "_Påfør filtre"
 
-#: ../mail/e-mail-reader.c:1424
+#: ../mail/e-mail-reader.c:1466
 msgid "Apply filter rules to the selected messages"
 msgstr "Aktiver filterregler på de valgte meldingene"
 
-#: ../mail/e-mail-reader.c:1429
+#: ../mail/e-mail-reader.c:1471
 msgid "_Find in Message..."
 msgstr "_Finn i melding..."
 
-#: ../mail/e-mail-reader.c:1431
+#: ../mail/e-mail-reader.c:1473
 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:1436
+#: ../mail/e-mail-reader.c:1478
 msgid "_Clear Flag"
 msgstr "F_jern flagg"
 
-#: ../mail/e-mail-reader.c:1438
+#: ../mail/e-mail-reader.c:1480
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Fjern flagg for oppfølging fra valgte meldinger"
 
-#: ../mail/e-mail-reader.c:1443
+#: ../mail/e-mail-reader.c:1485
 msgid "_Flag Completed"
 msgstr "Merk som _fullført"
 
-#: ../mail/e-mail-reader.c:1445
+#: ../mail/e-mail-reader.c:1487
 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:1450
+#: ../mail/e-mail-reader.c:1492
 msgid "Follow _Up..."
 msgstr "Følg _opp..."
 
-#: ../mail/e-mail-reader.c:1452
+#: ../mail/e-mail-reader.c:1494
 msgid "Flag the selected messages for follow-up"
 msgstr "Merk valgte meldinger for oppfølging"
 
-#: ../mail/e-mail-reader.c:1457
+#: ../mail/e-mail-reader.c:1499
 msgid "_Attached"
 msgstr "L_agt ved"
 
-#: ../mail/e-mail-reader.c:1459 ../mail/e-mail-reader.c:1466
+#: ../mail/e-mail-reader.c:1501 ../mail/e-mail-reader.c:1508
 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:1464
+#: ../mail/e-mail-reader.c:1506
 msgid "Forward As _Attached"
 msgstr "Videresend s_om vedlegg"
 
-#: ../mail/e-mail-reader.c:1471
+#: ../mail/e-mail-reader.c:1513
 msgid "_Inline"
 msgstr "_I meldingen"
 
-#: ../mail/e-mail-reader.c:1473 ../mail/e-mail-reader.c:1480
+#: ../mail/e-mail-reader.c:1515 ../mail/e-mail-reader.c:1522
 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:1478
+#: ../mail/e-mail-reader.c:1520
 msgid "Forward As _Inline"
 msgstr "V_ideresend som vedlegg"
 
-#: ../mail/e-mail-reader.c:1485
+#: ../mail/e-mail-reader.c:1527
 msgid "_Quoted"
 msgstr "_Sitert"
 
-#: ../mail/e-mail-reader.c:1487 ../mail/e-mail-reader.c:1494
+#: ../mail/e-mail-reader.c:1529 ../mail/e-mail-reader.c:1536
 msgid "Forward the selected message quoted like a reply"
 msgstr "Videresend den valgte meldingen sitert som et svar"
 
-#: ../mail/e-mail-reader.c:1492
+#: ../mail/e-mail-reader.c:1534
 msgid "Forward As _Quoted"
 msgstr "Videresend s_om sitat"
 
-#: ../mail/e-mail-reader.c:1499
+#: ../mail/e-mail-reader.c:1541
 msgid "_Load Images"
 msgstr "_Last bilder"
 
-#: ../mail/e-mail-reader.c:1501
+#: ../mail/e-mail-reader.c:1543
 msgid "Force images in HTML mail to be loaded"
 msgstr "Tvungen lasting av bilder i HTML e-post"
 
-#: ../mail/e-mail-reader.c:1506
+#: ../mail/e-mail-reader.c:1548
 msgid "_Important"
 msgstr "V_iktig"
 
-#: ../mail/e-mail-reader.c:1508
+#: ../mail/e-mail-reader.c:1550
 msgid "Mark the selected messages as important"
 msgstr "Merk valgte meldinger som viktige"
 
-#: ../mail/e-mail-reader.c:1513
+#: ../mail/e-mail-reader.c:1555
 msgid "_Junk"
 msgstr "_Uønsket e-post"
 
-#: ../mail/e-mail-reader.c:1515
+#: ../mail/e-mail-reader.c:1557
 msgid "Mark the selected messages as junk"
 msgstr "Merk valgte meldinger som uønsket e-post"
 
-#: ../mail/e-mail-reader.c:1520
+#: ../mail/e-mail-reader.c:1562
 msgid "_Not Junk"
 msgstr "_Ikke uønsket e-post"
 
-#: ../mail/e-mail-reader.c:1522
+#: ../mail/e-mail-reader.c:1564
 msgid "Mark the selected messages as not being junk"
 msgstr "Merk valgte meldinger som ønsket e-post"
 
-#: ../mail/e-mail-reader.c:1527
+#: ../mail/e-mail-reader.c:1569
 msgid "_Read"
 msgstr "_Les"
 
-#: ../mail/e-mail-reader.c:1529
+#: ../mail/e-mail-reader.c:1571
 msgid "Mark the selected messages as having been read"
 msgstr "Merk valgte meldinger som lest"
 
-#: ../mail/e-mail-reader.c:1534
+#: ../mail/e-mail-reader.c:1576
 msgid "Uni_mportant"
 msgstr "_Ikke viktig"
 
-#: ../mail/e-mail-reader.c:1536
+#: ../mail/e-mail-reader.c:1578
 msgid "Mark the selected messages as unimportant"
 msgstr "Merk valgte meldinger som uviktige"
 
-#: ../mail/e-mail-reader.c:1541
+#: ../mail/e-mail-reader.c:1583
 msgid "_Unread"
 msgstr "_Ulest"
 
-#: ../mail/e-mail-reader.c:1543
+#: ../mail/e-mail-reader.c:1585
 msgid "Mark the selected messages as not having been read"
 msgstr "Merk valgte meldinger som ulest"
 
-#: ../mail/e-mail-reader.c:1548
+#: ../mail/e-mail-reader.c:1590
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding..."
 
-#: ../mail/e-mail-reader.c:1550
+#: ../mail/e-mail-reader.c:1592
 msgid "Open the selected messages in the composer for editing"
 msgstr "Åpne valgte meldinger i redigeringskomponenten"
 
-#: ../mail/e-mail-reader.c:1555
+#: ../mail/e-mail-reader.c:1597
 msgid "Compose _New Message"
 msgstr "Skriv _ny melding"
 
-#: ../mail/e-mail-reader.c:1557
+#: ../mail/e-mail-reader.c:1599
 msgid "Open a window for composing a mail message"
 msgstr "Åpne et vindu for å skrive en e-post melding"
 
-#: ../mail/e-mail-reader.c:1562
+#: ../mail/e-mail-reader.c:1604
 msgid "_Open in New Window"
 msgstr "_Åpne i _nytt vindu"
 
-#: ../mail/e-mail-reader.c:1564
+#: ../mail/e-mail-reader.c:1606
 msgid "Open the selected messages in a new window"
 msgstr "Åpne valgte meldinger i et nytt vindu"
 
-#: ../mail/e-mail-reader.c:1569
+#: ../mail/e-mail-reader.c:1611
 msgid "_Move to Folder..."
 msgstr "Fl_ytt til mappe..."
 
-#: ../mail/e-mail-reader.c:1571
+#: ../mail/e-mail-reader.c:1613
 msgid "Move selected messages to another folder"
 msgstr "Flytt valgte meldinger til en annen mappe"
 
-#: ../mail/e-mail-reader.c:1576
+#: ../mail/e-mail-reader.c:1618
 msgid "_Next Message"
 msgstr "_Neste melding"
 
-#: ../mail/e-mail-reader.c:1578
+#: ../mail/e-mail-reader.c:1620
 msgid "Display the next message"
 msgstr "Vis neste melding"
 
-#: ../mail/e-mail-reader.c:1583
+#: ../mail/e-mail-reader.c:1625
 msgid "Next _Important Message"
 msgstr "Neste v_iktige melding"
 
-#: ../mail/e-mail-reader.c:1585
+#: ../mail/e-mail-reader.c:1627
 msgid "Display the next important message"
 msgstr "Vis neste viktige melding"
 
-#: ../mail/e-mail-reader.c:1590
+#: ../mail/e-mail-reader.c:1632
 msgid "Next _Thread"
 msgstr "Neste _tråd"
 
-#: ../mail/e-mail-reader.c:1592
+#: ../mail/e-mail-reader.c:1634
 msgid "Display the next thread"
 msgstr "Vis neste tråd"
 
-#: ../mail/e-mail-reader.c:1597
+#: ../mail/e-mail-reader.c:1639
 msgid "Next _Unread Message"
 msgstr "Neste _uleste melding"
 
-#: ../mail/e-mail-reader.c:1599
+#: ../mail/e-mail-reader.c:1641
 msgid "Display the next unread message"
 msgstr "Vis neste uleste melding"
 
-#: ../mail/e-mail-reader.c:1604
+#: ../mail/e-mail-reader.c:1646
 msgid "_Previous Message"
 msgstr "_Forrige melding"
 
-#: ../mail/e-mail-reader.c:1606
+#: ../mail/e-mail-reader.c:1648
 msgid "Display the previous message"
 msgstr "Vis forrige melding"
 
-#: ../mail/e-mail-reader.c:1611
+#: ../mail/e-mail-reader.c:1653
 msgid "Pr_evious Important Message"
 msgstr "Forrig_e viktige melding"
 
-#: ../mail/e-mail-reader.c:1613
+#: ../mail/e-mail-reader.c:1655
 msgid "Display the previous important message"
 msgstr "Vis forrige viktige melding"
 
-#: ../mail/e-mail-reader.c:1618
+#: ../mail/e-mail-reader.c:1660
 msgid "P_revious Unread Message"
 msgstr "Fo_rrige uleste melding"
 
-#: ../mail/e-mail-reader.c:1620
+#: ../mail/e-mail-reader.c:1662
 msgid "Display the previous unread message"
 msgstr "Vis forrige uleste melding"
 
-#: ../mail/e-mail-reader.c:1627
+#: ../mail/e-mail-reader.c:1669
 msgid "Print this message"
 msgstr "Skriv ut denne meldingen"
 
-#: ../mail/e-mail-reader.c:1634
+#: ../mail/e-mail-reader.c:1676
 msgid "Preview the message to be printed"
 msgstr "Forhåndsvis meldingen som skal skrives ut"
 
-#: ../mail/e-mail-reader.c:1639
+#: ../mail/e-mail-reader.c:1681
 msgid "Re_direct"
 msgstr "Om_diriger"
 
-#: ../mail/e-mail-reader.c:1641
+#: ../mail/e-mail-reader.c:1683
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Omdiriger (bounce) den valgte meldingen til noen"
 
-#: ../mail/e-mail-reader.c:1646 ../mail/mail.error.xml.h:91
+#: ../mail/e-mail-reader.c:1688 ../mail/mail.error.xml.h:91
 #: ../modules/calendar/e-cal-shell-view-actions.c:1459
 #: ../modules/mail/e-mail-attachment-handler.c:139
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: ../mail/e-mail-reader.c:1648
+#: ../mail/e-mail-reader.c:1690
 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:1653 ../mail/mail.error.xml.h:92
+#: ../mail/e-mail-reader.c:1695 ../mail/mail.error.xml.h:92
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: ../mail/e-mail-reader.c:1655
+#: ../mail/e-mail-reader.c:1697
 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:1660
+#: ../mail/e-mail-reader.c:1702
 #: ../modules/mail/e-mail-attachment-handler.c:146
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsender"
 
-#: ../mail/e-mail-reader.c:1662
+#: ../mail/e-mail-reader.c:1704
 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:1667
+#: ../mail/e-mail-reader.c:1709
 msgid "_Save as mbox..."
 msgstr "Lagre _som mbox..."
 
-#: ../mail/e-mail-reader.c:1669
+#: ../mail/e-mail-reader.c:1711
 msgid "Save selected messages as an mbox file"
 msgstr "Lagre valgte meldinger som en mbox-fil"
 
-#: ../mail/e-mail-reader.c:1674
+#: ../mail/e-mail-reader.c:1716
 msgid "Search Folder from Mailing _List..."
 msgstr "Søkemappe på e-post_liste..."
 
-#: ../mail/e-mail-reader.c:1676
+#: ../mail/e-mail-reader.c:1718
 msgid "Create a search folder for this mailing list"
 msgstr "Lag en søkemappe for denne e-postlisten"
 
-#: ../mail/e-mail-reader.c:1681
+#: ../mail/e-mail-reader.c:1723
 msgid "Search Folder from Recipien_ts..."
 msgstr "Søkemappe fra mo_ttakere..."
 
-#: ../mail/e-mail-reader.c:1683
+#: ../mail/e-mail-reader.c:1725
 msgid "Create a search folder for these recipients"
 msgstr "Lag en søkemappe for disse mottakerene"
 
-#: ../mail/e-mail-reader.c:1688
+#: ../mail/e-mail-reader.c:1730
 msgid "Search Folder from Sen_der..."
 msgstr "Søkemappe for avsen_der..."
 
-#: ../mail/e-mail-reader.c:1690
+#: ../mail/e-mail-reader.c:1732
 msgid "Create a search folder for this sender"
 msgstr "Lag en søkemappe for denne avsenderen"
 
-#: ../mail/e-mail-reader.c:1695
+#: ../mail/e-mail-reader.c:1737
 msgid "Search Folder from S_ubject..."
 msgstr "Søkemappe for _emne..."
 
-#: ../mail/e-mail-reader.c:1697
+#: ../mail/e-mail-reader.c:1739
 msgid "Create a search folder for this subject"
 msgstr "Lag en søkemappe for dette emnet"
 
-#: ../mail/e-mail-reader.c:1702
+#: ../mail/e-mail-reader.c:1744
 msgid "_Message Source"
 msgstr "_Meldingskilde"
 
-#: ../mail/e-mail-reader.c:1704
+#: ../mail/e-mail-reader.c:1746
 msgid "Show the raw email source of the message"
 msgstr "Vis e-post meldingen i sin råe form"
 
-#: ../mail/e-mail-reader.c:1716
+#: ../mail/e-mail-reader.c:1758
 msgid "_Undelete Message"
 msgstr "_Angre sletting av melding"
 
-#: ../mail/e-mail-reader.c:1718
+#: ../mail/e-mail-reader.c:1760
 msgid "Undelete the selected messages"
 msgstr "Angre sletting av valgte meldinger"
 
-#: ../mail/e-mail-reader.c:1723
+#: ../mail/e-mail-reader.c:1765
 msgid "_Normal Size"
 msgstr "_Normal størrelse"
 
-#: ../mail/e-mail-reader.c:1725
+#: ../mail/e-mail-reader.c:1767
 msgid "Reset the text to its original size"
 msgstr "Ta teksten tilbake til sin opprinnelige størrelse"
 
-#: ../mail/e-mail-reader.c:1730
+#: ../mail/e-mail-reader.c:1772
 msgid "_Zoom In"
 msgstr "_Zoom inn"
 
-#: ../mail/e-mail-reader.c:1732
+#: ../mail/e-mail-reader.c:1774
 msgid "Increase the text size"
 msgstr "Større tekst"
 
-#: ../mail/e-mail-reader.c:1737
+#: ../mail/e-mail-reader.c:1779
 msgid "Zoom _Out"
 msgstr "Zoom _ut"
 
-#: ../mail/e-mail-reader.c:1739
+#: ../mail/e-mail-reader.c:1781
 msgid "Decrease the text size"
 msgstr "Mindre skrift"
 
-#: ../mail/e-mail-reader.c:1746
+#: ../mail/e-mail-reader.c:1788
 msgid "Create R_ule"
 msgstr "Opprett _regel"
 
-#: ../mail/e-mail-reader.c:1753
+#: ../mail/e-mail-reader.c:1795
 msgid "Ch_aracter Encoding"
 msgstr "Tegn_koding"
 
-#: ../mail/e-mail-reader.c:1760
+#: ../mail/e-mail-reader.c:1802
 msgid "F_orward As"
 msgstr "Videresend s_om"
 
-#: ../mail/e-mail-reader.c:1767
+#: ../mail/e-mail-reader.c:1809
 msgid "_Group Reply"
 msgstr "_Gruppesvar"
 
-#: ../mail/e-mail-reader.c:1774
+#: ../mail/e-mail-reader.c:1816
 msgid "_Go To"
 msgstr "_Gå til"
 
-#: ../mail/e-mail-reader.c:1781
+#: ../mail/e-mail-reader.c:1823
 msgid "Mar_k As"
 msgstr "Mer_k som"
 
-#: ../mail/e-mail-reader.c:1788
+#: ../mail/e-mail-reader.c:1830
 msgid "_Message"
 msgstr "_Melding"
 
-#: ../mail/e-mail-reader.c:1795
+#: ../mail/e-mail-reader.c:1837
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../mail/e-mail-reader.c:1820
+#: ../mail/e-mail-reader.c:1862
 msgid "Mark for Follo_w Up..."
 msgstr "Merk for oppføl_ging..."
 
-#: ../mail/e-mail-reader.c:1828
+#: ../mail/e-mail-reader.c:1870
 msgid "Mark as _Important"
 msgstr "Merk som v_iktig"
 
-#: ../mail/e-mail-reader.c:1832
+#: ../mail/e-mail-reader.c:1874
 msgid "Mark as _Junk"
 msgstr "Merk som _uønsket e-post"
 
-#: ../mail/e-mail-reader.c:1836
+#: ../mail/e-mail-reader.c:1878
 msgid "Mark as _Not Junk"
 msgstr "Merk som _gyldig melding"
 
-#: ../mail/e-mail-reader.c:1840
+#: ../mail/e-mail-reader.c:1882
 msgid "Mar_k as Read"
 msgstr "Mer_k som lest"
 
-#: ../mail/e-mail-reader.c:1844
+#: ../mail/e-mail-reader.c:1886
 msgid "Mark as Uni_mportant"
 msgstr "_Merk som uviktig"
 
-#: ../mail/e-mail-reader.c:1848
+#: ../mail/e-mail-reader.c:1890
 msgid "Mark as _Unread"
 msgstr "Merk som _ulest"
 
-#: ../mail/e-mail-reader.c:1884
+#: ../mail/e-mail-reader.c:1926
 msgid "_Caret Mode"
 msgstr "Markør_modus"
 
-#: ../mail/e-mail-reader.c:1886
+#: ../mail/e-mail-reader.c:1928
 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:1892
+#: ../mail/e-mail-reader.c:1934
 msgid "All Message _Headers"
 msgstr "Alle meldings_hoder"
 
-#: ../mail/e-mail-reader.c:1894
+#: ../mail/e-mail-reader.c:1936
 msgid "Show messages with all email headers"
 msgstr "Vis meldinger med alle meldingshoder"
 
-#: ../mail/e-mail-reader.c:2115
+#: ../mail/e-mail-reader.c:2157
 msgid "Unable to retrieve message"
 msgstr "Kunne ikke hente ut melding"
 
-#: ../mail/e-mail-reader.c:2175 ../mail/mail-ops.c:1891
+#: ../mail/e-mail-reader.c:2217 ../mail/mail-ops.c:1891
 #, 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:2701 ../mail/mail-config.ui.h:31
+#: ../mail/e-mail-reader.c:2748 ../mail/mail-config.ui.h:31
 #: ../plugins/google-account-setup/google-source.c:303
 #: ../plugins/google-account-setup/google-source.c:537
 #: ../plugins/google-account-setup/google-source.c:659
@@ -9973,12 +9977,12 @@ msgstr "Henter melding «%s»"
 msgid "Default"
 msgstr "Forvalgt"
 
-#: ../mail/e-mail-reader.c:2841
+#: ../mail/e-mail-reader.c:2880
 #: ../modules/mail/e-mail-attachment-handler.c:132
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: ../mail/e-mail-reader.c:2842
+#: ../mail/e-mail-reader.c:2881
 msgid "Forward the selected message to someone"
 msgstr "Videresend den valgte meldingen til noen"
 
@@ -9987,32 +9991,32 @@ msgstr "Videresend den valgte meldingen til noen"
 #. (if possible and if that configuration option is enabled), or else
 #. it will reply to all. The word "Group" was chosen because it covers
 #. either of those, without too strongly implying one or the other.
-#: ../mail/e-mail-reader.c:2860
+#: ../mail/e-mail-reader.c:2899
 msgid "Group Reply"
 msgstr "Gruppesvar"
 
-#: ../mail/e-mail-reader.c:2861
+#: ../mail/e-mail-reader.c:2900
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Svar til e-postlisten eller til alle mottakere"
 
-#: ../mail/e-mail-reader.c:2906 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:2945 ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:743
 msgid "Delete"
 msgstr "Slett"
 
-#: ../mail/e-mail-reader.c:2918
+#: ../mail/e-mail-reader.c:2957
 #: ../modules/calendar/e-cal-shell-view-actions.c:1305
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "Neste"
 
-#: ../mail/e-mail-reader.c:2922
+#: ../mail/e-mail-reader.c:2961
 #: ../modules/calendar/e-cal-shell-view-actions.c:1298
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "Forrige"
 
-#: ../mail/e-mail-reader.c:2932 ../mail/mail-dialogs.ui.h:19
+#: ../mail/e-mail-reader.c:2971 ../mail/mail-dialogs.ui.h:19
 msgid "Reply"
 msgstr "Svar"
 
@@ -10118,7 +10122,7 @@ msgstr "Innkommende e-post"
 msgid "Please configure the following account settings."
 msgstr "Vennligst konfigurer følgende kontoinnstillinger."
 
-#: ../mail/em-account-editor.c:2104 ../mail/em-account-editor.c:2738
+#: ../mail/em-account-editor.c:2104 ../mail/em-account-editor.c:2740
 msgid "Sending Email"
 msgstr "Utgående e-post"
 
@@ -10168,21 +10172,21 @@ msgstr "Se etter _nye meldinger hver(t)"
 msgid "minu_tes"
 msgstr "minu_tter"
 
-#: ../mail/em-account-editor.c:2836
+#: ../mail/em-account-editor.c:2838
 msgid "Please select a folder from the current account."
 msgstr "Vennligst velg en mappe fra valgt konto."
 
-#: ../mail/em-account-editor.c:3106 ../mail/mail-config.ui.h:112
+#: ../mail/em-account-editor.c:3108 ../mail/mail-config.ui.h:112
 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:3151 ../mail/em-account-editor.c:3219
+#: ../mail/em-account-editor.c:3153 ../mail/em-account-editor.c:3221
 msgid "Receiving Options"
 msgstr "Alternativer for mottak"
 
-#: ../mail/em-account-editor.c:3152 ../mail/em-account-editor.c:3220
+#: ../mail/em-account-editor.c:3154 ../mail/em-account-editor.c:3222
 msgid "Checking for New Messages"
 msgstr "Ser etter nye meldinger"
 
@@ -10526,7 +10530,7 @@ msgstr "Mappe_navn:"
 #: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
 #: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:160
 #: ../mail/em-folder-tree-model.c:167 ../mail/em-folder-tree-model.c:169
-#: ../mail/mail-vfolder.c:1061 ../mail/mail-vfolder.c:1126
+#: ../mail/mail-vfolder.c:1064 ../mail/mail-vfolder.c:1129
 msgid "Search Folders"
 msgstr "Søkemapper"
 
@@ -10586,12 +10590,12 @@ msgstr "Flytter mappe %s"
 msgid "Copying folder %s"
 msgstr "Kopierer mappe %s"
 
-#: ../mail/em-folder-tree.c:1632 ../mail/message-list.c:2153
+#: ../mail/em-folder-tree.c:1632 ../mail/message-list.c:2164
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flytter meldinger til mappe %s"
 
-#: ../mail/em-folder-tree.c:1634 ../mail/message-list.c:2155
+#: ../mail/em-folder-tree.c:1634 ../mail/message-list.c:2166
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer meldinger til mappe %s"
@@ -10630,7 +10634,7 @@ msgstr "Spesifiser hvor mappen skal opprettes:"
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Fjerner abonnement på mappe «%s»"
 
-#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1571
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1576
 msgid "Unsigned"
 msgstr "Usignert"
 
@@ -10642,7 +10646,7 @@ msgstr ""
 "Denne meldingen er ikke signert. Du har ingen garanti for at meldingen er "
 "autentisk."
 
-#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1572
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1577
 msgid "Valid signature"
 msgstr "Gyldig signatur"
 
@@ -10654,7 +10658,7 @@ msgstr ""
 "Denne meldingen er signert og gyldig hvilket betyr denne meldingen høyst "
 "sannsynlig er autentisk."
 
-#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1573
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1578
 msgid "Invalid signature"
 msgstr "Ugyldig signatur"
 
@@ -10666,7 +10670,7 @@ msgstr ""
 "Signaturen for denne meldingen kan ikke verifiseres. Den kan være endret "
 "under overføring."
 
-#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1574
+#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1579
 msgid "Valid signature, but cannot verify sender"
 msgstr "Gyldig signatur, men kan ikke verifisere avsender"
 
@@ -10678,7 +10682,7 @@ msgstr ""
 "Denne meldingen er signert med en gyldig signatur, men avsender av meldingen "
 "kan ikke verifiseres."
 
-#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1575
+#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1580
 msgid "Signature exists, but need public key"
 msgstr "Signatur eksisterer, men trenger offentlig nøkkel"
 
@@ -10690,7 +10694,7 @@ msgstr ""
 "Denne meldingen er signert med en gyldig signatur, men det finnes ingen "
 "tilhørende offentlig nøkkel."
 
-#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1581
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1586
 msgid "Unencrypted"
 msgstr "Ukryptert"
 
@@ -10702,7 +10706,7 @@ msgstr ""
 "Denne meldingen er ikke kryptert. Innholdet kan vises under overføring over "
 "Internett."
 
-#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1582
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1587
 msgid "Encrypted, weak"
 msgstr "Kryptert, svak"
 
@@ -10716,7 +10720,7 @@ msgstr ""
 "vanskelig, men ikke umulig for en utenforstående å se innholdet i denne "
 "meldingen på noenlunde kort tid."
 
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1583
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1588
 msgid "Encrypted"
 msgstr "Kryptert"
 
@@ -10728,7 +10732,7 @@ 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:104 ../mail/em-format-html.c:1584
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1589
 msgid "Encrypted, strong"
 msgstr "Kryptert, sterk"
 
@@ -10787,55 +10791,55 @@ msgstr "Å_pne med"
 msgid "Page %d of %d"
 msgstr "Side %d av %d"
 
-#: ../mail/em-format-html.c:151
+#: ../mail/em-format-html.c:153
 msgid "Formatting message"
 msgstr "Formatterer melding"
 
-#: ../mail/em-format-html.c:347
+#: ../mail/em-format-html.c:352
 msgid "Formatting Message..."
 msgstr "Formatterer melding..."
 
-#: ../mail/em-format-html.c:1416 ../mail/em-format-html.c:1425
+#: ../mail/em-format-html.c:1421 ../mail/em-format-html.c:1430
 #, c-format
 msgid "Retrieving '%s'"
 msgstr "Henter «%s»"
 
-#: ../mail/em-format-html.c:1896
+#: ../mail/em-format-html.c:1901
 msgid "Unknown external-body part."
 msgstr "Ukjent del av ekstern kropp."
 
-#: ../mail/em-format-html.c:1904
+#: ../mail/em-format-html.c:1909
 msgid "Malformed external-body part."
 msgstr "Feilutformet del for ekstern kropp."
 
-#: ../mail/em-format-html.c:1934
+#: ../mail/em-format-html.c:1939
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peker til FTP-tjener (%s)"
 
-#: ../mail/em-format-html.c:1945
+#: ../mail/em-format-html.c:1950
 #, 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:1947
+#: ../mail/em-format-html.c:1952
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peker til lokal fil (%s)"
 
-#: ../mail/em-format-html.c:1968
+#: ../mail/em-format-html.c:1973
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Peker til eksterne data (%s)"
 
-#: ../mail/em-format-html.c:1979
+#: ../mail/em-format-html.c:1984
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peker til ukjente eksterne data («%s»-type)"
 
 #. 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:2642
+#: ../mail/em-format-html.c:2647
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "Denne meldingen ble sendt av %s på vegne av %s"
@@ -12023,7 +12027,7 @@ msgid "Importing Elm data"
 msgstr "Importerer data fra Elm"
 
 #: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:400
-#: ../modules/mail/e-mail-shell-view.c:952
+#: ../modules/mail/e-mail-shell-view.c:951
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
 #: ../widgets/misc/e-send-options.c:499
 msgid "Mail"
@@ -13184,13 +13188,13 @@ msgstr "Skriv inn passord"
 msgid "User canceled operation."
 msgstr "Operasjon avbrutt av bruker."
 
-#: ../mail/mail-session.c:723
+#: ../mail/mail-session.c:724
 #, 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/mail-session.c:732
+#: ../mail/mail-session.c:733
 #, 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."
@@ -13255,11 +13259,11 @@ msgstr[1] ""
 "%s ble oppdatert fordi de brukte en mappe som ble fjernet\n"
 "«%s»."
 
-#: ../mail/mail-vfolder.c:1179
+#: ../mail/mail-vfolder.c:1182
 msgid "Edit Search Folder"
 msgstr "Rediger søkemappe"
 
-#: ../mail/mail-vfolder.c:1284
+#: ../mail/mail-vfolder.c:1287
 msgid "New Search Folder"
 msgstr "Ny søkemappe"
 
@@ -13808,20 +13812,27 @@ 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 "
 "you sure you want to proceed?"
-msgstr "Du svarer privat på en melding som kom via en e-postliste, men listen prøver å omdirigere ditt svar tilbake til listen. Er du sikker på at du vil fortsette?"
+msgstr ""
+"Du svarer privat på en melding som kom via en e-postliste, men listen prøver "
+"å omdirigere ditt svar tilbake til listen. Er du sikker på at du vil "
+"fortsette?"
 
 #: ../mail/mail.error.xml.h:123
 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 "
 "proceed?"
-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?"
+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:124
 msgid ""
 "You are replying to a message which was sent to many recipients. Are you "
 "sure you want to reply to ALL of them?"
-msgstr "Du svarer på en melding som ble sendt til mange mottakere. Er du sikker på at du vil svare til ALLE mottakerene?"
+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:125
 msgid "You do not have sufficient permissions to delete this mail."
@@ -13896,82 +13907,82 @@ msgstr "_Send kvittering"
 msgid "_Synchronize"
 msgstr "_Synkroniser"
 
-#: ../mail/message-list.c:1159
+#: ../mail/message-list.c:1170
 msgid "Unseen"
 msgstr "Ulest"
 
-#: ../mail/message-list.c:1160
+#: ../mail/message-list.c:1171
 msgid "Seen"
 msgstr "Lest"
 
-#: ../mail/message-list.c:1161
+#: ../mail/message-list.c:1172
 msgid "Answered"
 msgstr "Besvart"
 
-#: ../mail/message-list.c:1162
+#: ../mail/message-list.c:1173
 msgid "Forwarded"
 msgstr "Videresendt"
 
-#: ../mail/message-list.c:1163
+#: ../mail/message-list.c:1174
 msgid "Multiple Unseen Messages"
 msgstr "Flere uleste meldinger"
 
-#: ../mail/message-list.c:1164
+#: ../mail/message-list.c:1175
 msgid "Multiple Messages"
 msgstr "Flere meldinger"
 
-#: ../mail/message-list.c:1168
+#: ../mail/message-list.c:1179
 msgid "Lowest"
 msgstr "Lavest"
 
-#: ../mail/message-list.c:1169
+#: ../mail/message-list.c:1180
 msgid "Lower"
 msgstr "Lavere"
 
-#: ../mail/message-list.c:1173
+#: ../mail/message-list.c:1184
 msgid "Higher"
 msgstr "Høyere"
 
-#: ../mail/message-list.c:1174
+#: ../mail/message-list.c:1185
 msgid "Highest"
 msgstr "Høyest"
 
-#: ../mail/message-list.c:1784 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1795 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1791 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1802 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "I dag %l:%M %p"
 
-#: ../mail/message-list.c:1800
+#: ../mail/message-list.c:1811
 msgid "Yesterday %l:%M %p"
 msgstr "I går %l:%M %p"
 
-#: ../mail/message-list.c:1812
+#: ../mail/message-list.c:1823
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: ../mail/message-list.c:1820
+#: ../mail/message-list.c:1831
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H.%M"
 
-#: ../mail/message-list.c:1822
+#: ../mail/message-list.c:1833
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2582
+#: ../mail/message-list.c:2598
 msgid "Select all visible messages"
 msgstr "Velg alle synlige meldinger"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4329 ../mail/message-list.c:4721
+#: ../mail/message-list.c:4402 ../mail/message-list.c:4809
 msgid "Generating message list"
 msgstr "Genererer meldingsliste"
 
-#: ../mail/message-list.c:4560
+#: ../mail/message-list.c:4633
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -13979,7 +13990,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:4562
+#: ../mail/message-list.c:4635
 msgid "There are no messages in this folder."
 msgstr "Det er ingen meldinger i denne mappen."
 
@@ -14263,7 +14274,7 @@ msgstr "Opprett en ny adressebok"
 
 #. Create the contacts group
 #: ../modules/addressbook/e-book-shell-backend.c:303
-#: ../modules/addressbook/e-book-shell-view.c:398
+#: ../modules/addressbook/e-book-shell-view.c:401
 #: ../modules/calendar/e-cal-shell-backend.c:104
 #: ../modules/calendar/e-cal-shell-migrate.c:57
 msgid "Contacts"
@@ -14494,23 +14505,23 @@ msgstr "Skriv ut valgte kontakter"
 msgid "Save selected contacts as a vCard"
 msgstr "Lagre valgte kontakter som et vCard"
 
-#: ../modules/addressbook/e-book-shell-view.c:342
+#: ../modules/addressbook/e-book-shell-view.c:345
 msgid "_Forward Contacts"
 msgstr "_Videresend kontakter"
 
-#: ../modules/addressbook/e-book-shell-view.c:344
+#: ../modules/addressbook/e-book-shell-view.c:347
 msgid "_Forward Contact"
 msgstr "_Videresend kontakt"
 
-#: ../modules/addressbook/e-book-shell-view.c:375
+#: ../modules/addressbook/e-book-shell-view.c:378
 msgid "_Send Message to Contacts"
 msgstr "_Send melding til kontakter"
 
-#: ../modules/addressbook/e-book-shell-view.c:377
+#: ../modules/addressbook/e-book-shell-view.c:380
 msgid "_Send Message to List"
 msgstr "_Send melding til liste"
 
-#: ../modules/addressbook/e-book-shell-view.c:379
+#: ../modules/addressbook/e-book-shell-view.c:382
 msgid "_Send Message to Contact"
 msgstr "_Send melding til kontakt"
 
@@ -15466,7 +15477,7 @@ msgid "Network Preferences"
 msgstr "Brukervalg for nettverk"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:820
-#: ../modules/mail/e-mail-shell-view.c:871
+#: ../modules/mail/e-mail-shell-view.c:870
 msgid "_Disable Account"
 msgstr "_Deaktiver konto"
 
@@ -15731,57 +15742,57 @@ msgstr "Denne kontoen"
 msgid "Current Folder"
 msgstr "Denne mappen"
 
-#: ../modules/mail/e-mail-shell-view-private.c:887
+#: ../modules/mail/e-mail-shell-view-private.c:936
 #, 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:898
+#: ../modules/mail/e-mail-shell-view-private.c:947
 #, 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:904
-#: ../modules/mail/e-mail-shell-view-private.c:911
+#: ../modules/mail/e-mail-shell-view-private.c:953
+#: ../modules/mail/e-mail-shell-view-private.c:960
 #, 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:917
+#: ../modules/mail/e-mail-shell-view-private.c:966
 #, 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:923
+#: ../modules/mail/e-mail-shell-view-private.c:972
 #, 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:929
+#: ../modules/mail/e-mail-shell-view-private.c:978
 #, 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:941
+#: ../modules/mail/e-mail-shell-view-private.c:990
 #, 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:944
+#: ../modules/mail/e-mail-shell-view-private.c:993
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -15796,7 +15807,7 @@ msgstr "Søk i alle konti"
 msgid "Account Search"
 msgstr "Søk i konto"
 
-#: ../modules/mail/e-mail-shell-view.c:869
+#: ../modules/mail/e-mail-shell-view.c:868
 msgid "Proxy _Logout"
 msgstr "_Logg ut proxy"
 
@@ -15913,12 +15924,12 @@ msgid "Test Plugin for Python EPlugin loader."
 msgstr "Testtillegg for Python EPlugin laster."
 
 #: ../modules/startup-wizard/evolution-startup-wizard.c:270
-#: ../widgets/misc/e-import-assistant.c:389
+#: ../widgets/misc/e-import-assistant.c:393
 msgid "Please select the information that you would like to import:"
 msgstr "Vennligst velg informasjon du ønsker å importere:"
 
 #: ../modules/startup-wizard/evolution-startup-wizard.c:302
-#: ../widgets/misc/e-import-assistant.c:545
+#: ../widgets/misc/e-import-assistant.c:549
 #, c-format
 msgid "From %s:"
 msgstr "Fra %s:"
@@ -16196,46 +16207,42 @@ msgstr ""
 "Er du sikker på at du vil gjenopprette Evolution fra valgt sikkerhetskopi?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
-msgid ""
-"Evolution backup can start only when Evolution is not running. Please make "
-"sure that you save and close all your unsaved windows before proceeding.  If "
-"you want Evolution to restart automatically after backup, please enable the "
-"toggle button."
-msgstr ""
-"Evolution sikkerhetskopiering kan kun startes når Evolution ikke kjører. "
-"Vennligst forsikre deg om at du lagrer og lukker alle vinduer før du "
-"fortsetter. Hvis du vil at Evolution skal starte på nytt automatisk etter "
-"sikkerhetskopiering kan du velge dette."
+msgid "Close and Backup Evolution"
+msgstr "Lukk og ta sikkerhetskopi av Evolution"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+msgid "Close and Restore Evolution"
+msgstr "Lukk og gjenopprett Evolution"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Insufficient Permissions"
 msgstr "Ikke tilstrekkelige rettigheter"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid "Invalid Evolution backup file"
 msgstr "Ugyldig sikkerhetskopi for Evolution"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
 msgid "Please select a valid backup file to restore."
 msgstr "Velg en gyldig sikkerhetskopi for gjenoppretting."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid "The selected folder is not writable."
 msgstr "Valgt mappe er ikke skrivbar."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
+msgid ""
+"To backup your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding."
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
 msgid ""
-"This will delete all your current Evolution data and settings and restore "
-"them from your backup. Evolution restore can start only when Evolution is "
-"not running. Please make sure that you close all your unsaved windows before "
-"you proceed. If you want Evolution to restart automatically restart after "
-"restore, please enable the toggle button."
+"To restore your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding. This will delete "
+"all your current Evolution data and settings and restore them from your "
+"backup."
 msgstr ""
-"Dette vil slette alle data og innstillinger fra Evolution og gjenopprette "
-"dem fra din sikkerhetskopi. Gjenoppretting av Evolution kan kun startes når "
-"Evolution ikke kjører. Vennligst sjekk at du har lukket alle vinduer med "
-"ikke-lagrede data før du fortsetter. Hvis du ønsker at Evolution skal starte "
-"automatisk etter gjenoppretting kan du velge det her."
 
 #: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
@@ -18162,15 +18169,15 @@ msgstr "Om ikonet skal blinke eller ikke."
 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:355
+#: ../plugins/mail-notification/mail-notification.c:369
 msgid "Evolution's Mail Notification"
 msgstr "Varsling om ny e-post for Evolution"
 
-#: ../plugins/mail-notification/mail-notification.c:377
+#: ../plugins/mail-notification/mail-notification.c:391
 msgid "Mail Notification Properties"
 msgstr "Egenskaper for varsling om ny e-post"
 
-#: ../plugins/mail-notification/mail-notification.c:513
+#: ../plugins/mail-notification/mail-notification.c:527
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18187,67 +18194,67 @@ msgstr[1] ""
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user@example.com"
-#: ../plugins/mail-notification/mail-notification.c:525
+#: ../plugins/mail-notification/mail-notification.c:539
 #, 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:538
+#: ../plugins/mail-notification/mail-notification.c:552
 #, c-format
 msgid "Subject: %s"
 msgstr "Emne: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:548
+#: ../plugins/mail-notification/mail-notification.c:562
 #, 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:570
-#: ../plugins/mail-notification/mail-notification.c:577
+#: ../plugins/mail-notification/mail-notification.c:584
+#: ../plugins/mail-notification/mail-notification.c:591
 msgid "New email"
 msgstr "Ny e-post"
 
-#: ../plugins/mail-notification/mail-notification.c:638
+#: ../plugins/mail-notification/mail-notification.c:652
 msgid "Show icon in _notification area"
 msgstr "Vis ikon i varslingsområdet"
 
-#: ../plugins/mail-notification/mail-notification.c:666
+#: ../plugins/mail-notification/mail-notification.c:680
 msgid "B_link icon in notification area"
 msgstr "B_linkende ikon i varslingsområdet"
 
-#: ../plugins/mail-notification/mail-notification.c:676
+#: ../plugins/mail-notification/mail-notification.c:690
 msgid "Popup _message together with the icon"
 msgstr "Vis _melding sammen med ikonet"
 
-#: ../plugins/mail-notification/mail-notification.c:863
+#: ../plugins/mail-notification/mail-notification.c:877
 msgid "_Play sound when new messages arrive"
 msgstr "S_pill en lydfil når nye meldinger ankommer"
 
-#: ../plugins/mail-notification/mail-notification.c:892
+#: ../plugins/mail-notification/mail-notification.c:906
 msgid "_Beep"
 msgstr "_Pip"
 
-#: ../plugins/mail-notification/mail-notification.c:905
+#: ../plugins/mail-notification/mail-notification.c:919
 msgid "Use sound _theme"
 msgstr "Bruk lyd_tema"
 
-#: ../plugins/mail-notification/mail-notification.c:924
+#: ../plugins/mail-notification/mail-notification.c:938
 msgid "Play _file:"
 msgstr "Spill av lyd_fil:"
 
-#: ../plugins/mail-notification/mail-notification.c:935
+#: ../plugins/mail-notification/mail-notification.c:949
 msgid "Select sound file"
 msgstr "Velg en lydfil"
 
-#: ../plugins/mail-notification/mail-notification.c:993
+#: ../plugins/mail-notification/mail-notification.c:1007
 msgid "Notify new messages for _Inbox only"
 msgstr "Varslingsmelding kun for _innboks"
 
-#: ../plugins/mail-notification/mail-notification.c:1002
+#: ../plugins/mail-notification/mail-notification.c:1016
 msgid "Generate a _D-Bus message"
 msgstr "Genererer en _D-Bus-melding"
 
@@ -18335,8 +18342,12 @@ msgid ""
 msgid_plural ""
 "Selected calendar contains events for the given mails already. Would you "
 "like to create new events anyway?"
-msgstr[0] "Valgt kalender inneholder en hendelse for gitt melding allerede. Vil du lage en ny hendelse likevel?"
-msgstr[1] "Valgt kalender inneholder hendelser for gitte meldinger allerede. Vil du lage nye hendelser likevel?"
+msgstr[0] ""
+"Valgt kalender inneholder en hendelse for gitt melding allerede. Vil du lage "
+"en ny hendelse likevel?"
+msgstr[1] ""
+"Valgt kalender inneholder hendelser for gitte meldinger allerede. Vil du "
+"lage nye hendelser likevel?"
 
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
@@ -18348,8 +18359,12 @@ msgid ""
 msgid_plural ""
 "Selected task list contains tasks for the given mails already. Would you "
 "like to create new tasks anyway?"
-msgstr[0] "Valgt oppgaveliste inneholder en oppgave for gitt melding allerede. Vil du lage en ny oppgave likevel?"
-msgstr[1] "Valgt oppgaveliste inneholder oppgaver for gitte meldinger allerede. Vil du lage nye oppgaver likevel?"
+msgstr[0] ""
+"Valgt oppgaveliste inneholder en oppgave for gitt melding allerede. Vil du "
+"lage en ny oppgave likevel?"
+msgstr[1] ""
+"Valgt oppgaveliste inneholder oppgaver for gitte meldinger allerede. Vil du "
+"lage nye oppgaver likevel?"
 
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
@@ -18361,8 +18376,12 @@ msgid ""
 msgid_plural ""
 "Selected memo list contains memos for the given mails already. Would you "
 "like to create new memos anyway?"
-msgstr[0] "Valgt notatliste inneholder et notat for gitt melding allerede. Vil du lage et nytt notat likevel?"
-msgstr[1] "Valgt notatliste inneholder notater for gitte meldinger allerede. Vil du lage nye notater likevel?"
+msgstr[0] ""
+"Valgt notatliste inneholder et notat for gitt melding allerede. Vil du lage "
+"et nytt notat likevel?"
+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
 msgid "[No Summary]"
@@ -19354,7 +19373,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:326
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:331
 msgid "Start in offline mode"
 msgstr "Start i frakoblet modus"
 
@@ -19852,7 +19871,7 @@ msgid "Preparing to quit..."
 msgstr "Forbereder avslutting..."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:175
+#: ../shell/main.c:180
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19887,7 +19906,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:199
+#: ../shell/main.c:204
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19895,55 +19914,55 @@ msgstr ""
 "Takk\n"
 "Evolution utviklerene\n"
 
-#: ../shell/main.c:206
+#: ../shell/main.c:211
 msgid "Do not tell me again"
 msgstr "Ikke gi beskjed igjen"
 
-#: ../shell/main.c:322
+#: ../shell/main.c:327
 msgid "Start Evolution activating the specified component"
 msgstr "Aktiver oppgitt komponent ved oppstart av Evolution"
 
-#: ../shell/main.c:324
+#: ../shell/main.c:329
 msgid "Apply the given geometry to the main window"
 msgstr "Bruk oppgitt geometri på hovedvinduet"
 
-#: ../shell/main.c:328
+#: ../shell/main.c:333
 msgid "Start in online mode"
 msgstr "Start i tilkoblet modus"
 
-#: ../shell/main.c:330
+#: ../shell/main.c:335
 msgid "Start in \"express\" mode"
 msgstr "Start i «ekspress»-modus"
 
-#: ../shell/main.c:333
+#: ../shell/main.c:338
 msgid "Forcibly shut down Evolution"
 msgstr "Tvungen nedstenging av Evolution"
 
-#: ../shell/main.c:336
+#: ../shell/main.c:341
 msgid "Send the debugging output of all components to a file."
 msgstr "Send feilsøkingsutskrift for alle komponentene til en fil."
 
-#: ../shell/main.c:338
+#: ../shell/main.c:343
 msgid "Disable loading of any plugins."
 msgstr "Slå av lasting av tillegg."
 
-#: ../shell/main.c:340
+#: ../shell/main.c:345
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Deaktiver forhåndsvisningsområdet for e-post, kontakter og oppgaver."
 
-#: ../shell/main.c:344
+#: ../shell/main.c:349
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "Importer URIer eller filnavn gitt som argumenter."
 
-#: ../shell/main.c:346
+#: ../shell/main.c:351
 msgid "Request a running Evolution process to quit"
 msgstr "Be en kjørende Evolution-prosess om å stenge ned"
 
-#: ../shell/main.c:469
+#: ../shell/main.c:475 ../shell/main.c:483
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution personlig informasjonshåndterer og e-postklient"
 
-#: ../shell/main.c:531
+#: ../shell/main.c:546
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20975,7 +20994,7 @@ msgstr "Ugyldig datoverdi"
 msgid "Invalid Time Value"
 msgstr "Ugyldig verdi for tid"
 
-#: ../widgets/misc/e-import-assistant.c:242
+#: ../widgets/misc/e-import-assistant.c:246
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
@@ -20983,37 +21002,37 @@ msgstr ""
 "Velg filen du ønsker å importere til Evolution og velg hvilken type fil det "
 "er fra listen."
 
-#: ../widgets/misc/e-import-assistant.c:259
+#: ../widgets/misc/e-import-assistant.c:263
 msgid "F_ilename:"
 msgstr "F_ilnavn:"
 
-#: ../widgets/misc/e-import-assistant.c:269
+#: ../widgets/misc/e-import-assistant.c:273
 msgid "Select a file"
 msgstr "Velg en fil"
 
-#: ../widgets/misc/e-import-assistant.c:283
-#: ../widgets/misc/e-import-assistant.c:458
+#: ../widgets/misc/e-import-assistant.c:287
+#: ../widgets/misc/e-import-assistant.c:462
 msgid "File _type:"
 msgstr "Fil_type:"
 
-#: ../widgets/misc/e-import-assistant.c:326
-#: ../widgets/misc/e-import-assistant.c:909
+#: ../widgets/misc/e-import-assistant.c:330
+#: ../widgets/misc/e-import-assistant.c:913
 msgid "Choose the destination for this import"
 msgstr "Velg mål det skal importeres til"
 
-#: ../widgets/misc/e-import-assistant.c:351
+#: ../widgets/misc/e-import-assistant.c:355
 msgid "Choose the type of importer to run:"
 msgstr "Velg type importerer som skal kjøres:"
 
-#: ../widgets/misc/e-import-assistant.c:359
+#: ../widgets/misc/e-import-assistant.c:363
 msgid "Import data and settings from _older programs"
 msgstr "Importer data og innstillinger fra _eldre programmer"
 
-#: ../widgets/misc/e-import-assistant.c:367
+#: ../widgets/misc/e-import-assistant.c:371
 msgid "Import a _single file"
 msgstr "Importer en en_kelt fil"
 
-#: ../widgets/misc/e-import-assistant.c:519
+#: ../widgets/misc/e-import-assistant.c:523
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
@@ -21024,37 +21043,37 @@ msgstr ""
 "Hvis du vil prøve igjen kan du klikke på «Tilbake»-knappen."
 
 #. Install a custom "Cancel Import" button.
-#: ../widgets/misc/e-import-assistant.c:766
+#: ../widgets/misc/e-import-assistant.c:770
 msgid "_Cancel Import"
 msgstr "A_vbryt import"
 
-#: ../widgets/misc/e-import-assistant.c:908
+#: ../widgets/misc/e-import-assistant.c:912
 msgid "Preview data to be imported"
 msgstr "Forhåndsvis data som skal importeres"
 
-#: ../widgets/misc/e-import-assistant.c:914
-#: ../widgets/misc/e-import-assistant.c:927
-#: ../widgets/misc/e-import-assistant.c:1276
-#: ../widgets/misc/e-import-assistant.c:1342
-#: ../widgets/misc/e-import-assistant.c:1351
+#: ../widgets/misc/e-import-assistant.c:918
+#: ../widgets/misc/e-import-assistant.c:931
+#: ../widgets/misc/e-import-assistant.c:1281
+#: ../widgets/misc/e-import-assistant.c:1347
+#: ../widgets/misc/e-import-assistant.c:1356
 msgid "Import Data"
 msgstr "Importer data"
 
-#: ../widgets/misc/e-import-assistant.c:922
+#: ../widgets/misc/e-import-assistant.c:926
 msgid "Select what type of file you want to import from the list."
 msgstr "Velg hvilken type fil du vil importere fra listen."
 
-#: ../widgets/misc/e-import-assistant.c:1268
-#: ../widgets/misc/e-import-assistant.c:1300
+#: ../widgets/misc/e-import-assistant.c:1271
+#: ../widgets/misc/e-import-assistant.c:1305
 msgid "Evolution Import Assistant"
 msgstr "Importeringsassistent for Evolution"
 
-#: ../widgets/misc/e-import-assistant.c:1283
-#: ../widgets/misc/e-import-assistant.c:1330
+#: ../widgets/misc/e-import-assistant.c:1288
+#: ../widgets/misc/e-import-assistant.c:1335
 msgid "Import Location"
 msgstr "Importer lokasjon"
 
-#: ../widgets/misc/e-import-assistant.c:1294
+#: ../widgets/misc/e-import-assistant.c:1299
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -21064,19 +21083,19 @@ msgstr ""
 "Gjennom denne veiviseren vil du ledes gjennom import av eksterne filer til "
 "Evolution."
 
-#: ../widgets/misc/e-import-assistant.c:1308
+#: ../widgets/misc/e-import-assistant.c:1313
 msgid "Importer Type"
 msgstr "Type import"
 
-#: ../widgets/misc/e-import-assistant.c:1316
+#: ../widgets/misc/e-import-assistant.c:1321
 msgid "Select Information to Import"
 msgstr "Velg informasjon som skal importeres"
 
-#: ../widgets/misc/e-import-assistant.c:1323
+#: ../widgets/misc/e-import-assistant.c:1328
 msgid "Select a File"
 msgstr "Velg en fil"
 
-#: ../widgets/misc/e-import-assistant.c:1337
+#: ../widgets/misc/e-import-assistant.c:1342
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "Klikk på «Bruk» for å starte import av filen til Evolution."