[evolution/gnome-3-22] Updated Norwegian bokmål translation.



commit 0859cde61c259d89a3de0749c80c4b34b8854fc7
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Sat Oct 15 12:10:45 2016 +0200

    Updated Norwegian bokmål translation.

 po/nb.po | 3361 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 1704 insertions(+), 1657 deletions(-)
---
diff --git a/po/nb.po b/po/nb.po
index ab5ae0d..1a6b0c9 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,10 +7,10 @@
 #: ../shell/main.c:522
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 3.21.x\n"
+"Project-Id-Version: evolution 3.22.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-14 19:48+0200\n"
-"PO-Revision-Date: 2016-07-14 19:53+0200\n"
+"POT-Creation-Date: 2016-10-15 12:01+0200\n"
+"PO-Revision-Date: 2016-10-15 12:10+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb lister ping uio no>\n"
 "Language: nb\n"
@@ -84,7 +84,7 @@ msgid "This address book will be removed permanently."
 msgstr "Denne adresseboken vil bli slettet for godt."
 
 #: ../addressbook/addressbook.error.xml.h:13 ../calendar/calendar.error.xml.h:7
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:69
 msgid "Do _Not Delete"
 msgstr "Ikke s_lett"
 
@@ -189,15 +189,15 @@ msgstr ""
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
 #: ../addressbook/gui/widgets/eab-contact-merging.c:723
 #: ../calendar/gui/e-comp-editor-page-general.c:1357
-#: ../e-util/e-mail-signature-manager.c:327
+#: ../e-util/e-mail-signature-manager.c:328
 #: ../e-util/e-name-selector-dialog.c:995 ../e-util/filter.ui.h:16
 #: ../mail/e-mail-account-manager.c:718 ../mail/e-mail-label-manager.c:373
 #: ../mail/em-vfolder-editor-rule.c:396 ../mail/em-vfolder-editor-rule.c:625
-#: ../mail/mail-config.ui.h:58 ../modules/mail/em-composer-prefs.c:417
+#: ../mail/mail-config.ui.h:58 ../modules/mail/em-composer-prefs.c:416
 #: ../plugins/attachment-reminder/attachment-reminder.c:457
 #: ../plugins/email-custom-header/email-custom-header.c:839
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
-#: ../plugins/templates/templates.c:470
+#: ../plugins/templates/templates.c:465
 msgid "_Add"
 msgstr "_Legg til"
 
@@ -333,8 +333,8 @@ msgid "_Home Page:"
 msgstr "_Hjemmeside:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
-#: ../calendar/gui/e-comp-editor-event.c:683
-#: ../modules/itip-formatter/itip-view.c:1905
+#: ../calendar/gui/e-comp-editor-event.c:729
+#: ../modules/itip-formatter/itip-view.c:2033
 msgid "_Calendar:"
 msgstr "_Kalender:"
 
@@ -513,8 +513,8 @@ msgstr "Legg til _X.509"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:54
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10
 #: ../calendar/gui/e-comp-editor-page-general.c:1373
-#: ../e-util/e-attachment-view.c:475 ../e-util/e-filter-rule.c:225
-#: ../e-util/e-mail-signature-manager.c:367
+#: ../e-util/e-attachment-view.c:357 ../e-util/e-filter-rule.c:225
+#: ../e-util/e-mail-signature-manager.c:368
 #: ../e-util/e-name-selector-dialog.c:999 ../e-util/filter.error.xml.h:18
 #: ../e-util/filter.ui.h:18 ../mail/e-mail-label-manager.c:391
 #: ../mail/em-filter-rule.c:440 ../mail/em-vfolder-editor-rule.c:630
@@ -523,7 +523,7 @@ msgstr "Legg til _X.509"
 #: ../plugins/email-custom-header/email-custom-header.c:849
 #: ../plugins/publish-calendar/publish-calendar.c:791
 #: ../plugins/publish-calendar/publish-calendar.ui.h:34
-#: ../plugins/templates/templates.c:480
+#: ../plugins/templates/templates.c:475
 msgid "_Remove"
 msgstr "Fje_rn"
 
@@ -539,10 +539,10 @@ msgstr "_Last X.509"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3507
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:18
 #: ../addressbook/gui/widgets/eab-contact-merging.c:721
-#: ../calendar/calendar.error.xml.h:47 ../calendar/gui/e-comp-editor.c:2106
-#: ../composer/e-composer-actions.c:215 ../composer/e-composer-actions.c:355
-#: ../e-util/e-attachment-store.c:641
-#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3334
+#: ../calendar/calendar.error.xml.h:47 ../calendar/gui/e-comp-editor.c:2107
+#: ../composer/e-composer-actions.c:230 ../composer/e-composer-actions.c:347
+#: ../e-util/e-attachment-store.c:831
+#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3906
 #: ../e-util/gal-view-instance-save-as-dialog.c:270
 #: ../shell/e-shell-content.c:660 ../shell/e-shell-utils.c:137
 #: ../smime/gui/certificate-manager.c:668
@@ -556,7 +556,7 @@ msgid "Certificates"
 msgstr "Sertifikater"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:59
-#: ../calendar/gui/e-comp-editor.c:2003 ../calendar/gui/e-comp-editor.c:2075
+#: ../calendar/gui/e-comp-editor.c:2004 ../calendar/gui/e-comp-editor.c:2076
 #: ../e-util/e-preferences-window.c:382 ../e-util/e-send-options.ui.h:41
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
 #: ../shell/e-shell.c:1224 ../shell/e-shell-window-actions.c:955
@@ -585,13 +585,13 @@ msgstr "Alternativer"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1365
 #: ../calendar/gui/e-cal-dialogs.c:689
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:303
-#: ../composer/e-composer-actions.c:214 ../e-util/e-activity-bar.c:359
-#: ../e-util/e-attachment-dialog.c:311 ../e-util/e-attachment-store.c:496
-#: ../e-util/e-attachment-store.c:640 ../e-util/e-attachment-view.c:421
+#: ../composer/e-composer-actions.c:229 ../e-util/e-activity-bar.c:359
+#: ../e-util/e-attachment-dialog.c:311 ../e-util/e-attachment-store.c:666
+#: ../e-util/e-attachment-store.c:830 ../e-util/e-attachment-view.c:303
 #: ../e-util/e-categories-dialog.c:82 ../e-util/e-category-editor.c:138
 #: ../e-util/e-category-editor.c:208 ../e-util/e-charset-combo-box.c:101
 #: ../e-util/e-color-chooser-widget.c:127 ../e-util/e-filter-datespec.c:291
-#: ../e-util/e-html-editor-actions.c:589 ../e-util/e-html-editor-actions.c:684
+#: ../e-util/e-html-editor-actions.c:323 ../e-util/e-html-editor-actions.c:414
 #: ../e-util/e-image-chooser-dialog.c:171
 #: ../e-util/e-mail-signature-script-dialog.c:365 ../e-util/e-passwords.c:470
 #: ../e-util/e-rule-context.c:815 ../e-util/e-rule-editor.c:180
@@ -599,7 +599,7 @@ msgstr "Alternativer"
 #: ../e-util/e-send-options.ui.h:42 ../e-util/e-source-config-dialog.c:379
 #: ../e-util/e-source-selector-dialog.c:372 ../e-util/e-table-config.c:548
 #: ../e-util/e-table-config.ui.h:1 ../e-util/e-timezone-dialog.ui.h:2
-#: ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3333
+#: ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3905
 #: ../e-util/gal-view-instance-save-as-dialog.c:269
 #: ../mail/e-mail-config-window.c:330 ../mail/e-mail-label-dialog.c:196
 #: ../mail/e-mail-tag-editor.c:242 ../mail/em-folder-selector.c:317
@@ -667,22 +667,22 @@ msgid "Show Certificates"
 msgstr "Vis sertifikater"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:262
-#: ../calendar/gui/e-comp-editor.c:2038 ../e-util/e-html-editor-actions.c:1108
+#: ../calendar/gui/e-comp-editor.c:2039 ../e-util/e-html-editor-actions.c:899
 msgid "_Undo"
 msgstr "A_ngre"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:264
-#: ../calendar/gui/e-comp-editor.c:2040 ../e-util/e-focus-tracker.c:122
+#: ../calendar/gui/e-comp-editor.c:2041 ../e-util/e-focus-tracker.c:122
 msgid "Undo"
 msgstr "Angre"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:269
-#: ../calendar/gui/e-comp-editor.c:2045 ../e-util/e-html-editor-actions.c:1094
+#: ../calendar/gui/e-comp-editor.c:2046 ../e-util/e-html-editor-actions.c:885
 msgid "_Redo"
 msgstr "G_jenta"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:271
-#: ../calendar/gui/e-comp-editor.c:2047 ../e-util/e-focus-tracker.c:138
+#: ../calendar/gui/e-comp-editor.c:2048 ../e-util/e-focus-tracker.c:138
 msgid "Redo"
 msgstr "Gjenta"
 
@@ -729,8 +729,8 @@ msgstr "Åpne X.509-sertifikat"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3274
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:4322
-#: ../e-util/e-attachment-store.c:494 ../e-util/e-category-editor.c:146
-#: ../e-util/e-html-editor-actions.c:590 ../e-util/e-html-editor-actions.c:685
+#: ../e-util/e-attachment-store.c:664 ../e-util/e-category-editor.c:146
+#: ../e-util/e-html-editor-actions.c:324 ../e-util/e-html-editor-actions.c:415
 #: ../e-util/e-image-chooser-dialog.c:174 ../plugins/face/face.c:298
 #: ../shell/e-shell-utils.c:73 ../smime/gui/certificate-manager.c:969
 msgid "_Open"
@@ -818,7 +818,7 @@ msgstr "Ugyldig kontakt."
 #: ../e-util/e-attachment-dialog.c:313 ../e-util/e-categories-dialog.c:83
 #: ../e-util/e-category-editor.c:209 ../e-util/e-charset-combo-box.c:102
 #: ../e-util/e-color-chooser-widget.c:128 ../e-util/e-filter-datespec.c:292
-#: ../e-util/e-html-editor-link-dialog.c:436 ../e-util/e-passwords.c:471
+#: ../e-util/e-html-editor-link-dialog.c:257 ../e-util/e-passwords.c:471
 #: ../e-util/e-rule-context.c:816 ../e-util/e-rule-editor.c:181
 #: ../e-util/e-rule-editor.c:283 ../e-util/e-rule-editor.c:792
 #: ../e-util/e-send-options.ui.h:43 ../e-util/e-source-config-dialog.c:380
@@ -1034,22 +1034,22 @@ msgid "Copy _Email Address"
 msgstr "Kopier _e-postadresse"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:151
-#: ../e-util/e-web-view.c:340
+#: ../e-util/e-web-view.c:359
 msgid "Copy the email address to the clipboard"
 msgstr "Kopier e-postadresser til utklippstavlen"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:156
-#: ../e-util/e-web-view.c:352
+#: ../e-util/e-web-view.c:371
 msgid "_Send New Message To..."
 msgstr "_Send ny melding til …"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:158
-#: ../e-util/e-web-view.c:354
+#: ../e-util/e-web-view.c:373
 msgid "Send a mail message to this address"
 msgstr "Send en e-postmelding til denne adressen"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../e-util/e-web-view.c:1069
+#: ../e-util/e-web-view.c:1288
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klikk for å sende melding til %s"
@@ -1452,13 +1452,13 @@ 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:1366
-#: ../calendar/gui/e-comp-editor.c:1996 ../e-util/e-focus-tracker.c:785
+#: ../calendar/gui/e-comp-editor.c:1997 ../e-util/e-focus-tracker.c:785
 #: ../e-util/evolution-source-viewer.c:805 ../mail/e-mail-account-manager.c:736
 #: ../modules/addressbook/e-book-shell-view-actions.c:1089
 #: ../modules/calendar/e-cal-shell-view-actions.c:1479
 #: ../modules/calendar/e-memo-shell-view-actions.c:678
 #: ../modules/calendar/e-task-shell-view-actions.c:832
-#: ../modules/mail/e-mail-shell-view-actions.c:1680
+#: ../modules/mail/e-mail-shell-view-actions.c:1752
 #: ../shell/e-shell-window-actions.c:813
 #: ../smime/gui/certificate-manager.c:1674 ../smime/gui/smime-ui.ui.h:10
 msgid "_Delete"
@@ -1657,14 +1657,14 @@ msgstr "Zoom _inn"
 
 #. Zoom-out button
 #: ../addressbook/gui/widgets/e-contact-map-window.c:420
-#: ../mail/e-mail-reader.c:2385
+#: ../mail/e-mail-reader.c:2424
 msgid "Zoom _Out"
 msgstr "Zoom _ut"
 
 #. Search button
 #: ../addressbook/gui/widgets/e-contact-map-window.c:450
-#: ../e-util/e-html-editor-actions.c:2103
-#: ../e-util/e-html-editor-find-dialog.c:195
+#: ../e-util/e-html-editor-actions.c:1858
+#: ../e-util/e-html-editor-find-dialog.c:252
 #: ../shell/e-shell-window-actions.c:890
 msgid "_Find"
 msgstr "_Finn"
@@ -1947,14 +1947,14 @@ msgstr "_Utsett"
 #: ../calendar/alarm-notify/alarm-notify.ui.h:4
 #: ../calendar/gui/e-comp-editor-page-general.c:1365
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:2241
-#: ../calendar/gui/e-comp-editor.c:2061 ../e-util/e-html-editor-actions.c:1117
-#: ../e-util/e-mail-signature-manager.c:357 ../e-util/filter.ui.h:17
+#: ../calendar/gui/e-comp-editor.c:2062 ../e-util/e-html-editor-actions.c:908
+#: ../e-util/e-mail-signature-manager.c:358 ../e-util/filter.ui.h:17
 #: ../mail/e-mail-account-manager.c:727 ../mail/e-mail-browser.c:173
 #: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:63
 #: ../plugins/attachment-reminder/attachment-reminder.c:462
 #: ../plugins/email-custom-header/email-custom-header.c:844
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
-#: ../plugins/templates/templates.c:475 ../shell/e-shell-window-actions.c:941
+#: ../plugins/templates/templates.c:470 ../shell/e-shell-window-actions.c:941
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "_Edit"
 msgstr "R_ediger"
@@ -1971,8 +1971,8 @@ msgstr "_Lukk"
 #: ../calendar/alarm-notify/alarm-queue.c:1914
 #: ../calendar/alarm-notify/alarm-queue.c:1924
 #: ../modules/cal-config-weather/evolution-cal-config-weather.c:248
-#: ../modules/itip-formatter/itip-view.c:1514
-#: ../modules/itip-formatter/itip-view.c:1625
+#: ../modules/itip-formatter/itip-view.c:1666
+#: ../modules/itip-formatter/itip-view.c:1777
 msgid "Location:"
 msgstr "Sted:"
 
@@ -2791,7 +2791,7 @@ msgstr "Privat"
 
 #: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:243
 #: ../calendar/gui/e-cal-model.c:316 ../calendar/gui/e-task-table.c:500
-#: ../calendar/gui/memotypes.xml.h:12 ../e-util/e-html-editor-page-dialog.c:117
+#: ../calendar/gui/memotypes.xml.h:12 ../e-util/e-html-editor-page-dialog.c:115
 #: ../e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "Konfidensiell"
@@ -3079,8 +3079,8 @@ msgstr "kalendervisning for en måned"
 msgid "calendar view for one or more weeks"
 msgstr "kalendervisning for en eller flere uker"
 
-#: ../calendar/gui/e-cal-component-preview.c:214 ../e-util/e-filter-rule.c:768
-#: ../mail/e-mail-config-page.c:125
+#: ../calendar/gui/e-cal-component-preview.c:214 ../e-util/e-filter-rule.c:772
+#: ../mail/e-mail-config-page.c:126
 msgid "Untitled"
 msgstr "Uten navn"
 
@@ -3105,8 +3105,8 @@ msgid "Due Date:"
 msgstr "Ferdig-dato:"
 
 #: ../calendar/gui/e-cal-component-preview.c:298
-#: ../modules/itip-formatter/itip-view.c:1517
-#: ../modules/itip-formatter/itip-view.c:1634
+#: ../modules/itip-formatter/itip-view.c:1669
+#: ../modules/itip-formatter/itip-view.c:1786
 msgid "Status:"
 msgstr "Status:"
 
@@ -3457,8 +3457,8 @@ msgstr "Kilde"
 #: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:169
 #: ../calendar/gui/e-meeting-store.c:232 ../calendar/gui/print.c:1249
 #: ../calendar/gui/print.c:1266 ../e-util/e-charset.c:51
-#: ../modules/itip-formatter/itip-view.c:3604
-#: ../modules/itip-formatter/itip-view.c:6213
+#: ../modules/itip-formatter/itip-view.c:3318
+#: ../modules/itip-formatter/itip-view.c:5915
 #: ../modules/plugin-manager/evolution-plugin-manager.c:99
 msgid "Unknown"
 msgstr "Ukjent"
@@ -3508,13 +3508,13 @@ msgstr "Nei"
 
 #: ../calendar/gui/e-cal-model.c:3820 ../calendar/gui/e-meeting-list-view.c:221
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../modules/itip-formatter/itip-view.c:6201
+#: ../modules/itip-formatter/itip-view.c:5903
 msgid "Accepted"
 msgstr "Godtatt"
 
 #: ../calendar/gui/e-cal-model.c:3821 ../calendar/gui/e-meeting-list-view.c:222
 #: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../modules/itip-formatter/itip-view.c:6207
+#: ../modules/itip-formatter/itip-view.c:5909
 msgid "Declined"
 msgstr "Avslått"
 
@@ -3526,7 +3526,7 @@ msgstr "Tentativ"
 
 #: ../calendar/gui/e-cal-model.c:3823 ../calendar/gui/e-meeting-list-view.c:224
 #: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
-#: ../modules/itip-formatter/itip-view.c:6210
+#: ../modules/itip-formatter/itip-view.c:5912
 msgid "Delegated"
 msgstr "Delegert"
 
@@ -3772,19 +3772,19 @@ msgstr "Hendelsen kan ikke redigeres fordi kalenderen er skrivebeskyttet"
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "Hendelsen kan ikke redigeres fordi du ikke er organisator"
 
-#: ../calendar/gui/e-comp-editor-event.c:402
+#: ../calendar/gui/e-comp-editor-event.c:438
 #: ../calendar/gui/e-comp-editor-task.c:348
 msgid "Start date is not a valid date"
 msgstr "Startdato er ikke en gyldig dato"
 
-#: ../calendar/gui/e-comp-editor-event.c:404
+#: ../calendar/gui/e-comp-editor-event.c:440
 msgid "Start time is not a valid time"
 msgstr "Starttid er ikke en gyldig tid"
 
-#: ../calendar/gui/e-comp-editor-event.c:408
-#: ../calendar/gui/e-comp-editor-event.c:424
-#: ../calendar/gui/e-comp-editor-page-attachments.c:211
-#: ../calendar/gui/e-comp-editor.c:339 ../mail/e-mail-display.c:2057
+#: ../calendar/gui/e-comp-editor-event.c:444
+#: ../calendar/gui/e-comp-editor-event.c:460
+#: ../calendar/gui/e-comp-editor-page-attachments.c:201
+#: ../calendar/gui/e-comp-editor.c:340 ../mail/e-mail-display.c:2021
 #: ../mail/e-mail-reader-utils.c:648 ../mail/mail-send-recv.c:489
 #: ../mail/mail-send-recv.c:1289 ../plugins/face/face.c:176
 #: ../shell/e-shell.c:992 ../shell/e-shell.c:1014
@@ -3792,125 +3792,125 @@ msgstr "Starttid er ikke en gyldig tid"
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
-#: ../calendar/gui/e-comp-editor-event.c:418
+#: ../calendar/gui/e-comp-editor-event.c:454
 msgid "End date is not a valid date"
 msgstr "Sluttdato er ikke en gyldig dato"
 
-#: ../calendar/gui/e-comp-editor-event.c:420
+#: ../calendar/gui/e-comp-editor-event.c:456
 msgid "End time is not a valid time"
 msgstr "Slutttid er ikke en gyldig tid"
 
-#: ../calendar/gui/e-comp-editor-event.c:542
+#: ../calendar/gui/e-comp-editor-event.c:588
 #: ../calendar/gui/e-comp-editor-memo.c:106
 #: ../calendar/gui/e-comp-editor-task.c:406
 msgid "_Categories"
 msgstr "_Kategorier"
 
-#: ../calendar/gui/e-comp-editor-event.c:544
+#: ../calendar/gui/e-comp-editor-event.c:590
 #: ../calendar/gui/e-comp-editor-memo.c:108
 #: ../calendar/gui/e-comp-editor-task.c:408
 msgid "Toggles whether to display categories"
 msgstr "Slår av/på visning av kategorier"
 
-#: ../calendar/gui/e-comp-editor-event.c:550
+#: ../calendar/gui/e-comp-editor-event.c:596
 msgid "Time _Zone"
 msgstr "Tids_sone"
 
-#: ../calendar/gui/e-comp-editor-event.c:552
+#: ../calendar/gui/e-comp-editor-event.c:598
 msgid "Toggles whether the time zone is displayed"
 msgstr "Slår av/på visning av tidssone"
 
-#: ../calendar/gui/e-comp-editor-event.c:558
+#: ../calendar/gui/e-comp-editor-event.c:604
 msgid "All _Day Event"
 msgstr "Avtale som varer hele _dagen"
 
-#: ../calendar/gui/e-comp-editor-event.c:560
+#: ../calendar/gui/e-comp-editor-event.c:606
 msgid "Toggles whether to have All Day Event"
 msgstr "Slår av/på hendelser som varer hele dagen"
 
-#: ../calendar/gui/e-comp-editor-event.c:566
+#: ../calendar/gui/e-comp-editor-event.c:612
 msgid "Show Time as _Busy"
 msgstr "Vis tiden som _opptatt"
 
-#: ../calendar/gui/e-comp-editor-event.c:568
+#: ../calendar/gui/e-comp-editor-event.c:614
 msgid "Toggles whether to show time as busy"
 msgstr "Slår av/på visning av tid som opptatt"
 
-#: ../calendar/gui/e-comp-editor-event.c:577
+#: ../calendar/gui/e-comp-editor-event.c:623
 msgid "Pu_blic"
 msgstr "O_ffentlig"
 
-#: ../calendar/gui/e-comp-editor-event.c:579
+#: ../calendar/gui/e-comp-editor-event.c:625
 msgid "Classify as public"
 msgstr "Klassifiser som offentlig"
 
-#: ../calendar/gui/e-comp-editor-event.c:584
+#: ../calendar/gui/e-comp-editor-event.c:630
 msgid "_Private"
 msgstr "_Privat"
 
-#: ../calendar/gui/e-comp-editor-event.c:586
+#: ../calendar/gui/e-comp-editor-event.c:632
 msgid "Classify as private"
 msgstr "Klassifiser som privat"
 
-#: ../calendar/gui/e-comp-editor-event.c:591
+#: ../calendar/gui/e-comp-editor-event.c:637
 msgid "_Confidential"
 msgstr "_Konfidensiell"
 
-#: ../calendar/gui/e-comp-editor-event.c:593
+#: ../calendar/gui/e-comp-editor-event.c:639
 msgid "Classify as confidential"
 msgstr "Klassifiser som konfidensiell"
 
-#: ../calendar/gui/e-comp-editor-event.c:694
+#: ../calendar/gui/e-comp-editor-event.c:740
 msgctxt "ECompEditor"
 msgid "_Start time:"
 msgstr "_Starttid:"
 
-#: ../calendar/gui/e-comp-editor-event.c:699
+#: ../calendar/gui/e-comp-editor-event.c:745
 msgctxt "ECompEditor"
 msgid "_End time:"
 msgstr "S_lutt-tid:"
 
-#: ../calendar/gui/e-comp-editor-event.c:709
+#: ../calendar/gui/e-comp-editor-event.c:755
 msgctxt "ECompEditor"
 msgid "All da_y event"
 msgstr "Avtale som varer hele _dagen"
 
-#: ../calendar/gui/e-comp-editor-event.c:762
+#: ../calendar/gui/e-comp-editor-event.c:808
 #: ../calendar/gui/e-comp-editor-memo.c:192
 #: ../calendar/gui/e-comp-editor-task.c:529
 msgctxt "ECompEditorPage"
 msgid "General"
 msgstr "Generelt"
 
-#: ../calendar/gui/e-comp-editor-event.c:765
+#: ../calendar/gui/e-comp-editor-event.c:811
 #: ../calendar/gui/e-comp-editor-task.c:535
 msgctxt "ECompEditorPage"
 msgid "Reminders"
 msgstr "Påminnelser"
 
-#: ../calendar/gui/e-comp-editor-event.c:768
+#: ../calendar/gui/e-comp-editor-event.c:814
 msgctxt "ECompEditorPage"
 msgid "Recurrence"
 msgstr "Gjeninntreffelse"
 
-#: ../calendar/gui/e-comp-editor-event.c:771
+#: ../calendar/gui/e-comp-editor-event.c:817
 #: ../calendar/gui/e-comp-editor-memo.c:195
 #: ../calendar/gui/e-comp-editor-task.c:538
 msgctxt "ECompEditorPage"
 msgid "Attachments"
 msgstr "Vedlegg"
 
-#: ../calendar/gui/e-comp-editor-event.c:781
+#: ../calendar/gui/e-comp-editor-event.c:827
 msgctxt "ECompEditorPage"
 msgid "Schedule"
 msgstr "Planlegg"
 
-#: ../calendar/gui/e-comp-editor-event.c:810
+#: ../calendar/gui/e-comp-editor-event.c:859
 #, c-format
 msgid "Meeting - %s"
 msgstr "Møte- %s"
 
-#: ../calendar/gui/e-comp-editor-event.c:811
+#: ../calendar/gui/e-comp-editor-event.c:860
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
@@ -3951,8 +3951,8 @@ msgstr "Notat - %s"
 
 #: ../calendar/gui/e-comp-editor-page-attachments.c:125
 #: ../calendar/gui/e-comp-editor-page-attachments.c:130
-#: ../em-format/e-mail-formatter-attachment.c:424
-#: ../e-util/e-attachment-bar.c:101 ../e-util/e-attachment-bar.c:106
+#: ../em-format/e-mail-formatter-attachment.c:337
+#: ../e-util/e-attachment-bar.c:103 ../e-util/e-attachment-bar.c:108
 #: ../e-util/e-attachment-paned.c:187 ../e-util/e-attachment-paned.c:192
 #: ../mail/message-list.etspec.h:4
 msgid "Attachment"
@@ -3960,59 +3960,59 @@ msgid_plural "Attachments"
 msgstr[0] "Vedlegg"
 msgstr[1] "Vedlegg"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:206
-#: ../e-util/e-attachment.c:2542
+#: ../calendar/gui/e-comp-editor-page-attachments.c:196
+#: ../e-util/e-attachment.c:2424
 #, c-format
 msgid "Could not load '%s'"
 msgstr "Kunne ikke laste «%s»"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:208
-#: ../e-util/e-attachment.c:2545
+#: ../calendar/gui/e-comp-editor-page-attachments.c:198
+#: ../e-util/e-attachment.c:2427
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Kunne ikke laste vedlegget"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:413
+#: ../calendar/gui/e-comp-editor-page-attachments.c:403
 msgid ""
 "Some attachments are still being downloaded. Please wait until the download "
 "is finished."
 msgstr "Vedlegg blir lastet ned. Vennligst vent til nedlastingen er fullført."
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:440
+#: ../calendar/gui/e-comp-editor-page-attachments.c:430
 #, c-format
 msgid "Attachment '%s' cannot be found, remove it from the list, please"
 msgstr "Vedlegg «%s» ble ikke funnet. Vennligst fjern det fra listen"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:457
+#: ../calendar/gui/e-comp-editor-page-attachments.c:447
 #, c-format
 msgid "Attachment '%s' doesn't have valid URI, remove it from the list, please"
 msgstr "Vedlegg «%s» har ikke en gyldig URI. Vennligst fjern det fra listen"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:618
-#: ../composer/e-composer-actions.c:327
+#: ../calendar/gui/e-comp-editor-page-attachments.c:608
+#: ../composer/e-composer-actions.c:319
 msgid "_Attachment..."
 msgstr "_Vedlegg …"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:620
-#: ../composer/e-composer-actions.c:329 ../e-util/e-attachment-view.c:463
+#: ../calendar/gui/e-comp-editor-page-attachments.c:610
+#: ../composer/e-composer-actions.c:321 ../e-util/e-attachment-view.c:345
 msgid "Attach a file"
 msgstr "Legg ved en fil"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:627
+#: ../calendar/gui/e-comp-editor-page-attachments.c:617
 msgid "_Attachments"
 msgstr "_Vedlegg"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:629
+#: ../calendar/gui/e-comp-editor-page-attachments.c:619
 msgid "Show attachments"
 msgstr "Vis vedlegg"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:782
-#: ../e-util/e-attachment-bar.c:701 ../e-util/e-attachment-paned.c:735
+#: ../calendar/gui/e-comp-editor-page-attachments.c:772
+#: ../e-util/e-attachment-bar.c:766 ../e-util/e-attachment-paned.c:735
 msgid "Icon View"
 msgstr "Ikonvisning"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:784
-#: ../e-util/e-attachment-bar.c:703 ../e-util/e-attachment-paned.c:737
+#: ../calendar/gui/e-comp-editor-page-attachments.c:774
+#: ../e-util/e-attachment-bar.c:768 ../e-util/e-attachment-paned.c:737
 msgid "List View"
 msgstr "Listevisning"
 
@@ -4534,11 +4534,11 @@ msgstr "_Argumenter:"
 msgid "_Send To:"
 msgstr "_Send til:"
 
-#: ../calendar/gui/e-comp-editor-page-schedule.c:427
+#: ../calendar/gui/e-comp-editor-page-schedule.c:445
 msgid "_Schedule"
 msgstr "_Planlegg"
 
-#: ../calendar/gui/e-comp-editor-page-schedule.c:429
+#: ../calendar/gui/e-comp-editor-page-schedule.c:447
 msgid "Query free / busy information for the attendees"
 msgstr "Slå opp ledig/opptatt informasjon for deltakerene"
 
@@ -4706,29 +4706,29 @@ msgstr "Tildelt oppgave - %s"
 msgid "Task - %s"
 msgstr "Oppgave - %s"
 
-#: ../calendar/gui/e-comp-editor.c:254
+#: ../calendar/gui/e-comp-editor.c:255
 #: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:127
 msgid "attachment"
 msgstr "vedlegg"
 
-#: ../calendar/gui/e-comp-editor.c:609
+#: ../calendar/gui/e-comp-editor.c:610
 msgid "Sending notifications to attendees..."
 msgstr "Sender oppdateringer til deltakere …"
 
-#: ../calendar/gui/e-comp-editor.c:994
+#: ../calendar/gui/e-comp-editor.c:995
 msgid "Saving changes..."
 msgstr "Lagre endringer …"
 
-#: ../calendar/gui/e-comp-editor.c:1250
+#: ../calendar/gui/e-comp-editor.c:1251
 msgid "No Summary"
 msgstr "Ingen sammendrag"
 
 #. == Button box ==
-#: ../calendar/gui/e-comp-editor.c:1975 ../composer/e-composer-actions.c:334
-#: ../e-util/e-html-editor-dialog.c:196 ../e-util/e-mail-signature-editor.c:299
+#: ../calendar/gui/e-comp-editor.c:1976 ../composer/e-composer-actions.c:326
+#: ../e-util/e-html-editor-dialog.c:196 ../e-util/e-mail-signature-editor.c:308
 #: ../e-util/e-name-selector-dialog.c:551 ../e-util/e-preferences-window.c:391
 #: ../e-util/e-table-field-chooser-dialog.c:207 ../mail/e-mail-browser.c:129
-#: ../mail/e-mail-notes.c:903 ../mail/em-folder-properties.c:786
+#: ../mail/e-mail-notes.c:931 ../mail/em-folder-properties.c:786
 #: ../mail/em-subscription-editor.c:1765
 #: ../modules/plugin-manager/evolution-plugin-manager.c:256
 #: ../shell/e-shell-window-actions.c:280 ../shell/e-shell-window-actions.c:778
@@ -4736,72 +4736,72 @@ msgstr "Ingen sammendrag"
 msgid "_Close"
 msgstr "L_ukk"
 
-#: ../calendar/gui/e-comp-editor.c:1977
+#: ../calendar/gui/e-comp-editor.c:1978
 msgid "Close the current window"
 msgstr "Lukk aktiv vindu"
 
 #. copy menu item
-#: ../calendar/gui/e-comp-editor.c:1982 ../e-util/e-focus-tracker.c:775
-#: ../e-util/e-html-editor-actions.c:1073 ../e-util/e-text.c:2109
-#: ../e-util/e-web-view.c:379 ../mail/e-mail-browser.c:136
-#: ../mail/mail.error.xml.h:140 ../shell/e-shell-window-actions.c:799
+#: ../calendar/gui/e-comp-editor.c:1983 ../e-util/e-focus-tracker.c:775
+#: ../e-util/e-html-editor-actions.c:864 ../e-util/e-text.c:2109
+#: ../e-util/e-web-view.c:398 ../mail/e-mail-browser.c:136
+#: ../mail/mail.error.xml.h:146 ../shell/e-shell-window-actions.c:799
 msgid "_Copy"
 msgstr "_Kopier"
 
-#: ../calendar/gui/e-comp-editor.c:1984 ../e-util/e-focus-tracker.c:175
+#: ../calendar/gui/e-comp-editor.c:1985 ../e-util/e-focus-tracker.c:175
 #: ../e-util/e-focus-tracker.c:231 ../e-util/e-focus-tracker.c:284
-#: ../e-util/e-focus-tracker.c:776 ../e-util/e-web-view.c:381
-#: ../e-util/e-web-view.c:1420 ../mail/e-mail-browser.c:138
+#: ../e-util/e-focus-tracker.c:776 ../e-util/e-web-view.c:400
+#: ../e-util/e-web-view.c:1854 ../mail/e-mail-browser.c:138
 #: ../shell/e-shell-window-actions.c:801
 msgid "Copy the selection"
 msgstr "Kopier utvalget"
 
 #. cut menu item
-#: ../calendar/gui/e-comp-editor.c:1989 ../e-util/e-focus-tracker.c:770
-#: ../e-util/e-html-editor-actions.c:1080 ../e-util/e-text.c:2095
+#: ../calendar/gui/e-comp-editor.c:1990 ../e-util/e-focus-tracker.c:770
+#: ../e-util/e-html-editor-actions.c:871 ../e-util/e-text.c:2095
 #: ../mail/e-mail-browser.c:143 ../shell/e-shell-window-actions.c:806
 msgid "Cu_t"
 msgstr "Klipp u_t"
 
-#: ../calendar/gui/e-comp-editor.c:1991 ../e-util/e-focus-tracker.c:168
+#: ../calendar/gui/e-comp-editor.c:1992 ../e-util/e-focus-tracker.c:168
 #: ../e-util/e-focus-tracker.c:224 ../e-util/e-focus-tracker.c:278
-#: ../e-util/e-focus-tracker.c:771 ../e-util/e-web-view.c:1414
+#: ../e-util/e-focus-tracker.c:771 ../e-util/e-web-view.c:1844
 #: ../mail/e-mail-browser.c:145 ../shell/e-shell-window-actions.c:808
 msgid "Cut the selection"
 msgstr "Klipp ut utvalget"
 
-#: ../calendar/gui/e-comp-editor.c:1998 ../e-util/e-focus-tracker.c:189
+#: ../calendar/gui/e-comp-editor.c:1999 ../e-util/e-focus-tracker.c:189
 #: ../e-util/e-focus-tracker.c:245 ../e-util/e-focus-tracker.c:786
 #: ../shell/e-shell-window-actions.c:815
 msgid "Delete the selection"
 msgstr "Slett utvalget"
 
-#: ../calendar/gui/e-comp-editor.c:2005
+#: ../calendar/gui/e-comp-editor.c:2006
 msgid "View help"
 msgstr "Vis hjelp"
 
 #. paste menu item
-#: ../calendar/gui/e-comp-editor.c:2010 ../e-util/e-focus-tracker.c:780
-#: ../e-util/e-html-editor-actions.c:1087 ../e-util/e-text.c:2121
+#: ../calendar/gui/e-comp-editor.c:2011 ../e-util/e-focus-tracker.c:780
+#: ../e-util/e-html-editor-actions.c:878 ../e-util/e-text.c:2121
 #: ../mail/e-mail-browser.c:150 ../shell/e-shell-window-actions.c:834
 msgid "_Paste"
 msgstr "_Lim inn"
 
-#: ../calendar/gui/e-comp-editor.c:2012 ../e-util/e-focus-tracker.c:182
+#: ../calendar/gui/e-comp-editor.c:2013 ../e-util/e-focus-tracker.c:182
 #: ../e-util/e-focus-tracker.c:238 ../e-util/e-focus-tracker.c:290
-#: ../e-util/e-focus-tracker.c:781 ../e-util/e-web-view.c:1426
+#: ../e-util/e-focus-tracker.c:781 ../e-util/e-web-view.c:1864
 #: ../mail/e-mail-browser.c:152 ../shell/e-shell-window-actions.c:836
 msgid "Paste the clipboard"
 msgstr "Lim inn fra utklippstavlen"
 
