[evolution/wip/webkit2] Updated Norwegian bokmål translation.



commit 94f840bae18e6a7255a92a2b0b25fc94153adc3f
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Thu Jul 14 19:53:09 2016 +0200

    Updated Norwegian bokmål translation.

 po/nb.po | 2166 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 1110 insertions(+), 1056 deletions(-)
---
diff --git a/po/nb.po b/po/nb.po
index ba9d667..51bdb3e 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,10 +7,10 @@
 #: ../shell/main.c:522
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 3.19.x\n"
+"Project-Id-Version: evolution 3.21.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-28 15:50+0100\n"
-"PO-Revision-Date: 2016-02-28 16:03+0100\n"
+"POT-Creation-Date: 2016-07-14 19:48+0200\n"
+"PO-Revision-Date: 2016-07-14 19:53+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb lister ping uio no>\n"
 "Language: Norsk bokmål\n"
@@ -197,7 +197,7 @@ msgstr ""
 #: ../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:453
+#: ../plugins/templates/templates.c:470
 msgid "_Add"
 msgstr "_Legg til"
 
@@ -324,7 +324,7 @@ msgid "Instant Messaging"
 msgstr "Øyeblikksmeldinger"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
-#: ../addressbook/importers/evolution-vcard-importer.c:979
+#: ../addressbook/importers/evolution-vcard-importer.c:983
 msgid "Contact"
 msgstr "Kontakt"
 
@@ -333,7 +333,7 @@ msgid "_Home Page:"
 msgstr "_Hjemmeside:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
-#: ../calendar/gui/e-comp-editor-event.c:631
+#: ../calendar/gui/e-comp-editor-event.c:683
 #: ../modules/itip-formatter/itip-view.c:1905
 msgid "_Calendar:"
 msgstr "_Kalender:"
@@ -424,14 +424,14 @@ msgstr "_Bryllupsdag:"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:875
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:47
-#: ../calendar/gui/e-calendar-view.c:2037
+#: ../calendar/gui/e-calendar-view.c:2044
 msgid "Anniversary"
 msgstr "Bryllupsdag"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:874
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:46
-#: ../calendar/gui/e-calendar-view.c:2036
+#: ../calendar/gui/e-calendar-view.c:2043
 msgid "Birthday"
 msgstr "Fødselsdag"
 
@@ -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:463
+#: ../plugins/templates/templates.c:480
 msgid "_Remove"
 msgstr "Fje_rn"
 
@@ -539,14 +539,14 @@ 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:2103
+#: ../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:3318
+#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3334
 #: ../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:655
-#: ../smime/gui/certificate-manager.c:732
+#: ../smime/gui/certificate-manager.c:668
+#: ../smime/gui/certificate-manager.c:745
 msgid "_Save"
 msgstr "_Lagre"
 
@@ -556,15 +556,15 @@ msgid "Certificates"
 msgstr "Sertifikater"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:59
-#: ../calendar/gui/e-comp-editor.c:2000 ../calendar/gui/e-comp-editor.c:2072
+#: ../calendar/gui/e-comp-editor.c:2003 ../calendar/gui/e-comp-editor.c:2075
 #: ../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:1223 ../shell/e-shell-window-actions.c:955
+#: ../shell/e-shell.c:1224 ../shell/e-shell-window-actions.c:955
 msgid "_Help"
 msgstr "_Hjelp"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:60
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1997
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1998
 #: ../mail/mail-config.ui.h:37
 msgid "Options"
 msgstr "Alternativer"
@@ -584,14 +584,14 @@ msgstr "Alternativer"
 #: ../addressbook/gui/widgets/eab-gui-util.c:318
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1365
 #: ../calendar/gui/e-cal-dialogs.c:689
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:302
+#: ../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
 #: ../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:593 ../e-util/e-html-editor-actions.c:688
+#: ../e-util/e-html-editor-actions.c:589 ../e-util/e-html-editor-actions.c:684
 #: ../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,12 +599,12 @@ 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:3317
+#: ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3333
 #: ../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
 #: ../mail/mail-config.ui.h:2 ../mail/mail.error.xml.h:16
-#: ../mail/mail-send-recv.c:743 ../mail/mail-send-recv.c:825
+#: ../mail/mail-send-recv.c:746 ../mail/mail-send-recv.c:828
 #: ../mail/mail-vfolder-ui.c:148 ../mail/mail-vfolder-ui.c:270
 #: ../modules/backup-restore/evolution-backup-tool.c:899
 #: ../modules/calendar/e-cal-attachment-handler.c:285
@@ -614,10 +614,10 @@ msgstr "Alternativer"
 #: ../plugins/publish-calendar/url-editor-dialog.c:421
 #: ../plugins/save-calendar/save-calendar.c:187 ../shell/e-shell-content.c:659
 #: ../shell/e-shell-content.c:766 ../shell/e-shell-utils.c:72
-#: ../shell/e-shell-utils.c:136 ../smime/gui/certificate-manager.c:654
-#: ../smime/gui/certificate-manager.c:731
-#: ../smime/gui/certificate-manager.c:955
-#: ../smime/gui/certificate-manager.c:1337 ../smime/gui/e-cert-selector.c:237
+#: ../shell/e-shell-utils.c:136 ../smime/gui/certificate-manager.c:667
+#: ../smime/gui/certificate-manager.c:744
+#: ../smime/gui/certificate-manager.c:968
+#: ../smime/gui/certificate-manager.c:1350 ../smime/gui/e-cert-selector.c:237
 #: ../smime/gui/smime-ui.ui.h:23
 msgid "_Cancel"
 msgstr "A_vbryt"
@@ -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:2035 ../e-util/e-html-editor-actions.c:1111
+#: ../calendar/gui/e-comp-editor.c:2038 ../e-util/e-html-editor-actions.c:1108
 msgid "_Undo"
 msgstr "A_ngre"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:264
-#: ../calendar/gui/e-comp-editor.c:2037 ../e-util/e-focus-tracker.c:122
+#: ../calendar/gui/e-comp-editor.c:2040 ../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:2042 ../e-util/e-html-editor-actions.c:1097
+#: ../calendar/gui/e-comp-editor.c:2045 ../e-util/e-html-editor-actions.c:1094
 msgid "_Redo"
 msgstr "G_jenta"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:271
-#: ../calendar/gui/e-comp-editor.c:2044 ../e-util/e-focus-tracker.c:138
+#: ../calendar/gui/e-comp-editor.c:2047 ../e-util/e-focus-tracker.c:138
 msgid "Redo"
 msgstr "Gjenta"
 
@@ -714,8 +714,8 @@ msgid "PGP keys"
 msgstr "PGP-nøkler"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3251
-#: ../smime/gui/certificate-manager.c:678
-#: ../smime/gui/certificate-manager.c:967
+#: ../smime/gui/certificate-manager.c:691
+#: ../smime/gui/certificate-manager.c:980
 msgid "All files"
 msgstr "Alle filer"
 
@@ -730,9 +730,9 @@ 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:594 ../e-util/e-html-editor-actions.c:689
+#: ../e-util/e-html-editor-actions.c:590 ../e-util/e-html-editor-actions.c:685
 #: ../e-util/e-image-chooser-dialog.c:174 ../plugins/face/face.c:298
-#: ../shell/e-shell-utils.c:73 ../smime/gui/certificate-manager.c:956
+#: ../shell/e-shell-utils.c:73 ../smime/gui/certificate-manager.c:969
 msgid "_Open"
 msgstr "_Åpne"
 
@@ -814,7 +814,7 @@ msgstr "Ugyldig kontakt."
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:456
 #: ../addressbook/gui/contact-editor/fullname.ui.h:13
 #: ../addressbook/gui/widgets/eab-gui-util.c:319
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:303
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:304
 #: ../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
@@ -831,7 +831,7 @@ msgstr "Ugyldig kontakt."
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
 #: ../plugins/publish-calendar/url-editor-dialog.c:422
 #: ../shell/e-shell-content.c:661 ../shell/e-shell-content.c:767
-#: ../shell/main.c:180 ../smime/gui/certificate-manager.c:1338
+#: ../shell/main.c:180 ../smime/gui/certificate-manager.c:1351
 #: ../smime/gui/e-cert-selector.c:238 ../smime/gui/smime-ui.ui.h:24
 msgid "_OK"
 msgstr "_OK"
@@ -1025,7 +1025,7 @@ msgstr "Et felt inneholder"
 
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:94
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:103
-#: ../addressbook/gui/widgets/ea-minicard-view.c:193
+#: ../addressbook/gui/widgets/ea-minicard-view.c:225
 msgid "evolution address book"
 msgstr "evolution adressebok"
 
@@ -1144,7 +1144,7 @@ msgid "Video Chat"
 msgstr "Videosamtale"
 
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:827
-#: ../e-util/e-send-options.c:546
+#: ../data/evolution.desktop.in.in.h:9 ../e-util/e-send-options.c:546
 #: ../modules/calendar/e-cal-shell-view-actions.c:199
 #: ../modules/calendar/e-cal-shell-view.c:579
 #: ../plugins/publish-calendar/publish-calendar.ui.h:21
@@ -1215,7 +1215,12 @@ msgid "Blog"
 msgstr "Weblogg"
 
 #: ../addressbook/gui/widgets/eab-contact-merging.c:261
-#: ../calendar/gui/tasktypes.xml.h:14
+#: ../calendar/gui/e-cal-component-preview.c:308
+#: ../calendar/gui/e-cal-model-tasks.c:316
+#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:610
+#: ../calendar/gui/print.c:3588 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/mail-send-recv.c:967
 msgid "Cancelled"
 msgstr "Avbrutt"
 
@@ -1447,7 +1452,7 @@ 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:1993 ../e-util/e-focus-tracker.c:785
+#: ../calendar/gui/e-comp-editor.c:1996 ../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
@@ -1455,7 +1460,7 @@ msgstr "Er du sikker på at du vil slette denne kontakten (%s)?"
 #: ../modules/calendar/e-task-shell-view-actions.c:832
 #: ../modules/mail/e-mail-shell-view-actions.c:1680
 #: ../shell/e-shell-window-actions.c:813
-#: ../smime/gui/certificate-manager.c:1661 ../smime/gui/smime-ui.ui.h:10
+#: ../smime/gui/certificate-manager.c:1674 ../smime/gui/smime-ui.ui.h:10
 msgid "_Delete"
 msgstr "_Slett"
 
@@ -1590,7 +1595,7 @@ msgid "Title"
 msgstr "Tittel"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../calendar/gui/e-meeting-list-view.c:659
+#: ../calendar/gui/e-meeting-list-view.c:660
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "Rolle"
@@ -1622,7 +1627,7 @@ msgstr "Kontaktliste: "
 msgid "Contact: "
 msgstr "Kontakt: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:187
+#: ../addressbook/gui/widgets/ea-minicard.c:182
 msgid "evolution minicard"
 msgstr "evolution minikort"
 
@@ -1634,7 +1639,7 @@ msgstr "Ny kontakt"
 msgid "New Contact List"
 msgstr "Ny kontaktliste"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:176
+#: ../addressbook/gui/widgets/ea-minicard-view.c:208
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -1658,7 +1663,7 @@ msgstr "Zoom _ut"
 
 #. Search button
 #: ../addressbook/gui/widgets/e-contact-map-window.c:450
-#: ../e-util/e-html-editor-actions.c:2106
+#: ../e-util/e-html-editor-actions.c:2103
 #: ../e-util/e-html-editor-find-dialog.c:195
 #: ../shell/e-shell-window-actions.c:890
 msgid "_Find"
@@ -1722,52 +1727,60 @@ msgstr ""
 "\n"
 "Ingen oppføringer i denne visningen."
 
-#: ../addressbook/importers/evolution-csv-importer.c:746
-#: ../addressbook/importers/evolution-ldif-importer.c:548
+#: ../addressbook/importers/evolution-csv-importer.c:747
+#: ../addressbook/importers/evolution-ldif-importer.c:549
 #: ../addressbook/importers/evolution-vcard-importer.c:249
-#: ../calendar/importers/icalendar-importer.c:485
-#: ../calendar/importers/icalendar-importer.c:980
-#: ../calendar/importers/icalendar-importer.c:1019 ../shell/shell.error.xml.h:1
+#: ../calendar/importers/icalendar-importer.c:481
+#: ../calendar/importers/icalendar-importer.c:978
+#: ../calendar/importers/icalendar-importer.c:1018 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "Importerer …"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1089
+#: ../addressbook/importers/evolution-csv-importer.c:929
+msgid "Can't open .csv file"
+msgstr "Kan ikke åpne .csv-fil"
+
+#: ../addressbook/importers/evolution-csv-importer.c:1098
 msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "Outlook kontakter CSV eller Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1090
+#: ../addressbook/importers/evolution-csv-importer.c:1099
 msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "Outlook kontakter CSV og Tab-import"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1098
+#: ../addressbook/importers/evolution-csv-importer.c:1107
 msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "Mozilla kontakter CSV eller Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1099
+#: ../addressbook/importers/evolution-csv-importer.c:1108
 msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "Mozilla kontakter CSV og Tab-import"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1107
+#: ../addressbook/importers/evolution-csv-importer.c:1116
 msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "Evolution kontakter CSV eller Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1108
+#: ../addressbook/importers/evolution-csv-importer.c:1117
 msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Evolution kontakter CSV og Tab-import"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:814
+#: ../addressbook/importers/evolution-ldif-importer.c:719
+msgid "Can't open .ldif file"
+msgstr "Kan ikke åpne .ldif-fil"
+
+#: ../addressbook/importers/evolution-ldif-importer.c:821
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:815
+#: ../addressbook/importers/evolution-ldif-importer.c:822
 msgid "Evolution LDIF importer"
 msgstr "LDIF-import for Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:642
+#: ../addressbook/importers/evolution-vcard-importer.c:646
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:643
+#: ../addressbook/importers/evolution-vcard-importer.c:647
 msgid "Evolution vCard Importer"
 msgstr "Evolution vCard-import"
 
@@ -1778,50 +1791,6 @@ msgstr "Evolution vCard-import"
 msgid "Page %d"
 msgstr "Side %d"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:54
-msgid "Specify the output file instead of standard output"
-msgstr "Oppgi utdatafil i stedet for standard utdata"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:55
-msgid "OUTPUTFILE"
-msgstr "UTDATAFIL"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:58
-msgid "List local address book folders"
-msgstr "Vis lokale adressebokmapper"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:61
-msgid "Show cards as vcard or csv file"
-msgstr "Vis kontakter som vcard eller csv-fil"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:62
-msgid "[vcard|csv]"
-msgstr "[vcard|csv]"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:111
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
-msgstr ""
-"Feil med kommandolinjeflagg. Vennligst bruk --help for å se bruksinformasjon."
-
-#: ../addressbook/tools/evolution-addressbook-export.c:125
-msgid "Only support csv or vcard format."
-msgstr "Støtt kun csv- eller vcard-format."
-
-#: ../addressbook/tools/evolution-addressbook-export.c:156
-msgid "Unhandled error"
-msgstr "Uhåndtert feil"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:635
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
-msgid "Can not open file"
-msgstr "Kan ikke åpne fil"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:75
-#, c-format
-msgid "Failed to open client '%s': %s"
-msgstr "Klarte ikke å åpne klient «%s»: %s"
-
 #: ../addressbook/util/eab-book-util.c:36
 msgctxt "addressbook-label"
 msgid "Work Email"
@@ -1963,7 +1932,7 @@ msgid "Start time"
 msgstr "Starttid"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:1
-#: ../calendar/alarm-notify/alarm-queue.c:1949
+#: ../calendar/alarm-notify/alarm-queue.c:1947
 msgid "Appointments"
 msgstr "Avtaler"
 
@@ -1977,15 +1946,15 @@ 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:2240
-#: ../calendar/gui/e-comp-editor.c:2058 ../e-util/e-html-editor-actions.c:1120
+#: ../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
 #: ../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:458 ../shell/e-shell-window-actions.c:941
+#: ../plugins/templates/templates.c:475 ../shell/e-shell-window-actions.c:941
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "_Edit"
 msgstr "R_ediger"
@@ -1999,8 +1968,8 @@ msgid "_Dismiss"
 msgstr "_Lukk"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/alarm-notify/alarm-queue.c:1916
-#: ../calendar/alarm-notify/alarm-queue.c:1926
+#: ../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
@@ -2035,23 +2004,23 @@ msgstr "timer"
 msgid "minutes"
 msgstr "minutter"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1714
-#: ../calendar/alarm-notify/alarm-queue.c:1896
+#: ../calendar/alarm-notify/alarm-queue.c:1715
+#: ../calendar/alarm-notify/alarm-queue.c:1895
 msgid "No summary available."
 msgstr "Sammendrag er ikke tilgjengelig."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1723
-#: ../calendar/alarm-notify/alarm-queue.c:1725
+#: ../calendar/alarm-notify/alarm-queue.c:1724
+#: ../calendar/alarm-notify/alarm-queue.c:1726
 msgid "No description available."
 msgstr "Ingen beskrivelse tilgjengelig."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1733
+#: ../calendar/alarm-notify/alarm-queue.c:1734
 msgid "No location information available."
 msgstr "Stedsinformasjon er ikke tilgjengelig."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1738
-#: ../calendar/alarm-notify/alarm-queue.c:1887
-#: ../calendar/alarm-notify/alarm-queue.c:2240
+#: ../calendar/alarm-notify/alarm-queue.c:1739
+#: ../calendar/alarm-notify/alarm-queue.c:1886
+#: ../calendar/alarm-notify/alarm-queue.c:2237
 msgid "Evolution Reminders"
 msgstr "Evolution påminnelser"
 
@@ -2062,21 +2031,21 @@ msgid_plural "You have %d reminders"
 msgstr[0] "Du har %d påminnelse"
 msgstr[1] "Du har %d påminnelser"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2058
+#: ../calendar/alarm-notify/alarm-queue.c:2055
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2059 ../mail/mail-dialogs.ui.h:21
+#: ../calendar/alarm-notify/alarm-queue.c:2056 ../mail/mail-dialogs.ui.h:21
 #: ../modules/mailto-handler/evolution-mailto-handler.c:114
 msgid "_No"
 msgstr "_Nei"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2060
+#: ../calendar/alarm-notify/alarm-queue.c:2057
 #: ../modules/mailto-handler/evolution-mailto-handler.c:115
 msgid "_Yes"
 msgstr "_Ja"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2064
+#: ../calendar/alarm-notify/alarm-queue.c:2061
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2092,16 +2061,25 @@ msgstr ""
 "\n"
 "Er du sikker på at du vil kjøre dette programmet?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2079
+#: ../calendar/alarm-notify/alarm-queue.c:2076
 msgid "Do not ask me about this program again."
 msgstr "Ikke spør meg om dette programmet igjen."
 
-#: ../calendar/alarm-notify/util.c:43
+#: ../calendar/alarm-notify/util.c:67
 msgid "invalid time"
 msgstr "ugyldig tid"
 
+#. Translator: Entire string is like "Pop up an alert %d days before start"
+#: ../calendar/alarm-notify/util.c:93 ../calendar/gui/e-alarm-list.c:370
+#: ../calendar/gui/misc.c:97
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d dag"
+msgstr[1] "%d dager"
+
 #. Translator: Entire string is like "Pop up an alert %d hours before start"
-#: ../calendar/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:382
+#: ../calendar/alarm-notify/util.c:99 ../calendar/gui/e-alarm-list.c:382
 #: ../calendar/gui/misc.c:103
 #, c-format
 msgid "%d hour"
@@ -2110,7 +2088,7 @@ msgstr[0] "%d time"
 msgstr[1] "%d timer"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start"
-#: ../calendar/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:388
+#: ../calendar/alarm-notify/util.c:105 ../calendar/gui/e-alarm-list.c:388
 #: ../calendar/gui/misc.c:109
 #, c-format
 msgid "%d minute"
@@ -2121,7 +2099,7 @@ msgstr[1] "%d minutter"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:394
+#: ../calendar/alarm-notify/util.c:109 ../calendar/gui/e-alarm-list.c:394
 #: ../calendar/gui/misc.c:113
 #, c-format
 msgid "%d second"
@@ -2773,7 +2751,7 @@ msgstr "inneholder ikke"
 
 #: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/e-cal-list-view.etspec.h:4
 #: ../calendar/gui/memotypes.xml.h:4 ../calendar/gui/tasktypes.xml.h:4
-#: ../e-util/e-attachment-tree-view.c:533 ../e-util/e-table-config.ui.h:7
+#: ../e-util/e-attachment-tree-view.c:149 ../e-util/e-table-config.ui.h:7
 #: ../modules/plugin-manager/evolution-plugin-manager.c:68
 msgid "Description"
 msgstr "Beskrivelse"
@@ -2863,7 +2841,7 @@ msgid "Do Not Exist"
 msgstr "Eksisterer ikke"
 
 #: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2004
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2005
 msgid "Recurrence"
 msgstr "Gjeninntreffelse"
 
@@ -2986,14 +2964,6 @@ msgstr "Hoppeknapp"
 msgid "Click here, you can find more events."
 msgstr "Klikk her for å finne flere hendelser."
 
-#. Translator: Entire string is like "Pop up an alert %d days before start"
-#: ../calendar/gui/e-alarm-list.c:370 ../calendar/gui/misc.c:97
-#, c-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d dag"
-msgstr[1] "%d dager"
-
 #. Translator: Entire string is like "Pop up an alert %d weeks before start"
 #: ../calendar/gui/e-alarm-list.c:376
 #, c-format
@@ -3004,28 +2974,28 @@ msgstr[1] "%d uker"
 
 #. Translators: Part of: [ Play a sound ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../calendar/gui/e-alarm-list.c:421
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1828
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1829
 msgctxt "cal-reminders"
 msgid "Play a sound"
 msgstr "Spill en lyd"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../calendar/gui/e-alarm-list.c:425
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1826
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1827
 msgctxt "cal-reminders"
 msgid "Pop up an alert"
 msgstr "Vis varsling"
 
 #. Translators: Part of: [ Send an email ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../calendar/gui/e-alarm-list.c:429
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1832
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1833
 msgctxt "cal-reminders"
 msgid "Send an email"
 msgstr "Send en e-post"
 
 #. Translators: Part of: [ Run a program ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../calendar/gui/e-alarm-list.c:433
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1830
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1831
 msgctxt "cal-reminders"
 msgid "Run a program"
 msgstr "Kjør et program"
@@ -3159,14 +3129,6 @@ msgstr "Under arbeid"
 msgid "Completed"
 msgstr "Fullført"
 
-#: ../calendar/gui/e-cal-component-preview.c:308
-#: ../calendar/gui/e-cal-model-tasks.c:316
-#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:610
-#: ../calendar/gui/print.c:3588 ../mail/mail-send-recv.c:963
-msgid "Canceled"
-msgstr "Avbrutt"
-
 #: ../calendar/gui/e-cal-component-preview.c:312
 #: ../calendar/gui/e-cal-model-tasks.c:310
 #: ../calendar/gui/e-cal-model-tasks.c:552 ../calendar/gui/e-task-table.c:207
@@ -3181,20 +3143,20 @@ msgstr "Prioritet:"
 
 #: ../calendar/gui/e-cal-component-preview.c:327
 #: ../calendar/gui/e-task-table.c:524 ../calendar/gui/tasktypes.xml.h:19
-#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:316
+#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:318
 msgid "High"
 msgstr "Høy"
 
 #: ../calendar/gui/e-cal-component-preview.c:329
 #: ../calendar/gui/e-cal-model.c:1890 ../calendar/gui/e-task-table.c:525
 #: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
-#: ../mail/message-list.c:315
+#: ../mail/message-list.c:317
 msgid "Normal"
 msgstr "Normal"
 
 #: ../calendar/gui/e-cal-component-preview.c:331
 #: ../calendar/gui/e-task-table.c:526 ../calendar/gui/tasktypes.xml.h:21
-#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:314
+#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:316
 msgid "Low"
 msgstr "Lav"
 
@@ -3393,7 +3355,7 @@ msgstr "Limer inn iCalendar-data"
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1830 ../calendar/gui/e-memo-table.c:492
+#: ../calendar/gui/e-calendar-view.c:1830 ../calendar/gui/e-memo-table.c:495
 #: ../calendar/gui/e-task-table.c:794
 #, c-format
 msgid "Organizer: %s <%s>"
@@ -3402,7 +3364,7 @@ msgstr "Organisator: %s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c:1834 ../calendar/gui/e-memo-table.c:497
+#: ../calendar/gui/e-calendar-view.c:1834 ../calendar/gui/e-memo-table.c:500
 #: ../calendar/gui/e-task-table.c:798
 #, c-format
 msgid "Organizer: %s"
@@ -3410,7 +3372,7 @@ msgstr "Organisator: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
 #: ../calendar/gui/e-calendar-view.c:1850
-#: ../calendar/gui/e-meeting-time-sel.c:2731 ../calendar/gui/print.c:3533
+#: ../calendar/gui/e-meeting-time-sel.c:2727 ../calendar/gui/print.c:3533
 #, c-format
 msgid "Location: %s"
 msgstr "Sted: %s"
@@ -3421,10 +3383,10 @@ msgstr "Sted: %s"
 msgid "Time: %s %s"
 msgstr "Tidspunkt: %s %s"
 
-#: ../calendar/gui/e-calendar-view.c:2269
 #: ../calendar/gui/e-calendar-view.c:2276
 #: ../calendar/gui/e-calendar-view.c:2283
-#: ../calendar/gui/e-calendar-view.c:2286
+#: ../calendar/gui/e-calendar-view.c:2290
+#: ../calendar/gui/e-calendar-view.c:2293
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -3433,13 +3395,13 @@ msgstr "%d %b %Y"
 #. strftime format %d = day of month, %b = abbreviated
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-calendar-view.c:2274 ../calendar/gui/e-day-view.c:3050
+#: ../calendar/gui/e-calendar-view.c:2281 ../calendar/gui/e-day-view.c:3080
 #: ../calendar/gui/e-day-view-top-item.c:851
 #: ../calendar/gui/e-week-view-main-item.c:230
 msgid "%d %b"
 msgstr "%d %b"
 