-#: ../calendar/gui/e-comp-editor.c:2017 ../composer/e-composer-actions.c:388
-#: ../mail/e-mail-reader.c:2287
+#: ../calendar/gui/e-comp-editor.c:2018 ../composer/e-composer-actions.c:380
+#: ../mail/e-mail-reader.c:2326
 #: ../modules/addressbook/e-book-shell-view-actions.c:1231
 #: ../modules/addressbook/e-book-shell-view-actions.c:1245
 msgid "_Print..."
 msgstr "S_kriv ut …"
 
-#: ../calendar/gui/e-comp-editor.c:2024 ../mail/e-mail-reader.c:2294
+#: ../calendar/gui/e-comp-editor.c:2025 ../mail/e-mail-reader.c:2333
 #: ../modules/addressbook/e-book-shell-view-actions.c:1238
 #: ../modules/calendar/e-cal-shell-view-actions.c:1695
 #: ../modules/calendar/e-memo-shell-view-actions.c:815
@@ -4809,52 +4809,52 @@ msgstr "S_kriv ut …"
 msgid "Pre_view..."
 msgstr "Forhånds_vis …"
 
-#: ../calendar/gui/e-comp-editor.c:2031 ../e-util/e-focus-tracker.c:790
-#: ../e-util/e-html-editor-actions.c:1101 ../e-util/e-web-view.c:389
+#: ../calendar/gui/e-comp-editor.c:2032 ../e-util/e-focus-tracker.c:790
+#: ../e-util/e-html-editor-actions.c:892 ../e-util/e-web-view.c:408
 #: ../mail/e-mail-browser.c:157 ../shell/e-shell-window-actions.c:911
 msgid "Select _All"
 msgstr "Velg _alle"
 
-#: ../calendar/gui/e-comp-editor.c:2033 ../e-util/e-focus-tracker.c:196
+#: ../calendar/gui/e-comp-editor.c:2034 ../e-util/e-focus-tracker.c:196
 #: ../e-util/e-focus-tracker.c:252 ../e-util/e-focus-tracker.c:791
 #: ../mail/e-mail-browser.c:159 ../shell/e-shell-window-actions.c:913
 msgid "Select all text"
 msgstr "Velg all tekst"
 
-#: ../calendar/gui/e-comp-editor.c:2054
+#: ../calendar/gui/e-comp-editor.c:2055
 msgid "_Classification"
 msgstr "K_lassifisering"
 
-#: ../calendar/gui/e-comp-editor.c:2068 ../e-util/e-html-editor-actions.c:1124
-#: ../e-util/e-mail-signature-editor.c:313 ../mail/e-mail-browser.c:166
-#: ../mail/e-mail-notes.c:917 ../shell/e-shell-window-actions.c:948
+#: ../calendar/gui/e-comp-editor.c:2069 ../e-util/e-html-editor-actions.c:915
+#: ../e-util/e-mail-signature-editor.c:322 ../mail/e-mail-browser.c:166
+#: ../mail/e-mail-notes.c:945 ../shell/e-shell-window-actions.c:948
 msgid "_File"
 msgstr "_Fil"
 
-#: ../calendar/gui/e-comp-editor.c:2082 ../e-util/e-html-editor-actions.c:1145
+#: ../calendar/gui/e-comp-editor.c:2083 ../e-util/e-html-editor-actions.c:936
 msgid "_Insert"
 msgstr "Sett _inn"
 
-#: ../calendar/gui/e-comp-editor.c:2089 ../composer/e-composer-actions.c:378
+#: ../calendar/gui/e-comp-editor.c:2090 ../composer/e-composer-actions.c:370
 msgid "_Options"
 msgstr "_Alternativer"
 
-#: ../calendar/gui/e-comp-editor.c:2096 ../e-util/e-html-editor-actions.c:1166
+#: ../calendar/gui/e-comp-editor.c:2097 ../e-util/e-html-editor-actions.c:957
 #: ../mail/e-mail-browser.c:180 ../shell/e-shell-window-actions.c:991
 #: ../smime/gui/certificate-manager.c:1664 ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "_Vis"
 
-#: ../calendar/gui/e-comp-editor.c:2108
+#: ../calendar/gui/e-comp-editor.c:2109
 msgid "Save current changes"
 msgstr "Lagre endringer"
 
-#: ../calendar/gui/e-comp-editor.c:2113 ../e-util/e-mail-signature-editor.c:308
-#: ../mail/e-mail-notes.c:912
+#: ../calendar/gui/e-comp-editor.c:2114 ../e-util/e-mail-signature-editor.c:317
+#: ../mail/e-mail-notes.c:940
 msgid "Save and Close"
 msgstr "Lagre og lukk"
 
-#: ../calendar/gui/e-comp-editor.c:2115
+#: ../calendar/gui/e-comp-editor.c:2116
 msgid "Save current changes and close editor"
 msgstr "Lagre endringer og lukk redigering"
 
@@ -5394,15 +5394,15 @@ msgstr "Kan ikke bestille en ressurs. Feil: "
 msgid "You must be an attendee of the event."
 msgstr "Du må være en deltager i hendelsen."
 
-#: ../calendar/gui/itip-utils.c:1940
+#: ../calendar/gui/itip-utils.c:1986
 msgid "Sending an event"
 msgstr "Sender en hendelse"
 
-#: ../calendar/gui/itip-utils.c:1944
+#: ../calendar/gui/itip-utils.c:1990
 msgid "Sending a memo"
 msgstr "Sender et notat"
 
-#: ../calendar/gui/itip-utils.c:1948
+#: ../calendar/gui/itip-utils.c:1994
 msgid "Sending a task"
 msgstr "Sender en oppgave"
 
@@ -7414,154 +7414,144 @@ msgstr "Stillehavet/Wallis"
 msgid "Pacific/Yap"
 msgstr "Stillahavet/Yap"
 
-#: ../composer/e-composer-actions.c:212
+#: ../composer/e-composer-actions.c:227
 msgid "Save as..."
 msgstr "Lagre som …"
 
-#: ../composer/e-composer-actions.c:336
+#: ../composer/e-composer-actions.c:328
 msgid "Close the current file"
 msgstr "Lukk aktiv fil"
 
-#: ../composer/e-composer-actions.c:341
+#: ../composer/e-composer-actions.c:333
 msgid "New _Message"
 msgstr "Ny _melding"
 
-#: ../composer/e-composer-actions.c:343
+#: ../composer/e-composer-actions.c:335
 msgid "Open New Message window"
 msgstr "Åpne nytt meldingsvindu"
 
-#: ../composer/e-composer-actions.c:348 ../shell/e-shell.c:1217
+#: ../composer/e-composer-actions.c:340 ../shell/e-shell.c:1217
 #: ../shell/e-shell-window-actions.c:848
 msgid "_Preferences"
 msgstr "_Brukervalg"
 
-#: ../composer/e-composer-actions.c:350 ../shell/e-shell-window-actions.c:850
+#: ../composer/e-composer-actions.c:342 ../shell/e-shell-window-actions.c:850
 msgid "Configure Evolution"
 msgstr "Konfigurer Evolution"
 
-#: ../composer/e-composer-actions.c:357
+#: ../composer/e-composer-actions.c:349
 msgid "Save the current file"
 msgstr "Lagre aktiv fil"
 
-#: ../composer/e-composer-actions.c:362
+#: ../composer/e-composer-actions.c:354
 msgid "Save _As..."
 msgstr "L_agre som …"
 
-#: ../composer/e-composer-actions.c:364
+#: ../composer/e-composer-actions.c:356
 msgid "Save the current file with a different name"
 msgstr "Lagre aktiv fil med et nytt navn"
 
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:363
 msgid "Character _Encoding"
 msgstr "T_egnkoding"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:387
 msgid "Print Pre_view"
 msgstr "Forhåndsvisning av utskrift"
 
-#: ../composer/e-composer-actions.c:402
+#: ../composer/e-composer-actions.c:394
 msgid "Save as _Draft"
 msgstr "Lagre som ut_kast"
 
-#: ../composer/e-composer-actions.c:404
+#: ../composer/e-composer-actions.c:396
 msgid "Save as draft"
 msgstr "Lagre som utkast"
 
-#: ../composer/e-composer-actions.c:409
+#: ../composer/e-composer-actions.c:401
 msgid "S_end"
 msgstr "S_end"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:403
 msgid "Send this message"
 msgstr "Send denne meldingen"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:411
 msgid "PGP _Encrypt"
 msgstr "Krypt_er med PGP"
 
-#: ../composer/e-composer-actions.c:421
+#: ../composer/e-composer-actions.c:413
 msgid "Encrypt this message with PGP"
 msgstr "Krypter denne meldingen med PGP"
 
-#: ../composer/e-composer-actions.c:427
+#: ../composer/e-composer-actions.c:419
 msgid "PGP _Sign"
 msgstr "_Signer med PGP"
 
-#: ../composer/e-composer-actions.c:429
+#: ../composer/e-composer-actions.c:421
 msgid "Sign this message with your PGP key"
 msgstr "Signer denne meldingen med din PGP-nøkkel"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:427
 msgid "_Picture Gallery"
 msgstr "_Bildegalleri"
 
-#: ../composer/e-composer-actions.c:437
+#: ../composer/e-composer-actions.c:429
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "Vis en samling av bilder som du kan dra til din melding"
 
-#: ../composer/e-composer-actions.c:443
+#: ../composer/e-composer-actions.c:435
 msgid "_Prioritize Message"
 msgstr "_Prioriter melding"
 
-#: ../composer/e-composer-actions.c:445
+#: ../composer/e-composer-actions.c:437
 msgid "Set the message priority to high"
 msgstr "Sett meldingsprioritet til høy"
 
-#: ../composer/e-composer-actions.c:451
+#: ../composer/e-composer-actions.c:443
 msgid "Re_quest Read Receipt"
 msgstr "S_pør om lesekvittering"
 
-#: ../composer/e-composer-actions.c:453
+#: ../composer/e-composer-actions.c:445
 msgid "Get delivery notification when your message is read"
 msgstr "Motta leveringsmelding når meldingen blir lest"
 
-#: ../composer/e-composer-actions.c:459
+#: ../composer/e-composer-actions.c:451
 msgid "S/MIME En_crypt"
 msgstr "_Krypter med S/MIME"
 
-#: ../composer/e-composer-actions.c:461
+#: ../composer/e-composer-actions.c:453
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Krypter denne meldingen med ditt S/MIME-krypteringssertifikat"
 
-#: ../composer/e-composer-actions.c:467
+#: ../composer/e-composer-actions.c:459
 msgid "S/MIME Sig_n"
 msgstr "Sig_ner med S/MIME"
 
-#: ../composer/e-composer-actions.c:469
+#: ../composer/e-composer-actions.c:461
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Signer denne meldingen med ditt S/MIME signatursertifikat"
 
-#: ../composer/e-composer-actions.c:523
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
-msgid "Unicode emoticons"
-msgstr "Unicode smilefjes"
-
-#: ../composer/e-composer-actions.c:525
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
-msgid "Use Unicode characters for emoticons."
-msgstr "Bruk Unicode-tegn for smilefjes."
-
-#: ../composer/e-composer-actions.c:531
+#: ../composer/e-composer-actions.c:515
 msgid "_Bcc Field"
 msgstr "_Bcc-felt"
 
-#: ../composer/e-composer-actions.c:533
+#: ../composer/e-composer-actions.c:517
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Slå av/på visning av BCC-feltet"
 
-#: ../composer/e-composer-actions.c:539
+#: ../composer/e-composer-actions.c:523
 msgid "_Cc Field"
 msgstr "_Cc-felt"
 
-#: ../composer/e-composer-actions.c:541
+#: ../composer/e-composer-actions.c:525
 msgid "Toggles whether the CC field is displayed"
 msgstr "Slå av/på visning av CC-feltet"
 
-#: ../composer/e-composer-actions.c:547
+#: ../composer/e-composer-actions.c:531
 msgid "_From Override Field"
 msgstr "Felt for overstyring av _Fra"
 
-#: ../composer/e-composer-actions.c:549
+#: ../composer/e-composer-actions.c:533
 msgid ""
 "Toggles whether the From override field to change name or email address is "
 "displayed"
@@ -7569,26 +7559,26 @@ msgstr ""
 "Slår av/på visning av feltet for overstyring av Fra for å bytte navn eller e-"
 "post"
 
-#: ../composer/e-composer-actions.c:555
+#: ../composer/e-composer-actions.c:539
 msgid "_Reply-To Field"
 msgstr "Svar-til felt"
 
-#: ../composer/e-composer-actions.c:557
+#: ../composer/e-composer-actions.c:541
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Slå av/på visning av Svar-til feltet"
 
-#: ../composer/e-composer-actions.c:612
+#: ../composer/e-composer-actions.c:596
 msgid "Attach"
 msgstr "Legg ved"
 
-#: ../composer/e-composer-actions.c:618
+#: ../composer/e-composer-actions.c:602
 msgid "Save Draft"
 msgstr "Lagre utkast"
 
 #: ../composer/e-composer-from-header.c:109
 #: ../e-util/e-mail-signature-script-dialog.c:415
 #: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
-#: ../mail/e-mail-config-identity-page.c:323
+#: ../mail/e-mail-config-identity-page.c:341
 #: ../mail/e-mail-config-summary-page.c:332
 msgid "_Name:"
 msgstr "_Navn:"
@@ -7638,7 +7628,7 @@ msgid "S_ubject:"
 msgstr "Em_ne:"
 
 #: ../composer/e-composer-header-table.c:870
-#: ../mail/e-mail-config-identity-page.c:516
+#: ../mail/e-mail-config-identity-page.c:534
 msgid "Si_gnature:"
 msgstr "Si_gnatur:"
 
@@ -7667,12 +7657,12 @@ msgstr ""
 "Kan ikke kryptere utgående melding: Sertifikat for kryptering ikke satt for "
 "denne kontoen"
 
-#: ../composer/e-msg-composer.c:1601 ../composer/e-msg-composer.c:2600
+#: ../composer/e-msg-composer.c:1621 ../composer/e-msg-composer.c:2411
 #: ../data/evolution.desktop.in.in.h:7
 msgid "Compose Message"
 msgstr "Skriv melding"
 
-#: ../composer/e-msg-composer.c:4895
+#: ../composer/e-msg-composer.c:4736
 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 "
@@ -7797,7 +7787,7 @@ msgstr ""
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "En feil oppsto under sending. Hvordan vil du fortsette?"
 
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:169
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:175
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "Feilen som ble rapportert var &quot;{0}&quot;."
 
@@ -7872,7 +7862,7 @@ msgid "Calendar event notifications"
 msgstr "Varsling om kalenderhendelser"
 
 #: ../data/evolution.desktop.in.in.h:1 ../evolution.appdata.xml.in.h:1
-#: ../mail/e-mail-browser.c:1118
+#: ../mail/e-mail-browser.c:1101
 #: ../modules/mailto-handler/evolution-mailto-handler.c:210
 #: ../shell/e-shell-window-private.c:242
 msgid "Evolution"
@@ -8600,10 +8590,8 @@ msgid "Show appointment icons in the month view"
 msgstr "Vis ikoner for avtaler i månedsvisning"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
-#, fuzzy
 msgid "Whether to show icons of events in the month view"
-msgstr ""
-"Om tidspunktet en hendelse slutter på skal vises i uke- og månedsvisninger"
+msgstr "Hvorvidt ikoner for hendelser skal vises i månedsvisning"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
 msgid "Show the memo preview pane"
@@ -8894,37 +8882,47 @@ msgid "Default charset in which to compose messages. Uses UTF-8, if not set."
 msgstr "Forvalgt tegnsett for nye meldinger. Bruker UTF-8 som forvalg."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:5
+msgid "Name of the editor to prefer in the message composer"
+msgstr "Navn på type redigering som er foretrukket i meldingsredigering"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:6
+msgid ""
+"If the name doesn't correspond to any known editor, then the built-in WebKit "
+"editor is used."
+msgstr "Hvis navnet ikke korresponderer til en kjent redigering blir den innebygde WebKit-redigeringen 
brukt."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:7
 msgid "Path where picture gallery should search for its content"
 msgstr "Sti for søk etter innhold til bildegalleri"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:6
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:8
 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 ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:7
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:9
 msgid "Spell check inline"
 msgstr "Stavekontroll i meldingen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:8
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:10
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Vis indikatorer for stavefeil mens du skriver."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:9
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:11
 msgid "Automatic link recognition"
 msgstr "Automatisk gjenkjenning av lenker"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:10
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:12
 msgid "Recognize links in text and replace them."
 msgstr "Gjenkjenn lenker i tekst og erstatt dem."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:11
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
 msgid "Automatic emoticon recognition"
 msgstr "Automatisk gjenkjenning av smilefjes"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:12
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
 msgid ""
 "Recognize emoticons in text and replace them with images or Unicode "
 "characters."
@@ -8932,40 +8930,48 @@ msgstr ""
 "Gjenkjenn smilefjes i tekst og erstatt dem med bilder eller Unicode-tegn."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
+msgid "Unicode emoticons"
+msgstr "Unicode smilefjes"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:16
+msgid "Use Unicode characters for emoticons."
+msgstr "Bruk Unicode-tegn for smilefjes."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
 msgid "Attribute message"
 msgstr "Attributtmelding"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:16
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
 msgid ""
 "The text that is inserted when replying to a message, attributing the "
 "message to the original author"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
 msgid "Forward message"
 msgstr "Videresend melding"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
 msgid ""
 "The text that is inserted when forwarding a message, saying that the "
 "forwarded message follows"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
 msgid "Original message"
 msgstr "Opprinnelig melding"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
 msgid ""
 "The text that is inserted when replying to a message (top posting), saying "
 "that the original message follows"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
 msgid "Group Reply replies to list"
 msgstr "Gruppesvar svarer til listen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
 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 "
@@ -8973,48 +8979,48 @@ msgid ""
 "replying."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
 msgid "Put the cursor at the bottom of replies"
 msgstr "Plasser markør ved bunnen av svar"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
 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 ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
 msgid "Always request read receipt"
 msgstr "Alltid be om lesekvittering"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
 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."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
 msgid "Send HTML mail by default"
 msgstr "Send HTML e-post som forvalg"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
 msgid "Send HTML mail by default."
 msgstr "Send HTML e-post som forvalg."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
 msgid "Spell checking languages"
 msgstr "Språk for stavekontroll"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
 msgid "List of dictionary language codes used for spell checking."
 msgstr "Liste med språkkoder for ordliste som skal brukes for stavekontroll."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Vis «Bcc» feltet når meldinger sendes"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -9022,11 +9028,11 @@ msgstr ""
 "Vis «Bcc»-feltet når en melding sendes. Dette kontrolleres fra «Vis»-menyen "
 "når en e-postkonto velges."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "Vis «Cc» feltet når meldinger sendes"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -9034,11 +9040,11 @@ msgstr ""
 "Vis «Cc»-feltet når en melding sendes. Dette kontrolleres fra «Vis»-menyen "
 "når en e-postkonto velges."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
 msgid "Show \"From\" override field when sending a mail message"
 msgstr "Vis overstyringsfelt for «Fra» når meldinger sendes"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
 msgid ""
 "Show the \"From\" override field when sending a mail message. This is "
 "controlled from the View menu when a mail account is chosen."
@@ -9046,11 +9052,11 @@ msgstr ""
 "Vis overstyringsfelt for «Fra» når en melding sendes. Dette kontrolleres fra "
 "«Vis»-menyen når en e-postkonto velges."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Vis «Svar-til» feltet når meldinger sendes"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -9058,11 +9064,11 @@ msgstr ""
 "Vis «Svar-til»-feltet når en melding sendes. Dette kontrolleres fra «Vis»-"
 "menyen når en e-postkonto velges."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "Vis «Fra» feltet når du poster til en nyhetsgruppe"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -9070,11 +9076,11 @@ msgstr ""
 "Vis «Fra»-feltet når en melding sendes til en nyhetsgruppe. Dette "
 "kontrolleres fra «Vis»-menyen når en e-postkonto velges."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "Vis «Svar-til» feltet når du poster til en nyhetsgruppe"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -9082,11 +9088,11 @@ msgstr ""
 "Vis «Svar-til»-feltet når en melding sendes til en nyhetsgruppe. Dette "
 "kontrolleres fra «Vis»-menyen når en e-postkonto velges."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
 msgid "Digitally sign replies when the original message is signed"
 msgstr "Signer svar digitalt når opprinnelig melding er signert"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
 msgid ""
 "Automatically enable PGP or S/MIME signatures when replying to a message "
 "which is also PGP or S/MIME signed."
@@ -9094,11 +9100,11 @@ msgstr ""
 "Slå på PGP- eller S/MIME-signaturer automatisk ved svar på en melding som "
 "også er signert med PGP eller S/MIME."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
 msgid "Encode filenames in an Outlook/GMail way"
 msgstr "Bruk samme koding for filnavn som Outlook/GMail"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
 msgid ""
 "Encode filenames in the mail headers same as Outlook or GMail do, to let "
 "them display correctly filenames with UTF-8 letters sent by Evolution, "
@@ -9106,42 +9112,42 @@ msgid ""
 "standard."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
 msgid "Send messages through Outbox folder"
 msgstr "Send meldinger gjennom Utboks-mappen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
 msgid ""
 "Always save messages to Outbox folder when sending, to let a user choose "
 "when the messages should be sent."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
 msgid "Put personalized signatures at the top of replies"
 msgstr "Plasser personlige signaturer på toppen av svar"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
 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 ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
 msgid "Do not add signature delimiter"
 msgstr "Ikke legg til skillelinje for signatur"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
 msgid "Ignore list Reply-To:"
 msgstr "Ignorer Reply-To: for lister"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
 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. "
@@ -9152,26 +9158,17 @@ msgid ""
 "Post: header, if there is one."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
 msgid "List of localized 'Re'"
 msgstr "Liste med oversettelser av «Re»"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
 msgid ""
 "Comma-separated list of localized 'Re' abbreviations to skip in a subject "
 "text when replying to a message, as an addition to the standard \"Re\" "
 "prefix. An example is 'SV,AV'."
 msgstr "SV"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
-msgid "Enable developer mode"
-msgstr "Slå på utviklermodus"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
-msgid ""
-"Enables some hidden actions and tools aimed for development and debugging."
-msgstr ""
-
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
 msgid "Number of characters for wrapping"
 msgstr "Antall tegn for linjebryting"
@@ -9210,18 +9207,28 @@ msgid "If set to 'true' quoted text in replies will be wrapped."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+msgid "Whether to obey Content-Disposition:inline message header hint"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+msgid ""
+"Set to 'false' to block automatic display of attachments with Content-"
+"Disposition: inline."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Save file format for drag-and-drop operation"
 msgstr "Filformat for lagring ved dra-og-slipp operasjon"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid "Can be either 'mbox' or 'pdf'."
 msgstr "Kan være enten «mbox» eller «pdf»."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Show image animations"
 msgstr "Vis bildeanimasjoner"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -9229,11 +9236,11 @@ msgstr ""
 "Slå på animerte bilder i HTML-meldinger. Mange brukere synes at animerte "
 "bilder er plagsomme og foretrekker å se et statisk bilde i stedet."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Enable or disable type ahead search feature"
 msgstr "Aktiver eller deaktiver funksjon for å søke mens du skriver"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -9241,11 +9248,11 @@ msgstr ""
 "Slår på søkefunksjonen for sidelinjen for å muliggjøre interaktive søk etter "
 "mappenavn."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 msgid "Enable or disable magic space bar"
 msgstr "Aktiver eller deaktiver magisk mellomrom"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -9253,173 +9260,183 @@ msgstr ""
 "Aktiver dette for å bruke mellomrom-tasten til å gå forover i "
 "meldingsvisning, meldingsliste og mapper."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 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"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr "Slå på for å bruke en lignende meldingslistevisning for alle mapper."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Mark citations in the message \"Preview\""
 msgstr "Merk sitat in e-posten «Forhåndsvisning»"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Merk sitat in e-posten «Forhåndsvisning»."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "Citation highlight color"
 msgstr "Farge for utheving av sitattekst"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid "Citation highlight color."
 msgstr "Farge for utheving av sitattekst."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Enable/disable caret mode"
 msgstr "Aktiver/deaktiver markørmodus"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 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."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid "Default charset in which to display messages"
 msgstr "Forvalgt tegnsett for visning av meldinger"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 msgid "Default charset in which to display messages."
 msgstr "Forvalgt tegnsett for visning av meldinger."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 msgid "Automatically load images for HTML messages over HTTP"
 msgstr "Last bilder automatisk for HTML-meldinger over HTTP"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid "Show notification about missing remote content"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid ""
 "When the message preview shows a message which requires to download remote "
 "content, while the download is not allowed for the user or the site, then "
 "show a notification about it on top of the preview panel."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Show Animations"
 msgstr "Vis animasjoner"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid "Show animated images as animations."
 msgstr "Vis animerte bilder som animasjoner."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid "Show all message headers"
 msgstr "Vis alle meldingshoder"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid "Show all the headers when viewing a messages."
 msgstr "Vis alle meldingshoder når en melding vises."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid "List of headers to show when viewing a message."
 msgstr "Liste med meldingshoder som skal vises når en melding vises."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid ""
 "Each header is represented as a pair: the header name, and a boolean "
 "indicating whether the header is enabled. Disabled headers are not shown "
 "when viewing a message, but are still listed in Preferences."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid "Show photo of the sender"
 msgstr "Vis bilde av avsender"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Vis bilde av avsender i meldingsområdet."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Search gravatar.com for photo of the sender"
 msgstr "Søk etter bilde av avsender på gravatar.com"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 msgid "Allow searching also at gravatar.com for photo of the sender."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid "Mark as Seen after specified timeout"
 msgstr "Merk som «lest» etter spesifisert tidsgrense"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid "Mark as Seen after specified timeout."
 msgstr "Merk som «sett» etter spesifisert tidsgrense."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "Mark as Seen always after specified timeout"
 msgstr "Alltid merk som lest etter spesifisert tidsgrense"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid ""
 "If set to true, the selected message will be set as unread after the timeout "
 "also after the folder change."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Timeout for marking messages as seen"
 msgstr "Tidsgrense for å merke e-post som sett."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "Tidsavbrudd i millisekunder for å merke e-poster som sett."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+msgid "Show Attachment Bar"
+msgstr "Vis vedleggsfelt"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+msgid ""
+"Show Attachment Bar below the message preview pane when the message has "
+"attachments."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid "Sender email-address column in the message list"
 msgstr "Kolonne for avsenders e-postadresse i meldingslisten"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 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."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid "Show deleted messages in the message-list"
 msgstr "Vis slettede meldinger i meldingslisten"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Vis slettede meldinger i meldingslisten (gjennomstreket)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid "Show junk messages in the message-list"
 msgstr "Vis uønskede meldinger i meldingslisten"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid "Show junk messages (with a red strike-through) in the message-list."
 msgstr "Vis uønskede meldinger i meldingslisten (med rød gjennomstreking)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid "Enable Unmatched search folder"
 msgstr "Aktiver søkemapper uten treff"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid ""
 "Enable Unmatched search folder within Search Folders. It does nothing if "
 "Search Folders are disabled."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Skjuler per-mappe forhåndsvisning og fjerner utvalget"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 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."
@@ -9428,31 +9445,31 @@ msgstr ""
 "Dette fjerner markering fra e-posten i listen og fjerner forhåndsvisning for "
 "den mappen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid "Height of the message-list pane"
 msgstr "Høyde på e-postlistefeltet"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid "Height of the message-list pane."
 msgstr "Høyde på e-postlistefeltet."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid "Whether message headers are collapsed in the user interface"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Width of the message-list pane"
 msgstr "Bredde på e-postlistefeltet"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid "Width of the message-list pane."
 msgstr "Bredde på e-postlistefeltet."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Layout style"
 msgstr "Stil for utforming"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 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 "
@@ -9460,35 +9477,35 @@ msgid ""
 "message list."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Variable width font"
 msgstr "Skrift for variabel bredde"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid "The variable width font for mail display."
 msgstr "Skrift med variabel bredde for meldingsvisning."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Terminal font"
 msgstr "Terminalskrift"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid "The terminal font for mail display."
 msgstr "Terminalskrift for meldingsvisning."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Use custom fonts"
 msgstr "Bruk egendefinerte skrifter"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 msgid "Use custom fonts for displaying mail."
 msgstr "Bruk tilpassede skrifttyper for e-postvisning."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Komprimer visning av adresser i Til/Cc/Bcc"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -9496,11 +9513,11 @@ msgstr ""
 "Komprimer visning av adresser i Til/Cc/Bcc til antall oppgitt i "
 "address_count."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Antall adresser som skal vises i Til/Cc/Bcc"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -9508,11 +9525,11 @@ msgstr ""
 "Setter antall adresser som skal vises i forvalgt listevisning for meldinger. "
 "Etter dette vises «…»."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid "Thread the message-list based on Subject"
 msgstr "Lag tråder av e-postlisten basert på emne"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -9520,11 +9537,11 @@ msgstr ""
 "Om e-poster skal sorteres etter emner når de ikke inneholder «In-Reply-To» "
 "eller referansetopptekster."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Default value for thread expand state"
 msgstr "Forvalgt verdi for trådutvidelsestilstand"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -9533,11 +9550,11 @@ msgstr ""
 "sammenslått tilstand som forvalg. Evolution må startes på nytt hvis denne "
 "endres."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Om tråder sorteres basert på siste melding i den tråden"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 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 "
@@ -9547,11 +9564,11 @@ msgstr ""
 "melding i hver tråd i stedet for meldingens dato. Evolution må startes på "
 "nytt."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Whether sort thread children always ascending"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 #, fuzzy
 msgid ""
 "This setting specifies whether the thread children should be sorted always "
@@ -9561,11 +9578,11 @@ msgstr ""
 "melding i hver tråd i stedet for meldingens dato. Evolution må startes på "
 "nytt."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "Sorter kontoer alfabetisk i et mappetre"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid ""
 "Tells how to sort accounts in a folder tree used in a Mail view. When set to "
 "true accounts are sorted alphabetically, with an exception of On This "
@@ -9573,82 +9590,82 @@ msgid ""
 "given by a user"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid "Log filter actions"
 msgstr "Loggfør filterhandlinger"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 msgid "Log filter actions to the specified log file."
 msgstr "Logg filterhandlinger til oppgitt loggfil."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid "Logfile to log filter actions"
 msgstr "Loggfil med filterhandlinger"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid "Logfile to log filter actions."
 msgstr "Loggfil med filterhandlinger."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid "Flush Outbox after filtering"
 msgstr "Tøm utboks etter filtrering"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 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 ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid "Default forward style"
 msgstr "Forvalgt videresendingsstil"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 msgid "Default reply style"
 msgstr "Forvalgt svarstil"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 msgid ""
 "Prompt the user when he or she tries to send a message with a key "
 "accelerator."
 msgstr "Spør bruker når en en e-post blir sendt med tastatursnarvei."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid "Prompt on empty subject"
 msgstr "Stopp og spør ved tomt emne"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 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."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid "Prompt when emptying the trash"
 msgstr "Spør ved tømming av papirkurven"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "Spør bruker ved forsøk på å tømme papirkurven."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid "Prompt when user expunges"
 msgstr "Stopp og spør før tømming"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 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."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 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"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
@@ -9656,20 +9673,20 @@ msgstr ""
 "Aktiverer/deaktiverer funksjonen som varsler om at du prøver å sende en "
 "melding til mottakere som ikke er oppgitt som e-postadresser"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 msgid "Prompt when user only fills Bcc"
 msgstr "Stopp og spør når bare «Bcc» er utfylt"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 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."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Spør når bruker prøver å sende uønsket HTML"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -9677,11 +9694,11 @@ msgstr ""
 "Spør når bruker prøver å sende HTML-meldinger til mottakere som ikke ønsker "
 "å motta HTML-meldinger."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 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"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -9689,19 +9706,19 @@ msgstr ""
 "Spør brukeren om han virkelig vil gjøre det hvis han prøver å åpne 10 eller "
 "flere e-poster på en gang."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 msgid "Prompt while marking multiple messages"
 msgstr "Spør ved merking av flere meldinger"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Slå av/på spørring ved merking av flere meldinger."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid "Prompt when deleting messages in search folder"
 msgstr "Spør ved sletting av meldinger fra søkemappe"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 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 "
@@ -9711,11 +9728,11 @@ msgstr ""
 "en søkemappe sletter meldingene permanent, og ikke bare fjerner dem fra "
 "søkeresultatene."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
 msgstr "Spør om kopiering av en mappe med dra-og-slipp i mappetreet"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 msgid ""
 "Possible values are: 'never' - do not allow copy with drag &amp; drop of "
 "folders in folder tree, 'always' - allow copy with drag &amp; drop of "
@@ -9723,11 +9740,11 @@ msgid ""
 "ask user."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
 msgstr "Spør om flytting av mappe med dra-og-slipp i mappetreet"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 msgid ""
 "Possible values are: 'never' - do not allow move with drag &amp; drop of "
 "folders in folder tree, 'always' - allow move with drag &amp; drop of "
@@ -9735,11 +9752,11 @@ msgid ""
 "ask user."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "Prompt when replying privately to list messages"
 msgstr "Spør ved privat svar til meldinger fra e-postlister"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 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."
@@ -9747,34 +9764,34 @@ msgstr ""
 "Aktiverer/deaktiverer funksjonen som varsler om at du sender et privat svar "
 "på en melding som har kommet via en e-postliste."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "Spør når e-postlister stikker av med private svar"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 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 ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid "Prompt when replying to many recipients"
 msgstr "Spør ved svar til mange mottakere"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 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."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid ""
 "Prompt when switching composer mode and the content needs to lose its "
 "formatting"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 #, fuzzy
 msgid ""
 "It disables/enables the repeated prompts to warn that you are switching "
@@ -9783,58 +9800,58 @@ msgstr ""
 "Aktiverer/deaktiverer funksjonen som varsler om at du prøver å sende en "
 "melding til mottakere som ikke er oppgitt som e-postadresser"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 #, fuzzy
 msgid "Prompt when sending to many To and CC recipients"
 msgstr "Spør ved svar til mange mottakere"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 msgid ""
 "Enable or disable the prompt when sending to many To and CC recipients. The "
 "'composer-many-to-cc-recips-num' defines the threshold."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid ""
 "Policy for automatically closing the message browser window when forwarding "
 "or replying to the displayed message."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 msgid "Empty Trash folders on exit"
 msgstr "Tøm papirkurven når programmet avsluttes"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Tøm alle papirkurver når programmet avsluttes."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Minimum antall dager mellom tømming av papirkurven ved avslutting"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 "Minste tidsperiode mellom tømming av papirkurven ved avslutting, i dager."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid "Last time Empty Trash was run"
 msgstr "Siste gang papirkurven ble tømt"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 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)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Antall sekunder feilen skal vises i statuslinjen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "Level beyond which the message should be logged."
 msgstr "Over dette nivået skal meldingen logges."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -9842,22 +9859,22 @@ msgstr ""
 "Denne har tre mulige verdier. «0» for feil. «1» for advarsler. «2» for "
 "feilsøkingsmeldinger."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "Show original \"Date\" header value."
 msgstr "Vis opprinnelig verdi for «Date»-meldingshode."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 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 ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 msgid "List of Labels and their associated colors"
 msgstr "Liste over etiketter og deres assosierte farger"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 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."
@@ -9866,50 +9883,50 @@ msgstr ""
 "inneholder strenger som inneholder «name:color» hvor «color» bruker HTML hex "
 "koding."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 msgid "Check incoming mail being junk"
 msgstr "Sjekk om innkommende meldinger er uønsket e-post"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 msgid "Run junk test on incoming mail."
 msgstr "Sjekk om innkommende e-post er uønsket."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 msgid "Empty Junk folders on exit"
 msgstr "Tøm mappe for uønsket e-post når programmet avsluttes"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Tøm alle mapper for uønsket e-post når programmet avsluttes."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 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"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 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."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 msgid "Last time Empty Junk was run"
 msgstr "Siste gang mapper for uønsket e-post ble tømt"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
 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)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
 msgid "The default plugin for Junk hook"
 msgstr "Forvalgt tillegg for uønsket e-post"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
 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 "
@@ -9919,11 +9936,11 @@ msgstr ""
 "tillegg er aktivert. Hvis forvalgt tillegg deaktiveres vil ikke de andre "
 "brukes."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "Bestemmer om avsenders e-post skal slås opp i adresseboken"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
 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 "
@@ -9935,7 +9952,7 @@ 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."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -9943,20 +9960,20 @@ msgstr ""
 "Bestemmer om oppslag for filtrering av uønsket e-post kun skal slås opp i "
 "lokale adressebøker"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
 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 ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
 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"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 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 "
@@ -9966,11 +9983,11 @@ msgstr ""
 "post. Hvis dette alternativet er aktivert og meldingshodene finnes vil  "
 "dette forbedre hastigheten for denne sjekken."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
 msgid "Custom headers to use while checking for junk."
 msgstr "Egendefinert meldingshode som skal sjekkes for uønsket e-post."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -9978,52 +9995,52 @@ msgstr ""
 "Egendefinerte meldingshoder som brukes ved sjekk etter uønsket e-post. "
 "Formatet for listeelementene er «headername=value»."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
 msgid "UID string of the default account."
 msgstr "UID-streng for forvalgt konto."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
 msgid "Save directory"
 msgstr "Lagre katalog"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
 msgid "Directory for saving mail component files."
 msgstr "Katalog for å lagre komponentfiler for e-post."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
 msgid "Composer load/attach directory"
 msgstr "Katalog for vedlegg i redigering"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
 msgid "Directory for loading/attaching files to composer."
 msgstr "Katalog for å laste/legge ved filer i redigering."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
 msgid "Check for new messages on start"
 msgstr "Se etter nye meldinger ved oppstart"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
 msgid "Check for new messages in all active accounts"
 msgstr "Se etter nye meldinger i alle aktive kontoer"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
 msgid ""
 "Whether to 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 ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
 msgid "Server synchronization interval"
 msgstr "Intervall for serversynkronisering"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -10031,11 +10048,11 @@ msgstr ""
 "Kontrollerer hvor ofte lokale endringer synkroniseres med ekstern e-"
 "posttjener. Intervallet må være minst 30 sekunder."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
 msgid "Allow expunge in virtual folders"
 msgstr "Tillat tømming av virtuelle mapper"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
 msgid ""
 "Enables Expunge in virtual folders, which means that the Folder->Expunge "
 "will be callable in virtual folders, while the expunge itself will be done "
@@ -10043,74 +10060,74 @@ msgid ""
 "for deleted messages belonging to the virtual folder."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
 #: ../mail/mail-config.ui.h:9
 msgid "Inherit theme colors in HTML mode"
 msgstr "Arv farger fra tema i HTML-modus"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
 msgid ""
 "When enabled the theme colors for background, text and links are sent in "
 "resulting HTML formatted message."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
 msgid "An Archive folder for On This Computer folders."
 msgstr "En arkivmappe for mapper under «På denne datamaskinen»."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
 msgid ""
 "An Archive folder to use for Messages|Archive... feature when in an On This "
 "Computer folder."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
 msgid "(Deprecated) Default forward style"
 msgstr "Forvalgt videresendingsstil (utgått)"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"forward-style-name\" instead."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
 msgid "(Deprecated) Default reply style"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"reply-style-name\" instead."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
 msgid "(Deprecated) List of custom headers and whether they are enabled."
 msgstr "(Utfaset) Liste over tillpassede topptekster og om de er slått på."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"show-headers\" instead."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:242
 msgid "(Deprecated) Load images for HTML messages over HTTP"
 msgstr "Last bilder for HTML-meldinger over HTTP (utgått)"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:243
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"image-loading-policy\" instead."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:244
 msgid ""
 "(Deprecated) Asks whether to close the message window when the user forwards "
 "or replies to the message shown in the window"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:245
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"browser-close-on-reply-policy\" instead."
@@ -10397,58 +10414,76 @@ msgstr "Forhåndsvalgt mappe for filvelger"
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "Startmappe for GtkFileChooser dialoger."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:320
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7
+msgid "Compression format used by autoar"
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:8
+msgid ""
+"Compression format used when compressing attached directories with autoar."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:9
+msgid "Compression filter used by autoar"
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:10
+msgid ""
+"Compression filter used when compressing attached directories with autoar."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11 ../shell/main.c:320
 msgid "Start in offline mode"
 msgstr "Start i frakoblet modus"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:8
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:12
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Om Evolution skal startes i frakoblet modus i stedet for tilkoblet modus."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:9
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:13
 msgid "Offline folder paths"
 msgstr "Sti til frakoblede mapper"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:10
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage."
 msgstr ""
 "Liste med stier for mapper som skal bli synkronisert til disk for frakoblet "
 "bruk."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:15
 msgid "Enable express mode"
 msgstr "Slå på ekspressmodus"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:12
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
 msgid "Flag that enables a much simplified user interface."
 msgstr "Flagg som slår på et forenklet brukergrensesnitt."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:13
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
 #, fuzzy
 msgid "List of button names to hide in the window switcher"
 msgstr "Zoom store bilder slik at de ikke er bredere enn vinduet"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
 msgid ""
 "Valid values are 'mail', 'addressbook', 'calendar', 'tasks' and 'memos'. "
 "Change of this requires restart of the application."
 msgstr ""
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:15
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
 msgid "Window buttons are visible"
 msgstr "Vindusknapper er synlige"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
 msgid "Whether the window buttons should be visible."
 msgstr "Om vinduknappene skal være synlige."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
 msgid "Window button style"
 msgstr "Knappestil for vindu"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -10458,39 +10493,39 @@ msgstr ""
 "Hvis «toolbar» er satt vil stilen på knappene bli bestemt av GNOME «toolbar»-"
 "instillingene."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
 msgid "Toolbar is visible"
 msgstr "Verktøylinjen er synlig"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
 msgid "Whether the toolbar should be visible."
 msgstr "Om verktøylinjen skal være synlig."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
 msgid "Sidebar is visible"
 msgstr "Sidelinjen er synlig"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:26
 msgid "Whether the sidebar should be visible."
 msgstr "Om sidelinjen skal være synlig."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:27
 msgid "Statusbar is visible"
 msgstr "Statuslinjen er synlig"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:28
 msgid "Whether the status bar should be visible."
 msgstr "Om statuslinjen skal være synlig."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:29
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ID eller alias for komponenten som skal være forvalgt ved oppstart."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:26
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:30
 msgid "Default sidebar width"
 msgstr "Forvalgt bredde på sidelinje"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:27
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:31
 msgid "The default width for the sidebar, in pixels."
 msgstr "Forvalgt bredde på sidelinjen i piksler."
 
@@ -10524,7 +10559,7 @@ msgid ""
 "arguments."
 msgstr ""
 
-#: ../em-format/e-mail-formatter-attachment.c:425
+#: ../em-format/e-mail-formatter-attachment.c:338
 msgid "Display as attachment"
 msgstr "Vis som vedlegg"
 
@@ -10559,11 +10594,11 @@ msgstr "Vanlig bilde"
 msgid "Display part as an image"
 msgstr "Vis del som et bilde"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:254
+#: ../em-format/e-mail-formatter-message-rfc822.c:250
 msgid "RFC822 message"
 msgstr "RFC822-melding"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:255
+#: ../em-format/e-mail-formatter-message-rfc822.c:251
 msgid "Format part as an RFC822 message"
 msgstr "Formater del som en RFC822-melding"
 
@@ -10616,7 +10651,7 @@ msgstr "Formater del som HTML"
 
 #: ../em-format/e-mail-formatter-quote-text-plain.c:123
 #: ../em-format/e-mail-formatter-text-plain.c:198
-#: ../e-util/e-html-editor-actions.c:1523
+#: ../e-util/e-html-editor-actions.c:1300
 msgid "Plain Text"
 msgstr "Ren tekst"
 
@@ -10625,11 +10660,11 @@ msgstr "Ren tekst"
 msgid "Format part as plain text"
 msgstr "Formater del som ren tekst"
 
-#: ../em-format/e-mail-formatter-secure-button.c:51
+#: ../em-format/e-mail-formatter-secure-button.c:46
 msgid "Unsigned"
 msgstr "Usignert"
 
-#: ../em-format/e-mail-formatter-secure-button.c:51
+#: ../em-format/e-mail-formatter-secure-button.c:46
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -10637,11 +10672,11 @@ msgstr ""
 "Denne meldingen er ikke signert. Du har ingen garanti for at meldingen er "
 "autentisk."
 
-#: ../em-format/e-mail-formatter-secure-button.c:52
+#: ../em-format/e-mail-formatter-secure-button.c:47
 msgid "Valid signature"
 msgstr "Gyldig signatur"
 
-#: ../em-format/e-mail-formatter-secure-button.c:52
+#: ../em-format/e-mail-formatter-secure-button.c:47
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -10649,11 +10684,11 @@ msgstr ""
 "Denne meldingen er signert og gyldig hvilket betyr denne meldingen høyst "
 "sannsynlig er autentisk."
 
-#: ../em-format/e-mail-formatter-secure-button.c:53
+#: ../em-format/e-mail-formatter-secure-button.c:48
 msgid "Invalid signature"
 msgstr "Ugyldig signatur"
 
-#: ../em-format/e-mail-formatter-secure-button.c:53
+#: ../em-format/e-mail-formatter-secure-button.c:48
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -10661,11 +10696,11 @@ msgstr ""
 "Signaturen for denne meldingen kan ikke verifiseres. Den kan være endret "
 "under overføring."
 
-#: ../em-format/e-mail-formatter-secure-button.c:54
+#: ../em-format/e-mail-formatter-secure-button.c:49
 msgid "Valid signature, but cannot verify sender"
 msgstr "Gyldig signatur, men kan ikke verifisere avsender"
 
-#: ../em-format/e-mail-formatter-secure-button.c:54
+#: ../em-format/e-mail-formatter-secure-button.c:49
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -10673,23 +10708,24 @@ msgstr ""
 "Denne meldingen er signert med en gyldig signatur, men avsender av meldingen "
 "kan ikke verifiseres."
 
-#: ../em-format/e-mail-formatter-secure-button.c:55
-msgid "Signature exists, but need public key"
-msgstr "Signatur eksisterer, men trenger offentlig nøkkel"
+#: ../em-format/e-mail-formatter-secure-button.c:50
+msgid "This message is signed, but the public key is not in your keyring"
+msgstr "Denne meldingen er signert, men den offentlig nøkkelen finnes ikke i nøkkelringen din."
 
-#: ../em-format/e-mail-formatter-secure-button.c:55
+#: ../em-format/e-mail-formatter-secure-button.c:50
 msgid ""
-"This message is signed with a signature, but there is no corresponding "
-"public key."
-msgstr ""
-"Denne meldingen er signert med en gyldig signatur, men det finnes ingen "
-"tilhørende offentlig nøkkel."
+"This message was digitally signed, but the corresponding public key is not "
+"present in your keyring. If you want to be able to verify the authenticity "
+"of messages from this person, you should obtain the public key through a "
+"trusted method and add it to your keyring. Until then, there is no guarantee "
+"that this message truly came from that person and that it arrived unaltered."
+msgstr "Denne meldingen har en digital signatur, men tilhørende offentlig nøkkel finnes ikke i din 
nøkkelring. Hvis du ønsker å kunne verifisere at meldinger fra denne personen er autentiske bør du hente den 
offentlige nøkkelen via en metode du stoler på og så legge den til i nøkkelringen. Inntil videre er det ingen 
garanti for at denne meldingen virkelig kom fra denne personen og at den ble mottatt uendret."
 
-#: ../em-format/e-mail-formatter-secure-button.c:62
+#: ../em-format/e-mail-formatter-secure-button.c:59
 msgid "Unencrypted"
 msgstr "Ukryptert"
 
-#: ../em-format/e-mail-formatter-secure-button.c:62
+#: ../em-format/e-mail-formatter-secure-button.c:59
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -10697,11 +10733,11 @@ msgstr ""
 "Denne meldingen er ikke kryptert. Innholdet kan vises under overføring over "
 "Internett."
 
-#: ../em-format/e-mail-formatter-secure-button.c:63
+#: ../em-format/e-mail-formatter-secure-button.c:60
 msgid "Encrypted, weak"
 msgstr "Kryptert, svak"
 
-#: ../em-format/e-mail-formatter-secure-button.c:63
+#: ../em-format/e-mail-formatter-secure-button.c:60
 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 "
@@ -10711,11 +10747,11 @@ msgstr ""
 "vanskelig, men ikke umulig for en utenforstående å se innholdet i denne "
 "meldingen på noenlunde kort tid."
 
-#: ../em-format/e-mail-formatter-secure-button.c:64
+#: ../em-format/e-mail-formatter-secure-button.c:61
 msgid "Encrypted"
 msgstr "Kryptert"
 
-#: ../em-format/e-mail-formatter-secure-button.c:64
+#: ../em-format/e-mail-formatter-secure-button.c:61
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -10723,11 +10759,11 @@ msgstr ""
 "Denne meldingen er kryptert. Det vil være vanskelig for en utenforstående å "
 "se innholdet i denne meldingen."
 
-#: ../em-format/e-mail-formatter-secure-button.c:65
+#: ../em-format/e-mail-formatter-secure-button.c:62
 msgid "Encrypted, strong"
 msgstr "Kryptert, sterk"
 
-#: ../em-format/e-mail-formatter-secure-button.c:65
+#: ../em-format/e-mail-formatter-secure-button.c:62
 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 "
@@ -10736,15 +10772,6 @@ 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."
 
-#: ../em-format/e-mail-formatter-secure-button.c:187
-#: ../shell/shell.error.xml.h:28 ../smime/gui/smime-ui.ui.h:22
-msgid "_View Certificate"
-msgstr "_Vis sertifikat"
-
-#: ../em-format/e-mail-formatter-secure-button.c:202
-msgid "This certificate is not viewable"
-msgstr "Dette sertifikatet kan ikke vises"
-
 #: ../em-format/e-mail-formatter-source.c:121
 msgid "Display source of a MIME part"
 msgstr "Vis kilde av en MIME-del"
@@ -10879,7 +10906,16 @@ msgstr "Nyhetsgrupper"
 msgid "Face"
 msgstr "Ansikt"
 
-#: ../em-format/e-mail-part-utils.c:547
+#: ../em-format/e-mail-part-secure-button.c:118 ../shell/shell.error.xml.h:28
+#: ../smime/gui/smime-ui.ui.h:22
+msgid "_View Certificate"
+msgstr "_Vis sertifikat"
+
+#: ../em-format/e-mail-part-secure-button.c:133
+msgid "This certificate is not viewable"
+msgstr "Dette sertifikatet kan ikke vises"
+
+#: ../em-format/e-mail-part-utils.c:552
 #, c-format
 msgid "%s attachment"
 msgstr "%s-vedlegg"
@@ -10935,7 +10971,7 @@ msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fullført)"
 
 #: ../e-util/e-activity-proxy.c:352
-#: ../modules/mail/e-mail-shell-view-actions.c:1851
+#: ../modules/mail/e-mail-shell-view-actions.c:1923
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -10952,48 +10988,48 @@ msgstr "Klarte ikke å lage en tråd: "
 #. * 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.
-#: ../e-util/e-attachment.c:1227
+#: ../e-util/e-attachment.c:1140
 msgid "Attached message"
 msgstr "Vedlagt melding"
 
-#: ../e-util/e-attachment.c:2173 ../e-util/e-attachment.c:3170
+#: ../e-util/e-attachment.c:2042 ../e-util/e-attachment.c:3098
 msgid "Operation was cancelled"
 msgstr "Operasjonen ble avbrutt"
 
 #. Translators: Default attachment filename.
-#: ../e-util/e-attachment.c:2333 ../e-util/e-attachment.c:3032
-#: ../e-util/e-attachment.c:3403 ../e-util/e-attachment-store.c:696
+#: ../e-util/e-attachment.c:2226 ../e-util/e-attachment.c:2945
+#: ../e-util/e-attachment.c:3388 ../e-util/e-attachment-store.c:884
 msgid "attachment.dat"
 msgstr "vedlegg.dat"
 
-#: ../e-util/e-attachment.c:2414 ../e-util/e-attachment.c:3463
+#: ../e-util/e-attachment.c:2307 ../e-util/e-attachment.c:3448
 msgid "A load operation is already in progress"
 msgstr "En lasteoperasjon er allerede i gang"
 
-#: ../e-util/e-attachment.c:2422 ../e-util/e-attachment.c:3471
+#: ../e-util/e-attachment.c:2315 ../e-util/e-attachment.c:3456
 msgid "A save operation is already in progress"
 msgstr "En lagreoperasjon er allerede i gang"
 
-#: ../e-util/e-attachment.c:2830
+#: ../e-util/e-attachment.c:2712
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Kunne ikke åpne «%s»"
 
-#: ../e-util/e-attachment.c:2833
+#: ../e-util/e-attachment.c:2715
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Kunne ikke åpne vedlegget"
 
-#: ../e-util/e-attachment.c:3480
+#: ../e-util/e-attachment.c:3465
 msgid "Attachment contents not loaded"
 msgstr "Vedleggets innhold ble ikke lastet"
 
-#: ../e-util/e-attachment.c:3571
+#: ../e-util/e-attachment.c:3556
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Kunne ikke lagre «%s»"
 
-#: ../e-util/e-attachment.c:3574
+#: ../e-util/e-attachment.c:3559
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Kunne ikke lagre vedlegget"
@@ -11007,8 +11043,8 @@ msgid "F_ilename:"
 msgstr "F_ilnavn:"
 
 #: ../e-util/e-attachment-dialog.c:356
-#: ../e-util/e-html-editor-image-dialog.c:568
-#: ../e-util/e-html-editor-link-dialog.c:422
+#: ../e-util/e-html-editor-image-dialog.c:510
+#: ../e-util/e-html-editor-link-dialog.c:243
 msgid "_Description:"
 msgstr "_Beskrivelse:"
 
@@ -11016,7 +11052,7 @@ msgstr "_Beskrivelse:"
 msgid "MIME Type:"
 msgstr "MIME-type:"
 
-#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:526
+#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:696
 msgid "_Suggest automatic display of attachment"
 msgstr "Fore_slå automatisk visning av vedlegg"
 
@@ -11046,107 +11082,75 @@ msgstr "Skjul ve_dleggsfelt"
 msgid "Show Attachment _Bar"
 msgstr "Vis ve_dleggsfelt"
 
-#: ../e-util/e-attachment-store.c:491
+#: ../e-util/e-attachment-store.c:661
 msgid "Add Attachment"
 msgstr "Legg til vedlegg"
 
-#: ../e-util/e-attachment-store.c:498 ../e-util/e-attachment-store.c:500
+#: ../e-util/e-attachment-store.c:668 ../e-util/e-attachment-store.c:670
 msgid "A_ttach"
 msgstr "Le_gg ved"
 
-#: ../e-util/e-attachment-store.c:538
+#: ../e-util/e-attachment-store.c:717
 msgid "Archive selected directories using this format:"
 msgstr "Arkiver valgte kataloger med dette formatet:"
 
-#: ../e-util/e-attachment-store.c:631
+#: ../e-util/e-attachment-store.c:821
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Lagre vedlegg"
 msgstr[1] "Lagre vedlegg"
 
-#: ../e-util/e-attachment-store.c:658
+#: ../e-util/e-attachment-store.c:848
 msgid "Do _not extract files from the attachment"
 msgstr "Ikke _hent ut filer fra vedlegget"
 
-#: ../e-util/e-attachment-store.c:663
+#: ../e-util/e-attachment-store.c:853
 msgid "Save extracted files _only"
 msgstr "Lagre k_un uthentede filer"
 
-#: ../e-util/e-attachment-store.c:668
+#: ../e-util/e-attachment-store.c:858
 msgid "Save extracted files and the original _archive"
 msgstr "Lagre uthentede filer og originalt _arkiv"
 
-#: ../e-util/e-attachment-view.c:428
+#: ../e-util/e-attachment-view.c:310
 msgid "Open With Other Application..."
 msgstr "Åpne med et annet program …"
 
-#: ../e-util/e-attachment-view.c:435
+#: ../e-util/e-attachment-view.c:317
 msgid "S_ave All"
 msgstr "L_agre alle"
 
-#: ../e-util/e-attachment-view.c:442
+#: ../e-util/e-attachment-view.c:324
 msgid "Sa_ve As"
 msgstr "L_agre som"
 
-#: ../e-util/e-attachment-view.c:451
+#: ../e-util/e-attachment-view.c:333
 #: ../plugins/save-calendar/save-calendar.c:349
 #: ../plugins/save-calendar/save-calendar.c:380
 #: ../plugins/save-calendar/save-calendar.c:411
 msgid "Save _As"
 msgstr "L_agre som"
 
-#: ../e-util/e-attachment-view.c:461
+#: ../e-util/e-attachment-view.c:343
 msgid "A_dd Attachment..."
 msgstr "Legg til ve_dlegg …"
 
-#: ../e-util/e-attachment-view.c:468
+#: ../e-util/e-attachment-view.c:350
 #: ../modules/addressbook/e-book-shell-view-actions.c:1097
 #: ../modules/calendar/e-cal-shell-view-actions.c:1278
 #: ../modules/calendar/e-memo-shell-view-actions.c:607
 #: ../modules/calendar/e-task-shell-view-actions.c:733
-#: ../modules/mail/e-mail-shell-view-actions.c:1645
-#: ../modules/mail/e-mail-shell-view-actions.c:1716
+#: ../modules/mail/e-mail-shell-view-actions.c:1717
+#: ../modules/mail/e-mail-shell-view-actions.c:1788
 msgid "_Properties"
 msgstr "Egenska_per …"
 
-#: ../e-util/e-attachment-view.c:485 ../e-util/e-source-selector.c:3376
-msgid "_Hide"
-msgstr "_Skjul"
-
-#: ../e-util/e-attachment-view.c:492
-msgid "Hid_e All"
-msgstr "Skj_ul alle"
-
-#: ../e-util/e-attachment-view.c:499
-msgid "_View Inline"
-msgstr "_Vis i meldingsteksten"
-
-#: ../e-util/e-attachment-view.c:506
-msgid "Vie_w All Inline"
-msgstr "_Vis alle i meldingsteksten"
-
-#: ../e-util/e-attachment-view.c:513
-msgid "_Zoom to 100%"
-msgstr "_Zoom til 100%"
-
-#: ../e-util/e-attachment-view.c:515
-msgid "Zoom the image to its natural size"
-msgstr "Zoom bildet til sin opprinnelige størrelse"
-
-#: ../e-util/e-attachment-view.c:520
-msgid "_Zoom to window"
-msgstr "_Zoom tilpasset vinduet"
-
-#: ../e-util/e-attachment-view.c:522
-msgid "Zoom large images to not be wider than the window width"
-msgstr "Zoom store bilder slik at de ikke er bredere enn vinduet"
-
-#: ../e-util/e-attachment-view.c:880
+#: ../e-util/e-attachment-view.c:660
 #, c-format
 msgid "Open With \"%s\""
 msgstr "Åpne med «%s»"
 
-#: ../e-util/e-attachment-view.c:883
+#: ../e-util/e-attachment-view.c:663
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Åpne dette vedlegget i %s"
@@ -11311,7 +11315,7 @@ msgstr "Nå"
 #. strftime format of a weekday and a date.
 #: ../e-util/e-cell-date-edit.c:311 ../e-util/e-datetime-format.c:208
 #: ../modules/calendar/e-cal-shell-view-actions.c:1793
-#: ../modules/itip-formatter/itip-view.c:221
+#: ../modules/itip-formatter/itip-view.c:255
 msgid "Today"
 msgstr "I dag"
 
@@ -11595,7 +11599,7 @@ msgstr "hvit"
 
 #: ../e-util/e-color-combo.c:644 ../mail/e-mail-account-tree-view.c:134
 #: ../mail/e-mail-config-security-page.c:426
-#: ../mail/e-mail-config-security-page.c:590 ../mail/e-mail-reader.c:4037
+#: ../mail/e-mail-config-security-page.c:590 ../mail/e-mail-reader.c:4063
 #: ../mail/mail-config.ui.h:73
 msgid "Default"
 msgstr "Forvalgt"
@@ -11650,7 +11654,7 @@ msgid "Invalid Time Value"
 msgstr "Ugyldig verdi for tid"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:219 ../modules/itip-formatter/itip-view.c:249
+#: ../e-util/e-datetime-format.c:219 ../modules/itip-formatter/itip-view.c:283
 msgid "Tomorrow"
 msgstr "I morgen"
 
@@ -11967,23 +11971,23 @@ msgstr "Velg en tid å sammenligne mot"
 msgid "Choose a File"
 msgstr "Velg en fil"
 
-#: ../e-util/e-filter-rule.c:761
+#: ../e-util/e-filter-rule.c:765
 msgid "R_ule name:"
 msgstr "Regel_navn:"
 
-#: ../e-util/e-filter-rule.c:811
+#: ../e-util/e-filter-rule.c:815
 msgid "all the following conditions"
 msgstr "alle følgende betingelser"
 
-#: ../e-util/e-filter-rule.c:812
+#: ../e-util/e-filter-rule.c:816
 msgid "any of the following conditions"
 msgstr "noen av følgende betingelser"
 
-#: ../e-util/e-filter-rule.c:818
+#: ../e-util/e-filter-rule.c:822
 msgid "_Find items which match:"
 msgstr "_Finn oppføringer som er lik:"
 
-#: ../e-util/e-filter-rule.c:841
+#: ../e-util/e-filter-rule.c:845
 msgid "Find items that meet the following conditions"
 msgstr "Finn oppføringer som møter følgende kriterier"
 
@@ -11991,7 +11995,7 @@ msgstr "Finn oppføringer som møter følgende kriterier"
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../e-util/e-filter-rule.c:856 ../e-util/e-html-editor-page-dialog.c:63
+#: ../e-util/e-filter-rule.c:860 ../e-util/e-html-editor-page-dialog.c:61
 #: ../e-util/e-mail-identity-combo-box.c:479
 #: ../e-util/e-mail-signature-combo-box.c:367
 #: ../libemail-engine/camel-null-store.c:27
@@ -12000,871 +12004,857 @@ msgstr "Finn oppføringer som møter følgende kriterier"
 msgid "None"
 msgstr "Ingen"
 
-#: ../e-util/e-filter-rule.c:857
+#: ../e-util/e-filter-rule.c:861
 msgid "All related"
 msgstr "Alle relaterte"
 
-#: ../e-util/e-filter-rule.c:858 ../e-util/e-send-options.ui.h:19
+#: ../e-util/e-filter-rule.c:862 ../e-util/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "Svar"
 
-#: ../e-util/e-filter-rule.c:859
+#: ../e-util/e-filter-rule.c:863
 msgid "Replies and parents"
 msgstr "Svar med opphav"
 
-#: ../e-util/e-filter-rule.c:860
+#: ../e-util/e-filter-rule.c:864
 msgid "No reply or parent"
 msgstr "Ingen svar eller opphav"
 
-#: ../e-util/e-filter-rule.c:863
+#: ../e-util/e-filter-rule.c:867
 msgid "I_nclude threads:"
 msgstr "Ta _med tråder:"
 
-#: ../e-util/e-filter-rule.c:942
+#: ../e-util/e-filter-rule.c:946
 msgid "A_dd Condition"
 msgstr "Legg til _kriterie"
 
-#: ../e-util/e-filter-rule.c:1256 ../e-util/filter.ui.h:1
+#: ../e-util/e-filter-rule.c:1260 ../e-util/filter.ui.h:1
 #: ../mail/em-utils.c:165
 msgid "Incoming"
 msgstr "Innkommende"
 
-#: ../e-util/e-filter-rule.c:1256 ../mail/em-utils.c:166
+#: ../e-util/e-filter-rule.c:1260 ../mail/em-utils.c:166
 msgid "Outgoing"
 msgstr "Utgående"
 
-#: ../e-util/e-html-editor-actions.c:58
+#: ../e-util/e-html-editor-actions.c:82
 msgid "Failed to insert HTML file."
 msgstr "Klarte ikke å sette inn HTML-fil."
 
-#: ../e-util/e-html-editor-actions.c:95
+#: ../e-util/e-html-editor-actions.c:120
 msgid "Failed to insert text file."
 msgstr "Klarte ikke å sette inn tekstfil."
 
-#: ../e-util/e-html-editor-actions.c:587
+#: ../e-util/e-html-editor-actions.c:321
 msgid "Insert HTML File"
 msgstr "Sett inn HTML-fil"
 
-#: ../e-util/e-html-editor-actions.c:593
+#: ../e-util/e-html-editor-actions.c:327
 msgid "HTML file"
 msgstr "HTML-fil"
 
-#: ../e-util/e-html-editor-actions.c:620
+#: ../e-util/e-html-editor-actions.c:354
 msgctxt "dialog-title"
 msgid "Insert Image"
 msgstr "Sett inn bilde"
 
-#: ../e-util/e-html-editor-actions.c:682
+#: ../e-util/e-html-editor-actions.c:412
 msgid "Insert text file"
 msgstr "Sett inn tekstfil"
 
-#: ../e-util/e-html-editor-actions.c:688
+#: ../e-util/e-html-editor-actions.c:418
 msgid "Text file"
 msgstr "Tekstfil"
 
-#: ../e-util/e-html-editor-actions.c:1075
+#: ../e-util/e-html-editor-actions.c:866
 msgid "Copy selected text to the clipboard"
 msgstr "Kopier valgt tekst til utklippstavlen"
 
-#: ../e-util/e-html-editor-actions.c:1082
+#: ../e-util/e-html-editor-actions.c:873
 msgid "Cut selected text to the clipboard"
 msgstr "Klipp ut valgt tekst til utklippstavlen"
 
 #. Widgets are treating Ctrl + v shortcut themselves
-#: ../e-util/e-html-editor-actions.c:1089
+#: ../e-util/e-html-editor-actions.c:880
 msgid "Paste text from the clipboard"
 msgstr "Lim inn tekst fra utklippstavlen"
 
-#: ../e-util/e-html-editor-actions.c:1096
+#: ../e-util/e-html-editor-actions.c:887
 msgid "Redo the last undone action"
 msgstr "Gjenopprett siste angrede handling"
 
-#: ../e-util/e-html-editor-actions.c:1110
+#: ../e-util/e-html-editor-actions.c:901
 msgid "Undo the last action"
 msgstr "Angre siste handling"
 
-#: ../e-util/e-html-editor-actions.c:1131
+#: ../e-util/e-html-editor-actions.c:922
 msgid "For_mat"
 msgstr "For_mat"
 
-#: ../e-util/e-html-editor-actions.c:1138
+#: ../e-util/e-html-editor-actions.c:929
 msgid "_Paragraph Style"
 msgstr "Stil for a_vsnitt"
 
-#: ../e-util/e-html-editor-actions.c:1152
-#: ../e-util/e-html-editor-image-dialog.c:645
+#: ../e-util/e-html-editor-actions.c:943
+#: ../e-util/e-html-editor-image-dialog.c:587
 msgid "_Alignment"
 msgstr "_Justering"
 
-#: ../e-util/e-html-editor-actions.c:1159
+#: ../e-util/e-html-editor-actions.c:950
 msgid "Current _Languages"
 msgstr "Aktive _språk"
 
-#: ../e-util/e-html-editor-actions.c:1176
+#: ../e-util/e-html-editor-actions.c:967
 msgid "_Increase Indent"
 msgstr "_Øk innrykk"
 
-#: ../e-util/e-html-editor-actions.c:1178
+#: ../e-util/e-html-editor-actions.c:969
 msgid "Increase Indent"
 msgstr "Øk innrykk"
 
-#: ../e-util/e-html-editor-actions.c:1183
+#: ../e-util/e-html-editor-actions.c:974
 msgid "_HTML File..."
 msgstr "_HTML-fil …"
 
-#: ../e-util/e-html-editor-actions.c:1190
+#: ../e-util/e-html-editor-actions.c:981
 msgid "Te_xt File..."
 msgstr "Te_kstfil …"
 
-#: ../e-util/e-html-editor-actions.c:1197
+#: ../e-util/e-html-editor-actions.c:988
 msgid "Paste _Quotation"
 msgstr "Lim inn _sitat"
 
-#: ../e-util/e-html-editor-actions.c:1204
+#: ../e-util/e-html-editor-actions.c:995
 msgid "_Find..."
 msgstr "_Finn …"
 
-#: ../e-util/e-html-editor-actions.c:1206
+#: ../e-util/e-html-editor-actions.c:997
 msgid "Search for text"
 msgstr "Søk etter tekst"
 
-#: ../e-util/e-html-editor-actions.c:1211
+#: ../e-util/e-html-editor-actions.c:1002
 msgid "Find A_gain"
 msgstr "Finn i_gjen"
 
-#: ../e-util/e-html-editor-actions.c:1218
+#: ../e-util/e-html-editor-actions.c:1009
 msgid "Re_place..."
 msgstr "E_rstatt …"
 
-#: ../e-util/e-html-editor-actions.c:1220
+#: ../e-util/e-html-editor-actions.c:1011
 msgid "Search for and replace text"
 msgstr "Søk etter og erstatt tekst"
 
-#: ../e-util/e-html-editor-actions.c:1225
+#: ../e-util/e-html-editor-actions.c:1016
 msgid "Check _Spelling..."
 msgstr "Sjekk _staving …"
 
-#: ../e-util/e-html-editor-actions.c:1232
+#: ../e-util/e-html-editor-actions.c:1023
 msgid "_Decrease Indent"
 msgstr "_Mindre innrykk"
 
-#: ../e-util/e-html-editor-actions.c:1234
+#: ../e-util/e-html-editor-actions.c:1025
 msgid "Decrease Indent"
 msgstr "Mindre innrykk"
 
-#: ../e-util/e-html-editor-actions.c:1239
+#: ../e-util/e-html-editor-actions.c:1030
 msgid "_Wrap Lines"
 msgstr "_Bryt linjer"
 
-#: ../e-util/e-html-editor-actions.c:1246
-msgid "Open Inspector"
-msgstr "Åpne inspektør"
-
 #. Center
-#: ../e-util/e-html-editor-actions.c:1256
+#: ../e-util/e-html-editor-actions.c:1040
 #: ../e-util/e-html-editor-paragraph-dialog.c:110
 msgid "_Center"
 msgstr "_Sentrer"
 
-#: ../e-util/e-html-editor-actions.c:1258
+#: ../e-util/e-html-editor-actions.c:1042
 msgid "Center Alignment"
 msgstr "Sentrert"
 
 #. Left
-#: ../e-util/e-html-editor-actions.c:1263
+#: ../e-util/e-html-editor-actions.c:1047
 #: ../e-util/e-html-editor-paragraph-dialog.c:101
 msgid "_Left"
 msgstr "_Venstre"
 
-#: ../e-util/e-html-editor-actions.c:1265
+#: ../e-util/e-html-editor-actions.c:1049
 msgid "Left Alignment"
 msgstr "Venstrejustert"
 
 #. Right
-#: ../e-util/e-html-editor-actions.c:1270
+#: ../e-util/e-html-editor-actions.c:1054
 #: ../e-util/e-html-editor-paragraph-dialog.c:119
 msgid "_Right"
 msgstr "Høy_re"
 
-#: ../e-util/e-html-editor-actions.c:1272
+#: ../e-util/e-html-editor-actions.c:1056
 msgid "Right Alignment"
 msgstr "Høyrejustert"
 
-#: ../e-util/e-html-editor-actions.c:1280
+#: ../e-util/e-html-editor-actions.c:1064
 #: ../modules/text-highlight/languages.c:72
 msgid "_HTML"
 msgstr "_HTML"
 
-#: ../e-util/e-html-editor-actions.c:1282
+#: ../e-util/e-html-editor-actions.c:1066
 msgid "HTML editing mode"
 msgstr "HTML-redigering"
 
-#: ../e-util/e-html-editor-actions.c:1287
+#: ../e-util/e-html-editor-actions.c:1071
 msgid "Plain _Text"
 msgstr "Vanlig _tekst"
 
-#: ../e-util/e-html-editor-actions.c:1289
+#: ../e-util/e-html-editor-actions.c:1073
 msgid "Plain text editing mode"
 msgstr "Tekstredigering"
 
-#: ../e-util/e-html-editor-actions.c:1297
+#: ../e-util/e-html-editor-actions.c:1081
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../e-util/e-html-editor-actions.c:1304
+#: ../e-util/e-html-editor-actions.c:1088
 msgid "Header _1"
 msgstr "Topptekst _1"
 
-#: ../e-util/e-html-editor-actions.c:1311
+#: ../e-util/e-html-editor-actions.c:1095
 msgid "Header _2"
 msgstr "Topptekst _2"
 
-#: ../e-util/e-html-editor-actions.c:1318
+#: ../e-util/e-html-editor-actions.c:1102
 msgid "Header _3"
 msgstr "Topptekst _3"
 
-#: ../e-util/e-html-editor-actions.c:1325
+#: ../e-util/e-html-editor-actions.c:1109
 msgid "Header _4"
 msgstr "Topptekst _4"
 
-#: ../e-util/e-html-editor-actions.c:1332
+#: ../e-util/e-html-editor-actions.c:1116
 msgid "Header _5"
 msgstr "Topptekst _5"
 
-#: ../e-util/e-html-editor-actions.c:1339
+#: ../e-util/e-html-editor-actions.c:1123
 msgid "Header _6"
 msgstr "Topptekst _6"
 
-#: ../e-util/e-html-editor-actions.c:1346
+#: ../e-util/e-html-editor-actions.c:1130
 msgid "_Preformatted"
 msgstr "_Forhåndsformatert"
 
-#: ../e-util/e-html-editor-actions.c:1353
+#: ../e-util/e-html-editor-actions.c:1137
 msgid "A_ddress"
 msgstr "A_dresse"
 
-#: ../e-util/e-html-editor-actions.c:1360
-msgid "_Blockquote"
-msgstr "_Blokksitat"
-
-#: ../e-util/e-html-editor-actions.c:1367
+#: ../e-util/e-html-editor-actions.c:1144
 msgid "_Bulleted List"
 msgstr "_Kulepunktliste"
 
-#: ../e-util/e-html-editor-actions.c:1374
+#: ../e-util/e-html-editor-actions.c:1151
 msgid "_Roman Numeral List"
 msgstr "Liste med _romerske tall"
 
-#: ../e-util/e-html-editor-actions.c:1381
+#: ../e-util/e-html-editor-actions.c:1158
 msgid "Numbered _List"
 msgstr "Nummerert _liste"
 
-#: ../e-util/e-html-editor-actions.c:1388
+#: ../e-util/e-html-editor-actions.c:1165
 msgid "_Alphabetical List"
 msgstr "_Alfabetisk liste"
 