-#: ../calendar/gui/e-calendar-view.c:2296
+#: ../calendar/gui/e-calendar-view.c:2303
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -3449,15 +3411,15 @@ msgstr "%A %d %b %Y"
 #. * %d = day of month, %b = abbreviated month name.
 #. * You can change the order but don't change the
 #. * specifiers or add anything.
-#: ../calendar/gui/e-calendar-view.c:2300 ../calendar/gui/e-day-view.c:3034
+#: ../calendar/gui/e-calendar-view.c:2307 ../calendar/gui/e-day-view.c:3064
 #: ../calendar/gui/e-day-view-top-item.c:847
 #: ../calendar/gui/e-week-view-main-item.c:216
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: ../calendar/gui/e-calendar-view.c:2303
-#: ../calendar/gui/e-calendar-view.c:2309
-#: ../calendar/gui/e-calendar-view.c:2312
+#: ../calendar/gui/e-calendar-view.c:2310
+#: ../calendar/gui/e-calendar-view.c:2316
+#: ../calendar/gui/e-calendar-view.c:2319
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -3490,13 +3452,13 @@ msgstr "Sist endret"
 msgid "Source"
 msgstr "Kilde"
 
-#: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-meeting-list-view.c:184
-#: ../calendar/gui/e-meeting-list-view.c:198
+#: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-meeting-list-view.c:185
+#: ../calendar/gui/e-meeting-list-view.c:199
 #: ../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:6218
+#: ../modules/itip-formatter/itip-view.c:6213
 #: ../modules/plugin-manager/evolution-plugin-manager.c:99
 msgid "Unknown"
 msgstr "Ukjent"
@@ -3532,39 +3494,39 @@ msgid "Assigned"
 msgstr "Tildelt"
 
 #: ../calendar/gui/e-cal-model.c:1896 ../calendar/gui/e-cal-model-tasks.c:1138
-#: ../calendar/gui/e-meeting-list-view.c:208
+#: ../calendar/gui/e-meeting-list-view.c:209
 #: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:186
 #: ../calendar/gui/e-meeting-store.c:1023
 msgid "Yes"
 msgstr "Ja"
 
 #: ../calendar/gui/e-cal-model.c:1896 ../calendar/gui/e-cal-model-tasks.c:1138
-#: ../calendar/gui/e-meeting-list-view.c:209
+#: ../calendar/gui/e-meeting-list-view.c:210
 #: ../calendar/gui/e-meeting-store.c:188
 msgid "No"
 msgstr "Nei"
 
-#: ../calendar/gui/e-cal-model.c:3820 ../calendar/gui/e-meeting-list-view.c:220
+#: ../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:6206
+#: ../modules/itip-formatter/itip-view.c:6201
 msgid "Accepted"
 msgstr "Godtatt"
 
-#: ../calendar/gui/e-cal-model.c:3821 ../calendar/gui/e-meeting-list-view.c:221
+#: ../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:6212
+#: ../modules/itip-formatter/itip-view.c:6207
 msgid "Declined"
 msgstr "Avslått"
 
-#: ../calendar/gui/e-cal-model.c:3822 ../calendar/gui/e-meeting-list-view.c:222
+#: ../calendar/gui/e-cal-model.c:3822 ../calendar/gui/e-meeting-list-view.c:223
 #: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
 #: ../calendar/gui/e-meeting-time-sel.c:535
 msgid "Tentative"
 msgstr "Tentativ"
 
-#: ../calendar/gui/e-cal-model.c:3823 ../calendar/gui/e-meeting-list-view.c:223
+#: ../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:6215
+#: ../modules/itip-formatter/itip-view.c:6210
 msgid "Delegated"
 msgstr "Delegert"
 
@@ -3574,7 +3536,7 @@ msgstr "Krever handling"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. * Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/e-cal-model.c:3879 ../calendar/gui/e-meeting-list-view.c:688
+#: ../calendar/gui/e-cal-model.c:3879 ../calendar/gui/e-meeting-list-view.c:689
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../calendar/gui/e-task-table.etspec.h:11 ../calendar/gui/tasktypes.xml.h:8
 #: ../mail/filtertypes.xml.in.h:36 ../mail/message-list.etspec.h:1
@@ -3810,144 +3772,145 @@ 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:350
+#: ../calendar/gui/e-comp-editor-event.c:402
 #: ../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:352
+#: ../calendar/gui/e-comp-editor-event.c:404
 msgid "Start time is not a valid time"
 msgstr "Starttid er ikke en gyldig tid"
 
-#: ../calendar/gui/e-comp-editor-event.c:356
-#: ../calendar/gui/e-comp-editor-event.c:372
+#: ../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-reader-utils.c:650
-#: ../mail/mail-send-recv.c:486 ../mail/mail-send-recv.c:1285
-#: ../plugins/face/face.c:176 ../shell/e-shell.c:991 ../shell/e-shell.c:1013
-#: ../smime/gui/certificate-manager.c:346
+#: ../calendar/gui/e-comp-editor.c:339 ../mail/e-mail-display.c:2057
+#: ../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
+#: ../smime/gui/certificate-manager.c:359
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
-#: ../calendar/gui/e-comp-editor-event.c:366
+#: ../calendar/gui/e-comp-editor-event.c:418
 msgid "End date is not a valid date"
 msgstr "Sluttdato er ikke en gyldig dato"
 
-#: ../calendar/gui/e-comp-editor-event.c:368
+#: ../calendar/gui/e-comp-editor-event.c:420
 msgid "End time is not a valid time"
 msgstr "Slutttid er ikke en gyldig tid"
 
-#: ../calendar/gui/e-comp-editor-event.c:490
+#: ../calendar/gui/e-comp-editor-event.c:542
 #: ../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:492
+#: ../calendar/gui/e-comp-editor-event.c:544
 #: ../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:498
+#: ../calendar/gui/e-comp-editor-event.c:550
 msgid "Time _Zone"
 msgstr "Tids_sone"
 
-#: ../calendar/gui/e-comp-editor-event.c:500
+#: ../calendar/gui/e-comp-editor-event.c:552
 msgid "Toggles whether the time zone is displayed"
 msgstr "Slår av/på visning av tidssone"
 
-#: ../calendar/gui/e-comp-editor-event.c:506
+#: ../calendar/gui/e-comp-editor-event.c:558
 msgid "All _Day Event"
 msgstr "Avtale som varer hele _dagen"
 
-#: ../calendar/gui/e-comp-editor-event.c:508
+#: ../calendar/gui/e-comp-editor-event.c:560
 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:514
+#: ../calendar/gui/e-comp-editor-event.c:566
 msgid "Show Time as _Busy"
 msgstr "Vis tiden som _opptatt"
 
-#: ../calendar/gui/e-comp-editor-event.c:516
+#: ../calendar/gui/e-comp-editor-event.c:568
 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:525
+#: ../calendar/gui/e-comp-editor-event.c:577
 msgid "Pu_blic"
 msgstr "O_ffentlig"
 
-#: ../calendar/gui/e-comp-editor-event.c:527
+#: ../calendar/gui/e-comp-editor-event.c:579
 msgid "Classify as public"
 msgstr "Klassifiser som offentlig"
 
-#: ../calendar/gui/e-comp-editor-event.c:532
+#: ../calendar/gui/e-comp-editor-event.c:584
 msgid "_Private"
 msgstr "_Privat"
 
-#: ../calendar/gui/e-comp-editor-event.c:534
+#: ../calendar/gui/e-comp-editor-event.c:586
 msgid "Classify as private"
 msgstr "Klassifiser som privat"
 
-#: ../calendar/gui/e-comp-editor-event.c:539
+#: ../calendar/gui/e-comp-editor-event.c:591
 msgid "_Confidential"
 msgstr "_Konfidensiell"
 
-#: ../calendar/gui/e-comp-editor-event.c:541
+#: ../calendar/gui/e-comp-editor-event.c:593
 msgid "Classify as confidential"
 msgstr "Klassifiser som konfidensiell"
 
-#: ../calendar/gui/e-comp-editor-event.c:642
+#: ../calendar/gui/e-comp-editor-event.c:694
 msgctxt "ECompEditor"
 msgid "_Start time:"
 msgstr "_Starttid:"
 
-#: ../calendar/gui/e-comp-editor-event.c:647
+#: ../calendar/gui/e-comp-editor-event.c:699
 msgctxt "ECompEditor"
 msgid "_End time:"
 msgstr "S_lutt-tid:"
 
-#: ../calendar/gui/e-comp-editor-event.c:657
+#: ../calendar/gui/e-comp-editor-event.c:709
 msgctxt "ECompEditor"
 msgid "All da_y event"
 msgstr "Avtale som varer hele _dagen"
 
-#: ../calendar/gui/e-comp-editor-event.c:710
+#: ../calendar/gui/e-comp-editor-event.c:762
 #: ../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:713
+#: ../calendar/gui/e-comp-editor-event.c:765
 #: ../calendar/gui/e-comp-editor-task.c:535
 msgctxt "ECompEditorPage"
 msgid "Reminders"
 msgstr "Påminnelser"
 
-#: ../calendar/gui/e-comp-editor-event.c:716
+#: ../calendar/gui/e-comp-editor-event.c:768
 msgctxt "ECompEditorPage"
 msgid "Recurrence"
 msgstr "Gjeninntreffelse"
 
-#: ../calendar/gui/e-comp-editor-event.c:719
+#: ../calendar/gui/e-comp-editor-event.c:771
 #: ../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:729
+#: ../calendar/gui/e-comp-editor-event.c:781
 msgctxt "ECompEditorPage"
 msgid "Schedule"
 msgstr "Planlegg"
 
-#: ../calendar/gui/e-comp-editor-event.c:758
+#: ../calendar/gui/e-comp-editor-event.c:810
 #, c-format
 msgid "Meeting - %s"
 msgstr "Møte- %s"
 
-#: ../calendar/gui/e-comp-editor-event.c:759
+#: ../calendar/gui/e-comp-editor-event.c:811
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
@@ -4043,13 +4006,13 @@ msgstr "_Vedlegg"
 msgid "Show attachments"
 msgstr "Vis vedlegg"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:781
-#: ../e-util/e-attachment-bar.c:661 ../e-util/e-attachment-paned.c:735
+#: ../calendar/gui/e-comp-editor-page-attachments.c:782
+#: ../e-util/e-attachment-bar.c:701 ../e-util/e-attachment-paned.c:735
 msgid "Icon View"
 msgstr "Ikonvisning"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:783
-#: ../e-util/e-attachment-bar.c:663 ../e-util/e-attachment-paned.c:737
+#: ../calendar/gui/e-comp-editor-page-attachments.c:784
+#: ../e-util/e-attachment-bar.c:703 ../e-util/e-attachment-paned.c:737
 msgid "List View"
 msgstr "Listevisning"
 
@@ -4127,17 +4090,17 @@ msgctxt "ECompEditor"
 msgid "Atte_ndees..."
 msgstr "De_ltakere …"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:326
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:327
 msgid "Add exception"
 msgstr "Legg til unntak"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:364
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:365
 msgid "Modify exception"
 msgstr "Endre unntak"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] 
[forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day 
always follows.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:489
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:490
 msgid "on"
 msgstr "på"
 
@@ -4145,7 +4108,7 @@ msgstr "på"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:570
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:571
 msgctxt "ECompEditorPageRecur"
 msgid "first"
 msgstr "første"
@@ -4155,7 +4118,7 @@ msgstr "første"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:576
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:577
 msgctxt "ECompEditorPageRecur"
 msgid "second"
 msgstr "andre"
@@ -4164,7 +4127,7 @@ msgstr "andre"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:581
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:582
 msgctxt "ECompEditorPageRecur"
 msgid "third"
 msgstr "tredje"
@@ -4173,7 +4136,7 @@ msgstr "tredje"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:586
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:587
 msgctxt "ECompEditorPageRecur"
 msgid "fourth"
 msgstr "fjerde"
@@ -4182,7 +4145,7 @@ msgstr "fjerde"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:591
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:592
 msgctxt "ECompEditorPageRecur"
 msgid "fifth"
 msgstr "femte"
@@ -4191,14 +4154,14 @@ msgstr "femte"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:596
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:597
 msgctxt "ECompEditorPageRecur"
 msgid "last"
 msgstr "siste"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] 