-#: ../e-util/e-html-editor-actions.c:1404
-#: ../e-util/e-html-editor-actions.c:1442
+#: ../e-util/e-html-editor-actions.c:1181
+#: ../e-util/e-html-editor-actions.c:1219
 msgid "_Image..."
 msgstr "B_ilde …"
 
 #. Translators: This is an action tooltip
-#: ../e-util/e-html-editor-actions.c:1407
+#: ../e-util/e-html-editor-actions.c:1184
 msgid "Insert Image"
 msgstr "Sett inn bilde"
 
-#: ../e-util/e-html-editor-actions.c:1412
-#: ../e-util/e-html-editor-actions.c:1449
+#: ../e-util/e-html-editor-actions.c:1189
+#: ../e-util/e-html-editor-actions.c:1226
 msgid "_Link..."
 msgstr "_Lenke …"
 
-#: ../e-util/e-html-editor-actions.c:1414
+#: ../e-util/e-html-editor-actions.c:1191
 msgid "Insert Link"
 msgstr "Sett inn lenke"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1420
-#: ../e-util/e-html-editor-actions.c:1464
+#: ../e-util/e-html-editor-actions.c:1197
+#: ../e-util/e-html-editor-actions.c:1241
 msgid "_Rule..."
 msgstr "_Regel …"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1423
+#: ../e-util/e-html-editor-actions.c:1200
 msgid "Insert Rule"
 msgstr "Sett inn regel"
 
-#: ../e-util/e-html-editor-actions.c:1428
-#: ../e-util/e-html-editor-actions.c:1471
+#: ../e-util/e-html-editor-actions.c:1205
+#: ../e-util/e-html-editor-actions.c:1248
 msgid "_Table..."
 msgstr "_Tabell …"
 
-#: ../e-util/e-html-editor-actions.c:1430
+#: ../e-util/e-html-editor-actions.c:1207
 msgid "Insert Table"
 msgstr "Sett inn tabell"
 
-#: ../e-util/e-html-editor-actions.c:1435
+#: ../e-util/e-html-editor-actions.c:1212
 msgid "_Cell..."
 msgstr "_Celle …"
 
-#: ../e-util/e-html-editor-actions.c:1456
+#: ../e-util/e-html-editor-actions.c:1233
 msgid "Pa_ge..."
 msgstr "Si_de …"
 
-#: ../e-util/e-html-editor-actions.c:1480
+#: ../e-util/e-html-editor-actions.c:1257
 msgid "Font _Size"
 msgstr "Skrift_størrelse"
 
-#: ../e-util/e-html-editor-actions.c:1487
+#: ../e-util/e-html-editor-actions.c:1264
 msgid "_Font Style"
 msgstr "Skri_ftstil"
 
-#: ../e-util/e-html-editor-actions.c:1494
+#: ../e-util/e-html-editor-actions.c:1271
 msgid "Paste As _Text"
 msgstr "Lim inn som _tekst"
 
-#: ../e-util/e-html-editor-actions.c:1505
-#: ../e-util/e-html-editor-text-dialog.c:214
+#: ../e-util/e-html-editor-actions.c:1282
+#: ../e-util/e-html-editor-text-dialog.c:203
 msgid "_Bold"
 msgstr "_Fet"
 
-#: ../e-util/e-html-editor-actions.c:1507
+#: ../e-util/e-html-editor-actions.c:1284
 msgid "Bold"
 msgstr "Fet"
 
-#: ../e-util/e-html-editor-actions.c:1513
-#: ../e-util/e-html-editor-text-dialog.c:225
+#: ../e-util/e-html-editor-actions.c:1290
+#: ../e-util/e-html-editor-text-dialog.c:214
 msgid "_Italic"
 msgstr "_Kursiv"
 
-#: ../e-util/e-html-editor-actions.c:1515
+#: ../e-util/e-html-editor-actions.c:1292
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../e-util/e-html-editor-actions.c:1521
+#: ../e-util/e-html-editor-actions.c:1298
 msgid "_Plain Text"
 msgstr "_Vanlig tekst"
 
-#: ../e-util/e-html-editor-actions.c:1529
-#: ../e-util/e-html-editor-text-dialog.c:246
+#: ../e-util/e-html-editor-actions.c:1306
+#: ../e-util/e-html-editor-text-dialog.c:235
 msgid "_Strikethrough"
 msgstr "Gjennom_streket"
 
-#: ../e-util/e-html-editor-actions.c:1531
+#: ../e-util/e-html-editor-actions.c:1308
 msgid "Strikethrough"
 msgstr "Gjennomstrek"
 
-#: ../e-util/e-html-editor-actions.c:1537
-#: ../e-util/e-html-editor-text-dialog.c:236
+#: ../e-util/e-html-editor-actions.c:1314
+#: ../e-util/e-html-editor-text-dialog.c:225
 msgid "_Underline"
 msgstr "_Understrek"
 
-#: ../e-util/e-html-editor-actions.c:1539
+#: ../e-util/e-html-editor-actions.c:1316
 msgid "Underline"
 msgstr "Understrek"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1549
+#: ../e-util/e-html-editor-actions.c:1326
 msgid "-2"
 msgstr "-2"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1557
+#: ../e-util/e-html-editor-actions.c:1334
 msgid "-1"
 msgstr "-1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1565
+#: ../e-util/e-html-editor-actions.c:1342
 msgid "+0"
 msgstr "+0"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1573
+#: ../e-util/e-html-editor-actions.c:1350
 msgid "+1"
 msgstr "+1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1581
+#: ../e-util/e-html-editor-actions.c:1358
 msgid "+2"
 msgstr "+2"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1589
+#: ../e-util/e-html-editor-actions.c:1366
 msgid "+3"
 msgstr "+3"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1597
+#: ../e-util/e-html-editor-actions.c:1374
 msgid "+4"
 msgstr "+4"
 
-#: ../e-util/e-html-editor-actions.c:1616
+#: ../e-util/e-html-editor-actions.c:1393
 msgid "Cell Contents"
 msgstr "Celleinnhold"
 
-#: ../e-util/e-html-editor-actions.c:1623
+#: ../e-util/e-html-editor-actions.c:1400
 msgid "Column"
 msgstr "Kolonne"
 
-#: ../e-util/e-html-editor-actions.c:1630
+#: ../e-util/e-html-editor-actions.c:1407
 msgid "Row"
 msgstr "Rad"
 
-#: ../e-util/e-html-editor-actions.c:1637
-#: ../e-util/e-html-editor-actions.c:1722
+#: ../e-util/e-html-editor-actions.c:1414
 msgid "Table"
 msgstr "Tabell"
 
 #. Translators: Popup menu item caption, containing all the Delete options for a table
-#: ../e-util/e-html-editor-actions.c:1647
+#: ../e-util/e-html-editor-actions.c:1424
 msgid "Table Delete"
 msgstr "Slett tabell"
 
-#: ../e-util/e-html-editor-actions.c:1654 ../e-util/e-text.c:2147
-msgid "Input Methods"
-msgstr "Inndatametoder"
-
 #. Translators: Popup menu item caption, containing all the Insert options for a table
-#: ../e-util/e-html-editor-actions.c:1662
+#: ../e-util/e-html-editor-actions.c:1432
 msgid "Table Insert"
 msgstr "Sett inn tabell"
 
-#: ../e-util/e-html-editor-actions.c:1669
+#: ../e-util/e-html-editor-actions.c:1439
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: ../e-util/e-html-editor-actions.c:1687
+#: ../e-util/e-html-editor-actions.c:1457
 msgid "Column After"
 msgstr "Kolonne etter"
 
-#: ../e-util/e-html-editor-actions.c:1694
+#: ../e-util/e-html-editor-actions.c:1464
 msgid "Column Before"
 msgstr "Kolonne før"
 
-#: ../e-util/e-html-editor-actions.c:1701
+#: ../e-util/e-html-editor-actions.c:1471
 msgid "Insert _Link"
 msgstr "Sett inn _lenke"
 
-#: ../e-util/e-html-editor-actions.c:1708
+#: ../e-util/e-html-editor-actions.c:1478
 msgid "Row Above"
 msgstr "Rad over"
 
-#: ../e-util/e-html-editor-actions.c:1715
+#: ../e-util/e-html-editor-actions.c:1485
 msgid "Row Below"
 msgstr "Rad under"
 
-#: ../e-util/e-html-editor-actions.c:1729
+#: ../e-util/e-html-editor-actions.c:1492
 msgid "Cell..."
 msgstr "Celle …"
 
-#: ../e-util/e-html-editor-actions.c:1736
+#: ../e-util/e-html-editor-actions.c:1499
 msgid "Image..."
 msgstr "Bilde …"
 
-#: ../e-util/e-html-editor-actions.c:1743
+#: ../e-util/e-html-editor-actions.c:1506
 msgid "Link..."
 msgstr "Lenke …"
 
-#: ../e-util/e-html-editor-actions.c:1750
+#: ../e-util/e-html-editor-actions.c:1513
 msgid "Page..."
 msgstr "Side …"
 
-#: ../e-util/e-html-editor-actions.c:1757
+#: ../e-util/e-html-editor-actions.c:1520
 msgid "Paragraph..."
 msgstr "Avsnitt …"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1765
+#: ../e-util/e-html-editor-actions.c:1528
 msgid "Rule..."
 msgstr "Regel …"
 
-#: ../e-util/e-html-editor-actions.c:1772
+#: ../e-util/e-html-editor-actions.c:1535
 msgid "Table..."
 msgstr "Tabell …"
 
-#: ../e-util/e-html-editor-actions.c:1779
+#: ../e-util/e-html-editor-actions.c:1542
 msgid "Text..."
 msgstr "Tekst …"
 
-#: ../e-util/e-html-editor-actions.c:1786
+#: ../e-util/e-html-editor-actions.c:1549
 msgid "Remove Link"
 msgstr "Fjern lenke"
 
-#: ../e-util/e-html-editor-actions.c:1803
+#: ../e-util/e-html-editor-actions.c:1566
 msgid "Add Word to Dictionary"
 msgstr "Legg til ord i ordbok"
 
-#: ../e-util/e-html-editor-actions.c:1810
+#: ../e-util/e-html-editor-actions.c:1573
 msgid "Ignore Misspelled Word"
 msgstr "Overse feilstavet ord"
 
-#: ../e-util/e-html-editor-actions.c:1817
+#: ../e-util/e-html-editor-actions.c:1580
 msgid "Add Word To"
 msgstr "Legg til ord i"
 
-#: ../e-util/e-html-editor-actions.c:1826
+#: ../e-util/e-html-editor-actions.c:1589
 msgid "More Suggestions"
 msgstr "Flere forslag"
 
 #. Translators: %s will be replaced with the actual dictionary
 #. * name, where a user can add a word to. This is part of an
 #. * "Add Word To" submenu.
-#: ../e-util/e-html-editor-actions.c:1947
+#: ../e-util/e-html-editor-actions.c:1713
 #, c-format
 msgid "%s Dictionary"
 msgstr "%s ordbok"
 
-#: ../e-util/e-html-editor-actions.c:2037
+#: ../e-util/e-html-editor-actions.c:1792
 msgid "_Emoticon"
 msgstr "_Emotikon"
 
-#: ../e-util/e-html-editor-actions.c:2038
+#: ../e-util/e-html-editor-actions.c:1793
 msgid "Insert Emoticon"
 msgstr "Sett inn emotikon"
 
-#: ../e-util/e-html-editor-actions.c:2106
+#: ../e-util/e-html-editor-actions.c:1861
 msgid "Re_place"
 msgstr "E_rstatt"
 
-#: ../e-util/e-html-editor-actions.c:2109
+#: ../e-util/e-html-editor-actions.c:1864
 msgid "_Image"
 msgstr "B_ilde"
 
-#: ../e-util/e-html-editor-actions.c:2112
+#: ../e-util/e-html-editor-actions.c:1867
 msgid "_Link"
 msgstr "_Lenke"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:2116
+#: ../e-util/e-html-editor-actions.c:1871
 msgid "_Rule"
 msgstr "_Regel"
 
-#: ../e-util/e-html-editor-actions.c:2119
-#: ../e-util/e-html-editor-cell-dialog.c:738
+#: ../e-util/e-html-editor-actions.c:1874
+#: ../e-util/e-html-editor-cell-dialog.c:450
 msgid "_Table"
 msgstr "_Tabell"
 
-#: ../e-util/e-html-editor.c:707
+#: ../e-util/e-html-editor.c:689
 msgid "Paragraph Style"
 msgstr "Avsnittstil"
 
-#: ../e-util/e-html-editor.c:721
+#: ../e-util/e-html-editor.c:703
 msgid "Editing Mode"
 msgstr "Redigeringsmodus"
 
-#: ../e-util/e-html-editor.c:733
+#: ../e-util/e-html-editor.c:715
 msgid "Font Color"
 msgstr "Skriftfarge"
 
-#: ../e-util/e-html-editor.c:751
+#: ../e-util/e-html-editor.c:725
 msgid "Font Size"
 msgstr "Skriftstørrelse"
 
-#: ../e-util/e-html-editor-cell-dialog.c:698
+#: ../e-util/e-html-editor-cell-dialog.c:410
 msgid "<b>Scope</b>"
 msgstr "<b>Omfang</b>"
 
-#: ../e-util/e-html-editor-cell-dialog.c:712
+#: ../e-util/e-html-editor-cell-dialog.c:424
 msgid "C_ell"
 msgstr "C_elle"
 
-#: ../e-util/e-html-editor-cell-dialog.c:725
+#: ../e-util/e-html-editor-cell-dialog.c:437
 msgid "_Row"
 msgstr "_Rad"
 
-#: ../e-util/e-html-editor-cell-dialog.c:751
+#: ../e-util/e-html-editor-cell-dialog.c:463
 msgid "Col_umn"
 msgstr "Kol_onne"
 
-#: ../e-util/e-html-editor-cell-dialog.c:761
+#: ../e-util/e-html-editor-cell-dialog.c:473
 msgid "<b>Alignment &amp; Behavior</b>"
 msgstr "<b>Justering &amp; oppførsel</b>"
 
-#: ../e-util/e-html-editor-cell-dialog.c:774
-#: ../e-util/e-html-editor-hrule-dialog.c:413
-#: ../e-util/e-html-editor-table-dialog.c:900
+#: ../e-util/e-html-editor-cell-dialog.c:486
+#: ../e-util/e-html-editor-hrule-dialog.c:330
+#: ../e-util/e-html-editor-table-dialog.c:651
 msgid "Left"
 msgstr "Venstre"
 
-#: ../e-util/e-html-editor-cell-dialog.c:775
-#: ../e-util/e-html-editor-hrule-dialog.c:415
-#: ../e-util/e-html-editor-table-dialog.c:901
+#: ../e-util/e-html-editor-cell-dialog.c:487
+#: ../e-util/e-html-editor-hrule-dialog.c:332
+#: ../e-util/e-html-editor-table-dialog.c:652
 msgid "Center"
 msgstr "Senter"
 
-#: ../e-util/e-html-editor-cell-dialog.c:776
-#: ../e-util/e-html-editor-hrule-dialog.c:417
-#: ../e-util/e-html-editor-table-dialog.c:902
+#: ../e-util/e-html-editor-cell-dialog.c:488
+#: ../e-util/e-html-editor-hrule-dialog.c:334
+#: ../e-util/e-html-editor-table-dialog.c:653
 msgid "Right"
 msgstr "Høyre"
 
-#: ../e-util/e-html-editor-cell-dialog.c:784
+#: ../e-util/e-html-editor-cell-dialog.c:496
 msgid "_Horizontal:"
 msgstr "_Horisontal:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:792
-#: ../e-util/e-html-editor-image-dialog.c:635
+#: ../e-util/e-html-editor-cell-dialog.c:504
+#: ../e-util/e-html-editor-image-dialog.c:577
 msgid "Top"
 msgstr "Topp"
 
-#: ../e-util/e-html-editor-cell-dialog.c:793
-#: ../e-util/e-html-editor-image-dialog.c:636
+#: ../e-util/e-html-editor-cell-dialog.c:505
+#: ../e-util/e-html-editor-image-dialog.c:578
 msgid "Middle"
 msgstr "Midt på"
 
-#: ../e-util/e-html-editor-cell-dialog.c:794
-#: ../e-util/e-html-editor-image-dialog.c:637
+#: ../e-util/e-html-editor-cell-dialog.c:506
+#: ../e-util/e-html-editor-image-dialog.c:579
 msgid "Bottom"
 msgstr "Bunn"
 
-#: ../e-util/e-html-editor-cell-dialog.c:802
+#: ../e-util/e-html-editor-cell-dialog.c:514
 msgid "_Vertical:"
 msgstr "_Vertikal:"
 
 #. Wrap Text
-#: ../e-util/e-html-editor-cell-dialog.c:808
+#: ../e-util/e-html-editor-cell-dialog.c:520
 msgid "_Wrap Text"
 msgstr "_Bryt tekst"
 
 #. Header Style
-#: ../e-util/e-html-editor-cell-dialog.c:816
+#: ../e-util/e-html-editor-cell-dialog.c:528
 msgid "_Header Style"
 msgstr "Stil _for topptekst"
 
-#: ../e-util/e-html-editor-cell-dialog.c:830
-#: ../e-util/e-html-editor-image-dialog.c:575
-#: ../e-util/e-html-editor-table-dialog.c:812
+#: ../e-util/e-html-editor-cell-dialog.c:542
+#: ../e-util/e-html-editor-image-dialog.c:517
+#: ../e-util/e-html-editor-table-dialog.c:563
 msgid "<b>Layout</b>"
 msgstr "<b>Utforming</b>"
 
 #. Width
-#: ../e-util/e-html-editor-cell-dialog.c:841
+#: ../e-util/e-html-editor-cell-dialog.c:553
 msgid "_Width"
 msgstr "_Bredde"
 
-#: ../e-util/e-html-editor-cell-dialog.c:880
+#: ../e-util/e-html-editor-cell-dialog.c:593
 msgid "Row S_pan:"
 msgstr "Rad_lengde:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:894
+#: ../e-util/e-html-editor-cell-dialog.c:607
 msgid "Co_lumn Span:"
 msgstr "Kolon_nelengde:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:901
-#: ../e-util/e-html-editor-table-dialog.c:916
+#: ../e-util/e-html-editor-cell-dialog.c:614
+#: ../e-util/e-html-editor-table-dialog.c:667
 msgid "<b>Background</b>"
 msgstr "<b>Bakgrunn</b>"
 
-#: ../e-util/e-html-editor-cell-dialog.c:914
-#: ../e-util/e-html-editor-table-dialog.c:929
+#: ../e-util/e-html-editor-cell-dialog.c:627
+#: ../e-util/e-html-editor-table-dialog.c:680
 msgid "Transparent"
 msgstr "Gjennomsiktig"
 
-#: ../e-util/e-html-editor-cell-dialog.c:922
+#: ../e-util/e-html-editor-cell-dialog.c:635
 msgid "C_olor:"
 msgstr "F_arge:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:930
-#: ../e-util/e-html-editor-image-dialog.c:537
-#: ../e-util/e-html-editor-table-dialog.c:945
+#: ../e-util/e-html-editor-cell-dialog.c:643
+#: ../e-util/e-html-editor-image-dialog.c:479
+#: ../e-util/e-html-editor-table-dialog.c:696
 msgid "Choose Background Image"
 msgstr "Velg bakgrunnsfarge"
 
-#: ../e-util/e-html-editor-cell-dialog.c:935
-#: ../e-util/e-html-editor-image-dialog.c:543
-#: ../e-util/e-html-editor-table-dialog.c:950
+#: ../e-util/e-html-editor-cell-dialog.c:648
+#: ../e-util/e-html-editor-image-dialog.c:485
+#: ../e-util/e-html-editor-table-dialog.c:701
 msgid "Images"
 msgstr "Bilder"
 
-#: ../e-util/e-html-editor-cell-dialog.c:948
+#: ../e-util/e-html-editor-cell-dialog.c:661
 msgid "_Image:"
 msgstr "B_ilde:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:955
-#: ../e-util/e-html-editor-page-dialog.c:660
-#: ../e-util/e-html-editor-table-dialog.c:970
+#: ../e-util/e-html-editor-cell-dialog.c:668
+#: ../e-util/e-html-editor-page-dialog.c:497
+#: ../e-util/e-html-editor-table-dialog.c:721
 msgid "_Remove image"
 msgstr "Fje_rn bilde"
 
-#: ../e-util/e-html-editor-cell-dialog.c:975
+#: ../e-util/e-html-editor-cell-dialog.c:688
 msgid "Cell Properties"
 msgstr "Egenskaper for celle"
 
-#: ../e-util/e-html-editor-find-dialog.c:105
-#: ../e-util/e-html-editor-replace-dialog.c:90
-#: ../e-util/e-html-editor-replace-dialog.c:108
+#: ../e-util/e-html-editor-find-dialog.c:94
+#: ../e-util/e-html-editor-replace-dialog.c:70
 msgid "No match found"
 msgstr "Ingen treff funnet"
 
-#: ../e-util/e-html-editor-find-dialog.c:160
-#: ../e-util/e-html-editor-replace-dialog.c:247
+#: ../e-util/e-html-editor-find-dialog.c:217
+#: ../e-util/e-html-editor-replace-dialog.c:297
 msgid "Search _backwards"
 msgstr "Søk _bakover"
 
-#: ../e-util/e-html-editor-find-dialog.c:167
+#: ../e-util/e-html-editor-find-dialog.c:224
 msgid "Case _Sensitive"
 msgstr "Skill mellom små/store bokstaver"
 
-#: ../e-util/e-html-editor-find-dialog.c:174
+#: ../e-util/e-html-editor-find-dialog.c:231
 msgid "_Wrap Search"
 msgstr "_Søk på nytt når slutten er nådd"
 
-#: ../e-util/e-html-editor-find-dialog.c:213
+#: ../e-util/e-html-editor-find-dialog.c:270
 msgid "Find"
 msgstr "Finn"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:348
+#: ../e-util/e-html-editor-hrule-dialog.c:265
 msgid "<b>Size</b>"
 msgstr "<b>Størrelse</b>"
 
 #. Width
-#: ../e-util/e-html-editor-hrule-dialog.c:368
-#: ../e-util/e-html-editor-image-dialog.c:593
-#: ../e-util/e-html-editor-table-dialog.c:823
+#: ../e-util/e-html-editor-hrule-dialog.c:285
+#: ../e-util/e-html-editor-image-dialog.c:535
+#: ../e-util/e-html-editor-table-dialog.c:574
 msgid "_Width:"
 msgstr "_Bredde:"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:393
+#: ../e-util/e-html-editor-hrule-dialog.c:310
 msgid "_Size:"
 msgstr "_Størrelse:"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:400
+#: ../e-util/e-html-editor-hrule-dialog.c:317
 msgid "<b>Style</b>"
 msgstr "<b>Stil</b>"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:425
-#: ../e-util/e-html-editor-table-dialog.c:909
+#: ../e-util/e-html-editor-hrule-dialog.c:342
+#: ../e-util/e-html-editor-table-dialog.c:660
 msgid "_Alignment:"
 msgstr "_Justering:"
 
 #. Shaded
-#: ../e-util/e-html-editor-hrule-dialog.c:431
+#: ../e-util/e-html-editor-hrule-dialog.c:348
 msgid "S_haded"
 msgstr "S_kyggelagt"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:448
+#: ../e-util/e-html-editor-hrule-dialog.c:365
 msgid "Rule properties"
 msgstr "Egenskaper for regel"
 
-#: ../e-util/e-html-editor-image-dialog.c:525
+#: ../e-util/e-html-editor-image-dialog.c:467
 #: ../e-util/e-html-editor-paragraph-dialog.c:66
-#: ../e-util/e-html-editor-table-dialog.c:766
+#: ../e-util/e-html-editor-table-dialog.c:517
 msgid "<b>General</b>"
 msgstr "<b>Generelt</b>"
 
-#: ../e-util/e-html-editor-image-dialog.c:554
+#: ../e-util/e-html-editor-image-dialog.c:496
 msgid "_Source:"
 msgstr "_Kilde:"
 
-#: ../e-util/e-html-editor-image-dialog.c:617
+#: ../e-util/e-html-editor-image-dialog.c:559
 msgid "_Height:"
 msgstr "_Høyde:"
 
-#: ../e-util/e-html-editor-image-dialog.c:658
+#: ../e-util/e-html-editor-image-dialog.c:600
 msgid "_X-Padding:"
 msgstr "_Horisontalt fyll:"
 
-#: ../e-util/e-html-editor-image-dialog.c:674
+#: ../e-util/e-html-editor-image-dialog.c:616
 msgid "_Y-Padding:"
 msgstr "_Vertikalt fyll:"
 
-#: ../e-util/e-html-editor-image-dialog.c:690
-#: ../e-util/e-html-editor-table-dialog.c:890
+#: ../e-util/e-html-editor-image-dialog.c:632
+#: ../e-util/e-html-editor-table-dialog.c:641
 msgid "_Border:"
 msgstr "_Kant:"
 
-#: ../e-util/e-html-editor-image-dialog.c:700
+#: ../e-util/e-html-editor-image-dialog.c:642
 msgid "<b>Link</b>"
 msgstr "<b>Lenke</b>"
 
-#: ../e-util/e-html-editor-image-dialog.c:718
-#: ../e-util/e-html-editor-link-dialog.c:400
+#: ../e-util/e-html-editor-image-dialog.c:660
+#: ../e-util/e-html-editor-link-dialog.c:221
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../e-util/e-html-editor-image-dialog.c:723
-#: ../e-util/e-html-editor-link-dialog.c:405
+#: ../e-util/e-html-editor-image-dialog.c:665
+#: ../e-util/e-html-editor-link-dialog.c:226
 msgid "_Test URL..."
 msgstr "_Test URL …"
 
-#: ../e-util/e-html-editor-image-dialog.c:740
+#: ../e-util/e-html-editor-image-dialog.c:682
 msgid "Image Properties"
 msgstr "Egenskaper for bilde"
 
-#: ../e-util/e-html-editor-link-dialog.c:429
+#: ../e-util/e-html-editor-link-dialog.c:250
 msgid "_Remove Link"
 msgstr "Fje_rn lenke"
 
-#: ../e-util/e-html-editor-link-dialog.c:454
+#: ../e-util/e-html-editor-link-dialog.c:275
 msgid "Link Properties"
 msgstr "Egenskaper for lenke"
 
-#: ../e-util/e-html-editor-page-dialog.c:72
+#: ../e-util/e-html-editor-page-dialog.c:70
 msgid "Perforated Paper"
 msgstr "Perforert papir"
 
-#: ../e-util/e-html-editor-page-dialog.c:81
+#: ../e-util/e-html-editor-page-dialog.c:79
 msgid "Blue Ink"
 msgstr "Blått blekk"
 
-#: ../e-util/e-html-editor-page-dialog.c:90
+#: ../e-util/e-html-editor-page-dialog.c:88
 msgid "Paper"
 msgstr "Papir"
 
-#: ../e-util/e-html-editor-page-dialog.c:99
+#: ../e-util/e-html-editor-page-dialog.c:97
 msgid "Ribbon"
 msgstr "Bånd"
 
-#: ../e-util/e-html-editor-page-dialog.c:108
+#: ../e-util/e-html-editor-page-dialog.c:106
 msgid "Midnight"
 msgstr "Midnatt"
 
-#: ../e-util/e-html-editor-page-dialog.c:126 ../mail/filtertypes.xml.in.h:38
+#: ../e-util/e-html-editor-page-dialog.c:124 ../mail/filtertypes.xml.in.h:38
 #: ../mail/searchtypes.xml.in.h:41 ../mail/vfoldertypes.xml.in.h:41
 msgid "Draft"
 msgstr "Skisse"
 
-#: ../e-util/e-html-editor-page-dialog.c:135
+#: ../e-util/e-html-editor-page-dialog.c:133
 msgid "Graph Paper"
 msgstr "Millimeterpapir"
 
-#: ../e-util/e-html-editor-page-dialog.c:544
+#: ../e-util/e-html-editor-page-dialog.c:381
 msgid "<b>Colors</b>"
 msgstr "<b>Farger</b>"
 
-#: ../e-util/e-html-editor-page-dialog.c:563
+#: ../e-util/e-html-editor-page-dialog.c:400
 msgid "_Text:"
 msgstr "_Tekst:"
 
-#: ../e-util/e-html-editor-page-dialog.c:578
+#: ../e-util/e-html-editor-page-dialog.c:415
 msgid "_Link:"
 msgstr "_Lenke:"
 
-#: ../e-util/e-html-editor-page-dialog.c:593
+#: ../e-util/e-html-editor-page-dialog.c:430
 msgid "_Visited Link:"
 msgstr "_Besøkt lenke:"
 
-#: ../e-util/e-html-editor-page-dialog.c:608
+#: ../e-util/e-html-editor-page-dialog.c:445
 msgid "_Background:"
 msgstr "_Bakgrunn:"
 
-#: ../e-util/e-html-editor-page-dialog.c:616
+#: ../e-util/e-html-editor-page-dialog.c:453
 msgid "<b>Background Image</b>"
 msgstr "<b>Bakgrunnsbilde</b>"
 
-#: ../e-util/e-html-editor-page-dialog.c:638
+#: ../e-util/e-html-editor-page-dialog.c:475
 #: ../modules/calendar/e-calendar-preferences.ui.h:80
 msgid "_Template:"
 msgstr "_Mal:"
 
-#: ../e-util/e-html-editor-page-dialog.c:646 ../e-util/e-import-assistant.c:288
+#: ../e-util/e-html-editor-page-dialog.c:483 ../e-util/e-import-assistant.c:288
 msgid "Select a file"
 msgstr "Velg en fil"
 
-#: ../e-util/e-html-editor-page-dialog.c:653
+#: ../e-util/e-html-editor-page-dialog.c:490
 msgid "_Custom:"
 msgstr "E_gendefinert:"
 
-#: ../e-util/e-html-editor-page-dialog.c:680
+#: ../e-util/e-html-editor-page-dialog.c:517
 msgid "Page Properties"
 msgstr "Egenskaper for papir"
 
@@ -12880,140 +12870,132 @@ msgstr "<b>Justering</b>"
 msgid "Paragraph Properties"
 msgstr "Egenskaper for avsnitt"
 
-#: ../e-util/e-html-editor-replace-dialog.c:163
+#: ../e-util/e-html-editor-replace-dialog.c:92
 #, c-format
 msgid "%d occurrence replaced"
 msgid_plural "%d occurrences replaced"
 msgstr[0] "%d forekomst erstattet"
 msgstr[1] "%d forekomster erstattet"
 
-#: ../e-util/e-html-editor-replace-dialog.c:227
+#: ../e-util/e-html-editor-replace-dialog.c:280
 msgid "R_eplace:"
 msgstr "_Erstatt:"
 
-#: ../e-util/e-html-editor-replace-dialog.c:239
+#: ../e-util/e-html-editor-replace-dialog.c:289
 msgid "_With:"
 msgstr "_Bredde:"
 
-#: ../e-util/e-html-editor-replace-dialog.c:251
+#: ../e-util/e-html-editor-replace-dialog.c:301
 msgid "_Case sensitive"
 msgstr "S_kill mellom små/store bokstaver"
 
-#: ../e-util/e-html-editor-replace-dialog.c:255
+#: ../e-util/e-html-editor-replace-dialog.c:305
 msgid "Wra_p search"
 msgstr "_Søk på nytt når slutten nås"
 
-#: ../e-util/e-html-editor-replace-dialog.c:265
+#: ../e-util/e-html-editor-replace-dialog.c:315
 msgid "_Skip"
 msgstr "_Hopp over"
 
-#: ../e-util/e-html-editor-replace-dialog.c:273
+#: ../e-util/e-html-editor-replace-dialog.c:323
 #: ../e-util/e-system.error.xml.h:3
 msgid "_Replace"
 msgstr "E_rstatt"
 
-#: ../e-util/e-html-editor-replace-dialog.c:281
+#: ../e-util/e-html-editor-replace-dialog.c:331
 msgid "Replace _All"
 msgstr "Erstatt _alle"
 
-#: ../e-util/e-html-editor-replace-dialog.c:301
+#: ../e-util/e-html-editor-replace-dialog.c:351
 msgctxt "dialog-title"
 msgid "Replace"
 msgstr "Erstatt"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:88
+#: ../e-util/e-html-editor-spell-check-dialog.c:85
 #, c-format
 msgid "<b>Suggestions for '%s'</b>"
 msgstr "<b>Forslag for «%s»</b>"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:522
+#: ../e-util/e-html-editor-spell-check-dialog.c:390
 msgid "<b>Suggestions</b>"
 msgstr "<b>Forslag</b>"
 
 #. Replace
-#: ../e-util/e-html-editor-spell-check-dialog.c:557
+#: ../e-util/e-html-editor-spell-check-dialog.c:425
 msgid "Replace"
 msgstr "Erstatt"
 
 #. Replace All
-#: ../e-util/e-html-editor-spell-check-dialog.c:566
+#: ../e-util/e-html-editor-spell-check-dialog.c:434
 msgid "Replace All"
 msgstr "Erstatt alle"
 
 #. Ignore
-#: ../e-util/e-html-editor-spell-check-dialog.c:575
-#: ../mail/mail.error.xml.h:110
+#: ../e-util/e-html-editor-spell-check-dialog.c:443
+#: ../mail/mail.error.xml.h:116
 msgid "Ignore"
 msgstr "Ignorer"
 
 #. Skip
-#: ../e-util/e-html-editor-spell-check-dialog.c:584
+#: ../e-util/e-html-editor-spell-check-dialog.c:452
 msgid "Skip"
 msgstr "Hopp over"
 
 #. Back
-#: ../e-util/e-html-editor-spell-check-dialog.c:593
+#: ../e-util/e-html-editor-spell-check-dialog.c:461
 msgid "Back"
 msgstr "Tilbake"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:602
+#: ../e-util/e-html-editor-spell-check-dialog.c:470
 msgid "<b>Dictionary</b>"
 msgstr "<b>Ordbok</b>"
 
 #. Add Word button
-#: ../e-util/e-html-editor-spell-check-dialog.c:622
+#: ../e-util/e-html-editor-spell-check-dialog.c:490
 msgid "Add word"
 msgstr "Legg til ord"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:639 ../mail/mail-config.ui.h:39
+#: ../e-util/e-html-editor-spell-check-dialog.c:507 ../mail/mail-config.ui.h:39
 msgid "Spell Checking"
 msgstr "Stavekontroll"
 
-#: ../e-util/e-html-editor-table-dialog.c:788
+#: ../e-util/e-html-editor-table-dialog.c:539
 msgid "_Rows:"
 msgstr "_Rader:"
 
-#: ../e-util/e-html-editor-table-dialog.c:805
+#: ../e-util/e-html-editor-table-dialog.c:556
 msgid "C_olumns:"
 msgstr "K_olonner:"
 
-#: ../e-util/e-html-editor-table-dialog.c:856
+#: ../e-util/e-html-editor-table-dialog.c:607
 msgid "_Spacing:"
 msgstr "_Mellomrom:"
 
-#: ../e-util/e-html-editor-table-dialog.c:873
+#: ../e-util/e-html-editor-table-dialog.c:624
 msgid "_Padding:"
 msgstr "_Fyll:"
 
-#: ../e-util/e-html-editor-table-dialog.c:937
-#: ../e-util/e-html-editor-text-dialog.c:261
+#: ../e-util/e-html-editor-table-dialog.c:688
+#: ../e-util/e-html-editor-text-dialog.c:250
 msgid "_Color:"
 msgstr "_Farge:"
 
-#: ../e-util/e-html-editor-table-dialog.c:963
+#: ../e-util/e-html-editor-table-dialog.c:714
 msgid "Image:"
 msgstr "Bilde:"
 
-#: ../e-util/e-html-editor-table-dialog.c:990
+#: ../e-util/e-html-editor-table-dialog.c:741
 msgid "Table Properties"
 msgstr "Egenskaper for tabell"
 
-#: ../e-util/e-html-editor-text-dialog.c:281
+#: ../e-util/e-html-editor-text-dialog.c:270
 msgid "Si_ze:"
 msgstr "St_ørrelse:"
 
-#: ../e-util/e-html-editor-text-dialog.c:296
+#: ../e-util/e-html-editor-text-dialog.c:285
 msgid "Text Properties"
 msgstr "Egenskaper for tekst"
 
-#: ../e-util/e-html-editor-view.c:6413
-msgid "Changed property"
-msgstr "Endret egenskap"
-
-#: ../e-util/e-html-editor-view.c:6414
-msgid "Whether editor changed"
-msgstr "Hvorvidt redigering ble endret"
-
 #: ../e-util/e-import-assistant.c:261
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
@@ -13120,35 +13102,35 @@ msgstr "Klikk på «Bruk» for å starte import av filen til Evolution."
 msgid "Autogenerated"
 msgstr "Generert automatisk"
 
-#: ../e-util/e-mail-signature-editor.c:301 ../mail/e-mail-notes.c:905
+#: ../e-util/e-mail-signature-editor.c:310 ../mail/e-mail-notes.c:933
 msgid "Close"
 msgstr "Lukk"
 
-#: ../e-util/e-mail-signature-editor.c:306 ../mail/e-mail-notes.c:910
+#: ../e-util/e-mail-signature-editor.c:315 ../mail/e-mail-notes.c:938
 msgid "_Save and Close"
 msgstr "L_agre og lukk"
 
-#: ../e-util/e-mail-signature-editor.c:533
+#: ../e-util/e-mail-signature-editor.c:558
 msgid "Edit Signature"
 msgstr "Rediger signatur"
 
-#: ../e-util/e-mail-signature-editor.c:566
+#: ../e-util/e-mail-signature-editor.c:591
 msgid "_Signature Name:"
 msgstr "Navn på _signatur:"
 
-#: ../e-util/e-mail-signature-editor.c:602
+#: ../e-util/e-mail-signature-editor.c:627
 msgid "Unnamed"
 msgstr "Uten navn"
 
-#: ../e-util/e-mail-signature-manager.c:337
+#: ../e-util/e-mail-signature-manager.c:338
 msgid "Add _Script"
 msgstr "Legg til _skript"
 
-#: ../e-util/e-mail-signature-manager.c:426
+#: ../e-util/e-mail-signature-manager.c:444
 msgid "Add Signature Script"
 msgstr "Legg til signaturskript"
 
-#: ../e-util/e-mail-signature-manager.c:497
+#: ../e-util/e-mail-signature-manager.c:538
 msgid "Edit Signature Script"
 msgstr "Rediger signaturskript"
 
@@ -13182,35 +13164,35 @@ msgstr ""
 "Mus-basert interaktivt kartfelt for å velge tidssone. Tastaturbrukere må "
 "velge tiddsone fra kombinasjonsboksen nedenfor."
 
-#: ../e-util/e-misc-utils.c:253
+#: ../e-util/e-misc-utils.c:255
 msgid "Could not open the link."
 msgstr "Kunne ikke åpne lenken."
 
-#: ../e-util/e-misc-utils.c:336
+#: ../e-util/e-misc-utils.c:338
 msgid "Could not display help for Evolution."
 msgstr "Kunne ikke vise hjelp for Evolution."
 
-#: ../e-util/e-misc-utils.c:2501
+#: ../e-util/e-misc-utils.c:2503
 #, c-format
 msgid "Opening calendar '%s'"
 msgstr "Åpner kalender «%s»"
 
-#: ../e-util/e-misc-utils.c:2504
+#: ../e-util/e-misc-utils.c:2506
 #, c-format
 msgid "Opening memo list '%s'"
 msgstr "Åpner notatliste «%s»"
 
-#: ../e-util/e-misc-utils.c:2507
+#: ../e-util/e-misc-utils.c:2509
 #, c-format
 msgid "Opening task list '%s'"
 msgstr "Åpner oppgaveliste «%s»"
 
-#: ../e-util/e-misc-utils.c:2510
+#: ../e-util/e-misc-utils.c:2512
 #, c-format
 msgid "Opening address book '%s'"
 msgstr "Åpner adressebok «%s»"
 
-#: ../e-util/e-misc-utils.c:3252
+#: ../e-util/e-misc-utils.c:3290
 #: ../modules/mailto-handler/evolution-mailto-handler.c:148
 msgid "_Do not show this message again"
 msgstr "Ikke vis _denne meldingen igjen"
@@ -13428,48 +13410,48 @@ msgstr "Legg til regel"
 msgid "Edit Rule"
 msgstr "Rediger regel"
 
-#: ../e-util/e-search-bar.c:83
+#: ../e-util/e-search-bar.c:84
 #, c-format
 msgid "Matches: %u"
 msgstr "Treff: %u"
 
-#: ../e-util/e-search-bar.c:572
+#: ../e-util/e-search-bar.c:611
 msgid "Close the find bar"
 msgstr "Lukk søkelinjen"
 
-#: ../e-util/e-search-bar.c:580
+#: ../e-util/e-search-bar.c:619
 msgid "Fin_d:"
 msgstr "Fin_n:"
 
-#: ../e-util/e-search-bar.c:592
+#: ../e-util/e-search-bar.c:631
 msgid "Clear the search"
 msgstr "Tøm søket"
 
-#: ../e-util/e-search-bar.c:616
+#: ../e-util/e-search-bar.c:655
 msgid "_Previous"
 msgstr "_Forrige"
 
-#: ../e-util/e-search-bar.c:619
+#: ../e-util/e-search-bar.c:658
 msgid "Find the previous occurrence of the phrase"
 msgstr "Finn forrige oppføring av teksten"
 
-#: ../e-util/e-search-bar.c:628
+#: ../e-util/e-search-bar.c:667
 msgid "_Next"
 msgstr "_Neste"
 
-#: ../e-util/e-search-bar.c:631
+#: ../e-util/e-search-bar.c:670
 msgid "Find the next occurrence of the phrase"
 msgstr "Finn neste oppføring av teksten"
 
-#: ../e-util/e-search-bar.c:640
+#: ../e-util/e-search-bar.c:679
 msgid "Mat_ch case"
 msgstr "Tre_ff på små/store bokstaver"
 
-#: ../e-util/e-search-bar.c:668
+#: ../e-util/e-search-bar.c:707
 msgid "Reached bottom of page, continued from top"
 msgstr "Nådde bunnen av siden og fortsatte fra toppen"
 
-#: ../e-util/e-search-bar.c:690
+#: ../e-util/e-search-bar.c:729
 msgid "Reached top of page, continued from bottom"
 msgstr "Nådde toppen av siden og fortsatte fra bunnen"
 
@@ -13654,6 +13636,10 @@ msgstr "Vis"
 msgid "Group name"
 msgstr "Gruppenavn"
 
+#: ../e-util/e-source-selector.c:3376 ../mail/e-mail-display.c:742
+msgid "_Hide"
+msgstr "_Skjul"
+
 #: ../e-util/e-source-selector.c:3376 ../e-util/e-source-selector.c:3475
 msgid "_Show"
 msgstr "Vi_s"
@@ -13740,7 +13726,7 @@ msgstr "Kan ikke åpne fil «{0}»."
 msgid "Failed to remove data source &quot;{0}&quot;."
 msgstr "Klarte ikke å fjerne datakilde &quot;{0}&quot;."
 
-#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:62
+#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:64
 msgid "The reported error was &quot;{1}&quot;."
 msgstr "Feilen som ble rapportert var &quot;{1}&quot;."
 
@@ -13886,11 +13872,11 @@ msgstr "Fjern _alt"
 msgid "_Show field in View"
 msgstr "Vi_s felt i visning"
 
-#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1784
+#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1796
 msgid "Ascending"
 msgstr "Stigende"
 
-#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1784
+#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1796
 msgid "Descending"
 msgstr "Synkende"
 
@@ -13952,60 +13938,60 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d oppføring)"
 msgstr[1] "%s (%d oppføringer)"
 
-#: ../e-util/e-table-header-item.c:1607
+#: ../e-util/e-table-header-item.c:1619
 msgid "Customize Current View"
 msgstr "Tilpass aktiv visning"
 
-#: ../e-util/e-table-header-item.c:1630
+#: ../e-util/e-table-header-item.c:1642
 msgid "Sort _Ascending"
 msgstr "Sorter s_tigende"
 
-#: ../e-util/e-table-header-item.c:1633
+#: ../e-util/e-table-header-item.c:1645
 msgid "Sort _Descending"
 msgstr "Sorter s_ynkende"
 
-#: ../e-util/e-table-header-item.c:1636
+#: ../e-util/e-table-header-item.c:1648
 msgid "_Reset sort"
 msgstr "Nullstill so_rtering"
 
-#: ../e-util/e-table-header-item.c:1639
+#: ../e-util/e-table-header-item.c:1651
 msgid "Group By This _Field"
 msgstr "Grupper etter dette _feltet"
 
-#: ../e-util/e-table-header-item.c:1642
+#: ../e-util/e-table-header-item.c:1654
 msgid "Group By _Box"
 msgstr "Grupper etter _boks"
 
-#: ../e-util/e-table-header-item.c:1646
+#: ../e-util/e-table-header-item.c:1658
 msgid "Remove This _Column"
 msgstr "Fjern denne _kolonnen"
 
-#: ../e-util/e-table-header-item.c:1649
+#: ../e-util/e-table-header-item.c:1661
 msgid "Add a C_olumn..."
 msgstr "Legg til en k_olonne …"
 
-#: ../e-util/e-table-header-item.c:1653
+#: ../e-util/e-table-header-item.c:1665
 msgid "A_lignment"
 msgstr "_Justering"
 
-#: ../e-util/e-table-header-item.c:1656
+#: ../e-util/e-table-header-item.c:1668
 msgid "B_est Fit"
 msgstr "B_este tilpasning"
 
-#: ../e-util/e-table-header-item.c:1659
+#: ../e-util/e-table-header-item.c:1671
 msgid "Format Column_s..."
 msgstr "For_mater kolonner …"
 
-#: ../e-util/e-table-header-item.c:1663
+#: ../e-util/e-table-header-item.c:1675
 msgid "Custo_mize Current View..."
 msgstr "T_ilpass aktiv visning …"
 
-#: ../e-util/e-table-header-item.c:1734
+#: ../e-util/e-table-header-item.c:1746
 msgid "_Sort By"
 msgstr "_Sorter etter"
 
 #. Custom
-#: ../e-util/e-table-header-item.c:1757
+#: ../e-util/e-table-header-item.c:1769
 msgid "_Custom"
 msgstr "E_gendefinert"
 
@@ -14013,10 +13999,14 @@ msgstr "E_gendefinert"
 msgid "Select All"
 msgstr "Velg alle"
 
+#: ../e-util/e-text.c:2147
+msgid "Input Methods"
+msgstr "Inndatametoder"
+
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../e-util/e-timezone-dialog.c:264 ../e-util/e-timezone-dialog.c:504
-#: ../e-util/e-timezone-dialog.c:508 ../e-util/e-timezone-dialog.c:512
-#: ../e-util/e-timezone-dialog.c:874
+#: ../e-util/e-timezone-dialog.c:270 ../e-util/e-timezone-dialog.c:510
+#: ../e-util/e-timezone-dialog.c:514 ../e-util/e-timezone-dialog.c:518
+#: ../e-util/e-timezone-dialog.c:901
 msgid "UTC"
 msgstr "UTC"
 
@@ -14068,94 +14058,99 @@ msgid "Flags"
 msgstr "Flagg"
 
 #: ../e-util/evolution-source-viewer.c:728
-#: ../mail/e-mail-config-identity-page.c:761
+#: ../mail/e-mail-config-identity-page.c:779
 msgid "Identity"
 msgstr "Identitet"
 
-#: ../e-util/e-web-view.c:318
+#: ../e-util/e-web-view.c:337
 msgid "_Copy Link Location"
 msgstr "_Kopier adressen til lenke"
 
-#: ../e-util/e-web-view.c:320
+#: ../e-util/e-web-view.c:339
 msgid "Copy the link to the clipboard"
 msgstr "Kopier lenken til utklippstavlen"
 
-#: ../e-util/e-web-view.c:328
+#: ../e-util/e-web-view.c:347
 msgid "_Open Link in Browser"
 msgstr "_Åpne lenke i nettleser"
 
-#: ../e-util/e-web-view.c:330
+#: ../e-util/e-web-view.c:349
 msgid "Open the link in a web browser"
 msgstr "Åpne lenken i en nettleser"
 
-#: ../e-util/e-web-view.c:338
+#: ../e-util/e-web-view.c:357
 msgid "_Copy Email Address"
 msgstr "_Kopier e-postadresse"
 
-#: ../e-util/e-web-view.c:345
+#: ../e-util/e-web-view.c:364
 msgid "Copy _Raw Email Address"
 msgstr "Kopier _rå e-postadresse"
 
-#: ../e-util/e-web-view.c:347
+#: ../e-util/e-web-view.c:366
 msgid "Copy the raw email address to the clipboard"
 msgstr "Kopier rå e-postadresse til utklippstavlen"
 
-#: ../e-util/e-web-view.c:362
+#: ../e-util/e-web-view.c:381
 msgid "_Copy Image"
 msgstr "_Kopier bilde"
 
-#: ../e-util/e-web-view.c:364
+#: ../e-util/e-web-view.c:383
 msgid "Copy the image to the clipboard"
 msgstr "Kopier bildet til utklippstavlen"
 
-#: ../e-util/e-web-view.c:369
+#: ../e-util/e-web-view.c:388
 msgid "Save _Image..."
 msgstr "Lagre b_ilde …"
 
-#: ../e-util/e-web-view.c:371
+#: ../e-util/e-web-view.c:390
 msgid "Save the image to a file"
 msgstr "Lagre bildet til en fil"
 
-#: ../e-util/e-web-view.c:391 ../e-util/e-web-view.c:1432
+#: ../e-util/e-web-view.c:410 ../e-util/e-web-view.c:1869
 msgid "Select all text and images"
 msgstr "Velg all tekst og alle bilder"
 
-#: ../e-util/e-web-view.c:1074
+#: ../e-util/e-web-view.c:1293
 #, c-format
 msgid "Click to call %s"
 msgstr "Klikk for å ringe %s"
 
-#: ../e-util/e-web-view.c:1076
+#: ../e-util/e-web-view.c:1295
 msgid "Click to hide/unhide addresses"
 msgstr "Klikk for å skjule/vise adresser"
 
-#: ../e-util/e-web-view.c:1087
+#: ../e-util/e-web-view.c:1306
 #, c-format
 msgid "Go to the section %s of the message"
 msgstr "Gå til %s-del av meldingen"
 
-#: ../e-util/e-web-view.c:1089
+#: ../e-util/e-web-view.c:1308
 msgid "Go to the beginning of the message"
 msgstr "Gå til begynnelsen av meldingen"
 
-#: ../e-util/e-web-view.c:1093
+#: ../e-util/e-web-view.c:1312
 #, c-format
 msgid "Click to open %s"
 msgstr "Klikk for å åpne %s"
 
-#: ../e-util/e-web-view.c:3143
+#: ../e-util/e-web-view.c:3715
 msgid "Copying image to clipboard"
 msgstr "Kopierer bilde til utklippstavlen"
 
-#: ../e-util/e-web-view.c:3331
+#: ../e-util/e-web-view.c:3903
 msgid "Save Image"
 msgstr "Lagre bilde"
 
-#: ../e-util/e-web-view.c:3367
+#: ../e-util/e-web-view.c:3939
 #, c-format
 msgid "Saving image to '%s'"
 msgstr "Lagrer bilde til «%s»"
 
+#: ../e-util/e-web-view.c:4034
+#, c-format
+msgid "Cannot get URI '%s', do not know how to download it."
+msgstr "Kan ikke hente URI «%s». Vet ikke hvordan den skal lastes ned."
+
 #: ../e-util/e-widget-undo.c:430
 msgid "Undo 'Insert text'"
 msgstr "Angre «Sett inn tekst»"
@@ -14200,7 +14195,7 @@ msgstr "Ugyldig regulært uttrykk &quot;{0}&quot;."
 msgid "Could not compile regular expression &quot;{1}&quot;."
 msgstr "Kunne ikke sette sammen regulært uttrykk &quot;{1}&quot;."
 
-#: ../e-util/filter.error.xml.h:8 ../mail/mail.error.xml.h:101
+#: ../e-util/filter.error.xml.h:8 ../mail/mail.error.xml.h:107
 msgid "Missing name."
 msgstr "Mangler navn."
 
@@ -14361,7 +14356,7 @@ msgstr "_Opprett en ny visning"
 msgid "_Replace existing view"
 msgstr "E_rstatt eksisterende visning"
 
-#: ../e-util/widgets.error.xml.h:1 ../mail/mail.error.xml.h:195
+#: ../e-util/widgets.error.xml.h:1 ../mail/mail.error.xml.h:201
 msgid "Do you wish to save your changes?"
 msgstr "Vil du lagre dine endringer?"
 
@@ -14369,7 +14364,7 @@ msgstr "Vil du lagre dine endringer?"
 msgid "This signature has been changed, but has not been saved."
 msgstr "Denne signaturen er endret, men er ikke lagret."
 
-#: ../e-util/widgets.error.xml.h:3 ../mail/mail.error.xml.h:197
+#: ../e-util/widgets.error.xml.h:3 ../mail/mail.error.xml.h:203
 msgid "_Discard changes"
 msgstr "_Forkast endringene"
 
@@ -14448,43 +14443,43 @@ msgid "Forwarded messages"
 msgstr "Videresendte meldinger"
 
 #: ../libemail-engine/e-mail-folder-utils.c:684
-#: ../libemail-engine/e-mail-folder-utils.c:938
+#: ../libemail-engine/e-mail-folder-utils.c:946
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Henter %d melding"
 msgstr[1] "Henter %d melding(er)"
 
-#: ../libemail-engine/e-mail-folder-utils.c:778
+#: ../libemail-engine/e-mail-folder-utils.c:786
 msgid "Scanning messages for duplicates"
 msgstr "Sjekker meldinger for duplikater"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1151
+#: ../libemail-engine/e-mail-folder-utils.c:1159
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Fjerner mappe «%s»"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1332
+#: ../libemail-engine/e-mail-folder-utils.c:1340
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "Filen «%s» ble fjernet."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1336
+#: ../libemail-engine/e-mail-folder-utils.c:1344
 msgid "File has been removed."
 msgstr "Filen er fjernet."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1413
+#: ../libemail-engine/e-mail-folder-utils.c:1421
 msgid "Removing attachments"
 msgstr "Fjerner vedlegg"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1577
+#: ../libemail-engine/e-mail-folder-utils.c:1593
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Lagrer %d melding"
 msgstr[1] "Lagrer %d meldinger"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1955
+#: ../libemail-engine/e-mail-folder-utils.c:1971
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "Ugyldig URI for mappe «%s»"
@@ -14492,59 +14487,59 @@ msgstr "Ugyldig URI for mappe «%s»"
 #. Some local folders
 #: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-properties.c:778
 #: ../mail/em-folder-tree-model.c:1212 ../mail/importers/kmail-libs.c:141
-#: ../modules/mail/e-mail-shell-view-private.c:1052
-#: ../modules/mail/e-mail-shell-view-private.c:1063
+#: ../modules/mail/e-mail-shell-view-private.c:1053
+#: ../modules/mail/e-mail-shell-view-private.c:1064
 msgid "Inbox"
 msgstr "Innboks"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
 #: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1205
 #: ../mail/importers/kmail-libs.c:147
-#: ../modules/mail/e-mail-shell-view-private.c:1050
+#: ../modules/mail/e-mail-shell-view-private.c:1051
 msgid "Drafts"
 msgstr "Skisser"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
 #: ../libemail-engine/e-mail-session.c:129 ../mail/em-folder-tree-model.c:1216
 #: ../mail/importers/kmail-libs.c:143
-#: ../modules/mail/e-mail-shell-view-private.c:1054
+#: ../modules/mail/e-mail-shell-view-private.c:1055
 msgid "Outbox"
 msgstr "Utboks"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
 #: ../libemail-engine/e-mail-session.c:130 ../mail/em-folder-tree-model.c:1220
 #: ../mail/importers/kmail-libs.c:145
-#: ../modules/mail/e-mail-shell-view-private.c:1056
+#: ../modules/mail/e-mail-shell-view-private.c:1057
 msgid "Sent"
 msgstr "Sendt"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
 #: ../libemail-engine/e-mail-session.c:131 ../mail/em-folder-tree-model.c:1208
 #: ../mail/importers/kmail-libs.c:149
-#: ../modules/mail/e-mail-shell-view-private.c:1058
+#: ../modules/mail/e-mail-shell-view-private.c:1059
 #: ../plugins/templates/e-templates-store.c:2214
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
 msgid "Templates"
 msgstr "Maler"
 
-#: ../libemail-engine/e-mail-session.c:1305
+#: ../libemail-engine/e-mail-session.c:1334
 #, c-format
 msgid "User cancelled operation"
 msgstr "Operasjon avbrutt av bruker"
 
-#: ../libemail-engine/e-mail-session.c:1362
+#: ../libemail-engine/e-mail-session.c:1391
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
 "cancelled."
 msgstr "Ingen måladresse oppgitt. Videresending av meldingen ble avbrutt."
 
-#: ../libemail-engine/e-mail-session.c:1375
+#: ../libemail-engine/e-mail-session.c:1404
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr "Fant ingen identitet å bruke. Videresending av meldingen ble avbrutt."
 
-#: ../libemail-engine/e-mail-session.c:2405
+#: ../libemail-engine/e-mail-session.c:2434
 #, c-format
 msgid "Waiting for '%s'"
 msgstr "Venter på «%s»"
@@ -14771,7 +14766,7 @@ msgid "De_fault"
 msgstr "_Forvalgt"
 
 #: ../mail/e-mail-account-tree-view.c:83
-#: ../modules/mail/em-composer-prefs.c:1282
+#: ../modules/mail/em-composer-prefs.c:1281
 #: ../modules/plugin-manager/evolution-plugin-manager.c:357
 #: ../plugins/publish-calendar/publish-calendar.c:855
 msgid "Enabled"
@@ -14794,7 +14789,7 @@ msgstr "Mangler domene i e-postadresse"
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
-#: ../mail/e-mail-browser.c:288
+#: ../mail/e-mail-browser.c:289
 msgid "(No Subject)"
 msgstr "(Uten emne)"
 
@@ -14976,7 +14971,7 @@ msgstr "Spør for hver melding"
 msgid "Defaults"
 msgstr "Forvalg"
 
-#: ../mail/e-mail-config-identity-page.c:286
+#: ../mail/e-mail-config-identity-page.c:304
 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 "
@@ -14986,12 +14981,12 @@ msgstr ""
 "under må ikke nødvendigvis fylles ut, hvis du ikke ønsker å inkludere denne "
 "informasjonen i meldingene du sender."
 
-#: ../mail/e-mail-config-identity-page.c:314
+#: ../mail/e-mail-config-identity-page.c:332
 #: ../mail/e-mail-config-summary-page.c:323
 msgid "Account Information"
 msgstr "Kontoinformasjon"
 
-#: ../mail/e-mail-config-identity-page.c:352
+#: ../mail/e-mail-config-identity-page.c:370
 #: ../mail/e-mail-config-summary-page.c:353
 msgid ""
 "The above name will be used to identify this account.\n"
@@ -15000,58 +14995,58 @@ msgstr ""
 "Navnet over vil brukes til å identifisere denne kontoen.\n"
 "For eksempel «Arbeid» eller «Personlig»."
 
-#: ../mail/e-mail-config-identity-page.c:369
+#: ../mail/e-mail-config-identity-page.c:387
 msgid "Required Information"
 msgstr "Nødvendig informasjon"
 
-#: ../mail/e-mail-config-identity-page.c:378
+#: ../mail/e-mail-config-identity-page.c:396
 msgid "Full Nam_e:"
 msgstr "_Fullt navn:"
 
-#: ../mail/e-mail-config-identity-page.c:407
+#: ../mail/e-mail-config-identity-page.c:425
 msgid "Email _Address:"
 msgstr "E-post_adresse:"
 
-#: ../mail/e-mail-config-identity-page.c:456
+#: ../mail/e-mail-config-identity-page.c:474
 #: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "Valgfri informasjon"
 
-#: ../mail/e-mail-config-identity-page.c:465
+#: ../mail/e-mail-config-identity-page.c:483
 msgid "Re_ply-To:"
 msgstr "S_var-til:"
 
-#: ../mail/e-mail-config-identity-page.c:494
+#: ../mail/e-mail-config-identity-page.c:512
 msgid "Or_ganization:"
 msgstr "Or_ganisasjon:"
 
-#: ../mail/e-mail-config-identity-page.c:549
+#: ../mail/e-mail-config-identity-page.c:567
 msgid "Add Ne_w Signature..."
 msgstr "Legg til n_y signatur …"
 
-#: ../mail/e-mail-config-identity-page.c:567
+#: ../mail/e-mail-config-identity-page.c:585
 msgid "_Look up mail server details based on the entered e-mail address"
 msgstr "S_lå opp detaljer om e-posttjener basert på oppgitt e-postadresse"
 
 #. This is only a warning, not a blocker
 #. complete = complete && correct;
-#: ../mail/e-mail-config-identity-page.c:612
+#: ../mail/e-mail-config-identity-page.c:630
 msgid "Full Name should not be empty"
 msgstr "Fullt navn bør ikke være tomt"
 
-#: ../mail/e-mail-config-identity-page.c:619
+#: ../mail/e-mail-config-identity-page.c:637
 msgid "Email Address cannot be empty"
 msgstr "E-postadressen kan ikke være tomt"
 
-#: ../mail/e-mail-config-identity-page.c:624
+#: ../mail/e-mail-config-identity-page.c:642
 msgid "Email Address is not a valid email"
 msgstr "E-postadressen er ikke en gyldig e-postadresse"
 
-#: ../mail/e-mail-config-identity-page.c:636
+#: ../mail/e-mail-config-identity-page.c:654
 msgid "Reply To is not a valid email"
 msgstr "Svar til er ikke en e-postadresse"
 
-#: ../mail/e-mail-config-identity-page.c:647
+#: ../mail/e-mail-config-identity-page.c:665
 #: ../mail/e-mail-config-summary-page.c:632
 msgid "Account Name cannot be empty"
 msgstr "Navn på konto kan ikke være tomt"
@@ -15089,7 +15084,7 @@ msgstr "%s - %s"
 #: ../modules/addressbook/autocompletion-config.c:113
 #: ../modules/calendar/e-calendar-preferences.c:620
 #: ../modules/calendar/e-calendar-preferences.ui.h:48
-#: ../modules/mail/e-mail-shell-backend.c:707
+#: ../modules/mail/e-mail-shell-backend.c:731
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "General"
 msgstr "Generelt"
@@ -15273,30 +15268,58 @@ msgstr "Velkommen"
 msgid "Account Editor"
 msgstr "Kontoredigering"
 
-#: ../mail/e-mail-display.c:104
+#: ../mail/e-mail-display.c:124
 msgid "_Add to Address Book..."
 msgstr "Legg til i _adressebok …"
 
-#: ../mail/e-mail-display.c:111
+#: ../mail/e-mail-display.c:131
 msgid "_To This Address"
 msgstr "_Til denne adressen"
 
-#: ../mail/e-mail-display.c:118
+#: ../mail/e-mail-display.c:138
 msgid "_From This Address"
 msgstr "_Fra denne adressen"
 
-#: ../mail/e-mail-display.c:125
+#: ../mail/e-mail-display.c:145
 msgid "Send _Reply To..."
 msgstr "Send sva_r til …"
 
-#: ../mail/e-mail-display.c:127
+#: ../mail/e-mail-display.c:147
 msgid "Send a reply message to this address"
 msgstr "Send svarmelding til denne adressen"
 
-#: ../mail/e-mail-display.c:134
+#: ../mail/e-mail-display.c:154
 msgid "Create Search _Folder"
 msgstr "Opprett _søkemappe"
 
+#: ../mail/e-mail-display.c:749
+msgid "Hid_e All"
+msgstr "Skj_ul alle"
+
+#: ../mail/e-mail-display.c:756
+msgid "_View Inline"
+msgstr "_Vis i meldingsteksten"
+
+#: ../mail/e-mail-display.c:763
+msgid "Vie_w All Inline"
+msgstr "_Vis alle i meldingsteksten"
+
+#: ../mail/e-mail-display.c:770
+msgid "_Zoom to 100%"
+msgstr "_Zoom til 100%"
+
+#: ../mail/e-mail-display.c:772
+msgid "Zoom the image to its natural size"
+msgstr "Zoom bildet til sin opprinnelige størrelse"
+
+#: ../mail/e-mail-display.c:777
+msgid "_Zoom to window"
+msgstr "_Zoom tilpasset vinduet"
+
+#: ../mail/e-mail-display.c:779
+msgid "Zoom large images to not be wider than the window width"
+msgstr "Zoom store bilder slik at de ikke er bredere enn vinduet"
+
 #: ../mail/e-mail-folder-create-dialog.c:327
 msgid "Create Folder"
 msgstr "Opprett mappe"
@@ -15388,7 +15411,7 @@ msgid "_Later"
 msgstr "_Senere"
 
 #: ../mail/e-mail-label-manager.c:171
-#: ../modules/mail/e-mail-shell-view-actions.c:1143
+#: ../modules/mail/e-mail-shell-view-actions.c:1200
 msgid "Add Label"
 msgstr "Legg til etikett"
 
@@ -15408,23 +15431,23 @@ msgstr ""
 msgid "Color"
 msgstr "Farge"
 
-#: ../mail/e-mail-notes.c:310 ../mail/e-mail-notes.c:692
+#: ../mail/e-mail-notes.c:321 ../mail/e-mail-notes.c:719
 msgid "Message Note"
 msgstr "Meldingsnotat"
 
-#: ../mail/e-mail-notes.c:612
+#: ../mail/e-mail-notes.c:639
 msgid "Cannot find message in its folder summary"
 msgstr "Kan ikke finne melding i mappesammendrag"
 
-#: ../mail/e-mail-notes.c:815
+#: ../mail/e-mail-notes.c:842
 msgid "Storing changes..."
 msgstr "Lagrer endringer …"
 
-#: ../mail/e-mail-notes.c:940
+#: ../mail/e-mail-notes.c:968
 msgid "Edit Message Note"
 msgstr "Rediger meldingsnotat"
 
-#: ../mail/e-mail-notes.c:1058
+#: ../mail/e-mail-notes.c:1122
 msgid "Retrieving message..."
 msgstr "Henter melding …"
 
@@ -15456,11 +15479,11 @@ msgstr "Navn på meldingshode"
 msgid "Header Value"
 msgstr "Verdi for meldingshode"
 
-#: ../mail/e-mail-printer.c:113 ../mail/mail-config.ui.h:123
+#: ../mail/e-mail-printer.c:102 ../mail/mail-config.ui.h:123
 msgid "Headers"
 msgstr "Meldingshoder"
 
-#: ../mail/e-mail-printer.c:155
+#: ../mail/e-mail-printer.c:144
 #, c-format
 msgid "Page %d of %d"
 msgstr "Side %d av %d"
@@ -15474,7 +15497,7 @@ msgid "Copy to Folder"
 msgstr "Kopier til mappe"
 
 #: ../mail/e-mail-reader.c:356 ../mail/em-folder-utils.c:487
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:152
 msgid "_Move"
 msgstr "_Flytt"
 
@@ -15486,652 +15509,652 @@ msgstr "K_opier"
 msgid "Deleting message note..."
 msgstr "Sletter meldingsnotat …"
 
-#: ../mail/e-mail-reader.c:1271 ../mail/e-mail-reader.c:1483
-#: ../mail/e-mail-reader.c:1523
+#: ../mail/e-mail-reader.c:1310 ../mail/e-mail-reader.c:1522
+#: ../mail/e-mail-reader.c:1562
 msgid "_Do not ask me again."
 msgstr "_Ikke spør meg igjen."
 
-#: ../mail/e-mail-reader.c:1529
+#: ../mail/e-mail-reader.c:1568
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Alltid ignorer Reply-To: for e-postlister."
 
-#: ../mail/e-mail-reader.c:1732
+#: ../mail/e-mail-reader.c:1771
 msgid "Failed to retrieve message:"
 msgstr "Klarte ikke å hente melding:"
 
-#: ../mail/e-mail-reader.c:1777 ../mail/e-mail-reader.c:3158
+#: ../mail/e-mail-reader.c:1816 ../mail/e-mail-reader.c:3186
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Henter melding «%s»"
 
-#: ../mail/e-mail-reader.c:1965
+#: ../mail/e-mail-reader.c:2004
 msgid "A_dd Sender to Address Book"
 msgstr "L_egg til avsender i adressebok"
 
-#: ../mail/e-mail-reader.c:1967
+#: ../mail/e-mail-reader.c:2006
 msgid "Add sender to address book"
 msgstr "Legg til avsender i adressebok"
 
-#: ../mail/e-mail-reader.c:1972
+#: ../mail/e-mail-reader.c:2011
 msgid "_Archive..."
 msgstr "_Arkiv …"
 
-#: ../mail/e-mail-reader.c:1974
+#: ../mail/e-mail-reader.c:2013
 msgid "Move selected messages to the Archive folder for the account"
 msgstr "Flytt valgte meldinger til arkivmappen for kontoen"
 
-#: ../mail/e-mail-reader.c:1979
+#: ../mail/e-mail-reader.c:2018
 msgid "Check for _Junk"
 msgstr "Sjekk etter _uønsket e-post"
 
-#: ../mail/e-mail-reader.c:1981
+#: ../mail/e-mail-reader.c:2020
 msgid "Filter the selected messages for junk status"
 msgstr "Filtrer valgte meldinger etter uønsket e-poststatus"
 
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:2025
 msgid "_Copy to Folder..."
 msgstr "K_opier til mappe …"
 
-#: ../mail/e-mail-reader.c:1988
+#: ../mail/e-mail-reader.c:2027
 msgid "Copy selected messages to another folder"
 msgstr "Kopier valgte meldinger til en annen mappe"
 
-#: ../mail/e-mail-reader.c:1993
+#: ../mail/e-mail-reader.c:2032
 msgid "_Delete Message"
 msgstr "_Slett melding"
 
-#: ../mail/e-mail-reader.c:1995
+#: ../mail/e-mail-reader.c:2034
 msgid "Mark the selected messages for deletion"
 msgstr "Merk valgte meldinger for sletting"
 
-#: ../mail/e-mail-reader.c:2000
+#: ../mail/e-mail-reader.c:2039
 msgid "_Add note..."
 msgstr "L_egg til notat …"
 
-#: ../mail/e-mail-reader.c:2002
+#: ../mail/e-mail-reader.c:2041
 msgid "Add a note for the selected message"
 msgstr "Legg til et notat fra valgt melding"
 
-#: ../mail/e-mail-reader.c:2007
+#: ../mail/e-mail-reader.c:2046
 msgid "Delete no_te"
 msgstr "Slett no_tat"
 
-#: ../mail/e-mail-reader.c:2009
+#: ../mail/e-mail-reader.c:2048
 msgid "Delete the note for the selected message"
 msgstr " Slett notat for valgt melding"
 
-#: ../mail/e-mail-reader.c:2014
+#: ../mail/e-mail-reader.c:2053
 msgid "_Edit note..."
 msgstr "R_ediger notat …"
 
-#: ../mail/e-mail-reader.c:2016
+#: ../mail/e-mail-reader.c:2055
 msgid "Edit a note for the selected message"
 msgstr "Rediger et notat for valgt melding"
 
-#: ../mail/e-mail-reader.c:2021
+#: ../mail/e-mail-reader.c:2060
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "Lag filterregel for e-post_liste …"
 
-#: ../mail/e-mail-reader.c:2023
+#: ../mail/e-mail-reader.c:2062
 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:2028
+#: ../mail/e-mail-reader.c:2067
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "Lag en filterregel for mottake_re …"
 
-#: ../mail/e-mail-reader.c:2030
+#: ../mail/e-mail-reader.c:2069
 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:2035
+#: ../mail/e-mail-reader.c:2074
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "Lag en filterregel for avse_nder …"
 
-#: ../mail/e-mail-reader.c:2037
+#: ../mail/e-mail-reader.c:2076
 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:2042
+#: ../mail/e-mail-reader.c:2081
 msgid "Create a Filter Rule for _Subject..."
 msgstr "Lag en filterregel for e_mne …"
 
-#: ../mail/e-mail-reader.c:2044
+#: ../mail/e-mail-reader.c:2083
 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:2049
+#: ../mail/e-mail-reader.c:2088
 msgid "A_pply Filters"
 msgstr "_Påfør filtre"
 
-#: ../mail/e-mail-reader.c:2051
+#: ../mail/e-mail-reader.c:2090
 msgid "Apply filter rules to the selected messages"
 msgstr "Aktiver filterregler på de valgte meldingene"
 
-#: ../mail/e-mail-reader.c:2056
+#: ../mail/e-mail-reader.c:2095
 msgid "_Find in Message..."
 msgstr "_Finn i melding …"
 
-#: ../mail/e-mail-reader.c:2058
+#: ../mail/e-mail-reader.c:2097
 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:2063
+#: ../mail/e-mail-reader.c:2102
 msgid "_Clear Flag"
 msgstr "F_jern flagg"
 
-#: ../mail/e-mail-reader.c:2065
+#: ../mail/e-mail-reader.c:2104
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Fjern flagg for oppfølging fra valgte meldinger"
 
-#: ../mail/e-mail-reader.c:2070
+#: ../mail/e-mail-reader.c:2109
 msgid "_Flag Completed"
 msgstr "Merk som _fullført"
 
-#: ../mail/e-mail-reader.c:2072
+#: ../mail/e-mail-reader.c:2111
 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:2077
+#: ../mail/e-mail-reader.c:2116
 msgid "Follow _Up..."
 msgstr "Følg _opp …"
 
-#: ../mail/e-mail-reader.c:2079
+#: ../mail/e-mail-reader.c:2118
 msgid "Flag the selected messages for follow-up"
 msgstr "Merk valgte meldinger for oppfølging"
 
-#: ../mail/e-mail-reader.c:2084 ../modules/mail/e-mail-attachment-handler.c:364
+#: ../mail/e-mail-reader.c:2123 ../modules/mail/e-mail-attachment-handler.c:432
 msgid "_Attached"
 msgstr "L_agt ved"
 
-#: ../mail/e-mail-reader.c:2086 ../mail/e-mail-reader.c:2093
-#: ../modules/mail/e-mail-attachment-handler.c:366
+#: ../mail/e-mail-reader.c:2125 ../mail/e-mail-reader.c:2132
+#: ../modules/mail/e-mail-attachment-handler.c:434
 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:2091