[11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:623
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:624
 msgctxt "ECompEditorPageRecur"
 msgid "Other Date"
 msgstr "Annen dato"
@@ -4207,7 +4170,7 @@ msgstr "Annen dato"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:629
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:630
 msgctxt "ECompEditorPageRecur"
 msgid "1st to 10th"
 msgstr "Første til tiende"
@@ -4216,7 +4179,7 @@ msgstr "Første til tiende"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:635
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:636
 msgctxt "ECompEditorPageRecur"
 msgid "11th to 20th"
 msgstr "ellevte til tjuende"
@@ -4225,7 +4188,7 @@ msgstr "ellevte til tjuende"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:641
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:642
 msgctxt "ECompEditorPageRecur"
 msgid "21st to 31st"
 msgstr "tjueførste til trettiførste"
@@ -4233,42 +4196,42 @@ msgstr "tjueførste til trettiførste"
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the 
[first] [day] [forever]'
 #. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:667
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:668
 msgctxt "ECompEditorPageRecur"
 msgid "day"
 msgstr "dag"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:668
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:669
 msgctxt "ECompEditorPageRecur"
 msgid "Monday"
 msgstr "Mandag"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:669
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:670
 msgctxt "ECompEditorPageRecur"
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:670
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:671
 msgctxt "ECompEditorPageRecur"
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:671
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:672
 msgctxt "ECompEditorPageRecur"
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:672
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:673
 msgctxt "ECompEditorPageRecur"
 msgid "Friday"
 msgstr "Fredag"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:673
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:674
 msgctxt "ECompEditorPageRecur"
 msgid "Saturday"
 msgstr "Lørdag"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:674
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:675
 msgctxt "ECompEditorPageRecur"
 msgid "Sunday"
 msgstr "Søndag"
@@ -4276,127 +4239,127 @@ msgstr "Søndag"
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] 
[Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:803
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:804
 msgctxt "ECompEditorPageRecur"
 msgid "on the"
 msgstr "den"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:993
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:994
 msgctxt "ECompEditorPageRecur"
 msgid "occurrences"
 msgstr "gjentakelser"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1486
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2016
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1487
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2017
 msgctxt "ECompEditorPageRecur"
 msgid "This appointment rec_urs"
 msgstr "Denne avtalen _gjeninntreffer"
 
 #. Translators: Entire string is for example:     'This task recurs/Every[x][day(s)][for][1]occurrences' 
(combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1491
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1492
 msgctxt "ECompEditorPageRecur"
 msgid "This task rec_urs"
 msgstr "Denne oppgaven _gjeninntreffer"
 
 #. Translators: Entire string is for example:     'This memo recurs/Every[x][day(s)][for][1]occurrences' 
(combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1496
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1497
 msgctxt "ECompEditorPageRecur"
 msgid "This memo rec_urs"
 msgstr "Dette notatet _gjeninntreffer"
 
 #. Translators: Entire string is for example:     'This component 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1501
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1502
 msgctxt "ECompEditorPageRecur"
 msgid "This component rec_urs"
 msgstr "Denne komponenten _gjeninntreffer"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1862
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1863
 msgid "Recurrence exception date is invalid"
 msgstr "Dato for gjeninntreffelse er ugyldig"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1910
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1911
 msgid "End time of the recurrence is before the start"
 msgstr "Slutt for gjentakelse er før hendelsens start"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1953
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1954
 msgid "R_ecurrence"
 msgstr "Gj_eninntreffelse"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1955
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1956
 msgid "Set or unset recurrence"
 msgstr "Sett eller fjern gjeninntreffelse"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2056
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2057
 msgctxt "ECompEditorPageRecur"
 msgid "Every"
 msgstr "Hver"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2091
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2092
 msgctxt "ECompEditorPageRecur"
 msgid "day(s)"
 msgstr "dag(er)"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2093
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2094
 msgctxt "ECompEditorPageRecur"
 msgid "week(s)"
 msgstr "uke(r)"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2095
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2096
 msgctxt "ECompEditorPageRecur"
 msgid "month(s)"
 msgstr "måned(er)"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2097
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2098
 msgctxt "ECompEditorPageRecur"
 msgid "year(s)"
 msgstr "år"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2126
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2127
 msgctxt "ECompEditorPageRecur"
 msgid "for"
 msgstr "i"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2128
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2129
 msgctxt "ECompEditorPageRecur"
 msgid "until"
 msgstr "til"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2130
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2131
 msgctxt "ECompEditorPageRecur"
 msgid "forever"
 msgstr "alltid"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2146
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2147
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Denne avtalen har gjeninntreffelser som ikke kan redigeres av Evolution."
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2163
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2164
 msgid "Exceptions"
 msgstr "Unntak"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2232
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1778
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2233
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1779
 #: ../mail/mail-config.ui.h:62
 msgid "A_dd"
 msgstr "L_egg til"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2248
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1786
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2249
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1787
 #: ../mail/mail-config.ui.h:64
 msgid "Re_move"
 msgstr "Fjer_n"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2256
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2257
 msgid "Preview"
 msgstr "Forhåndsvis"
 
@@ -4404,38 +4367,38 @@ msgstr "Forhåndsvis"
 msgid "Send To"
 msgstr "Send til"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1555
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1556
 msgid "_Reminders"
 msgstr "_Påminnelser"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1557
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1558
 msgid "Set or unset reminders"
 msgstr "Sett eller fjern påminnelser"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1610
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1611
 #: ../modules/calendar/e-calendar-preferences.ui.h:66
 msgid "Reminders"
 msgstr "Påminnelser"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1639
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1640
 msgid "_Reminder"
 msgstr "_Påminnelse"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1672
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1673
 #, c-format
 msgid "%d day before"
 msgid_plural "%d days before"
 msgstr[0] "%d dag før"
 msgstr[1] "%d dager før"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1679
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1680
 #, c-format
 msgid "%d hour before"
 msgid_plural "%d hours before"
 msgstr[0] "%d time før"
 msgstr[1] "%d timer før"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1686
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1687
 #, c-format
 msgid "%d minute before"
 msgid_plural "%d minutes before"
@@ -4443,131 +4406,131 @@ msgstr[0] "%d minutt før"
 msgstr[1] "%d minutter før"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1694
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1695
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "Ingen"
 
 #. Translators: Predefined reminder's description
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1696
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1697
 msgctxt "cal-reminders"
 msgid "15 minutes before"
 msgstr "15 minutter før"
 
 #. Translators: Predefined reminder's description
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1698
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1699
 msgctxt "cal-reminders"
 msgid "1 hour before"
 msgstr "1 time før"
 
 #. Translators: Predefined reminder's description
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1700
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1701
 msgctxt "cal-reminders"
 msgid "1 day before"
 msgstr "1 dag før"
 
 #. Translators: "Custom" for "Custom reminder set"
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1712
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1713
 msgctxt "cal-reminders"
 msgid "Custom"
 msgstr "Egendefinert"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1863
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1864
 msgctxt "cal-reminders"
 msgid "minute(s)"
 msgstr "minutt(er)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ hour(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1865
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1866
 msgctxt "cal-reminders"
 msgid "hour(s)"
 msgstr "time(r)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ day(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1867
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1868
 msgctxt "cal-reminders"
 msgid "day(s)"
 msgstr "dag(er)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1884
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1885
 msgctxt "cal-reminders"
 msgid "before"
 msgstr "før"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ after ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1886
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1887
 msgctxt "cal-reminders"
 msgid "after"
 msgstr "etter"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1902
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1903
 msgctxt "cal-reminders"
 msgid "start"
 msgstr "Start"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ end ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1904
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1905
 msgctxt "cal-reminders"
 msgid "end"
 msgstr "slutt"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1927
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1928
 msgid "Re_peat the reminder"
 msgstr "Gjenta _påminnelse"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1952
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1953
 msgctxt "cal-reminders"
 msgid "extra times every"
 msgstr "ekstra ganger hver"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1989
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1990
 msgctxt "cal-reminders"
 msgid "minutes"
 msgstr "minutter"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ hours ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1991
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1992
 msgctxt "cal-reminders"
 msgid "hours"
 msgstr "timer"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ days ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1993
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1994
 msgctxt "cal-reminders"
 msgid "days"
 msgstr "dager"
 
 #. page_reminders->priv->custom_email_entry is initialized on demand
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2034
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2191
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2035
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2192
 msgctxt "cal-reminders"
 msgid "Custom _message"
 msgstr "Egendefinert _beskjed"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2078
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2079
 msgctxt "cal-reminders"
 msgid "Custom reminder _sound"
 msgstr "Egendefinert lyd for påminnelse"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2089
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2090
 msgid "Select a sound file"
 msgstr "Velg en lydfil"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2117
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2118
 msgid "_Program:"
 msgstr "_Program:"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2142
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2143
 msgid "_Arguments:"
 msgstr "_Argumenter:"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2174
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2175
 msgid "_Send To:"
 msgstr "_Send til:"
 
@@ -4651,7 +4614,7 @@ msgstr "Fullført"
 
 #: ../calendar/gui/e-comp-editor-property-parts.c:1173
 msgctxt "ECompEditor"
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Avbrutt"
 
 #: ../calendar/gui/e-comp-editor-property-parts.c:1182
@@ -4752,40 +4715,40 @@ msgstr "vedlegg"
 msgid "Sending notifications to attendees..."
 msgstr "Sender oppdateringer til deltakere …"
 
-#: ../calendar/gui/e-comp-editor.c:991
+#: ../calendar/gui/e-comp-editor.c:994
 msgid "Saving changes..."
 msgstr "Lagre endringer …"
 
-#: ../calendar/gui/e-comp-editor.c:1247
+#: ../calendar/gui/e-comp-editor.c:1250
 msgid "No Summary"
 msgstr "Ingen sammendrag"
 
 #. == Button box ==
-#: ../calendar/gui/e-comp-editor.c:1972 ../composer/e-composer-actions.c:334
-#: ../e-util/e-html-editor-dialog.c:196 ../e-util/e-mail-signature-editor.c:295
+#: ../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
 #: ../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:688
-#: ../mail/em-subscription-editor.c:1759
+#: ../mail/e-mail-notes.c:903 ../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
-#: ../smime/gui/certificate-manager.c:2068
+#: ../smime/gui/certificate-manager.c:2214
 msgid "_Close"
 msgstr "L_ukk"
 
-#: ../calendar/gui/e-comp-editor.c:1974
+#: ../calendar/gui/e-comp-editor.c:1977
 msgid "Close the current window"
 msgstr "Lukk aktiv vindu"
 
 #. copy menu item
-#: ../calendar/gui/e-comp-editor.c:1979 ../e-util/e-focus-tracker.c:775
-#: ../e-util/e-html-editor-actions.c:1076 ../e-util/e-text.c:2109
+#: ../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
 msgid "_Copy"
 msgstr "_Kopier"
 
-#: ../calendar/gui/e-comp-editor.c:1981 ../e-util/e-focus-tracker.c:175
+#: ../calendar/gui/e-comp-editor.c:1984 ../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
@@ -4794,51 +4757,51 @@ msgid "Copy the selection"
 msgstr "Kopier utvalget"
 
 #. cut menu item
-#: ../calendar/gui/e-comp-editor.c:1986 ../e-util/e-focus-tracker.c:770
-#: ../e-util/e-html-editor-actions.c:1083 ../e-util/e-text.c:2095
+#: ../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
 #: ../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:1988 ../e-util/e-focus-tracker.c:168
+#: ../calendar/gui/e-comp-editor.c:1991 ../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
 #: ../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:1995 ../e-util/e-focus-tracker.c:189
+#: ../calendar/gui/e-comp-editor.c:1998 ../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:2002
+#: ../calendar/gui/e-comp-editor.c:2005
 msgid "View help"
 msgstr "Vis hjelp"
 
 #. paste menu item
-#: ../calendar/gui/e-comp-editor.c:2007 ../e-util/e-focus-tracker.c:780
-#: ../e-util/e-html-editor-actions.c:1090 ../e-util/e-text.c:2121
+#: ../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
 #: ../mail/e-mail-browser.c:150 ../shell/e-shell-window-actions.c:834
 msgid "_Paste"
 msgstr "_Lim inn"
 
-#: ../calendar/gui/e-comp-editor.c:2009 ../e-util/e-focus-tracker.c:182
+#: ../calendar/gui/e-comp-editor.c:2012 ../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
 #: ../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:2014 ../composer/e-composer-actions.c:388
+#: ../calendar/gui/e-comp-editor.c:2017 ../composer/e-composer-actions.c:388
 #: ../mail/e-mail-reader.c:2287
 #: ../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:2021 ../mail/e-mail-reader.c:2294
+#: ../calendar/gui/e-comp-editor.c:2024 ../mail/e-mail-reader.c:2294
 #: ../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
@@ -4846,52 +4809,52 @@ msgstr "S_kriv ut …"
 msgid "Pre_view..."
 msgstr "Forhånds_vis …"
 
-#: ../calendar/gui/e-comp-editor.c:2028 ../e-util/e-focus-tracker.c:790
-#: ../e-util/e-html-editor-actions.c:1104 ../e-util/e-web-view.c:389
+#: ../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
 #: ../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:2030 ../e-util/e-focus-tracker.c:196
+#: ../calendar/gui/e-comp-editor.c:2033 ../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:2051
+#: ../calendar/gui/e-comp-editor.c:2054
 msgid "_Classification"
 msgstr "K_lassifisering"
 
-#: ../calendar/gui/e-comp-editor.c:2065 ../e-util/e-html-editor-actions.c:1127
-#: ../e-util/e-mail-signature-editor.c:309 ../mail/e-mail-browser.c:166
+#: ../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
 msgid "_File"
 msgstr "_Fil"
 
-#: ../calendar/gui/e-comp-editor.c:2079 ../e-util/e-html-editor-actions.c:1148
+#: ../calendar/gui/e-comp-editor.c:2082 ../e-util/e-html-editor-actions.c:1145
 msgid "_Insert"
 msgstr "Sett _inn"
 
-#: ../calendar/gui/e-comp-editor.c:2086 ../composer/e-composer-actions.c:378
+#: ../calendar/gui/e-comp-editor.c:2089 ../composer/e-composer-actions.c:378
 msgid "_Options"
 msgstr "_Alternativer"
 
-#: ../calendar/gui/e-comp-editor.c:2093 ../e-util/e-html-editor-actions.c:1169
+#: ../calendar/gui/e-comp-editor.c:2096 ../e-util/e-html-editor-actions.c:1166
 #: ../mail/e-mail-browser.c:180 ../shell/e-shell-window-actions.c:991
-#: ../smime/gui/certificate-manager.c:1651 ../smime/gui/smime-ui.ui.h:5
+#: ../smime/gui/certificate-manager.c:1664 ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "_Vis"
 
-#: ../calendar/gui/e-comp-editor.c:2105
+#: ../calendar/gui/e-comp-editor.c:2108
 msgid "Save current changes"
 msgstr "Lagre endringer"
 
-#: ../calendar/gui/e-comp-editor.c:2110 ../e-util/e-mail-signature-editor.c:304
+#: ../calendar/gui/e-comp-editor.c:2113 ../e-util/e-mail-signature-editor.c:308
 #: ../mail/e-mail-notes.c:912
 msgid "Save and Close"
 msgstr "Lagre og lukk"
 
-#: ../calendar/gui/e-comp-editor.c:2112
+#: ../calendar/gui/e-comp-editor.c:2115
 msgid "Save current changes and close editor"
 msgstr "Lagre endringer og lukk redigering"
 
@@ -4915,13 +4878,13 @@ msgstr "pm"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../calendar/gui/e-day-view.c:3017 ../calendar/gui/e-day-view-top-item.c:843
+#: ../calendar/gui/e-day-view.c:3047 ../calendar/gui/e-day-view-top-item.c:843
 #: ../calendar/gui/e-week-view-main-item.c:207 ../calendar/gui/print.c:2095
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:3742
+#: ../calendar/gui/e-day-view.c:3772
 #, c-format
 msgid "Week %d"
 msgstr "Uke %d"
@@ -4956,94 +4919,94 @@ msgstr "Ingen"
 msgid "Select..."
 msgstr "Velg …"
 
-#: ../calendar/gui/e-meeting-list-view.c:63
+#: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Chair Persons"
 msgstr "Styremedlemmer"
 
-#: ../calendar/gui/e-meeting-list-view.c:64
+#: ../calendar/gui/e-meeting-list-view.c:65
 msgid "Required Participants"
 msgstr "Obligatoriske deltakere"
 
-#: ../calendar/gui/e-meeting-list-view.c:65
+#: ../calendar/gui/e-meeting-list-view.c:66
 msgid "Optional Participants"
 msgstr "Valgfrie deltakere"
 
-#: ../calendar/gui/e-meeting-list-view.c:66
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Resources"
 msgstr "Ressurser"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-list-view.c:165
 msgid "Attendees"
 msgstr "Deltakere"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-list-view.c:181
 #: ../calendar/gui/e-meeting-store.c:109 ../calendar/gui/e-meeting-store.c:126
 #: ../calendar/gui/e-meeting-store.c:1017 ../calendar/gui/print.c:1245
 msgid "Individual"
 msgstr "Individuell"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-list-view.c:182
 #: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
 #: ../calendar/gui/print.c:1246 ../e-util/e-table-config.ui.h:8
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
+#: ../calendar/gui/e-meeting-list-view.c:183
 #: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
 #: ../calendar/gui/print.c:1247
 msgid "Resource"
 msgstr "Ressurs"
 
-#: ../calendar/gui/e-meeting-list-view.c:183
+#: ../calendar/gui/e-meeting-list-view.c:184
 #: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
 #: ../calendar/gui/print.c:1248
 msgid "Room"
 msgstr "Rom"
 
-#: ../calendar/gui/e-meeting-list-view.c:194
+#: ../calendar/gui/e-meeting-list-view.c:195
 #: ../calendar/gui/e-meeting-store.c:144 ../calendar/gui/e-meeting-store.c:161
 #: ../calendar/gui/print.c:1262
 msgid "Chair"
 msgstr "Styremedlem"
 
-#: ../calendar/gui/e-meeting-list-view.c:195
+#: ../calendar/gui/e-meeting-list-view.c:196
 #: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
 #: ../calendar/gui/e-meeting-store.c:1020 ../calendar/gui/print.c:1263
 msgid "Required Participant"
 msgstr "Obligatorisk deltaker"
 
-#: ../calendar/gui/e-meeting-list-view.c:196
+#: ../calendar/gui/e-meeting-list-view.c:197
 #: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
 #: ../calendar/gui/print.c:1264
 msgid "Optional Participant"
 msgstr "Valgfri deltaker"
 
-#: ../calendar/gui/e-meeting-list-view.c:197
+#: ../calendar/gui/e-meeting-list-view.c:198
 #: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
 #: ../calendar/gui/print.c:1265
 msgid "Non-Participant"
 msgstr "Ikke-deltaker"
 
-#: ../calendar/gui/e-meeting-list-view.c:219
+#: ../calendar/gui/e-meeting-list-view.c:220
 #: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
 #: ../calendar/gui/e-meeting-store.c:1030
 msgid "Needs Action"
 msgstr "Trenger handling"
 
-#: ../calendar/gui/e-meeting-list-view.c:619
+#: ../calendar/gui/e-meeting-list-view.c:620
 msgid "Attendee                          "
 msgstr "Deltaker                          "
 
-#: ../calendar/gui/e-meeting-list-view.c:645
+#: ../calendar/gui/e-meeting-list-view.c:646
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../calendar/gui/e-memo-table.etspec.h:3
 #: ../calendar/gui/e-task-table.etspec.h:3
-#: ../e-util/e-attachment-tree-view.c:591
+#: ../e-util/e-attachment-tree-view.c:207
 #: ../mail/e-mail-account-tree-view.c:157
 msgid "Type"
 msgstr "Type"
 
-#: ../calendar/gui/e-meeting-list-view.c:674
+#: ../calendar/gui/e-meeting-list-view.c:675
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "RSVP"
@@ -5134,7 +5097,7 @@ msgstr "_Start-tid:"
 msgid "_End time:"
 msgstr "S_lutt-tid:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2727
+#: ../calendar/gui/e-meeting-time-sel.c:2723
 #, c-format
 msgid ""
 "Summary: %s\n"
@@ -5143,7 +5106,7 @@ msgstr ""
 "Sammendrag: %s\n"
 "Sted: %s"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2729 ../calendar/gui/print.c:3522
+#: ../calendar/gui/e-meeting-time-sel.c:2725 ../calendar/gui/print.c:3522
 #, c-format
 msgid "Summary: %s"
 msgstr "Sammendrag: %s"
@@ -5172,7 +5135,7 @@ msgstr "Vanlig navn"
 msgid "Language"
 msgstr "Språk"
 
-#: ../calendar/gui/e-memo-table.c:370
+#: ../calendar/gui/e-memo-table.c:370 ../data/evolution.desktop.in.in.h:11
 #: ../modules/calendar/e-cal-shell-content.c:1667
 #: ../modules/calendar/e-memo-shell-view-actions.c:196
 #: ../modules/calendar/e-memo-shell-view-actions.c:211
@@ -5180,38 +5143,38 @@ msgstr "Språk"
 msgid "Memos"
 msgstr "Notater"
 
-#: ../calendar/gui/e-memo-table.c:454 ../calendar/gui/e-task-table.c:757
+#: ../calendar/gui/e-memo-table.c:457 ../calendar/gui/e-task-table.c:757
 msgid "* No Summary *"
 msgstr "* Ingen sammendrag *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:539 ../calendar/gui/e-task-table.c:839
+#: ../calendar/gui/e-memo-table.c:542 ../calendar/gui/e-task-table.c:839
 msgid "Start: "
 msgstr "Start: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:559 ../calendar/gui/e-task-table.c:858
+#: ../calendar/gui/e-memo-table.c:562 ../calendar/gui/e-task-table.c:858
 msgid "Due: "
 msgstr "Ferdig: "
 
-#: ../calendar/gui/e-memo-table.c:682
+#: ../calendar/gui/e-memo-table.c:720
 msgid "Cut selected memos to the clipboard"
 msgstr "Klipp ut valgte notater til utklippstavlen"
 
-#: ../calendar/gui/e-memo-table.c:688
+#: ../calendar/gui/e-memo-table.c:726
 msgid "Copy selected memos to the clipboard"
 msgstr "Kopier valgte notater til utklippstavlen"
 
-#: ../calendar/gui/e-memo-table.c:694
+#: ../calendar/gui/e-memo-table.c:732
 msgid "Paste memos from the clipboard"
 msgstr "Lim inn notater fra utklippstavlen"
 
-#: ../calendar/gui/e-memo-table.c:700
+#: ../calendar/gui/e-memo-table.c:738
 #: ../modules/calendar/e-memo-shell-view-actions.c:560
 msgid "Delete selected memos"
 msgstr "Slett valgt notat"
 
-#: ../calendar/gui/e-memo-table.c:706
+#: ../calendar/gui/e-memo-table.c:744
 msgid "Select all visible memos"
 msgstr "Velg alle synlige notater"
 
@@ -5235,7 +5198,8 @@ msgstr "%d%%"
 
 #: ../calendar/gui/e-task-table.c:672 ../calendar/gui/print.c:2410
 #: ../calendar/importers/icalendar-importer.c:79
-#: ../calendar/importers/icalendar-importer.c:1117
+#: ../calendar/importers/icalendar-importer.c:1116
+#: ../data/evolution.desktop.in.in.h:12
 #: ../modules/calendar/e-calendar-preferences.ui.h:65
 #: ../modules/calendar/e-cal-shell-content.c:1627
 #: ../modules/calendar/e-task-shell-view-actions.c:220
@@ -5244,24 +5208,24 @@ msgstr "%d%%"
 msgid "Tasks"
 msgstr "Oppgaver"
 
-#: ../calendar/gui/e-task-table.c:998
+#: ../calendar/gui/e-task-table.c:1033
 msgid "Cut selected tasks to the clipboard"
 msgstr "Klipp ut valgte oppgaver til utklippstavlen"
 
-#: ../calendar/gui/e-task-table.c:1004
+#: ../calendar/gui/e-task-table.c:1039
 msgid "Copy selected tasks to the clipboard"
 msgstr "Kopier valgte oppgaver til utklippstavlen"
 
-#: ../calendar/gui/e-task-table.c:1010
+#: ../calendar/gui/e-task-table.c:1045
 msgid "Paste tasks from the clipboard"
 msgstr "Lim inn oppgaver fra utklippstavlen"
 
-#: ../calendar/gui/e-task-table.c:1016
+#: ../calendar/gui/e-task-table.c:1051
 #: ../modules/calendar/e-task-shell-view-actions.c:686
 msgid "Delete selected tasks"
 msgstr "Slett valgte oppgaver"
 
-#: ../calendar/gui/e-task-table.c:1022
+#: ../calendar/gui/e-task-table.c:1057
 msgid "Select all visible tasks"
 msgstr "Velg alle synlige oppgaver"
 
@@ -5277,7 +5241,7 @@ msgstr "Startdato"
 msgid "Completion date"
 msgstr "Ferdigstillingsdato"
 
-#: ../calendar/gui/e-task-table.etspec.h:6 ../mail/mail-send-recv.c:965
+#: ../calendar/gui/e-task-table.etspec.h:6 ../mail/mail-send-recv.c:969
 msgid "Complete"
 msgstr "Fullført"
 
@@ -5306,32 +5270,32 @@ msgstr "Velg tidssone"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/itip-utils.c:650 ../calendar/gui/itip-utils.c:708
-#: ../calendar/gui/itip-utils.c:842
+#: ../calendar/gui/itip-utils.c:657 ../calendar/gui/itip-utils.c:715
+#: ../calendar/gui/itip-utils.c:849
 msgid "An organizer must be set."
 msgstr "En organisator må oppgis."
 
-#: ../calendar/gui/itip-utils.c:699
+#: ../calendar/gui/itip-utils.c:706
 msgid "At least one attendee is necessary"
 msgstr "Minst en deltaker kreves"
 
-#: ../calendar/gui/itip-utils.c:930 ../calendar/gui/itip-utils.c:1091
+#: ../calendar/gui/itip-utils.c:937 ../calendar/gui/itip-utils.c:1098
 msgid "Event information"
 msgstr "Hendelsesinformasjon"
 
-#: ../calendar/gui/itip-utils.c:933 ../calendar/gui/itip-utils.c:1094
+#: ../calendar/gui/itip-utils.c:940 ../calendar/gui/itip-utils.c:1101
 msgid "Task information"
 msgstr "Oppgaveinformasjon"
 
-#: ../calendar/gui/itip-utils.c:936 ../calendar/gui/itip-utils.c:1097
+#: ../calendar/gui/itip-utils.c:943 ../calendar/gui/itip-utils.c:1104
 msgid "Memo information"
 msgstr "Informasjon om notat"
 
-#: ../calendar/gui/itip-utils.c:939 ../calendar/gui/itip-utils.c:1115
+#: ../calendar/gui/itip-utils.c:946 ../calendar/gui/itip-utils.c:1122
 msgid "Free/Busy information"
 msgstr "Ledig/opptatt-informasjon"
 
-#: ../calendar/gui/itip-utils.c:942
+#: ../calendar/gui/itip-utils.c:949
 msgid "Calendar information"
 msgstr "Kalenderinformasjon"
 
@@ -5339,7 +5303,7 @@ msgstr "Kalenderinformasjon"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:979
+#: ../calendar/gui/itip-utils.c:986
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Godtatt"
@@ -5348,7 +5312,7 @@ msgstr "Godtatt"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:986
+#: ../calendar/gui/itip-utils.c:993
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Akseptert tentativt"
@@ -5360,7 +5324,7 @@ msgstr "Akseptert tentativt"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:993 ../calendar/gui/itip-utils.c:1041
+#: ../calendar/gui/itip-utils.c:1000 ../calendar/gui/itip-utils.c:1048
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Avslått"
@@ -5369,7 +5333,7 @@ msgstr "Avslått"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1000
+#: ../calendar/gui/itip-utils.c:1007
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegert"
@@ -5377,7 +5341,7 @@ msgstr "Delegert"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1013
+#: ../calendar/gui/itip-utils.c:1020
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Oppdatert"
@@ -5385,7 +5349,7 @@ msgstr "Oppdatert"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1020
+#: ../calendar/gui/itip-utils.c:1027
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Avbryt"
@@ -5393,7 +5357,7 @@ msgstr "Avbryt"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1027
+#: ../calendar/gui/itip-utils.c:1034
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Oppdater"
@@ -5401,44 +5365,44 @@ msgstr "Oppdater"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1034
+#: ../calendar/gui/itip-utils.c:1041
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Motforslag"
 
-#: ../calendar/gui/itip-utils.c:1112
+#: ../calendar/gui/itip-utils.c:1119
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Ledig/opptatt-informasjon (%s til %s)"
 
-#: ../calendar/gui/itip-utils.c:1120
+#: ../calendar/gui/itip-utils.c:1127
 msgid "iCalendar information"
 msgstr "iCalendar-informasjon"
 
-#: ../calendar/gui/itip-utils.c:1149
+#: ../calendar/gui/itip-utils.c:1156
 #, c-format
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
 "Klarer ikke å bestille en ressurs. Den nye hendelsen er i konflikt med en "
 "annen."
 
-#: ../calendar/gui/itip-utils.c:1154
+#: ../calendar/gui/itip-utils.c:1161
 msgid "Unable to book a resource, error: "
 msgstr "Kan ikke bestille en ressurs. Feil: "
 
-#: ../calendar/gui/itip-utils.c:1325
+#: ../calendar/gui/itip-utils.c:1332
 msgid "You must be an attendee of the event."
 msgstr "Du må være en deltager i hendelsen."
 
-#: ../calendar/gui/itip-utils.c:1933
+#: ../calendar/gui/itip-utils.c:1940
 msgid "Sending an event"
 msgstr "Sender en hendelse"
 
-#: ../calendar/gui/itip-utils.c:1937
+#: ../calendar/gui/itip-utils.c:1944
 msgid "Sending a memo"
 msgstr "Sender et notat"
 
-#: ../calendar/gui/itip-utils.c:1941
+#: ../calendar/gui/itip-utils.c:1948
 msgid "Sending a task"
 msgstr "Sender en oppgave"
 
@@ -5704,40 +5668,40 @@ msgstr "er mindre enn"
 msgid "Appointments and Meetings"
 msgstr "Avtaler og møter"
 
-#: ../calendar/importers/icalendar-importer.c:312
+#: ../calendar/importers/icalendar-importer.c:308
 #: ../modules/calendar/e-cal-base-shell-backend.c:183
 #: ../modules/calendar/e-cal-shell-view-actions.c:180
 msgid "New Calendar"
 msgstr "Ny kalender"
 
-#: ../calendar/importers/icalendar-importer.c:315
+#: ../calendar/importers/icalendar-importer.c:311
 #: ../modules/calendar/e-cal-base-shell-backend.c:191
 #: ../modules/calendar/e-task-shell-view-actions.c:204
 msgid "New Task List"
 msgstr "Ny oppgaveliste"
 
-#: ../calendar/importers/icalendar-importer.c:357
+#: ../calendar/importers/icalendar-importer.c:353
 msgid "Cre_ate new calendar"
 msgstr "L_ag en ny kalender"
 
-#: ../calendar/importers/icalendar-importer.c:361
+#: ../calendar/importers/icalendar-importer.c:357
 msgid "Cre_ate new task list"
 msgstr "L_ag en ny oppgaveliste"
 
-#: ../calendar/importers/icalendar-importer.c:507
+#: ../calendar/importers/icalendar-importer.c:503
 #: ../calendar/importers/icalendar-importer.c:946
 msgid "Opening calendar"
 msgstr "Åpner kalender"
 
-#: ../calendar/importers/icalendar-importer.c:655
+#: ../calendar/importers/icalendar-importer.c:654
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar-filer (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:656
+#: ../calendar/importers/icalendar-importer.c:655
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar-import"
 
-#: ../calendar/importers/icalendar-importer.c:748
+#: ../calendar/importers/icalendar-importer.c:747
 msgid "Reminder!"
 msgstr "Påminnelse!"
 
@@ -5749,156 +5713,156 @@ msgstr "vCalendar-filer (.vcs)"
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar-import"
 
-#: ../calendar/importers/icalendar-importer.c:1110
+#: ../calendar/importers/icalendar-importer.c:1109
 msgid "Calendar Events"
 msgstr "Hendlelser i kalenderen"
 
-#: ../calendar/importers/icalendar-importer.c:1153
+#: ../calendar/importers/icalendar-importer.c:1152
 msgid "GNOME Calendar"
 msgstr "GNOME kalender"
 
-#: ../calendar/importers/icalendar-importer.c:1154
+#: ../calendar/importers/icalendar-importer.c:1153
 msgid "Evolution Calendar intelligent importer"
 msgstr "Intelligent import for Evolution kalender"
 
-#: ../calendar/importers/icalendar-importer.c:1225
-#: ../calendar/importers/icalendar-importer.c:1539
+#: ../calendar/importers/icalendar-importer.c:1224
+#: ../calendar/importers/icalendar-importer.c:1538
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Møte"
 
-#: ../calendar/importers/icalendar-importer.c:1225
-#: ../calendar/importers/icalendar-importer.c:1539
+#: ../calendar/importers/icalendar-importer.c:1224
+#: ../calendar/importers/icalendar-importer.c:1538
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Hendelse"
 
-#: ../calendar/importers/icalendar-importer.c:1228
-#: ../calendar/importers/icalendar-importer.c:1540
+#: ../calendar/importers/icalendar-importer.c:1227
+#: ../calendar/importers/icalendar-importer.c:1539
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Oppgave"
 
-#: ../calendar/importers/icalendar-importer.c:1231
-#: ../calendar/importers/icalendar-importer.c:1541
+#: ../calendar/importers/icalendar-importer.c:1230
+#: ../calendar/importers/icalendar-importer.c:1540
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Notat"
 
-#: ../calendar/importers/icalendar-importer.c:1240
+#: ../calendar/importers/icalendar-importer.c:1239
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "har gjeninntreffelse"
 
-#: ../calendar/importers/icalendar-importer.c:1245
+#: ../calendar/importers/icalendar-importer.c:1244
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "er en instans"
 
-#: ../calendar/importers/icalendar-importer.c:1250
+#: ../calendar/importers/icalendar-importer.c:1249
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "har påminnelser"
 
-#: ../calendar/importers/icalendar-importer.c:1255
+#: ../calendar/importers/icalendar-importer.c:1254
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "har vedlegg"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1268
+#: ../calendar/importers/icalendar-importer.c:1267
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Offentlig"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1271
+#: ../calendar/importers/icalendar-importer.c:1270
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Privat"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1274
+#: ../calendar/importers/icalendar-importer.c:1273
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Konfidensiell"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1278
+#: ../calendar/importers/icalendar-importer.c:1277
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Klassifisering"
 
 #. Translators: Appointment's summary
-#: ../calendar/importers/icalendar-importer.c:1283
-#: ../calendar/importers/icalendar-importer.c:1583
+#: ../calendar/importers/icalendar-importer.c:1282
+#: ../calendar/importers/icalendar-importer.c:1582
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Sammendrag"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1289
+#: ../calendar/importers/icalendar-importer.c:1288
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Plassering"
 
 #. Translators: Appointment's start time
-#: ../calendar/importers/icalendar-importer.c:1297
-#: ../calendar/importers/icalendar-importer.c:1578
+#: ../calendar/importers/icalendar-importer.c:1296
+#: ../calendar/importers/icalendar-importer.c:1577
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Start"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1308
+#: ../calendar/importers/icalendar-importer.c:1307
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Ferdig"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1320
+#: ../calendar/importers/icalendar-importer.c:1319
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Slutt"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1330
+#: ../calendar/importers/icalendar-importer.c:1329
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "Kategorier"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1354
+#: ../calendar/importers/icalendar-importer.c:1353
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Fullført"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1362
+#: ../calendar/importers/icalendar-importer.c:1361
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1373
-#: ../calendar/importers/icalendar-importer.c:1376
+#: ../calendar/importers/icalendar-importer.c:1372
+#: ../calendar/importers/icalendar-importer.c:1375
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Organisator"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1396
-#: ../calendar/importers/icalendar-importer.c:1399
+#: ../calendar/importers/icalendar-importer.c:1395
+#: ../calendar/importers/icalendar-importer.c:1398
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Deltakere"
 
-#: ../calendar/importers/icalendar-importer.c:1413
+#: ../calendar/importers/icalendar-importer.c:1412
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: ../calendar/importers/icalendar-importer.c:1573
+#: ../calendar/importers/icalendar-importer.c:1572
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Type"
@@ -7466,7 +7430,7 @@ msgstr "Ny _melding"
 msgid "Open New Message window"
 msgstr "Åpne nytt meldingsvindu"
 
-#: ../composer/e-composer-actions.c:348 ../shell/e-shell.c:1216
+#: ../composer/e-composer-actions.c:348 ../shell/e-shell.c:1217
 #: ../shell/e-shell-window-actions.c:848
 msgid "_Preferences"
 msgstr "_Brukervalg"
@@ -7686,7 +7650,7 @@ msgstr "Klikk her for å få opp adresseboken"
 msgid "Click here to select folders to post to"
 msgstr "Klikk her for å velge mapper å poste til"
 
-#: ../composer/e-msg-composer.c:874
+#: ../composer/e-msg-composer.c:876
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -7694,7 +7658,7 @@ msgstr ""
 "Kan ikke signere utgående melding: Ingen sertifikat for signering satt for "
 "denne kontoen"
 
-#: ../composer/e-msg-composer.c:883
+#: ../composer/e-msg-composer.c:885
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -7703,11 +7667,12 @@ msgstr ""
 "Kan ikke kryptere utgående melding: Sertifikat for kryptering ikke satt for "
 "denne kontoen"
 
-#: ../composer/e-msg-composer.c:1619 ../composer/e-msg-composer.c:2645
+#: ../composer/e-msg-composer.c:1601 ../composer/e-msg-composer.c:2600
+#: ../data/evolution.desktop.in.in.h:7
 msgid "Compose Message"
 msgstr "Skriv melding"
 
-#: ../composer/e-msg-composer.c:4995
+#: ../composer/e-msg-composer.c:4895
 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 "
@@ -7894,6 +7859,10 @@ msgstr "_Ta vare på formatering"
 msgid "Lose _formatting"
 msgstr "Ikke ta vare på _formatering"
 
+#: ../composer/mail-composer.error.xml.h:41
+msgid "An error occurred while saving to your Templates folder."
+msgstr "En feil oppsto under lagring til mappen Skisser."
+
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
 msgid "Evolution Alarm Notify"
 msgstr "Evolution varslingstjeneste"
@@ -7929,6 +7898,20 @@ msgstr "e-post;kalender;kontakt;adressebok;oppgave;"
 msgid "New Window"
 msgstr "Nytt vindu"
 
+#: ../data/evolution.desktop.in.in.h:8 ../e-util/e-name-selector-dialog.c:451
+#: ../modules/addressbook/e-book-shell-backend.c:303
+#: ../modules/addressbook/e-book-shell-view.c:373
+msgid "Contacts"
+msgstr "Kontakter"
+
+#: ../data/evolution.desktop.in.in.h:10 ../e-util/e-send-options.c:538
+#: ../mail/importers/elm-importer.c:329 ../mail/importers/kmail-importer.c:253
+#: ../mail/importers/pine-importer.c:422
+#: ../modules/mail/e-mail-shell-view.c:1242
+#: ../smime/gui/certificate-manager.c:1684
+msgid "Mail"
+msgstr "E-post"
+
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
 msgid "Enable address formatting"
 msgstr "Slå på formattering av adresser"
@@ -10592,7 +10575,7 @@ msgid "Name"
 msgstr "Navn"
 
 #: ../em-format/e-mail-formatter-print.c:51
-#: ../e-util/e-attachment-tree-view.c:579 ../mail/message-list.etspec.h:10
+#: ../e-util/e-attachment-tree-view.c:195 ../mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Størrelse"
 
@@ -10600,7 +10583,7 @@ msgstr "Størrelse"
 #: ../em-format/e-mail-part-headers.c:51 ../mail/e-mail-tag-editor.c:282
 #: ../mail/filtertypes.xml.in.h:16 ../mail/message-list.etspec.h:6
 #: ../mail/searchtypes.xml.in.h:17 ../mail/vfoldertypes.xml.in.h:17
-#: ../modules/mail/em-mailer-prefs.c:67 ../smime/gui/certificate-manager.c:1632
+#: ../modules/mail/em-mailer-prefs.c:67 ../smime/gui/certificate-manager.c:1645
 msgid "Subject"
 msgstr "Emne"
 
@@ -10622,18 +10605,18 @@ msgid "Display part as enriched text"
 msgstr "Vis del som rik tekst"
 
 #: ../em-format/e-mail-formatter-quote-text-html.c:95
-#: ../em-format/e-mail-formatter-text-html.c:385
+#: ../em-format/e-mail-formatter-text-html.c:387
 msgid "HTML"
 msgstr "HTML"
 
 #: ../em-format/e-mail-formatter-quote-text-html.c:96
-#: ../em-format/e-mail-formatter-text-html.c:386
+#: ../em-format/e-mail-formatter-text-html.c:388
 msgid "Format part as HTML"
 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:1526
+#: ../e-util/e-html-editor-actions.c:1523
 msgid "Plain Text"
 msgstr "Ren tekst"
 
@@ -10804,8 +10787,8 @@ msgstr "Kryptert med S/MIME"
 
 #: ../em-format/e-mail-formatter-utils.c:593
 #: ../mail/e-mail-config-security-page.c:760
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:204
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:154
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:271
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:214
 msgid "Security"
 msgstr "Sikkerhet"
 
@@ -10896,7 +10879,7 @@ msgstr "Nyhetsgrupper"
 msgid "Face"
 msgstr "Ansikt"
 
-#: ../em-format/e-mail-part-utils.c:544
+#: ../em-format/e-mail-part-utils.c:547
 #, c-format
 msgid "%s attachment"
 msgstr "%s-vedlegg"
@@ -11019,12 +11002,12 @@ msgstr "Kunne ikke lagre vedlegget"
 msgid "Attachment Properties"
 msgstr "Egenskaper for vedlegg"
 
-#: ../e-util/e-attachment-dialog.c:339 ../e-util/e-import-assistant.c:273
+#: ../e-util/e-attachment-dialog.c:339 ../e-util/e-import-assistant.c:278
 msgid "F_ilename:"
 msgstr "F_ilnavn:"
 
 #: ../e-util/e-attachment-dialog.c:356
-#: ../e-util/e-html-editor-image-dialog.c:558
+#: ../e-util/e-html-editor-image-dialog.c:568
 #: ../e-util/e-html-editor-link-dialog.c:422
 msgid "_Description:"
 msgstr "_Beskrivelse:"
@@ -11045,13 +11028,13 @@ msgstr "Kunne ikke sette som bakgrunn"
 msgid "Set as _Background"
 msgstr "Sett som _bakgrunn"
 
-#: ../e-util/e-attachment-icon-view.c:168
-#: ../e-util/e-attachment-tree-view.c:554
+#: ../e-util/e-attachment-icon-view.c:170
+#: ../e-util/e-attachment-tree-view.c:170
 msgid "Loading"
 msgstr "Laster"
 
-#: ../e-util/e-attachment-icon-view.c:180
-#: ../e-util/e-attachment-tree-view.c:566
+#: ../e-util/e-attachment-icon-view.c:182
+#: ../e-util/e-attachment-tree-view.c:182
 msgid "Saving"
 msgstr "Lagrer"
 
@@ -11185,40 +11168,40 @@ msgstr "Kopier innhold i boken lokalt for frakoblet operasjon"
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl-klikk for å åpne en lenke"
 
-#: ../e-util/e-calendar.c:207
+#: ../e-util/e-calendar.c:272
 msgid "Previous month"
 msgstr "Forrige måned"
 
-#: ../e-util/e-calendar.c:232
+#: ../e-util/e-calendar.c:291
 msgid "Next month"
 msgstr "Neste måned"
 
-#: ../e-util/e-calendar.c:258
+#: ../e-util/e-calendar.c:311
 msgid "Previous year"
 msgstr "Forrige år"
 
-#: ../e-util/e-calendar.c:283
+#: ../e-util/e-calendar.c:330
 msgid "Next year"
 msgstr "Neste år"
 
-#: ../e-util/e-calendar.c:307
+#: ../e-util/e-calendar.c:354
 msgid "Month Calendar"
 msgstr "Månedskalender"
 
 #. This is a strftime() format. %B = Month name.
-#: ../e-util/e-calendar-item.c:1337 ../e-util/e-calendar-item.c:2215
+#: ../e-util/e-calendar-item.c:1340 ../e-util/e-calendar-item.c:2220
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%B"
 
 #. This is a strftime() format. %Y = Year.
-#: ../e-util/e-calendar-item.c:1339
+#: ../e-util/e-calendar-item.c:1342
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../e-util/e-calendar-item.c:1376
+#: ../e-util/e-calendar-item.c:1379
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%B %Y"
@@ -11317,7 +11300,7 @@ msgid "popup list"
 msgstr "oppsprettliste"
 
 #: ../e-util/e-cell-date.c:51 ../e-util/e-cell-date.c:139
-#: ../e-util/e-cell-date.c:159 ../mail/message-list.c:2052
+#: ../e-util/e-cell-date.c:159 ../mail/message-list.c:2054
 msgid "?"
 msgstr "?"
 
@@ -11610,7 +11593,7 @@ msgstr "lys lilla"
 msgid "white"
 msgstr "hvit"
 
-#: ../e-util/e-color-combo.c:639 ../mail/e-mail-account-tree-view.c:134
+#: ../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/mail-config.ui.h:73
@@ -12009,7 +11992,7 @@ msgstr "Finn oppføringer som møter følgende kriterier"
 #. protocol:
 #. name:
 #: ../e-util/e-filter-rule.c:856 ../e-util/e-html-editor-page-dialog.c:63
-#: ../e-util/e-mail-identity-combo-box.c:476
+#: ../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
 #: ../mail/e-mail-config-summary-page.c:139
@@ -12058,521 +12041,521 @@ msgstr "Klarte ikke å sette inn HTML-fil."
 msgid "Failed to insert text file."
 msgstr "Klarte ikke å sette inn tekstfil."
 
-#: ../e-util/e-html-editor-actions.c:591
+#: ../e-util/e-html-editor-actions.c:587
 msgid "Insert HTML File"
 msgstr "Sett inn HTML-fil"
 
-#: ../e-util/e-html-editor-actions.c:597
+#: ../e-util/e-html-editor-actions.c:593
 msgid "HTML file"
 msgstr "HTML-fil"
 
-#: ../e-util/e-html-editor-actions.c:624
+#: ../e-util/e-html-editor-actions.c:620
 msgctxt "dialog-title"
 msgid "Insert Image"
 msgstr "Sett inn bilde"
 
-#: ../e-util/e-html-editor-actions.c:686
+#: ../e-util/e-html-editor-actions.c:682
 msgid "Insert text file"
 msgstr "Sett inn tekstfil"
 
-#: ../e-util/e-html-editor-actions.c:692
+#: ../e-util/e-html-editor-actions.c:688
 msgid "Text file"
 msgstr "Tekstfil"
 
-#: ../e-util/e-html-editor-actions.c:1078
+#: ../e-util/e-html-editor-actions.c:1075
 msgid "Copy selected text to the clipboard"
 msgstr "Kopier valgt tekst til utklippstavlen"
 
-#: ../e-util/e-html-editor-actions.c:1085
+#: ../e-util/e-html-editor-actions.c:1082
 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:1092
+#: ../e-util/e-html-editor-actions.c:1089
 msgid "Paste text from the clipboard"
 msgstr "Lim inn tekst fra utklippstavlen"
 
-#: ../e-util/e-html-editor-actions.c:1099
+#: ../e-util/e-html-editor-actions.c:1096
 msgid "Redo the last undone action"
 msgstr "Gjenopprett siste angrede handling"
 
-#: ../e-util/e-html-editor-actions.c:1113
+#: ../e-util/e-html-editor-actions.c:1110
 msgid "Undo the last action"
 msgstr "Angre siste handling"
 
-#: ../e-util/e-html-editor-actions.c:1134
+#: ../e-util/e-html-editor-actions.c:1131
 msgid "For_mat"
 msgstr "For_mat"
 
-#: ../e-util/e-html-editor-actions.c:1141
+#: ../e-util/e-html-editor-actions.c:1138
 msgid "_Paragraph Style"
 msgstr "Stil for a_vsnitt"
 
-#: ../e-util/e-html-editor-actions.c:1155
-#: ../e-util/e-html-editor-image-dialog.c:635
+#: ../e-util/e-html-editor-actions.c:1152
+#: ../e-util/e-html-editor-image-dialog.c:645
 msgid "_Alignment"
 msgstr "_Justering"
 
-#: ../e-util/e-html-editor-actions.c:1162
+#: ../e-util/e-html-editor-actions.c:1159
 msgid "Current _Languages"
 msgstr "Aktive _språk"
 
-#: ../e-util/e-html-editor-actions.c:1179
+#: ../e-util/e-html-editor-actions.c:1176
 msgid "_Increase Indent"
 msgstr "_Øk innrykk"
 
-#: ../e-util/e-html-editor-actions.c:1181
+#: ../e-util/e-html-editor-actions.c:1178
 msgid "Increase Indent"
 msgstr "Øk innrykk"
 
-#: ../e-util/e-html-editor-actions.c:1186
+#: ../e-util/e-html-editor-actions.c:1183
 msgid "_HTML File..."
 msgstr "_HTML-fil …"
 
-#: ../e-util/e-html-editor-actions.c:1193
+#: ../e-util/e-html-editor-actions.c:1190
 msgid "Te_xt File..."
 msgstr "Te_kstfil …"
 
-#: ../e-util/e-html-editor-actions.c:1200
+#: ../e-util/e-html-editor-actions.c:1197
 msgid "Paste _Quotation"
 msgstr "Lim inn _sitat"
 
-#: ../e-util/e-html-editor-actions.c:1207
+#: ../e-util/e-html-editor-actions.c:1204
 msgid "_Find..."
 msgstr "_Finn …"
 
-#: ../e-util/e-html-editor-actions.c:1209
+#: ../e-util/e-html-editor-actions.c:1206
 msgid "Search for text"
 msgstr "Søk etter tekst"
 
-#: ../e-util/e-html-editor-actions.c:1214
+#: ../e-util/e-html-editor-actions.c:1211
 msgid "Find A_gain"
 msgstr "Finn i_gjen"
 
-#: ../e-util/e-html-editor-actions.c:1221
+#: ../e-util/e-html-editor-actions.c:1218
 msgid "Re_place..."
 msgstr "E_rstatt …"
 
-#: ../e-util/e-html-editor-actions.c:1223
+#: ../e-util/e-html-editor-actions.c:1220
 msgid "Search for and replace text"
 msgstr "Søk etter og erstatt tekst"
 
-#: ../e-util/e-html-editor-actions.c:1228
+#: ../e-util/e-html-editor-actions.c:1225
 msgid "Check _Spelling..."
 msgstr "Sjekk _staving …"
 
-#: ../e-util/e-html-editor-actions.c:1235
+#: ../e-util/e-html-editor-actions.c:1232
 msgid "_Decrease Indent"
 msgstr "_Mindre innrykk"
 
-#: ../e-util/e-html-editor-actions.c:1237
+#: ../e-util/e-html-editor-actions.c:1234
 msgid "Decrease Indent"
 msgstr "Mindre innrykk"
 
-#: ../e-util/e-html-editor-actions.c:1242
+#: ../e-util/e-html-editor-actions.c:1239
 msgid "_Wrap Lines"
 msgstr "_Bryt linjer"
 
-#: ../e-util/e-html-editor-actions.c:1249
+#: ../e-util/e-html-editor-actions.c:1246
 msgid "Open Inspector"
 msgstr "Åpne inspektør"
 
 #. Center
-#: ../e-util/e-html-editor-actions.c:1259
+#: ../e-util/e-html-editor-actions.c:1256
 #: ../e-util/e-html-editor-paragraph-dialog.c:110
 msgid "_Center"
 msgstr "_Sentrer"
 
-#: ../e-util/e-html-editor-actions.c:1261
+#: ../e-util/e-html-editor-actions.c:1258
 msgid "Center Alignment"
 msgstr "Sentrert"
 
 #. Left
-#: ../e-util/e-html-editor-actions.c:1266
+#: ../e-util/e-html-editor-actions.c:1263
 #: ../e-util/e-html-editor-paragraph-dialog.c:101
 msgid "_Left"
 msgstr "_Venstre"
 
-#: ../e-util/e-html-editor-actions.c:1268
+#: ../e-util/e-html-editor-actions.c:1265
 msgid "Left Alignment"
 msgstr "Venstrejustert"
 
 #. Right
-#: ../e-util/e-html-editor-actions.c:1273
+#: ../e-util/e-html-editor-actions.c:1270
 #: ../e-util/e-html-editor-paragraph-dialog.c:119
 msgid "_Right"
 msgstr "Høy_re"
 
-#: ../e-util/e-html-editor-actions.c:1275
+#: ../e-util/e-html-editor-actions.c:1272
 msgid "Right Alignment"
 msgstr "Høyrejustert"
 
-#: ../e-util/e-html-editor-actions.c:1283
+#: ../e-util/e-html-editor-actions.c:1280
 #: ../modules/text-highlight/languages.c:72
 msgid "_HTML"
 msgstr "_HTML"
 
-#: ../e-util/e-html-editor-actions.c:1285
+#: ../e-util/e-html-editor-actions.c:1282
 msgid "HTML editing mode"
 msgstr "HTML-redigering"
 
-#: ../e-util/e-html-editor-actions.c:1290
+#: ../e-util/e-html-editor-actions.c:1287
 msgid "Plain _Text"
 msgstr "Vanlig _tekst"
 
-#: ../e-util/e-html-editor-actions.c:1292
+#: ../e-util/e-html-editor-actions.c:1289
 msgid "Plain text editing mode"
 msgstr "Tekstredigering"
 
-#: ../e-util/e-html-editor-actions.c:1300
+#: ../e-util/e-html-editor-actions.c:1297
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../e-util/e-html-editor-actions.c:1307
+#: ../e-util/e-html-editor-actions.c:1304
 msgid "Header _1"
 msgstr "Topptekst _1"
 
-#: ../e-util/e-html-editor-actions.c:1314
+#: ../e-util/e-html-editor-actions.c:1311
 msgid "Header _2"
 msgstr "Topptekst _2"
 
-#: ../e-util/e-html-editor-actions.c:1321
+#: ../e-util/e-html-editor-actions.c:1318
 msgid "Header _3"
 msgstr "Topptekst _3"
 
-#: ../e-util/e-html-editor-actions.c:1328
+#: ../e-util/e-html-editor-actions.c:1325
 msgid "Header _4"
 msgstr "Topptekst _4"
 
-#: ../e-util/e-html-editor-actions.c:1335
+#: ../e-util/e-html-editor-actions.c:1332
 msgid "Header _5"
 msgstr "Topptekst _5"
 
-#: ../e-util/e-html-editor-actions.c:1342
+#: ../e-util/e-html-editor-actions.c:1339
 msgid "Header _6"
 msgstr "Topptekst _6"
 
-#: ../e-util/e-html-editor-actions.c:1349
+#: ../e-util/e-html-editor-actions.c:1346
 msgid "_Preformatted"
 msgstr "_Forhåndsformatert"
 
-#: ../e-util/e-html-editor-actions.c:1356
+#: ../e-util/e-html-editor-actions.c:1353
 msgid "A_ddress"
 msgstr "A_dresse"
 
-#: ../e-util/e-html-editor-actions.c:1363
+#: ../e-util/e-html-editor-actions.c:1360
 msgid "_Blockquote"
 msgstr "_Blokksitat"
 
-#: ../e-util/e-html-editor-actions.c:1370
+#: ../e-util/e-html-editor-actions.c:1367
 msgid "_Bulleted List"
 msgstr "_Kulepunktliste"
 
-#: ../e-util/e-html-editor-actions.c:1377
+#: ../e-util/e-html-editor-actions.c:1374
 msgid "_Roman Numeral List"
 msgstr "Liste med _romerske tall"
 
-#: ../e-util/e-html-editor-actions.c:1384
+#: ../e-util/e-html-editor-actions.c:1381
 msgid "Numbered _List"
 msgstr "Nummerert _liste"
 
-#: ../e-util/e-html-editor-actions.c:1391
+#: ../e-util/e-html-editor-actions.c:1388
 msgid "_Alphabetical List"
 msgstr "_Alfabetisk liste"
 
-#: ../e-util/e-html-editor-actions.c:1407
-#: ../e-util/e-html-editor-actions.c:1445
+#: ../e-util/e-html-editor-actions.c:1404
+#: ../e-util/e-html-editor-actions.c:1442
 msgid "_Image..."
 msgstr "B_ilde …"
 
 #. Translators: This is an action tooltip
-#: ../e-util/e-html-editor-actions.c:1410
+#: ../e-util/e-html-editor-actions.c:1407
 msgid "Insert Image"
 msgstr "Sett inn bilde"
 
-#: ../e-util/e-html-editor-actions.c:1415
-#: ../e-util/e-html-editor-actions.c:1452
+#: ../e-util/e-html-editor-actions.c:1412
+#: ../e-util/e-html-editor-actions.c:1449
 msgid "_Link..."
 msgstr "_Lenke …"
 
-#: ../e-util/e-html-editor-actions.c:1417
+#: ../e-util/e-html-editor-actions.c:1414
 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:1423
-#: ../e-util/e-html-editor-actions.c:1467
+#: ../e-util/e-html-editor-actions.c:1420
+#: ../e-util/e-html-editor-actions.c:1464
 msgid "_Rule..."
 msgstr "_Regel …"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1426
+#: ../e-util/e-html-editor-actions.c:1423
 msgid "Insert Rule"
 msgstr "Sett inn regel"
 
-#: ../e-util/e-html-editor-actions.c:1431
-#: ../e-util/e-html-editor-actions.c:1474
+#: ../e-util/e-html-editor-actions.c:1428
+#: ../e-util/e-html-editor-actions.c:1471
 msgid "_Table..."
 msgstr "_Tabell …"
 
-#: ../e-util/e-html-editor-actions.c:1433
+#: ../e-util/e-html-editor-actions.c:1430
 msgid "Insert Table"
 msgstr "Sett inn tabell"
 
-#: ../e-util/e-html-editor-actions.c:1438
+#: ../e-util/e-html-editor-actions.c:1435
 msgid "_Cell..."
 msgstr "_Celle …"
 
-#: ../e-util/e-html-editor-actions.c:1459
+#: ../e-util/e-html-editor-actions.c:1456
 msgid "Pa_ge..."
 msgstr "Si_de …"
 
-#: ../e-util/e-html-editor-actions.c:1483
+#: ../e-util/e-html-editor-actions.c:1480
 msgid "Font _Size"
 msgstr "Skrift_størrelse"
 
-#: ../e-util/e-html-editor-actions.c:1490
+#: ../e-util/e-html-editor-actions.c:1487
 msgid "_Font Style"
 msgstr "Skri_ftstil"
 
-#: ../e-util/e-html-editor-actions.c:1497
+#: ../e-util/e-html-editor-actions.c:1494
 msgid "Paste As _Text"
 msgstr "Lim inn som _tekst"
 
-#: ../e-util/e-html-editor-actions.c:1508
+#: ../e-util/e-html-editor-actions.c:1505
 #: ../e-util/e-html-editor-text-dialog.c:214
 msgid "_Bold"
 msgstr "_Fet"
 
-#: ../e-util/e-html-editor-actions.c:1510
+#: ../e-util/e-html-editor-actions.c:1507
 msgid "Bold"
 msgstr "Fet"
 
-#: ../e-util/e-html-editor-actions.c:1516
+#: ../e-util/e-html-editor-actions.c:1513
 #: ../e-util/e-html-editor-text-dialog.c:225
 msgid "_Italic"
 msgstr "_Kursiv"
 
-#: ../e-util/e-html-editor-actions.c:1518
+#: ../e-util/e-html-editor-actions.c:1515
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../e-util/e-html-editor-actions.c:1524
+#: ../e-util/e-html-editor-actions.c:1521
 msgid "_Plain Text"
 msgstr "_Vanlig tekst"
 
-#: ../e-util/e-html-editor-actions.c:1532
+#: ../e-util/e-html-editor-actions.c:1529
 #: ../e-util/e-html-editor-text-dialog.c:246
 msgid "_Strikethrough"
 msgstr "Gjennom_streket"
 
-#: ../e-util/e-html-editor-actions.c:1534
+#: ../e-util/e-html-editor-actions.c:1531
 msgid "Strikethrough"
 msgstr "Gjennomstrek"
 
-#: ../e-util/e-html-editor-actions.c:1540
+#: ../e-util/e-html-editor-actions.c:1537
 #: ../e-util/e-html-editor-text-dialog.c:236
 msgid "_Underline"
 msgstr "_Understrek"
 
-#: ../e-util/e-html-editor-actions.c:1542
+#: ../e-util/e-html-editor-actions.c:1539
 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:1552
+#: ../e-util/e-html-editor-actions.c:1549
 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:1560
+#: ../e-util/e-html-editor-actions.c:1557
 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:1568
+#: ../e-util/e-html-editor-actions.c:1565
 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:1576
+#: ../e-util/e-html-editor-actions.c:1573
 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:1584
+#: ../e-util/e-html-editor-actions.c:1581
 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:1592
+#: ../e-util/e-html-editor-actions.c:1589
 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:1600
+#: ../e-util/e-html-editor-actions.c:1597
 msgid "+4"
 msgstr "+4"
 
-#: ../e-util/e-html-editor-actions.c:1619
+#: ../e-util/e-html-editor-actions.c:1616
 msgid "Cell Contents"
 msgstr "Celleinnhold"
 
-#: ../e-util/e-html-editor-actions.c:1626
+#: ../e-util/e-html-editor-actions.c:1623
 msgid "Column"
 msgstr "Kolonne"
 
-#: ../e-util/e-html-editor-actions.c:1633
+#: ../e-util/e-html-editor-actions.c:1630
 msgid "Row"
 msgstr "Rad"
 
-#: ../e-util/e-html-editor-actions.c:1640
-#: ../e-util/e-html-editor-actions.c:1725
+#: ../e-util/e-html-editor-actions.c:1637
+#: ../e-util/e-html-editor-actions.c:1722
 msgid "Table"
 msgstr "Tabell"
 
 #. Translators: Popup menu item caption, containing all the Delete options for a table
-#: ../e-util/e-html-editor-actions.c:1650
+#: ../e-util/e-html-editor-actions.c:1647
 msgid "Table Delete"
 msgstr "Slett tabell"
 
-#: ../e-util/e-html-editor-actions.c:1657 ../e-util/e-text.c:2147
+#: ../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:1665
+#: ../e-util/e-html-editor-actions.c:1662
 msgid "Table Insert"
 msgstr "Sett inn tabell"
 
-#: ../e-util/e-html-editor-actions.c:1672
+#: ../e-util/e-html-editor-actions.c:1669
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: ../e-util/e-html-editor-actions.c:1690
+#: ../e-util/e-html-editor-actions.c:1687
 msgid "Column After"
 msgstr "Kolonne etter"
 
-#: ../e-util/e-html-editor-actions.c:1697
+#: ../e-util/e-html-editor-actions.c:1694
 msgid "Column Before"
 msgstr "Kolonne før"
 
-#: ../e-util/e-html-editor-actions.c:1704
+#: ../e-util/e-html-editor-actions.c:1701
 msgid "Insert _Link"
 msgstr "Sett inn _lenke"
 
-#: ../e-util/e-html-editor-actions.c:1711
+#: ../e-util/e-html-editor-actions.c:1708
 msgid "Row Above"
 msgstr "Rad over"
 
-#: ../e-util/e-html-editor-actions.c:1718
+#: ../e-util/e-html-editor-actions.c:1715
 msgid "Row Below"
 msgstr "Rad under"
 
-#: ../e-util/e-html-editor-actions.c:1732
+#: ../e-util/e-html-editor-actions.c:1729
 msgid "Cell..."
 msgstr "Celle …"
 
-#: ../e-util/e-html-editor-actions.c:1739
+#: ../e-util/e-html-editor-actions.c:1736
 msgid "Image..."
 msgstr "Bilde …"
 
-#: ../e-util/e-html-editor-actions.c:1746
+#: ../e-util/e-html-editor-actions.c:1743
 msgid "Link..."
 msgstr "Lenke …"
 
-#: ../e-util/e-html-editor-actions.c:1753
+#: ../e-util/e-html-editor-actions.c:1750
 msgid "Page..."
 msgstr "Side …"
 
-#: ../e-util/e-html-editor-actions.c:1760
+#: ../e-util/e-html-editor-actions.c:1757
 msgid "Paragraph..."
 msgstr "Avsnitt …"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1768
+#: ../e-util/e-html-editor-actions.c:1765
 msgid "Rule..."
 msgstr "Regel …"
 
-#: ../e-util/e-html-editor-actions.c:1775
+#: ../e-util/e-html-editor-actions.c:1772
 msgid "Table..."
 msgstr "Tabell …"
 
-#: ../e-util/e-html-editor-actions.c:1782
+#: ../e-util/e-html-editor-actions.c:1779
 msgid "Text..."
 msgstr "Tekst …"
 
-#: ../e-util/e-html-editor-actions.c:1789
+#: ../e-util/e-html-editor-actions.c:1786
 msgid "Remove Link"
 msgstr "Fjern lenke"
 
-#: ../e-util/e-html-editor-actions.c:1806
+#: ../e-util/e-html-editor-actions.c:1803
 msgid "Add Word to Dictionary"
 msgstr "Legg til ord i ordbok"
 
-#: ../e-util/e-html-editor-actions.c:1813
+#: ../e-util/e-html-editor-actions.c:1810
 msgid "Ignore Misspelled Word"
 msgstr "Overse feilstavet ord"
 
-#: ../e-util/e-html-editor-actions.c:1820
+#: ../e-util/e-html-editor-actions.c:1817
 msgid "Add Word To"
 msgstr "Legg til ord i"
 
-#: ../e-util/e-html-editor-actions.c:1829
+#: ../e-util/e-html-editor-actions.c:1826
 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:1950
+#: ../e-util/e-html-editor-actions.c:1947
 #, c-format
 msgid "%s Dictionary"
 msgstr "%s ordbok"
 
-#: ../e-util/e-html-editor-actions.c:2040
+#: ../e-util/e-html-editor-actions.c:2037
 msgid "_Emoticon"
 msgstr "_Emotikon"
 
-#: ../e-util/e-html-editor-actions.c:2041
+#: ../e-util/e-html-editor-actions.c:2038
 msgid "Insert Emoticon"
 msgstr "Sett inn emotikon"
 
-#: ../e-util/e-html-editor-actions.c:2109
+#: ../e-util/e-html-editor-actions.c:2106
 msgid "Re_place"
 msgstr "E_rstatt"
 
-#: ../e-util/e-html-editor-actions.c:2112
+#: ../e-util/e-html-editor-actions.c:2109
 msgid "_Image"
 msgstr "B_ilde"
 
-#: ../e-util/e-html-editor-actions.c:2115
+#: ../e-util/e-html-editor-actions.c:2112
 msgid "_Link"
 msgstr "_Lenke"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:2119
+#: ../e-util/e-html-editor-actions.c:2116
 msgid "_Rule"
 msgstr "_Regel"
 
-#: ../e-util/e-html-editor-actions.c:2122
+#: ../e-util/e-html-editor-actions.c:2119
 #: ../e-util/e-html-editor-cell-dialog.c:738
 msgid "_Table"
 msgstr "_Tabell"
 
-#: ../e-util/e-html-editor.c:704
+#: ../e-util/e-html-editor.c:707
 msgid "Paragraph Style"
 msgstr "Avsnittstil"
 
-#: ../e-util/e-html-editor.c:718
+#: ../e-util/e-html-editor.c:721
 msgid "Editing Mode"
 msgstr "Redigeringsmodus"
 
-#: ../e-util/e-html-editor.c:730
+#: ../e-util/e-html-editor.c:733
 msgid "Font Color"
 msgstr "Skriftfarge"
 
-#: ../e-util/e-html-editor.c:748
+#: ../e-util/e-html-editor.c:751
 msgid "Font Size"
 msgstr "Skriftstørrelse"
 
@@ -12619,17 +12602,17 @@ msgid "_Horizontal:"
 msgstr "_Horisontal:"
 
 #: ../e-util/e-html-editor-cell-dialog.c:792
-#: ../e-util/e-html-editor-image-dialog.c:625
+#: ../e-util/e-html-editor-image-dialog.c:635
 msgid "Top"
 msgstr "Topp"
 
 #: ../e-util/e-html-editor-cell-dialog.c:793
-#: ../e-util/e-html-editor-image-dialog.c:626
+#: ../e-util/e-html-editor-image-dialog.c:636
 msgid "Middle"
 msgstr "Midt på"
 
 #: ../e-util/e-html-editor-cell-dialog.c:794
-#: ../e-util/e-html-editor-image-dialog.c:627
+#: ../e-util/e-html-editor-image-dialog.c:637
 msgid "Bottom"
 msgstr "Bunn"
 
@@ -12648,7 +12631,7 @@ msgid "_Header Style"
 msgstr "Stil _for topptekst"
 
 #: ../e-util/e-html-editor-cell-dialog.c:830
-#: ../e-util/e-html-editor-image-dialog.c:565
+#: ../e-util/e-html-editor-image-dialog.c:575
 #: ../e-util/e-html-editor-table-dialog.c:812
 msgid "<b>Layout</b>"
 msgstr "<b>Utforming</b>"
@@ -12681,13 +12664,13 @@ msgid "C_olor:"
 msgstr "F_arge:"
 
 #: ../e-util/e-html-editor-cell-dialog.c:930
-#: ../e-util/e-html-editor-image-dialog.c:527
+#: ../e-util/e-html-editor-image-dialog.c:537
 #: ../e-util/e-html-editor-table-dialog.c:945
 msgid "Choose Background Image"
 msgstr "Velg bakgrunnsfarge"
 
 #: ../e-util/e-html-editor-cell-dialog.c:935
-#: ../e-util/e-html-editor-image-dialog.c:533
+#: ../e-util/e-html-editor-image-dialog.c:543
 #: ../e-util/e-html-editor-table-dialog.c:950
 msgid "Images"
 msgstr "Bilder"
@@ -12735,7 +12718,7 @@ msgstr "<b>Størrelse</b>"
 
 #. Width
 #: ../e-util/e-html-editor-hrule-dialog.c:368
-#: ../e-util/e-html-editor-image-dialog.c:583
+#: ../e-util/e-html-editor-image-dialog.c:593
 #: ../e-util/e-html-editor-table-dialog.c:823
 msgid "_Width:"
 msgstr "_Bredde:"
@@ -12762,48 +12745,48 @@ msgstr "S_kyggelagt"
 msgid "Rule properties"
 msgstr "Egenskaper for regel"
 
-#: ../e-util/e-html-editor-image-dialog.c:515
+#: ../e-util/e-html-editor-image-dialog.c:525
 #: ../e-util/e-html-editor-paragraph-dialog.c:66
 #: ../e-util/e-html-editor-table-dialog.c:766
 msgid "<b>General</b>"
 msgstr "<b>Generelt</b>"
 
-#: ../e-util/e-html-editor-image-dialog.c:544
+#: ../e-util/e-html-editor-image-dialog.c:554
 msgid "_Source:"
 msgstr "_Kilde:"
 
-#: ../e-util/e-html-editor-image-dialog.c:607
+#: ../e-util/e-html-editor-image-dialog.c:617
 msgid "_Height:"
 msgstr "_Høyde:"
 
-#: ../e-util/e-html-editor-image-dialog.c:648
+#: ../e-util/e-html-editor-image-dialog.c:658
 msgid "_X-Padding:"
 msgstr "_Horisontalt fyll:"
 
-#: ../e-util/e-html-editor-image-dialog.c:664
+#: ../e-util/e-html-editor-image-dialog.c:674
 msgid "_Y-Padding:"
 msgstr "_Vertikalt fyll:"
 
-#: ../e-util/e-html-editor-image-dialog.c:680
+#: ../e-util/e-html-editor-image-dialog.c:690
 #: ../e-util/e-html-editor-table-dialog.c:890
 msgid "_Border:"
 msgstr "_Kant:"
 
-#: ../e-util/e-html-editor-image-dialog.c:690
+#: ../e-util/e-html-editor-image-dialog.c:700
 msgid "<b>Link</b>"
 msgstr "<b>Lenke</b>"
 
-#: ../e-util/e-html-editor-image-dialog.c:708
+#: ../e-util/e-html-editor-image-dialog.c:718
 #: ../e-util/e-html-editor-link-dialog.c:400
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../e-util/e-html-editor-image-dialog.c:713
+#: ../e-util/e-html-editor-image-dialog.c:723
 #: ../e-util/e-html-editor-link-dialog.c:405
 msgid "_Test URL..."
 msgstr "_Test URL …"
 
-#: ../e-util/e-html-editor-image-dialog.c:730
+#: ../e-util/e-html-editor-image-dialog.c:740
 msgid "Image Properties"
 msgstr "Egenskaper for bilde"
 
@@ -12873,7 +12856,7 @@ msgstr "<b>Bakgrunnsbilde</b>"
 msgid "_Template:"
 msgstr "_Mal:"
 
-#: ../e-util/e-html-editor-page-dialog.c:646 ../e-util/e-import-assistant.c:283
+#: ../e-util/e-html-editor-page-dialog.c:646 ../e-util/e-import-assistant.c:288
 msgid "Select a file"
 msgstr "Velg en fil"
 
@@ -12943,46 +12926,46 @@ msgstr "Erstatt"
 msgid "<b>Suggestions for '%s'</b>"
 msgstr "<b>Forslag for «%s»</b>"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:520
+#: ../e-util/e-html-editor-spell-check-dialog.c:522
 msgid "<b>Suggestions</b>"
 msgstr "<b>Forslag</b>"
 
 #. Replace
-#: ../e-util/e-html-editor-spell-check-dialog.c:555
+#: ../e-util/e-html-editor-spell-check-dialog.c:557
 msgid "Replace"
 msgstr "Erstatt"
 
 #. Replace All
-#: ../e-util/e-html-editor-spell-check-dialog.c:564
+#: ../e-util/e-html-editor-spell-check-dialog.c:566
 msgid "Replace All"
 msgstr "Erstatt alle"
 
 #. Ignore
-#: ../e-util/e-html-editor-spell-check-dialog.c:573
+#: ../e-util/e-html-editor-spell-check-dialog.c:575
 #: ../mail/mail.error.xml.h:110
 msgid "Ignore"
 msgstr "Ignorer"
 
 #. Skip
-#: ../e-util/e-html-editor-spell-check-dialog.c:582
+#: ../e-util/e-html-editor-spell-check-dialog.c:584
 msgid "Skip"
 msgstr "Hopp over"
 
 #. Back
-#: ../e-util/e-html-editor-spell-check-dialog.c:591
+#: ../e-util/e-html-editor-spell-check-dialog.c:593
 msgid "Back"
 msgstr "Tilbake"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:600
+#: ../e-util/e-html-editor-spell-check-dialog.c:602
 msgid "<b>Dictionary</b>"
 msgstr "<b>Ordbok</b>"
 
 #. Add Word button
-#: ../e-util/e-html-editor-spell-check-dialog.c:620
+#: ../e-util/e-html-editor-spell-check-dialog.c:622
 msgid "Add word"
 msgstr "Legg til ord"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:637 ../mail/mail-config.ui.h:39
+#: ../e-util/e-html-editor-spell-check-dialog.c:639 ../mail/mail-config.ui.h:39
 msgid "Spell Checking"
 msgstr "Stavekontroll"
 
@@ -13023,15 +13006,15 @@ msgstr "St_ørrelse:"
 msgid "Text Properties"
 msgstr "Egenskaper for tekst"
 
-#: ../e-util/e-html-editor-view.c:6380
+#: ../e-util/e-html-editor-view.c:6413
 msgid "Changed property"
 msgstr "Endret egenskap"
 
-#: ../e-util/e-html-editor-view.c:6381
+#: ../e-util/e-html-editor-view.c:6414
 msgid "Whether editor changed"
 msgstr "Hvorvidt redigering ble endret"
 
-#: ../e-util/e-import-assistant.c:256
+#: ../e-util/e-import-assistant.c:261
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
@@ -13039,72 +13022,75 @@ msgstr ""
 "Velg filen du ønsker å importere til Evolution og velg hvilken type fil det "
 "er fra listen."
 
-#: ../e-util/e-import-assistant.c:297 ../e-util/e-import-assistant.c:472
+#: ../e-util/e-import-assistant.c:302 ../e-util/e-import-assistant.c:477
 msgid "File _type:"
 msgstr "Fil_type:"
 
-#: ../e-util/e-import-assistant.c:340 ../e-util/e-import-assistant.c:917
+#: ../e-util/e-import-assistant.c:345 ../e-util/e-import-assistant.c:925
 msgid "Choose the destination for this import"
 msgstr "Velg mål det skal importeres til"
 
-#: ../e-util/e-import-assistant.c:365
+#: ../e-util/e-import-assistant.c:370
 msgid "Choose the type of importer to run:"
 msgstr "Velg type importerer som skal kjøres:"
 
-#: ../e-util/e-import-assistant.c:373
+#: ../e-util/e-import-assistant.c:378
 msgid "Import data and settings from _older programs"
 msgstr "Importer data og innstillinger fra _eldre programmer"
 
-#: ../e-util/e-import-assistant.c:381
+#: ../e-util/e-import-assistant.c:386
 msgid "Import a _single file"
 msgstr "Importer en en_kelt fil"
 
-#: ../e-util/e-import-assistant.c:403
-#: ../modules/startup-wizard/e-mail-config-import-page.c:200
+#: ../e-util/e-import-assistant.c:408
+#: ../modules/startup-wizard/e-mail-config-import-page.c:210
 msgid "Please select the information that you would like to import:"
 msgstr "Vennligst velg informasjon du ønsker å importere:"
 
-#: ../e-util/e-import-assistant.c:533
+#: ../e-util/e-import-assistant.c:538
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar, KMail. No importable settings found. If you "
 "would like to try again, please click the \"Back\" button."
-msgstr "Evolution så etter innstillinger å importere fra følgende programmer: Pine, Netscape, Elm, iCalendar 
og KMail. Fant ingen innstillinger som kunne importeres. Hvis du vil prøve igjen kan du klikke på 
«Tilbake»-knappen."
+msgstr ""
+"Evolution så etter innstillinger å importere fra følgende programmer: Pine, "
+"Netscape, Elm, iCalendar og KMail. Fant ingen innstillinger som kunne "
+"importeres. Hvis du vil prøve igjen kan du klikke på «Tilbake»-knappen."
 
-#: ../e-util/e-import-assistant.c:559
-#: ../modules/startup-wizard/e-mail-config-import-page.c:229
+#: ../e-util/e-import-assistant.c:564
+#: ../modules/startup-wizard/e-mail-config-import-page.c:239
 #, c-format
 msgid "From %s:"
 msgstr "Fra %s:"
 
 #. Install a custom "Cancel Import" button.
-#: ../e-util/e-import-assistant.c:775
+#: ../e-util/e-import-assistant.c:783
 msgid "_Cancel Import"
 msgstr "A_vbryt import"
 
-#: ../e-util/e-import-assistant.c:916
+#: ../e-util/e-import-assistant.c:924
 msgid "Preview data to be imported"
 msgstr "Forhåndsvis data som skal importeres"
 
-#: ../e-util/e-import-assistant.c:922 ../e-util/e-import-assistant.c:935
-#: ../e-util/e-import-assistant.c:1288 ../e-util/e-import-assistant.c:1364
-#: ../e-util/e-import-assistant.c:1373
+#: ../e-util/e-import-assistant.c:930 ../e-util/e-import-assistant.c:943
+#: ../e-util/e-import-assistant.c:1296 ../e-util/e-import-assistant.c:1372
+#: ../e-util/e-import-assistant.c:1381
 msgid "Import Data"
 msgstr "Importer data"
 
-#: ../e-util/e-import-assistant.c:930
+#: ../e-util/e-import-assistant.c:938
 msgid "Select what type of file you want to import from the list."
 msgstr "Velg hvilken type fil du vil importere fra listen."
 
-#: ../e-util/e-import-assistant.c:1278 ../e-util/e-import-assistant.c:1313
+#: ../e-util/e-import-assistant.c:1286 ../e-util/e-import-assistant.c:1321
 msgid "Evolution Import Assistant"
 msgstr "Importeringsassistent for Evolution"
 
-#: ../e-util/e-import-assistant.c:1295 ../e-util/e-import-assistant.c:1351
+#: ../e-util/e-import-assistant.c:1303 ../e-util/e-import-assistant.c:1359
 msgid "Import Location"
 msgstr "Importer adresse"
 
-#: ../e-util/e-import-assistant.c:1306
+#: ../e-util/e-import-assistant.c:1314
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -13114,19 +13100,19 @@ msgstr ""
 "Gjennom denne veiviseren vil du ledes gjennom import av eksterne filer til "
 "Evolution."
 
-#: ../e-util/e-import-assistant.c:1323
+#: ../e-util/e-import-assistant.c:1331
 msgid "Importer Type"
 msgstr "Type import"
 
-#: ../e-util/e-import-assistant.c:1333
+#: ../e-util/e-import-assistant.c:1341
 msgid "Select Information to Import"
 msgstr "Velg informasjon som skal importeres"
 
-#: ../e-util/e-import-assistant.c:1342
+#: ../e-util/e-import-assistant.c:1350
 msgid "Select a File"
 msgstr "Velg en fil"
 
-#: ../e-util/e-import-assistant.c:1359
+#: ../e-util/e-import-assistant.c:1367
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "Klikk på «Bruk» for å starte import av filen til Evolution."
 
@@ -13134,23 +13120,23 @@ msgstr "Klikk på «Bruk» for å starte import av filen til Evolution."
 msgid "Autogenerated"
 msgstr "Generert automatisk"
 
-#: ../e-util/e-mail-signature-editor.c:297 ../mail/e-mail-notes.c:905
+#: ../e-util/e-mail-signature-editor.c:301 ../mail/e-mail-notes.c:905
 msgid "Close"
 msgstr "Lukk"
 
-#: ../e-util/e-mail-signature-editor.c:302 ../mail/e-mail-notes.c:910
+#: ../e-util/e-mail-signature-editor.c:306 ../mail/e-mail-notes.c:910
 msgid "_Save and Close"
 msgstr "L_agre og lukk"
 
-#: ../e-util/e-mail-signature-editor.c:529
+#: ../e-util/e-mail-signature-editor.c:533
 msgid "Edit Signature"
 msgstr "Rediger signatur"
 
-#: ../e-util/e-mail-signature-editor.c:562
+#: ../e-util/e-mail-signature-editor.c:566
 msgid "_Signature Name:"
 msgstr "Navn på _signatur:"
 
-#: ../e-util/e-mail-signature-editor.c:598
+#: ../e-util/e-mail-signature-editor.c:602
 msgid "Unnamed"
 msgstr "Uten navn"
 
@@ -13196,35 +13182,35 @@ msgstr ""
 "Mus-basert interaktivt kartfelt for å velge tidssone. Tastaturbrukere må "
 "velge tiddsone fra kombinasjonsboksen nedenfor."
 
-#: ../e-util/e-misc-utils.c:251
+#: ../e-util/e-misc-utils.c:253
 msgid "Could not open the link."
 msgstr "Kunne ikke åpne lenken."
 
-#: ../e-util/e-misc-utils.c:334
+#: ../e-util/e-misc-utils.c:336
 msgid "Could not display help for Evolution."
 msgstr "Kunne ikke vise hjelp for Evolution."
 
-#: ../e-util/e-misc-utils.c:2387
+#: ../e-util/e-misc-utils.c:2501
 #, c-format
 msgid "Opening calendar '%s'"
 msgstr "Åpner kalender «%s»"
 
-#: ../e-util/e-misc-utils.c:2390
+#: ../e-util/e-misc-utils.c:2504
 #, c-format
 msgid "Opening memo list '%s'"
 msgstr "Åpner notatliste «%s»"
 
-#: ../e-util/e-misc-utils.c:2393
+#: ../e-util/e-misc-utils.c:2507
 #, c-format
 msgid "Opening task list '%s'"
 msgstr "Åpner oppgaveliste «%s»"
 
-#: ../e-util/e-misc-utils.c:2396
+#: ../e-util/e-misc-utils.c:2510
 #, c-format
 msgid "Opening address book '%s'"
 msgstr "Åpner adressebok «%s»"
 
-#: ../e-util/e-misc-utils.c:3138
+#: ../e-util/e-misc-utils.c:3252
 #: ../modules/mailto-handler/evolution-mailto-handler.c:148
 msgid "_Do not show this message again"
 msgstr "Ikke vis _denne meldingen igjen"
@@ -13266,12 +13252,6 @@ msgstr "Søk"
 msgid "Address Book"
 msgstr "Adressebok"
 
-#: ../e-util/e-name-selector-dialog.c:451
-#: ../modules/addressbook/e-book-shell-backend.c:303
-#: ../modules/addressbook/e-book-shell-view.c:373
-msgid "Contacts"
-msgstr "Kontakter"
-
 #: ../e-util/e-name-selector-dialog.c:576
 msgid "Select Contacts from Address Book"
 msgstr "Velg kontakter fra adresseboken"
@@ -13453,53 +13433,46 @@ msgstr "Rediger regel"
 msgid "Matches: %u"
 msgstr "Treff: %u"
 
-#: ../e-util/e-search-bar.c:569
+#: ../e-util/e-search-bar.c:572
 msgid "Close the find bar"
 msgstr "Lukk søkelinjen"
 
-#: ../e-util/e-search-bar.c:577
+#: ../e-util/e-search-bar.c:580
 msgid "Fin_d:"
 msgstr "Fin_n:"
 
-#: ../e-util/e-search-bar.c:589
+#: ../e-util/e-search-bar.c:592
 msgid "Clear the search"
 msgstr "Tøm søket"
 
-#: ../e-util/e-search-bar.c:613
+#: ../e-util/e-search-bar.c:616
 msgid "_Previous"
 msgstr "_Forrige"
 
-#: ../e-util/e-search-bar.c:616
+#: ../e-util/e-search-bar.c:619
 msgid "Find the previous occurrence of the phrase"
 msgstr "Finn forrige oppføring av teksten"
 
-#: ../e-util/e-search-bar.c:625
+#: ../e-util/e-search-bar.c:628
 msgid "_Next"
 msgstr "_Neste"
 
-#: ../e-util/e-search-bar.c:628
+#: ../e-util/e-search-bar.c:631
 msgid "Find the next occurrence of the phrase"
 msgstr "Finn neste oppføring av teksten"
 
-#: ../e-util/e-search-bar.c:637
+#: ../e-util/e-search-bar.c:640
 msgid "Mat_ch case"
 msgstr "Tre_ff på små/store bokstaver"
 
-#: ../e-util/e-search-bar.c:665
+#: ../e-util/e-search-bar.c:668
 msgid "Reached bottom of page, continued from top"
 msgstr "Nådde bunnen av siden og fortsatte fra toppen"
 
-#: ../e-util/e-search-bar.c:687
+#: ../e-util/e-search-bar.c:690
 msgid "Reached top of page, continued from bottom"
 msgstr "Nådde toppen av siden og fortsatte fra bunnen"
 
-#: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:329
-#: ../mail/importers/kmail-importer.c:253 ../mail/importers/pine-importer.c:422
-#: ../modules/mail/e-mail-shell-view.c:1242
-#: ../smime/gui/certificate-manager.c:1671
-msgid "Mail"
-msgstr "E-post"
-
 #: ../e-util/e-send-options.c:570
 msgid "When de_leted:"
 msgstr "Når s_lettet:"
@@ -13913,11 +13886,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:1755
+#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1784
 msgid "Ascending"
 msgstr "Stigende"
 
-#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1755
+#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1784
 msgid "Descending"
 msgstr "Synkende"
 
@@ -13979,60 +13952,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:1578
+#: ../e-util/e-table-header-item.c:1607
 msgid "Customize Current View"
 msgstr "Tilpass aktiv visning"
 
-#: ../e-util/e-table-header-item.c:1601
+#: ../e-util/e-table-header-item.c:1630
 msgid "Sort _Ascending"
 msgstr "Sorter s_tigende"
 
-#: ../e-util/e-table-header-item.c:1604
+#: ../e-util/e-table-header-item.c:1633
 msgid "Sort _Descending"
 msgstr "Sorter s_ynkende"
 
-#: ../e-util/e-table-header-item.c:1607
-msgid "_Unsort"
-msgstr "_Fjern sortering"
+#: ../e-util/e-table-header-item.c:1636
+msgid "_Reset sort"
+msgstr "Nullstill so_rtering"
 
-#: ../e-util/e-table-header-item.c:1610
+#: ../e-util/e-table-header-item.c:1639
 msgid "Group By This _Field"
 msgstr "Grupper etter dette _feltet"
 
-#: ../e-util/e-table-header-item.c:1613
+#: ../e-util/e-table-header-item.c:1642
 msgid "Group By _Box"
 msgstr "Grupper etter _boks"
 
-#: ../e-util/e-table-header-item.c:1617
+#: ../e-util/e-table-header-item.c:1646
 msgid "Remove This _Column"
 msgstr "Fjern denne _kolonnen"
 
-#: ../e-util/e-table-header-item.c:1620
+#: ../e-util/e-table-header-item.c:1649
 msgid "Add a C_olumn..."
 msgstr "Legg til en k_olonne …"
 
-#: ../e-util/e-table-header-item.c:1624
+#: ../e-util/e-table-header-item.c:1653
 msgid "A_lignment"
 msgstr "_Justering"
 
-#: ../e-util/e-table-header-item.c:1627
+#: ../e-util/e-table-header-item.c:1656
 msgid "B_est Fit"
 msgstr "B_este tilpasning"
 
-#: ../e-util/e-table-header-item.c:1630
+#: ../e-util/e-table-header-item.c:1659
 msgid "Format Column_s..."
 msgstr "For_mater kolonner …"
 
-#: ../e-util/e-table-header-item.c:1634
+#: ../e-util/e-table-header-item.c:1663
 msgid "Custo_mize Current View..."
 msgstr "T_ilpass aktiv visning …"
 
-#: ../e-util/e-table-header-item.c:1705
+#: ../e-util/e-table-header-item.c:1734
 msgid "_Sort By"
 msgstr "_Sorter etter"
 
 #. Custom
-#: ../e-util/e-table-header-item.c:1728
+#: ../e-util/e-table-header-item.c:1757
 msgid "_Custom"
 msgstr "E_gendefinert"
 
@@ -14041,9 +14014,9 @@ msgid "Select All"
 msgstr "Velg alle"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../e-util/e-timezone-dialog.c:206 ../e-util/e-timezone-dialog.c:428
-#: ../e-util/e-timezone-dialog.c:432 ../e-util/e-timezone-dialog.c:436
-#: ../e-util/e-timezone-dialog.c:804
+#: ../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
 msgid "UTC"
 msgstr "UTC"
 
@@ -14095,7 +14068,7 @@ msgid "Flags"
 msgstr "Flagg"
 
 #: ../e-util/evolution-source-viewer.c:728
-#: ../mail/e-mail-config-identity-page.c:760
+#: ../mail/e-mail-config-identity-page.c:761
 msgid "Identity"
 msgstr "Identitet"
 
@@ -14170,15 +14143,15 @@ msgstr "Gå til begynnelsen av meldingen"
 msgid "Click to open %s"
 msgstr "Klikk for å åpne %s"
 
-#: ../e-util/e-web-view.c:3127
+#: ../e-util/e-web-view.c:3143
 msgid "Copying image to clipboard"
 msgstr "Kopierer bilde til utklippstavlen"
 
-#: ../e-util/e-web-view.c:3315
+#: ../e-util/e-web-view.c:3331
 msgid "Save Image"
 msgstr "Lagre bilde"
 
-#: ../e-util/e-web-view.c:3351
+#: ../e-util/e-web-view.c:3367
 #, c-format
 msgid "Saving image to '%s'"
 msgstr "Lagrer bilde til «%s»"
@@ -14359,12 +14332,12 @@ msgid "toggle the cell"
 msgstr "vend cellen"
 
 #. Translators: description of an "expand" action
-#: ../e-util/gal-a11y-e-cell-tree.c:213
+#: ../e-util/gal-a11y-e-cell-tree.c:215
 msgid "expands the row in the ETree containing this cell"
 msgstr "utvider raden i ETree som inneholder denne cellen"
 
 #. Translators: description of a "collapse" action
-#: ../e-util/gal-a11y-e-cell-tree.c:221
+#: ../e-util/gal-a11y-e-cell-tree.c:223
 msgid "collapses the row in the ETree containing this cell"
 msgstr "slår sammen raden i ETree som inneholder denne cellen"
 
@@ -14475,7 +14448,7 @@ msgid "Forwarded messages"
 msgstr "Videresendte meldinger"
 
 #: ../libemail-engine/e-mail-folder-utils.c:684
-#: ../libemail-engine/e-mail-folder-utils.c:935
+#: ../libemail-engine/e-mail-folder-utils.c:938
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -14486,93 +14459,92 @@ msgstr[1] "Henter %d melding(er)"
 msgid "Scanning messages for duplicates"
 msgstr "Sjekker meldinger for duplikater"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1148
+#: ../libemail-engine/e-mail-folder-utils.c:1151
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Fjerner mappe «%s»"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1328
+#: ../libemail-engine/e-mail-folder-utils.c:1332
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "Filen «%s» ble fjernet."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1332
+#: ../libemail-engine/e-mail-folder-utils.c:1336
 msgid "File has been removed."
 msgstr "Filen er fjernet."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1391
+#: ../libemail-engine/e-mail-folder-utils.c:1413
 msgid "Removing attachments"
 msgstr "Fjerner vedlegg"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1555
+#: ../libemail-engine/e-mail-folder-utils.c:1577
 #, 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:1933
+#: ../libemail-engine/e-mail-folder-utils.c:1955
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "Ugyldig URI for mappe «%s»"
 
 #. Some local folders
-#: ../libemail-engine/e-mail-session.c:125 ../mail/em-folder-properties.c:680
-#: ../mail/em-folder-tree-model.c:1229 ../mail/importers/kmail-libs.c:141
+#: ../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
 msgid "Inbox"
 msgstr "Innboks"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1222
+#: ../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
 msgid "Drafts"
 msgstr "Skisser"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1233
+#: ../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
 msgid "Outbox"
 msgstr "Utboks"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1237
+#: ../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
 msgid "Sent"
 msgstr "Sendt"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:129 ../mail/em-folder-tree-model.c:1225
+#: ../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
+#: ../plugins/templates/e-templates-store.c:2214
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1176 ../plugins/templates/templates.c:1478
-#: ../plugins/templates/templates.c:1488
 msgid "Templates"
 msgstr "Maler"
 
-#: ../libemail-engine/e-mail-session.c:1262
+#: ../libemail-engine/e-mail-session.c:1305
 #, c-format
 msgid "User cancelled operation"
 msgstr "Operasjon avbrutt av bruker"
 
-#: ../libemail-engine/e-mail-session.c:1319
+#: ../libemail-engine/e-mail-session.c:1362
 #, 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:1332
+#: ../libemail-engine/e-mail-session.c:1375
 #, 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:2362
+#: ../libemail-engine/e-mail-session.c:2405
 #, c-format
 msgid "Waiting for '%s'"
 msgstr "Venter på «%s»"
@@ -14582,26 +14554,26 @@ msgid "No mail transport service available"
 msgstr "Tjeneste for transport av e-post er ikke tilgjengelig"
 
 #: ../libemail-engine/e-mail-session-utils.c:630
-#: ../libemail-engine/mail-ops.c:719
+#: ../libemail-engine/mail-ops.c:720
 #, c-format
 msgid "Posting message to '%s'"
 msgstr "Poster melding til «%s»"
 
 #: ../libemail-engine/e-mail-session-utils.c:667
-#: ../libemail-engine/mail-ops.c:755
+#: ../libemail-engine/mail-ops.c:756
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Feil under påføring av utgående filtre: %s"
 
 #: ../libemail-engine/e-mail-session-utils.c:697
 #: ../libemail-engine/e-mail-session-utils.c:732
-#: ../libemail-engine/mail-ops.c:779 ../libemail-engine/mail-ops.c:814
+#: ../libemail-engine/mail-ops.c:780 ../libemail-engine/mail-ops.c:815
 #, c-format
 msgid "Storing sent message to '%s'"
 msgstr "Lagrer sendt melding til «%s»"
 
 #: ../libemail-engine/e-mail-session-utils.c:721
-#: ../libemail-engine/mail-ops.c:803
+#: ../libemail-engine/mail-ops.c:804
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14611,13 +14583,13 @@ msgstr ""
 "Legger til i lokal «Sendt»-mappe i stedet."
 
 #: ../libemail-engine/e-mail-session-utils.c:751
-#: ../libemail-engine/mail-ops.c:831
+#: ../libemail-engine/mail-ops.c:832
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Kunne ikke legge til i lokal Sendt-mappe: %s"
 
 #: ../libemail-engine/e-mail-session-utils.c:953
-#: ../libemail-engine/mail-ops.c:979 ../libemail-engine/mail-ops.c:1081
+#: ../libemail-engine/mail-ops.c:995 ../libemail-engine/mail-ops.c:1097
 msgid "Sending message"
 msgstr "Sender melding"
 
@@ -14658,7 +14630,7 @@ msgstr ""
 msgid "Fetching mail from '%s'"
 msgstr "Henter e-post fra «%s»"
 
-#: ../libemail-engine/mail-ops.c:749
+#: ../libemail-engine/mail-ops.c:750
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set "
@@ -14671,57 +14643,57 @@ msgstr ""
 "i «Rediger->Meldingsfiltre».\n"
 "Opprinnelig feil var: %s"
 
-#: ../libemail-engine/mail-ops.c:990
+#: ../libemail-engine/mail-ops.c:1006
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
 
-#: ../libemail-engine/mail-ops.c:1042
+#: ../libemail-engine/mail-ops.c:1058
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
 msgstr[0] "Klarte ikke å sende en melding"
 msgstr[1] "Klarte ikke å sende %d av %d meldinger"
 
-#: ../libemail-engine/mail-ops.c:1048
-msgid "Canceled."
+#: ../libemail-engine/mail-ops.c:1064
+msgid "Cancelled."
 msgstr "Avbrutt."
 
-#: ../libemail-engine/mail-ops.c:1050
+#: ../libemail-engine/mail-ops.c:1066
 msgid "Complete."
 msgstr "Fullført."
 
-#: ../libemail-engine/mail-ops.c:1164
+#: ../libemail-engine/mail-ops.c:1182
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Flytter meldinger til «%s»"
 
-#: ../libemail-engine/mail-ops.c:1165
+#: ../libemail-engine/mail-ops.c:1183
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Kopierer meldinger til «%s»"
 
-#: ../libemail-engine/mail-ops.c:1284
+#: ../libemail-engine/mail-ops.c:1302
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrer mappe «%s»"
 
-#: ../libemail-engine/mail-ops.c:1412
+#: ../libemail-engine/mail-ops.c:1430
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Tømmer og lagrer konto «%s»"
 
-#: ../libemail-engine/mail-ops.c:1413
+#: ../libemail-engine/mail-ops.c:1431
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Lagrer konto «%s»"
 
-#: ../libemail-engine/mail-ops.c:1488
+#: ../libemail-engine/mail-ops.c:1506
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tømmer søppel i «%s»"
 
-#: ../libemail-engine/mail-ops.c:1580
+#: ../libemail-engine/mail-ops.c:1598
 #, c-format
 msgid "Processing folder changes in '%s'"
 msgstr "Prosesserer endringer i mappe «%s»"
@@ -14840,7 +14812,7 @@ msgstr "_Hopp over oppslag"
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontoassistent"
 
-#: ../mail/e-mail-config-assistant.c:952
+#: ../mail/e-mail-config-assistant.c:954
 msgid "_Revise Details"
 msgstr "Gå gjennom detalje_r"
 
@@ -14870,129 +14842,137 @@ msgstr ""
 msgid "Done"
 msgstr "Ferdig"
 
-#: ../mail/e-mail-config-defaults-page.c:371
+#: ../mail/e-mail-config-defaults-page.c:377
 msgid "Checking server settings..."
 msgstr "Ser etter innstillinger for tjener …"
 
-#: ../mail/e-mail-config-defaults-page.c:489
+#: ../mail/e-mail-config-defaults-page.c:495
 msgctxt "ReplyForward"
 msgid "Use global setting"
 msgstr "Bruk global innstilling"
 
-#: ../mail/e-mail-config-defaults-page.c:491 ../mail/mail-config.ui.h:26
+#: ../mail/e-mail-config-defaults-page.c:497 ../mail/mail-config.ui.h:26
 msgctxt "ReplyForward"
 msgid "Attachment"
 msgstr "Vedlegg"
 
-#: ../mail/e-mail-config-defaults-page.c:493 ../mail/mail-config.ui.h:27
+#: ../mail/e-mail-config-defaults-page.c:499 ../mail/mail-config.ui.h:27
 msgctxt "ReplyForward"
 msgid "Inline (Outlook style)"
 msgstr "I meldingen (som i Outlook)"
 
-#: ../mail/e-mail-config-defaults-page.c:495 ../mail/mail-config.ui.h:28
+#: ../mail/e-mail-config-defaults-page.c:501 ../mail/mail-config.ui.h:28
 msgctxt "ReplyForward"
 msgid "Quoted"
 msgstr "Sitert"
 
-#: ../mail/e-mail-config-defaults-page.c:497 ../mail/mail-config.ui.h:29
+#: ../mail/e-mail-config-defaults-page.c:503 ../mail/mail-config.ui.h:29
 msgctxt "ReplyForward"
 msgid "Do Not Quote"
 msgstr "Ikke siter"
 
-#: ../mail/e-mail-config-defaults-page.c:822
+#: ../mail/e-mail-config-defaults-page.c:829
 msgid "Special Folders"
 msgstr "Spesielle mapper"
 
-#: ../mail/e-mail-config-defaults-page.c:831
+#: ../mail/e-mail-config-defaults-page.c:838
 msgid "Draft Messages _Folder:"
 msgstr "Mappe _for skisser:"
 
-#: ../mail/e-mail-config-defaults-page.c:841
+#: ../mail/e-mail-config-defaults-page.c:848
 msgid "Choose a folder for saving draft messages."
 msgstr "Velg en mappe for lagring av skisser."
 
-#: ../mail/e-mail-config-defaults-page.c:855
+#: ../mail/e-mail-config-defaults-page.c:862
 msgid "Sent _Messages Folder:"
 msgstr "Mappe for sendte _meldinger:"
 
-#: ../mail/e-mail-config-defaults-page.c:865
+#: ../mail/e-mail-config-defaults-page.c:872
 msgid "Choose a folder for saving sent messages."
 msgstr "Velg en mappe for lagring av sendte meldinger."
 
-#: ../mail/e-mail-config-defaults-page.c:884
+#: ../mail/e-mail-config-defaults-page.c:891
 msgid "S_ave replies in the folder of the message being replied to"
 msgstr "L_agre svar i samme mappe som meldingen som blir besvart"
 
-#: ../mail/e-mail-config-defaults-page.c:901
+#: ../mail/e-mail-config-defaults-page.c:908
 msgid "Archi_ve Folder:"
 msgstr "Arki_vmappe:"
 
-#: ../mail/e-mail-config-defaults-page.c:911
+#: ../mail/e-mail-config-defaults-page.c:918
 #: ../modules/mail/em-mailer-prefs.c:1403
 msgid "Choose a folder to archive messages to."
 msgstr "Velg en mappe å arkivere meldinger til."
 
-#: ../mail/e-mail-config-defaults-page.c:929
+#: ../mail/e-mail-config-defaults-page.c:932
+msgid "_Templates Folder:"
+msgstr "_Mappe for maler:"
+
+#: ../mail/e-mail-config-defaults-page.c:942
+msgid "Choose a folder to use for template messages."
+msgstr "Velg en mappe som skal brukes for maler for meldinger."
+
+#: ../mail/e-mail-config-defaults-page.c:964
 msgid "_Restore Defaults"
 msgstr "Gjenopp_rett forvalg"
 
-#: ../mail/e-mail-config-defaults-page.c:946
+#: ../mail/e-mail-config-defaults-page.c:981
 msgid "_Lookup Folders"
 msgstr "S_lå opp mapper"
 
-#: ../mail/e-mail-config-defaults-page.c:964
+#: ../mail/e-mail-config-defaults-page.c:999
 msgid "Use a Real Folder for _Trash:"
 msgstr "Bruk en virkelig mappe som _papirkurv:"
 
-#: ../mail/e-mail-config-defaults-page.c:965
+#: ../mail/e-mail-config-defaults-page.c:1000
 msgid "Choose a folder for deleted messages."
 msgstr "Velg en mappe for slettede meldinger."
 
-#: ../mail/e-mail-config-defaults-page.c:974
+#: ../mail/e-mail-config-defaults-page.c:1009
 msgid "Use a Real Folder for _Junk:"
 msgstr "Bruk en virkelig mappe for uønskede _meldinger:"
 
-#: ../mail/e-mail-config-defaults-page.c:975
+#: ../mail/e-mail-config-defaults-page.c:1010
 msgid "Choose a folder for junk messages."
 msgstr "Velg en mappe for uønskede meldinger."
 
-#: ../mail/e-mail-config-defaults-page.c:992
+#: ../mail/e-mail-config-defaults-page.c:1027
 msgid "Composing Messages"
 msgstr "Skriver meldinger"
 
-#: ../mail/e-mail-config-defaults-page.c:1001
+#: ../mail/e-mail-config-defaults-page.c:1036
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "All_tid _kopi (cc) til:"
 
-#: ../mail/e-mail-config-defaults-page.c:1026
+#: ../mail/e-mail-config-defaults-page.c:1061
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Alltid _blindkopi (bcc) til:"
 
-#: ../mail/e-mail-config-defaults-page.c:1057
+#: ../mail/e-mail-config-defaults-page.c:1092
 msgid "Re_ply style:"
 msgstr "S_varstil:"
 
-#: ../mail/e-mail-config-defaults-page.c:1093
+#: ../mail/e-mail-config-defaults-page.c:1128
 msgid "Message Receipts"
 msgstr "Meldingsmottakere"
 
-#: ../mail/e-mail-config-defaults-page.c:1102
+#: ../mail/e-mail-config-defaults-page.c:1137
 msgid "S_end message receipts:"
 msgstr "S_end kvittering for meldinger:"
 
-#: ../mail/e-mail-config-defaults-page.c:1127
+#: ../mail/e-mail-config-defaults-page.c:1162
 msgid "Never"
 msgstr "Aldri"
 
-#: ../mail/e-mail-config-defaults-page.c:1133
+#: ../mail/e-mail-config-defaults-page.c:1168
 msgid "Always"
 msgstr "Alltid"
 
-#: ../mail/e-mail-config-defaults-page.c:1139
+#: ../mail/e-mail-config-defaults-page.c:1174
 msgid "Ask for each message"
 msgstr "Spør for hver melding"
 
-#: ../mail/e-mail-config-defaults-page.c:1246
+#: ../mail/e-mail-config-defaults-page.c:1281
 msgid "Defaults"
 msgstr "Forvalg"
 
@@ -15053,23 +15033,25 @@ msgstr "Legg til n_y signatur …"
 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"
 
-#: ../mail/e-mail-config-identity-page.c:611
-msgid "Full Name cannot be empty"
-msgstr "Fullt navn kan ikke være tomt"
+#. This is only a warning, not a blocker
+#. complete = complete && correct;
+#: ../mail/e-mail-config-identity-page.c:612
+msgid "Full Name should not be empty"
+msgstr "Fullt navn bør ikke være tomt"
 
-#: ../mail/e-mail-config-identity-page.c:618
+#: ../mail/e-mail-config-identity-page.c:619
 msgid "Email Address cannot be empty"
 msgstr "E-postadressen kan ikke være tomt"
 
-#: ../mail/e-mail-config-identity-page.c:623
+#: ../mail/e-mail-config-identity-page.c:624
 msgid "Email Address is not a valid email"
 msgstr "E-postadressen er ikke en gyldig e-postadresse"
 
-#: ../mail/e-mail-config-identity-page.c:635
+#: ../mail/e-mail-config-identity-page.c:636
 msgid "Reply To is not a valid email"
 msgstr "Svar til er ikke en e-postadresse"
 
-#: ../mail/e-mail-config-identity-page.c:646
+#: ../mail/e-mail-config-identity-page.c:647
 #: ../mail/e-mail-config-summary-page.c:632
 msgid "Account Name cannot be empty"
 msgstr "Navn på konto kan ikke være tomt"
@@ -15102,11 +15084,12 @@ msgctxt "PGPKeyDescription"
 msgid "%s - %s"
 msgstr "%s - %s"
 
-#: ../mail/e-mail-config-security-page.c:340 ../mail/em-folder-properties.c:603
+#: ../mail/e-mail-config-security-page.c:340 ../mail/em-folder-properties.c:701
 #: ../mail/mail-config.ui.h:31
 #: ../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
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "General"
 msgstr "Generelt"
@@ -15657,11 +15640,12 @@ msgstr "Følg _opp …"
 msgid "Flag the selected messages for follow-up"
 msgstr "Merk valgte meldinger for oppfølging"
 
-#: ../mail/e-mail-reader.c:2084
+#: ../mail/e-mail-reader.c:2084 ../modules/mail/e-mail-attachment-handler.c:364
 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
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Videresend den valgte meldingen til noen som et vedlegg"
 
@@ -15669,11 +15653,12 @@ msgstr "Videresend den valgte meldingen til noen som et vedlegg"
 msgid "Forward As _Attached"
 msgstr "Videresend s_om vedlegg"
 
-#: ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2098 ../modules/mail/e-mail-attachment-handler.c:371
 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
 msgid "Forward the selected message in the body of a new message"
 msgstr "Videresend den valgte meldingen i kroppen av en ny melding"
 
@@ -15681,11 +15666,12 @@ msgstr "Videresend den valgte meldingen i kroppen av en ny melding"
 msgid "Forward As _Inline"
 msgstr "V_ideresend som vedlegg"
 
-#: ../mail/e-mail-reader.c:2112
+#: ../mail/e-mail-reader.c:2112 ../modules/mail/e-mail-attachment-handler.c:378
 msgid "_Quoted"
 msgstr "_Sitert"
 
 #: ../mail/e-mail-reader.c:2114 ../mail/e-mail-reader.c:2121
+#: ../modules/mail/e-mail-attachment-handler.c:380
 msgid "Forward the selected message quoted like a reply"
 msgstr "Videresend den valgte meldingen sitert som et svar"
 
@@ -15781,11 +15767,11 @@ msgstr "_Ulest"
 msgid "Mark the selected messages as not having been read"
 msgstr "Merk valgte meldinger som ulest"
 
-#: ../mail/e-mail-reader.c:2203
+#: ../mail/e-mail-reader.c:2203 ../modules/mail/e-mail-attachment-handler.c:350
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding …"
 
-#: ../mail/e-mail-reader.c:2205
+#: ../mail/e-mail-reader.c:2205 ../modules/mail/e-mail-attachment-handler.c:352
 msgid "Open the selected messages in the composer for editing"
 msgstr "Åpne valgte meldinger i redigeringskomponenten"
 
@@ -15885,11 +15871,11 @@ msgstr "Skriv ut denne meldingen"
 msgid "Preview the message to be printed"
 msgstr "Forhåndsvis meldingen som skal skrives ut"
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2301 ../modules/mail/e-mail-attachment-handler.c:385
 msgid "Re_direct"
 msgstr "Om_diriger"
 
-#: ../mail/e-mail-reader.c:2303
+#: ../mail/e-mail-reader.c:2303 ../modules/mail/e-mail-attachment-handler.c:387
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Omdiriger (bounce) den valgte meldingen til noen"
 
@@ -15911,27 +15897,28 @@ msgstr "Sjekk valgte meldinger for duplikater"
 
 #: ../mail/e-mail-reader.c:2322 ../mail/mail.error.xml.h:28
 #: ../modules/calendar/e-cal-shell-view-actions.c:1432
-#: ../modules/mail/e-mail-attachment-handler.c:213
+#: ../modules/mail/e-mail-attachment-handler.c:329
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: ../mail/e-mail-reader.c:2324
+#: ../mail/e-mail-reader.c:2324 ../modules/mail/e-mail-attachment-handler.c:331
 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
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: ../mail/e-mail-reader.c:2331
+#: ../mail/e-mail-reader.c:2331 ../modules/mail/e-mail-attachment-handler.c:338
 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:220
+#: ../mail/e-mail-reader.c:2336 ../modules/mail/e-mail-attachment-handler.c:343
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsender"
 
-#: ../mail/e-mail-reader.c:2338
+#: ../mail/e-mail-reader.c:2338 ../modules/mail/e-mail-attachment-handler.c:345
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Skriv et svar til avsender av den valgte meldingen"
 
@@ -15987,7 +15974,7 @@ msgstr "L_ag"
 msgid "Ch_aracter Encoding"
 msgstr "Tegn_koding"
 
-#: ../mail/e-mail-reader.c:2408
+#: ../mail/e-mail-reader.c:2408 ../modules/mail/e-mail-attachment-handler.c:357
 msgid "F_orward As"
 msgstr "Videresend s_om"
 
@@ -16091,11 +16078,11 @@ msgstr "Vis meldinger med alle meldingshoder"
 msgid "Retrieving message"
 msgstr "Henter melding"
 
-#: ../mail/e-mail-reader.c:4216 ../modules/mail/e-mail-attachment-handler.c:206
+#: ../mail/e-mail-reader.c:4216 ../modules/mail/e-mail-attachment-handler.c:322
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: ../mail/e-mail-reader.c:4217
+#: ../mail/e-mail-reader.c:4217 ../modules/mail/e-mail-attachment-handler.c:324
 msgid "Forward the selected message to someone"
 msgstr "Videresend den valgte meldingen til noen"
 
@@ -16152,34 +16139,34 @@ msgstr "Last eksternt innhold"
 msgid "Do not warn me again"
 msgstr "Ikke varsle meg igjen"
 
-#: ../mail/e-mail-reader-utils.c:572
+#: ../mail/e-mail-reader-utils.c:570
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Oppdaterer mappe «%s»"
 
-#: ../mail/e-mail-reader-utils.c:1165
+#: ../mail/e-mail-reader-utils.c:1163
 msgid "Marking thread to be ignored"
 msgstr "Merker tråd som ignorert"
 
-#: ../mail/e-mail-reader-utils.c:1169
+#: ../mail/e-mail-reader-utils.c:1167
 msgid "Unmarking thread from being ignored"
 msgstr "Fjerner merking av tråd som ignorert"
 
-#: ../mail/e-mail-reader-utils.c:1173
+#: ../mail/e-mail-reader-utils.c:1171
 msgid "Marking subthread to be ignored"
 msgstr "Merker undertråd som ignorert"
 
-#: ../mail/e-mail-reader-utils.c:1177
+#: ../mail/e-mail-reader-utils.c:1175
 msgid "Unmarking subthread from being ignored"
 msgstr "Fjerner merking av undertråd som ignorert"
 
-#: ../mail/e-mail-reader-utils.c:1421
+#: ../mail/e-mail-reader-utils.c:1419
 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:1658
+#: ../mail/e-mail-reader-utils.c:1656
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -16194,7 +16181,7 @@ msgstr[1] ""
 "Mappen «%s» inneholder %u duplikatmeldinger. Er du sikker på at du vil "
 "slette dem?"
 
-#: ../mail/e-mail-reader-utils.c:2489
+#: ../mail/e-mail-reader-utils.c:2487
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Lagre melding"
@@ -16205,13 +16192,13 @@ 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:2510
+#: ../mail/e-mail-reader-utils.c:2508
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Melding"
 msgstr[1] "Meldinger"
 
-#: ../mail/e-mail-reader-utils.c:2883
+#: ../mail/e-mail-reader-utils.c:2881
 msgid "Parsing message"
 msgstr "Leser melding"
 
@@ -16239,8 +16226,10 @@ msgstr "Fant ingen datakilde for UID «%s»"
 msgid "Are you sure you want to send a message with %d To and CC recipients?"
 msgid_plural ""
 "Are you sure you want to send a message with %d To and CC recipients?"
-msgstr[0] "Er du sikker på at du vil sende en melding med %d Til- og CC-mottaker?"
-msgstr[1] "Er du sikker på at du vil sende en melding med %d Til- og CC-mottakere?"
+msgstr[0] ""
+"Er du sikker på at du vil sende en melding med %d Til- og CC-mottaker?"
+msgstr[1] ""
+"Er du sikker på at du vil sende en melding med %d Til- og CC-mottakere?"
 
 #. Translators: The %d is replaced with the actual count of recipients, which is always more than one.
 #: ../mail/em-composer-utils.c:396
@@ -16257,8 +16246,18 @@ msgid_plural ""
 "some cases this behaviour is undesired, especially if they do not know each "
 "other or if privacy is a concern. Consider adding recipients to the BCC "
 "field instead."
-msgstr[0] "Du prøver å sende en melding til %d mottaker i Til og CC feltene. Dette betyr at alle mottakere 
vil se hverandres e-postadresser. I noen tilfeller er ikke dette ønsket oppførsel, spesielt hvis de ikke 
kjenner hverandre eller hvis personvern er bekymring. Vurder å legge til mottakere i BCC-feltet i stedet."
-msgstr[1] "Du prøver å sende en melding til %d mottakere i Til og CC feltene. Dette betyr at alle mottakere 
vil se hverandres e-postadresser. I noen tilfeller er ikke dette ønsket oppførsel, spesielt hvis de ikke 
kjenner hverandre eller hvis personvern er bekymring. Vurder å legge til mottakere i BCC-feltet i stedet."
+msgstr[0] ""
+"Du prøver å sende en melding til %d mottaker i Til og CC feltene. Dette "
+"betyr at alle mottakere vil se hverandres e-postadresser. I noen tilfeller "
+"er ikke dette ønsket oppførsel, spesielt hvis de ikke kjenner hverandre "
+"eller hvis personvern er bekymring. Vurder å legge til mottakere i BCC-"
+"feltet i stedet."
+msgstr[1] ""
+"Du prøver å sende en melding til %d mottakere i Til og CC feltene. Dette "
+"betyr at alle mottakere vil se hverandres e-postadresser. I noen tilfeller "
+"er ikke dette ønsket oppførsel, spesielt hvis de ikke kjenner hverandre "
+"eller hvis personvern er bekymring. Vurder å legge til mottakere i BCC-"
+"feltet i stedet."
 
 #. This message is never removed from the camel operation, otherwise the GtkInfoBar
 #. hides itself and the user sees no feedback.
@@ -16270,7 +16269,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:1686
+#: ../mail/em-composer-utils.c:1692
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -16278,24 +16277,24 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Day}.${Month}.${Year} kl. ${24Hour}.${Minute} "
 "${TimeZone}, skrev ${Sender}:"
 
-#: ../mail/em-composer-utils.c:1692
+#: ../mail/em-composer-utils.c:1698
 msgid "-------- Forwarded Message --------"
 msgstr "---------Videresendt melding-------"
 
-#: ../mail/em-composer-utils.c:1697
+#: ../mail/em-composer-utils.c:1703
 msgid "-----Original Message-----"
 msgstr "-----Opprinnelig melding-----"
 
-#: ../mail/em-composer-utils.c:2984
+#: ../mail/em-composer-utils.c:3008
 msgid "an unknown sender"
 msgstr "en ukjent avsender"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../mail/em-composer-utils.c:3471
+#: ../mail/em-composer-utils.c:3495
 msgid "Posting destination"
 msgstr "Destinasjon for post"
 
-#: ../mail/em-composer-utils.c:3476
+#: ../mail/em-composer-utils.c:3500
 msgid "Choose folders to post the message to."
 msgstr "Velg mapper meldingen skal postes til."
 
@@ -16312,87 +16311,87 @@ msgstr "Så etter"
 msgid "Add Ac_tion"
 msgstr "Legg til hand_ling"
 
-#: ../mail/em-folder-properties.c:178
+#: ../mail/em-folder-properties.c:227
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Ulest melding:"
 msgstr[1] "Uleste meldinger:"
 
-#: ../mail/em-folder-properties.c:189
+#: ../mail/em-folder-properties.c:238
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Totalt antall melding:"
 msgstr[1] "Totalt antall meldinger:"
 
-#: ../mail/em-folder-properties.c:210
+#: ../mail/em-folder-properties.c:259
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Bruk av kvote (%s):"
 
-#: ../mail/em-folder-properties.c:212
+#: ../mail/em-folder-properties.c:261
 #, c-format
 msgid "Quota usage"
 msgstr "Bruk av kvote"
 
 #. Translators: Label of a combo with a list of configured accounts where a user can
 #. choose which account to use as the sender when composing a message in this folder
-#: ../mail/em-folder-properties.c:287
+#: ../mail/em-folder-properties.c:385
 msgid "_Send Account Override:"
 msgstr "Overstyring av av_senderkonto:"
 
-#: ../mail/em-folder-properties.c:491
+#: ../mail/em-folder-properties.c:589
 msgid "_Archive this folder using these settings:"
 msgstr "_Arkiver denne mappen med disse innstillingene:"
 
 #. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
-#: ../mail/em-folder-properties.c:500
+#: ../mail/em-folder-properties.c:598
 msgctxt "autoarchive"
 msgid "_Cleanup messages older than"
 msgstr "_Rydd opp meldinger som er eldre enn"
 
 #. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
-#: ../mail/em-folder-properties.c:516
+#: ../mail/em-folder-properties.c:614
 msgctxt "autoarchive"
 msgid "days"
 msgstr "dager"
 
 #. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
-#: ../mail/em-folder-properties.c:518
+#: ../mail/em-folder-properties.c:616
 msgctxt "autoarchive"
 msgid "weeks"
 msgstr "uker"
 
 #. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
-#: ../mail/em-folder-properties.c:520
+#: ../mail/em-folder-properties.c:618
 msgctxt "autoarchive"
 msgid "months"
 msgstr "måneder"
 
-#: ../mail/em-folder-properties.c:526
+#: ../mail/em-folder-properties.c:624
 msgid "Move old messages to the default archive _folder"
 msgstr "Flytt gamle meldinger til forvalgt arkiv_mappe"
 
-#: ../mail/em-folder-properties.c:537
+#: ../mail/em-folder-properties.c:635
 msgid "_Move old messages to:"
 msgstr "Flytt gamle _meldinger til:"
 
-#: ../mail/em-folder-properties.c:541
+#: ../mail/em-folder-properties.c:639
 msgid "AutoArchive folder"
 msgstr "Mappe for automatisk arkivering"
 
-#: ../mail/em-folder-properties.c:541
+#: ../mail/em-folder-properties.c:639
 msgid "Select folder to use for AutoArchive"
 msgstr "Velg mappe som skal brukes for automatisk arkivering"
 
-#: ../mail/em-folder-properties.c:547
+#: ../mail/em-folder-properties.c:645
 msgid "_Delete old messages"
 msgstr "_Slett gamle meldinger"
 
-#: ../mail/em-folder-properties.c:606
+#: ../mail/em-folder-properties.c:704
 msgid "AutoArchive"
 msgstr "Automatisk arkivering"
 
-#: ../mail/em-folder-properties.c:685
+#: ../mail/em-folder-properties.c:783
 msgid "Folder Properties"
 msgstr "Egenskaper for mappe"
 
@@ -16428,12 +16427,12 @@ msgstr "Flytter mappe %s"
 msgid "Copying folder %s"
 msgstr "Kopierer mappe %s"
 
-#: ../mail/em-folder-tree.c:2261 ../mail/message-list.c:2494
+#: ../mail/em-folder-tree.c:2261 ../mail/message-list.c:2496
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flytter meldinger til mappe %s"
 
-#: ../mail/em-folder-tree.c:2265 ../mail/message-list.c:2496
+#: ../mail/em-folder-tree.c:2265 ../mail/message-list.c:2498
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer meldinger til mappe %s"
@@ -16448,7 +16447,7 @@ msgstr "Kan ikke slippe melding(er) toppnivå for lageret"
 msgid "UNMATCHED"
 msgstr "UTEN TREFF"
 
-#: ../mail/em-folder-tree-model.c:1313 ../mail/em-folder-tree-model.c:1689
+#: ../mail/em-folder-tree-model.c:1301 ../mail/em-folder-tree-model.c:1677
 msgid "Loading..."
 msgstr "Laster …"
 
@@ -16472,7 +16471,7 @@ msgstr "Abonner på innhold som vises"
 msgid "Subscribe To _All"
 msgstr "Abonner på _alle"
 
-#: ../mail/em-subscription-editor.c:970 ../mail/em-subscription-editor.c:1912
+#: ../mail/em-subscription-editor.c:970 ../mail/em-subscription-editor.c:1914
 #: ../modules/mail/e-mail-shell-view-actions.c:1751
 msgid "_Unsubscribe"
 msgstr "_Fjern abonnement"
@@ -16501,66 +16500,66 @@ msgid_plural "%d total"
 msgstr[0] "%d totalt"
 msgstr[1] "%d totalt"
 
-#: ../mail/em-subscription-editor.c:1749
+#: ../mail/em-subscription-editor.c:1755
 msgid "Folder Subscriptions"
 msgstr "Abonnement på mapper"
 
-#: ../mail/em-subscription-editor.c:1788
+#: ../mail/em-subscription-editor.c:1790
 msgid "_Account:"
 msgstr "K_onto:"
 
-#: ../mail/em-subscription-editor.c:1801
+#: ../mail/em-subscription-editor.c:1803
 msgid "Clear Search"
 msgstr "Tøm søk"
 
-#: ../mail/em-subscription-editor.c:1818
+#: ../mail/em-subscription-editor.c:1820
 msgid "Sho_w items that contain:"
 msgstr "_Vis oppføringer som inneholder:"
 
-#: ../mail/em-subscription-editor.c:1865
+#: ../mail/em-subscription-editor.c:1867
 msgid "Subscribe to the selected folder"
 msgstr "Abonner på valgt mappe"
 
-#: ../mail/em-subscription-editor.c:1866
+#: ../mail/em-subscription-editor.c:1868
 msgid "Su_bscribe"
 msgstr "A_bonner"
 
-#: ../mail/em-subscription-editor.c:1911
+#: ../mail/em-subscription-editor.c:1913
 #: ../modules/mail/e-mail-shell-view-actions.c:1753
 msgid "Unsubscribe from the selected folder"
 msgstr "Fjern abonnement på valgt mappe"
 
-#: ../mail/em-subscription-editor.c:1951
+#: ../mail/em-subscription-editor.c:1953
 msgid "Collapse all folders"
 msgstr "Slå sammen alle mapper"
 
-#: ../mail/em-subscription-editor.c:1952
+#: ../mail/em-subscription-editor.c:1954
 msgid "C_ollapse All"
 msgstr "Slå sammen _alle"
 
-#: ../mail/em-subscription-editor.c:1962
+#: ../mail/em-subscription-editor.c:1964
 msgid "Expand all folders"
 msgstr "Utvid alle mapper"
 
-#: ../mail/em-subscription-editor.c:1963
+#: ../mail/em-subscription-editor.c:1965
 msgid "E_xpand All"
 msgstr "Ut_vid alle"
 
-#: ../mail/em-subscription-editor.c:1973
+#: ../mail/em-subscription-editor.c:1975
 msgid "Refresh the folder list"
 msgstr "Oppdater mappelisten"
 
-#: ../mail/em-subscription-editor.c:1974
+#: ../mail/em-subscription-editor.c:1976
 #: ../modules/mail/e-mail-shell-view-actions.c:1652
 #: ../modules/mail/e-mail-shell-view-actions.c:1723
 msgid "_Refresh"
 msgstr "Oppdate_r"
 
-#: ../mail/em-subscription-editor.c:1985
+#: ../mail/em-subscription-editor.c:1987
 msgid "Stop the current operation"
 msgstr "Stopp aktiv operasjon"
 
-#: ../mail/em-subscription-editor.c:1986
+#: ../mail/em-subscription-editor.c:1988
 #: ../modules/addressbook/e-book-shell-view-actions.c:1001
 msgid "_Stop"
 msgstr "_Stopp"
@@ -17492,8 +17491,8 @@ msgid "Check cu_stom headers for junk"
 msgstr "_Sjekk egendefinerte meldingshoder for uønsket e-post"
 
 #: ../mail/mail-config.ui.h:131
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:234
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:184
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:301
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:244
 msgid "No encryption"
 msgstr "Ingen kryptering"
 
@@ -18434,38 +18433,38 @@ msgstr "Klarte ikke å lagre meldingsnotat i mappe «{0}»"
 msgid "Canceling..."
 msgstr "Avbryter …"
 
-#: ../mail/mail-send-recv.c:636
+#: ../mail/mail-send-recv.c:639
 msgid "Send & Receive Mail"
 msgstr "Send & motta e-post"
 
-#: ../mail/mail-send-recv.c:650
+#: ../mail/mail-send-recv.c:653
 msgid "Cancel _All"
 msgstr "Avbryt _alle"
 
-#: ../mail/mail-send-recv.c:740 ../mail/mail-send-recv.c:1259
+#: ../mail/mail-send-recv.c:743 ../mail/mail-send-recv.c:1263
 msgid "Updating..."
 msgstr "Oppdaterer …"
 
-#: ../mail/mail-send-recv.c:740 ../mail/mail-send-recv.c:822
+#: ../mail/mail-send-recv.c:743 ../mail/mail-send-recv.c:825
 msgid "Waiting..."
 msgstr "Venter …"
 
-#: ../mail/mail-send-recv.c:1225
+#: ../mail/mail-send-recv.c:1229
 #, c-format
 msgid "Checking for new mail at '%s'"
 msgstr "Ser etter nye meldinger på «%s»"
 
-#: ../mail/mail-send-recv.c:1452
+#: ../mail/mail-send-recv.c:1456
 #, c-format
 msgid "Deleting junk and expunging trash at '%s'"
 msgstr "Sletter søppel og tømmer papirkurv ved «%s»"
 
-#: ../mail/mail-send-recv.c:1454
+#: ../mail/mail-send-recv.c:1458
 #, c-format
 msgid "Deleting junk at '%s'"
 msgstr "Sletter søppelpost ved «%s»"
 
-#: ../mail/mail-send-recv.c:1456
+#: ../mail/mail-send-recv.c:1460
 #, c-format
 msgid "Expunging trash at '%s'"
 msgstr "Tømmer søppelpost i «%s»"
@@ -18482,86 +18481,86 @@ msgstr "Rediger søkemappe"
 msgid "New Search Folder"
 msgstr "Ny søkemappe"
 
-#: ../mail/message-list.c:294
+#: ../mail/message-list.c:296
 msgid "Unseen"
 msgstr "Ulest"
 
-#: ../mail/message-list.c:295
+#: ../mail/message-list.c:297
 msgid "Seen"
 msgstr "Lest"
 
-#: ../mail/message-list.c:296
+#: ../mail/message-list.c:298
 msgid "Answered"
 msgstr "Besvart"
 
-#: ../mail/message-list.c:297
+#: ../mail/message-list.c:299
 msgid "Forwarded"
 msgstr "Videresendt"
 
-#: ../mail/message-list.c:298
+#: ../mail/message-list.c:300
 msgid "Multiple Unseen Messages"
 msgstr "Flere uleste meldinger"
 
-#: ../mail/message-list.c:299
+#: ../mail/message-list.c:301
 msgid "Multiple Messages"
 msgstr "Flere meldinger"
 
-#: ../mail/message-list.c:312
+#: ../mail/message-list.c:314
 msgid "Lowest"
 msgstr "Lavest"
 
-#: ../mail/message-list.c:313
+#: ../mail/message-list.c:315
 msgid "Lower"
 msgstr "Lavere"
 
-#: ../mail/message-list.c:317
+#: ../mail/message-list.c:319
 msgid "Higher"
 msgstr "Høyere"
 
-#: ../mail/message-list.c:318
+#: ../mail/message-list.c:320
 msgid "Highest"
 msgstr "Høyest"
 
-#: ../mail/message-list.c:464 ../mail/message-list.c:6168
+#: ../mail/message-list.c:466 ../mail/message-list.c:6186
 msgid "Generating message list"
 msgstr "Genererer meldingsliste"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:2060 ../modules/itip-formatter/itip-view.c:235
+#: ../mail/message-list.c:2062 ../modules/itip-formatter/itip-view.c:235
 msgid "Today %l:%M %p"
 msgstr "I dag %l:%M %p"
 
-#: ../mail/message-list.c:2069
+#: ../mail/message-list.c:2071
 msgid "Yesterday %l:%M %p"
 msgstr "I går %l:%M %p"
 
-#: ../mail/message-list.c:2081
+#: ../mail/message-list.c:2083
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: ../mail/message-list.c:2089
+#: ../mail/message-list.c:2091
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H.%M"
 
-#: ../mail/message-list.c:2091
+#: ../mail/message-list.c:2093
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2997
+#: ../mail/message-list.c:3001
 msgid "Select all visible messages"
 msgstr "Velg alle synlige meldinger"
 
-#: ../mail/message-list.c:3699 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3703 ../mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "Meldinger"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:5105
+#: ../mail/message-list.c:5117
 msgid "Follow-up"
 msgstr "Følg opp"
 
-#: ../mail/message-list.c:6107
+#: ../mail/message-list.c:6125
 msgid ""
 "No message satisfies your search criteria. Change search criteria by "
 "selecting a new Show message filter from the drop down list above or by "
@@ -18573,7 +18572,7 @@ msgstr ""
 "starte et nytt søk enten ved å tømme det med Søk->Tøm menyoppføringen eller "
 "ved å endre spørringen over."
 
-#: ../mail/message-list.c:6115
+#: ../mail/message-list.c:6133
 msgid "There are no messages in this folder."
 msgstr "Det er ingen meldinger i denne mappen."
 
@@ -19254,8 +19253,8 @@ msgstr "Søppelfilter bruker Bogofilter"
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:993
 #: ../modules/cal-config-google/e-cal-config-google.c:177
 #: ../modules/cal-config-google/e-cal-config-gtasks.c:117
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:361
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:396
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:433
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:468
 msgid "User name cannot be empty"
 msgstr "Brukernavn kan ikke være tomt"
 
@@ -19290,8 +19289,8 @@ msgid "Port:"
 msgstr "Port:"
 
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:619
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:185
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:140
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:245
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:200
 msgid "Port number is not valid"
 msgstr "Portnummeret er ikke en gyldig"
 
@@ -19304,8 +19303,8 @@ msgid "Encryption:"
 msgstr "Kryptering:"
 
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:660
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:255
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:205
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:322
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:265
 msgid "Authentication"
 msgstr "Autentisering"
 
@@ -19397,59 +19396,67 @@ msgid "Browse until limit is reached"
 msgstr "Bla gjennom til grensen nås"
 
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:978
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:342
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:378
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:414
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:450
 msgid "Server address cannot be empty"
 msgstr "Tjeneradresse kan ikke være tom"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:135
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:299
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:92
+msgid "Choose an Address Book"
+msgstr "Velg en adressebok"
+
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:240
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:296
 #: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:127
 msgid "URL:"
 msgstr "URL:"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:145
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:249
+msgid "Find Address Books"
+msgstr "Finn adressebok"
+
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:259
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "Unngå IfMatch (kreves med Apache < 2.2.8)"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:194
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:415
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:308
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:412
 #: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:184
 msgid "URL is not a valid http:// nor https:// URL"
 msgstr "URL er ikke en gyldig http:// eller https:// URL"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:112
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:109
 #: ../modules/cal-config-google/e-google-chooser-button.c:224
 msgid "Choose a Calendar"
 msgstr "Velg en kalender"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:116
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:113
 #: ../modules/cal-config-google/e-google-chooser-button.c:228
 msgid "Choose a Memo List"
 msgstr "Velg en notatliste"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:120
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:117
 #: ../modules/cal-config-google/e-google-chooser-button.c:232
 msgid "Choose a Task List"
 msgstr "Velg en oppgaveliste"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:313
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:310
 msgid "Find Calendars"
 msgstr "Finn kalendere"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:316
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:313
 msgid "Find Memo Lists"
 msgstr "Finn notatlister"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:319
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:316
 msgid "Find Task Lists"
 msgstr "Finn oppgavelister"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:337
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:334
 msgid "Email:"
 msgstr "E-post:"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:342
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:339
 msgid "Server handles meeting invitations"
 msgstr "Tjener håndterer møteinvitasjoner"
 
@@ -20279,7 +20286,7 @@ msgid "New _Memo"
 msgstr "Nytt _notat"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:252
-#: ../modules/calendar/e-memo-shell-backend.c:65
+#: ../modules/calendar/e-memo-shell-backend.c:81
 #: ../modules/calendar/e-memo-shell-view-actions.c:644
 msgid "Create a new memo"
 msgstr "Lag et nytt notat"
@@ -20306,29 +20313,29 @@ msgstr "_Åpne nettside"
 msgid "Print the selected memo"
 msgstr "Skriv ut valgt notat"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:810
+#: ../modules/calendar/e-cal-shell-view-private.c:816
 msgid "Searching next matching event"
 msgstr "Søker etter neste hendelsen som passer"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:811
+#: ../modules/calendar/e-cal-shell-view-private.c:817
 msgid "Searching previous matching event"
 msgstr "Søker etter forrige hendelse som passer"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:832
+#: ../modules/calendar/e-cal-shell-view-private.c:838
 #, c-format
 msgid "Cannot find matching event in the next %d year"
 msgid_plural "Cannot find matching event in the next %d years"
 msgstr[0] "Kan ikke finne treff på hendelse neste %d år"
 msgstr[1] "Kan ikke finne treff på hendelse de neste %d år"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:836
+#: ../modules/calendar/e-cal-shell-view-private.c:842
 #, c-format
 msgid "Cannot find matching event in the previous %d year"
 msgid_plural "Cannot find matching event in the previous %d years"
 msgstr[0] "Kan ikke finne treff på hendelse forrige %d år"
 msgstr[1] "Kan ikke finne treff på hendelse forrige %d år"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:859
+#: ../modules/calendar/e-cal-shell-view-private.c:865
 msgid "Cannot search with no active calendar"
 msgstr "Kan ikke søke uten en aktiv kalender"
 
@@ -20371,7 +20378,7 @@ msgid "New _Task"
 msgstr "Ny _oppgave"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:340
-#: ../modules/calendar/e-task-shell-backend.c:63
+#: ../modules/calendar/e-task-shell-backend.c:79
 #: ../modules/calendar/e-task-shell-view-actions.c:784
 msgid "Create a new task"
 msgstr "Opprett en ny oppgave"
@@ -20391,26 +20398,26 @@ msgstr "Vis valgt oppgave"
 msgid "Print the selected task"
 msgstr "Skriv ut valgt oppgave"
 
-#: ../modules/calendar/e-memo-shell-backend.c:63
+#: ../modules/calendar/e-memo-shell-backend.c:79
 msgctxt "New"
 msgid "Mem_o"
 msgstr "N_otat"
 
-#: ../modules/calendar/e-memo-shell-backend.c:70
+#: ../modules/calendar/e-memo-shell-backend.c:86
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "_Delt notat"
 
-#: ../modules/calendar/e-memo-shell-backend.c:72
+#: ../modules/calendar/e-memo-shell-backend.c:88
 msgid "Create a new shared memo"
 msgstr "Lag et nytt delt notat"
 
-#: ../modules/calendar/e-memo-shell-backend.c:80
+#: ../modules/calendar/e-memo-shell-backend.c:96
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Notatli_ste"
 
-#: ../modules/calendar/e-memo-shell-backend.c:82
+#: ../modules/calendar/e-memo-shell-backend.c:98
 #: ../modules/calendar/e-memo-shell-view-actions.c:602
 msgid "Create a new memo list"
 msgstr "Lag en ny notatliste"
@@ -20517,26 +20524,26 @@ msgstr[1] "%d notater"
 msgid "%d selected"
 msgstr "%d valgt"
 
-#: ../modules/calendar/e-task-shell-backend.c:61
+#: ../modules/calendar/e-task-shell-backend.c:77
 msgctxt "New"
 msgid "_Task"
 msgstr "_Oppgave"
 
-#: ../modules/calendar/e-task-shell-backend.c:68
+#: ../modules/calendar/e-task-shell-backend.c:84
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Til_delt oppgave"
 
-#: ../modules/calendar/e-task-shell-backend.c:70
+#: ../modules/calendar/e-task-shell-backend.c:86
 msgid "Create a new assigned task"
 msgstr "Opprett en ny tildelt oppgave"
 
-#: ../modules/calendar/e-task-shell-backend.c:78
+#: ../modules/calendar/e-task-shell-backend.c:94
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "_Oppgaveliste"
 
-#: ../modules/calendar/e-task-shell-backend.c:80
+#: ../modules/calendar/e-task-shell-backend.c:96
 #: ../modules/calendar/e-task-shell-view-actions.c:728
 msgid "Create a new task list"
 msgstr "Opprett en ny oppgaveliste"
@@ -20899,12 +20906,12 @@ msgstr "%s har sendt tilbake følgende svar på møteinnkalling:"
 
 #: ../modules/itip-formatter/itip-view.c:442
 #, c-format
-msgid "%s through %s has canceled the following meeting:"
+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
 #, c-format
-msgid "%s has canceled the following meeting:"
+msgid "%s has cancelled the following meeting:"
 msgstr "%s har avlyst følgende møte:"
 
 #: ../modules/itip-formatter/itip-view.c:448
@@ -20990,12 +20997,12 @@ msgstr "%s har sendt tilbake følgende svar på tildelt oppgave:"
 
 #: ../modules/itip-formatter/itip-view.c:532
 #, c-format
-msgid "%s through %s has canceled the following assigned task:"
+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
 #, c-format
-msgid "%s has canceled the following assigned task:"
+msgid "%s has cancelled the following assigned task:"
 msgstr "%s har avlyst følgende tildelt oppgave:"
 
 #: ../modules/itip-formatter/itip-view.c:538
@@ -21040,12 +21047,12 @@ msgstr "%s ønsker å legge til informasjon i et eksisterende notat:"
 
 #: ../modules/itip-formatter/itip-view.c:598
 #, c-format
-msgid "%s through %s has canceled the following shared memo:"
+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
 #, c-format
-msgid "%s has canceled the following shared memo:"
+msgid "%s has cancelled the following shared memo:"
 msgstr "%s har avlyst følgende delt notat:"
 
 #: ../modules/itip-formatter/itip-view.c:674
@@ -21107,7 +21114,7 @@ msgid "_Update Attendee Status"
 msgstr "_Oppdater status for deltaker"
 
 #: ../modules/itip-formatter/itip-view.c:1066
-#: ../smime/gui/certificate-manager.c:1666
+#: ../smime/gui/certificate-manager.c:1679
 msgid "_Update"
 msgstr "_Oppdater"
 
@@ -21157,7 +21164,7 @@ msgid "Sa_ve"
 msgstr "L_agre"
 
 #: ../modules/itip-formatter/itip-view.c:3679
-#: ../modules/itip-formatter/itip-view.c:5151
+#: ../modules/itip-formatter/itip-view.c:5146
 msgid "Attendee status updated"
 msgstr "Deltakerstatus oppdatert"
 
@@ -21195,113 +21202,113 @@ msgstr "Åpner kalender. Vennligst vent …"
 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:4787
+#: ../modules/itip-formatter/itip-view.c:4782
 #, 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:4802
+#: ../modules/itip-formatter/itip-view.c:4797
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Sendt til kalender «%s» som godtatt"
 
-#: ../modules/itip-formatter/itip-view.c:4807
+#: ../modules/itip-formatter/itip-view.c:4802
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Sendt til kalender «%s» som tentativ"
 
-#: ../modules/itip-formatter/itip-view.c:4813
+#: ../modules/itip-formatter/itip-view.c:4808
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Sendt til kalender «%s» som avslått"
 
-#: ../modules/itip-formatter/itip-view.c:4819
+#: ../modules/itip-formatter/itip-view.c:4814
 #, c-format
-msgid "Sent to calendar '%s' as canceled"
+msgid "Sent to calendar '%s' as cancelled"
 msgstr "Sendt til kalender «%s» som avlyst"
 
-#: ../modules/itip-formatter/itip-view.c:4840
-#: ../modules/itip-formatter/itip-view.c:5298
-#: ../modules/itip-formatter/itip-view.c:5404
+#: ../modules/itip-formatter/itip-view.c:4835
+#: ../modules/itip-formatter/itip-view.c:5293
+#: ../modules/itip-formatter/itip-view.c:5399
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "Lagrer endringer i kalender. Vennligst vent …"
 
-#: ../modules/itip-formatter/itip-view.c:4881
+#: ../modules/itip-formatter/itip-view.c:4876
 msgid "Unable to parse item"
 msgstr "Kunne ikke lese oppføring"
 
-#: ../modules/itip-formatter/itip-view.c:5074
+#: ../modules/itip-formatter/itip-view.c:5069
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organisator har fjernet delegat %s"
 
-#: ../modules/itip-formatter/itip-view.c:5091
+#: ../modules/itip-formatter/itip-view.c:5086
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Avlysningsvarsel sendt til delegat"
 
-#: ../modules/itip-formatter/itip-view.c:5095
+#: ../modules/itip-formatter/itip-view.c:5090
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Kunne ikke sende avlysningsmelding til delegaten"
 
-#: ../modules/itip-formatter/itip-view.c:5143
+#: ../modules/itip-formatter/itip-view.c:5138
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Kan ikke oppdatere deltaker. %s"
 
-#: ../modules/itip-formatter/itip-view.c:5187
+#: ../modules/itip-formatter/itip-view.c:5182
 msgid "The meeting is invalid and cannot be updated"
 msgstr "Møtet er ugyldig og kan ikke oppdateres"
 
-#: ../modules/itip-formatter/itip-view.c:5263
+#: ../modules/itip-formatter/itip-view.c:5258
 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:5335
-#: ../modules/itip-formatter/itip-view.c:5374
+#: ../modules/itip-formatter/itip-view.c:5330
+#: ../modules/itip-formatter/itip-view.c:5369
 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:5437
+#: ../modules/itip-formatter/itip-view.c:5432
 msgid "Meeting information sent"
 msgstr "Informasjon om møte sendt"
 
-#: ../modules/itip-formatter/itip-view.c:5442
+#: ../modules/itip-formatter/itip-view.c:5437
 msgid "Task information sent"
 msgstr "Informasjon om oppgave sendt"
 
-#: ../modules/itip-formatter/itip-view.c:5447
+#: ../modules/itip-formatter/itip-view.c:5442
 msgid "Memo information sent"
 msgstr "Informasjon om notat sendt"
 
-#: ../modules/itip-formatter/itip-view.c:5458
+#: ../modules/itip-formatter/itip-view.c:5453
 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:5463
+#: ../modules/itip-formatter/itip-view.c:5458
 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:5468
+#: ../modules/itip-formatter/itip-view.c:5463
 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:5533
+#: ../modules/itip-formatter/itip-view.c:5528
 msgid "calendar.ics"
 msgstr "kalender.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5538
+#: ../modules/itip-formatter/itip-view.c:5533
 msgid "Save Calendar"
 msgstr "Lagre kalender"
 
-#: ../modules/itip-formatter/itip-view.c:5587
-#: ../modules/itip-formatter/itip-view.c:5600
+#: ../modules/itip-formatter/itip-view.c:5582
+#: ../modules/itip-formatter/itip-view.c:5595
 msgid "The calendar attached is not valid"
 msgstr "Vedlagt kalender er ugyldig"
 
-#: ../modules/itip-formatter/itip-view.c:5588
-#: ../modules/itip-formatter/itip-view.c:5601
+#: ../modules/itip-formatter/itip-view.c:5583
+#: ../modules/itip-formatter/itip-view.c:5596
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -21309,15 +21316,15 @@ msgstr ""
 "Meldingen påstår at den inneholder en kalender, men kalenderen er ikke en "
 "gyldig iCalendar."
 
-#: ../modules/itip-formatter/itip-view.c:5643
-#: ../modules/itip-formatter/itip-view.c:5673
-#: ../modules/itip-formatter/itip-view.c:5774
+#: ../modules/itip-formatter/itip-view.c:5638
+#: ../modules/itip-formatter/itip-view.c:5668
+#: ../modules/itip-formatter/itip-view.c:5769
 msgid "The item in the calendar is not valid"
 msgstr "Oppføringen i kalenderen er ikke gyldig"
 
-#: ../modules/itip-formatter/itip-view.c:5644
-#: ../modules/itip-formatter/itip-view.c:5674
-#: ../modules/itip-formatter/itip-view.c:5775
+#: ../modules/itip-formatter/itip-view.c:5639
+#: ../modules/itip-formatter/itip-view.c:5669
+#: ../modules/itip-formatter/itip-view.c:5770
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -21325,11 +21332,11 @@ msgstr ""
 "Meldingen inneholder en kalender, men kalenderen inneholder ingen hendelser, "
 "oppgaver eller ledig/opptatt-informasjon"
 
-#: ../modules/itip-formatter/itip-view.c:5689
+#: ../modules/itip-formatter/itip-view.c:5684
 msgid "The calendar attached contains multiple items"
 msgstr "Vedlagt kalender inneholder flere oppføringer"
 
-#: ../modules/itip-formatter/itip-view.c:5690
+#: ../modules/itip-formatter/itip-view.c:5685
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -21337,24 +21344,24 @@ msgstr ""
 "Du må lagre filen og importere kalenderen for å prosessere alle disse "
 "oppføringene"
 
-#: ../modules/itip-formatter/itip-view.c:6193
+#: ../modules/itip-formatter/itip-view.c:6188
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ingen"
 
-#: ../modules/itip-formatter/itip-view.c:6209
+#: ../modules/itip-formatter/itip-view.c:6204
 msgid "Tentatively Accepted"
 msgstr "Akseptert tentativt"
 
-#: ../modules/itip-formatter/itip-view.c:6369
+#: ../modules/itip-formatter/itip-view.c:6364
 msgid "This meeting recurs"
 msgstr "Dettee møtet gjeninntreffer"
 
-#: ../modules/itip-formatter/itip-view.c:6372
+#: ../modules/itip-formatter/itip-view.c:6367
 msgid "This task recurs"
 msgstr "Denne oppgaven gjeninntreffer"
 
-#: ../modules/itip-formatter/itip-view.c:6375
+#: ../modules/itip-formatter/itip-view.c:6370
 msgid "This memo recurs"
 msgstr "Dette notatet gjeninntreffer"
 
@@ -21372,19 +21379,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:261
+#: ../modules/mail-config/e-mail-config-google-summary.c:265
 msgid "Google Features"
 msgstr "Google funksjoner"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:270
+#: ../modules/mail-config/e-mail-config-google-summary.c:274
 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:279
+#: ../modules/mail-config/e-mail-config-google-summary.c:283
 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:288
+#: ../modules/mail-config/e-mail-config-google-summary.c:292
 msgid "You may need to enable IMAP access"
 msgstr "Du må kanskje slå på IMAP-tilgang"
 
@@ -21445,42 +21452,47 @@ msgstr "Velg en køkatalog for mbox"
 msgid "Mbox spool directory cannot be empty"
 msgstr "Mbox e-postkatalog kan ikke være tom"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:137
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:197
 #: ../modules/mail-config/e-mail-config-sendmail-backend.c:61
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:93
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:153
 #: ../modules/plugin-manager/evolution-plugin-manager.c:158
 msgid "Configuration"
 msgstr "Konfigurasjon"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:155
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:111
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:215
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:171
 #: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_Server:"
 msgstr "Tj_ener:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:169
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:124
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:229
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:184
 msgid "_Port:"
 msgstr "_Port:"
 
 #. do not reference
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:190
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:252
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:250
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:312
 msgid "User_name:"
 msgstr "Bruker_navn:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:223
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:173
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:264
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:326
+msgid "_Forget password"
+msgstr "_Glem passord"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:290
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:233
 msgid "Encryption _method:"
 msgstr "Krypterings_metode:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:238
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:188
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:305
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:248
 msgid "STARTTLS after connecting"
 msgstr "STARTTLS etter tilkobling"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:242
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:192
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:309
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:252
 msgid "TLS on a dedicated port"
 msgstr "TLS på en dedikert port"
 
@@ -21519,23 +21531,23 @@ msgid "Custom binary cannot be empty"
 msgstr "Egendefinert kjørbar fil kan ikke være tom"
 
 #. do not reference
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:145
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:205
 msgid "Ser_ver requires authentication"
 msgstr "Tjener kre_ver autentisering"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:234
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:294
 msgid "T_ype:"
 msgstr "T_ype:"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:245
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:251
 msgid "Yahoo! Features"
 msgstr "Yahoo!-funksjoner"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:254
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:260
 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:440
+#: ../modules/mail/e-mail-attachment-handler.c:605
 #, c-format
 msgid "%d attached message"
 msgid_plural "%d attached messages"
@@ -21569,25 +21581,63 @@ msgstr "E-post_mappe"
 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
+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
+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
+msgctxt "NetworkMonitor"
+msgid "networkmanager"
+msgstr "networkmanager"
+
+#: ../modules/mail/e-mail-shell-backend.c:725
+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
+msgctxt "NetworkMonitor"
+msgid "Default"
+msgstr "Forvalgt"
+
+#. Always as the last
+#: ../modules/mail/e-mail-shell-backend.c:748
+msgctxt "NetworkMonitor"
+msgid "Always Online"
+msgstr "Alltid tilkoblet"
+
+#: ../modules/mail/e-mail-shell-backend.c:808
 msgid "Mail Accounts"
 msgstr "E-post-konti"
 
-#: ../modules/mail/e-mail-shell-backend.c:696
+#: ../modules/mail/e-mail-shell-backend.c:817
 msgid "Mail Preferences"
 msgstr "Brukervalg for e-post"
 
-#: ../modules/mail/e-mail-shell-backend.c:705
+#: ../modules/mail/e-mail-shell-backend.c:826
 msgid "Composer Preferences"
 msgstr "Brukervalg for redigering"
 
-#: ../modules/mail/e-mail-shell-backend.c:715
+#: ../modules/mail/e-mail-shell-backend.c:835
 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:1007
+#: ../modules/mail/e-mail-shell-backend.c:1127
 msgctxt "label"
 msgid "None"
 msgstr "Ingen"
@@ -22075,13 +22125,13 @@ msgstr "Din melding til %s om «%s» den %s er har blitt lest."
 msgid "Delivery Notification for \"%s\""
 msgstr "Varsling om levering for «%s»"
 
-#: ../modules/mdn/evolution-mdn.c:531
+#: ../modules/mdn/evolution-mdn.c:534
 #, c-format
 msgid "Send a read receipt to '%s'"
 msgstr "Send en lesekvittering til «%s»"
 
 #. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:536
+#: ../modules/mdn/evolution-mdn.c:539
 msgid "_Notify Sender"
 msgstr "Varsle avse_nder"
 
@@ -22273,7 +22323,7 @@ msgstr "Søppelfilter bruker SpamAssassin"
 
 #. Keep the title identical to EMailConfigImportPage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/startup-wizard/e-mail-config-import-page.c:260
+#: ../modules/startup-wizard/e-mail-config-import-page.c:270
 #: ../modules/startup-wizard/e-mail-config-import-progress-page.c:339
 msgid "Importing Files"
 msgstr "Importerer filer"
@@ -22569,7 +22619,7 @@ msgid "_Do not show this message again."
 msgstr "Ikke vis _denne meldingen igjen."
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:484
-#: ../plugins/templates/templates.c:478
+#: ../plugins/templates/templates.c:495
 msgid "Keywords"
 msgstr "Nøkkelord"
 
@@ -22725,7 +22775,7 @@ msgid "Key"
 msgstr "Nøkkel"
 
 #: ../plugins/email-custom-header/email-custom-header.c:879
-#: ../plugins/templates/templates.c:487
+#: ../plugins/templates/templates.c:504
 msgid "Values"
 msgstr "Verdier"
 
@@ -23443,7 +23493,7 @@ msgid "_Username:"
 msgstr "Br_ukernavn:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:29
-#: ../smime/gui/certificate-manager.c:774
+#: ../smime/gui/certificate-manager.c:787
 msgid "_Password:"
 msgstr "_Passord:"
 
@@ -23593,6 +23643,10 @@ msgstr "Lagre valgt notatliste til disk"
 msgid "Save the selected task list to disk"
 msgstr "Lagre valgt oppgaveliste til disk"
 
+#: ../plugins/templates/e-templates-store.c:117
+msgid "No Title"
+msgstr "Ingen tittel"
+
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid ""
 "Drafts based template plugin. You can use variables like $ORIG[subject], "
@@ -23603,51 +23657,51 @@ 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:1245
-msgid "No Title"
-msgstr "Ingen tittel"
+#: ../plugins/templates/templates.c:1247
+msgid "Saving message template"
+msgstr "Lagrer melding som mal"
 
-#: ../plugins/templates/templates.c:1354
+#: ../plugins/templates/templates.c:1268
 msgid "Save as _Template"
 msgstr "Lagre som _mal"
 
-#: ../plugins/templates/templates.c:1356
+#: ../plugins/templates/templates.c:1270
 msgid "Save as Template"
 msgstr "Lagre som mal"
 
-#: ../shell/e-shell.c:380
+#: ../shell/e-shell.c:381
 msgid "Preparing to go offline..."
 msgstr "Forbereder frakoblet bruk …"
 
-#: ../shell/e-shell.c:409
+#: ../shell/e-shell.c:410
 msgid "Preparing to go online..."
 msgstr "Forbereder tilkoblet bruk …"
 
-#: ../shell/e-shell.c:520
+#: ../shell/e-shell.c:521
 msgid "Preparing to quit"
 msgstr "Forbereder å avslutte"
 
-#: ../shell/e-shell.c:526
+#: ../shell/e-shell.c:527
 msgid "Preparing to quit..."
 msgstr "Forbereder å avslutte …"
 
-#: ../shell/e-shell.c:1043
+#: ../shell/e-shell.c:1044
 msgid "Credentials are required to connect to the destination host."
 msgstr "Påloggingsinformasjon kreves for å koble til målverten."
 
-#: ../shell/e-shell.c:1211 ../shell/e-shell-window-actions.c:827
+#: ../shell/e-shell.c:1212 ../shell/e-shell-window-actions.c:827
 msgid "New _Window"
 msgstr "Nytt _vindu"
 
-#: ../shell/e-shell.c:1222
+#: ../shell/e-shell.c:1223
 msgid "Quick _Reference"
 msgstr "Hu_rtigreferanse"
 
-#: ../shell/e-shell.c:1224 ../shell/e-shell-window-actions.c:764
+#: ../shell/e-shell.c:1225 ../shell/e-shell-window-actions.c:764
 msgid "_About"
 msgstr "_Om"
 
-#: ../shell/e-shell.c:1225 ../shell/e-shell-window-actions.c:862
+#: ../shell/e-shell.c:1226 ../shell/e-shell-window-actions.c:862
 msgid "_Quit"
 msgstr "A_vslutt"
 
@@ -24302,7 +24356,7 @@ msgstr "MD5-fingeravtrykk"
 msgid "Email Address"
 msgstr "E-post_adresse"
 
-#: ../smime/gui/certificate-manager.c:652
+#: ../smime/gui/certificate-manager.c:665
 msgid "Select a file to backup your key and certificate..."
 msgstr "Velg en fil for sikkerhetskopiering av nøkkel og sertifikat …"
 
@@ -24311,31 +24365,31 @@ msgstr "Velg en fil for sikkerhetskopiering av nøkkel og sertifikat …"
 #. * when a user wants to backup one of her/his private keys/certificates.
 #. * For example: gnomedev-backup.p12
 #.
-#: ../smime/gui/certificate-manager.c:664
+#: ../smime/gui/certificate-manager.c:677
 #, c-format
 msgid "%s-backup.p12"
 msgstr "%s-sikkerhetskopi.p12"
 
-#: ../smime/gui/certificate-manager.c:730
+#: ../smime/gui/certificate-manager.c:743
 msgid "Backup Certificate"
 msgstr "Sikkerhetskopi av sertifikat"
 
 #. filename selection
-#: ../smime/gui/certificate-manager.c:744
+#: ../smime/gui/certificate-manager.c:757
 msgid "_File name:"
 msgstr "_Filnavn:"
 
 #. FIXME when gtk_file_chooser_button allows GTK_FILE_CHOOSER_ACTION_SAVE use it
-#: ../smime/gui/certificate-manager.c:749
+#: ../smime/gui/certificate-manager.c:762
 msgid "Please select a file..."
 msgstr "Velg en fil …"
 
-#: ../smime/gui/certificate-manager.c:763
+#: ../smime/gui/certificate-manager.c:776
 msgid "_Include certificate chain in the backup"
 msgstr "_Inkluder sertifikatkjeden i sikkerhetskopien"
 
 #. To Translators: this text was copied from Firefox
-#: ../smime/gui/certificate-manager.c:769
+#: ../smime/gui/certificate-manager.c:782
 msgid ""
 "The certificate backup password you set here protects the backup file that "
 "you are about to create.\n"
@@ -24345,16 +24399,16 @@ msgstr ""
 "sikkerhetskopifilen du holder på å lage.\n"
 "Du må sette dette passordet for å fortsette med sikkerhetskopieringen."
 
-#: ../smime/gui/certificate-manager.c:788
+#: ../smime/gui/certificate-manager.c:801
 msgid "_Repeat Password:"
 msgstr "_Gjenta passord:"
 
-#: ../smime/gui/certificate-manager.c:807
+#: ../smime/gui/certificate-manager.c:820
 msgid "Passwords do not match"
 msgstr "Passordene er ikke like"
 
 #. To Translators: this text was copied from Firefox
-#: ../smime/gui/certificate-manager.c:815
+#: ../smime/gui/certificate-manager.c:828
 msgid ""
 "Important:\n"
 "If you forget your certificate backup password, you will not be able to "
@@ -24366,92 +24420,92 @@ msgstr ""
 "kunne gjenopprette denne sikkerhetskopien senere.\n"
 "Vennligst lagre det på en trygg plass."
 
-#: ../smime/gui/certificate-manager.c:860
+#: ../smime/gui/certificate-manager.c:873
 msgid "No file name provided"
 msgstr "Filnavn ble ikke oppgitt"
 
-#: ../smime/gui/certificate-manager.c:864
+#: ../smime/gui/certificate-manager.c:877
 msgid "Failed to backup key and certificate"
 msgstr "Klarte ikke å sikkerhetskopiere nøkkel og sertifikat"
 
-#: ../smime/gui/certificate-manager.c:953
+#: ../smime/gui/certificate-manager.c:966
 msgid "Select a certificate to import..."
 msgstr "Velg et sertifikat som skal importeres …"
 
-#: ../smime/gui/certificate-manager.c:1003
+#: ../smime/gui/certificate-manager.c:1016
 msgid "Failed to import certificate"
 msgstr "Klarte ikke å importere sertifikat"
 
-#: ../smime/gui/certificate-manager.c:1119
+#: ../smime/gui/certificate-manager.c:1132
 msgctxt "CamelTrust"
 msgid "Ask when used"
 msgstr "Spør når det blir brukt"
 
-#: ../smime/gui/certificate-manager.c:1121
+#: ../smime/gui/certificate-manager.c:1134
 msgctxt "CamelTrust"
 msgid "Never"
 msgstr "Aldri"
 
-#: ../smime/gui/certificate-manager.c:1123
+#: ../smime/gui/certificate-manager.c:1136
 msgctxt "CamelTrust"
 msgid "Marginally"
 msgstr "Marginalt"
 
-#: ../smime/gui/certificate-manager.c:1125
+#: ../smime/gui/certificate-manager.c:1138
 msgctxt "CamelTrust"
 msgid "Fully"
 msgstr "Fullstendig"
 
-#: ../smime/gui/certificate-manager.c:1127
+#: ../smime/gui/certificate-manager.c:1140
 msgctxt "CamelTrust"
 msgid "Ultimately"
 msgstr "Ultimat"
 
-#: ../smime/gui/certificate-manager.c:1129
+#: ../smime/gui/certificate-manager.c:1142
 msgctxt "CamelTrust"
 msgid "Temporarily"
 msgstr "Midlertidig"
 
-#: ../smime/gui/certificate-manager.c:1335
+#: ../smime/gui/certificate-manager.c:1348
 msgid "Change certificate trust"
 msgstr "Endre klarering for sertifikat"
 
-#: ../smime/gui/certificate-manager.c:1347
+#: ../smime/gui/certificate-manager.c:1360
 #, c-format
 msgid "Change trust for the host '%s':"
 msgstr "Endre klarering for vert «%s»:"
 
-#: ../smime/gui/certificate-manager.c:1371
+#: ../smime/gui/certificate-manager.c:1384
 msgctxt "CamelTrust"
 msgid "_Ask when used"
 msgstr "Spør når det _blir brukt"
 
-#: ../smime/gui/certificate-manager.c:1372
+#: ../smime/gui/certificate-manager.c:1385
 msgctxt "CamelTrust"
 msgid "_Never trust this certificate"
 msgstr "_Aldri stol på dette sertifikatet"
 
-#: ../smime/gui/certificate-manager.c:1373
+#: ../smime/gui/certificate-manager.c:1386
 msgctxt "CamelTrust"
 msgid "_Temporarily trusted (this session only)"
 msgstr "Midler_tidig klarering (kun denne økten)"
 
-#: ../smime/gui/certificate-manager.c:1374
+#: ../smime/gui/certificate-manager.c:1387
 msgctxt "CamelTrust"
 msgid "_Marginally trusted"
 msgstr "_Marginal klarering"
 
-#: ../smime/gui/certificate-manager.c:1375
+#: ../smime/gui/certificate-manager.c:1388
 msgctxt "CamelTrust"
 msgid "_Fully trusted"
 msgstr "_Full klarering"
 
-#: ../smime/gui/certificate-manager.c:1376
+#: ../smime/gui/certificate-manager.c:1389
 msgctxt "CamelTrust"
 msgid "_Ultimately trusted"
 msgstr "_Ultimat klarering"
 
-#: ../smime/gui/certificate-manager.c:1380
+#: ../smime/gui/certificate-manager.c:1393
 msgid ""
 "Before trusting this site, you should examine its certificate and its policy "
 "and procedures (if available)."
@@ -24459,43 +24513,43 @@ msgstr ""
 "Før du stoler på dette nettstedet bør du undersøke sertifikatet og dets "
 "regelsett og prosedyrer (hvis tilgjengelig)."
 
-#: ../smime/gui/certificate-manager.c:1395
+#: ../smime/gui/certificate-manager.c:1408
 msgid "_Display certificate"
 msgstr "_Vis sertifikat"
 
-#: ../smime/gui/certificate-manager.c:1600
+#: ../smime/gui/certificate-manager.c:1613
 msgid "You have certificates on file that identify these mail servers:"
 msgstr "Du har sertifikater som identifiserer disse e-posttjenerene på lager:"
 
-#: ../smime/gui/certificate-manager.c:1631
+#: ../smime/gui/certificate-manager.c:1644
 msgid "Host name"
 msgstr "Vertsnavn"
 
-#: ../smime/gui/certificate-manager.c:1633
+#: ../smime/gui/certificate-manager.c:1646
 msgid "Issuer"
 msgstr "Utsteder"
 
-#: ../smime/gui/certificate-manager.c:1634
+#: ../smime/gui/certificate-manager.c:1647
 msgid "Fingerprint"
 msgstr "Fingeravtrykk"
 
-#: ../smime/gui/certificate-manager.c:1635
+#: ../smime/gui/certificate-manager.c:1648
 msgid "Trust"
 msgstr "Tillit"
 
-#: ../smime/gui/certificate-manager.c:1656
+#: ../smime/gui/certificate-manager.c:1669
 msgid "_Edit Trust"
 msgstr "R_ediger tillit"
 
-#: ../smime/gui/certificate-manager.c:1977
+#: ../smime/gui/certificate-manager.c:2123
 msgid "All PKCS12 files"
 msgstr "Alle PKCS12-filer"
 
-#: ../smime/gui/certificate-manager.c:1994
+#: ../smime/gui/certificate-manager.c:2140
 msgid "All email certificate files"
 msgstr "Alle sertifikatfiler for e-post"
 
-#: ../smime/gui/certificate-manager.c:2011
+#: ../smime/gui/certificate-manager.c:2157
 msgid "All CA certificate files"
 msgstr "Alle CA-sertifikatfiler"
 


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