+#: ../mail/e-mail-reader.c:2130
 msgid "Forward As _Attached"
 msgstr "Videresend s_om vedlegg"
 
-#: ../mail/e-mail-reader.c:2098 ../modules/mail/e-mail-attachment-handler.c:371
+#: ../mail/e-mail-reader.c:2137 ../modules/mail/e-mail-attachment-handler.c:439
 msgid "_Inline"
 msgstr "_I meldingen"
 
-#: ../mail/e-mail-reader.c:2100 ../mail/e-mail-reader.c:2107
-#: ../modules/mail/e-mail-attachment-handler.c:373
+#: ../mail/e-mail-reader.c:2139 ../mail/e-mail-reader.c:2146
+#: ../modules/mail/e-mail-attachment-handler.c:441
 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:2105
+#: ../mail/e-mail-reader.c:2144
 msgid "Forward As _Inline"
 msgstr "V_ideresend som vedlegg"
 
-#: ../mail/e-mail-reader.c:2112 ../modules/mail/e-mail-attachment-handler.c:378
+#: ../mail/e-mail-reader.c:2151 ../modules/mail/e-mail-attachment-handler.c:446
 msgid "_Quoted"
 msgstr "_Sitert"
 
-#: ../mail/e-mail-reader.c:2114 ../mail/e-mail-reader.c:2121
-#: ../modules/mail/e-mail-attachment-handler.c:380
+#: ../mail/e-mail-reader.c:2153 ../mail/e-mail-reader.c:2160
+#: ../modules/mail/e-mail-attachment-handler.c:448
 msgid "Forward the selected message quoted like a reply"
 msgstr "Videresend den valgte meldingen sitert som et svar"
 
-#: ../mail/e-mail-reader.c:2119
+#: ../mail/e-mail-reader.c:2158
 msgid "Forward As _Quoted"
 msgstr "Videresend s_om sitat"
 
-#: ../mail/e-mail-reader.c:2126
+#: ../mail/e-mail-reader.c:2165
 msgid "_Load Images"
 msgstr "_Last bilder"
 
-#: ../mail/e-mail-reader.c:2128
+#: ../mail/e-mail-reader.c:2167
 msgid "Force images in HTML mail to be loaded"
 msgstr "Tvungen lasting av bilder i HTML e-post"
 
-#: ../mail/e-mail-reader.c:2133 ../mail/e-mail-reader.c:2523
+#: ../mail/e-mail-reader.c:2172 ../mail/e-mail-reader.c:2562
 msgid "_Ignore Subthread"
 msgstr "_Ignorer undertråd"
 
-#: ../mail/e-mail-reader.c:2135
+#: ../mail/e-mail-reader.c:2174
 msgid "Mark new mails in a subthread as read automatically"
 msgstr "Merk nye meldinger i en undertråd som lest automatisk"
 
-#: ../mail/e-mail-reader.c:2140 ../mail/e-mail-reader.c:2527
+#: ../mail/e-mail-reader.c:2179 ../mail/e-mail-reader.c:2566
 msgid "_Ignore Thread"
 msgstr "Overse _tråd"
 
-#: ../mail/e-mail-reader.c:2142
+#: ../mail/e-mail-reader.c:2181
 msgid "Mark new mails in this thread as read automatically"
 msgstr "Merk nye meldinger i denne tråden som lest automatisk"
 
-#: ../mail/e-mail-reader.c:2147
+#: ../mail/e-mail-reader.c:2186
 msgid "_Important"
 msgstr "V_iktig"
 
-#: ../mail/e-mail-reader.c:2149
+#: ../mail/e-mail-reader.c:2188
 msgid "Mark the selected messages as important"
 msgstr "Merk valgte meldinger som viktige"
 
-#: ../mail/e-mail-reader.c:2154
+#: ../mail/e-mail-reader.c:2193
 msgid "_Junk"
 msgstr "_Uønsket e-post"
 
-#: ../mail/e-mail-reader.c:2156
+#: ../mail/e-mail-reader.c:2195
 msgid "Mark the selected messages as junk"
 msgstr "Merk valgte meldinger som uønsket e-post"
 
-#: ../mail/e-mail-reader.c:2161
+#: ../mail/e-mail-reader.c:2200
 msgid "_Not Junk"
 msgstr "_Ikke uønsket e-post"
 
-#: ../mail/e-mail-reader.c:2163
+#: ../mail/e-mail-reader.c:2202
 msgid "Mark the selected messages as not being junk"
 msgstr "Merk valgte meldinger som ønsket e-post"
 
-#: ../mail/e-mail-reader.c:2168
+#: ../mail/e-mail-reader.c:2207
 msgid "_Read"
 msgstr "_Lest"
 
-#: ../mail/e-mail-reader.c:2170
+#: ../mail/e-mail-reader.c:2209
 msgid "Mark the selected messages as having been read"
 msgstr "Merk valgte meldinger som lest"
 
-#: ../mail/e-mail-reader.c:2175 ../mail/e-mail-reader.c:2547
+#: ../mail/e-mail-reader.c:2214 ../mail/e-mail-reader.c:2586
 msgid "Do not _Ignore Subthread"
 msgstr "Ikke _ignorer undertråd"
 
-#: ../mail/e-mail-reader.c:2177
+#: ../mail/e-mail-reader.c:2216
 msgid "Do not mark new mails in a subthread as read automatically"
 msgstr "Ikke merk nye meldinger i en undertråd som lest automatisk"
 
-#: ../mail/e-mail-reader.c:2182 ../mail/e-mail-reader.c:2551
+#: ../mail/e-mail-reader.c:2221 ../mail/e-mail-reader.c:2590
 msgid "Do not _Ignore Thread"
 msgstr "_Ikke ignorter tråd"
 
-#: ../mail/e-mail-reader.c:2184
+#: ../mail/e-mail-reader.c:2223
 msgid "Do not mark new mails in this thread as read automatically"
 msgstr "Ikke merk nye meldinger i denne tråden som lest automatisk"
 
-#: ../mail/e-mail-reader.c:2189
+#: ../mail/e-mail-reader.c:2228
 msgid "Uni_mportant"
 msgstr "_Ikke viktig"
 
-#: ../mail/e-mail-reader.c:2191
+#: ../mail/e-mail-reader.c:2230
 msgid "Mark the selected messages as unimportant"
 msgstr "Merk valgte meldinger som uviktige"
 
-#: ../mail/e-mail-reader.c:2196
+#: ../mail/e-mail-reader.c:2235
 msgid "_Unread"
 msgstr "_Ulest"
 
-#: ../mail/e-mail-reader.c:2198
+#: ../mail/e-mail-reader.c:2237
 msgid "Mark the selected messages as not having been read"
 msgstr "Merk valgte meldinger som ulest"
 
-#: ../mail/e-mail-reader.c:2203 ../modules/mail/e-mail-attachment-handler.c:350
+#: ../mail/e-mail-reader.c:2242 ../modules/mail/e-mail-attachment-handler.c:418
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding …"
 
-#: ../mail/e-mail-reader.c:2205 ../modules/mail/e-mail-attachment-handler.c:352
+#: ../mail/e-mail-reader.c:2244 ../modules/mail/e-mail-attachment-handler.c:420
 msgid "Open the selected messages in the composer for editing"
 msgstr "Åpne valgte meldinger i redigeringskomponenten"
 
-#: ../mail/e-mail-reader.c:2210
+#: ../mail/e-mail-reader.c:2249
 msgid "Compose _New Message"
 msgstr "Skriv _ny melding"
 
-#: ../mail/e-mail-reader.c:2212
+#: ../mail/e-mail-reader.c:2251
 msgid "Open a window for composing a mail message"
 msgstr "Åpne et vindu for å skrive en e-post melding"
 
-#: ../mail/e-mail-reader.c:2217
+#: ../mail/e-mail-reader.c:2256
 msgid "_Open in New Window"
 msgstr "_Åpne i _nytt vindu"
 
-#: ../mail/e-mail-reader.c:2219
+#: ../mail/e-mail-reader.c:2258
 msgid "Open the selected messages in a new window"
 msgstr "Åpne valgte meldinger i et nytt vindu"
 
-#: ../mail/e-mail-reader.c:2224
+#: ../mail/e-mail-reader.c:2263
 msgid "_Move to Folder..."
 msgstr "Fl_ytt til mappe …"
 
-#: ../mail/e-mail-reader.c:2226
+#: ../mail/e-mail-reader.c:2265
 msgid "Move selected messages to another folder"
 msgstr "Flytt valgte meldinger til en annen mappe"
 
-#: ../mail/e-mail-reader.c:2231
+#: ../mail/e-mail-reader.c:2270
 msgid "_Next Message"
 msgstr "_Neste melding"
 
-#: ../mail/e-mail-reader.c:2233
+#: ../mail/e-mail-reader.c:2272
 msgid "Display the next message"
 msgstr "Vis neste melding"
 
-#: ../mail/e-mail-reader.c:2238
+#: ../mail/e-mail-reader.c:2277
 msgid "Next _Important Message"
 msgstr "Neste v_iktige melding"
 
-#: ../mail/e-mail-reader.c:2240
+#: ../mail/e-mail-reader.c:2279
 msgid "Display the next important message"
 msgstr "Vis neste viktige melding"
 
-#: ../mail/e-mail-reader.c:2245
+#: ../mail/e-mail-reader.c:2284
 msgid "Next _Thread"
 msgstr "Neste _tråd"
 
-#: ../mail/e-mail-reader.c:2247
+#: ../mail/e-mail-reader.c:2286
 msgid "Display the next thread"
 msgstr "Vis neste tråd"
 
-#: ../mail/e-mail-reader.c:2252
+#: ../mail/e-mail-reader.c:2291
 msgid "Next _Unread Message"
 msgstr "Neste _uleste melding"
 
-#: ../mail/e-mail-reader.c:2254
+#: ../mail/e-mail-reader.c:2293
 msgid "Display the next unread message"
 msgstr "Vis neste uleste melding"
 
-#: ../mail/e-mail-reader.c:2259
+#: ../mail/e-mail-reader.c:2298
 msgid "_Previous Message"
 msgstr "_Forrige melding"
 
-#: ../mail/e-mail-reader.c:2261
+#: ../mail/e-mail-reader.c:2300
 msgid "Display the previous message"
 msgstr "Vis forrige melding"
 
-#: ../mail/e-mail-reader.c:2266
+#: ../mail/e-mail-reader.c:2305
 msgid "Pr_evious Important Message"
 msgstr "Forrig_e viktige melding"
 
-#: ../mail/e-mail-reader.c:2268
+#: ../mail/e-mail-reader.c:2307
 msgid "Display the previous important message"
 msgstr "Vis forrige viktige melding"
 
-#: ../mail/e-mail-reader.c:2273
+#: ../mail/e-mail-reader.c:2312
 msgid "Previous T_hread"
 msgstr "Forrige trå_d"
 
-#: ../mail/e-mail-reader.c:2275
+#: ../mail/e-mail-reader.c:2314
 msgid "Display the previous thread"
 msgstr "Vis forrige tråd"
 
-#: ../mail/e-mail-reader.c:2280
+#: ../mail/e-mail-reader.c:2319
 msgid "P_revious Unread Message"
 msgstr "Fo_rrige uleste melding"
 
-#: ../mail/e-mail-reader.c:2282
+#: ../mail/e-mail-reader.c:2321
 msgid "Display the previous unread message"
 msgstr "Vis forrige uleste melding"
 
-#: ../mail/e-mail-reader.c:2289
+#: ../mail/e-mail-reader.c:2328
 msgid "Print this message"
 msgstr "Skriv ut denne meldingen"
 
-#: ../mail/e-mail-reader.c:2296
+#: ../mail/e-mail-reader.c:2335
 msgid "Preview the message to be printed"
 msgstr "Forhåndsvis meldingen som skal skrives ut"
 
-#: ../mail/e-mail-reader.c:2301 ../modules/mail/e-mail-attachment-handler.c:385
+#: ../mail/e-mail-reader.c:2340 ../modules/mail/e-mail-attachment-handler.c:453
 msgid "Re_direct"
 msgstr "Om_diriger"
 
-#: ../mail/e-mail-reader.c:2303 ../modules/mail/e-mail-attachment-handler.c:387
+#: ../mail/e-mail-reader.c:2342 ../modules/mail/e-mail-attachment-handler.c:455
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Omdiriger (bounce) den valgte meldingen til noen"
 
-#: ../mail/e-mail-reader.c:2308
+#: ../mail/e-mail-reader.c:2347
 msgid "Remo_ve Attachments"
 msgstr "Fjern _vedlegg"
 
-#: ../mail/e-mail-reader.c:2310
+#: ../mail/e-mail-reader.c:2349
 msgid "Remove attachments"
 msgstr "Fjern vedlegg"
 
-#: ../mail/e-mail-reader.c:2315
+#: ../mail/e-mail-reader.c:2354
 msgid "Remove Du_plicate Messages"
 msgstr "Fjern du_plikatmeldinger"
 
-#: ../mail/e-mail-reader.c:2317
+#: ../mail/e-mail-reader.c:2356
 msgid "Checks selected messages for duplicates"
 msgstr "Sjekk valgte meldinger for duplikater"
 
-#: ../mail/e-mail-reader.c:2322 ../mail/mail.error.xml.h:28
+#: ../mail/e-mail-reader.c:2361 ../mail/mail.error.xml.h:28
 #: ../modules/calendar/e-cal-shell-view-actions.c:1432
-#: ../modules/mail/e-mail-attachment-handler.c:329
+#: ../modules/mail/e-mail-attachment-handler.c:397
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: ../mail/e-mail-reader.c:2324 ../modules/mail/e-mail-attachment-handler.c:331
+#: ../mail/e-mail-reader.c:2363 ../modules/mail/e-mail-attachment-handler.c:399
 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:2329 ../mail/mail.error.xml.h:26
-#: ../modules/mail/e-mail-attachment-handler.c:336
+#: ../mail/e-mail-reader.c:2368 ../mail/mail.error.xml.h:26
+#: ../modules/mail/e-mail-attachment-handler.c:404
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: ../mail/e-mail-reader.c:2331 ../modules/mail/e-mail-attachment-handler.c:338
+#: ../mail/e-mail-reader.c:2370 ../modules/mail/e-mail-attachment-handler.c:406
 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:2336 ../modules/mail/e-mail-attachment-handler.c:343
+#: ../mail/e-mail-reader.c:2375 ../modules/mail/e-mail-attachment-handler.c:411
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsender"
 
-#: ../mail/e-mail-reader.c:2338 ../modules/mail/e-mail-attachment-handler.c:345
+#: ../mail/e-mail-reader.c:2377 ../modules/mail/e-mail-attachment-handler.c:413
 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:2343
+#: ../mail/e-mail-reader.c:2382
 msgid "_Save as mbox..."
 msgstr "Lagre _som mbox …"
 
-#: ../mail/e-mail-reader.c:2345
+#: ../mail/e-mail-reader.c:2384
 msgid "Save selected messages as an mbox file"
 msgstr "Lagre valgte meldinger som en mbox-fil"
 
-#: ../mail/e-mail-reader.c:2350
+#: ../mail/e-mail-reader.c:2389
 msgid "_Message Source"
 msgstr "_Meldingskilde"
 
-#: ../mail/e-mail-reader.c:2352
+#: ../mail/e-mail-reader.c:2391
 msgid "Show the raw email source of the message"
 msgstr "Vis e-post meldingen i sin råe form"
 
-#: ../mail/e-mail-reader.c:2364
+#: ../mail/e-mail-reader.c:2403
 msgid "_Undelete Message"
 msgstr "_Angre sletting av melding"
 
-#: ../mail/e-mail-reader.c:2366
+#: ../mail/e-mail-reader.c:2405
 msgid "Undelete the selected messages"
 msgstr "Angre sletting av valgte meldinger"
 
-#: ../mail/e-mail-reader.c:2371
+#: ../mail/e-mail-reader.c:2410
 msgid "_Normal Size"
 msgstr "_Normal størrelse"
 
-#: ../mail/e-mail-reader.c:2373
+#: ../mail/e-mail-reader.c:2412
 msgid "Reset the text to its original size"
 msgstr "Ta teksten tilbake til sin opprinnelige størrelse"
 
-#: ../mail/e-mail-reader.c:2378
+#: ../mail/e-mail-reader.c:2417
 msgid "_Zoom In"
 msgstr "_Zoom inn"
 
-#: ../mail/e-mail-reader.c:2380
+#: ../mail/e-mail-reader.c:2419
 msgid "Increase the text size"
 msgstr "Større tekst"
 
-#: ../mail/e-mail-reader.c:2387
+#: ../mail/e-mail-reader.c:2426
 msgid "Decrease the text size"
 msgstr "Mindre skrift"
 
-#: ../mail/e-mail-reader.c:2394
+#: ../mail/e-mail-reader.c:2433
 msgid "Cre_ate"
 msgstr "L_ag"
 
-#: ../mail/e-mail-reader.c:2401
+#: ../mail/e-mail-reader.c:2440
 msgid "Ch_aracter Encoding"
 msgstr "Tegn_koding"
 
-#: ../mail/e-mail-reader.c:2408 ../modules/mail/e-mail-attachment-handler.c:357
+#: ../mail/e-mail-reader.c:2447 ../modules/mail/e-mail-attachment-handler.c:425
 msgid "F_orward As"
 msgstr "Videresend s_om"
 
-#: ../mail/e-mail-reader.c:2415
+#: ../mail/e-mail-reader.c:2454
 msgid "_Group Reply"
 msgstr "_Gruppesvar"
 
-#: ../mail/e-mail-reader.c:2422
+#: ../mail/e-mail-reader.c:2461
 msgid "_Go To"
 msgstr "_Gå til"
 
-#: ../mail/e-mail-reader.c:2429
+#: ../mail/e-mail-reader.c:2468
 msgid "Mar_k As"
 msgstr "Mer_k som"
 
-#: ../mail/e-mail-reader.c:2436
+#: ../mail/e-mail-reader.c:2475
 msgid "_Message"
 msgstr "_Melding"
 
-#: ../mail/e-mail-reader.c:2443
+#: ../mail/e-mail-reader.c:2482
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../mail/e-mail-reader.c:2453
+#: ../mail/e-mail-reader.c:2492
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "Lag en søkemappe fra e-post_liste …"
 
-#: ../mail/e-mail-reader.c:2455
+#: ../mail/e-mail-reader.c:2494
 msgid "Create a search folder for this mailing list"
 msgstr "Lag en søkemappe for denne e-postlisten"
 
-#: ../mail/e-mail-reader.c:2460
+#: ../mail/e-mail-reader.c:2499
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "Lag en søkemappe fra mo_ttakere …"
 
-#: ../mail/e-mail-reader.c:2462
+#: ../mail/e-mail-reader.c:2501
 msgid "Create a search folder for these recipients"
 msgstr "Lag en søkemappe for disse mottakerene"
 
-#: ../mail/e-mail-reader.c:2467
+#: ../mail/e-mail-reader.c:2506
 msgid "Create a Search Folder from Sen_der..."
 msgstr "Lag en søkemappe fra avsen_der …"
 
-#: ../mail/e-mail-reader.c:2469
+#: ../mail/e-mail-reader.c:2508
 msgid "Create a search folder for this sender"
 msgstr "Lag en søkemappe for denne avsenderen"
 
-#: ../mail/e-mail-reader.c:2474
+#: ../mail/e-mail-reader.c:2513
 msgid "Create a Search Folder from S_ubject..."
 msgstr "Lag en søkemappe fra _emne …"
 
-#: ../mail/e-mail-reader.c:2476
+#: ../mail/e-mail-reader.c:2515
 msgid "Create a search folder for this subject"
 msgstr "Lag en søkemappe for dette emnet"
 
-#: ../mail/e-mail-reader.c:2515
+#: ../mail/e-mail-reader.c:2554
 msgid "Mark for Follo_w Up..."
 msgstr "Merk for oppføl_ging …"
 
-#: ../mail/e-mail-reader.c:2531
+#: ../mail/e-mail-reader.c:2570
 msgid "Mark as _Important"
 msgstr "Merk som v_iktig"
 
-#: ../mail/e-mail-reader.c:2535
+#: ../mail/e-mail-reader.c:2574
 msgid "Mark as _Junk"
 msgstr "Merk som _uønsket e-post"
 
-#: ../mail/e-mail-reader.c:2539
+#: ../mail/e-mail-reader.c:2578
 msgid "Mark as _Not Junk"
 msgstr "Merk som _gyldig melding"
 
-#: ../mail/e-mail-reader.c:2543
+#: ../mail/e-mail-reader.c:2582
 msgid "Mar_k as Read"
 msgstr "Mer_k som lest"
 
-#: ../mail/e-mail-reader.c:2555
+#: ../mail/e-mail-reader.c:2594
 msgid "Mark as Uni_mportant"
 msgstr "_Merk som uviktig"
 
-#: ../mail/e-mail-reader.c:2559
+#: ../mail/e-mail-reader.c:2598
 msgid "Mark as _Unread"
 msgstr "Merk som _ulest"
 
-#: ../mail/e-mail-reader.c:2603
+#: ../mail/e-mail-reader.c:2642
 msgid "_Caret Mode"
 msgstr "Markør_modus"
 
-#: ../mail/e-mail-reader.c:2605
+#: ../mail/e-mail-reader.c:2644
 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:2611
+#: ../mail/e-mail-reader.c:2650
 msgid "All Message _Headers"
 msgstr "Alle meldings_hoder"
 
-#: ../mail/e-mail-reader.c:2613
+#: ../mail/e-mail-reader.c:2652
 msgid "Show messages with all email headers"
 msgstr "Vis meldinger med alle meldingshoder"
 
-#: ../mail/e-mail-reader.c:3164
+#: ../mail/e-mail-reader.c:3192
 msgid "Retrieving message"
 msgstr "Henter melding"
 
-#: ../mail/e-mail-reader.c:4216 ../modules/mail/e-mail-attachment-handler.c:322
+#: ../mail/e-mail-reader.c:4242 ../modules/mail/e-mail-attachment-handler.c:390
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: ../mail/e-mail-reader.c:4217 ../modules/mail/e-mail-attachment-handler.c:324
+#: ../mail/e-mail-reader.c:4243 ../modules/mail/e-mail-attachment-handler.c:392
 msgid "Forward the selected message to someone"
 msgstr "Videresend den valgte meldingen til noen"
 
-#: ../mail/e-mail-reader.c:4236
+#: ../mail/e-mail-reader.c:4262
 msgid "Group Reply"
 msgstr "Gruppesvar"
 
-#: ../mail/e-mail-reader.c:4237
+#: ../mail/e-mail-reader.c:4263
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Svar til e-postlisten eller til alle mottakere"
 
-#: ../mail/e-mail-reader.c:4303 ../mail/filtertypes.xml.in.h:67
+#: ../mail/e-mail-reader.c:4329 ../mail/filtertypes.xml.in.h:67
 msgid "Delete"
 msgstr "Slett"
 
-#: ../mail/e-mail-reader.c:4315
+#: ../mail/e-mail-reader.c:4341
 #: ../modules/calendar/e-cal-shell-view-actions.c:1243
 msgid "Next"
 msgstr "Neste"
 
-#: ../mail/e-mail-reader.c:4319
+#: ../mail/e-mail-reader.c:4345
 #: ../modules/calendar/e-cal-shell-view-actions.c:1236
 msgid "Previous"
 msgstr "Forrige"
 
-#: ../mail/e-mail-reader.c:4328 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:4354 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "Svar"
 
-#: ../mail/e-mail-reader.c:5406
+#: ../mail/e-mail-reader.c:5426
 #, c-format
 msgid "Allow remote content for anyone from %s"
 msgstr "Tillat eksternt innhold for alle fra %s"
 
-#: ../mail/e-mail-reader.c:5408
+#: ../mail/e-mail-reader.c:5428
 #, c-format
 msgid "Allow remote content for %s"
 msgstr "Tillat eksternt innhold for %s"
 
-#: ../mail/e-mail-reader.c:5425
+#: ../mail/e-mail-reader.c:5445
 #, c-format
 msgid "Allow remote content from %s"
 msgstr "Tillat eksternt innhold fra %s"
 
-#: ../mail/e-mail-reader.c:5442
+#: ../mail/e-mail-reader.c:5462
 msgid "Do not show this message again"
 msgstr "Ikke vis denne meldingen igjen"
 
-#: ../mail/e-mail-reader.c:5490
+#: ../mail/e-mail-reader.c:5510
 msgid "Load remote content"
 msgstr "Last eksternt innhold"
 
@@ -16160,13 +16183,13 @@ msgstr "Merker undertråd som ignorert"
 msgid "Unmarking subthread from being ignored"
 msgstr "Fjerner merking av undertråd som ignorert"
 
-#: ../mail/e-mail-reader-utils.c:1419
+#: ../mail/e-mail-reader-utils.c:1427
 msgid "Printing"
 msgstr "Skriver ut"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1656
+#: ../mail/e-mail-reader-utils.c:1664
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -16181,7 +16204,7 @@ msgstr[1] ""
 "Mappen «%s» inneholder %u duplikatmeldinger. Er du sikker på at du vil "
 "slette dem?"
 
-#: ../mail/e-mail-reader-utils.c:2487
+#: ../mail/e-mail-reader-utils.c:2664
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Lagre melding"
@@ -16192,17 +16215,17 @@ msgstr[1] "Lagre meldinger"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:2508
+#: ../mail/e-mail-reader-utils.c:2685
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Melding"
 msgstr[1] "Meldinger"
 
-#: ../mail/e-mail-reader-utils.c:2881
+#: ../mail/e-mail-reader-utils.c:3058
 msgid "Parsing message"
 msgstr "Leser melding"
 
-#: ../mail/e-mail-request.c:207
+#: ../mail/e-mail-request.c:272
 msgid "The message has no text content."
 msgstr "Meldingen har ikke tekstinnhold."
 
@@ -16261,7 +16284,7 @@ msgstr[1] ""
 
 #. This message is never removed from the camel operation, otherwise the GtkInfoBar
 #. hides itself and the user sees no feedback.
-#: ../mail/em-composer-utils.c:790
+#: ../mail/em-composer-utils.c:791
 msgid "Waiting for attachments to load..."
 msgstr "Venter på at vedlegg lastes …"
 
@@ -16269,7 +16292,7 @@ msgstr "Venter på at vedlegg lastes …"
 #. * 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:1692
+#: ../mail/em-composer-utils.c:1742
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -16277,24 +16300,24 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Day}.${Month}.${Year} kl. ${24Hour}.${Minute} "
 "${TimeZone}, skrev ${Sender}:"
 
-#: ../mail/em-composer-utils.c:1698
+#: ../mail/em-composer-utils.c:1748
 msgid "-------- Forwarded Message --------"
 msgstr "---------Videresendt melding-------"
 
-#: ../mail/em-composer-utils.c:1703
+#: ../mail/em-composer-utils.c:1753
 msgid "-----Original Message-----"
 msgstr "-----Opprinnelig melding-----"
 
-#: ../mail/em-composer-utils.c:3008
+#: ../mail/em-composer-utils.c:2968
 msgid "an unknown sender"
 msgstr "en ukjent avsender"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../mail/em-composer-utils.c:3495
+#: ../mail/em-composer-utils.c:3440
 msgid "Posting destination"
 msgstr "Destinasjon for post"
 
-#: ../mail/em-composer-utils.c:3500
+#: ../mail/em-composer-utils.c:3445
 msgid "Choose folders to post the message to."
 msgstr "Velg mapper meldingen skal postes til."
 
@@ -16303,11 +16326,11 @@ msgid "Select Folder"
 msgstr "Velg mappe"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:587
+#: ../mail/em-filter-rule.c:597
 msgid "Then"
 msgstr "Så etter"
 
-#: ../mail/em-filter-rule.c:652
+#: ../mail/em-filter-rule.c:662
 msgid "Add Ac_tion"
 msgstr "Legg til hand_ling"
 
@@ -16472,7 +16495,7 @@ msgid "Subscribe To _All"
 msgstr "Abonner på _alle"
 
 #: ../mail/em-subscription-editor.c:970 ../mail/em-subscription-editor.c:1914
-#: ../modules/mail/e-mail-shell-view-actions.c:1751
+#: ../mail/mail.error.xml.h:73 ../modules/mail/e-mail-shell-view-actions.c:1823
 msgid "_Unsubscribe"
 msgstr "_Fjern abonnement"
 
@@ -16485,7 +16508,7 @@ msgid "Unsubscribe From _All"
 msgstr "Fjern abonnement på _alle"
 
 #: ../mail/em-subscription-editor.c:1339
-#: ../modules/mail/e-mail-shell-view-private.c:1029
+#: ../modules/mail/e-mail-shell-view-private.c:1030
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -16493,7 +16516,7 @@ msgstr[0] "%d ulest, "
 msgstr[1] "%d uleste, "
 
 #: ../mail/em-subscription-editor.c:1343
-#: ../modules/mail/e-mail-shell-view-private.c:1039
+#: ../modules/mail/e-mail-shell-view-private.c:1040
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -16525,7 +16548,7 @@ msgid "Su_bscribe"
 msgstr "A_bonner"
 
 #: ../mail/em-subscription-editor.c:1913
-#: ../modules/mail/e-mail-shell-view-actions.c:1753
+#: ../modules/mail/e-mail-shell-view-actions.c:1825
 msgid "Unsubscribe from the selected folder"
 msgstr "Fjern abonnement på valgt mappe"
 
@@ -16550,8 +16573,8 @@ msgid "Refresh the folder list"
 msgstr "Oppdater mappelisten"
 
 #: ../mail/em-subscription-editor.c:1976
-#: ../modules/mail/e-mail-shell-view-actions.c:1652
-#: ../modules/mail/e-mail-shell-view-actions.c:1723
+#: ../modules/mail/e-mail-shell-view-actions.c:1724
+#: ../modules/mail/e-mail-shell-view-actions.c:1795
 msgid "_Refresh"
 msgstr "Oppdate_r"
 
@@ -16579,12 +16602,12 @@ msgstr[1] "Er du sikker på at du vil åpne %d meldinger samtidig?"
 msgid "Message Filters"
 msgstr "Meldingsfiltre"
 
-#: ../mail/em-utils.c:923
+#: ../mail/em-utils.c:939
 #, c-format
 msgid "Messages from %s"
 msgstr "Meldinger fra %s"
 
-#: ../mail/em-utils.c:1680
+#: ../mail/em-utils.c:1696
 msgid "Deleting old messages"
 msgstr "Sletter gamle meldinger"
 
@@ -16989,7 +17012,7 @@ msgid "Import mail and contacts from KMail."
 msgstr "Importer e-post og kontakter fra KMail."
 
 #: ../mail/importers/kmail-libs.c:152
-#: ../modules/mail/e-mail-shell-view-private.c:1060
+#: ../modules/mail/e-mail-shell-view-private.c:1061
 msgid "Trash"
 msgstr "Papirkurv"
 
@@ -17262,7 +17285,7 @@ msgid "Use for Recipients"
 msgstr " Bruk for mottakere "
 
 #. Translators: Label of a frame with a list of configured accounts in Send account overrides
-#: ../mail/mail-config.ui.h:68 ../modules/mail/em-composer-prefs.c:864
+#: ../mail/mail-config.ui.h:68 ../modules/mail/em-composer-prefs.c:863
 msgid "Account"
 msgstr "Konto"
 
@@ -17746,16 +17769,19 @@ msgstr "Bruk forvalgt mappe for skisser?"
 #: ../mail/mail.error.xml.h:34
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
+"folder instead?\n"
+"\n"
+"The reported error was &quot;{0}&quot;."
 msgstr ""
-"Kan ikke åpne skisse-mappen for denne kontoen. Vil du bruke forvalgt mappe "
-"for skisser i stedet?"
+"Kan ikke åpne skisse-mappen for denne kontoen. Vil du bruke forvalgt mappe for skisser i stedet?\n"
+"\n"
+"Rapportert feil var &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:37
 msgid "Use _Default"
 msgstr "Bruk _forvalg"
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:38
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
@@ -17763,15 +17789,15 @@ msgstr ""
 "Er du sikker på at du vil fjerne alle slettede meldinger fra mappe «{0}» "
 "permanent?"
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:39
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Hvis du fortsetter vil du ikke kunne gjenopprette disse meldingene."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:40
 msgid "_Expunge"
 msgstr "T_øm"
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:41
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -17779,23 +17805,23 @@ msgstr ""
 "Er du sikker på at du vil fjerne alle slettede meldinger fra alle mapper "
 "permanent?"
 
-#: ../mail/mail.error.xml.h:40 ../modules/mail/e-mail-shell-view-actions.c:1638
+#: ../mail/mail.error.xml.h:42 ../modules/mail/e-mail-shell-view-actions.c:1710
 msgid "_Empty Trash"
 msgstr "_Tøm papirkurven"
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:43
 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:42
+#: ../mail/mail.error.xml.h:44
 msgid "_Open Messages"
 msgstr "_Åpne meldinger"
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:45
 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:44
+#: ../mail/mail.error.xml.h:46
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -17806,55 +17832,55 @@ msgstr ""
 #. 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:48
+#: ../mail/mail.error.xml.h:50
 msgid "Error while {0}."
 msgstr "Feil under {0}."
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:51
 msgid "Error while performing operation."
 msgstr "Feil under utføring av operasjon."
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:52
 msgid "Enter password."
 msgstr "Oppgi passord."
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:53
 msgid "Error loading filter definitions."
 msgstr "Feil under lasting av filterdefinisjoner."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:54
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Kan ikke lagre til katalog «{0}»."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:55
 msgid "Cannot save to file \"{0}\"."
 msgstr "Kan ikke lagre til fil «{0}»."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:56
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Kan ikke opprette katalog for lagring fordi «{1}»"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:57
 msgid "Cannot create temporary save directory."
 msgstr "Kan ikke opprette midlertidig katalog."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:58
 msgid "File exists but cannot overwrite it."
 msgstr "Filen eksisterer men kan ikke overskrives."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but is not a regular file."
 msgstr "Filen eksisterer, men den er ikke en vanlig fil."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:60
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Kunne ikke slette mappe «{0}»."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:61
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Kan ikke slette systemmappe «{0}»."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -17862,23 +17888,23 @@ 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:61
+#: ../mail/mail.error.xml.h:63
 msgid "Failed to expunge folder &quot;{0}&quot;."
 msgstr "Klarte ikke å tømme mappe &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:65
 msgid "Failed to refresh folder &quot;{0}&quot;."
 msgstr "Klarte ikke å oppdatere mappe &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:66
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Kan ikke endre navn på eller flytte systemmappe «{0}»."
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:67
 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:66
+#: ../mail/mail.error.xml.h:68
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
@@ -17886,20 +17912,35 @@ msgstr ""
 "Hvis du sletter mappen vil alt innhold i denne og undermapper slettes "
 "permanent."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:70
+msgid "Really unsubscribe folder \"{0}\"?"
+msgstr "Vil du virkelig slutte å abonnere på mappen «{0}»?"
+
+#: ../mail/mail.error.xml.h:71
+msgid ""
+"If you unsubscribe the folder, it might not be visible in the Evolution, "
+"while still being available on the server. You can re-subscribe in Folder-"
+">Subscriptions... menu."
+msgstr "Hvis du slutter å abonnere på mappen vil den kanskje ikke vises i Evolution, men den vil fortsatt 
være tilgjengelig på tjeneren. Du kan abonnere på nytt i menyen Mappe->Abonnement."
+
+#: ../mail/mail.error.xml.h:72
+msgid "Do _Not Unsubscribe"
+msgstr "_Ikke fjern abonnement"
+
+#: ../mail/mail.error.xml.h:74
 msgid "Really delete folder \"{0}\"?"
 msgstr "Vil du virkelig slette mappen «{0}»?"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:75
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "Hvis du sletter mappen vil alt innhold i denne bli slettet permanent."
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:76
 msgid "These messages are not copies."
 msgstr "Disse meldingene er ikke kopier."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:77
 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 "
@@ -17909,65 +17950,65 @@ msgstr ""
 "søkemappe sletter du de faktiske meldingene fra dine lokale eller eksterne "
 "mapper. Vil du virkelig slette disse meldingene?"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:78
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Kan ikke endre navn på «{0}» til «{1}»."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:79
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr ""
 "En mappe med navn «{1}» eksisterer allerede. Vennligst bruk et annet navn."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:80
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Kunne ikke flytte mappe «{0}» til «{1}»."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:81
 msgid "Cannot open source folder. Error: {2}"
 msgstr "Kan ikke åpne kildemappe. Feil: {2}"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:82
 msgid "Cannot open target folder. Error: {2}"
 msgstr "Kan ikke åpne målmappe. Feil: {2}"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:83
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Kan ikke kopiere mappe «{0}» til «{1}»."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:84
 msgid "Cannot create folder \"{0}\"."
 msgstr "Kan ikke opprette mappe «{0}»."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:85
 msgid "Cannot open folder. Error: {1}"
 msgstr "Kunne ikke åpne mappe. Feil: {1}"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:86
 msgid "Cannot save changes to account."
 msgstr "Kan ikke lagre endringer for kontoen."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:87
 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:82
+#: ../mail/mail.error.xml.h:88
 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:83
+#: ../mail/mail.error.xml.h:89
 msgid "Are you sure you want to delete this account?"
 msgstr "Er du sikker på at du vil slette denne kontoen?"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:90
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Hvis du fortsetter vil kontoinformasjonen bli slettet permanent."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:91
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr ""
 "Er du sikker på at du vil slette denne kontoen med alle stedfortredere?"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:92
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -17975,29 +18016,29 @@ msgstr ""
 "Hvis du fortsetter vil all kontoinformasjon og\n"
 "mellomtjenerinformasjon bli slettet permanent."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:94
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr ""
 "Er du sikker på at du vil slette denne kontoen med alle stedfortredere?"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:95
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Hvis du fortsetter vil stedfortrederkontoer bli slettet permanent."
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:96
 msgid "Do _Not Disable"
 msgstr "I_kke slå av"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:97
 msgid "_Disable"
 msgstr "_Deaktiver"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:98
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "Kan ikke redigere søkemappe «{0}» da den ikke eksisterer."
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -18005,40 +18046,40 @@ 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:95
+#: ../mail/mail.error.xml.h:101
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "Kan ikke legge til søkemappe «{0}»."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:102
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr ""
 "En mappe med navn «{0}» eksisterer allerede. Vennligst bruk et annet navn."
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:103
 msgid "Search Folders automatically updated."
 msgstr "Søkemapper oppdatert automatisk."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:104
 msgid "Mail filters automatically updated."
 msgstr "E-postfiltre oppdatert automatisk."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:105
 msgid "Missing folder."
 msgstr "Mangler mappe."
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:106
 msgid "You must specify a folder."
 msgstr "Du må oppgi en mappe."
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:108
 msgid "You must name this Search Folder."
 msgstr "Du må gi navn til denne søkemappen."
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:109
 msgid "No folder selected."
 msgstr "Ingen mappe valgt."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -18048,11 +18089,11 @@ msgstr ""
 "Enten ved å velge mappene individuelt og/eller å velge alle lokale mapper, "
 "alle eksterne mapper eller begge deler."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:112
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Det oppsto et problem under migrering av gammel meldingsmappe «{0}»."
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -18064,19 +18105,19 @@ msgstr ""
 "Du kan velge å ignorere denne mappen, overskrive eller legge til innhold "
 "der, eller avslutte."
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:117
 msgid "_Overwrite"
 msgstr "_Overskriv"
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:118
 msgid "_Append"
 msgstr "_Legg til"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:119
 msgid "Evolution's local mail format has changed."
 msgstr "Evolutions lokale e-postformat er endret."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:120
 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 "
@@ -18094,19 +18135,19 @@ 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:117
+#: ../mail/mail.error.xml.h:123
 msgid "_Exit Evolution"
 msgstr "Avslutt _Evolution"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:124
 msgid "_Migrate Now"
 msgstr "_Migrer nå"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:125
 msgid "Unable to read license file."
 msgstr "Kan ikke lese lisensfilen."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:126
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
@@ -18114,56 +18155,56 @@ msgstr ""
 "Kan ikke lese lisensfil «{0}» pga et installasjonsproblem. Du vil ikke kunne "
 "bruke denne tilbyderen før du har mulighet til å godta lisensen."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:127
 msgid "Please wait."
 msgstr "Vennligst vent."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:128
 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:123
+#: ../mail/mail.error.xml.h:129
 msgid ""
 "Failed to query server for a list of supported authentication mechanisms."
 msgstr ""
 "Klarte ikke å spørre tjener etter en liste med støttede "
 "autentiseringsmekanismer."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:130
 msgid "Failed to get server setup."
 msgstr "Klarte ikke å hente oppsett for tjener."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:131
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Synkroniser mapper lokalt for frakoblet bruk?"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:132
 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:127
+#: ../mail/mail.error.xml.h:133
 msgid "Do _Not Synchronize"
 msgstr "Ikke sy_nkroniser"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:134
 msgid "_Synchronize"
 msgstr "_Synkroniser"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:135
 msgid "Do you want to mark all messages as read?"
 msgstr "Vil du merke alle meldinger som lest?"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:136
 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:131
+#: ../mail/mail.error.xml.h:137
 msgid "Also mark messages in subfolders?"
 msgstr "Merk meldinger i undermapper også?"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:138
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
@@ -18171,135 +18212,135 @@ msgstr ""
 "Vil du merke meldinger som lest kun i denne mappen, eller i valgt mappe og "
 "undermapper i tillegg?"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:139
 msgid "In Current Folder and _Subfolders"
 msgstr "I denne mappen og _undermapper"
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:140
 msgid "In Current _Folder Only"
 msgstr "Kun i _denne mappen"
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:141
 msgid "Should Evolution close this window when replying or forwarding?"
 msgstr "Skal Evolution lukke dette vinduet ved svar eller videresending?"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:142
 msgid "_Yes, Always"
 msgstr "_Ja, alltid"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:143
 msgid "_No, Never"
 msgstr "_Nei, aldri"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:144
 msgid "Copy folder in folder tree."
 msgstr "Kopierer mappe i mappetre."
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:145
 msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
 msgstr "Er du sikker på at du vil kopiere mappe «{0} til mappe «{1}»?"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:147
 msgid "Do _not copy"
 msgstr "Ikke k_opier"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:148
 msgid "_Always copy"
 msgstr "_Alltid kopier"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:149
 msgid "N_ever copy"
 msgstr "A_ldri kopier"
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:150
 msgid "Move folder in folder tree."
 msgstr "Flytt mappe i mappetre."
 
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:151
 msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
 msgstr "Er du sikker på at du vil flytte mappe «{0}» til mappe «{1}»?"
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:153
 msgid "Do _not move"
 msgstr "Ikke _flytt"
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:154
 msgid "_Always move"
 msgstr "_Alltid flytt"
 
-#: ../mail/mail.error.xml.h:149
+#: ../mail/mail.error.xml.h:155
 msgid "N_ever move"
 msgstr "A_ldri flytt"
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:156
 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:151
+#: ../mail/mail.error.xml.h:157
 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:152
+#: ../mail/mail.error.xml.h:158
 msgid "Mail Deletion Failed"
 msgstr "Sletting av e-post feilet"
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:159
 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:154
+#: ../mail/mail.error.xml.h:160
 msgid "\"Check Junk\" Failed"
 msgstr "Sjekk etter uønsket e-post feilet"
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:161
 msgid "\"Report Junk\" Failed"
 msgstr "Feil under rapportering av uønsket e-post"
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:162
 msgid "\"Report Not Junk\" Failed"
 msgstr "Feil under rapportering av e-post som ønsket"
 
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:163
 msgid "Remove duplicate messages?"
 msgstr "Fjern duplikatmeldinger?"
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:164
 msgid "No duplicate messages found."
 msgstr "Ingen duplikatmeldinger funnet."
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:166
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "Mappe «{0}» inneholder ingen duplikatmeldinger."
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:167
 msgid "Failed to connect account &quot;{0}&quot;."
 msgstr "Klarte ikke å koble til konto &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:168
 msgid "Failed to disconnect account &quot;{0}&quot;."
 msgstr "Klarte ikke å koble fra konto &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:169
 msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
 msgstr "Klarte ikke å fjerne abonnement på mappe &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:170
 msgid "Unable to retrieve message."
 msgstr "Kunne ikke hente melding."
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:171
 msgid "{0}"
 msgstr "{0}"
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:172
 msgid "Message is not available in offline mode."
 msgstr "Meldingen er ikke tilgjengelig i frakoblet modus."
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:173
 msgid ""
 "This can be due to the message not being downloaded yet. The folder, or the "
 "account, can be marked for offline synchronization. Then, once the account "
@@ -18312,39 +18353,39 @@ msgstr ""
 "igjen kan du gå til Fil->Last ned meldinger for frakoblet bruk mens denne "
 "mappen er valgt for å sikre at meldingene er tilgjengelig i frakoblet modus."
 
-#: ../mail/mail.error.xml.h:168
+#: ../mail/mail.error.xml.h:174
 msgid "Failed to open folder."
 msgstr "Klarte ikke å åpne mappe."
 
-#: ../mail/mail.error.xml.h:170
+#: ../mail/mail.error.xml.h:176
 msgid "Failed to find duplicate messages."
 msgstr "Klarte ikke å finne duplikatmeldinger."
 
-#: ../mail/mail.error.xml.h:171
+#: ../mail/mail.error.xml.h:177
 msgid "Failed to retrieve messages."
 msgstr "Klarte ikke å hente meldinger."
 
-#: ../mail/mail.error.xml.h:172
+#: ../mail/mail.error.xml.h:178
 msgid "Failed to mark messages as read."
 msgstr "Klarte ikke å markere meldinger som lest."
 
-#: ../mail/mail.error.xml.h:173
+#: ../mail/mail.error.xml.h:179
 msgid "Failed to remove attachments from messages."
 msgstr "Klarte ikke å fjerne vedlegg fra meldinger."
 
-#: ../mail/mail.error.xml.h:174
+#: ../mail/mail.error.xml.h:180
 msgid "Failed to download messages for offline viewing."
 msgstr "Klarte ikke å laste ned meldinger for frakoblet visning."
 
-#: ../mail/mail.error.xml.h:175
+#: ../mail/mail.error.xml.h:181
 msgid "Failed to save messages to disk."
 msgstr "Klarte ikke å lagre meldinger til disk."
 
-#: ../mail/mail.error.xml.h:176
+#: ../mail/mail.error.xml.h:182
 msgid "Hidden file is attached."
 msgstr "Skjult fil er vedlagt."
 
-#: ../mail/mail.error.xml.h:177
+#: ../mail/mail.error.xml.h:183
 msgid ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
@@ -18352,47 +18393,47 @@ msgstr ""
 "Vedleg med navn {0} er en skjult fil og kan inneholde sensitive data. "
 "Vennlist se gjennom den før du sender meldingen."
 
-#: ../mail/mail.error.xml.h:178
+#: ../mail/mail.error.xml.h:184
 msgid "Printing failed."
 msgstr "Utskrift feilet."
 
-#: ../mail/mail.error.xml.h:179
+#: ../mail/mail.error.xml.h:185
 msgid "The printer replied &quot;{0}&quot;."
 msgstr "Skriveren svarte &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:180
+#: ../mail/mail.error.xml.h:186
 msgid "Could not perform this operation on {0}."
 msgstr "Kunne ikke utføre denne operasjonen på {0}."
 
-#: ../mail/mail.error.xml.h:181
+#: ../mail/mail.error.xml.h:187
 msgid "You must be working online to complete this operation."
 msgstr "Du må arbeide frakoblet for å fullføre denne operasjonen."
 
-#: ../mail/mail.error.xml.h:182
+#: ../mail/mail.error.xml.h:188
 msgid "Message from &quot;{0}&quot; account:"
 msgstr "Melding fra konto &quot;{0}&quot;:"
 
-#: ../mail/mail.error.xml.h:183
+#: ../mail/mail.error.xml.h:189
 msgid "Failed to mark thread to be ignored in folder '{0}'"
 msgstr "Klarte ikke å merke tråd som ignorert i mappe «{0}»"
 
-#: ../mail/mail.error.xml.h:184
+#: ../mail/mail.error.xml.h:190
 msgid "Failed to unmark thread from being ignored in folder '{0}'"
 msgstr "Klarte ikke å fjerne merking av tråd som ignorert i mappe «{0}»"
 
-#: ../mail/mail.error.xml.h:185
+#: ../mail/mail.error.xml.h:191
 msgid "Failed to mark subthread to be ignored in folder '{0}'"
 msgstr "Klarte ikke å merke undertråd som ignorert i mappe «{0}»"
 
-#: ../mail/mail.error.xml.h:186
+#: ../mail/mail.error.xml.h:192
 msgid "Failed to unmark subthread from being ignored in folder '{0}'"
 msgstr "Klarte ikke å fjerne merking av undertråd som ignorert i mappe «{0}»"
 
-#: ../mail/mail.error.xml.h:187
+#: ../mail/mail.error.xml.h:193
 msgid "Remote content download had been blocked for this message."
 msgstr "Nedlasting av eksternt innhold ble blokkert for denne meldingen."
 
-#: ../mail/mail.error.xml.h:188
+#: ../mail/mail.error.xml.h:194
 msgid ""
 "You can download remote content manually, or set to remember to download "
 "remote content for this sender or used sites."
@@ -18401,31 +18442,31 @@ msgstr ""
 "innhold for denne avsenderen eller brukte nettsteder."
 
 #. Translators: This constructs a string like "Follow-up, Completed on Tuesday, January 13, 2009"
-#: ../mail/mail.error.xml.h:190
+#: ../mail/mail.error.xml.h:196
 msgid "{0}, Completed on {1}"
 msgstr "{0}, fullført {1}"
 
 #. Translators: This constructs a string like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/mail.error.xml.h:192
+#: ../mail/mail.error.xml.h:198
 msgid "{0} by {1}"
 msgstr "{0} innen {1}"
 
 #. Translators: This constructs a string like "Overdue: Follow-up by Tuesday, January 13, 2009"
-#: ../mail/mail.error.xml.h:194
+#: ../mail/mail.error.xml.h:200
 msgid "Overdue: {0} by {1}"
 msgstr "Utgått: {0} innen {1}"
 
-#: ../mail/mail.error.xml.h:196
+#: ../mail/mail.error.xml.h:202
 msgid "This message note has been changed, but has not been saved."
 msgstr "Meldingsnotatet er endret, men er ikke lagret."
 
 #. Translators: {0} is the name of the folder where the delete of the message note failed.
-#: ../mail/mail.error.xml.h:199
+#: ../mail/mail.error.xml.h:205
 msgid "Failed to delete message note in folder '{0}'"
 msgstr "Klarte ikke å slette meldingsnotat i mappe «{0}»"
 
 #. Translators: {0} is the name of the folder where the store of the message note failed.
-#: ../mail/mail.error.xml.h:201
+#: ../mail/mail.error.xml.h:207
 msgid "Failed to store message note in folder '{0}'"
 msgstr "Klarte ikke å lagre meldingsnotat i mappe «{0}»"
 
@@ -18527,7 +18568,7 @@ msgstr "Genererer meldingsliste"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:2062 ../modules/itip-formatter/itip-view.c:235
+#: ../mail/message-list.c:2062 ../modules/itip-formatter/itip-view.c:269
 msgid "Today %l:%M %p"
 msgstr "I dag %l:%M %p"
 
@@ -18617,32 +18658,32 @@ msgid "Subject or Addresses contains"
 msgstr "Emne eller adresser inneholder"
 
 #: ../mail/searchtypes.xml.in.h:58
-#: ../modules/mail/e-mail-shell-view-actions.c:2159
+#: ../modules/mail/e-mail-shell-view-actions.c:2239
 msgid "Recipients contain"
 msgstr "Mottakere inneholder"
 
 #: ../mail/searchtypes.xml.in.h:59
-#: ../modules/mail/e-mail-shell-view-actions.c:2152
+#: ../modules/mail/e-mail-shell-view-actions.c:2232
 msgid "Message contains"
 msgstr "Melding inneholder"
 
 #: ../mail/searchtypes.xml.in.h:60
-#: ../modules/mail/e-mail-shell-view-actions.c:2173
+#: ../modules/mail/e-mail-shell-view-actions.c:2253
 msgid "Subject contains"
 msgstr "Emne inneholder"
 
 #: ../mail/searchtypes.xml.in.h:61
-#: ../modules/mail/e-mail-shell-view-actions.c:2166
+#: ../modules/mail/e-mail-shell-view-actions.c:2246
 msgid "Sender contains"
 msgstr "Avsender inneholder"
 
 #: ../mail/searchtypes.xml.in.h:62
-#: ../modules/mail/e-mail-shell-view-actions.c:2138
+#: ../modules/mail/e-mail-shell-view-actions.c:2218
 msgid "Body contains"
 msgstr "Kropp inneholder"
 
 #: ../mail/searchtypes.xml.in.h:63
-#: ../modules/mail/e-mail-shell-view-actions.c:2145
+#: ../modules/mail/e-mail-shell-view-actions.c:2225
 msgid "Free form expression"
 msgstr "Fritt uttrykk"
 
@@ -18668,22 +18709,22 @@ msgstr "Autofullføring"
 msgid "Always _show address of the autocompleted contact"
 msgstr "Alltid vi_s adresse for automatisk fullført kontakt"
 
-#: ../modules/addressbook/eab-composer-util.c:147
+#: ../modules/addressbook/eab-composer-util.c:100
 msgid "Multiple vCards"
 msgstr "Flere vCard"
 
-#: ../modules/addressbook/eab-composer-util.c:155
+#: ../modules/addressbook/eab-composer-util.c:108
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard for %s"
 
-#: ../modules/addressbook/eab-composer-util.c:167
-#: ../modules/addressbook/eab-composer-util.c:194
+#: ../modules/addressbook/eab-composer-util.c:119
+#: ../modules/addressbook/eab-composer-util.c:146
 #, c-format
 msgid "Contact information"
 msgstr "Kontaktinformasjon"
 
-#: ../modules/addressbook/eab-composer-util.c:196
+#: ../modules/addressbook/eab-composer-util.c:148
 #, c-format
 msgid "Contact information for %s"
 msgstr "Kontaktinformasjon for %s"
@@ -18801,7 +18842,7 @@ msgstr "Vis kart med alle kontakter fra valgt adressebok"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1299
 #: ../modules/calendar/e-memo-shell-view-actions.c:621
 #: ../modules/calendar/e-task-shell-view-actions.c:747
-#: ../modules/mail/e-mail-shell-view-actions.c:1730
+#: ../modules/mail/e-mail-shell-view-actions.c:1802
 msgid "_Rename..."
 msgstr "End_re navn …"
 
@@ -18882,7 +18923,7 @@ msgstr "H_andlinger"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1080
 #: ../modules/calendar/e-memo-shell-view-actions.c:665
 #: ../modules/calendar/e-task-shell-view-actions.c:819
-#: ../modules/mail/e-mail-shell-view-actions.c:1902
+#: ../modules/mail/e-mail-shell-view-actions.c:1974
 msgid "_Preview"
 msgstr "_Forhåndsvis"
 
@@ -18916,7 +18957,7 @@ msgstr "Vis kart i forhåndsvisning av kontakter"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1166
 #: ../modules/calendar/e-memo-shell-view-actions.c:743
 #: ../modules/calendar/e-task-shell-view-actions.c:909
-#: ../modules/mail/e-mail-shell-view-actions.c:2040
+#: ../modules/mail/e-mail-shell-view-actions.c:2120
 msgid "_Classic View"
 msgstr "_Klassisk visning"
 
@@ -18927,7 +18968,7 @@ msgstr "Vis forhåndsvisning av kontakt under kontaktlisten"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1173
 #: ../modules/calendar/e-memo-shell-view-actions.c:750
 #: ../modules/calendar/e-task-shell-view-actions.c:916
-#: ../modules/mail/e-mail-shell-view-actions.c:2047
+#: ../modules/mail/e-mail-shell-view-actions.c:2127
 msgid "_Vertical View"
 msgstr "_Vertikal visning"
 
@@ -18946,7 +18987,7 @@ msgstr "Ingen treff"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1657
 #: ../modules/calendar/e-memo-shell-view-actions.c:777
 #: ../modules/calendar/e-task-shell-view-actions.c:978
-#: ../modules/mail/e-mail-shell-view-actions.c:2131
+#: ../modules/mail/e-mail-shell-view-actions.c:2211
 #: ../shell/e-shell-content.c:657
 msgid "Advanced Search"
 msgstr "Avansert søk"
@@ -20684,204 +20725,204 @@ msgid_plural "%d tasks"
 msgstr[0] "%d oppgave"
 msgstr[1] "%d oppgaver"
 
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:149
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:156
 msgid "ITIP"
 msgstr "ITIP"
 
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:150
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:157
 msgid "Display part as an invitation"
 msgstr "Vis del som en invitasjon"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:226
+#: ../modules/itip-formatter/itip-view.c:260
 msgid "Today %H:%M"
 msgstr "I dag %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:230
+#: ../modules/itip-formatter/itip-view.c:264
 msgid "Today %H:%M:%S"
 msgstr "I dag %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:239
+#: ../modules/itip-formatter/itip-view.c:273
 msgid "Today %l:%M:%S %p"
 msgstr "I dag %l:%M:%S %p"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:254
+#: ../modules/itip-formatter/itip-view.c:288
 msgid "Tomorrow %H:%M"
 msgstr "I morgen %H.%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:258
+#: ../modules/itip-formatter/itip-view.c:292
 msgid "Tomorrow %H:%M:%S"
 msgstr "I morgen %H.%M.%S"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:263
+#: ../modules/itip-formatter/itip-view.c:297
 msgid "Tomorrow %l:%M %p"
 msgstr "I morgen %l.%M %p"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:267
+#: ../modules/itip-formatter/itip-view.c:301
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "I morgen %l.%M.%S %p"
 
 #. strftime format of a weekday.
-#: ../modules/itip-formatter/itip-view.c:286
+#: ../modules/itip-formatter/itip-view.c:320
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:291
+#: ../modules/itip-formatter/itip-view.c:325
 msgid "%A %H:%M"
 msgstr "%A %H.%M"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:295
+#: ../modules/itip-formatter/itip-view.c:329
 msgid "%A %H:%M:%S"
 msgstr "%A %H.%M.%S"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:300
+#: ../modules/itip-formatter/itip-view.c:334
 msgid "%A %l:%M %p"
 msgstr "%A %l.%M %p"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:304
+#: ../modules/itip-formatter/itip-view.c:338
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l.%M.%S %p"
 
 #. strftime format of a weekday and a date
 #. * without a year.
-#: ../modules/itip-formatter/itip-view.c:313
+#: ../modules/itip-formatter/itip-view.c:347
 msgid "%A, %B %e"
 msgstr "%A, %e %B"
 
 #. strftime format of a weekday, a date
 #. * without a year and a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:319
+#: ../modules/itip-formatter/itip-view.c:353
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e %B %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:323
+#: ../modules/itip-formatter/itip-view.c:357
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e %B %H.%M.%S"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:328
+#: ../modules/itip-formatter/itip-view.c:362
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e %B %l.%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:332
+#: ../modules/itip-formatter/itip-view.c:366
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e %B %l.%M.%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../modules/itip-formatter/itip-view.c:338
+#: ../modules/itip-formatter/itip-view.c:372
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e %B, %Y"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:343
+#: ../modules/itip-formatter/itip-view.c:377
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e %B, %Y %H.%M"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:347
+#: ../modules/itip-formatter/itip-view.c:381
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e %B %Y %H.%M.%S"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:352
+#: ../modules/itip-formatter/itip-view.c:386
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e %B, %Y %l.%M %p"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:356
+#: ../modules/itip-formatter/itip-view.c:390
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e %B, %Y %l.%M.%S %p"
 
-#: ../modules/itip-formatter/itip-view.c:394
-#: ../modules/itip-formatter/itip-view.c:395
-#: ../modules/itip-formatter/itip-view.c:484
-#: ../modules/itip-formatter/itip-view.c:485
-#: ../modules/itip-formatter/itip-view.c:574
+#: ../modules/itip-formatter/itip-view.c:428
+#: ../modules/itip-formatter/itip-view.c:429
+#: ../modules/itip-formatter/itip-view.c:518
+#: ../modules/itip-formatter/itip-view.c:519
+#: ../modules/itip-formatter/itip-view.c:608
 msgid "An unknown person"
 msgstr "En ukjent person"
 
-#: ../modules/itip-formatter/itip-view.c:399
-#: ../modules/itip-formatter/itip-view.c:489
-#: ../modules/itip-formatter/itip-view.c:578
+#: ../modules/itip-formatter/itip-view.c:433
+#: ../modules/itip-formatter/itip-view.c:523
+#: ../modules/itip-formatter/itip-view.c:612
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "Vennligst svar på vegne av %s"
 
-#: ../modules/itip-formatter/itip-view.c:401
-#: ../modules/itip-formatter/itip-view.c:491
-#: ../modules/itip-formatter/itip-view.c:580
+#: ../modules/itip-formatter/itip-view.c:435
+#: ../modules/itip-formatter/itip-view.c:525
+#: ../modules/itip-formatter/itip-view.c:614
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "Mottatt på vegne av %s"
 
-#: ../modules/itip-formatter/itip-view.c:406
+#: ../modules/itip-formatter/itip-view.c:440
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr "%s har publisert følgende møteinformasjon gjennom %s:"
 
-#: ../modules/itip-formatter/itip-view.c:408
+#: ../modules/itip-formatter/itip-view.c:442
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s har publisert følgende møteinformasjon:"
 
-#: ../modules/itip-formatter/itip-view.c:413
+#: ../modules/itip-formatter/itip-view.c:447
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s har delegert følgende møte til deg:"
 
-#: ../modules/itip-formatter/itip-view.c:416
+#: ../modules/itip-formatter/itip-view.c:450
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "%s ber om din tilstedeværelse i et møte gjennom %s:"
 
-#: ../modules/itip-formatter/itip-view.c:418
+#: ../modules/itip-formatter/itip-view.c:452
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "%s ber om din tilstedeværelse i følgende møte:"
 
-#: ../modules/itip-formatter/itip-view.c:424
+#: ../modules/itip-formatter/itip-view.c:458
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "%s ønsker å legge til informasjon i et eksisterende møte gjennom %s:"
 
-#: ../modules/itip-formatter/itip-view.c:426
+#: ../modules/itip-formatter/itip-view.c:460
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "%s ønsker å legge til informasjon i et eksisterende møte:"
 
-#: ../modules/itip-formatter/itip-view.c:430
+#: ../modules/itip-formatter/itip-view.c:464
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -20889,87 +20930,87 @@ msgid ""
 msgstr ""
 "%s ønsker å motta den seneste informasjon for følgende møte gjennom %s:"
 
-#: ../modules/itip-formatter/itip-view.c:432
+#: ../modules/itip-formatter/itip-view.c:466
 #, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "%s ønsker å motta den seneste informasjon for følgende møte:"
 
-#: ../modules/itip-formatter/itip-view.c:436
+#: ../modules/itip-formatter/itip-view.c:470
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "%s har sendt tilbake følgende svar på møteinnkalling gjennom %s:"
 
-#: ../modules/itip-formatter/itip-view.c:438
+#: ../modules/itip-formatter/itip-view.c:472
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "%s har sendt tilbake følgende svar på møteinnkalling:"
 
-#: ../modules/itip-formatter/itip-view.c:442
+#: ../modules/itip-formatter/itip-view.c:476
 #, c-format
 msgid "%s through %s has cancelled the following meeting:"
 msgstr "%s har avlyst følgende møte gjennom %s:"
 
-#: ../modules/itip-formatter/itip-view.c:444
+#: ../modules/itip-formatter/itip-view.c:478
 #, c-format
 msgid "%s has cancelled the following meeting:"
 msgstr "%s har avlyst følgende møte:"
 
-#: ../modules/itip-formatter/itip-view.c:448
+#: ../modules/itip-formatter/itip-view.c:482
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "%s har foreslått følgende endringer i møte gjennom %s."
 
-#: ../modules/itip-formatter/itip-view.c:450
+#: ../modules/itip-formatter/itip-view.c:484
 #, c-format
 msgid "%s has proposed the following meeting changes:"
 msgstr "%s har foreslått følgende endringer i møte:"
 
-#: ../modules/itip-formatter/itip-view.c:454
+#: ../modules/itip-formatter/itip-view.c:488
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "%s har avslått følgende endringer for møte gjennom %s:"
 
-#: ../modules/itip-formatter/itip-view.c:456
+#: ../modules/itip-formatter/itip-view.c:490
 #, c-format
 msgid "%s has declined the following meeting changes:"
 msgstr "%s har avslått følgende endringer for møte:"
 
-#: ../modules/itip-formatter/itip-view.c:496
+#: ../modules/itip-formatter/itip-view.c:530
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr "%s har publisert følgende oppgave gjennom %s:"
 
-#: ../modules/itip-formatter/itip-view.c:498
+#: ../modules/itip-formatter/itip-view.c:532
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s har publisert følgende oppgave:"
 
-#: ../modules/itip-formatter/itip-view.c:503
+#: ../modules/itip-formatter/itip-view.c:537
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "%s ber om at %s tildeles følgende oppgave:"
 
-#: ../modules/itip-formatter/itip-view.c:506
+#: ../modules/itip-formatter/itip-view.c:540
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s har tildelt deg en oppgave gjennom %s:"
 
-#: ../modules/itip-formatter/itip-view.c:508
+#: ../modules/itip-formatter/itip-view.c:542
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s har tildelt deg en oppgave:"
 
-#: ../modules/itip-formatter/itip-view.c:514
+#: ../modules/itip-formatter/itip-view.c:548
 #, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "%s forespør å legge til informasjon i eksisterende oppgave gjennom %s:"
 
-#: ../modules/itip-formatter/itip-view.c:516
+#: ../modules/itip-formatter/itip-view.c:550
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "%s ønsker å legge til informasjon i en eksisterende oppgave:"
 
-#: ../modules/itip-formatter/itip-view.c:520
+#: ../modules/itip-formatter/itip-view.c:554
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -20978,337 +21019,337 @@ msgstr ""
 "%s ønsker å motta den seneste informasjon for følgende tildelt oppgave "
 "gjennom %s:"
 
-#: ../modules/itip-formatter/itip-view.c:522
+#: ../modules/itip-formatter/itip-view.c:556
 #, c-format
 msgid ""
 "%s wishes to receive the latest information for the following assigned task:"
 msgstr ""
 "%s ønsker å motta den seneste informasjon for følgende tildelt oppgave:"
 
-#: ../modules/itip-formatter/itip-view.c:526
+#: ../modules/itip-formatter/itip-view.c:560
 #, c-format
 msgid "%s through %s has sent back the following assigned task response:"
 msgstr "%s har sendt tilbake følgende svar på tildelt oppgave gjennom %s:"
 
-#: ../modules/itip-formatter/itip-view.c:528
+#: ../modules/itip-formatter/itip-view.c:562
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "%s har sendt tilbake følgende svar på tildelt oppgave:"
 
-#: ../modules/itip-formatter/itip-view.c:532
+#: ../modules/itip-formatter/itip-view.c:566
 #, c-format
 msgid "%s through %s has cancelled the following assigned task:"
 msgstr "%s har avlyst følgende tildelt oppgave gjennom %s:"
 
-#: ../modules/itip-formatter/itip-view.c:534
+#: ../modules/itip-formatter/itip-view.c:568
 #, c-format
 msgid "%s has cancelled the following assigned task:"
 msgstr "%s har avlyst følgende tildelt oppgave:"
 
-#: ../modules/itip-formatter/itip-view.c:538
+#: ../modules/itip-formatter/itip-view.c:572
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "%s har foreslått følgende endringer i oppgavetildeling gjennom %s:"
 
-#: ../modules/itip-formatter/itip-view.c:540
+#: ../modules/itip-formatter/itip-view.c:574
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "%s har foreslått følgende endringer i oppgavetildeling:"
 
-#: ../modules/itip-formatter/itip-view.c:544
+#: ../modules/itip-formatter/itip-view.c:578
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "%s har avslått følgende tildelt oppgave gjennom %s:"
 
-#: ../modules/itip-formatter/itip-view.c:546
+#: ../modules/itip-formatter/itip-view.c:580
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s har avslått følgende tildelt oppgave:"
 
-#: ../modules/itip-formatter/itip-view.c:585
+#: ../modules/itip-formatter/itip-view.c:619
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "%s har publisert følgende notat gjennom %s:"
 
-#: ../modules/itip-formatter/itip-view.c:587
+#: ../modules/itip-formatter/itip-view.c:621
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s har publisert følgende notat:"
 
-#: ../modules/itip-formatter/itip-view.c:592
+#: ../modules/itip-formatter/itip-view.c:626
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "%s ønsker å legge til informasjon i et eksisterende notat gjennom %s:"
 
-#: ../modules/itip-formatter/itip-view.c:594
+#: ../modules/itip-formatter/itip-view.c:628
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "%s ønsker å legge til informasjon i et eksisterende notat:"
 
-#: ../modules/itip-formatter/itip-view.c:598
+#: ../modules/itip-formatter/itip-view.c:632
 #, c-format
 msgid "%s through %s has cancelled the following shared memo:"
 msgstr "%s har avlyst følgende delt notat gjennom %s:"
 
-#: ../modules/itip-formatter/itip-view.c:600
+#: ../modules/itip-formatter/itip-view.c:634
 #, c-format
 msgid "%s has cancelled the following shared memo:"
 msgstr "%s har avlyst følgende delt notat:"
 
-#: ../modules/itip-formatter/itip-view.c:674
+#: ../modules/itip-formatter/itip-view.c:859
 msgid "All day:"
 msgstr "Hele dagen:"
 
-#: ../modules/itip-formatter/itip-view.c:680
+#: ../modules/itip-formatter/itip-view.c:865
 msgid "Start day:"
 msgstr "Startdag:"
 
-#: ../modules/itip-formatter/itip-view.c:680
-#: ../modules/itip-formatter/itip-view.c:1515
+#: ../modules/itip-formatter/itip-view.c:865
+#: ../modules/itip-formatter/itip-view.c:1667
 msgid "Start time:"
 msgstr "Start-tid:"
 
-#: ../modules/itip-formatter/itip-view.c:689
+#: ../modules/itip-formatter/itip-view.c:874
 msgid "End day:"
 msgstr "Sluttdag:"
 
-#: ../modules/itip-formatter/itip-view.c:689
-#: ../modules/itip-formatter/itip-view.c:1516
+#: ../modules/itip-formatter/itip-view.c:874
+#: ../modules/itip-formatter/itip-view.c:1668
 msgid "End time:"
 msgstr "Slutt-tid:"
 
-#: ../modules/itip-formatter/itip-view.c:1039
+#: ../modules/itip-formatter/itip-view.c:1205
 msgid "Ope_n Calendar"
 msgstr "Åp_ne kalender"
 
-#: ../modules/itip-formatter/itip-view.c:1042
+#: ../modules/itip-formatter/itip-view.c:1208
 msgid "_Decline all"
 msgstr "A_vslå alle"
 
-#: ../modules/itip-formatter/itip-view.c:1045
+#: ../modules/itip-formatter/itip-view.c:1211
 msgid "_Decline"
 msgstr "A_vslå"
 
-#: ../modules/itip-formatter/itip-view.c:1048
+#: ../modules/itip-formatter/itip-view.c:1214
 msgid "_Tentative all"
 msgstr "Gjør alle _tentative"
 
-#: ../modules/itip-formatter/itip-view.c:1051
+#: ../modules/itip-formatter/itip-view.c:1217
 msgid "_Tentative"
 msgstr "_Tentativ"
 
-#: ../modules/itip-formatter/itip-view.c:1054
+#: ../modules/itip-formatter/itip-view.c:1220
 msgid "Acce_pt all"
 msgstr "_Godta alle"
 
-#: ../modules/itip-formatter/itip-view.c:1057
+#: ../modules/itip-formatter/itip-view.c:1223
 msgid "Acce_pt"
 msgstr "_Godta"
 
-#: ../modules/itip-formatter/itip-view.c:1060
+#: ../modules/itip-formatter/itip-view.c:1226
 msgid "Send _Information"
 msgstr "Send _informasjon"
 
-#: ../modules/itip-formatter/itip-view.c:1063
+#: ../modules/itip-formatter/itip-view.c:1229
 msgid "_Update Attendee Status"
 msgstr "_Oppdater status for deltaker"
 
-#: ../modules/itip-formatter/itip-view.c:1066
+#: ../modules/itip-formatter/itip-view.c:1232
 #: ../smime/gui/certificate-manager.c:1679
 msgid "_Update"
 msgstr "_Oppdater"
 
-#: ../modules/itip-formatter/itip-view.c:1518
-#: ../modules/itip-formatter/itip-view.c:1566
-#: ../modules/itip-formatter/itip-view.c:1637
+#: ../modules/itip-formatter/itip-view.c:1670
+#: ../modules/itip-formatter/itip-view.c:1718
+#: ../modules/itip-formatter/itip-view.c:1789
 msgid "Comment:"
 msgstr "Kommentar:"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1554
+#: ../modules/itip-formatter/itip-view.c:1706
 msgid "Send reply to sender"
 msgstr "Send svar til avsender"
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1569
+#: ../modules/itip-formatter/itip-view.c:1721
 msgid "Send _updates to attendees"
 msgstr "Send _oppdateringer til deltakere"
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1572
+#: ../modules/itip-formatter/itip-view.c:1724
 msgid "_Apply to all instances"
 msgstr "Bruk på _alle instanser"
 
-#: ../modules/itip-formatter/itip-view.c:1573
+#: ../modules/itip-formatter/itip-view.c:1725
 msgid "Show time as _free"
 msgstr "Vis tid som _ledig"
 
-#: ../modules/itip-formatter/itip-view.c:1574
+#: ../modules/itip-formatter/itip-view.c:1726
 msgid "_Preserve my reminder"
 msgstr "_Bevar min påminnelse"
 
-#: ../modules/itip-formatter/itip-view.c:1575
+#: ../modules/itip-formatter/itip-view.c:1727
 msgid "_Inherit reminder"
 msgstr "Arv påm_innelse"
 
-#: ../modules/itip-formatter/itip-view.c:1908
+#: ../modules/itip-formatter/itip-view.c:2036
 msgid "_Tasks:"
 msgstr "_Oppgaver:"
 
-#: ../modules/itip-formatter/itip-view.c:1911
+#: ../modules/itip-formatter/itip-view.c:2039
 msgid "_Memos:"
 msgstr "_Notater:"
 
-#: ../modules/itip-formatter/itip-view.c:3217
+#: ../modules/itip-formatter/itip-view.c:2952
 msgid "Sa_ve"
 msgstr "L_agre"
 
-#: ../modules/itip-formatter/itip-view.c:3679
-#: ../modules/itip-formatter/itip-view.c:5146
+#: ../modules/itip-formatter/itip-view.c:3392
+#: ../modules/itip-formatter/itip-view.c:4848
 msgid "Attendee status updated"
 msgstr "Deltakerstatus oppdatert"
 
-#: ../modules/itip-formatter/itip-view.c:3859
+#: ../modules/itip-formatter/itip-view.c:3557
 #, 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"
 
-#: ../modules/itip-formatter/itip-view.c:3889
+#: ../modules/itip-formatter/itip-view.c:3587
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Fant avtalen i kalender «%s»"
 
-#: ../modules/itip-formatter/itip-view.c:4024
+#: ../modules/itip-formatter/itip-view.c:3721
 msgid "Unable to find any calendars"
 msgstr "Kan ikke finne noen kalendere"
 
-#: ../modules/itip-formatter/itip-view.c:4032
+#: ../modules/itip-formatter/itip-view.c:3729
 msgid "Unable to find this meeting in any calendar"
 msgstr "Kan ikke finne dette møtet i noen kalender"
 
-#: ../modules/itip-formatter/itip-view.c:4037
+#: ../modules/itip-formatter/itip-view.c:3734
 msgid "Unable to find this task in any task list"
 msgstr "Kan ikke finne denne oppgaven i noen oppgaveliste"
 
-#: ../modules/itip-formatter/itip-view.c:4042
+#: ../modules/itip-formatter/itip-view.c:3739
 msgid "Unable to find this memo in any memo list"
 msgstr "Kan ikke finne dette notatet i noen notatliste"
 
-#: ../modules/itip-formatter/itip-view.c:4387
+#: ../modules/itip-formatter/itip-view.c:4083
 msgid "Opening the calendar. Please wait..."
 msgstr "Åpner kalender. Vennligst vent …"
 
-#: ../modules/itip-formatter/itip-view.c:4392
+#: ../modules/itip-formatter/itip-view.c:4088
 msgid "Searching for an existing version of this appointment"
 msgstr "Søker etter en eksisterende versjon av denne avtalen"
 
-#: ../modules/itip-formatter/itip-view.c:4782
+#: ../modules/itip-formatter/itip-view.c:4487
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Kunne ikke sende oppføring til kalender «%s». %s"
 
-#: ../modules/itip-formatter/itip-view.c:4797
+#: ../modules/itip-formatter/itip-view.c:4502
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Sendt til kalender «%s» som godtatt"
 
-#: ../modules/itip-formatter/itip-view.c:4802
+#: ../modules/itip-formatter/itip-view.c:4507
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Sendt til kalender «%s» som tentativ"
 
-#: ../modules/itip-formatter/itip-view.c:4808
+#: ../modules/itip-formatter/itip-view.c:4513
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Sendt til kalender «%s» som avslått"
 
-#: ../modules/itip-formatter/itip-view.c:4814
+#: ../modules/itip-formatter/itip-view.c:4519
 #, c-format
 msgid "Sent to calendar '%s' as cancelled"
 msgstr "Sendt til kalender «%s» som avlyst"
 
-#: ../modules/itip-formatter/itip-view.c:4835
-#: ../modules/itip-formatter/itip-view.c:5293
-#: ../modules/itip-formatter/itip-view.c:5399
+#: ../modules/itip-formatter/itip-view.c:4539
+#: ../modules/itip-formatter/itip-view.c:4985
+#: ../modules/itip-formatter/itip-view.c:5088
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "Lagrer endringer i kalender. Vennligst vent …"
 
-#: ../modules/itip-formatter/itip-view.c:4876
+#: ../modules/itip-formatter/itip-view.c:4580
 msgid "Unable to parse item"
 msgstr "Kunne ikke lese oppføring"
 
-#: ../modules/itip-formatter/itip-view.c:5069
+#: ../modules/itip-formatter/itip-view.c:4772
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organisator har fjernet delegat %s"
 
-#: ../modules/itip-formatter/itip-view.c:5086
+#: ../modules/itip-formatter/itip-view.c:4789
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Avlysningsvarsel sendt til delegat"
 
-#: ../modules/itip-formatter/itip-view.c:5090
+#: ../modules/itip-formatter/itip-view.c:4793
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Kunne ikke sende avlysningsmelding til delegaten"
 
-#: ../modules/itip-formatter/itip-view.c:5138
+#: ../modules/itip-formatter/itip-view.c:4840
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Kan ikke oppdatere deltaker. %s"
 
-#: ../modules/itip-formatter/itip-view.c:5182
+#: ../modules/itip-formatter/itip-view.c:4875
 msgid "The meeting is invalid and cannot be updated"
 msgstr "Møtet er ugyldig og kan ikke oppdateres"
 
-#: ../modules/itip-formatter/itip-view.c:5258
+#: ../modules/itip-formatter/itip-view.c:4950
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Deltakerstatus kunne ikke oppdateres pga ugyldig status"
 
-#: ../modules/itip-formatter/itip-view.c:5330
-#: ../modules/itip-formatter/itip-view.c:5369
+#: ../modules/itip-formatter/itip-view.c:5021
+#: ../modules/itip-formatter/itip-view.c:5059
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Deltakerstatus kan ikke oppdateres fordi oppføringen ikke eksisterer lenger"
 
-#: ../modules/itip-formatter/itip-view.c:5432
+#: ../modules/itip-formatter/itip-view.c:5120
 msgid "Meeting information sent"
 msgstr "Informasjon om møte sendt"
 
-#: ../modules/itip-formatter/itip-view.c:5437
+#: ../modules/itip-formatter/itip-view.c:5125
 msgid "Task information sent"
 msgstr "Informasjon om oppgave sendt"
 
-#: ../modules/itip-formatter/itip-view.c:5442
+#: ../modules/itip-formatter/itip-view.c:5130
 msgid "Memo information sent"
 msgstr "Informasjon om notat sendt"
 
-#: ../modules/itip-formatter/itip-view.c:5453
+#: ../modules/itip-formatter/itip-view.c:5141
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Kan ikke sende møteinformasjon. Møtet eksisterer ikke"
 
-#: ../modules/itip-formatter/itip-view.c:5458
+#: ../modules/itip-formatter/itip-view.c:5146
 msgid "Unable to send task information, the task does not exist"
 msgstr "Kan ikke sende informasjon om oppgave. Oppgaven eksisterer ikke"
 
-#: ../modules/itip-formatter/itip-view.c:5463
+#: ../modules/itip-formatter/itip-view.c:5151
 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.
-#: ../modules/itip-formatter/itip-view.c:5528
+#: ../modules/itip-formatter/itip-view.c:5216
 msgid "calendar.ics"
 msgstr "kalender.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5533
+#: ../modules/itip-formatter/itip-view.c:5221
 msgid "Save Calendar"
 msgstr "Lagre kalender"
 
-#: ../modules/itip-formatter/itip-view.c:5582
-#: ../modules/itip-formatter/itip-view.c:5595
+#: ../modules/itip-formatter/itip-view.c:5269
+#: ../modules/itip-formatter/itip-view.c:5282
 msgid "The calendar attached is not valid"
 msgstr "Vedlagt kalender er ugyldig"
 
-#: ../modules/itip-formatter/itip-view.c:5583
-#: ../modules/itip-formatter/itip-view.c:5596
+#: ../modules/itip-formatter/itip-view.c:5270
+#: ../modules/itip-formatter/itip-view.c:5283
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -21316,15 +21357,15 @@ msgstr ""
 "Meldingen påstår at den inneholder en kalender, men kalenderen er ikke en "
 "gyldig iCalendar."
 
-#: ../modules/itip-formatter/itip-view.c:5638
-#: ../modules/itip-formatter/itip-view.c:5668
-#: ../modules/itip-formatter/itip-view.c:5769
+#: ../modules/itip-formatter/itip-view.c:5325
+#: ../modules/itip-formatter/itip-view.c:5355
+#: ../modules/itip-formatter/itip-view.c:5458
 msgid "The item in the calendar is not valid"
 msgstr "Oppføringen i kalenderen er ikke gyldig"
 
-#: ../modules/itip-formatter/itip-view.c:5639
-#: ../modules/itip-formatter/itip-view.c:5669
-#: ../modules/itip-formatter/itip-view.c:5770
+#: ../modules/itip-formatter/itip-view.c:5326
+#: ../modules/itip-formatter/itip-view.c:5356
+#: ../modules/itip-formatter/itip-view.c:5459
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -21332,11 +21373,11 @@ msgstr ""
 "Meldingen inneholder en kalender, men kalenderen inneholder ingen hendelser, "
 "oppgaver eller ledig/opptatt-informasjon"
 
-#: ../modules/itip-formatter/itip-view.c:5684
+#: ../modules/itip-formatter/itip-view.c:5371
 msgid "The calendar attached contains multiple items"
 msgstr "Vedlagt kalender inneholder flere oppføringer"
 
-#: ../modules/itip-formatter/itip-view.c:5685
+#: ../modules/itip-formatter/itip-view.c:5372
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -21344,24 +21385,24 @@ msgstr ""
 "Du må lagre filen og importere kalenderen for å prosessere alle disse "
 "oppføringene"
 
-#: ../modules/itip-formatter/itip-view.c:6188
+#: ../modules/itip-formatter/itip-view.c:5890
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ingen"
 
-#: ../modules/itip-formatter/itip-view.c:6204
+#: ../modules/itip-formatter/itip-view.c:5906
 msgid "Tentatively Accepted"
 msgstr "Akseptert tentativt"
 
-#: ../modules/itip-formatter/itip-view.c:6364
+#: ../modules/itip-formatter/itip-view.c:6072
 msgid "This meeting recurs"
 msgstr "Dettee møtet gjeninntreffer"
 
-#: ../modules/itip-formatter/itip-view.c:6367
+#: ../modules/itip-formatter/itip-view.c:6075
 msgid "This task recurs"
 msgstr "Denne oppgaven gjeninntreffer"
 
-#: ../modules/itip-formatter/itip-view.c:6370
+#: ../modules/itip-formatter/itip-view.c:6078
 msgid "This memo recurs"
 msgstr "Dette notatet gjeninntreffer"
 
@@ -21379,19 +21420,19 @@ msgstr "Dette møtet er delegert"
 msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
 msgstr "'{0}' har delegert møtet. Vil du legge til delegat '{1}'?"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:265
+#: ../modules/mail-config/e-mail-config-google-summary.c:282
 msgid "Google Features"
 msgstr "Google funksjoner"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:274
+#: ../modules/mail-config/e-mail-config-google-summary.c:291
 msgid "Add Google Ca_lendar to this account"
 msgstr "Legg til ka_lendere fra Google i denne kontoen"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:283
+#: ../modules/mail-config/e-mail-config-google-summary.c:300
 msgid "Add Google Con_tacts to this account"
 msgstr "Legg til kontakter fra Google i denne kontoen"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:292
+#: ../modules/mail-config/e-mail-config-google-summary.c:309
 msgid "You may need to enable IMAP access"
 msgstr "Du må kanskje slå på IMAP-tilgang"
 
@@ -21547,436 +21588,446 @@ msgstr "Yahoo!-funksjoner"
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr "Legg til kalender og oppgaver fra Yahoo i denne kontoen"
 
-#: ../modules/mail/e-mail-attachment-handler.c:605
+#: ../modules/mail/e-mail-attachment-handler.c:673
 #, c-format
 msgid "%d attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "%d vedlagt melding"
 msgstr[1] "%d vedlagte meldinger"
 
-#: ../modules/mail/e-mail-shell-backend.c:353
+#: ../modules/mail/e-mail-shell-backend.c:377
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "E-post_melding"
 
-#: ../modules/mail/e-mail-shell-backend.c:355
+#: ../modules/mail/e-mail-shell-backend.c:379
 msgid "Compose a new mail message"
 msgstr "Skriv en ny e-postmelding"
 
-#: ../modules/mail/e-mail-shell-backend.c:363
+#: ../modules/mail/e-mail-shell-backend.c:387
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "E-post-k_onto"
 
-#: ../modules/mail/e-mail-shell-backend.c:365
+#: ../modules/mail/e-mail-shell-backend.c:389
 msgid "Create a new mail account"
 msgstr "Lag en ny e-postkonto"
 
-#: ../modules/mail/e-mail-shell-backend.c:370
+#: ../modules/mail/e-mail-shell-backend.c:394
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "E-post_mappe"
 
-#: ../modules/mail/e-mail-shell-backend.c:372
+#: ../modules/mail/e-mail-shell-backend.c:396
 msgid "Create a new mail folder"
 msgstr "Opprett en ny e-postmappe"
 
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
 #. it to some user-frienly form, or keep it as is.
-#: ../modules/mail/e-mail-shell-backend.c:687
+#: ../modules/mail/e-mail-shell-backend.c:711
 msgctxt "NetworkMonitor"
 msgid "base"
 msgstr "grunnleggende"
 
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
 #. it to some user-frienly form, or keep it as is.
-#: ../modules/mail/e-mail-shell-backend.c:690
+#: ../modules/mail/e-mail-shell-backend.c:714
 msgctxt "NetworkMonitor"
 msgid "netlink"
 msgstr "netlink"
 
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
 #. it to some user-frienly form, or keep it as is.
-#: ../modules/mail/e-mail-shell-backend.c:693
+#: ../modules/mail/e-mail-shell-backend.c:717
 msgctxt "NetworkMonitor"
 msgid "networkmanager"
 msgstr "networkmanager"
 
-#: ../modules/mail/e-mail-shell-backend.c:725
+#: ../modules/mail/e-mail-shell-backend.c:749
 msgctxt "NetworkMonitor"
 msgid "Method to detect _online state:"
 msgstr "Metode for å avdekke tilk_oblingsstatus:"
 
 #. Always as the first
-#: ../modules/mail/e-mail-shell-backend.c:734
+#: ../modules/mail/e-mail-shell-backend.c:758
 msgctxt "NetworkMonitor"
 msgid "Default"
 msgstr "Forvalgt"
 
 #. Always as the last
-#: ../modules/mail/e-mail-shell-backend.c:748
+#: ../modules/mail/e-mail-shell-backend.c:772
 msgctxt "NetworkMonitor"
 msgid "Always Online"
 msgstr "Alltid tilkoblet"
 
-#: ../modules/mail/e-mail-shell-backend.c:808
+#: ../modules/mail/e-mail-shell-backend.c:832
 msgid "Mail Accounts"
 msgstr "E-post-konti"
 
-#: ../modules/mail/e-mail-shell-backend.c:817
+#: ../modules/mail/e-mail-shell-backend.c:841
 msgid "Mail Preferences"
 msgstr "Brukervalg for e-post"
 
-#: ../modules/mail/e-mail-shell-backend.c:826
+#: ../modules/mail/e-mail-shell-backend.c:850
 msgid "Composer Preferences"
 msgstr "Brukervalg for redigering"
 
-#: ../modules/mail/e-mail-shell-backend.c:835
+#: ../modules/mail/e-mail-shell-backend.c:859
 msgid "Network Preferences"
 msgstr "Brukervalg for nettverk"
 
 #. Translators: The first item in the list, to be
 #. * able to set rule: [Label] [is/is-not] [None]
-#: ../modules/mail/e-mail-shell-backend.c:1127
+#: ../modules/mail/e-mail-shell-backend.c:1151
 msgctxt "label"
 msgid "None"
 msgstr "Ingen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:713
+#: ../modules/mail/e-mail-shell-view-actions.c:736
 msgid "Marking messages as read..."
 msgstr "Merker meldinger _som lest …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1038
+#: ../modules/mail/e-mail-shell-view-actions.c:1095
 msgid "Go to Folder"
 msgstr "Gå til mappe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1042
+#: ../modules/mail/e-mail-shell-view-actions.c:1099
 msgid "_Select"
 msgstr "_Velg"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1631
+#: ../modules/mail/e-mail-shell-view-actions.c:1703
 msgid "_Disable Account"
 msgstr "_Deaktiver konto"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1633
+#: ../modules/mail/e-mail-shell-view-actions.c:1705
 msgid "Disable this account"
 msgstr "Deaktiver denne kontoen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1640
+#: ../modules/mail/e-mail-shell-view-actions.c:1712
 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:1647
+#: ../modules/mail/e-mail-shell-view-actions.c:1719
 msgid "Edit properties of this account"
 msgstr "Rediger egenskaper for denne kontoen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1654
+#: ../modules/mail/e-mail-shell-view-actions.c:1726
 msgid "Refresh list of folders of this account"
 msgstr "Oppdater mappelisten for denne kontoen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1659
+#: ../modules/mail/e-mail-shell-view-actions.c:1731
 msgid "_Download Messages for Offline Usage"
 msgstr "Last ne_d meldinger for frakoblet bruk"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1661
+#: ../modules/mail/e-mail-shell-view-actions.c:1733
 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:1666
+#: ../modules/mail/e-mail-shell-view-actions.c:1738
 msgid "Fl_ush Outbox"
 msgstr "T_øm utboks"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1673
+#: ../modules/mail/e-mail-shell-view-actions.c:1745
 msgid "_Copy Folder To..."
 msgstr "_Kopier mappe til …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1675
+#: ../modules/mail/e-mail-shell-view-actions.c:1747
 msgid "Copy the selected folder into another folder"
 msgstr "Kopier valgt mappe til en annen mappe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1682
+#: ../modules/mail/e-mail-shell-view-actions.c:1754
 msgid "Permanently remove this folder"
 msgstr "Fjern denne mappen permanent"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1687
+#: ../modules/mail/e-mail-shell-view-actions.c:1759
 msgid "E_xpunge"
 msgstr "T_øm"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1689
+#: ../modules/mail/e-mail-shell-view-actions.c:1761
 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:1694
-#: ../modules/mail/e-mail-shell-view-actions.c:1802
+#: ../modules/mail/e-mail-shell-view-actions.c:1766
+#: ../modules/mail/e-mail-shell-view-actions.c:1874
 msgid "Mar_k All Messages as Read"
 msgstr "Mer_k alle meldinger som lest"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1696
-#: ../modules/mail/e-mail-shell-view-actions.c:1804
+#: ../modules/mail/e-mail-shell-view-actions.c:1768
+#: ../modules/mail/e-mail-shell-view-actions.c:1876
 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:1701
+#: ../modules/mail/e-mail-shell-view-actions.c:1773
 msgid "_Move Folder To..."
 msgstr "Flytt _mappe til …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1703
+#: ../modules/mail/e-mail-shell-view-actions.c:1775
 msgid "Move the selected folder into another folder"
 msgstr "Flytt valgt mappe til en annen mappe"
 
 #. Translators: An action caption to create a new mail folder
-#: ../modules/mail/e-mail-shell-view-actions.c:1709
+#: ../modules/mail/e-mail-shell-view-actions.c:1781
 msgid "_New..."
 msgstr "_Ny …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1711
+#: ../modules/mail/e-mail-shell-view-actions.c:1783
 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:1718
+#: ../modules/mail/e-mail-shell-view-actions.c:1790
 msgid "Change the properties of this folder"
 msgstr "Endre egenskaper for denne mappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1725
+#: ../modules/mail/e-mail-shell-view-actions.c:1797
 msgid "Refresh the folder"
 msgstr "Oppdater mappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1732
+#: ../modules/mail/e-mail-shell-view-actions.c:1804
 msgid "Change the name of this folder"
 msgstr "Endre navn på denne mappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1737
+#: ../modules/mail/e-mail-shell-view-actions.c:1809
 msgid "Select Message _Thread"
 msgstr "Velg meldings_tråd"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1739
+#: ../modules/mail/e-mail-shell-view-actions.c:1811
 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:1744
+#: ../modules/mail/e-mail-shell-view-actions.c:1816
 msgid "Select Message S_ubthread"
 msgstr "Velg _undertråd for melding"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1746
+#: ../modules/mail/e-mail-shell-view-actions.c:1818
 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:1758
+#: ../modules/mail/e-mail-shell-view-actions.c:1830
 msgid "Empty _Trash"
 msgstr "Tøm _papirkurven"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1760
+#: ../modules/mail/e-mail-shell-view-actions.c:1832
 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:1765
+#: ../modules/mail/e-mail-shell-view-actions.c:1837
 msgid "Go to _Folder"
 msgstr "Gå til _mappe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1767
+#: ../modules/mail/e-mail-shell-view-actions.c:1839
 msgid "Opens a dialog to select a folder to go to"
 msgstr "Åpner en dialog for å velge en mappe å gå til"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1772
+#: ../modules/mail/e-mail-shell-view-actions.c:1844
 msgid "_New Label"
 msgstr "_Ny etikett"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1781
+#: ../modules/mail/e-mail-shell-view-actions.c:1853
 msgid "N_one"
 msgstr "_Ingen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1795
+#: ../modules/mail/e-mail-shell-view-actions.c:1867
 msgid "_Manage Subscriptions"
 msgstr "_Håndter abonnement"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1797
-#: ../modules/mail/e-mail-shell-view-actions.c:1881
+#: ../modules/mail/e-mail-shell-view-actions.c:1869
+#: ../modules/mail/e-mail-shell-view-actions.c:1953
 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:1809
-#: ../modules/mail/e-mail-shell-view-actions.c:1830
+#: ../modules/mail/e-mail-shell-view-actions.c:1881
+#: ../modules/mail/e-mail-shell-view-actions.c:1902
 msgid "Send / _Receive"
 msgstr "Send / _motta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1811
+#: ../modules/mail/e-mail-shell-view-actions.c:1883
 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:1816
+#: ../modules/mail/e-mail-shell-view-actions.c:1888
 msgid "R_eceive All"
 msgstr "Motta all_e"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1818
+#: ../modules/mail/e-mail-shell-view-actions.c:1890
 msgid "Receive new items from all accounts"
 msgstr "Motta nye oppføringer fra alle kontoer"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1823
+#: ../modules/mail/e-mail-shell-view-actions.c:1895
 msgid "_Send All"
 msgstr "_Send alle"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1825
+#: ../modules/mail/e-mail-shell-view-actions.c:1897
 msgid "Send queued items in all accounts"
 msgstr "Send kølagte oppføringer i alle kontoer"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1853
+#: ../modules/mail/e-mail-shell-view-actions.c:1925
 msgid "Cancel the current mail operation"
 msgstr "Avbryt aktiv e-postoperasjon"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1858
+#: ../modules/mail/e-mail-shell-view-actions.c:1930
 msgid "Collapse All _Threads"
 msgstr "Slå sammen alle _tråder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1860
+#: ../modules/mail/e-mail-shell-view-actions.c:1932
 msgid "Collapse all message threads"
 msgstr "Slå sammen alle meldingstråder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1865
+#: ../modules/mail/e-mail-shell-view-actions.c:1937
 msgid "E_xpand All Threads"
 msgstr "Ut_vid alle tråder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1867
+#: ../modules/mail/e-mail-shell-view-actions.c:1939
 msgid "Expand all message threads"
 msgstr "Utvid alle meldingstråder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1872
+#: ../modules/mail/e-mail-shell-view-actions.c:1944
 msgid "_Message Filters"
 msgstr "_Meldingsfiltre"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1874
+#: ../modules/mail/e-mail-shell-view-actions.c:1946
 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:1879
+#: ../modules/mail/e-mail-shell-view-actions.c:1951
 msgid "_Subscriptions..."
 msgstr "_Abonnement …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1888
+#: ../modules/mail/e-mail-shell-view-actions.c:1960
 msgid "F_older"
 msgstr "M_appe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1895
+#: ../modules/mail/e-mail-shell-view-actions.c:1967
 msgid "_Label"
 msgstr "_Etikett"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1912
+#: ../modules/mail/e-mail-shell-view-actions.c:1984
 msgid "C_reate Search Folder From Search..."
 msgstr "Opp_rett søkemappe fra søk …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1919
+#: ../modules/mail/e-mail-shell-view-actions.c:1991
 msgid "Search F_olders"
 msgstr "Søk i _mapper"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1921
+#: ../modules/mail/e-mail-shell-view-actions.c:1993
 msgid "Create or edit search folder definitions"
 msgstr "Opprett eller rediger søkemappedefinisjoner"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1960
+#: ../modules/mail/e-mail-shell-view-actions.c:2032
 msgid "_New Folder..."
 msgstr "_Ny mappe …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1988
+#: ../modules/mail/e-mail-shell-view-actions.c:2060
 msgid "Show Message _Preview"
 msgstr "Vis _forhåndsvisning av melding"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1990
+#: ../modules/mail/e-mail-shell-view-actions.c:2062
 msgid "Show message preview pane"
 msgstr "Vis område for forhåndsvisning av melding"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1996
+#: ../modules/mail/e-mail-shell-view-actions.c:2068
+msgid "Show _Attachment Bar"
+msgstr "Vis ve_dleggsfelt"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:2070
+msgid ""
+"Show Attachment Bar below the message preview pane when the message has "
+"attachments"
+msgstr "Vis vedleggsfelt under under område for forhåndsvisning av meldinger når meldingen har vedlegg"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:2076
 msgid "Show _Deleted Messages"
 msgstr "Vis slette_de meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1998
+#: ../modules/mail/e-mail-shell-view-actions.c:2078
 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:2004
+#: ../modules/mail/e-mail-shell-view-actions.c:2084
 msgid "Show _Junk Messages"
 msgstr "Vis _uønskede meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2006
+#: ../modules/mail/e-mail-shell-view-actions.c:2086
 msgid "Show junk messages with a red line through them"
 msgstr "Vis uønskeded meldinger som gjennomstreket i rødt"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2012
+#: ../modules/mail/e-mail-shell-view-actions.c:2092
 msgid "_Group By Threads"
 msgstr "_Grupper etter tråder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2014
+#: ../modules/mail/e-mail-shell-view-actions.c:2094
 msgid "Threaded message list"
 msgstr "Meldingsliste med tråder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2020
+#: ../modules/mail/e-mail-shell-view-actions.c:2100
 msgid "_Unmatched Folder Enabled"
 msgstr "Mapper _uten treff er aktivert"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2022
+#: ../modules/mail/e-mail-shell-view-actions.c:2102
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "Slår av/på søkemapper for oppføringer uten treff"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2042
+#: ../modules/mail/e-mail-shell-view-actions.c:2122
 msgid "Show message preview below the message list"
 msgstr "Vis meldingen under meldingslisten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2049
+#: ../modules/mail/e-mail-shell-view-actions.c:2129
 msgid "Show message preview alongside the message list"
 msgstr "Vis meldingen ved siden av meldingslisten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2057
+#: ../modules/mail/e-mail-shell-view-actions.c:2137
 msgid "All Messages"
 msgstr "Alle meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2064
+#: ../modules/mail/e-mail-shell-view-actions.c:2144
 msgid "Important Messages"
 msgstr "Viktige meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2071
+#: ../modules/mail/e-mail-shell-view-actions.c:2151
 msgid "Last 5 Days' Messages"
 msgstr "Meldinger fra de siste 5 dagene"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2078
+#: ../modules/mail/e-mail-shell-view-actions.c:2158
 msgid "Messages Not Junk"
 msgstr "Meldinger som ikke er uønsket e-post"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2085
+#: ../modules/mail/e-mail-shell-view-actions.c:2165
 msgid "Messages with Attachments"
 msgstr "Meldinger med vedlegg"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2092
+#: ../modules/mail/e-mail-shell-view-actions.c:2172
 msgid "Messages with Notes"
 msgstr "Meldinger med notater"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2099
+#: ../modules/mail/e-mail-shell-view-actions.c:2179
 msgid "No Label"
 msgstr "Ingen etikett"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2106
+#: ../modules/mail/e-mail-shell-view-actions.c:2186
 msgid "Read Messages"
 msgstr "Leste meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2113
+#: ../modules/mail/e-mail-shell-view-actions.c:2193
 msgid "Unread Messages"
 msgstr "Uleste meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2120
+#: ../modules/mail/e-mail-shell-view-actions.c:2200
 msgid "Message Thread"
 msgstr "Meldingstråd"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2180
+#: ../modules/mail/e-mail-shell-view-actions.c:2260
 msgid "Subject or Addresses contain"
 msgstr "Emne eller adresser inneholder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2190
+#: ../modules/mail/e-mail-shell-view-actions.c:2270
 msgid "All Accounts"
 msgstr "Alle konti"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2197
+#: ../modules/mail/e-mail-shell-view-actions.c:2277
 msgid "Current Account"
 msgstr "Denne kontoen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2204
+#: ../modules/mail/e-mail-shell-view-actions.c:2284
 msgid "Current Folder"
 msgstr "Denne mappen"
 
@@ -21988,86 +22039,86 @@ msgstr "Søk i alle konti"
 msgid "Account Search"
 msgstr "Søk i konto"
 
-#: ../modules/mail/e-mail-shell-view-private.c:957
+#: ../modules/mail/e-mail-shell-view-private.c:958
 #, 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:966
-#: ../modules/mail/e-mail-shell-view-private.c:983
+#: ../modules/mail/e-mail-shell-view-private.c:967
+#: ../modules/mail/e-mail-shell-view-private.c:984
 #, 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:992
-#: ../modules/mail/e-mail-shell-view-private.c:998
+#: ../modules/mail/e-mail-shell-view-private.c:993
+#: ../modules/mail/e-mail-shell-view-private.c:999
 #, 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:1005
+#: ../modules/mail/e-mail-shell-view-private.c:1006
 #, 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:1011
+#: ../modules/mail/e-mail-shell-view-private.c:1012
 #, 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:1017
+#: ../modules/mail/e-mail-shell-view-private.c:1018
 #, 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:1034
+#: ../modules/mail/e-mail-shell-view-private.c:1035
 #, 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:1552
+#: ../modules/mail/e-mail-shell-view-private.c:1553
 msgid "Send / Receive"
 msgstr "Send / motta"
 
-#: ../modules/mail/em-composer-prefs.c:414
+#: ../modules/mail/em-composer-prefs.c:413
 msgid "Select Folder to Add"
 msgstr "Velg mappe som skal legges til"
 
-#: ../modules/mail/em-composer-prefs.c:884
+#: ../modules/mail/em-composer-prefs.c:883
 msgid "Folder"
 msgstr "Mappe"
 
-#: ../modules/mail/em-composer-prefs.c:920
+#: ../modules/mail/em-composer-prefs.c:919
 msgid "Recipient"
 msgstr "Mottaker"
 
-#: ../modules/mail/em-composer-prefs.c:1205
+#: ../modules/mail/em-composer-prefs.c:1204
 msgid "Keep in Outbox"
 msgstr "Behold i Utboks"
 
-#: ../modules/mail/em-composer-prefs.c:1206
+#: ../modules/mail/em-composer-prefs.c:1205
 msgid "Send immediately"
 msgstr "Send med det samme"
 
-#: ../modules/mail/em-composer-prefs.c:1207
+#: ../modules/mail/em-composer-prefs.c:1206
 msgid "Send after 5 minutes"
 msgstr "Send etter 5 minutter"
 
-#: ../modules/mail/em-composer-prefs.c:1286
+#: ../modules/mail/em-composer-prefs.c:1285
 msgid "Language(s)"
 msgstr "Språk"
 
@@ -22352,11 +22403,11 @@ msgstr ""
 msgid "Loading accounts..."
 msgstr "Laster kontoer …"
 
-#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:94
+#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:95
 msgid "_Format as..."
 msgstr "_Formater som …"
 
-#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:102
+#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:103
 msgid "_Other languages"
 msgstr "_Andre språk"
 
@@ -22578,48 +22629,44 @@ msgid "_VHDL"
 msgstr "_VHDL"
 
 #: ../modules/vcard-inline/e-mail-formatter-vcard.c:131
-#: ../modules/vcard-inline/e-mail-part-vcard.c:151
+#: ../modules/vcard-inline/e-mail-part-vcard.c:187
 msgid "Show F_ull vCard"
 msgstr "Vis f_ullstendig vCard"
 
 #: ../modules/vcard-inline/e-mail-formatter-vcard.c:134
-#: ../modules/vcard-inline/e-mail-part-vcard.c:169
+#: ../modules/vcard-inline/e-mail-part-vcard.c:192
 msgid "Show Com_pact vCard"
 msgstr "Vis kom_pakt vCard"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:162
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:165
 msgid "Save _To Addressbook"
 msgstr "Lagre _til adressebok"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:184
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:189
 msgid "There is one other contact."
 msgstr "Det finnes en annen kontakt."
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:189
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:194
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "Det finnes %d annen kontakt."
 msgstr[1] "Det finnes %d andre kontakter."
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:215
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:220
 msgid "Addressbook Contact"
 msgstr "Kontakt i adressebok"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:216
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:221
 msgid "Display the part as an addressbook contact"
 msgstr "Vis del som en adressebokkontakt"
 
-#: ../modules/web-inspector/evolution-web-inspector.c:95
-msgid "Evolution Web Inspector"
-msgstr "Evolution webinspektør"
-
 #: ../plugins/attachment-reminder/attachment-reminder.c:126
 msgid "_Do not show this message again."
 msgstr "Ikke vis _denne meldingen igjen."
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:484
-#: ../plugins/templates/templates.c:495
+#: ../plugins/templates/templates.c:490
 msgid "Keywords"
 msgstr "Nøkkelord"
 
@@ -22775,7 +22822,7 @@ msgid "Key"
 msgstr "Nøkkel"
 
 #: ../plugins/email-custom-header/email-custom-header.c:879
-#: ../plugins/templates/templates.c:504
+#: ../plugins/templates/templates.c:499
 msgid "Values"
 msgstr "Verdier"
 
@@ -22808,8 +22855,8 @@ msgstr ""
 msgid "_Automatically launch when a new mail is edited"
 msgstr "Start _automatisk når en ny e-post redigeres"
 
-#: ../plugins/external-editor/external-editor.c:530
-#: ../plugins/external-editor/external-editor.c:532
+#: ../plugins/external-editor/external-editor.c:455
+#: ../plugins/external-editor/external-editor.c:457
 msgid "Compose in External Editor"
 msgstr "Skriv i eksternt redigeringsprogram"
 
@@ -22929,63 +22976,63 @@ msgstr "Ikke et bilde"
 msgid "The file you selected does not look like a valid PNG image. Error: {0}"
 msgstr "Filen du valgte ser ikke ut som et gyldig PNG-bilde. Feil: {0}"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:380
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:415
 msgid "Get List _Archive"
 msgstr "Hent liste_arkiv"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:382
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:417
 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:387
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:422
 msgid "Copy _Message Archive URL"
 msgstr "Kopier URL til _meldingsarkiv"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:389
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:424
 msgid "Copy direct URL for the selected message in its archive"
 msgstr "Kopier direkte URL for valgt melding i dens arkiv"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:394
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:429
 msgid "Get List _Usage Information"
 msgstr "Hent informasjon om br_uk av liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:396
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:431
 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:401
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:436
 msgid "Contact List _Owner"
 msgstr "Eier av k_ontaktliste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:403
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:438
 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:408
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:443
 msgid "_Post Message to List"
 msgstr "_Skriv e-post til liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:410
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:445
 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:415
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:450
 msgid "_Subscribe to List"
 msgstr "_Abonner på listen"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:417
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:452
 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:422
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:457
 msgid "_Unsubscribe from List"
 msgstr "_Fjern abonnement på listen"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:424
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:459
 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:431
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:466
 msgid "Mailing _List"
 msgstr "E-post_liste"
 
@@ -23288,35 +23335,35 @@ msgstr ""
 "Valgt notantliste er skrivebeskyttet og notater kan ikke opprettes der. Velg "
 "en annen notatliste."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1235
+#: ../plugins/mail-to-task/mail-to-task.c:1231
 msgid "Create an _Appointment"
 msgstr "Lag en _avtale"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1237
+#: ../plugins/mail-to-task/mail-to-task.c:1233
 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:1242
+#: ../plugins/mail-to-task/mail-to-task.c:1238
 msgid "Create a Mem_o"
 msgstr "Lag et n_otat"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1244
+#: ../plugins/mail-to-task/mail-to-task.c:1240
 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:1249
+#: ../plugins/mail-to-task/mail-to-task.c:1245
 msgid "Create a _Task"
 msgstr "Lag en o_ppgave"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1251
+#: ../plugins/mail-to-task/mail-to-task.c:1247
 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:1259
+#: ../plugins/mail-to-task/mail-to-task.c:1255
 msgid "Create a _Meeting"
 msgstr "Lag et _møte"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1261
+#: ../plugins/mail-to-task/mail-to-task.c:1257
 msgid "Create a new meeting from the selected message"
 msgstr "Lag et nytt møte fra den valgte meldingen"
 
@@ -23657,15 +23704,15 @@ msgstr ""
 "$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:1247
+#: ../plugins/templates/templates.c:1286
 msgid "Saving message template"
 msgstr "Lagrer melding som mal"
 
-#: ../plugins/templates/templates.c:1268
+#: ../plugins/templates/templates.c:1307
 msgid "Save as _Template"
 msgstr "Lagre som _mal"
 
-#: ../plugins/templates/templates.c:1270
+#: ../plugins/templates/templates.c:1309
 msgid "Save as Template"
 msgstr "Lagre som mal"
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]