[evolution/wip/webkit2] Updated Swedish translation



commit ff4616634d6911a17fa2d4cb32d13ccc6938c9e8
Author: Anders Jonsson <anders jonsson norsjovallen se>
Date:   Thu Jul 16 22:01:23 2015 +0000

    Updated Swedish translation

 po/sv.po | 4887 +++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 2804 insertions(+), 2083 deletions(-)
---
diff --git a/po/sv.po b/po/sv.po
index 3971cbc..e5118e1 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -21,8 +21,8 @@ msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution&keywords=I18N+L10N&component=Miscellaneous\n"
-"POT-Creation-Date: 2015-03-16 09:38+0000\n"
-"PO-Revision-Date: 2015-03-07 23:29+0100\n"
+"POT-Creation-Date: 2015-07-16 16:31+0000\n"
+"PO-Revision-Date: 2015-07-04 00:25+0100\n"
 "Last-Translator: Anders Jonsson <anders jonsson norsjovallen se>\n"
 "Language-Team: Swedish <tp-sv listor tp-sv se>\n"
 "Language: sv\n"
@@ -30,7 +30,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.7.3\n"
+"X-Generator: Poedit 1.8.1\n"
 
 #: ../addressbook/addressbook.error.xml.h:1
 msgid "This address book could not be opened."
@@ -210,8 +210,8 @@ msgstr ""
 #: ../e-util/e-name-selector-dialog.c:995 ../e-util/filter.ui.h:16
 #: ../mail/e-mail-account-manager.c:718 ../mail/e-mail-label-manager.c:373
 #: ../mail/em-vfolder-editor-rule.c:396 ../mail/em-vfolder-editor-rule.c:625
-#: ../mail/mail-config.ui.h:54 ../modules/mail/em-composer-prefs.c:416
-#: ../plugins/attachment-reminder/attachment-reminder.c:557
+#: ../mail/mail-config.ui.h:55 ../modules/mail/em-composer-prefs.c:417
+#: ../plugins/attachment-reminder/attachment-reminder.c:438
 #: ../plugins/email-custom-header/email-custom-header.c:839
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
 #: ../plugins/templates/templates.c:453
@@ -251,7 +251,7 @@ msgstr ""
 "lägga till den ändå?"
 
 #: ../addressbook/addressbook.error.xml.h:41
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1250
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1252
 msgid "Failed to delete contact"
 msgstr "Misslyckades med att ta bort kontakt"
 
@@ -288,9 +288,9 @@ msgstr ""
 "adressbok."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:722
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:744
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3087
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:727
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:749
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Contact Editor"
 msgstr "Kontaktredigerare"
 
@@ -357,7 +357,7 @@ msgstr "_Webbsida:"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 #: ../calendar/gui/dialogs/event-page.c:709
 #: ../calendar/gui/dialogs/event-page.ui.h:25
-#: ../modules/itip-formatter/itip-view.c:1908
+#: ../modules/itip-formatter/itip-view.c:1907
 msgid "_Calendar:"
 msgstr "_Kalender:"
 
@@ -374,7 +374,7 @@ msgid "Home Page:"
 msgstr "Webbsida:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
-#: ../modules/cal-config-google/e-cal-config-google.c:93
+#: ../modules/cal-config-google/e-cal-config-google.c:92
 msgid "Calendar:"
 msgstr "Kalender:"
 
@@ -446,7 +446,8 @@ msgstr "_Jubileum:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:875
-#: ../calendar/gui/e-calendar-view.c:1996
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:47
+#: ../calendar/gui/e-calendar-view.c:2001
 msgid "Anniversary"
 msgstr "Jubileum"
 
@@ -457,7 +458,8 @@ msgstr "Jubileum"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:874
-#: ../calendar/gui/e-calendar-view.c:1995 ../shell/main.c:127
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:46
+#: ../calendar/gui/e-calendar-view.c:2000 ../shell/main.c:127
 msgid "Birthday"
 msgstr "Födelsedag"
 
@@ -514,7 +516,7 @@ msgstr "Arbete"
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:83
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:512
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:909
-#: ../calendar/gui/e-cal-model.c:3034
+#: ../calendar/gui/e-cal-model.c:3791
 msgid "Other"
 msgstr "Annat"
 
@@ -527,23 +529,80 @@ msgid "Notes"
 msgstr "Anteckningar"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:52
-#: ../calendar/gui/dialogs/comp-editor.c:1249
-#: ../calendar/gui/dialogs/comp-editor.c:1335
+msgid "Add _PGP"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:53
+msgid "Add _X.509"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:54
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:23
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:21
+#: ../calendar/gui/dialogs/task-page.ui.h:31 ../e-util/e-attachment-view.c:475
+#: ../e-util/e-filter-rule.c:225 ../e-util/e-mail-signature-manager.c:367
+#: ../e-util/e-name-selector-dialog.c:999 ../e-util/filter.ui.h:18
+#: ../mail/e-mail-label-manager.c:391 ../mail/em-filter-rule.c:440
+#: ../mail/em-vfolder-editor-rule.c:630 ../mail/mail-config.ui.h:56
+#: ../plugins/attachment-reminder/attachment-reminder.c:448
+#: ../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
+msgid "_Remove"
+msgstr "_Ta bort"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:55
+msgid "Load P_GP"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:56
+msgid "_Load X.509"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:57
+#: ../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/dialogs/comp-editor.c:1305
+#: ../composer/e-composer-actions.c:215 ../composer/e-composer-actions.c:355
+#: ../e-util/e-attachment-store.c:636
+#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3230
+#: ../e-util/gal-view-instance-save-as-dialog.c:270
+#: ../shell/e-shell-content.c:660 ../shell/e-shell-utils.c:135
+#: ../smime/gui/certificate-manager.c:655
+#: ../smime/gui/certificate-manager.c:732
+msgid "_Save"
+msgstr "_Spara"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:58
+#: ../modules/addressbook/e-book-shell-backend.c:314
+msgid "Certificates"
+msgstr "Certifikat"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:59
+#: ../calendar/gui/dialogs/comp-editor.c:1277
+#: ../calendar/gui/dialogs/comp-editor.c:1363
 #: ../e-util/e-preferences-window.c:379 ../e-util/e-send-options.ui.h:41
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
 #: ../shell/e-shell-window-actions.c:1085
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:53
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15 ../mail/mail-config.ui.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:60
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15 ../mail/mail-config.ui.h:36
 msgid "Options"
 msgstr "Alternativ"
 
 #. This is only shown if the EActivity has a GCancellable.
 #. no flags
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:54
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3683
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:61
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3273
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3506
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4321
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:222
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
 #: ../addressbook/gui/contact-editor/fullname.ui.h:14
@@ -551,164 +610,221 @@ msgstr "Alternativ"
 #: ../addressbook/gui/widgets/eab-contact-merging.c:474
 #: ../addressbook/gui/widgets/eab-contact-merging.c:718
 #: ../addressbook/gui/widgets/eab-gui-util.c:318
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1332
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:15
-#: ../calendar/gui/dialogs/recurrence-page.c:2322
-#: ../composer/e-composer-actions.c:267 ../e-util/e-activity-bar.c:340
+#: ../calendar/gui/dialogs/recurrence-page.c:2326
+#: ../composer/e-composer-actions.c:214 ../e-util/e-activity-bar.c:340
 #: ../e-util/e-attachment-dialog.c:311 ../e-util/e-attachment-store.c:491
-#: ../e-util/e-attachment-store.c:635 ../e-util/e-attachment-view.c:370
+#: ../e-util/e-attachment-store.c:635 ../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:608 ../e-util/e-html-editor-actions.c:702
+#: ../e-util/e-html-editor-actions.c:616 ../e-util/e-html-editor-actions.c:711
 #: ../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
 #: ../e-util/e-rule-editor.c:282 ../e-util/e-rule-editor.c:776
 #: ../e-util/e-send-options.ui.h:42 ../e-util/e-source-config-dialog.c:379
-#: ../e-util/e-source-selector-dialog.c:350 ../e-util/e-table-config.c:548
+#: ../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:3131
+#: ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3229
 #: ../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-send-recv.c:738
-#: ../mail/mail-send-recv.c:820 ../mail/mail-vfolder-ui.c:148
+#: ../mail/mail-config.ui.h:2 ../mail/mail-send-recv.c:743
+#: ../mail/mail-send-recv.c:825 ../mail/mail-vfolder-ui.c:148
 #: ../mail/mail-vfolder-ui.c:270
-#: ../modules/backup-restore/evolution-backup-tool.c:900
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:363
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:363
+#: ../modules/backup-restore/evolution-backup-tool.c:899
 #: ../modules/calendar/e-cal-attachment-handler.c:285
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
-#: ../plugins/face/face.c:291
-#: ../plugins/publish-calendar/publish-calendar.c:806
+#: ../plugins/face/face.c:297
+#: ../plugins/publish-calendar/publish-calendar.c:790
 #: ../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:70
-#: ../shell/e-shell-utils.c:134 ../smime/gui/certificate-manager.c:652
-#: ../smime/gui/certificate-manager.c:729
-#: ../smime/gui/certificate-manager.c:953
-#: ../smime/gui/certificate-manager.c:1335 ../smime/gui/e-cert-selector.c:237
+#: ../shell/e-shell-utils.c:134 ../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
 #: ../smime/gui/smime-ui.ui.h:23
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:55
-#: ../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/dialogs/comp-editor.c:1277
-#: ../composer/e-composer-actions.c:268 ../composer/e-composer-actions.c:408
-#: ../e-util/e-attachment-store.c:636
-#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3132
-#: ../e-util/gal-view-instance-save-as-dialog.c:270
-#: ../shell/e-shell-content.c:660 ../shell/e-shell-utils.c:135
-#: ../smime/gui/certificate-manager.c:653
-#: ../smime/gui/certificate-manager.c:730
-msgid "_Save"
-msgstr "_Spara"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:56
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:62
 msgid "Show Telephone"
 msgstr "Visa telefon"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:57
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:63
 msgid "Show SIP Address"
 msgstr "Visa SIP-adress"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:58
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:64
 msgid "Show Instant Messaging"
 msgstr "Visa snabbmeddelanden"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:59
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:65
 msgid "Show Web Addresses"
 msgstr "Visa webbadresser"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:60
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:66
 msgid "Show Job section"
 msgstr "Visa jobbdel"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:61
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:67
 msgid "Show Miscellaneous"
 msgstr "Visa diverse"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:62
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:68
 msgid "Show Home Mailing Address"
 msgstr "Visa postadress hem"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:63
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:69
 msgid "Show Work Mailing Address"
 msgstr "Visa postadress arbete"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:64
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:70
 msgid "Show Other Mailing Address"
 msgstr "Visa annan postadress"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:65
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:71
 msgid "Show Notes"
 msgstr "Visa anteckningar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:257
-#: ../calendar/gui/dialogs/comp-editor.c:1298
-#: ../e-util/e-html-editor-actions.c:1123
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:72
+#, fuzzy
+#| msgid "Certificates"
+msgid "Show Certificates"
+msgstr "Certifikat"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:262
+#: ../calendar/gui/dialogs/comp-editor.c:1326
+#: ../e-util/e-html-editor-actions.c:1134
 msgid "_Undo"
 msgstr "_Ångra"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
-#: ../calendar/gui/dialogs/comp-editor.c:1300 ../e-util/e-focus-tracker.c:122
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:264
+#: ../calendar/gui/dialogs/comp-editor.c:1328 ../e-util/e-focus-tracker.c:122
 msgid "Undo"
 msgstr "Ångra"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:264
-#: ../calendar/gui/dialogs/comp-editor.c:1305
-#: ../e-util/e-html-editor-actions.c:1109
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:269
+#: ../calendar/gui/dialogs/comp-editor.c:1333
+#: ../e-util/e-html-editor-actions.c:1120
 msgid "_Redo"
 msgstr "_Gör om"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
-#: ../calendar/gui/dialogs/comp-editor.c:1307 ../e-util/e-focus-tracker.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:271
+#: ../calendar/gui/dialogs/comp-editor.c:1335 ../e-util/e-focus-tracker.c:138
 msgid "Redo"
 msgstr "Gör om"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
 #: ../addressbook/gui/widgets/eab-gui-util.c:503
 msgid "Error adding contact"
 msgstr "Fel vid tillägg av kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:323
 msgid "Error modifying contact"
 msgstr "Fel vid ändring av kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:343
 msgid "Error removing contact"
 msgstr "Fel vid borttagning av kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:738
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3081
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:743
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3104
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontaktredigerare - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3680
-msgid "Please select an image for this contact"
-msgstr "Välj en bild för denna kontakt"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3240
+#, fuzzy
+#| msgid "Certificates"
+msgid "X.509 certificates"
+msgstr "Certifikat"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3245
+msgid "PGP keys"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3251
+#: ../smime/gui/certificate-manager.c:678
+#: ../smime/gui/certificate-manager.c:967
+msgid "All files"
+msgstr "Alla filer"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3684
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3271
+#, fuzzy
+#| msgid "OpenPGP _Key ID:"
+msgid "Open PGP key"
+msgstr "OpenPGP-_nyckelid:"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3271
+#, fuzzy
+#| msgid "Select certificate"
+msgid "Open X.509 certificate"
+msgstr "Välj certifikat"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3274
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4322
 #: ../e-util/e-attachment-store.c:489 ../e-util/e-category-editor.c:146
-#: ../e-util/e-html-editor-actions.c:609 ../e-util/e-html-editor-actions.c:703
-#: ../e-util/e-image-chooser-dialog.c:174 ../plugins/face/face.c:292
-#: ../shell/e-shell-utils.c:71 ../smime/gui/certificate-manager.c:954
+#: ../e-util/e-html-editor-actions.c:617 ../e-util/e-html-editor-actions.c:712
+#: ../e-util/e-image-chooser-dialog.c:174 ../plugins/face/face.c:298
+#: ../shell/e-shell-utils.c:71 ../smime/gui/certificate-manager.c:956
 msgid "_Open"
 msgstr "_Öppna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3685
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3291
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3522
+#, fuzzy
+#| msgid "Choose an iCalendar file"
+msgid "Chosen file is not a local file."
+msgstr "Välj en iCalendar-fil"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3304
+#, fuzzy, c-format
+#| msgid "Failed to import certificate"
+msgid "Failed to load certificate: %s"
+msgstr "Misslyckades med att importera certifikatet"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3333
+msgctxt "cert-kind"
+msgid "X.509"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3333
+msgctxt "cert-kind"
+msgid "PGP"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3504
+msgid "Save PGP key"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3504
+#, fuzzy
+#| msgid "Select certificate"
+msgid "Save X.509 certificate"
+msgstr "Välj certifikat"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3534
+#, fuzzy, c-format
+#| msgid "Failed to import certificate"
+msgid "Failed to save certificate: %s"
+msgstr "Misslyckades med att importera certifikatet"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4318
+msgid "Please select an image for this contact"
+msgstr "Välj en bild för denna kontakt"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4323
 msgid "_No image"
 msgstr "_Ingen bild"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4034
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4672
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -716,28 +832,28 @@ msgstr ""
 "Data för kontakten är ogiltiga:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4040
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4678
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "”%s” har ett ogiltigt format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4048
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4686
 #, c-format
 msgid "'%s' cannot be a future date"
 msgstr "”%s” får inte vara ett datum i framtiden"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4056
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4694
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s”%s” har ett ogiltigt format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4069
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4083
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4707
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4721
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s”%s” är tom"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4098
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4736
 msgid "Invalid contact."
 msgstr "Ogiltig kontakt."
 
@@ -748,15 +864,15 @@ msgstr "Ogiltig kontakt."
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:3
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
-#: ../calendar/gui/dialogs/recurrence-page.c:2323
+#: ../calendar/gui/dialogs/recurrence-page.c:2327
 #: ../e-util/e-attachment-dialog.c:313 ../e-util/e-categories-dialog.c:83
 #: ../e-util/e-category-editor.c:209 ../e-util/e-charset-combo-box.c:102
 #: ../e-util/e-color-chooser-widget.c:128 ../e-util/e-filter-datespec.c:292
-#: ../e-util/e-html-editor-link-dialog.c:381 ../e-util/e-passwords.c:471
+#: ../e-util/e-html-editor-link-dialog.c:436 ../e-util/e-passwords.c:471
 #: ../e-util/e-rule-context.c:816 ../e-util/e-rule-editor.c:181
 #: ../e-util/e-rule-editor.c:283 ../e-util/e-rule-editor.c:777
 #: ../e-util/e-send-options.ui.h:43 ../e-util/e-source-config-dialog.c:380
-#: ../e-util/e-source-selector-dialog.c:351 ../e-util/e-table-config.c:549
+#: ../e-util/e-source-selector-dialog.c:373 ../e-util/e-table-config.c:549
 #: ../e-util/e-table-config.ui.h:3 ../e-util/e-timezone-dialog.ui.h:3
 #: ../mail/e-mail-config-window.c:331 ../mail/e-mail-tag-editor.c:243
 #: ../mail/em-folder-selector.c:43 ../mail/mail-config.ui.h:3
@@ -765,7 +881,7 @@ msgstr "Ogiltig 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:168 ../smime/gui/certificate-manager.c:1336
+#: ../shell/main.c:168 ../smime/gui/certificate-manager.c:1338
 #: ../smime/gui/e-cert-selector.c:238 ../smime/gui/smime-ui.ui.h:24
 msgid "_OK"
 msgstr "_OK"
@@ -889,23 +1005,6 @@ msgstr "Lägg till e-post till listan"
 msgid "Remove an email address from the List"
 msgstr "Ta bort e-postadresser från listan"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:23
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:21
-#: ../calendar/gui/dialogs/task-page.ui.h:31 ../e-util/e-attachment-view.c:424
-#: ../e-util/e-filter-rule.c:225 ../e-util/e-mail-signature-manager.c:367
-#: ../e-util/e-name-selector-dialog.c:999 ../e-util/filter.ui.h:18
-#: ../mail/e-mail-label-manager.c:391 ../mail/em-filter-rule.c:440
-#: ../mail/em-vfolder-editor-rule.c:630 ../mail/mail-config.ui.h:55
-#: ../plugins/attachment-reminder/attachment-reminder.c:567
-#: ../plugins/email-custom-header/email-custom-header.c:849
-#: ../plugins/publish-calendar/publish-calendar.c:807
-#: ../plugins/publish-calendar/publish-calendar.ui.h:34
-#: ../plugins/templates/templates.c:463
-msgid "_Remove"
-msgstr "_Ta bort"
-
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:11
 msgid "Insert email addresses from Address Book"
 msgstr "Infoga e-postadresser från adressboken"
@@ -985,22 +1084,22 @@ msgid "Copy _Email Address"
 msgstr "Kopiera _e-postadress"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:151
-#: ../e-util/e-web-view.c:307
+#: ../e-util/e-web-view.c:338
 msgid "Copy the email address to the clipboard"
 msgstr "Kopiera e-postadressen till urklipp"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:156
-#: ../e-util/e-web-view.c:312
+#: ../e-util/e-web-view.c:350
 msgid "_Send New Message To..."
 msgstr "_Skicka nytt meddelande till…"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:158
-#: ../e-util/e-web-view.c:314
+#: ../e-util/e-web-view.c:352
 msgid "Send a mail message to this address"
 msgstr "Skicka ett e-postmeddelande till denna adress"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../e-util/e-web-view.c:999
+#: ../e-util/e-web-view.c:1064
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klicka för att skicka e-post till %s"
@@ -1098,7 +1197,7 @@ msgstr "Videochatt"
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:827
 #: ../e-util/e-send-options.c:546
 #: ../modules/calendar/e-cal-shell-view-actions.c:181
-#: ../modules/calendar/e-cal-shell-view.c:570
+#: ../modules/calendar/e-cal-shell-view.c:572
 #: ../plugins/publish-calendar/publish-calendar.ui.h:21
 msgid "Calendar"
 msgstr "Kalender"
@@ -1351,73 +1450,73 @@ msgstr "Fel vid hämtande av bokvy"
 msgid "Search Interrupted"
 msgstr "Sökning avbröts"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:203
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:221
 msgid "Error modifying card"
 msgstr "Fel vid ändring av kort"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:648
+#: ../addressbook/gui/widgets/e-addressbook-view.c:649
 msgid "Cut selected contacts to the clipboard"
 msgstr "Klipp ut markerade kontakter till urklipp"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:654
+#: ../addressbook/gui/widgets/e-addressbook-view.c:655
 msgid "Copy selected contacts to the clipboard"
 msgstr "Kopiera markerade kontakter till urklipp"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:660
+#: ../addressbook/gui/widgets/e-addressbook-view.c:661
 msgid "Paste contacts from the clipboard"
 msgstr "Klistra in kontakter från urklipp"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:666
+#: ../addressbook/gui/widgets/e-addressbook-view.c:667
 #: ../modules/addressbook/e-book-shell-view-actions.c:995
 msgid "Delete selected contacts"
 msgstr "Ta bort markerade kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:672
+#: ../addressbook/gui/widgets/e-addressbook-view.c:673
 msgid "Select all visible contacts"
 msgstr "Markera alla synliga kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1298
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1300
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Är du säker på att du vill ta bort dessa kontaktlistor?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1302
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1304
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Är du säker på att du vill ta bort denna kontaktlista?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1306
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1308
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Är du säker på att du vill ta bort denna kontaktlista (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1312
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1314
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Är du säker på att du vill ta bort dessa kontakter?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1316
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1318
 msgid "Are you sure you want to delete this contact?"
 msgstr "Är du säker på att du vill ta bort denna kontakt?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1320
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1322
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Är du säker på att du vill ta bort kontakten (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1331
-#: ../calendar/gui/dialogs/comp-editor.c:1242 ../e-util/e-focus-tracker.c:785
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1333
+#: ../calendar/gui/dialogs/comp-editor.c:1270 ../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:1067
 #: ../modules/calendar/e-cal-shell-view-actions.c:1434
 #: ../modules/calendar/e-memo-shell-view-actions.c:635
 #: ../modules/calendar/e-task-shell-view-actions.c:788
-#: ../modules/mail/e-mail-shell-view-actions.c:1621
+#: ../modules/mail/e-mail-shell-view-actions.c:1680
 #: ../shell/e-shell-window-actions.c:943
-#: ../smime/gui/certificate-manager.c:1659 ../smime/gui/smime-ui.ui.h:10
+#: ../smime/gui/certificate-manager.c:1661 ../smime/gui/smime-ui.ui.h:10
 msgid "_Delete"
 msgstr "_Ta bort"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1476
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1480
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -1432,11 +1531,11 @@ msgstr[1] ""
 "Öppna %d kontakter kommer även att öppna %d nya fönster.\n"
 "Vill du verkligen visa alla dessa kontakter?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1484
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1488
 msgid "_Don't Display"
 msgstr "Visa _inte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1485
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1489
 msgid "Display _All Contacts"
 msgstr "Visa _alla kontakter"
 
@@ -1547,7 +1646,7 @@ msgid "Title"
 msgstr "Titel"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../calendar/gui/e-meeting-list-view.c:666
+#: ../calendar/gui/e-meeting-list-view.c:684
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "Roll"
@@ -1611,19 +1710,19 @@ msgstr "Zooma _in"
 
 #. Zoom-out button
 #: ../addressbook/gui/widgets/e-contact-map-window.c:420
-#: ../mail/e-mail-reader.c:2360
+#: ../mail/e-mail-reader.c:2293
 msgid "Zoom _Out"
 msgstr "Zooma _ut"
 
 #. Search button
 #: ../addressbook/gui/widgets/e-contact-map-window.c:450
-#: ../e-util/e-html-editor-actions.c:2102
+#: ../e-util/e-html-editor-actions.c:2113
 #: ../e-util/e-html-editor-find-dialog.c:195
 #: ../shell/e-shell-window-actions.c:1020
 msgid "_Find"
 msgstr "_Sök"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:190
+#: ../addressbook/gui/widgets/e-minicard-view.c:188
 msgid ""
 "\n"
 "\n"
@@ -1633,7 +1732,7 @@ msgstr ""
 "\n"
 "Söker efter kontakterna…"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:191
 msgid ""
 "\n"
 "\n"
@@ -1647,7 +1746,7 @@ msgstr ""
 "\n"
 "eller dubbelklicka här för att skapa en ny kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:196
+#: ../addressbook/gui/widgets/e-minicard-view.c:194
 msgid ""
 "\n"
 "\n"
@@ -1661,7 +1760,7 @@ msgstr ""
 "\n"
 "Dubbelklicka här för att skapa en ny kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:200
+#: ../addressbook/gui/widgets/e-minicard-view.c:198
 msgid ""
 "\n"
 "\n"
@@ -1671,7 +1770,7 @@ msgstr ""
 "\n"
 "Sök efter kontakten."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:202
+#: ../addressbook/gui/widgets/e-minicard-view.c:200
 msgid ""
 "\n"
 "\n"
@@ -1915,17 +2014,18 @@ msgstr[1] "timmar"
 #. * (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/alarm-notify/alarm-notify-dialog.c:131
-#: ../calendar/gui/dialogs/recurrence-page.c:1249
+#: ../calendar/gui/dialogs/recurrence-page.c:1253
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dag"
 msgstr[1] "dagar"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:343
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:358
 msgid "Start time"
 msgstr "Starttid"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:1
+#: ../calendar/alarm-notify/alarm-queue.c:1913
 msgid "Appointments"
 msgstr "Möten"
 
@@ -1939,15 +2039,15 @@ msgstr "_Slumra"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:4
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1321
+#: ../calendar/gui/dialogs/comp-editor.c:1349
 #: ../calendar/gui/dialogs/event-page.ui.h:24
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:20
 #: ../calendar/gui/dialogs/task-page.ui.h:32
-#: ../e-util/e-html-editor-actions.c:1132
+#: ../e-util/e-html-editor-actions.c:1143
 #: ../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:170
-#: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:59
-#: ../plugins/attachment-reminder/attachment-reminder.c:562
+#: ../mail/e-mail-account-manager.c:727 ../mail/e-mail-browser.c:171
+#: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:60
+#: ../plugins/attachment-reminder/attachment-reminder.c:443
 #: ../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:1071
@@ -1964,9 +2064,9 @@ msgid "_Dismiss"
 msgstr "S_täng"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/alarm-notify/alarm-queue.c:1844
-#: ../calendar/alarm-notify/alarm-queue.c:1854
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:249
+#: ../calendar/alarm-notify/alarm-queue.c:1877
+#: ../calendar/alarm-notify/alarm-queue.c:1887
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:248
 #: ../modules/itip-formatter/itip-view.c:1516
 #: ../modules/itip-formatter/itip-view.c:1627
 msgid "Location:"
@@ -2005,49 +2105,48 @@ msgstr "timmar"
 msgid "minutes"
 msgstr "minuter"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1687
-#: ../calendar/alarm-notify/alarm-queue.c:1824
+#: ../calendar/alarm-notify/alarm-queue.c:1703
+#: ../calendar/alarm-notify/alarm-queue.c:1857
 msgid "No summary available."
 msgstr "Ingen sammanfattning finns tillgänglig."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1696
-#: ../calendar/alarm-notify/alarm-queue.c:1698
+#: ../calendar/alarm-notify/alarm-queue.c:1712
+#: ../calendar/alarm-notify/alarm-queue.c:1714
 msgid "No description available."
 msgstr "Ingen beskrivning finns tillgänglig."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1706
+#: ../calendar/alarm-notify/alarm-queue.c:1722
 msgid "No location information available."
 msgstr "Ingen platsinformation finns tillgänglig."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1711
-#: ../calendar/alarm-notify/alarm-queue.c:1815
-#: ../calendar/alarm-notify/alarm-queue.c:2156
+#: ../calendar/alarm-notify/alarm-queue.c:1727
+#: ../calendar/alarm-notify/alarm-queue.c:1848
+#: ../calendar/alarm-notify/alarm-queue.c:2203
 msgid "Evolution Reminders"
 msgstr "Påminnelser för Evolution"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1755
+#: ../calendar/alarm-notify/alarm-queue.c:1771
 #, c-format
 msgid "You have %d reminder"
 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:1974
+#: ../calendar/alarm-notify/alarm-queue.c:2021
 msgid "Warning"
 msgstr "Varning"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1975 ../mail/mail-dialogs.ui.h:21
-#: ../mail/mail.error.xml.h:139
+#: ../calendar/alarm-notify/alarm-queue.c:2022 ../mail/mail-dialogs.ui.h:21
 #: ../modules/mailto-handler/evolution-mailto-handler.c:114
 msgid "_No"
 msgstr "_Nej"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1976 ../mail/mail.error.xml.h:138
+#: ../calendar/alarm-notify/alarm-queue.c:2023
 #: ../modules/mailto-handler/evolution-mailto-handler.c:115
 msgid "_Yes"
 msgstr "_Ja"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1980
+#: ../calendar/alarm-notify/alarm-queue.c:2027
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2064,7 +2163,7 @@ msgstr ""
 "\n"
 "Är du säker på att du vill köra detta program?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1995
+#: ../calendar/alarm-notify/alarm-queue.c:2042
 msgid "Do not ask me about this program again."
 msgstr "Fråga mig inte om detta program igen."
 
@@ -2736,24 +2835,24 @@ msgstr "är inte"
 
 #. To Translators: This is task classification
 #: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/dialogs/task-page.ui.h:2
-#: ../calendar/gui/e-cal-list-view.c:246 ../calendar/gui/e-cal-model.c:278
-#: ../calendar/gui/e-cal-model.c:285 ../calendar/gui/e-task-table.c:498
+#: ../calendar/gui/e-cal-list-view.c:246 ../calendar/gui/e-cal-model.c:306
+#: ../calendar/gui/e-cal-model.c:313 ../calendar/gui/e-task-table.c:498
 #: ../calendar/gui/memotypes.xml.h:10
 msgid "Public"
 msgstr "Publikt"
 
 #. To Translators: This is task classification
 #: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/dialogs/task-page.ui.h:4
-#: ../calendar/gui/e-cal-list-view.c:247 ../calendar/gui/e-cal-model.c:287
+#: ../calendar/gui/e-cal-list-view.c:247 ../calendar/gui/e-cal-model.c:315
 #: ../calendar/gui/e-task-table.c:499 ../calendar/gui/memotypes.xml.h:11
 msgid "Private"
 msgstr "Privat"
 
 #. To Translators: This is task classification
 #: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/dialogs/task-page.ui.h:6
-#: ../calendar/gui/e-cal-list-view.c:248 ../calendar/gui/e-cal-model.c:289
+#: ../calendar/gui/e-cal-list-view.c:248 ../calendar/gui/e-cal-model.c:317
 #: ../calendar/gui/e-task-table.c:500 ../calendar/gui/memotypes.xml.h:12
-#: ../e-util/e-html-editor-page-dialog.c:116 ../e-util/e-send-options.ui.h:7
+#: ../e-util/e-html-editor-page-dialog.c:117 ../e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "Konfidentiellt"
 
@@ -2770,7 +2869,7 @@ msgstr "Deltagare"
 
 #: ../calendar/gui/caltypes.xml.h:14
 #: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:14
-#: ../plugins/publish-calendar/publish-calendar.c:903
+#: ../plugins/publish-calendar/publish-calendar.c:862
 #: ../plugins/publish-calendar/publish-calendar.ui.h:22
 #: ../plugins/save-calendar/csv-format.c:389
 msgid "Location"
@@ -2784,20 +2883,20 @@ msgstr "Kategori"
 #: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:53
 #: ../em-format/e-mail-formatter-print-headers.c:157
-#: ../mail/filtertypes.xml.in.h:46 ../mail/searchtypes.xml.in.h:48
-#: ../mail/vfoldertypes.xml.in.h:49
+#: ../mail/filtertypes.xml.in.h:45 ../mail/searchtypes.xml.in.h:47
+#: ../mail/vfoldertypes.xml.in.h:48
 msgid "Attachments"
 msgstr "Bilagor"
 
 #: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/filtertypes.xml.in.h:47
-#: ../mail/searchtypes.xml.in.h:49 ../mail/vfoldertypes.xml.in.h:50
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/filtertypes.xml.in.h:46
+#: ../mail/searchtypes.xml.in.h:48 ../mail/vfoldertypes.xml.in.h:49
 msgid "Exist"
 msgstr "finns"
 
 #: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/filtertypes.xml.in.h:48
-#: ../mail/searchtypes.xml.in.h:50 ../mail/vfoldertypes.xml.in.h:51
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/filtertypes.xml.in.h:47
+#: ../mail/searchtypes.xml.in.h:49 ../mail/vfoldertypes.xml.in.h:50
 msgid "Do Not Exist"
 msgstr "finns inte"
 
@@ -2996,138 +3095,138 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Du har inte gjort några ändringar, uppdatera redigeraren?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:271
+#: ../calendar/gui/dialogs/comp-editor.c:299
 msgid "Could not save attachments"
 msgstr "Kunde inte spara bilagor"
 
-#: ../calendar/gui/dialogs/comp-editor.c:625
+#: ../calendar/gui/dialogs/comp-editor.c:653
 msgid "Could not update object"
 msgstr "Kunde inte uppdatera objekt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:759
+#: ../calendar/gui/dialogs/comp-editor.c:787
 msgid "Edit Appointment"
 msgstr "Redigera möte"
 
-#: ../calendar/gui/dialogs/comp-editor.c:766
+#: ../calendar/gui/dialogs/comp-editor.c:794
 #, c-format
 msgid "Meeting - %s"
 msgstr "Sammanträde - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:768
+#: ../calendar/gui/dialogs/comp-editor.c:796
 #, c-format
 msgid "Appointment - %s"
 msgstr "Möte - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:774
+#: ../calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tilldelad uppgift - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:776
+#: ../calendar/gui/dialogs/comp-editor.c:804
 #, c-format
 msgid "Task - %s"
 msgstr "Uppgift - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:781
+#: ../calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Memo - %s"
 msgstr "Memo - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:797
+#: ../calendar/gui/dialogs/comp-editor.c:825
 msgid "No Summary"
 msgstr "Ingen sammanfattning"
 
-#: ../calendar/gui/dialogs/comp-editor.c:918
+#: ../calendar/gui/dialogs/comp-editor.c:946
 msgid "Keep original item?"
 msgstr "Behåll ursprungligt objekt?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1081
 #: ../calendar/gui/dialogs/comp-editor.c:1109
+#: ../calendar/gui/dialogs/comp-editor.c:1137
 msgid "Unable to synchronize with the server"
 msgstr "Kunde inte synkronisera med servern"
 
 #. == Button box ==
-#: ../calendar/gui/dialogs/comp-editor.c:1221
+#: ../calendar/gui/dialogs/comp-editor.c:1249
 #: ../calendar/gui/dialogs/event-editor.c:116
 #: ../calendar/gui/dialogs/event-editor.c:310
 #: ../calendar/gui/dialogs/event-page.ui.h:29
-#: ../composer/e-composer-actions.c:387 ../e-util/e-html-editor-dialog.c:196
+#: ../composer/e-composer-actions.c:334 ../e-util/e-html-editor-dialog.c:196
 #: ../e-util/e-mail-signature-editor.c:295
 #: ../e-util/e-name-selector-dialog.c:551 ../e-util/e-preferences-window.c:388
-#: ../e-util/e-table-field-chooser-dialog.c:207 ../mail/e-mail-browser.c:126
-#: ../mail/em-folder-properties.c:418 ../mail/em-subscription-editor.c:1714
+#: ../e-util/e-table-field-chooser-dialog.c:207 ../mail/e-mail-browser.c:127
+#: ../mail/em-folder-properties.c:688 ../mail/em-subscription-editor.c:1716
 #: ../modules/plugin-manager/evolution-plugin-manager.c:256
 #: ../shell/e-shell-window-actions.c:342 ../shell/e-shell-window-actions.c:908
-#: ../smime/gui/certificate-manager.c:2064
+#: ../smime/gui/certificate-manager.c:2066
 msgid "_Close"
 msgstr "S_täng"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1223
+#: ../calendar/gui/dialogs/comp-editor.c:1251
 msgid "Close the current window"
 msgstr "Stäng aktuellt fönster"
 
 #. copy menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1228 ../e-util/e-focus-tracker.c:775
-#: ../e-util/e-html-editor-actions.c:1088 ../e-util/e-text.c:2089
-#: ../e-util/e-web-view.c:339 ../mail/e-mail-browser.c:133
-#: ../shell/e-shell-window-actions.c:929
+#: ../calendar/gui/dialogs/comp-editor.c:1256 ../e-util/e-focus-tracker.c:775
+#: ../e-util/e-html-editor-actions.c:1099 ../e-util/e-text.c:2109
+#: ../e-util/e-web-view.c:377 ../mail/e-mail-browser.c:134
+#: ../mail/mail.error.xml.h:138 ../shell/e-shell-window-actions.c:929
 msgid "_Copy"
 msgstr "_Kopiera"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1230 ../e-util/e-focus-tracker.c:175
+#: ../calendar/gui/dialogs/comp-editor.c:1258 ../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:341
-#: ../e-util/e-web-view.c:1328 ../mail/e-mail-browser.c:135
+#: ../e-util/e-focus-tracker.c:776 ../e-util/e-web-view.c:379
+#: ../e-util/e-web-view.c:1415 ../mail/e-mail-browser.c:136
 #: ../shell/e-shell-window-actions.c:931
 msgid "Copy the selection"
 msgstr "Kopiera markeringen"
 
 #. cut menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1235 ../e-util/e-focus-tracker.c:770
-#: ../e-util/e-html-editor-actions.c:1095 ../e-util/e-text.c:2075
-#: ../mail/e-mail-browser.c:140 ../shell/e-shell-window-actions.c:936
+#: ../calendar/gui/dialogs/comp-editor.c:1263 ../e-util/e-focus-tracker.c:770
+#: ../e-util/e-html-editor-actions.c:1106 ../e-util/e-text.c:2095
+#: ../mail/e-mail-browser.c:141 ../shell/e-shell-window-actions.c:936
 msgid "Cu_t"
 msgstr "Klipp _ut"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1237 ../e-util/e-focus-tracker.c:168
+#: ../calendar/gui/dialogs/comp-editor.c:1265 ../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:1322
-#: ../mail/e-mail-browser.c:142 ../shell/e-shell-window-actions.c:938
+#: ../e-util/e-focus-tracker.c:771 ../e-util/e-web-view.c:1409
+#: ../mail/e-mail-browser.c:143 ../shell/e-shell-window-actions.c:938
 msgid "Cut the selection"
 msgstr "Klipp ut markeringen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1244 ../e-util/e-focus-tracker.c:189
+#: ../calendar/gui/dialogs/comp-editor.c:1272 ../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:945
 msgid "Delete the selection"
 msgstr "Ta bort markeringen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1251
+#: ../calendar/gui/dialogs/comp-editor.c:1279
 msgid "View help"
 msgstr "Visa hjälp"
 
 #. paste menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1256 ../e-util/e-focus-tracker.c:780
-#: ../e-util/e-html-editor-actions.c:1102 ../e-util/e-text.c:2101
-#: ../mail/e-mail-browser.c:147 ../shell/e-shell-window-actions.c:964
+#: ../calendar/gui/dialogs/comp-editor.c:1284 ../e-util/e-focus-tracker.c:780
+#: ../e-util/e-html-editor-actions.c:1113 ../e-util/e-text.c:2121
+#: ../mail/e-mail-browser.c:148 ../shell/e-shell-window-actions.c:964
 msgid "_Paste"
 msgstr "K_listra in"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1258 ../e-util/e-focus-tracker.c:182
+#: ../calendar/gui/dialogs/comp-editor.c:1286 ../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:1334
-#: ../mail/e-mail-browser.c:149 ../shell/e-shell-window-actions.c:966
+#: ../e-util/e-focus-tracker.c:781 ../e-util/e-web-view.c:1421
+#: ../mail/e-mail-browser.c:150 ../shell/e-shell-window-actions.c:966
 msgid "Paste the clipboard"
 msgstr "Klistra in från urklipp"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1263
-#: ../composer/e-composer-actions.c:441 ../mail/e-mail-reader.c:2262
+#: ../calendar/gui/dialogs/comp-editor.c:1291
+#: ../composer/e-composer-actions.c:388 ../mail/e-mail-reader.c:2195
 #: ../modules/addressbook/e-book-shell-view-actions.c:1205
 #: ../modules/addressbook/e-book-shell-view-actions.c:1219
 msgid "_Print..."
 msgstr "Skriv _ut…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1270 ../mail/e-mail-reader.c:2269
+#: ../calendar/gui/dialogs/comp-editor.c:1298 ../mail/e-mail-reader.c:2202
 #: ../modules/addressbook/e-book-shell-view-actions.c:1212
 #: ../modules/calendar/e-cal-shell-view-actions.c:1642
 #: ../modules/calendar/e-memo-shell-view-actions.c:764
@@ -3135,162 +3234,162 @@ msgstr "Skriv _ut…"
 msgid "Pre_view..."
 msgstr "Förhands_visning…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1279
+#: ../calendar/gui/dialogs/comp-editor.c:1307
 msgid "Save current changes"
 msgstr "Spara aktuella ändringar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1284
+#: ../calendar/gui/dialogs/comp-editor.c:1312
 #: ../e-util/e-mail-signature-editor.c:304
 msgid "Save and Close"
 msgstr "Spara och stäng"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1286
+#: ../calendar/gui/dialogs/comp-editor.c:1314
 msgid "Save current changes and close editor"
 msgstr "Spara aktuella förändringar och stäng redigerare"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1291 ../e-util/e-focus-tracker.c:790
-#: ../e-util/e-html-editor-actions.c:1116 ../e-util/e-web-view.c:349
-#: ../mail/e-mail-browser.c:154 ../shell/e-shell-window-actions.c:1041
+#: ../calendar/gui/dialogs/comp-editor.c:1319 ../e-util/e-focus-tracker.c:790
+#: ../e-util/e-html-editor-actions.c:1127 ../e-util/e-web-view.c:387
+#: ../mail/e-mail-browser.c:155 ../shell/e-shell-window-actions.c:1041
 msgid "Select _All"
 msgstr "Markera _alla"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1293 ../e-util/e-focus-tracker.c:196
+#: ../calendar/gui/dialogs/comp-editor.c:1321 ../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:156 ../shell/e-shell-window-actions.c:1043
+#: ../mail/e-mail-browser.c:157 ../shell/e-shell-window-actions.c:1043
 msgid "Select all text"
 msgstr "Markera all text"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1314
+#: ../calendar/gui/dialogs/comp-editor.c:1342
 msgid "_Classification"
 msgstr "_Klassificering"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1328
-#: ../e-util/e-html-editor-actions.c:1139
-#: ../e-util/e-mail-signature-editor.c:309 ../mail/e-mail-browser.c:163
+#: ../calendar/gui/dialogs/comp-editor.c:1356
+#: ../e-util/e-html-editor-actions.c:1150
+#: ../e-util/e-mail-signature-editor.c:309 ../mail/e-mail-browser.c:164
 #: ../shell/e-shell-window-actions.c:1078
 msgid "_File"
 msgstr "_Arkiv"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1342
-#: ../e-util/e-html-editor-actions.c:1160
+#: ../calendar/gui/dialogs/comp-editor.c:1370
+#: ../e-util/e-html-editor-actions.c:1171
 msgid "_Insert"
 msgstr "_Infoga"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1349
-#: ../composer/e-composer-actions.c:431
+#: ../calendar/gui/dialogs/comp-editor.c:1377
+#: ../composer/e-composer-actions.c:378
 msgid "_Options"
 msgstr "A_lternativ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1356
-#: ../e-util/e-html-editor-actions.c:1181 ../mail/e-mail-browser.c:177
+#: ../calendar/gui/dialogs/comp-editor.c:1384
+#: ../e-util/e-html-editor-actions.c:1192 ../mail/e-mail-browser.c:178
 #: ../shell/e-shell-window-actions.c:1121
-#: ../smime/gui/certificate-manager.c:1649 ../smime/gui/smime-ui.ui.h:5
+#: ../smime/gui/certificate-manager.c:1651 ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "_Visa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1366
-#: ../composer/e-composer-actions.c:380
+#: ../calendar/gui/dialogs/comp-editor.c:1394
+#: ../composer/e-composer-actions.c:327
 msgid "_Attachment..."
 msgstr "_Bilaga…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1368
-#: ../composer/e-composer-actions.c:382 ../e-util/e-attachment-view.c:412
+#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../composer/e-composer-actions.c:329 ../e-util/e-attachment-view.c:463
 msgid "Attach a file"
 msgstr "Bifoga en fil"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1376
+#: ../calendar/gui/dialogs/comp-editor.c:1404
 msgid "_Categories"
 msgstr "_Kategorier"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1378
+#: ../calendar/gui/dialogs/comp-editor.c:1406
 msgid "Toggles whether to display categories"
 msgstr "Växlar huruvida kategorier ska visas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1384
+#: ../calendar/gui/dialogs/comp-editor.c:1412
 msgid "Time _Zone"
 msgstr "Tids_zon"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1386
+#: ../calendar/gui/dialogs/comp-editor.c:1414
 msgid "Toggles whether the time zone is displayed"
 msgstr "Växlar huruvida tidszonen ska visas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1395
+#: ../calendar/gui/dialogs/comp-editor.c:1423
 msgid "Pu_blic"
 msgstr "Pu_blikt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1397
+#: ../calendar/gui/dialogs/comp-editor.c:1425
 msgid "Classify as public"
 msgstr "Klassificera som publik"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1402
+#: ../calendar/gui/dialogs/comp-editor.c:1430
 msgid "_Private"
 msgstr "_Privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1404
+#: ../calendar/gui/dialogs/comp-editor.c:1432
 msgid "Classify as private"
 msgstr "Klassificera som privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1409
+#: ../calendar/gui/dialogs/comp-editor.c:1437
 msgid "_Confidential"
 msgstr "_Konfidentiellt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1411
+#: ../calendar/gui/dialogs/comp-editor.c:1439
 msgid "Classify as confidential"
 msgstr "Klassificera som konfidentiell"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1419
+#: ../calendar/gui/dialogs/comp-editor.c:1447
 msgid "R_ole Field"
 msgstr "_Rollfältet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1421
+#: ../calendar/gui/dialogs/comp-editor.c:1449
 msgid "Toggles whether the Role field is displayed"
 msgstr "Växlar huruvida rollfältet ska visas"
 
 # RSVP borde kanske förklaras med en kommentar?
 # http://bugzilla.ximian.com/show_bug.cgi?id=61071
-#: ../calendar/gui/dialogs/comp-editor.c:1427
+#: ../calendar/gui/dialogs/comp-editor.c:1455
 msgid "_RSVP"
 msgstr "_OSA"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1429
+#: ../calendar/gui/dialogs/comp-editor.c:1457
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Växlar huruvida OSA-fältet ska visas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1435
+#: ../calendar/gui/dialogs/comp-editor.c:1463
 msgid "_Status Field"
 msgstr "_Statusfält"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1437
+#: ../calendar/gui/dialogs/comp-editor.c:1465
 msgid "Toggles whether the Status field is displayed"
 msgstr "Växlar huruvida statusfältet ska visas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1443
+#: ../calendar/gui/dialogs/comp-editor.c:1471
 msgid "_Type Field"
 msgstr "_Typfält"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1445
+#: ../calendar/gui/dialogs/comp-editor.c:1473
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Växlar huruvida Deltagartyp ska visas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2232
-#: ../composer/e-composer-actions.c:665
+#: ../calendar/gui/dialogs/comp-editor.c:2596
+#: ../composer/e-composer-actions.c:612
 msgid "Attach"
 msgstr "Bifoga"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2563
-#: ../calendar/gui/dialogs/comp-editor.c:2773
-#: ../calendar/gui/dialogs/comp-editor.c:3786
+#: ../calendar/gui/dialogs/comp-editor.c:2926
+#: ../calendar/gui/dialogs/comp-editor.c:3512
+#: ../calendar/gui/dialogs/comp-editor.c:4525
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Ändringar som görs i detta objekt kan komma att kastas om en uppdatering "
 "kommer"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3748
+#: ../calendar/gui/dialogs/comp-editor.c:4487
 #: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:121
 msgid "attachment"
 msgstr "bilaga"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3818
+#: ../calendar/gui/dialogs/comp-editor.c:4557
 msgid "Unable to use current version!"
 msgstr "Kan inte använda aktuell version!"
 
@@ -3300,7 +3399,7 @@ msgid "Validation error: %s"
 msgstr "Valideringsfel: %s"
 
 #: ../calendar/gui/dialogs/copy-source-dialog.c:129
-#: ../calendar/gui/e-cal-ops.c:1940
+#: ../calendar/gui/e-cal-ops.c:1968
 msgid "Destination is read only"
 msgstr "Målet är skrivskyddat"
 
@@ -3418,7 +3517,7 @@ msgstr ""
 "Evenemanget kan inte redigeras fullständigt eftersom du inte är organisatören"
 
 #: ../calendar/gui/dialogs/event-page.c:650
-#: ../calendar/gui/dialogs/event-page.c:3178
+#: ../calendar/gui/dialogs/event-page.c:3180
 msgid "This event has reminders"
 msgstr "Detta evenemang har påminnelser"
 
@@ -3472,33 +3571,33 @@ msgstr "_Delegater"
 msgid "Atte_ndees"
 msgstr "Delta_gare"
 
-#: ../calendar/gui/dialogs/event-page.c:3458
+#: ../calendar/gui/dialogs/event-page.c:3460
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d dag före möte"
 msgstr[1] "%d dagar före möte"
 
-#: ../calendar/gui/dialogs/event-page.c:3464
+#: ../calendar/gui/dialogs/event-page.c:3466
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d timme före möte"
 msgstr[1] "%d timmar före möte"
 
-#: ../calendar/gui/dialogs/event-page.c:3470
+#: ../calendar/gui/dialogs/event-page.c:3472
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minut före möte"
 msgstr[1] "%d minuter före möte"
 
-#: ../calendar/gui/dialogs/event-page.c:3491
+#: ../calendar/gui/dialogs/event-page.c:3493
 msgid "Custom"
 msgstr "Anpassad"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3498
+#: ../calendar/gui/dialogs/event-page.c:3500
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "Ingen"
@@ -3542,7 +3641,7 @@ msgstr "_Plats:"
 #: ../calendar/gui/dialogs/task-page.ui.h:29
 #: ../e-util/e-attachment-dialog.c:356
 #: ../e-util/e-html-editor-image-dialog.c:558
-#: ../e-util/e-html-editor-link-dialog.c:367
+#: ../e-util/e-html-editor-link-dialog.c:422
 msgid "_Description:"
 msgstr "_Beskrivning:"
 
@@ -3565,7 +3664,7 @@ msgstr "Evenemangsbeskrivning"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:26
 #: ../calendar/gui/dialogs/task-page.ui.h:33
-#: ../calendar/gui/e-meeting-time-sel.c:549
+#: ../calendar/gui/e-meeting-time-sel.c:555
 msgid "Atte_ndees..."
 msgstr "D_eltagare…"
 
@@ -3652,7 +3751,7 @@ msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr ""
 "Memot kan inte redigeras fullständigt eftersom du inte är organisatören"
 
-#: ../calendar/gui/dialogs/memo-page.c:1166
+#: ../calendar/gui/dialogs/memo-page.c:1168
 #: ../em-format/e-mail-formatter-utils.c:202
 #: ../em-format/e-mail-formatter-utils.c:219
 #: ../em-format/e-mail-part-headers.c:48 ../mail/message-list.etspec.h:9
@@ -3727,17 +3826,17 @@ msgstr "Alla instanser"
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Detta möte har upprepningsregler som inte kan redigeras med Evolution."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1001
+#: ../calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Recurrence date is invalid"
 msgstr "Upprepningsdatumet är ogiltigt"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
+#: ../calendar/gui/dialogs/recurrence-page.c:1049
 msgid "End time of the recurrence was before event's start"
 msgstr "Sluttiden för upprepningen var före evenemangets starttid"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] 
[forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day 
always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:1074
+#: ../calendar/gui/dialogs/recurrence-page.c:1078
 msgid "on"
 msgstr "på"
 
@@ -3745,7 +3844,7 @@ msgstr "på"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1155
+#: ../calendar/gui/dialogs/recurrence-page.c:1159
 msgid "first"
 msgstr "första"
 
@@ -3755,7 +3854,7 @@ msgstr "första"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1161
+#: ../calendar/gui/dialogs/recurrence-page.c:1165
 msgid "second"
 msgstr "sekund"
 
@@ -3763,7 +3862,7 @@ msgstr "sekund"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1166
+#: ../calendar/gui/dialogs/recurrence-page.c:1170
 msgid "third"
 msgstr "tredje"
 
@@ -3771,7 +3870,7 @@ msgstr "tredje"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1171
+#: ../calendar/gui/dialogs/recurrence-page.c:1175
 msgid "fourth"
 msgstr "fjärde"
 
@@ -3779,7 +3878,7 @@ msgstr "fjärde"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1176
+#: ../calendar/gui/dialogs/recurrence-page.c:1180
 msgid "fifth"
 msgstr "femte"
 
@@ -3787,13 +3886,13 @@ msgstr "femte"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1181
+#: ../calendar/gui/dialogs/recurrence-page.c:1185
 msgid "last"
 msgstr "sista"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] 
[11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1205
+#: ../calendar/gui/dialogs/recurrence-page.c:1209
 msgid "Other Date"
 msgstr "Annat datum"
 
@@ -3801,7 +3900,7 @@ msgstr "Annat datum"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1211
+#: ../calendar/gui/dialogs/recurrence-page.c:1215
 msgid "1st to 10th"
 msgstr "Första till tionde"
 
@@ -3809,7 +3908,7 @@ msgstr "Första till tionde"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1217
+#: ../calendar/gui/dialogs/recurrence-page.c:1221
 msgid "11th to 20th"
 msgstr "elfte till tjugonde"
 
@@ -3817,41 +3916,41 @@ msgstr "elfte till tjugonde"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1223
+#: ../calendar/gui/dialogs/recurrence-page.c:1227
 msgid "21st to 31st"
 msgstr "tjugoförsta till trettioförsta"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1250
+#: ../calendar/gui/dialogs/recurrence-page.c:1254
 #: ../modules/calendar/e-calendar-preferences.ui.h:25
 msgid "Monday"
 msgstr "måndag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1251
+#: ../calendar/gui/dialogs/recurrence-page.c:1255
 #: ../modules/calendar/e-calendar-preferences.ui.h:28
 msgid "Tuesday"
 msgstr "tisdag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1252
+#: ../calendar/gui/dialogs/recurrence-page.c:1256
 #: ../modules/calendar/e-calendar-preferences.ui.h:31
 msgid "Wednesday"
 msgstr "onsdag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1253
+#: ../calendar/gui/dialogs/recurrence-page.c:1257
 #: ../modules/calendar/e-calendar-preferences.ui.h:34
 msgid "Thursday"
 msgstr "torsdag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1254
+#: ../calendar/gui/dialogs/recurrence-page.c:1258
 #: ../modules/calendar/e-calendar-preferences.ui.h:37
 msgid "Friday"
 msgstr "fredag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1255
+#: ../calendar/gui/dialogs/recurrence-page.c:1259
 #: ../modules/calendar/e-calendar-preferences.ui.h:40
 msgid "Saturday"
 msgstr "lördag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1256
+#: ../calendar/gui/dialogs/recurrence-page.c:1260
 #: ../modules/calendar/e-calendar-preferences.ui.h:43
 msgid "Sunday"
 msgstr "söndag"
@@ -3859,31 +3958,31 @@ msgstr "söndag"
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] 
[Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1387
+#: ../calendar/gui/dialogs/recurrence-page.c:1391
 msgid "on the"
 msgstr "den"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1572
+#: ../calendar/gui/dialogs/recurrence-page.c:1576
 msgid "occurrences"
 msgstr "förekomster"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2342
+#: ../calendar/gui/dialogs/recurrence-page.c:2346
 msgid "Add exception"
 msgstr "Lägg till undantag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2384
+#: ../calendar/gui/dialogs/recurrence-page.c:2388
 msgid "Could not get a selection to modify."
 msgstr "Kunde inte få ett val att ändra."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2390
+#: ../calendar/gui/dialogs/recurrence-page.c:2394
 msgid "Modify exception"
 msgstr "Ändra undantag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2436
+#: ../calendar/gui/dialogs/recurrence-page.c:2440
 msgid "Could not get a selection to delete."
 msgstr "Kunde inte få ett val att ta bort."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2577
+#: ../calendar/gui/dialogs/recurrence-page.c:2581
 msgid "Date/Time"
 msgstr "Datum/tid"
 
@@ -4015,7 +4114,7 @@ msgstr "Hög"
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:10
 #: ../calendar/gui/e-cal-component-preview.c:340
-#: ../calendar/gui/e-cal-model.c:1643 ../calendar/gui/e-task-table.c:525
+#: ../calendar/gui/e-cal-model.c:1856 ../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:312
 msgid "Normal"
@@ -4076,7 +4175,7 @@ msgstr "Färdigt"
 #: ../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:3582 ../mail/mail-send-recv.c:958
+#: ../calendar/gui/print.c:3582 ../mail/mail-send-recv.c:963
 msgid "Canceled"
 msgstr "Avbruten"
 
@@ -4335,17 +4434,17 @@ msgstr "Beskrivning:"
 msgid "Web Page:"
 msgstr "Webbsida:"
 
-#: ../calendar/gui/e-cal-data-model.c:1608
+#: ../calendar/gui/e-cal-data-model.c:1625
 #, c-format
 msgid "Creating view for calendar '%s'"
 msgstr "Skapar vy för kalendern ”%s”"
 
-#: ../calendar/gui/e-cal-data-model.c:1612
+#: ../calendar/gui/e-cal-data-model.c:1629
 #, c-format
 msgid "Creating view for task list '%s'"
 msgstr "Skapar vy för uppgiftslistan ”%s”"
 
-#: ../calendar/gui/e-cal-data-model.c:1616
+#: ../calendar/gui/e-cal-data-model.c:1633
 #, c-format
 msgid "Creating view for memo list '%s'"
 msgstr "Skapar vy för memolistan ”%s”"
@@ -4359,7 +4458,7 @@ msgid "Start date"
 msgstr "Startdatum"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:3
-#: ../calendar/gui/e-meeting-list-view.c:652
+#: ../calendar/gui/e-meeting-list-view.c:670
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../calendar/gui/e-memo-table.etspec.h:3
 #: ../e-util/e-attachment-tree-view.c:585
@@ -4371,7 +4470,7 @@ msgstr "Typ"
 msgid "Completion date"
 msgstr "Färdigdatum"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:960
+#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:965
 msgid "Complete"
 msgstr "Färdigt"
 
@@ -4393,8 +4492,8 @@ msgstr "Prioritet"
 #. 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-calendar-table.etspec.h:11
-#: ../calendar/gui/e-cal-model.c:3088
-#: ../calendar/gui/e-meeting-list-view.c:695
+#: ../calendar/gui/e-cal-model.c:3845
+#: ../calendar/gui/e-meeting-list-view.c:713
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../calendar/gui/tasktypes.xml.h:8 ../mail/filtertypes.xml.in.h:34
 #: ../mail/message-list.etspec.h:1 ../mail/searchtypes.xml.in.h:36
@@ -4431,35 +4530,35 @@ msgstr "Klistra in evenemang från urklipp"
 msgid "Delete selected events"
 msgstr "Ta bort markerade evenemang"
 
-#: ../calendar/gui/e-calendar-view.c:810
+#: ../calendar/gui/e-calendar-view.c:811
 msgid "Pasted text doesn't contain valid iCalendar data"
 msgstr "Inklistrad text innehåller inte giltiga iCalendar-data"
 
-#: ../calendar/gui/e-calendar-view.c:821 ../calendar/gui/e-cal-ops.c:1540
+#: ../calendar/gui/e-calendar-view.c:822 ../calendar/gui/e-cal-ops.c:1567
 msgid "Default calendar not found"
 msgstr "Standardkalender hittades inte"
 
-#: ../calendar/gui/e-calendar-view.c:826 ../calendar/gui/e-cal-ops.c:1543
+#: ../calendar/gui/e-calendar-view.c:827 ../calendar/gui/e-cal-ops.c:1570
 msgid "Default memo list not found"
 msgstr "Standardmemolista hittades inte"
 
-#: ../calendar/gui/e-calendar-view.c:831 ../calendar/gui/e-cal-ops.c:1546
+#: ../calendar/gui/e-calendar-view.c:832 ../calendar/gui/e-cal-ops.c:1573
 msgid "Default task list not found"
 msgstr "Standarduppgiftslista hittades inte"
 
-#: ../calendar/gui/e-calendar-view.c:918
+#: ../calendar/gui/e-calendar-view.c:921
 msgid "No suitable component found"
 msgstr "Ingen lämplig komponent hittades"
 
-#: ../calendar/gui/e-calendar-view.c:988
+#: ../calendar/gui/e-calendar-view.c:991
 msgid "Pasting iCalendar data"
 msgstr "Klistrar in 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:1791 ../calendar/gui/e-memo-table.c:495
-#: ../calendar/gui/e-task-table.c:796
+#: ../calendar/gui/e-calendar-view.c:1794 ../calendar/gui/e-memo-table.c:493
+#: ../calendar/gui/e-task-table.c:794
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organisatör: %s <%s>"
@@ -4467,29 +4566,29 @@ msgstr "Organisatör: %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:1795 ../calendar/gui/e-memo-table.c:500
-#: ../calendar/gui/e-task-table.c:800
+#: ../calendar/gui/e-calendar-view.c:1798 ../calendar/gui/e-memo-table.c:498
+#: ../calendar/gui/e-task-table.c:798
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisatör: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1811
-#: ../calendar/gui/e-meeting-time-sel.c:2663 ../calendar/gui/print.c:3527
+#: ../calendar/gui/e-calendar-view.c:1814
+#: ../calendar/gui/e-meeting-time-sel.c:2725 ../calendar/gui/print.c:3527
 #, c-format
 msgid "Location: %s"
 msgstr "Plats: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1851
+#: ../calendar/gui/e-calendar-view.c:1854
 #, c-format
 msgid "Time: %s %s"
 msgstr "Tid: %s %s"
 
-#: ../calendar/gui/e-calendar-view.c:2228
-#: ../calendar/gui/e-calendar-view.c:2235
-#: ../calendar/gui/e-calendar-view.c:2242
-#: ../calendar/gui/e-calendar-view.c:2245
+#: ../calendar/gui/e-calendar-view.c:2233
+#: ../calendar/gui/e-calendar-view.c:2240
+#: ../calendar/gui/e-calendar-view.c:2247
+#: ../calendar/gui/e-calendar-view.c:2250
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -4498,13 +4597,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:2233 ../calendar/gui/e-day-view.c:2943
+#: ../calendar/gui/e-calendar-view.c:2238 ../calendar/gui/e-day-view.c:3052
 #: ../calendar/gui/e-day-view-top-item.c:859
 #: ../calendar/gui/e-week-view-main-item.c:230
 msgid "%d %b"
 msgstr "%d %b"
 
-#: ../calendar/gui/e-calendar-view.c:2255
+#: ../calendar/gui/e-calendar-view.c:2260
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -4514,15 +4613,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:2259 ../calendar/gui/e-day-view.c:2927
+#: ../calendar/gui/e-calendar-view.c:2264 ../calendar/gui/e-day-view.c:3036
 #: ../calendar/gui/e-day-view-top-item.c:855
 #: ../calendar/gui/e-week-view-main-item.c:216
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: ../calendar/gui/e-calendar-view.c:2262
-#: ../calendar/gui/e-calendar-view.c:2268
-#: ../calendar/gui/e-calendar-view.c:2271
+#: ../calendar/gui/e-calendar-view.c:2267
+#: ../calendar/gui/e-calendar-view.c:2273
+#: ../calendar/gui/e-calendar-view.c:2276
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -4535,99 +4634,99 @@ msgstr "Startdatum"
 msgid "End Date"
 msgstr "Slutdatum"
 
-#: ../calendar/gui/e-cal-model.c:291 ../calendar/gui/e-meeting-list-view.c:184
+#: ../calendar/gui/e-cal-model.c:319 ../calendar/gui/e-meeting-list-view.c:184
 #: ../calendar/gui/e-meeting-list-view.c:198
 #: ../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:1250
 #: ../calendar/gui/print.c:1267 ../e-util/e-charset.c:51
-#: ../modules/itip-formatter/itip-view.c:3607
-#: ../modules/itip-formatter/itip-view.c:6197
+#: ../modules/itip-formatter/itip-view.c:3606
+#: ../modules/itip-formatter/itip-view.c:6220
 #: ../modules/plugin-manager/evolution-plugin-manager.c:99
 msgid "Unknown"
 msgstr "Okänd"
 
-#: ../calendar/gui/e-cal-model.c:1183 ../calendar/gui/e-cal-ops.c:586
-#: ../calendar/gui/e-cal-ops.c:1209
+#: ../calendar/gui/e-cal-model.c:1394 ../calendar/gui/e-cal-ops.c:596
+#: ../calendar/gui/e-cal-ops.c:1232
 #: ../modules/calendar/e-cal-base-shell-backend.c:361
 #, c-format
 msgid "Source with UID '%s' not found"
 msgstr "Källa med UID ”%s” hittades inte"
 
-#: ../calendar/gui/e-cal-model.c:1267 ../calendar/gui/e-cal-ops.c:184
-#: ../calendar/gui/e-cal-ops.c:1325
+#: ../calendar/gui/e-cal-model.c:1480 ../calendar/gui/e-cal-ops.c:185
+#: ../calendar/gui/e-cal-ops.c:1349
 msgid "Creating an event"
 msgstr "Skapar ett evenemang"
 
-#: ../calendar/gui/e-cal-model.c:1271 ../calendar/gui/e-cal-ops.c:188
-#: ../calendar/gui/e-cal-ops.c:1329
+#: ../calendar/gui/e-cal-model.c:1484 ../calendar/gui/e-cal-ops.c:189
+#: ../calendar/gui/e-cal-ops.c:1353
 msgid "Creating a memo"
 msgstr "Skapar ett memo"
 
-#: ../calendar/gui/e-cal-model.c:1275 ../calendar/gui/e-cal-ops.c:192
-#: ../calendar/gui/e-cal-ops.c:1333
+#: ../calendar/gui/e-cal-model.c:1488 ../calendar/gui/e-cal-ops.c:193
+#: ../calendar/gui/e-cal-ops.c:1357
 msgid "Creating a task"
 msgstr "Skapar en uppgift"
 
-#: ../calendar/gui/e-cal-model.c:1645
+#: ../calendar/gui/e-cal-model.c:1858
 msgid "Recurring"
 msgstr "Återkommande"
 
-#: ../calendar/gui/e-cal-model.c:1647
+#: ../calendar/gui/e-cal-model.c:1860
 msgid "Assigned"
 msgstr "Tilldelad"
 
-#: ../calendar/gui/e-cal-model.c:1649 ../calendar/gui/e-cal-model-tasks.c:1139
+#: ../calendar/gui/e-cal-model.c:1862 ../calendar/gui/e-cal-model-tasks.c:1139
 #: ../calendar/gui/e-meeting-list-view.c:208
 #: ../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:1649 ../calendar/gui/e-cal-model-tasks.c:1139
+#: ../calendar/gui/e-cal-model.c:1862 ../calendar/gui/e-cal-model-tasks.c:1139
 #: ../calendar/gui/e-meeting-list-view.c:209
 #: ../calendar/gui/e-meeting-store.c:188
 msgid "No"
 msgstr "Nej"
 
-#: ../calendar/gui/e-cal-model.c:3029
+#: ../calendar/gui/e-cal-model.c:3786
 #: ../calendar/gui/e-meeting-list-view.c:220
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../modules/itip-formatter/itip-view.c:6185
+#: ../modules/itip-formatter/itip-view.c:6208
 msgid "Accepted"
 msgstr "Accepterat"
 
-#: ../calendar/gui/e-cal-model.c:3030
+#: ../calendar/gui/e-cal-model.c:3787
 #: ../calendar/gui/e-meeting-list-view.c:221
 #: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../modules/itip-formatter/itip-view.c:6191
+#: ../modules/itip-formatter/itip-view.c:6214
 msgid "Declined"
 msgstr "Avslaget"
 
-#: ../calendar/gui/e-cal-model.c:3031
+#: ../calendar/gui/e-cal-model.c:3788
 #: ../calendar/gui/e-meeting-list-view.c:222
 #: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
-#: ../calendar/gui/e-meeting-time-sel.c:529
+#: ../calendar/gui/e-meeting-time-sel.c:535
 msgid "Tentative"
 msgstr "Preliminärt"
 
-#: ../calendar/gui/e-cal-model.c:3032
+#: ../calendar/gui/e-cal-model.c:3789
 #: ../calendar/gui/e-meeting-list-view.c:223
 #: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
-#: ../modules/itip-formatter/itip-view.c:6194
+#: ../modules/itip-formatter/itip-view.c:6217
 msgid "Delegated"
 msgstr "Delegerat"
 
-#: ../calendar/gui/e-cal-model.c:3033
+#: ../calendar/gui/e-cal-model.c:3790
 msgid "Needs action"
 msgstr "Behöver åtgärd"
 
-#: ../calendar/gui/e-cal-model-calendar.c:123
+#: ../calendar/gui/e-cal-model-calendar.c:151
 #: ../calendar/gui/e-task-table.c:582
 msgid "Free"
 msgstr "Ledig"
 
-#: ../calendar/gui/e-cal-model-calendar.c:126
-#: ../calendar/gui/e-meeting-time-sel.c:530 ../calendar/gui/e-task-table.c:583
+#: ../calendar/gui/e-cal-model-calendar.c:154
+#: ../calendar/gui/e-meeting-time-sel.c:536 ../calendar/gui/e-task-table.c:583
 msgid "Busy"
 msgstr "Upptagen"
 
@@ -4647,166 +4746,166 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "Ingen"
 
-#: ../calendar/gui/e-cal-ops.c:283
+#: ../calendar/gui/e-cal-ops.c:287
 msgid "Modifying an event"
 msgstr "Ändrar ett evenemang"
 
-#: ../calendar/gui/e-cal-ops.c:287
+#: ../calendar/gui/e-cal-ops.c:291
 msgid "Modifying a memo"
 msgstr "Ändrar ett memo"
 
-#: ../calendar/gui/e-cal-ops.c:291
+#: ../calendar/gui/e-cal-ops.c:295
 msgid "Modifying a task"
 msgstr "Ändrar en uppgift"
 
-#: ../calendar/gui/e-cal-ops.c:387
+#: ../calendar/gui/e-cal-ops.c:394
 msgid "Removing an event"
 msgstr "Tar bort ett evenemang"
 
-#: ../calendar/gui/e-cal-ops.c:391
+#: ../calendar/gui/e-cal-ops.c:398
 msgid "Removing a memo"
 msgstr "Tar bort ett memo"
 
-#: ../calendar/gui/e-cal-ops.c:395
+#: ../calendar/gui/e-cal-ops.c:402
 msgid "Removing a task"
 msgstr "Tar bort en uppgift"
 
-#: ../calendar/gui/e-cal-ops.c:484
+#: ../calendar/gui/e-cal-ops.c:493
 #, c-format
 msgid "Deleting an event"
 msgid_plural "Deleting %d events"
 msgstr[0] "Tar bort ett evenemang"
 msgstr[1] "Tar bort %d evenemang"
 
-#: ../calendar/gui/e-cal-ops.c:488
+#: ../calendar/gui/e-cal-ops.c:497
 #, c-format
 msgid "Deleting a memo"
 msgid_plural "Deleting %d memos"
 msgstr[0] "Tar bort ett memo"
 msgstr[1] "Tar bort %d memon"
 
-#: ../calendar/gui/e-cal-ops.c:492
+#: ../calendar/gui/e-cal-ops.c:501
 #, c-format
 msgid "Deleting a task"
 msgid_plural "Deleting %d tasks"
 msgstr[0] "Tar bort en uppgift"
 msgstr[1] "Tar bort %d uppgifter"
 
-#: ../calendar/gui/e-cal-ops.c:692
+#: ../calendar/gui/e-cal-ops.c:704
 #, c-format
 msgid "Pasting an event"
 msgid_plural "Pasting %d events"
 msgstr[0] "Klistrar in ett evenemang"
 msgstr[1] "Klistrar in %d evenemang"
 
-#: ../calendar/gui/e-cal-ops.c:707
+#: ../calendar/gui/e-cal-ops.c:719
 #, c-format
 msgid "Pasting a memo"
 msgid_plural "Pasting %d memos"
 msgstr[0] "Klistrar in ett memo"
 msgstr[1] "Klistrar in %d memon"
 
-#: ../calendar/gui/e-cal-ops.c:722
+#: ../calendar/gui/e-cal-ops.c:734
 #, c-format
 msgid "Pasting a task"
 msgid_plural "Pasting %d tasks"
 msgstr[0] "Klistrar in en uppgift"
 msgstr[1] "Klistrar in %d uppgifter"
 
-#: ../calendar/gui/e-cal-ops.c:820
+#: ../calendar/gui/e-cal-ops.c:833
 msgid "Updating an event"
 msgstr "Uppdaterar ett evenemang"
 
-#: ../calendar/gui/e-cal-ops.c:824
+#: ../calendar/gui/e-cal-ops.c:837
 msgid "Updating a memo"
 msgstr "Uppdaterar ett memo"
 
-#: ../calendar/gui/e-cal-ops.c:828
+#: ../calendar/gui/e-cal-ops.c:841
 msgid "Updating a task"
 msgstr "Uppdaterar en uppgift"
 
-#: ../calendar/gui/e-cal-ops.c:933
+#: ../calendar/gui/e-cal-ops.c:949
 #, c-format
 msgid "Getting events to purge in the calendar '%s'"
 msgstr "Hämtar evenemang att tömma i kalendern ”%s”"
 
-#: ../calendar/gui/e-cal-ops.c:937
+#: ../calendar/gui/e-cal-ops.c:953
 #, c-format
 msgid "Getting memos to purge in the memo list '%s'"
 msgstr "Hämtar memon att tömma i memolistan ”%s”"
 
-#: ../calendar/gui/e-cal-ops.c:941
+#: ../calendar/gui/e-cal-ops.c:957
 #, c-format
 msgid "Getting tasks to purge in the task list '%s'"
 msgstr "Hämtar uppgifter att tömma i uppgiftslistan ”%s”"
 
-#: ../calendar/gui/e-cal-ops.c:962
+#: ../calendar/gui/e-cal-ops.c:983
 #, c-format
 msgid "Purging events in the calendar '%s'"
 msgstr "Tömmer evenemang i kalendern ”%s”"
 
-#: ../calendar/gui/e-cal-ops.c:966
+#: ../calendar/gui/e-cal-ops.c:987
 #, c-format
 msgid "Purging memos in the memo list '%s'"
 msgstr "Tömmer memon i memolistan ”%s”"
 
-#: ../calendar/gui/e-cal-ops.c:970
+#: ../calendar/gui/e-cal-ops.c:991
 #, c-format
 msgid "Purging tasks in the task list '%s'"
 msgstr "Tömmer uppgifter i uppgiftslistan ”%s”"
 
-#: ../calendar/gui/e-cal-ops.c:1068
+#: ../calendar/gui/e-cal-ops.c:1091
 msgid "Purging events"
 msgstr "Tömmer evenemang"
 
-#: ../calendar/gui/e-cal-ops.c:1072
+#: ../calendar/gui/e-cal-ops.c:1095
 msgid "Purging memos"
 msgstr "Tömmer memon"
 
-#: ../calendar/gui/e-cal-ops.c:1076
+#: ../calendar/gui/e-cal-ops.c:1099
 msgid "Purging tasks"
 msgstr "Tömmer uppgifter"
 
-#: ../calendar/gui/e-cal-ops.c:1178
+#: ../calendar/gui/e-cal-ops.c:1201
 msgid "Expunging completed tasks"
 msgstr "Tömmer färdiga uppgifter"
 
-#: ../calendar/gui/e-cal-ops.c:2034
+#: ../calendar/gui/e-cal-ops.c:2062
 #, c-format
 msgid "Moving an event"
 msgid_plural "Moving %d events"
 msgstr[0] "Flyttar ett evenemang"
 msgstr[1] "Flyttar %d evenemang"
 
-#: ../calendar/gui/e-cal-ops.c:2035
+#: ../calendar/gui/e-cal-ops.c:2063
 #, c-format
 msgid "Copying an event"
 msgid_plural "Copying %d events"
 msgstr[0] "Kopierar ett evenemang"
 msgstr[1] "Kopierar %d evenemang"
 
-#: ../calendar/gui/e-cal-ops.c:2041
+#: ../calendar/gui/e-cal-ops.c:2069
 #, c-format
 msgid "Moving a memo"
 msgid_plural "Moving %d memos"
 msgstr[0] "Flyttar ett memo"
 msgstr[1] "Flyttar %d memon"
 
-#: ../calendar/gui/e-cal-ops.c:2042
+#: ../calendar/gui/e-cal-ops.c:2070
 #, c-format
 msgid "Copying a memo"
 msgid_plural "Copying %d memos"
 msgstr[0] "Kopierar ett memo"
 msgstr[1] "Kopierar %d memon"
 
-#: ../calendar/gui/e-cal-ops.c:2048
+#: ../calendar/gui/e-cal-ops.c:2076
 #, c-format
 msgid "Moving a task"
 msgid_plural "Moving %d tasks"
 msgstr[0] "Flyttar en uppgift"
 msgstr[1] "Flyttar %d uppgifter"
 
-#: ../calendar/gui/e-cal-ops.c:2049
+#: ../calendar/gui/e-cal-ops.c:2077
 #, c-format
 msgid "Copying a task"
 msgid_plural "Copying %d tasks"
@@ -4833,14 +4932,14 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:2061 ../calendar/gui/e-week-view.c:1692
+#: ../calendar/gui/e-day-view.c:2138 ../calendar/gui/e-week-view.c:1694
 #: ../calendar/gui/print.c:1073 ../calendar/gui/print.c:1092
 #: ../calendar/gui/print.c:2622 ../calendar/gui/print.c:2642
 msgid "am"
 msgstr "fm"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:2064 ../calendar/gui/e-week-view.c:1695
+#: ../calendar/gui/e-day-view.c:2141 ../calendar/gui/e-week-view.c:1697
 #: ../calendar/gui/print.c:1078 ../calendar/gui/print.c:1094
 #: ../calendar/gui/print.c:2627 ../calendar/gui/print.c:2644
 msgid "pm"
@@ -4852,13 +4951,13 @@ msgstr "em"
 #. * 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:2910 ../calendar/gui/e-day-view-top-item.c:851
+#: ../calendar/gui/e-day-view.c:3019 ../calendar/gui/e-day-view-top-item.c:851
 #: ../calendar/gui/e-week-view-main-item.c:207 ../calendar/gui/print.c:2089
 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:3574
+#: ../calendar/gui/e-day-view.c:3744
 #, c-format
 msgid "Week %d"
 msgstr "Vecka %d"
@@ -4869,27 +4968,27 @@ msgstr "Vecka %d"
 #. * day view, e.g. a day is displayed in
 #. * 24 "60 minute divisions" or
 #. * 48 "30 minute divisions".
-#: ../calendar/gui/e-day-view-time-item.c:802
+#: ../calendar/gui/e-day-view-time-item.c:804
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minutdivisioner"
 
-#: ../calendar/gui/e-day-view-time-item.c:827
+#: ../calendar/gui/e-day-view-time-item.c:829
 msgid "Show the second time zone"
 msgstr "Visa sekundära tidszonen"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:844
-#: ../modules/calendar/e-calendar-preferences.c:305
-#: ../modules/calendar/e-calendar-preferences.c:357
+#: ../calendar/gui/e-day-view-time-item.c:846
+#: ../modules/calendar/e-calendar-preferences.c:306
+#: ../modules/calendar/e-calendar-preferences.c:358
 #: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Ingen"
 
-#: ../calendar/gui/e-day-view-time-item.c:878
-#: ../calendar/gui/e-timezone-entry.c:323
-#: ../modules/calendar/e-calendar-preferences.c:388
+#: ../calendar/gui/e-day-view-time-item.c:880
+#: ../calendar/gui/e-timezone-entry.c:324
+#: ../modules/calendar/e-calendar-preferences.c:389
 msgid "Select..."
 msgstr "Välj…"
 
@@ -4963,13 +5062,13 @@ msgstr "Icke-deltagare"
 msgid "Needs Action"
 msgstr "Behöver åtgärd"
 
-#: ../calendar/gui/e-meeting-list-view.c:626
+#: ../calendar/gui/e-meeting-list-view.c:644
 msgid "Attendee                          "
 msgstr "Deltagare                         "
 
 # RSVP borde kanske förklaras med en kommentar?
 # http://bugzilla.ximian.com/show_bug.cgi?id=61071
-#: ../calendar/gui/e-meeting-list-view.c:681
+#: ../calendar/gui/e-meeting-list-view.c:699
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "OSA"
@@ -4978,85 +5077,85 @@ msgstr "OSA"
 msgid "In Process"
 msgstr "Pågår"
 
-#: ../calendar/gui/e-meeting-store.c:1909
+#: ../calendar/gui/e-meeting-store.c:1881
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr ""
 "Ange lösenordet för att komma åt information om ledig/upptagen på servern %s "
 "som användaren %s"
 
-#: ../calendar/gui/e-meeting-store.c:1919
+#: ../calendar/gui/e-meeting-store.c:1891
 #, c-format
 msgid "Failure reason: %s"
 msgstr "Anledning till felet: %s"
 
-#: ../calendar/gui/e-meeting-store.c:1924
+#: ../calendar/gui/e-meeting-store.c:1896
 #: ../plugins/publish-calendar/publish-calendar.c:351
 #: ../smime/gui/component.c:63
 msgid "Enter password"
 msgstr "Ange lösenord"
 
-#: ../calendar/gui/e-meeting-time-sel.c:531
+#: ../calendar/gui/e-meeting-time-sel.c:537
 msgid "Out of Office"
 msgstr "Inte inne"
 
-#: ../calendar/gui/e-meeting-time-sel.c:533
+#: ../calendar/gui/e-meeting-time-sel.c:539
 msgid "No Information"
 msgstr "Ingen information"
 
-#: ../calendar/gui/e-meeting-time-sel.c:568
+#: ../calendar/gui/e-meeting-time-sel.c:574
 msgid "O_ptions"
 msgstr "A_lternativ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:588
+#: ../calendar/gui/e-meeting-time-sel.c:594
 msgid "Show _only working hours"
 msgstr "Visa _endast arbetstimmar"
 
-#: ../calendar/gui/e-meeting-time-sel.c:601
+#: ../calendar/gui/e-meeting-time-sel.c:607
 msgid "Show _zoomed out"
 msgstr "Visa ut_zoomade"
 
-#: ../calendar/gui/e-meeting-time-sel.c:619
+#: ../calendar/gui/e-meeting-time-sel.c:625
 msgid "_Update free/busy"
 msgstr "_Uppdatera ledig/upptagen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:636
+#: ../calendar/gui/e-meeting-time-sel.c:642
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:656
+#: ../calendar/gui/e-meeting-time-sel.c:662
 msgid "_Autopick"
 msgstr "_Autovälj"
 
-#: ../calendar/gui/e-meeting-time-sel.c:673
+#: ../calendar/gui/e-meeting-time-sel.c:679
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:694
+#: ../calendar/gui/e-meeting-time-sel.c:700
 msgid "_All people and resources"
 msgstr "_Allt folk och resurser"
 
-#: ../calendar/gui/e-meeting-time-sel.c:705
+#: ../calendar/gui/e-meeting-time-sel.c:711
 msgid "All _people and one resource"
 msgstr "Allt _folk och en resurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:716
+#: ../calendar/gui/e-meeting-time-sel.c:722
 msgid "_Required people"
 msgstr "Folk som k_rävs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:726
+#: ../calendar/gui/e-meeting-time-sel.c:732
 msgid "Required people and _one resource"
 msgstr "Folk som krävs _och en resurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:765
+#: ../calendar/gui/e-meeting-time-sel.c:771
 msgid "_Start time:"
 msgstr "_Starttid:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:794
+#: ../calendar/gui/e-meeting-time-sel.c:800
 msgid "_End time:"
 msgstr "Slutti_d:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2659
+#: ../calendar/gui/e-meeting-time-sel.c:2721
 #, c-format
 msgid ""
 "Summary: %s\n"
@@ -5065,7 +5164,7 @@ msgstr ""
 "Sammanfattning: %s\n"
 "Plats: %s"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2661 ../calendar/gui/print.c:3516
+#: ../calendar/gui/e-meeting-time-sel.c:2723 ../calendar/gui/print.c:3516
 #, c-format
 msgid "Summary: %s"
 msgstr "Sammanfattning: %s"
@@ -5095,45 +5194,45 @@ msgid "Language"
 msgstr "Språk"
 
 #: ../calendar/gui/e-memo-table.c:371
-#: ../modules/calendar/e-cal-shell-content.c:1602
+#: ../modules/calendar/e-cal-shell-content.c:1599
 #: ../modules/calendar/e-memo-shell-view-actions.c:180
 #: ../modules/calendar/e-memo-shell-view-actions.c:195
 #: ../modules/calendar/e-memo-shell-view.c:308
 msgid "Memos"
 msgstr "Memon"
 
-#: ../calendar/gui/e-memo-table.c:457 ../calendar/gui/e-task-table.c:759
+#: ../calendar/gui/e-memo-table.c:455 ../calendar/gui/e-task-table.c:757
 msgid "* No Summary *"
 msgstr "* Ingen sammanfattning *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:544 ../calendar/gui/e-task-table.c:843
+#: ../calendar/gui/e-memo-table.c:540 ../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:563 ../calendar/gui/e-task-table.c:861
+#: ../calendar/gui/e-memo-table.c:560 ../calendar/gui/e-task-table.c:858
 msgid "Due: "
 msgstr "Ska genomföras: "
 
-#: ../calendar/gui/e-memo-table.c:684
+#: ../calendar/gui/e-memo-table.c:683
 msgid "Cut selected memos to the clipboard"
 msgstr "Klipp ut markerade memon till urklipp"
 
-#: ../calendar/gui/e-memo-table.c:690
+#: ../calendar/gui/e-memo-table.c:689
 msgid "Copy selected memos to the clipboard"
 msgstr "Kopiera markerade memon till urklipp"
 
-#: ../calendar/gui/e-memo-table.c:696
+#: ../calendar/gui/e-memo-table.c:695
 msgid "Paste memos from the clipboard"
 msgstr "Klistra in memon från urklipp"
 
-#: ../calendar/gui/e-memo-table.c:702
+#: ../calendar/gui/e-memo-table.c:701
 #: ../modules/calendar/e-memo-shell-view-actions.c:531
 msgid "Delete selected memos"
 msgstr "Ta bort markerade memon"
 
-#: ../calendar/gui/e-memo-table.c:708
+#: ../calendar/gui/e-memo-table.c:707
 msgid "Select all visible memos"
 msgstr "Markera alla synliga memon"
 
@@ -5154,35 +5253,35 @@ msgstr "%d%%"
 #: ../calendar/importers/icalendar-importer.c:78
 #: ../calendar/importers/icalendar-importer.c:1062
 #: ../modules/calendar/e-calendar-preferences.ui.h:62
-#: ../modules/calendar/e-cal-shell-content.c:1560
+#: ../modules/calendar/e-cal-shell-content.c:1559
 #: ../modules/calendar/e-task-shell-view-actions.c:203
 #: ../modules/calendar/e-task-shell-view-actions.c:218
 #: ../modules/calendar/e-task-shell-view.c:466
 msgid "Tasks"
 msgstr "Uppgifter"
 
-#: ../calendar/gui/e-task-table.c:999
+#: ../calendar/gui/e-task-table.c:998
 msgid "Cut selected tasks to the clipboard"
 msgstr "Klipp ut markerade uppgifter till urklipp"
 
-#: ../calendar/gui/e-task-table.c:1005
+#: ../calendar/gui/e-task-table.c:1004
 msgid "Copy selected tasks to the clipboard"
 msgstr "Kopiera markerade uppgifter till urklipp"
 
-#: ../calendar/gui/e-task-table.c:1011
+#: ../calendar/gui/e-task-table.c:1010
 msgid "Paste tasks from the clipboard"
 msgstr "Klistra in uppgifter från urklipp"
 
-#: ../calendar/gui/e-task-table.c:1017
+#: ../calendar/gui/e-task-table.c:1016
 #: ../modules/calendar/e-task-shell-view-actions.c:656
 msgid "Delete selected tasks"
 msgstr "Ta bort markerade uppgifter"
 
-#: ../calendar/gui/e-task-table.c:1023
+#: ../calendar/gui/e-task-table.c:1022
 msgid "Select all visible tasks"
 msgstr "Markera alla synliga uppgifter"
 
-#: ../calendar/gui/e-timezone-entry.c:334
+#: ../calendar/gui/e-timezone-entry.c:335
 msgid "Select Timezone"
 msgstr "Välj tidszon"
 
@@ -5316,15 +5415,15 @@ msgstr "Kunde inte boka en resurs, fel: "
 msgid "You must be an attendee of the event."
 msgstr "Du måste delta i evenemanget."
 
-#: ../calendar/gui/itip-utils.c:1917
+#: ../calendar/gui/itip-utils.c:1918
 msgid "Sending an event"
 msgstr "Skickar ett evenemang"
 
-#: ../calendar/gui/itip-utils.c:1921
+#: ../calendar/gui/itip-utils.c:1922
 msgid "Sending a memo"
 msgstr "Skickar ett memo"
 
-#: ../calendar/gui/itip-utils.c:1925
+#: ../calendar/gui/itip-utils.c:1926
 msgid "Sending a task"
 msgstr "Skickar en uppgift"
 
@@ -7304,158 +7403,153 @@ msgstr "Stilla_Havet/Wallis"
 msgid "Pacific/Yap"
 msgstr "Stilla_Havet/Yap"
 
-#: ../composer/e-composer-actions.c:63 ../mail/em-utils.c:131
-#: ../modules/mailto-handler/evolution-mailto-handler.c:148
-msgid "_Do not show this message again"
-msgstr "Visa _inte detta meddelande igen"
-
-#: ../composer/e-composer-actions.c:265
+#: ../composer/e-composer-actions.c:212
 msgid "Save as..."
 msgstr "Spara som…"
 
-#: ../composer/e-composer-actions.c:389
+#: ../composer/e-composer-actions.c:336
 msgid "Close the current file"
 msgstr "Stäng aktuell fil"
 
-#: ../composer/e-composer-actions.c:394
+#: ../composer/e-composer-actions.c:341
 msgid "New _Message"
 msgstr "Nytt _meddelande"
 
-#: ../composer/e-composer-actions.c:396
+#: ../composer/e-composer-actions.c:343
 msgid "Open New Message window"
 msgstr "Öppna Nytt meddelande-fönster"
 
-#: ../composer/e-composer-actions.c:401 ../shell/e-shell-window-actions.c:978
+#: ../composer/e-composer-actions.c:348 ../shell/e-shell-window-actions.c:978
 msgid "_Preferences"
 msgstr "_Inställningar"
 
-#: ../composer/e-composer-actions.c:403 ../shell/e-shell-window-actions.c:980
+#: ../composer/e-composer-actions.c:350 ../shell/e-shell-window-actions.c:980
 msgid "Configure Evolution"
 msgstr "Konfigurera Evolution"
 
-#: ../composer/e-composer-actions.c:410
+#: ../composer/e-composer-actions.c:357
 msgid "Save the current file"
 msgstr "Spara aktuell fil"
 
-#: ../composer/e-composer-actions.c:415
+#: ../composer/e-composer-actions.c:362
 msgid "Save _As..."
 msgstr "Spara so_m…"
 
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:364
 msgid "Save the current file with a different name"
 msgstr "Spara aktuell fil med ett annat namn"
 
-#: ../composer/e-composer-actions.c:424
+#: ../composer/e-composer-actions.c:371
 msgid "Character _Encoding"
 msgstr "Tecken_kodning"
 
-#: ../composer/e-composer-actions.c:448
+#: ../composer/e-composer-actions.c:395
 msgid "Print Pre_view"
 msgstr "Förhands_granska"
 
-#: ../composer/e-composer-actions.c:455
+#: ../composer/e-composer-actions.c:402
 msgid "Save as _Draft"
 msgstr "Spara som ut_kast"
 
-#: ../composer/e-composer-actions.c:457
+#: ../composer/e-composer-actions.c:404
 msgid "Save as draft"
 msgstr "Spara som utkast"
 
-#: ../composer/e-composer-actions.c:462
+#: ../composer/e-composer-actions.c:409
 msgid "S_end"
 msgstr "S_kicka"
 
-#: ../composer/e-composer-actions.c:464
+#: ../composer/e-composer-actions.c:411
 msgid "Send this message"
 msgstr "Skicka detta meddelande"
 
-#: ../composer/e-composer-actions.c:472
+#: ../composer/e-composer-actions.c:419
 msgid "PGP _Encrypt"
 msgstr "PGP-_kryptera"
 
-#: ../composer/e-composer-actions.c:474
+#: ../composer/e-composer-actions.c:421
 msgid "Encrypt this message with PGP"
 msgstr "Kryptera detta meddelande med PGP"
 
-#: ../composer/e-composer-actions.c:480
+#: ../composer/e-composer-actions.c:427
 msgid "PGP _Sign"
 msgstr "PGP-_signera"
 
-#: ../composer/e-composer-actions.c:482
+#: ../composer/e-composer-actions.c:429
 msgid "Sign this message with your PGP key"
 msgstr "Signera detta meddelande med din PGP-nyckel"
 
-#: ../composer/e-composer-actions.c:488
+#: ../composer/e-composer-actions.c:435
 msgid "_Picture Gallery"
 msgstr "_Bildgalleri"
 
-#: ../composer/e-composer-actions.c:490
+#: ../composer/e-composer-actions.c:437
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "Visa en samling bilder som du kan dra till ditt meddelande"
 
-#: ../composer/e-composer-actions.c:496
+#: ../composer/e-composer-actions.c:443
 msgid "_Prioritize Message"
 msgstr "_Prioritera meddelande"
 
-#: ../composer/e-composer-actions.c:498
+#: ../composer/e-composer-actions.c:445
 msgid "Set the message priority to high"
 msgstr "Ställ in meddelandeprioritet till hög"
 
-#: ../composer/e-composer-actions.c:504
+#: ../composer/e-composer-actions.c:451
 msgid "Re_quest Read Receipt"
 msgstr "Be_gär läskvitto"
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:453
 msgid "Get delivery notification when your message is read"
 msgstr "Få en leveranskvitto när ditt meddelande läses"
 
-#: ../composer/e-composer-actions.c:512
+#: ../composer/e-composer-actions.c:459
 msgid "S/MIME En_crypt"
 msgstr "S/MIME-k_ryptera"
 
-#: ../composer/e-composer-actions.c:514
+#: ../composer/e-composer-actions.c:461
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Kryptera detta meddelande med ditt S/MIME-krypteringscertifikat"
 
-#: ../composer/e-composer-actions.c:520
+#: ../composer/e-composer-actions.c:467
 msgid "S/MIME Sig_n"
 msgstr "S/MIME-sig_nera"
 
-#: ../composer/e-composer-actions.c:522
+#: ../composer/e-composer-actions.c:469
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Signera detta meddelande med ditt S/MIME-signaturcertifikat"
 
-#: ../composer/e-composer-actions.c:576
+#: ../composer/e-composer-actions.c:523
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
 msgid "Unicode smileys"
 msgstr "Unicode-smilisar"
 
-#: ../composer/e-composer-actions.c:578
+#: ../composer/e-composer-actions.c:525
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
 msgid "Use Unicode characters for smileys."
 msgstr "Använd Unicode-tecken för smilisar."
 
-#: ../composer/e-composer-actions.c:584
+#: ../composer/e-composer-actions.c:531
 msgid "_Bcc Field"
 msgstr "_Blindkopia-fältet"
 
-#: ../composer/e-composer-actions.c:586
+#: ../composer/e-composer-actions.c:533
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Växlar huruvida blindkopiefältet ska visas"
 
-#: ../composer/e-composer-actions.c:592
+#: ../composer/e-composer-actions.c:539
 msgid "_Cc Field"
 msgstr "_Kopia-fältet"
 
-#: ../composer/e-composer-actions.c:594
+#: ../composer/e-composer-actions.c:541
 msgid "Toggles whether the CC field is displayed"
 msgstr "Växlar huruvida kopiefältet ska visas"
 
-#: ../composer/e-composer-actions.c:600
+#: ../composer/e-composer-actions.c:547
 msgid "_From Override Field"
 msgstr "_Från-överskuggningsfält"
 
-#: ../composer/e-composer-actions.c:602
+#: ../composer/e-composer-actions.c:549
 msgid ""
 "Toggles whether the From override field to change name or email address is "
 "displayed"
@@ -7463,23 +7557,23 @@ msgstr ""
 "Växlar huruvida Från-överskuggningsfältet för att ändra namn eller e-"
 "postadress ska visas"
 
-#: ../composer/e-composer-actions.c:608
+#: ../composer/e-composer-actions.c:555
 msgid "_Reply-To Field"
 msgstr "_Svara till-fältet"
 
-#: ../composer/e-composer-actions.c:610
+#: ../composer/e-composer-actions.c:557
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Växlar huruvida svara till-fältet ska visas"
 
-#: ../composer/e-composer-actions.c:671
+#: ../composer/e-composer-actions.c:618
 msgid "Save Draft"
 msgstr "Spara utkast"
 
 #: ../composer/e-composer-from-header.c:109
 #: ../e-util/e-mail-signature-script-dialog.c:415
 #: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
-#: ../mail/e-mail-config-identity-page.c:327
-#: ../mail/e-mail-config-summary-page.c:339
+#: ../mail/e-mail-config-identity-page.c:319
+#: ../mail/e-mail-config-summary-page.c:331
 msgid "_Name:"
 msgstr "_Namn:"
 
@@ -7528,7 +7622,7 @@ msgid "S_ubject:"
 msgstr "_Ämne:"
 
 #: ../composer/e-composer-header-table.c:870
-#: ../mail/e-mail-config-identity-page.c:505
+#: ../mail/e-mail-config-identity-page.c:504
 msgid "Si_gnature:"
 msgstr "Si_gnatur:"
 
@@ -7540,7 +7634,7 @@ msgstr "Klicka här för att ta fram adressboken"
 msgid "Click here to select folders to post to"
 msgstr "Klicka här för att välja mappar att posta till"
 
-#: ../composer/e-msg-composer.c:871
+#: ../composer/e-msg-composer.c:876
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -7548,7 +7642,7 @@ msgstr ""
 "Kan inte signera utgående meddelande: Inget signeringscertifikat angivet för "
 "detta konto"
 
-#: ../composer/e-msg-composer.c:880
+#: ../composer/e-msg-composer.c:885
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -7557,11 +7651,11 @@ msgstr ""
 "Kan inte kryptera utgående meddelande: Inget krypteringscertifikat angivet "
 "för detta konto"
 
-#: ../composer/e-msg-composer.c:1594 ../composer/e-msg-composer.c:2280
+#: ../composer/e-msg-composer.c:1599 ../composer/e-msg-composer.c:2367
 msgid "Compose Message"
 msgstr "Skriv meddelande"
 
-#: ../composer/e-msg-composer.c:4579
+#: ../composer/e-msg-composer.c:4710
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
 "Redigeraren innehåller en meddelandetext som inte är text och som inte kan "
@@ -7705,7 +7799,7 @@ msgstr ""
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "Ett fel inträffade vid sändning. Hur vill du fortsätta?"
 
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:163
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:167
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "Det rapporterade felet var &quot;{0}&quot;."
 
@@ -7750,6 +7844,30 @@ msgstr ""
 "meddelandet från att skickas om det gjordes av misstag, eller skicka "
 "meddelandet."
 
+#: ../composer/mail-composer.error.xml.h:39
+#, fuzzy
+#| msgid "Are you sure you want to send the message?"
+msgid "Are you sure you want to change the composer mode?"
+msgstr "Är du säker på att du vill skicka meddelandet?"
+
+#: ../composer/mail-composer.error.xml.h:40
+msgid ""
+"Turning HTML mode off will cause the text to lose all formatting. Do you "
+"want to continue?"
+msgstr ""
+"Att slå av HTML-läget kommer få texten att förlora all formatering. Vill du "
+"fortsätta?"
+
+#: ../composer/mail-composer.error.xml.h:41
+msgid "_Don't lose formatting"
+msgstr "Förlora _inte formatering"
+
+#: ../composer/mail-composer.error.xml.h:42
+#, fuzzy
+#| msgid "_Lose formatting"
+msgid "Lose _formatting"
+msgstr "För_lora formatering"
+
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
 msgid "Evolution Alarm Notify"
 msgstr "Evolutions alarmavisering"
@@ -7758,7 +7876,7 @@ msgstr "Evolutions alarmavisering"
 msgid "Calendar event notifications"
 msgstr "Aviseringar för kalenderevenemang"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1032
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1054
 #: ../modules/mailto-handler/evolution-mailto-handler.c:210
 #: ../shell/e-shell-window-private.c:242
 msgid "Evolution"
@@ -7929,6 +8047,12 @@ msgstr "Huruvida diverseinformation ska visas redigeraren"
 msgid "Whether to show notes in the editor"
 msgstr "Huruvida anteckningar ska visas i redigeraren"
 
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:32
+#, fuzzy
+#| msgid "Whether to show notes in the editor"
+msgid "Whether to show Certificates tab in the editor"
+msgstr "Huruvida anteckningar ska visas i redigeraren"
+
 #: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:1
 msgid "Convert mail messages to Unicode"
 msgstr "Konvertera e-postmeddelanden till Unicode"
@@ -8069,11 +8193,143 @@ msgstr "Minut som arbetsdagen börjar"
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minut som arbetsdagen börjar, 0 till 59."
 
+# Detta borde bero på lokalen?!
+# http://bugzilla.ximian.com/show_bug.cgi?id=61073
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:23
+#, fuzzy
+#| msgid "Workday start hour"
+msgid "Workday start time for Monday"
+msgstr "Timme som arbetsdagen börjar"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:24
+#, fuzzy
+#| msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
+msgid ""
+"Time the workday starts on, in twenty four hour format HHMM, 0000 to 2359, "
+"or -1 to use day-start-hour and day-start-minute"
+msgstr "Timme som arbetsdagen börjar, i tjugofyratimmarsformat, 0 till 23."
+
+# Detta borde bero på lokalen?!
+# http://bugzilla.ximian.com/show_bug.cgi?id=61073
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
+#, fuzzy
+#| msgid "Workday end hour"
+msgid "Workday end time for Monday"
+msgstr "Timme som arbetsdagen slutar"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:26
+#, fuzzy
+#| msgid "Hour the workday ends on, in twenty four hour format, 0 to 23"
+msgid ""
+"Time the workday ends on, in twenty four hour format HHMM, 0000 to 2359, or "
+"-1 to use day-end-hour and day-end-minute"
+msgstr "Timme som arbetsdagen slutar på, i tjugofyratimmarsformat, 0 till 23"
+
+# Detta borde bero på lokalen?!
+# http://bugzilla.ximian.com/show_bug.cgi?id=61073
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:27
+#, fuzzy
+#| msgid "Workday start minute"
+msgid "Workday start time for Tuesday"
+msgstr "Minut som arbetsdagen börjar"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:28
+#, fuzzy
+#| msgid "Hour the workday ends on, in twenty four hour format, 0 to 23"
+msgid ""
+"Time the workday ends on, in twenty four hour format HHMM, 0000 to 2359, or "
+"-1 to use day-start-hour and day-start-minute"
+msgstr "Timme som arbetsdagen slutar på, i tjugofyratimmarsformat, 0 till 23"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
+#, fuzzy
+#| msgid "Workday end minute"
+msgid "Workday end time for Tuesday"
+msgstr "Minut som arbetsdagen slutar"
+
+# Detta borde bero på lokalen?!
+# http://bugzilla.ximian.com/show_bug.cgi?id=61073
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:30
+#, fuzzy
+#| msgid "Workday start minute"
+msgid "Workday start time for Wednesday"
+msgstr "Minut som arbetsdagen börjar"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:31
+#, fuzzy
+#| msgid "Workday end minute"
+msgid "Workday end time for Wednesday"
+msgstr "Minut som arbetsdagen slutar"
+
+# Detta borde bero på lokalen?!
+# http://bugzilla.ximian.com/show_bug.cgi?id=61073
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:32
+#, fuzzy
+#| msgid "Workday start hour"
+msgid "Workday start time for Thursday"
+msgstr "Timme som arbetsdagen börjar"
+
+# Detta borde bero på lokalen?!
+# http://bugzilla.ximian.com/show_bug.cgi?id=61073
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
+#, fuzzy
+#| msgid "Workday end hour"
+msgid "Workday end time for Thursday"
+msgstr "Timme som arbetsdagen slutar"
+
+# Detta borde bero på lokalen?!
+# http://bugzilla.ximian.com/show_bug.cgi?id=61073
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:34
+#, fuzzy
+#| msgid "Workday start hour"
+msgid "Workday start time for Friday"
+msgstr "Timme som arbetsdagen börjar"
+
+# Detta borde bero på lokalen?!
+# http://bugzilla.ximian.com/show_bug.cgi?id=61073
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:35
+#, fuzzy
+#| msgid "Workday end hour"
+msgid "Workday end time for Friday"
+msgstr "Timme som arbetsdagen slutar"
+
+# Detta borde bero på lokalen?!
+# http://bugzilla.ximian.com/show_bug.cgi?id=61073
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:36
+#, fuzzy
+#| msgid "Workday start hour"
+msgid "Workday start time for Saturday"
+msgstr "Timme som arbetsdagen börjar"
+
+# Detta borde bero på lokalen?!
+# http://bugzilla.ximian.com/show_bug.cgi?id=61073
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:37
+#, fuzzy
+#| msgid "Workday end hour"
+msgid "Workday end time for Saturday"
+msgstr "Timme som arbetsdagen slutar"
+
+# Detta borde bero på lokalen?!
+# http://bugzilla.ximian.com/show_bug.cgi?id=61073
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:38
+#, fuzzy
+#| msgid "Workday start hour"
+msgid "Workday start time for Sunday"
+msgstr "Timme som arbetsdagen börjar"
+
+# Detta borde bero på lokalen?!
+# http://bugzilla.ximian.com/show_bug.cgi?id=61073
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:39
+#, fuzzy
+#| msgid "Workday end hour"
+msgid "Workday end time for Sunday"
+msgstr "Timme som arbetsdagen slutar"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:40
 msgid "The second timezone for a Day View"
 msgstr "Sekundär tidszon för en dagsvy"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:24
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:41
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key"
@@ -8081,19 +8337,19 @@ msgstr ""
 "Visar den sekundära tidszonen i en dagsvy, om inställd. Värdet är liknande "
 "det som används i \"timezone\"-nyckeln"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:42
 msgid "Recently used second time zones in a Day View"
 msgstr "Tidigare använda sekundära tidszoner i en dagsvy"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:26
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:43
 msgid "List of recently used second time zones in a Day View"
 msgstr "Lista över tidigare använda sekundära tidszoner i en dagsvy"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:27
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:44
 msgid "Maximum number of recently used timezones to remember"
 msgstr "Maximalt antal tidigare använda tidszoner att komma ihåg"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:28
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:45
 msgid ""
 "Maximum number of recently used timezones to remember in a 'day-second-"
 "zones' list"
@@ -8101,121 +8357,133 @@ msgstr ""
 "Maximalt antal tidigare använda tidszoner att komma ihåg i en \"day-second-"
 "zones\"-lista"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:46
 msgid "Default reminder value"
 msgstr "Standardpåminnelsevärde"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:30
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:47
 msgid "Number of units for determining a default reminder"
 msgstr "Antal enheter för att bestämma en standardpåminnelse"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:31
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:48
 msgid "Default reminder units"
 msgstr "Standardpåminnelseenheter"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:32
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
 msgstr ""
 "Enheter för en standardpåminnelse, \"minutes\" (minuter), \"hours\" (timmar) "
 "eller \"days\" (dagar)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:50
+#, fuzzy
+#| msgid "Default reminder value"
+msgid "Default reminder snooze interval, in minutes"
+msgstr "Standardpåminnelsevärde"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
+msgid ""
+"Default reminder snooze interval, in minutes, to be filled in the reminder "
+"notification dialog"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Visa kategorierfältet i evenemang/sammanträde/uppgiftsredigeraren"
 
 # Detta borde bero på lokalen?!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61073
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:34
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr ""
 "Huruvida kategorierfältet ska visas i evenemang/sammanträdesredigeraren"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:35
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:54
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Visa rollfältet i evenemang/uppgift/sammanträdesredigeraren"
 
 # Detta borde bero på lokalen?!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61073
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:36
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr ""
 "Huruvida rollfältet ska visas i evenemang/uppgift/sammanträdesredigeraren"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:37
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Visa OSA-fältet i evenemang/uppgift/sammanträdesredigeraren"
 
 # Detta borde bero på lokalen?!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61073
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:38
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr ""
 "Huruvida OSA-fältet ska visas i evenemang/uppgift/sammanträdesredigeraren"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:39
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Visa statusfältet i evenemang/uppgift/sammanträdesredigeraren"
 
 # Detta borde bero på lokalen?!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61073
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:40
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr ""
 "Huruvida statusfältet ska visas i evenemang/uppgift/sammanträdesredigeraren"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:41
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Visa tidszonfältet i evenemang/sammanträdesredigeraren"
 
 # Detta borde bero på lokalen?!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61073
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:42
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Huruvida tidszonfältet ska visas i evenemang/sammanträdesredigeraren"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:43
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Visa typfältet i evenemang/uppgift/sammanträdesredigeraren"
 
 # Detta borde bero på lokalen?!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61073
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:44
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr ""
 "Huruvida typfältet ska visas i evenemang/uppgift/sammanträdesredigeraren"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:45
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
 msgid "Hide completed tasks"
 msgstr "Dölj färdiga uppgifter"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:46
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
 msgid "Whether to hide completed tasks in the tasks view"
 msgstr "Huruvida färdigställda uppgifter i uppgiftsvyn ska döljas"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:47
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
 msgid "Hide task units"
 msgstr "Dölj uppgiftsenheter"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:48
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\""
 msgstr ""
 "Enheter för avgörande av när uppgifter ska döljas, \"minutes\" (minuter), "
 "\"hours\" (timmar) eller \"days\" (dagar)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
 msgid "Hide task value"
 msgstr "Dölj uppgiftsvärde"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:50
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
 msgid "Number of units for determining when to hide tasks"
 msgstr "Antal enheter för avgörande av när uppgifter ska döljas"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
 msgid "Horizontal pane position"
 msgstr "Horisontell panelposition"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels"
@@ -8223,57 +8491,57 @@ msgstr ""
 "Position för den horisontella panelen, mellan datumnavigeringskalendern och "
 "uppgiftslistan när månadsvyn inte används, i bildpunkter"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
 msgid "Last reminder time"
 msgstr "Senaste påminnelsetid"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:54
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
 msgid "Time the last reminder ran, in time_t"
 msgstr "Tid som senaste påminnelsen kördes, i time_t"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Färg på Marcus Bains-linje - Dagsvy"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
 msgid "Color to draw the Marcus Bains line in the Day View"
 msgstr "Färg att rita Marcus Bains-linjen med i dagsvyn"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Färg på Marcus Bains-linje - Tidsrad"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
 msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)"
 msgstr ""
 "Färg att rita Marcus Bains-linjen med i tidsraden (tomt för "
 "standardalternativet)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains-linje"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar"
 msgstr ""
 "Huruvida Marcus Bains-linjen (linjen vid aktuell tid) ska ritas i kalendern"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
 msgid "Memo preview pane position (horizontal)"
 msgstr "Position för memoförhandsvisningspanelen (horisontellt)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
 msgid "Position of the task preview pane when oriented horizontally"
 msgstr ""
 "Position för förhandsvisningspanelen för uppgifter när horisontellt "
 "orienterad"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
 msgid "Memo layout style"
 msgstr "Layoutstil för memo"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the memo list. \"0\" (Classic View) places the preview pane below the memo "
@@ -8284,20 +8552,20 @@ msgstr ""
 "förhandsvisningspanelen nedanför memolistan. \"1\" (Vertikal vy) placerar "
 "förhandsvisningspanelen bredvid memolistan"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:84
 msgid "Memo preview pane position (vertical)"
 msgstr "Position för memoförhandsvisningspanelen (vertikalt)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
 msgid "Position of the memo preview pane when oriented vertically"
 msgstr ""
 "Position för förhandsvisningspanelen för memon när vertikalt orienterad"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
 msgid "Month view horizontal pane position"
 msgstr "Horisontell panelposition för månadsvyn"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels"
@@ -8305,44 +8573,44 @@ msgstr ""
 "Position för den horisontella panelen, mellan vyn och kalendern för "
 "datumnavigering och uppgiftslistan i månadsvyn, i bildpunkter"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
 msgid "Scroll Month View by a week, not by a month"
 msgstr "Rulla månadsvyn med en vecka, inte med en månad"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
 msgid "Whether to scroll a Month View by a week, not by a month"
 msgstr "Huruvida månadsvyn ska rulla med en vecka, inte med en månad"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
 msgid "Reminder programs"
 msgstr "Påminnelseprogram"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
 msgid "Programs that are allowed to be run by reminders"
 msgstr "Program som tillåts att köras av påminnelser"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
 msgid "Show display reminders in notification tray"
 msgstr "Visa påminnelser i aviseringsytan"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
 msgid "Whether or not to use the notification tray for display reminders"
 msgstr ""
 "Huruvida aviseringsytan ska användas för att visa påminnelser eller inte"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
 msgid "Preferred New button item"
 msgstr "Föredraget objekt för Nytt-knapp"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
 msgid "Name of the preferred New toolbar button item"
 msgstr "Namnet på föredraget verktygsobjekt för Nytt-knapp"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
 msgid "Primary calendar"
 msgstr "Primär kalender"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
 msgid ""
 "The UID of the selected (or \"primary\") calendar in the sidebar of the "
 "\"Calendar\" view"
@@ -8350,11 +8618,11 @@ msgstr ""
 "UID för den valda (eller \"primära\") kalendern i sidopanelen för \"Kalender"
 "\"-vyn"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
 msgid "Primary memo list"
 msgstr "Primär memolista"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
 msgid ""
 "The UID of the selected (or \"primary\") memo list in the sidebar of the "
 "\"Memos\" view"
@@ -8362,11 +8630,11 @@ msgstr ""
 "UID för den valda (eller \"primära\") memolistan i sidopanelen för \"Memon\"-"
 "vyn"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
 msgid "Primary task list"
 msgstr "Primär uppgiftslista"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
 msgid ""
 "The UID of the selected (or \"primary\") task list in the sidebar of the "
 "\"Tasks\" view"
@@ -8374,11 +8642,11 @@ msgstr ""
 "UID för den valda (eller \"primära\") uppgiftslistan i sidopanelen för "
 "\"Uppgifter\"-vyn"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
 msgid "Free/busy template URL"
 msgstr "URL för ledig-/upptagenmall"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -8387,20 +8655,20 @@ msgstr ""
 "URL-mallen att använda som en reserv för ledig/upptagen-data, %u ersätts av "
 "användardelen av e-postadressen, och %d ersätts av domänen"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
 msgid "Recurrent Events in Italic"
 msgstr "Återkommande evenemang i kursivt"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
 msgid "Show days with recurrent events in italic font in bottom left calendar"
 msgstr ""
 "Visa dagar med återkommande evenemang i kursiv text i nedre vänstra kalendern"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
 msgid "Search range for time-based searching in years"
 msgstr "Sökområde för tidsbaserad sökning i år"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
 msgid ""
 "How many years can the time-based search go forward or backward from "
 "currently selected day when searching for another occurrence; default is ten "
@@ -8409,62 +8677,62 @@ msgstr ""
 "Hur många år kan tidsbaserad sökning gå framåt eller bakåt från nuvarande "
 "vald dag vid sökning efter ytterligare en förekomst; standard är tio år"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
 msgid "Show appointment end times in week and month views"
 msgstr "Visa sluttiderna på möten i vecko- och månadsvyerna"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
 msgid "Whether to display the end time of events in the week and month views"
 msgstr "Huruvida sluttider för möten i vecko- och månadsvyerna ska visas"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
 msgid "Show the memo preview pane"
 msgstr "Visa förhandsvisningspanelen för memon"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
 msgid "If \"true\", show the memo preview pane in the main window"
 msgstr ""
 "Om \"true\" så kommer förhandsvisningspanelen för memon att visas i "
 "huvudfönstret"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
 msgid "Show the task preview pane"
 msgstr "Visa förhandsvisningspanelen för uppgifter"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
 msgid "If \"true\", show the task preview pane in the main window"
 msgstr ""
 "Om \"true\" så kommer förhandsvisningspanelen för uppgifter att visas i "
 "huvudfönstret"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
 msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
 msgstr "Visa veckonummer i dagsvy, arbetsveckovy och datumnavigator"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
 msgid "Whether to show week numbers in various places in the Calendar"
 msgstr "Huruvida veckonummer ska visas på olika platser i kalendern"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
 msgid "Vertical position for the tag pane"
 msgstr "Vertikal position för taggpanelen"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
 msgid "Highlight tasks due today"
 msgstr "Informera om uppgifter som ska genomföras idag"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
 msgid ""
 "Whether highlight tasks due today with a special color (task-due-today-color)"
 msgstr ""
 "Huruvida uppgifter som ska genomföras idag ska visas med en speciell färg "
 "(task-due-today-color)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
 msgid "Tasks due today color"
 msgstr "Färg på uppgifter som ska genomföras idag"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
 msgid ""
 "Background color of tasks that are due today, in \"#rrggbb\" format. Used "
 "together with task-due-today-highlight"
@@ -8472,15 +8740,15 @@ msgstr ""
 "Bakgrundsfärg på uppgifter som ska genomföras idag, i \"#rrggbb\"-format. "
 "Används tillsammans med task-due-today-highlight"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
 msgid "Task preview pane position (horizontal)"
 msgstr "Panelposition för förhandsvisning av uppgift (horisontell)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
 msgid "Task layout style"
 msgstr "Stil för uppgiftslayout"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the task list. \"0\" (Classic View) places the preview pane below the task "
@@ -8491,31 +8759,31 @@ msgstr ""
 "förhandsvisningspanelen nedanför uppgiftslistan. \"1\" (Vertikal vy) "
 "placerar förhandsvisningspanelen bredvid uppgiftslistan"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
 msgid "Task preview pane position (vertical)"
 msgstr "Panelposition för förhandsvisning av uppgift (vertikal)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
 msgid "Position of the task preview pane when oriented vertically"
 msgstr ""
 "Position för förhandsvisningspanelen för uppgifter när vertikalt orienterad"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
 msgid "Highlight overdue tasks"
 msgstr "Informera om uppgifter som skulle ha genomförts"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
 msgid ""
 "Whether highlight overdue tasks with a special color (task-overdue-color)"
 msgstr ""
 "Huruvida uppgifter som skulle ha genomförts ska visas med en speciell färg "
 "(task-overdue-color)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
 msgid "Overdue tasks color"
 msgstr "Färg på uppgifter som skulle ha genomförts"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
 msgid ""
 "Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
 "together with task-overdue-highlight."
@@ -8523,19 +8791,19 @@ msgstr ""
 "Bakgrundsfärg på uppgifter som skulle ha genomförts, i \"#rrggbb\"-format. "
 "Används tillsammans med task-overdue-highlight."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
 msgid "Time divisions"
 msgstr "Tidsuppdelningar"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
 msgid "Intervals shown in Day and Work Week views, in minutes"
 msgstr "Intervall som visas i dags- och arbetsveckovyerna, i minuter"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
 msgid "Timezone"
 msgstr "Tidszon"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olson timezone database location like \"America/New York\""
@@ -8543,81 +8811,81 @@ msgstr ""
 "Standardstidszonen att använda för datum och tider i kalendern, som en "
 "oöversatt Olsen-tidszonsdatabasplats som till exempel \"America/New York\""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
 msgid "Twenty four hour time format"
 msgstr "Tjugofyratimmarstidsformat"
 
 # Detta borde bero på lokalen?!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61073
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
 msgid "Whether to show times in twenty four hour format instead of using am/pm"
 msgstr "Huruvida tider ska visas i 24-timmarsformat istället för fm/em"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
 msgid "Birthday and anniversary reminder"
 msgstr "Påminnelse för födelsedagar och jubileum"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
 msgid "Whether to set a reminder for birthdays and anniversaries"
 msgstr "Huruvida en påminnelse för födelsedagar och jubileum ska ställas in"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
 msgid "Default appointment reminder"
 msgstr "Standardmötespåminnelse"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
 msgid "Whether to set a default reminder for appointments"
 msgstr "Huruvida en standardpåminnare för möten ska ställas in"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
 msgid "Use system timezone"
 msgstr "Använd systemets tidszon"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
 msgid "Use the system timezone instead of the timezone selected in Evolution"
 msgstr ""
 "Använd systemets tidszon istället för tidszonen som ställts in i Evolution"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
 msgid "First day of the week"
 msgstr "Första dag i veckan"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
 msgid "Monday is a work day"
 msgstr "Måndag är en arbetsdag"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:145
 msgid "Tuesday is a work day"
 msgstr "Tisdag är en arbetsdag"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
 msgid "Wednesday is a work day"
 msgstr "Onsdag är en arbetsdag"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:147
 msgid "Thursday is a work day"
 msgstr "Torsdag är en arbetsdag"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
 msgid "Friday is a work day"
 msgstr "Fredag är en arbetsdag"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
 msgid "Saturday is a work day"
 msgstr "Lördag är en arbetsdag"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
 msgid "Sunday is a work day"
 msgstr "Söndag är en arbetsdag"
 
 # Detta borde bero på lokalen?!
 # http://bugzilla.ximian.com/show_bug.cgi?id=61073
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
 msgid "(Deprecated) First day of the week, from Sunday (0) to Saturday (6)"
 msgstr ""
 "(Föråldrad) Veckodag som veckan börjar på, från söndag (0) till lördag (6)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:152
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"week-start-day-name\" instead."
@@ -8625,11 +8893,11 @@ msgstr ""
 "Denna nyckel blev föråldrad i version 3.10 och ska inte längre användas. "
 "Använd \"week-start-day-name\" istället."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
 msgid "(Deprecated) Work days"
 msgstr "(Föråldrad) Arbetsdagar"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:154
 msgid ""
 "Days on which the start and end of work hours should be indicated. (This key "
 "was deprecated in version 3.10 and should no longer be used. Use the \"work-"
@@ -9047,18 +9315,32 @@ msgid "Will autowrap lines after given number of characters."
 msgstr "Kommer automatiskt radbryta text efter det angivna antalet tecken."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
+msgid "Whether to always show Sign and Encrypt buttons on the toolbar"
+msgstr ""
+"Huruvida knapparna Signera och Kryptera alltid ska visas i verktygsfältet"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
+msgid ""
+"If set to 'true', the Sign and Encrypt buttons for either PGP or S/MIME are "
+"always shown in the composer's toolbar. Otherwise they are shown only when "
+"being used."
+msgstr ""
+"Om satt till 'true' visas knapparna Signera och Kryptera för PGP eller S/"
+"MIME alltid i redigerarens verktygsfält. Annars visas de bara då de används."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
 msgid "Save file format for drag-and-drop operation"
 msgstr "Filformat att spara i vid dra-och-släpp-operationer"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
 msgid "Can be either 'mbox' or 'pdf'."
 msgstr "Kan antingen vara \"mbox\" eller \"pdf\"."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
 msgid "Show image animations"
 msgstr "Visa bildanimeringar"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -9066,11 +9348,11 @@ msgstr ""
 "Aktivera animerade bilder i HTML-meddelanden. Många användare tycker att "
 "animerade bilder är störande och föredrar att se en statisk bild istället."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 msgid "Enable or disable type ahead search feature"
 msgstr "Aktivera eller inaktivera sökfunktion för förhandsinmatning"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -9078,11 +9360,11 @@ msgstr ""
 "Aktivera sidopanelens sökfunktion för att tillåta interaktiv sökning efter "
 "mappnamn."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Enable or disable magic space bar"
 msgstr "Aktivera eller inaktivera magiskt blanksteg"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -9090,74 +9372,74 @@ msgstr ""
 "Aktivera denna för att använda Magiskt blanksteg för att rulla i "
 "förhandsvisning av meddelanden, meddelandelistor och mappar."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
 "Aktivera för att använda liknande visningsinställningar för meddelandelistor "
 "för alla mappar"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr ""
 "Aktivera för att använda liknande listvisningsinställningar för alla mappar."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Mark citations in the message \"Preview\""
 msgstr "Markera citat i meddelandeförhandsgranskningen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Markera citat i meddelandeförhandsgranskningen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 msgid "Citation highlight color"
 msgstr "Färgmarkeringsfärg för citat"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid "Citation highlight color."
 msgstr "Färgmarkeringsfärg för citat."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 msgid "Enable/disable caret mode"
 msgstr "Aktivera/inaktivera markörläge"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Aktivera markörläge, så att du ser en markör när du läser e-post."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Default charset in which to display messages"
 msgstr "Standardteckentabell som ska användas vid visning av meddelanden"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "Default charset in which to display messages."
 msgstr "Standardteckentabell som ska användas vid visning av meddelanden."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "Automatically load images for HTML messages over HTTP"
 msgstr "Läs in bilder automatiskt för HTML-meddelanden över HTTP"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid "Show Animations"
 msgstr "Visa animationer"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Show animated images as animations."
 msgstr "Visa animerade bilder som animationer."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid "Show all message headers"
 msgstr "Visa alla meddelanderubriker"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid "Show all the headers when viewing a messages."
 msgstr "Visa alla rubriker när meddelanden visas."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 msgid "List of headers to show when viewing a message."
 msgstr "Lista över rubriker att visa när ett meddelande visas."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 msgid ""
 "Each header is represented as a pair: the header name, and a boolean "
 "indicating whether the header is enabled. Disabled headers are not shown "
@@ -9167,49 +9449,61 @@ msgstr ""
 "värde som indikerar huruvida rubriken är påslagen. Avslagna rubriker visas "
 "inte när ett meddelande visas, men är fortfarande listade i Inställningar."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid "Show photo of the sender"
 msgstr "Visa fotot på avsändaren"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Visa avsändarens foto i meddelandets läsningspanel."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Search gravatar.com for photo of the sender"
 msgstr "Sök på gravatar.com efter foto på avsändaren"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid "Allow searching also at gravatar.com for photo of the sender."
 msgstr "Tillåt även sökning på gravatar.com efter foto på avsändaren."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid "Mark as Seen after specified timeout"
 msgstr "Markera som läst efter angiven tidsgräns"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid "Mark as Seen after specified timeout."
 msgstr "Markera som läst efter angiven tidsgräns."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#, fuzzy
+#| msgid "Mark as Seen after specified timeout"
+msgid "Mark as Seen always after specified timeout"
+msgstr "Markera som läst efter angiven tidsgräns"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+msgid ""
+"If set to true, the selected message will be set as unread after the timeout "
+"also after the folder change."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid "Timeout for marking messages as seen"
 msgstr "Tidsgräns för markering av meddelanden som lästa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "Tidsgräns, i millisekunder, för markering av meddelanden som lästa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Sender email-address column in the message list"
 msgstr "Kolumn för avsändarens e-postadress i meddelandelistan"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "Visa avsändarens e-postadress i en separat kolumn i meddelandelistan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view"
@@ -9217,7 +9511,7 @@ msgstr ""
 "Bestämmer huruvida samma typsnitt för båda raderna \"Från\" och \"Ämne\" i "
 "kolumnen \"Meddelanden\" ska användas i vertikal vy"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -9225,19 +9519,19 @@ msgstr ""
 "Bestämmer huruvida samma typsnitt för båda raderna \"Från\" och \"Ämne\" i "
 "kolumnen \"Meddelanden\" ska användas i vertikal vy."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "Show deleted messages in the message-list"
 msgstr "Visa borttagna meddelanden i meddelandelistan"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Visa borttagna meddelanden (med en genomstrykning) i meddelandelistan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Enable Unmatched search folder"
 msgstr "Aktivera Omatchad sökmapp"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid ""
 "Enable Unmatched search folder within Search Folders. It does nothing if "
 "Search Folders are disabled."
@@ -9245,11 +9539,11 @@ msgstr ""
 "Slå på Omatchad sökmapp inom Sökmappar. Detta gör ingenting om Sökmappar är "
 "avslagna."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Döljer mappförhandsvisningen och tar bort markeringen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -9258,31 +9552,31 @@ msgstr ""
 "läsning. Det här avmarkerar meddelandet i listan och tar bort "
 "förhandsvisningen för den mappen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid "Height of the message-list pane"
 msgstr "Höjd för meddelandelistpanelen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid "Height of the message-list pane."
 msgstr "Höjd för meddelandelistpanelen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid "Whether message headers are collapsed in the user interface"
 msgstr "Huruvida meddelanderubriker är infällda i användargränssnittet"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid "Width of the message-list pane"
 msgstr "Bredd på meddelandelistpanelen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid "Width of the message-list pane."
 msgstr "Bredd på meddelandelistpanelen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid "Layout style"
 msgstr "Layoutstil"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. \"0\" (Classic View) places the preview pane below the "
@@ -9294,36 +9588,36 @@ msgstr ""
 "förhandsvisningspanelen nedanför meddelandelistan. \"1\" (Vertikal vy) "
 "placerar förhandsvisningspanelen bredvid meddelandelistan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid "Variable width font"
 msgstr "Typsnitt med variabelt breddsteg"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "The variable width font for mail display."
 msgstr ""
 "Det typsnitt med variabelt breddsteg som ska användas för e-postvisning."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid "Terminal font"
 msgstr "Terminaltypsnitt"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid "The terminal font for mail display."
 msgstr "Terminaltypsnittet för e-postvisning."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid "Use custom fonts"
 msgstr "Använd anpassade typsnitt"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid "Use custom fonts for displaying mail."
 msgstr "Använd anpassade typsnitt för visning av e-post."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Minska visning av adresser i Till/Kopia/Blindkopia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -9331,11 +9625,11 @@ msgstr ""
 "Minska visning av adresser i Till/Kopia/Blindkopia till det antal som "
 "angivits i address_count."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Antal adresser att visa i Till/Kopia/Blindkopia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -9343,11 +9637,11 @@ msgstr ""
 "Detta anger antalet adresser som skall visas i standardmeddelandelistan, "
 "utanför gränsen visas en \"…\"."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Thread the message-list based on Subject"
 msgstr "Tråda meddelandelistan baserat på ämnet"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -9355,11 +9649,11 @@ msgstr ""
 "Huruvida Evolution ska falla tillbaka på att tråda efter ämne när "
 "meddelandena inte innehåller \"In-Reply-To\"- eller \"References\"-rubriker."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Default value for thread expand state"
 msgstr "Standardvärde för trådexpandering"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -9367,11 +9661,11 @@ msgstr ""
 "Denna inställning anger huruvida trådarna ska vara utfällda eller infällda "
 "som standard. Evolution kräver en omstart vid ändring."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Huruvida trådar sorteras baserat på senaste meddelandet i tråden"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -9381,11 +9675,29 @@ msgstr ""
 "senaste meddelandet i varje tråd, istället för meddelandets datum. En "
 "omstart av Evolution krävs."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+msgid "Whether sort thread children always ascending"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#, fuzzy
+#| msgid ""
+#| "This setting specifies whether the threads should be sorted based on "
+#| "latest message in each thread, rather than by message's date. Evolution "
+#| "requires a restart."
+msgid ""
+"This setting specifies whether the thread children should be sorted always "
+"ascending, rather than using the same sort order as in the thread root level."
+msgstr ""
+"Den här inställningen anger huruvida trådarna ska sorteras baserat på "
+"senaste meddelandet i varje tråd, istället för meddelandets datum. En "
+"omstart av Evolution krävs."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "Sortera konton i alfabetisk ordning i ett mappträd"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 msgid ""
 "Tells how to sort accounts in a folder tree used in a Mail view. When set to "
 "true accounts are sorted alphabetically, with an exception of On This "
@@ -9397,27 +9709,27 @@ msgstr ""
 "undantaget av På denna dator och sökmappar, annars sorteras konton baserat "
 "på en ordning angiven av användaren"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid "Log filter actions"
 msgstr "Logga filteråtgärder"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid "Log filter actions to the specified log file."
 msgstr "Logga filteråtgärder i den angivna loggfilen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Logfile to log filter actions"
 msgstr "Loggfil att logga filteråtgärder i"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid "Logfile to log filter actions."
 msgstr "Loggfil att logga filteråtgärder i."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Flush Outbox after filtering"
 msgstr "Töm utkorgen efter filtrering"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 msgid ""
 "Whether to flush Outbox after filtering is done. Outbox flush will happen "
 "only when there was used any 'Forward to' filter action and approximately "
@@ -9427,19 +9739,19 @@ msgstr ""
 "utkorgen kommer endast att inträffa när användes någon \"Vidarebefordra till"
 "\"-filteråtgärd och ungefär en minut efter senaste åtgärdskörning."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Default forward style"
 msgstr "Standardstil för vidarebefordran"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid "Default reply style"
 msgstr "Standardstil för svar"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
 msgstr "Fråga vid skickande med snabbtangent (Ctrl+Enter)"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid ""
 "Prompt the user when he or she tries to send a message with a key "
 "accelerator."
@@ -9447,39 +9759,39 @@ msgstr ""
 "Fråga användaren när han eller hon försöker att skicka ett meddelande med en "
 "snabbtangent."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid "Prompt on empty subject"
 msgstr "Fråga vid tom ämnesrad"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Fråga användaren när han eller hon försöker att skicka ett meddelande utan "
 "en ämnesrad."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid "Prompt when emptying the trash"
 msgstr "Fråga vid tömning av papperskorgen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "Fråga användaren när han eller hon försöker att tömma papperskorgen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid "Prompt when user expunges"
 msgstr "Fråga när användaren tömmer"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Fråga användaren när han eller hon försöker att tömma en mapp."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr ""
 "Fråga före sändning till mottagare som inte matats in som e-postadresser"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
@@ -9488,21 +9800,21 @@ msgstr ""
 "försöker skicka ett meddelande till mottagare som inte angivits som e-"
 "postadresser"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid "Prompt when user only fills Bcc"
 msgstr "Fråga när användaren endast fyller i blindkopia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Fråga när användaren försöker skicka ett meddelande utan till- eller "
 "kopiemottagare."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Fråga när användaren försöker skicka oönskad HTML"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -9510,13 +9822,13 @@ msgstr ""
 "Fråga när användaren försöker skicka HTML-brev till mottagare som kanske "
 "inte vill ha HTML-brev."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Fråga när användaren försöker att öppna tio eller fler meddelanden på samma "
 "gång"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -9524,19 +9836,19 @@ msgstr ""
 "Om en användare försöker att öppna 10 eller fler meddelanden på samma gång, "
 "fråga om användaren verkligen vill göra det."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid "Prompt while marking multiple messages"
 msgstr "Fråga vid markering av flera meddelanden"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Aktivera eller inaktivera frågan vid markering av flera meddelanden."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid "Prompt when deleting messages in search folder"
 msgstr "Fråga när meddelanden tas bort från sökmappar"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -9546,12 +9858,12 @@ msgstr ""
 "borttagning av meddelanden från en sökmapp permanent tar bort meddelandet, "
 "inte att den helt enkelt tar bort det från sökresultaten."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
 msgstr ""
 "Frågar huruvida en mapp får kopieras genom dra &amp; släpp i mappträdet"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 msgid ""
 "Possible values are: 'never' - do not allow copy with drag &amp; drop of "
 "folders in folder tree, 'always' - allow copy with drag &amp; drop of "
@@ -9563,12 +9875,12 @@ msgstr ""
 "mappträdet utan att fråga, eller 'ask' - (eller något annat värde) kommer "
 "att fråga användare."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
 msgstr ""
 "Frågar huruvida en folder får flyttas genom dra &amp; släpp i mappträdet"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid ""
 "Possible values are: 'never' - do not allow move with drag &amp; drop of "
 "folders in folder tree, 'always' - allow move with drag &amp; drop of "
@@ -9580,11 +9892,11 @@ msgstr ""
 "mappträdet utan att fråga, eller 'ask' - (eller något annat värde) kommer "
 "att fråga användare."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid "Prompt when replying privately to list messages"
 msgstr "Fråga vid privat svar till sändlistmeddelanden"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
@@ -9592,11 +9904,11 @@ msgstr ""
 "Den inaktiverar/aktiverar funktionen för upprepade varningar om att du "
 "skickar ett privat svar på ett meddelande från en sändlista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "Fråga när sändlista kapar privata svar"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending "
 "a private reply to a message which arrived via a mailing list, but the list "
@@ -9606,11 +9918,11 @@ msgstr ""
 "skickar ett privat svar på ett meddelande från en sändlista, men listan "
 "ställer in en Reply-To:-rubrik som omdirigerar ditt svar tillbaka till listan"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid "Prompt when replying to many recipients"
 msgstr "Fråga vid svar till många mottagare"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
@@ -9618,7 +9930,26 @@ msgstr ""
 "Den inaktiverar/aktiverar funktionen för upprepade varningar att du skickar "
 "ett svar till många personer."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+msgid ""
+"Prompt when switching composer mode and the content needs to lose its "
+"formatting"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#, fuzzy
+#| msgid ""
+#| "It disables/enables the repeated prompts to warn that you are trying to "
+#| "send a message to recipients not entered as mail addresses"
+msgid ""
+"It disables/enables the repeated prompts to warn that you are switching "
+"composer mode and the content needs to lose its formatting."
+msgstr ""
+"Den inaktiverar/aktiverar funktionen för upprepade varningar om att du "
+"försöker skicka ett meddelande till mottagare som inte angivits som e-"
+"postadresser"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid ""
 "Policy for automatically closing the message browser window when forwarding "
 "or replying to the displayed message."
@@ -9626,42 +9957,42 @@ msgstr ""
 "Policy för att automatiskt stänga meddelandevisningsfönstret vid "
 "vidarebefordring eller vid svar på det visade meddelandet."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 msgid "Empty Trash folders on exit"
 msgstr "Töm papperskorgsmappar vid avslut"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Töm alla papperskorgsmappar vid avslutande av Evolution."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Minsta antalet dagar mellan tömning av papperskorgen vid avslut"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Minsta tiden mellan tömning av papperskorgen vid avslut, i dagar."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 msgid "Last time Empty Trash was run"
 msgstr "Senaste gången som Tömning av papperskorgen kördes"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "Den senaste gången som tömning av papperskorgen gjordes, i dagar sedan 1:a "
 "januari 1970."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Den tidsperiod i sekunder som felet ska visas på statusraden."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid "Level beyond which the message should be logged."
 msgstr "Nivå bortom vilken meddelandet ska loggas."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -9669,11 +10000,11 @@ msgstr ""
 "Denna kan ha tre möjliga värden. \"0\" för fel. \"1\" för varningar. \"2\" "
 "för felsökningsmeddelanden."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "Show original \"Date\" header value."
 msgstr "Visa ursprungligt \"Date\"-rubrikvärde."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
@@ -9683,11 +10014,11 @@ msgstr ""
 "skiljer sig). Visa annars alltid rubrikvärdet för \"Datum\" i ett föredraget "
 "format och lokal tidszon."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid "List of Labels and their associated colors"
 msgstr "Lista med etiketter och deras associerade färger"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -9696,35 +10027,35 @@ msgstr ""
 "innehåller strängar som innehåller namn:färg där färg använder den "
 "hexadecimala kodningen i HTML."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid "Check incoming mail being junk"
 msgstr "Kontrollera om inkommande e-post är skräppost"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 msgid "Run junk test on incoming mail."
 msgstr "Kör skräptest på inkommande e-post."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Empty Junk folders on exit"
 msgstr "Töm skräpmappar vid avslut"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Töm alla skräpmappar vid avslutande av Evolution."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Minsta antalet dagar mellan tömning av skräpkorgen vid avslut"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Minsta tiden mellan tömning av skräpkorgen vid avslut, i dagar."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "Last time Empty Junk was run"
 msgstr "Senaste gången som Tömning av skräpkorgen kördes"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
@@ -9732,11 +10063,11 @@ msgstr ""
 "januari 1970."
 
 # Hook?
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "The default plugin for Junk hook"
 msgstr "Standardinsticksmodul för skräpkrok"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -9746,13 +10077,13 @@ msgstr ""
 "aktiverade insticksmoduler. Om listad standardinsticksmodul är inaktiverad "
 "kommer den inte att falla tillbaka på andra tillgängliga insticksmoduler."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 msgid "Determines whether to lookup in address book for sender email"
 msgstr ""
 "Bestämmer huruvida en uppslagning i adressboken efter avsändarens e-"
 "postadress ska göras"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -9765,7 +10096,7 @@ msgstr ""
 "Uppslagningen kan vara långsam om fjärradressböcker (som LDAP) är markerade "
 "för automatisk komplettering."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -9773,7 +10104,7 @@ msgstr ""
 "Bestämmer huruvida endast adresser för skräppostfiltrering i lokal adressbok "
 "ska slås upp"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -9783,11 +10114,11 @@ msgstr ""
 "för att bestämma huruvida adresser endast ska slås upp i lokala adressböcker "
 "för att exkludera e-post skickad av kända kontakter från skräppostfiltrering."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "Bestämmer huruvida anpassade rubriker ska kontrolleras efter skräppost"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -9797,11 +10128,11 @@ msgstr ""
 "detta alternativ är aktiverat och rubrikerna finns, kommer det att öka "
 "hastigheten för skräpkontrollen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 msgid "Custom headers to use while checking for junk."
 msgstr "Anpassade rubriker att använda vid kontroll av skräppost."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -9809,31 +10140,31 @@ msgstr ""
 "Anpassade rubriker att använda vid kontroll av skräppost. Listelementen är "
 "strängar i formatet \"rubriknamn=värde\"."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 msgid "UID string of the default account."
 msgstr "UID-sträng för standardkontot."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
 msgid "Save directory"
 msgstr "Spara katalog"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
 msgid "Directory for saving mail component files."
 msgstr "Katalog för sparning av postkomponentfiler."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
 msgid "Composer load/attach directory"
 msgstr "Katalog för inläsning/bifogning"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
 msgid "Directory for loading/attaching files to composer."
 msgstr "Katalog för inläsning/bifogning av filer till redigeraren."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
 msgid "Check for new messages on start"
 msgstr "Leta efter nya meddelanden vid uppstart"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
@@ -9841,11 +10172,11 @@ msgstr ""
 "Huruvida nya meddelanden ska letas efter när Evolution startas. Detta "
 "inkluderar även att skicka meddelanden från utkorgen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
 msgid "Check for new messages in all active accounts"
 msgstr "Leta efter nya meddelanden i alla aktiva konton"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
 msgid ""
 "Whether to check for new messages in all active accounts regardless of the "
 "account \"Check for new messages every X minutes\" option when Evolution is "
@@ -9856,11 +10187,11 @@ msgstr ""
 "startas. Detta alternativ används endast tillsammans med alternativet "
 "\"send_recv_on_start\"."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 msgid "Server synchronization interval"
 msgstr "Intervall för serversynkronisering"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -9868,11 +10199,11 @@ msgstr ""
 "Bestämmer hur frekvent lokala ändringar synkroniseras med fjärrpostservern. "
 "Intervallet måste vara minimum 30 sekunder."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
 msgid "Allow expunge in virtual folders"
 msgstr "Tillåt tömning i virtuella mappar"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
 msgid ""
 "Enables Expunge in virtual folders, which means that the Folder->Expunge "
 "will be callable in virtual folders, while the expunge itself will be done "
@@ -9884,11 +10215,22 @@ msgstr ""
 "alla mappar för alla borttagna meddelanden i den virtuella mappen, inte "
 "enbart för borttagna meddelanden som hör till den virtuella mappen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
+#: ../mail/mail-config.ui.h:9
+msgid "Inherit theme colors in HTML mode"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
+msgid ""
+"When enabled the theme colors for background, text and links are sent in "
+"resulting HTML formatted message."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
 msgid "An Archive folder for On This Computer folders."
 msgstr "En arkivmapp för På denna dator-mappar."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
 msgid ""
 "An Archive folder to use for Messages|Archive... feature when in an On This "
 "Computer folder."
@@ -9896,11 +10238,11 @@ msgstr ""
 "En arkivmapp att använda för funktionen Meddelanden|Arkivera… då aktuell "
 "mapp är en På denna dator-mapp."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
 msgid "(Deprecated) Default forward style"
 msgstr "(Föråldrad) Standardstil för vidarebefordran"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"forward-style-name\" instead."
@@ -9908,11 +10250,11 @@ msgstr ""
 "Denna nyckel blev föråldrad i version 3.10 och bör inte längre användas. "
 "Använd \"forward-style-name\" istället."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
 msgid "(Deprecated) Default reply style"
 msgstr "(Föråldrad) Standardstil för svar"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"reply-style-name\" instead."
@@ -9920,12 +10262,12 @@ msgstr ""
 "Denna nyckel blev föråldrad i version 3.10 och bör inte längre användas. "
 "Använd \"reply-style-name\" istället."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
 msgid "(Deprecated) List of custom headers and whether they are enabled."
 msgstr ""
 "(Föråldrad) Lista med anpassade rubriker och huruvida de är aktiverade."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"show-headers\" instead."
@@ -9933,11 +10275,11 @@ msgstr ""
 "Denna nyckel blev föråldrad i version 3.10 och bör inte längre användas. "
 "Använd \"show-headers\" istället."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
 msgid "(Deprecated) Load images for HTML messages over HTTP"
 msgstr "(Föråldrad) Läs in bilder för HTML-meddelanden över HTTP"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"image-loading-policy\" instead."
@@ -9945,7 +10287,7 @@ msgstr ""
 "Denna nyckel blev föråldrad i version 3.10 och bör inte längre användas. "
 "Använd \"image-loading-policy\" istället."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
 msgid ""
 "(Deprecated) Asks whether to close the message window when the user forwards "
 "or replies to the message shown in the window"
@@ -9953,7 +10295,7 @@ msgstr ""
 "(Föråldrad) Frågar huruvida meddelandefönstret ska stängas när användaren "
 "vidarebefordrar eller svarar på meddelandet som visas i fönstret"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"browser-close-on-reply-policy\" instead."
@@ -10374,7 +10716,7 @@ msgstr ""
 "sökväg från kompileringen att användas, vanligen /usr/bin/sa-learn. "
 "Kommandot får inte innehålla några andra argument."
 
-#: ../em-format/e-mail-formatter-attachment.c:405
+#: ../em-format/e-mail-formatter-attachment.c:408
 #: ../e-util/e-attachment-bar.c:101 ../e-util/e-attachment-bar.c:106
 #: ../e-util/e-attachment-paned.c:187 ../e-util/e-attachment-paned.c:192
 #: ../mail/message-list.etspec.h:4
@@ -10383,7 +10725,7 @@ msgid_plural "Attachments"
 msgstr[0] "Bilaga"
 msgstr[1] "Bilagor"
 
-#: ../em-format/e-mail-formatter-attachment.c:406
+#: ../em-format/e-mail-formatter-attachment.c:409
 msgid "Display as attachment"
 msgstr "Visa som bilaga"
 
@@ -10429,8 +10771,6 @@ msgstr "Formatera del som ett RFC822-meddelande"
 #: ../em-format/e-mail-formatter-print.c:53
 #: ../e-util/gal-view-instance-save-as-dialog.c:94
 #: ../mail/e-mail-label-tree-view.c:98
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1301
-#: ../modules/cal-config-google/e-google-chooser.c:1303
 #: ../modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Name"
 msgstr "Namn"
@@ -10440,19 +10780,19 @@ msgstr "Namn"
 msgid "Size"
 msgstr "Storlek"
 
-#: ../em-format/e-mail-formatter-quote-headers.c:174
+#: ../em-format/e-mail-formatter-quote-headers.c:180
 #: ../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:1630
+#: ../smime/gui/certificate-manager.c:1632
 msgid "Subject"
 msgstr "Ämne"
 
 #. pseudo-header
-#: ../em-format/e-mail-formatter-quote-headers.c:193
+#: ../em-format/e-mail-formatter-quote-headers.c:199
 #: ../em-format/e-mail-formatter-utils.c:343
-#: ../modules/mail/em-mailer-prefs.c:1166
+#: ../modules/mail/em-mailer-prefs.c:1484
 msgid "Mailer"
 msgstr "E-postprogram"
 
@@ -10478,7 +10818,7 @@ msgstr "Formatera 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:1538
+#: ../e-util/e-html-editor-actions.c:1549
 msgid "Plain Text"
 msgstr "Vanlig text"
 
@@ -10600,7 +10940,7 @@ msgstr ""
 "inom en rimlig tid."
 
 #: ../em-format/e-mail-formatter-secure-button.c:187
-#: ../shell/shell.error.xml.h:23 ../smime/gui/smime-ui.ui.h:22
+#: ../shell/shell.error.xml.h:28 ../smime/gui/smime-ui.ui.h:22
 msgid "_View Certificate"
 msgstr "_Visa certifikat"
 
@@ -10645,7 +10985,7 @@ msgid "S/MIME encrypted"
 msgstr "S/MIME-krypterad"
 
 #: ../em-format/e-mail-formatter-utils.c:591
-#: ../mail/e-mail-config-security-page.c:736
+#: ../mail/e-mail-config-security-page.c:748
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:194
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:144
 msgid "Security"
@@ -10723,8 +11063,8 @@ msgstr "Signaturformatet stöds inte"
 msgid "Reply-To"
 msgstr "Svara till"
 
-#: ../em-format/e-mail-part-headers.c:52 ../e-util/e-dateedit.c:549
-#: ../e-util/e-dateedit.c:572 ../mail/message-list.etspec.h:7
+#: ../em-format/e-mail-part-headers.c:52 ../e-util/e-dateedit.c:552
+#: ../e-util/e-dateedit.c:575 ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:68
 msgid "Date"
 msgstr "Datum"
@@ -10794,12 +11134,12 @@ msgid "%s (%d%% complete)"
 msgstr "%s (%d%% färdigt)"
 
 #: ../e-util/e-activity-proxy.c:352
-#: ../modules/mail/e-mail-shell-view-actions.c:1785
+#: ../modules/mail/e-mail-shell-view-actions.c:1851
 msgid "Cancel"
 msgstr "Avbryt"
 
 #. Translators: Escape is a keyboard binding.
-#: ../e-util/e-alert-bar.c:118
+#: ../e-util/e-alert-bar.c:124
 msgid "Close this message (Escape)"
 msgstr "Stäng detta meddelande (Escape)"
 
@@ -10807,11 +11147,11 @@ msgstr "Stäng detta meddelande (Escape)"
 msgid "Failed to create a thread: "
 msgstr "Misslyckades med att skapa en tråd: "
 
-#: ../e-util/e-attachment-bar.c:660 ../e-util/e-attachment-paned.c:736
+#: ../e-util/e-attachment-bar.c:661 ../e-util/e-attachment-paned.c:735
 msgid "Icon View"
 msgstr "Ikonvy"
 
-#: ../e-util/e-attachment-bar.c:662 ../e-util/e-attachment-paned.c:738
+#: ../e-util/e-attachment-bar.c:663 ../e-util/e-attachment-paned.c:737
 msgid "List View"
 msgstr "Listvy"
 
@@ -10819,59 +11159,59 @@ msgstr "Listvy"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../e-util/e-attachment.c:1197
+#: ../e-util/e-attachment.c:1223
 msgid "Attached message"
 msgstr "Bifogat meddelande"
 
 # Outlook kallar det för Prioritet (Låg, Normal, Hög)
-#: ../e-util/e-attachment.c:2104 ../e-util/e-attachment.c:3101
+#: ../e-util/e-attachment.c:2152 ../e-util/e-attachment.c:3149
 msgid "Operation was cancelled"
 msgstr "Åtgärden avbröts"
 
 #. Translators: Default attachment filename.
-#: ../e-util/e-attachment.c:2264 ../e-util/e-attachment.c:2963
-#: ../e-util/e-attachment.c:3334 ../e-util/e-attachment-store.c:691
+#: ../e-util/e-attachment.c:2312 ../e-util/e-attachment.c:3011
+#: ../e-util/e-attachment.c:3382 ../e-util/e-attachment-store.c:691
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../e-util/e-attachment.c:2345 ../e-util/e-attachment.c:3394
+#: ../e-util/e-attachment.c:2393 ../e-util/e-attachment.c:3442
 msgid "A load operation is already in progress"
 msgstr "En inläsningsåtgärd pågår"
 
-#: ../e-util/e-attachment.c:2353 ../e-util/e-attachment.c:3402
+#: ../e-util/e-attachment.c:2401 ../e-util/e-attachment.c:3450
 msgid "A save operation is already in progress"
 msgstr "En sparningsåtgärd pågår"
 
-#: ../e-util/e-attachment.c:2473
+#: ../e-util/e-attachment.c:2521
 #, c-format
 msgid "Could not load '%s'"
 msgstr "Kunde inte läsa in ”%s”"
 
-#: ../e-util/e-attachment.c:2476
+#: ../e-util/e-attachment.c:2524
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Kunde inte läsa in bilagan"
 
-#: ../e-util/e-attachment.c:2761
+#: ../e-util/e-attachment.c:2809
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Kunde inte öppna ”%s”"
 
-#: ../e-util/e-attachment.c:2764
+#: ../e-util/e-attachment.c:2812
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Kunde inte öppna bilagan"
 
-#: ../e-util/e-attachment.c:3411
+#: ../e-util/e-attachment.c:3459
 msgid "Attachment contents not loaded"
 msgstr "Bilagornas innehåll har inte lästs in"
 
-#: ../e-util/e-attachment.c:3502
+#: ../e-util/e-attachment.c:3550
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Kunde inte spara ”%s”"
 
-#: ../e-util/e-attachment.c:3505
+#: ../e-util/e-attachment.c:3553
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Kunde inte spara bilagan"
@@ -10914,7 +11254,7 @@ msgstr "Sparar"
 msgid "Hide Attachment _Bar"
 msgstr "Dölj _bilageraden"
 
-#: ../e-util/e-attachment-paned.c:116 ../e-util/e-attachment-paned.c:752
+#: ../e-util/e-attachment-paned.c:116 ../e-util/e-attachment-paned.c:751
 msgid "Show Attachment _Bar"
 msgstr "Visa _bilageraden"
 
@@ -10948,61 +11288,81 @@ msgstr "Spara endast e_xtraherade filer"
 msgid "Save extracted files and the original _archive"
 msgstr "Spara extraherade filer och det ursprungliga _arkivet"
 
-#: ../e-util/e-attachment-view.c:377
+#: ../e-util/e-attachment-view.c:428
 msgid "Open With Other Application..."
 msgstr "Öppna med annat program…"
 
-#: ../e-util/e-attachment-view.c:384
+#: ../e-util/e-attachment-view.c:435
 msgid "S_ave All"
 msgstr "Spara _alla"
 
-#: ../e-util/e-attachment-view.c:391
+#: ../e-util/e-attachment-view.c:442
 msgid "Sa_ve As"
 msgstr "S_para som"
 
-#: ../e-util/e-attachment-view.c:400
+#: ../e-util/e-attachment-view.c:451
 #: ../plugins/save-calendar/save-calendar.c:349
 #: ../plugins/save-calendar/save-calendar.c:380
 #: ../plugins/save-calendar/save-calendar.c:411
 msgid "Save _As"
 msgstr "Spara so_m"
 
-#: ../e-util/e-attachment-view.c:410
+#: ../e-util/e-attachment-view.c:461
 msgid "A_dd Attachment..."
 msgstr "Lä_gg till bilaga…"
 
-#: ../e-util/e-attachment-view.c:417
+#: ../e-util/e-attachment-view.c:468
 #: ../modules/addressbook/e-book-shell-view-actions.c:1071
 #: ../modules/calendar/e-cal-shell-view-actions.c:1240
 #: ../modules/calendar/e-memo-shell-view-actions.c:571
 #: ../modules/calendar/e-task-shell-view-actions.c:696
-#: ../modules/mail/e-mail-shell-view-actions.c:1586
-#: ../modules/mail/e-mail-shell-view-actions.c:1657
+#: ../modules/mail/e-mail-shell-view-actions.c:1645
+#: ../modules/mail/e-mail-shell-view-actions.c:1716
 msgid "_Properties"
 msgstr "_Egenskaper"
 
-#: ../e-util/e-attachment-view.c:434
+#: ../e-util/e-attachment-view.c:485
 msgid "_Hide"
 msgstr "_Dölj"
 
-#: ../e-util/e-attachment-view.c:441
+#: ../e-util/e-attachment-view.c:492
 msgid "Hid_e All"
 msgstr "Döl_j alla"
 
-#: ../e-util/e-attachment-view.c:448
+#: ../e-util/e-attachment-view.c:499
 msgid "_View Inline"
 msgstr "_Visa inuti"
 
-#: ../e-util/e-attachment-view.c:455
+#: ../e-util/e-attachment-view.c:506
 msgid "Vie_w All Inline"
 msgstr "Visa alla in_uti"
 
-#: ../e-util/e-attachment-view.c:785
+#: ../e-util/e-attachment-view.c:513
+msgid "_Zoom to 100%"
+msgstr ""
+
+#: ../e-util/e-attachment-view.c:515
+#, fuzzy
+#| msgid "Reset the text to its original size"
+msgid "Zoom the image to its natural size"
+msgstr "Återställ texten till dess originalstorlek"
+
+#: ../e-util/e-attachment-view.c:520
+#, fuzzy
+#| msgid "Close this window"
+msgid "_Zoom to window"
+msgstr "Stäng detta fönster"
+
+#: ../e-util/e-attachment-view.c:522
+msgid "Zoom large images to not be wider than the window width"
+msgstr ""
+
+#: ../e-util/e-attachment-view.c:880
 #, c-format
 msgid "Open With \"%s\""
 msgstr "Öppna med ”%s”"
 
-#: ../e-util/e-attachment-view.c:788
+#: ../e-util/e-attachment-view.c:883
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Öppna denna bilaga i %s"
@@ -11045,19 +11405,19 @@ msgid "Month Calendar"
 msgstr "Månadskalender"
 
 #. This is a strftime() format. %B = Month name.
-#: ../e-util/e-calendar-item.c:1323 ../e-util/e-calendar-item.c:2201
+#: ../e-util/e-calendar-item.c:1322 ../e-util/e-calendar-item.c:2200
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%B"
 
 #. This is a strftime() format. %Y = Year.
-#: ../e-util/e-calendar-item.c:1325
+#: ../e-util/e-calendar-item.c:1324
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../e-util/e-calendar-item.c:1362
+#: ../e-util/e-calendar-item.c:1361
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%B %Y"
@@ -11078,15 +11438,15 @@ msgstr "Markera som standardmemolista"
 msgid "Color:"
 msgstr "Färg:"
 
-#: ../e-util/e-cal-source-config.c:405
+#: ../e-util/e-cal-source-config.c:428
 msgid "Copy calendar contents locally for offline operation"
 msgstr "Kopiera kalenderinnehåll lokalt för frånkopplad användning"
 
-#: ../e-util/e-cal-source-config.c:409
+#: ../e-util/e-cal-source-config.c:432
 msgid "Copy task list contents locally for offline operation"
 msgstr "Kopiera innehåll i uppgiftslista lokalt för frånkopplad användning"
 
-#: ../e-util/e-cal-source-config.c:413
+#: ../e-util/e-cal-source-config.c:436
 msgid "Copy memo list contents locally for offline operation"
 msgstr "Kopiera innehåll i memolista lokalt för frånkopplad användning"
 
@@ -11154,16 +11514,17 @@ msgstr ""
 msgid "popup list"
 msgstr "popuplista"
 
-#: ../e-util/e-cell-date.c:52 ../mail/message-list.c:2033
+#: ../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:2033
 msgid "?"
 msgstr "?"
 
-#: ../e-util/e-cell-date-edit.c:298
+#: ../e-util/e-cell-date-edit.c:303
 msgid "Now"
 msgstr "Nu"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-cell-date-edit.c:306 ../e-util/e-datetime-format.c:208
+#: ../e-util/e-cell-date-edit.c:311 ../e-util/e-datetime-format.c:208
 #: ../modules/calendar/e-cal-shell-view-actions.c:1740
 #: ../modules/itip-formatter/itip-view.c:223
 msgid "Today"
@@ -11171,16 +11532,16 @@ msgstr "Idag"
 
 #. Translators: "None" as a label of a button to unset date in a
 #. * date table cell.
-#: ../e-util/e-cell-date-edit.c:316
+#: ../e-util/e-cell-date-edit.c:321
 msgctxt "table-date"
 msgid "None"
 msgstr "Inget"
 
-#: ../e-util/e-cell-date-edit.c:324 ../mail/e-mail-label-dialog.c:200
+#: ../e-util/e-cell-date-edit.c:329 ../mail/e-mail-label-dialog.c:200
 msgid "OK"
 msgstr "OK"
 
-#: ../e-util/e-cell-date-edit.c:873
+#: ../e-util/e-cell-date-edit.c:878
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Tiden måste anges i formatet: %s"
@@ -11278,7 +11639,7 @@ msgstr "Ange teckentabellen att använda"
 msgid "Other..."
 msgstr "Annan…"
 
-#: ../e-util/e-client-cache.c:1266
+#: ../e-util/e-client-cache.c:1148 ../e-util/e-client-cache.c:1279
 #, c-format
 msgid "Cannot create a client object from extension name '%s'"
 msgstr "Kan inte skapa ett klientobjekt från tillägget ”%s”"
@@ -11449,58 +11810,58 @@ msgstr "vit"
 
 #: ../e-util/e-color-combo.c:639 ../mail/e-mail-account-tree-view.c:134
 #: ../mail/e-mail-config-security-page.c:426
-#: ../mail/e-mail-config-security-page.c:566 ../mail/e-mail-reader.c:3863
-#: ../mail/mail-config.ui.h:69
+#: ../mail/e-mail-config-security-page.c:578 ../mail/e-mail-reader.c:3896
+#: ../mail/mail-config.ui.h:70
 msgid "Default"
 msgstr "Standard"
 
-#: ../e-util/e-dateedit.c:523
+#: ../e-util/e-dateedit.c:526
 msgid "Date and Time"
 msgstr "Datum och tid"
 
-#: ../e-util/e-dateedit.c:548
+#: ../e-util/e-dateedit.c:551
 msgid "Text entry to input date"
 msgstr "Textfält för att ange datum"
 
-#: ../e-util/e-dateedit.c:571
+#: ../e-util/e-dateedit.c:574
 msgid "Click this button to show a calendar"
 msgstr "Klicka på denna knapp för att visa en kalender"
 
-#: ../e-util/e-dateedit.c:625
+#: ../e-util/e-dateedit.c:628
 msgid "Drop-down combination box to select time"
 msgstr "Kombinationsruta för att välja tid"
 
-#: ../e-util/e-dateedit.c:626
+#: ../e-util/e-dateedit.c:629
 #: ../modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Time"
 msgstr "Tid"
 
-#: ../e-util/e-dateedit.c:700
+#: ../e-util/e-dateedit.c:703
 msgid "No_w"
 msgstr "N_u"
 
-#: ../e-util/e-dateedit.c:707
+#: ../e-util/e-dateedit.c:710
 msgid "_Today"
 msgstr "_Idag"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. * is not permitted.
-#: ../e-util/e-dateedit.c:716
+#: ../e-util/e-dateedit.c:719
 msgid "_None"
 msgstr "_Ingen"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../e-util/e-dateedit.c:1838 ../e-util/e-dateedit.c:2086
+#: ../e-util/e-dateedit.c:1841 ../e-util/e-dateedit.c:2089
 msgctxt "date"
 msgid "None"
 msgstr "Inget"
 
-#: ../e-util/e-dateedit.c:1978
+#: ../e-util/e-dateedit.c:1981
 msgid "Invalid Date Value"
 msgstr "Ogiltigt datumvärde"
 
-#: ../e-util/e-dateedit.c:2023
+#: ../e-util/e-dateedit.c:2026
 msgid "Invalid Time Value"
 msgstr "Ogiltigt tidsvärde"
 
@@ -11846,12 +12207,12 @@ msgstr "Hitta objekt som matchar följande villkor"
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../e-util/e-filter-rule.c:846 ../e-util/e-html-editor-page-dialog.c:62
+#: ../e-util/e-filter-rule.c:846 ../e-util/e-html-editor-page-dialog.c:63
 #: ../e-util/e-mail-identity-combo-box.c:476
-#: ../e-util/e-mail-signature-combo-box.c:367 ../e-util/e-proxy-editor.c:560
+#: ../e-util/e-mail-signature-combo-box.c:367
 #: ../libemail-engine/camel-null-store.c:27
 #: ../mail/e-mail-config-summary-page.c:138
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:616
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:615
 msgid "None"
 msgstr "Ingen"
 
@@ -11880,11 +12241,11 @@ msgid "A_dd Condition"
 msgstr "Lägg till v_illkor"
 
 #: ../e-util/e-filter-rule.c:1244 ../e-util/filter.ui.h:1
-#: ../mail/em-utils.c:229
+#: ../mail/em-utils.c:165
 msgid "Incoming"
 msgstr "Inkommande"
 
-#: ../e-util/e-filter-rule.c:1244 ../mail/em-utils.c:230
+#: ../e-util/e-filter-rule.c:1244 ../mail/em-utils.c:166
 msgid "Outgoing"
 msgstr "Utgående"
 
@@ -11896,651 +12257,651 @@ msgstr "Misslyckades med att infoga HTML-fil."
 msgid "Failed to insert text file."
 msgstr "Misslyckades med att infoga textfil."
 
-#: ../e-util/e-html-editor-actions.c:606
+#: ../e-util/e-html-editor-actions.c:614
 msgid "Insert HTML File"
 msgstr "Infoga HTML-fil"
 
-#: ../e-util/e-html-editor-actions.c:612
+#: ../e-util/e-html-editor-actions.c:620
 msgid "HTML file"
 msgstr "HTML-fil"
 
-#: ../e-util/e-html-editor-actions.c:639
+#: ../e-util/e-html-editor-actions.c:647
 msgctxt "dialog-title"
 msgid "Insert Image"
 msgstr "Infoga bild"
 
-#: ../e-util/e-html-editor-actions.c:700
+#: ../e-util/e-html-editor-actions.c:709
 msgid "Insert text file"
 msgstr "Infoga textfil"
 
-#: ../e-util/e-html-editor-actions.c:706
+#: ../e-util/e-html-editor-actions.c:715
 msgid "Text file"
 msgstr "Textfil"
 
-#: ../e-util/e-html-editor-actions.c:1090
+#: ../e-util/e-html-editor-actions.c:1101
 msgid "Copy selected text to the clipboard"
 msgstr "Kopiera markerad text till urklipp"
 
-#: ../e-util/e-html-editor-actions.c:1097
+#: ../e-util/e-html-editor-actions.c:1108
 msgid "Cut selected text to the clipboard"
 msgstr "Klipp ut markerad text till urklipp"
 
 #. Widgets are treating Ctrl + v shortcut themselves
-#: ../e-util/e-html-editor-actions.c:1104
+#: ../e-util/e-html-editor-actions.c:1115
 msgid "Paste text from the clipboard"
 msgstr "Klistra in text från urklipp"
 
-#: ../e-util/e-html-editor-actions.c:1111
+#: ../e-util/e-html-editor-actions.c:1122
 msgid "Redo the last undone action"
 msgstr "Gör om senaste ångrade åtgärden"
 
-#: ../e-util/e-html-editor-actions.c:1125
+#: ../e-util/e-html-editor-actions.c:1136
 msgid "Undo the last action"
 msgstr "Ångra den senaste åtgärden"
 
-#: ../e-util/e-html-editor-actions.c:1146
+#: ../e-util/e-html-editor-actions.c:1157
 msgid "For_mat"
 msgstr "_Format"
 
-#: ../e-util/e-html-editor-actions.c:1153
+#: ../e-util/e-html-editor-actions.c:1164
 msgid "_Paragraph Style"
 msgstr "St_yckestil"
 
-#: ../e-util/e-html-editor-actions.c:1167
+#: ../e-util/e-html-editor-actions.c:1178
 #: ../e-util/e-html-editor-image-dialog.c:635
 msgid "_Alignment"
 msgstr "_Justering"
 
-#: ../e-util/e-html-editor-actions.c:1174
+#: ../e-util/e-html-editor-actions.c:1185
 msgid "Current _Languages"
 msgstr "Aktuella _språk"
 
-#: ../e-util/e-html-editor-actions.c:1191
+#: ../e-util/e-html-editor-actions.c:1202
 msgid "_Increase Indent"
 msgstr "Öka _indrag"
 
-#: ../e-util/e-html-editor-actions.c:1193
+#: ../e-util/e-html-editor-actions.c:1204
 msgid "Increase Indent"
 msgstr "Öka indrag"
 
-#: ../e-util/e-html-editor-actions.c:1198
+#: ../e-util/e-html-editor-actions.c:1209
 msgid "_HTML File..."
 msgstr "_HTML-fil…"
 
-#: ../e-util/e-html-editor-actions.c:1205
+#: ../e-util/e-html-editor-actions.c:1216
 msgid "Te_xt File..."
 msgstr "Te_xtfil…"
 
-#: ../e-util/e-html-editor-actions.c:1212
+#: ../e-util/e-html-editor-actions.c:1223
 msgid "Paste _Quotation"
 msgstr "Klistra in _citat"
 
-#: ../e-util/e-html-editor-actions.c:1219
+#: ../e-util/e-html-editor-actions.c:1230
 msgid "_Find..."
 msgstr "_Sök…"
 
-#: ../e-util/e-html-editor-actions.c:1221
+#: ../e-util/e-html-editor-actions.c:1232
 msgid "Search for text"
 msgstr "Sök efter text"
 
-#: ../e-util/e-html-editor-actions.c:1226
+#: ../e-util/e-html-editor-actions.c:1237
 msgid "Find A_gain"
 msgstr "Sök ige_n"
 
-#: ../e-util/e-html-editor-actions.c:1233
+#: ../e-util/e-html-editor-actions.c:1244
 msgid "Re_place..."
 msgstr "_Ersätt…"
 
-#: ../e-util/e-html-editor-actions.c:1235
+#: ../e-util/e-html-editor-actions.c:1246
 msgid "Search for and replace text"
 msgstr "Sök efter och ersätt text"
 
-#: ../e-util/e-html-editor-actions.c:1240
+#: ../e-util/e-html-editor-actions.c:1251
 msgid "Check _Spelling..."
 msgstr "Kontrollera _stavning…"
 
-#: ../e-util/e-html-editor-actions.c:1247
+#: ../e-util/e-html-editor-actions.c:1258
 msgid "_Decrease Indent"
 msgstr "_Minska indrag"
 
-#: ../e-util/e-html-editor-actions.c:1249
+#: ../e-util/e-html-editor-actions.c:1260
 msgid "Decrease Indent"
 msgstr "Minska indrag"
 
-#: ../e-util/e-html-editor-actions.c:1254
+#: ../e-util/e-html-editor-actions.c:1265
 msgid "_Wrap Lines"
 msgstr "_Radbryt rader"
 
-#: ../e-util/e-html-editor-actions.c:1261
+#: ../e-util/e-html-editor-actions.c:1272
 msgid "Open Inspector"
 msgstr "Öppna inspektör"
 
 #. Center
-#: ../e-util/e-html-editor-actions.c:1271
+#: ../e-util/e-html-editor-actions.c:1282
 #: ../e-util/e-html-editor-paragraph-dialog.c:110
 msgid "_Center"
 msgstr "_Centrera"
 
-#: ../e-util/e-html-editor-actions.c:1273
+#: ../e-util/e-html-editor-actions.c:1284
 msgid "Center Alignment"
 msgstr "Centerjustering"
 
 #. Left
-#: ../e-util/e-html-editor-actions.c:1278
+#: ../e-util/e-html-editor-actions.c:1289
 #: ../e-util/e-html-editor-paragraph-dialog.c:101
 msgid "_Left"
 msgstr "_Vänster"
 
-#: ../e-util/e-html-editor-actions.c:1280
+#: ../e-util/e-html-editor-actions.c:1291
 msgid "Left Alignment"
 msgstr "Vänsterjustering"
 
 #. Right
-#: ../e-util/e-html-editor-actions.c:1285
+#: ../e-util/e-html-editor-actions.c:1296
 #: ../e-util/e-html-editor-paragraph-dialog.c:119
 msgid "_Right"
 msgstr "_Höger"
 
-#: ../e-util/e-html-editor-actions.c:1287
+#: ../e-util/e-html-editor-actions.c:1298
 msgid "Right Alignment"
 msgstr "Högerjustering"
 
-#: ../e-util/e-html-editor-actions.c:1295
+#: ../e-util/e-html-editor-actions.c:1306
 #: ../modules/text-highlight/languages.c:72
 msgid "_HTML"
 msgstr "_HTML"
 
-#: ../e-util/e-html-editor-actions.c:1297
+#: ../e-util/e-html-editor-actions.c:1308
 msgid "HTML editing mode"
 msgstr "HTML-redigeringsläge"
 
-#: ../e-util/e-html-editor-actions.c:1302
+#: ../e-util/e-html-editor-actions.c:1313
 msgid "Plain _Text"
 msgstr "Vanlig _text"
 
-#: ../e-util/e-html-editor-actions.c:1304
+#: ../e-util/e-html-editor-actions.c:1315
 msgid "Plain text editing mode"
 msgstr "Redigeringsläge för vanlig text"
 
-#: ../e-util/e-html-editor-actions.c:1312
+#: ../e-util/e-html-editor-actions.c:1323
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../e-util/e-html-editor-actions.c:1319
+#: ../e-util/e-html-editor-actions.c:1330
 msgid "Header _1"
 msgstr "Rubrik _1"
 
-#: ../e-util/e-html-editor-actions.c:1326
+#: ../e-util/e-html-editor-actions.c:1337
 msgid "Header _2"
 msgstr "Rubrik _2"
 
-#: ../e-util/e-html-editor-actions.c:1333
+#: ../e-util/e-html-editor-actions.c:1344
 msgid "Header _3"
 msgstr "Rubrik _3"
 
-#: ../e-util/e-html-editor-actions.c:1340
+#: ../e-util/e-html-editor-actions.c:1351
 msgid "Header _4"
 msgstr "Rubrik _4"
 
-#: ../e-util/e-html-editor-actions.c:1347
+#: ../e-util/e-html-editor-actions.c:1358
 msgid "Header _5"
 msgstr "Rubrik _5"
 
-#: ../e-util/e-html-editor-actions.c:1354
+#: ../e-util/e-html-editor-actions.c:1365
 msgid "Header _6"
 msgstr "Rubrik _6"
 
-#: ../e-util/e-html-editor-actions.c:1361
+#: ../e-util/e-html-editor-actions.c:1372
 msgid "_Preformatted"
 msgstr "_Förformaterad"
 
-#: ../e-util/e-html-editor-actions.c:1368
+#: ../e-util/e-html-editor-actions.c:1379
 msgid "A_ddress"
 msgstr "A_dress"
 
-#: ../e-util/e-html-editor-actions.c:1375
+#: ../e-util/e-html-editor-actions.c:1386
 msgid "_Blockquote"
 msgstr "Citat_block"
 
-#: ../e-util/e-html-editor-actions.c:1382
+#: ../e-util/e-html-editor-actions.c:1393
 msgid "_Bulleted List"
 msgstr "_Punktlista"
 
-#: ../e-util/e-html-editor-actions.c:1389
+#: ../e-util/e-html-editor-actions.c:1400
 msgid "_Roman Numeral List"
 msgstr "_Romerskt numrerad lista"
 
-#: ../e-util/e-html-editor-actions.c:1396
+#: ../e-util/e-html-editor-actions.c:1407
 msgid "Numbered _List"
 msgstr "Numrerad _lista"
 
-#: ../e-util/e-html-editor-actions.c:1403
+#: ../e-util/e-html-editor-actions.c:1414
 msgid "_Alphabetical List"
 msgstr "_Alfabetisk lista"
 
-#: ../e-util/e-html-editor-actions.c:1419
-#: ../e-util/e-html-editor-actions.c:1457
+#: ../e-util/e-html-editor-actions.c:1430
+#: ../e-util/e-html-editor-actions.c:1468
 msgid "_Image..."
 msgstr "_Bild…"
 
 #. Translators: This is an action tooltip
-#: ../e-util/e-html-editor-actions.c:1422
+#: ../e-util/e-html-editor-actions.c:1433
 msgid "Insert Image"
 msgstr "Infoga bild"
 
-#: ../e-util/e-html-editor-actions.c:1427
-#: ../e-util/e-html-editor-actions.c:1464
+#: ../e-util/e-html-editor-actions.c:1438
+#: ../e-util/e-html-editor-actions.c:1475
 msgid "_Link..."
 msgstr "_Länk…"
 
-#: ../e-util/e-html-editor-actions.c:1429
+#: ../e-util/e-html-editor-actions.c:1440
 msgid "Insert Link"
 msgstr "Infoga länk"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1435
-#: ../e-util/e-html-editor-actions.c:1479
+#: ../e-util/e-html-editor-actions.c:1446
+#: ../e-util/e-html-editor-actions.c:1490
 msgid "_Rule..."
 msgstr "_Linje…"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1438
+#: ../e-util/e-html-editor-actions.c:1449
 msgid "Insert Rule"
 msgstr "Infoga linje"
 
-#: ../e-util/e-html-editor-actions.c:1443
-#: ../e-util/e-html-editor-actions.c:1486
+#: ../e-util/e-html-editor-actions.c:1454
+#: ../e-util/e-html-editor-actions.c:1497
 msgid "_Table..."
 msgstr "_Tabell…"
 
-#: ../e-util/e-html-editor-actions.c:1445
+#: ../e-util/e-html-editor-actions.c:1456
 msgid "Insert Table"
 msgstr "Infoga tabell"
 
-#: ../e-util/e-html-editor-actions.c:1450
+#: ../e-util/e-html-editor-actions.c:1461
 msgid "_Cell..."
 msgstr "_Cell…"
 
-#: ../e-util/e-html-editor-actions.c:1471
+#: ../e-util/e-html-editor-actions.c:1482
 msgid "Pa_ge..."
 msgstr "Si_da…"
 
-#: ../e-util/e-html-editor-actions.c:1495
+#: ../e-util/e-html-editor-actions.c:1506
 msgid "Font _Size"
 msgstr "Typsnitts_storlek"
 
-#: ../e-util/e-html-editor-actions.c:1502
+#: ../e-util/e-html-editor-actions.c:1513
 msgid "_Font Style"
 msgstr "_Typsnittsstil"
 
-#: ../e-util/e-html-editor-actions.c:1509
+#: ../e-util/e-html-editor-actions.c:1520
 msgid "Paste As _Text"
 msgstr "Klistra in som _text"
 
-#: ../e-util/e-html-editor-actions.c:1520
+#: ../e-util/e-html-editor-actions.c:1531
 #: ../e-util/e-html-editor-text-dialog.c:214
 msgid "_Bold"
 msgstr "_Fet"
 
-#: ../e-util/e-html-editor-actions.c:1522
+#: ../e-util/e-html-editor-actions.c:1533
 msgid "Bold"
 msgstr "Fet"
 
-#: ../e-util/e-html-editor-actions.c:1528
+#: ../e-util/e-html-editor-actions.c:1539
 #: ../e-util/e-html-editor-text-dialog.c:225
 msgid "_Italic"
 msgstr "_Kursiv"
 
-#: ../e-util/e-html-editor-actions.c:1530
+#: ../e-util/e-html-editor-actions.c:1541
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../e-util/e-html-editor-actions.c:1536
+#: ../e-util/e-html-editor-actions.c:1547
 msgid "_Plain Text"
 msgstr "_Vanlig text"
 
-#: ../e-util/e-html-editor-actions.c:1544
+#: ../e-util/e-html-editor-actions.c:1555
 #: ../e-util/e-html-editor-text-dialog.c:246
 msgid "_Strikethrough"
 msgstr "_Genomstruken"
 
-#: ../e-util/e-html-editor-actions.c:1546
+#: ../e-util/e-html-editor-actions.c:1557
 msgid "Strikethrough"
 msgstr "Genomstruken"
 
-#: ../e-util/e-html-editor-actions.c:1552
+#: ../e-util/e-html-editor-actions.c:1563
 #: ../e-util/e-html-editor-text-dialog.c:236
 msgid "_Underline"
 msgstr "_Understruken"
 
-#: ../e-util/e-html-editor-actions.c:1554
+#: ../e-util/e-html-editor-actions.c:1565
 msgid "Underline"
 msgstr "Understruken"
 
 #. 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:1564
+#: ../e-util/e-html-editor-actions.c:1575
 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:1572
+#: ../e-util/e-html-editor-actions.c:1583
 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:1580
+#: ../e-util/e-html-editor-actions.c:1591
 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:1588
+#: ../e-util/e-html-editor-actions.c:1599
 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:1596
+#: ../e-util/e-html-editor-actions.c:1607
 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:1604
+#: ../e-util/e-html-editor-actions.c:1615
 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:1612
+#: ../e-util/e-html-editor-actions.c:1623
 msgid "+4"
 msgstr "+4"
 
-#: ../e-util/e-html-editor-actions.c:1631
+#: ../e-util/e-html-editor-actions.c:1642
 msgid "Cell Contents"
 msgstr "Cellinnehåll"
 
-#: ../e-util/e-html-editor-actions.c:1638
+#: ../e-util/e-html-editor-actions.c:1649
 msgid "Column"
 msgstr "Kolumn"
 
-#: ../e-util/e-html-editor-actions.c:1645
+#: ../e-util/e-html-editor-actions.c:1656
 msgid "Row"
 msgstr "Rad"
 
-#: ../e-util/e-html-editor-actions.c:1652
-#: ../e-util/e-html-editor-actions.c:1737
+#: ../e-util/e-html-editor-actions.c:1663
+#: ../e-util/e-html-editor-actions.c:1748
 msgid "Table"
 msgstr "Tabell"
 
 #. Translators: Popup menu item caption, containing all the Delete options for a table
-#: ../e-util/e-html-editor-actions.c:1662
+#: ../e-util/e-html-editor-actions.c:1673
 msgid "Table Delete"
 msgstr "Tabellborttagning"
 
-#: ../e-util/e-html-editor-actions.c:1669 ../e-util/e-text.c:2127
+#: ../e-util/e-html-editor-actions.c:1680 ../e-util/e-text.c:2147
 msgid "Input Methods"
 msgstr "Inmatningsmetoder"
 
 #. Translators: Popup menu item caption, containing all the Insert options for a table
-#: ../e-util/e-html-editor-actions.c:1677
+#: ../e-util/e-html-editor-actions.c:1688
 msgid "Table Insert"
 msgstr "Tabellinfogning"
 
-#: ../e-util/e-html-editor-actions.c:1684
+#: ../e-util/e-html-editor-actions.c:1695
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: ../e-util/e-html-editor-actions.c:1702
+#: ../e-util/e-html-editor-actions.c:1713
 msgid "Column After"
 msgstr "Kolumn efter"
 
-#: ../e-util/e-html-editor-actions.c:1709
+#: ../e-util/e-html-editor-actions.c:1720
 msgid "Column Before"
 msgstr "Kolumn före"
 
-#: ../e-util/e-html-editor-actions.c:1716
+#: ../e-util/e-html-editor-actions.c:1727
 msgid "Insert _Link"
 msgstr "Infoga _länk"
 
-#: ../e-util/e-html-editor-actions.c:1723
+#: ../e-util/e-html-editor-actions.c:1734
 msgid "Row Above"
 msgstr "Rad över"
 
-#: ../e-util/e-html-editor-actions.c:1730
+#: ../e-util/e-html-editor-actions.c:1741
 msgid "Row Below"
 msgstr "Rad under"
 
-#: ../e-util/e-html-editor-actions.c:1744
+#: ../e-util/e-html-editor-actions.c:1755
 msgid "Cell..."
 msgstr "Cell…"
 
-#: ../e-util/e-html-editor-actions.c:1751
+#: ../e-util/e-html-editor-actions.c:1762
 msgid "Image..."
 msgstr "Bild…"
 
-#: ../e-util/e-html-editor-actions.c:1758
+#: ../e-util/e-html-editor-actions.c:1769
 msgid "Link..."
 msgstr "Länk…"
 
-#: ../e-util/e-html-editor-actions.c:1765
+#: ../e-util/e-html-editor-actions.c:1776
 msgid "Page..."
 msgstr "Sida…"
 
-#: ../e-util/e-html-editor-actions.c:1772
+#: ../e-util/e-html-editor-actions.c:1783
 msgid "Paragraph..."
 msgstr "Stycke…"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1780
+#: ../e-util/e-html-editor-actions.c:1791
 msgid "Rule..."
 msgstr "Linje…"
 
-#: ../e-util/e-html-editor-actions.c:1787
+#: ../e-util/e-html-editor-actions.c:1798
 msgid "Table..."
 msgstr "Tabell…"
 
-#: ../e-util/e-html-editor-actions.c:1794
+#: ../e-util/e-html-editor-actions.c:1805
 msgid "Text..."
 msgstr "Text…"
 
-#: ../e-util/e-html-editor-actions.c:1801
+#: ../e-util/e-html-editor-actions.c:1812
 msgid "Remove Link"
 msgstr "Ta bort länk"
 
-#: ../e-util/e-html-editor-actions.c:1818
+#: ../e-util/e-html-editor-actions.c:1829
 msgid "Add Word to Dictionary"
 msgstr "Lägg till ord i ordbok"
 
-#: ../e-util/e-html-editor-actions.c:1825
+#: ../e-util/e-html-editor-actions.c:1836
 msgid "Ignore Misspelled Word"
 msgstr "Ignorera felstavat ord"
 
-#: ../e-util/e-html-editor-actions.c:1832
+#: ../e-util/e-html-editor-actions.c:1843
 msgid "Add Word To"
 msgstr "Lägg till ord i"
 
-#: ../e-util/e-html-editor-actions.c:1841
+#: ../e-util/e-html-editor-actions.c:1852
 msgid "More Suggestions"
 msgstr "Fler förslag"
 
 #. 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:1949
+#: ../e-util/e-html-editor-actions.c:1960
 #, c-format
 msgid "%s Dictionary"
 msgstr "Ordboken %s"
 
-#: ../e-util/e-html-editor-actions.c:2036
+#: ../e-util/e-html-editor-actions.c:2047
 msgid "_Emoticon"
 msgstr "Humörsymb_ol"
 
-#: ../e-util/e-html-editor-actions.c:2037
+#: ../e-util/e-html-editor-actions.c:2048
 msgid "Insert Emoticon"
 msgstr "Infoga humörsymbol"
 
-#: ../e-util/e-html-editor-actions.c:2105
+#: ../e-util/e-html-editor-actions.c:2116
 msgid "Re_place"
 msgstr "E_rsätt"
 
-#: ../e-util/e-html-editor-actions.c:2108
+#: ../e-util/e-html-editor-actions.c:2119
 msgid "_Image"
 msgstr "_Bild"
 
-#: ../e-util/e-html-editor-actions.c:2111
+#: ../e-util/e-html-editor-actions.c:2122
 msgid "_Link"
 msgstr "_Länk"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:2115
+#: ../e-util/e-html-editor-actions.c:2126
 msgid "_Rule"
 msgstr "_Linje"
 
-#: ../e-util/e-html-editor-actions.c:2118
-#: ../e-util/e-html-editor-cell-dialog.c:732
+#: ../e-util/e-html-editor-actions.c:2129
+#: ../e-util/e-html-editor-cell-dialog.c:738
 msgid "_Table"
 msgstr "_Tabell"
 
-#: ../e-util/e-html-editor.c:672
+#: ../e-util/e-html-editor.c:681
 msgid "Paragraph Style"
 msgstr "Stil på stycke"
 
-#: ../e-util/e-html-editor.c:686
+#: ../e-util/e-html-editor.c:695
 msgid "Editing Mode"
 msgstr "Redigeringsläge"
 
-#: ../e-util/e-html-editor.c:698
+#: ../e-util/e-html-editor.c:707
 msgid "Font Color"
 msgstr "Typsnittsfärg"
 
-#: ../e-util/e-html-editor.c:716
+#: ../e-util/e-html-editor.c:725
 msgid "Font Size"
 msgstr "Typsnittsstorlek"
 
-#: ../e-util/e-html-editor-cell-dialog.c:692
+#: ../e-util/e-html-editor-cell-dialog.c:698
 msgid "<b>Scope</b>"
 msgstr "<b>Räckvidd</b>"
 
-#: ../e-util/e-html-editor-cell-dialog.c:706
+#: ../e-util/e-html-editor-cell-dialog.c:712
 msgid "C_ell"
 msgstr "C_ell"
 
-#: ../e-util/e-html-editor-cell-dialog.c:719
+#: ../e-util/e-html-editor-cell-dialog.c:725
 msgid "_Row"
 msgstr "_Rad"
 
-#: ../e-util/e-html-editor-cell-dialog.c:745
+#: ../e-util/e-html-editor-cell-dialog.c:751
 msgid "Col_umn"
 msgstr "Kol_umn"
 
-#: ../e-util/e-html-editor-cell-dialog.c:755
+#: ../e-util/e-html-editor-cell-dialog.c:761
 msgid "<b>Alignment &amp; Behavior</b>"
 msgstr "<b>Justering &amp; beteende</b>"
 
-#: ../e-util/e-html-editor-cell-dialog.c:768
-#: ../e-util/e-html-editor-hrule-dialog.c:407
-#: ../e-util/e-html-editor-table-dialog.c:890
+#: ../e-util/e-html-editor-cell-dialog.c:774
+#: ../e-util/e-html-editor-hrule-dialog.c:413
+#: ../e-util/e-html-editor-table-dialog.c:900
 msgid "Left"
 msgstr "Vänster"
 
-#: ../e-util/e-html-editor-cell-dialog.c:769
-#: ../e-util/e-html-editor-hrule-dialog.c:409
-#: ../e-util/e-html-editor-table-dialog.c:891
+#: ../e-util/e-html-editor-cell-dialog.c:775
+#: ../e-util/e-html-editor-hrule-dialog.c:415
+#: ../e-util/e-html-editor-table-dialog.c:901
 msgid "Center"
 msgstr "Centrera"
 
-#: ../e-util/e-html-editor-cell-dialog.c:770
-#: ../e-util/e-html-editor-hrule-dialog.c:411
-#: ../e-util/e-html-editor-table-dialog.c:892
+#: ../e-util/e-html-editor-cell-dialog.c:776
+#: ../e-util/e-html-editor-hrule-dialog.c:417
+#: ../e-util/e-html-editor-table-dialog.c:902
 msgid "Right"
 msgstr "Höger"
 
-#: ../e-util/e-html-editor-cell-dialog.c:778
+#: ../e-util/e-html-editor-cell-dialog.c:784
 msgid "_Horizontal:"
 msgstr "_Horisontell:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:786
+#: ../e-util/e-html-editor-cell-dialog.c:792
 #: ../e-util/e-html-editor-image-dialog.c:625
 msgid "Top"
 msgstr "Överkant"
 
-#: ../e-util/e-html-editor-cell-dialog.c:787
+#: ../e-util/e-html-editor-cell-dialog.c:793
 #: ../e-util/e-html-editor-image-dialog.c:626
 msgid "Middle"
 msgstr "Mitten"
 
-#: ../e-util/e-html-editor-cell-dialog.c:788
+#: ../e-util/e-html-editor-cell-dialog.c:794
 #: ../e-util/e-html-editor-image-dialog.c:627
 msgid "Bottom"
 msgstr "Underkant"
 
-#: ../e-util/e-html-editor-cell-dialog.c:796
+#: ../e-util/e-html-editor-cell-dialog.c:802
 msgid "_Vertical:"
 msgstr "_Vertikal:"
 
 #. Wrap Text
-#: ../e-util/e-html-editor-cell-dialog.c:802
+#: ../e-util/e-html-editor-cell-dialog.c:808
 msgid "_Wrap Text"
 msgstr "_Radbryt text"
 
 #. Header Style
-#: ../e-util/e-html-editor-cell-dialog.c:810
+#: ../e-util/e-html-editor-cell-dialog.c:816
 msgid "_Header Style"
 msgstr "Ru_brikstil"
 
-#: ../e-util/e-html-editor-cell-dialog.c:824
+#: ../e-util/e-html-editor-cell-dialog.c:830
 #: ../e-util/e-html-editor-image-dialog.c:565
-#: ../e-util/e-html-editor-table-dialog.c:802
+#: ../e-util/e-html-editor-table-dialog.c:812
 msgid "<b>Layout</b>"
 msgstr "<b>Layout</b>"
 
 #. Width
-#: ../e-util/e-html-editor-cell-dialog.c:835
+#: ../e-util/e-html-editor-cell-dialog.c:841
 msgid "_Width"
 msgstr "_Bredd"
 
-#: ../e-util/e-html-editor-cell-dialog.c:874
+#: ../e-util/e-html-editor-cell-dialog.c:880
 msgid "Row S_pan:"
 msgstr "Radut_sträckning:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:888
+#: ../e-util/e-html-editor-cell-dialog.c:894
 msgid "Co_lumn Span:"
 msgstr "Ko_lumnutsträckning:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:895
-#: ../e-util/e-html-editor-table-dialog.c:906
+#: ../e-util/e-html-editor-cell-dialog.c:901
+#: ../e-util/e-html-editor-table-dialog.c:916
 msgid "<b>Background</b>"
 msgstr "<b>Bakgrund</b>"
 
-#: ../e-util/e-html-editor-cell-dialog.c:908
-#: ../e-util/e-html-editor-table-dialog.c:919
+#: ../e-util/e-html-editor-cell-dialog.c:914
+#: ../e-util/e-html-editor-table-dialog.c:929
 msgid "Transparent"
 msgstr "Transparent"
 
-#: ../e-util/e-html-editor-cell-dialog.c:916
+#: ../e-util/e-html-editor-cell-dialog.c:922
 msgid "C_olor:"
 msgstr "F_ärg:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:924
+#: ../e-util/e-html-editor-cell-dialog.c:930
 #: ../e-util/e-html-editor-image-dialog.c:527
-#: ../e-util/e-html-editor-table-dialog.c:935
+#: ../e-util/e-html-editor-table-dialog.c:945
 msgid "Choose Background Image"
 msgstr "Välj bakgrundsbild"
 
-#: ../e-util/e-html-editor-cell-dialog.c:929
+#: ../e-util/e-html-editor-cell-dialog.c:935
 #: ../e-util/e-html-editor-image-dialog.c:533
-#: ../e-util/e-html-editor-table-dialog.c:940
+#: ../e-util/e-html-editor-table-dialog.c:950
 msgid "Images"
 msgstr "Bilder"
 
-#: ../e-util/e-html-editor-cell-dialog.c:942
+#: ../e-util/e-html-editor-cell-dialog.c:948
 msgid "_Image:"
 msgstr "B_ild:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:949
-#: ../e-util/e-html-editor-page-dialog.c:579
-#: ../e-util/e-html-editor-table-dialog.c:960
+#: ../e-util/e-html-editor-cell-dialog.c:955
+#: ../e-util/e-html-editor-page-dialog.c:660
+#: ../e-util/e-html-editor-table-dialog.c:970
 msgid "_Remove image"
 msgstr "Ta bo_rt bild"
 
-#: ../e-util/e-html-editor-cell-dialog.c:969
+#: ../e-util/e-html-editor-cell-dialog.c:975
 msgid "Cell Properties"
 msgstr "Cellegenskaper"
 
@@ -12567,43 +12928,43 @@ msgstr "_Fortsätt sökning i början"
 msgid "Find"
 msgstr "Sök"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:342
+#: ../e-util/e-html-editor-hrule-dialog.c:348
 msgid "<b>Size</b>"
 msgstr "<b>Storlek</b>"
 
 #. Width
-#: ../e-util/e-html-editor-hrule-dialog.c:362
+#: ../e-util/e-html-editor-hrule-dialog.c:368
 #: ../e-util/e-html-editor-image-dialog.c:583
-#: ../e-util/e-html-editor-table-dialog.c:813
+#: ../e-util/e-html-editor-table-dialog.c:823
 msgid "_Width:"
 msgstr "_Bredd:"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:387
+#: ../e-util/e-html-editor-hrule-dialog.c:393
 msgid "_Size:"
 msgstr "_Storlek:"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:394
+#: ../e-util/e-html-editor-hrule-dialog.c:400
 msgid "<b>Style</b>"
 msgstr "<b>Stil</b>"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:419
-#: ../e-util/e-html-editor-table-dialog.c:899
+#: ../e-util/e-html-editor-hrule-dialog.c:425
+#: ../e-util/e-html-editor-table-dialog.c:909
 msgid "_Alignment:"
 msgstr "_Justering:"
 
 #. Shaded
-#: ../e-util/e-html-editor-hrule-dialog.c:425
+#: ../e-util/e-html-editor-hrule-dialog.c:431
 msgid "S_haded"
 msgstr "S_kuggad"
 
 # rule=<hr>
-#: ../e-util/e-html-editor-hrule-dialog.c:442
+#: ../e-util/e-html-editor-hrule-dialog.c:448
 msgid "Rule properties"
 msgstr "Linjeegenskaper"
 
 #: ../e-util/e-html-editor-image-dialog.c:515
 #: ../e-util/e-html-editor-paragraph-dialog.c:66
-#: ../e-util/e-html-editor-table-dialog.c:756
+#: ../e-util/e-html-editor-table-dialog.c:766
 msgid "<b>General</b>"
 msgstr "<b>Allmänt</b>"
 
@@ -12624,7 +12985,7 @@ msgid "_Y-Padding:"
 msgstr "_Y-utfyllnad:"
 
 #: ../e-util/e-html-editor-image-dialog.c:680
-#: ../e-util/e-html-editor-table-dialog.c:880
+#: ../e-util/e-html-editor-table-dialog.c:890
 msgid "_Border:"
 msgstr "_Kant:"
 
@@ -12633,12 +12994,12 @@ msgid "<b>Link</b>"
 msgstr "<b>Länk</b>"
 
 #: ../e-util/e-html-editor-image-dialog.c:708
-#: ../e-util/e-html-editor-link-dialog.c:345
+#: ../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-link-dialog.c:350
+#: ../e-util/e-html-editor-link-dialog.c:405
 msgid "_Test URL..."
 msgstr "_Test-URL…"
 
@@ -12646,77 +13007,84 @@ msgstr "_Test-URL…"
 msgid "Image Properties"
 msgstr "Bildegenskaper"
 
-#: ../e-util/e-html-editor-link-dialog.c:374
+#: ../e-util/e-html-editor-link-dialog.c:429
 msgid "_Remove Link"
 msgstr "Ta bo_rt länk"
 
-#: ../e-util/e-html-editor-link-dialog.c:399
+#: ../e-util/e-html-editor-link-dialog.c:454
 msgid "Link Properties"
 msgstr "Länkegenskaper"
 
-#: ../e-util/e-html-editor-page-dialog.c:71
+#: ../e-util/e-html-editor-page-dialog.c:72
 msgid "Perforated Paper"
 msgstr "Hålat papper"
 
-#: ../e-util/e-html-editor-page-dialog.c:80
+#: ../e-util/e-html-editor-page-dialog.c:81
 msgid "Blue Ink"
 msgstr "Blått bläck"
 
-#: ../e-util/e-html-editor-page-dialog.c:89
+#: ../e-util/e-html-editor-page-dialog.c:90
 msgid "Paper"
 msgstr "Papper"
 
-#: ../e-util/e-html-editor-page-dialog.c:98
+#: ../e-util/e-html-editor-page-dialog.c:99
 msgid "Ribbon"
 msgstr "Band"
 
-#: ../e-util/e-html-editor-page-dialog.c:107
+#: ../e-util/e-html-editor-page-dialog.c:108
 msgid "Midnight"
 msgstr "Midnatt"
 
-#: ../e-util/e-html-editor-page-dialog.c:125 ../mail/filtertypes.xml.in.h:36
+#: ../e-util/e-html-editor-page-dialog.c:126 ../mail/filtertypes.xml.in.h:36
 #: ../mail/searchtypes.xml.in.h:39 ../mail/vfoldertypes.xml.in.h:39
 msgid "Draft"
 msgstr "Utkast"
 
-#: ../e-util/e-html-editor-page-dialog.c:134
+#: ../e-util/e-html-editor-page-dialog.c:135
 msgid "Graph Paper"
 msgstr "Grafpapper"
 
-#: ../e-util/e-html-editor-page-dialog.c:478
+#: ../e-util/e-html-editor-page-dialog.c:544
 msgid "<b>Colors</b>"
 msgstr "<b>Färger</b>"
 
-#: ../e-util/e-html-editor-page-dialog.c:497
+#: ../e-util/e-html-editor-page-dialog.c:563
 msgid "_Text:"
 msgstr "_Text:"
 
-#: ../e-util/e-html-editor-page-dialog.c:512
+#: ../e-util/e-html-editor-page-dialog.c:578
 msgid "_Link:"
 msgstr "_Länk:"
 
-#: ../e-util/e-html-editor-page-dialog.c:527
+#: ../e-util/e-html-editor-page-dialog.c:593
+#, fuzzy
+#| msgid "_Link:"
+msgid "_Visited Link:"
+msgstr "_Länk:"
+
+#: ../e-util/e-html-editor-page-dialog.c:608
 msgid "_Background:"
 msgstr "_Bakgrund:"
 
-#: ../e-util/e-html-editor-page-dialog.c:535
+#: ../e-util/e-html-editor-page-dialog.c:616
 msgid "<b>Background Image</b>"
 msgstr "<b>Bakgrundsbild</b>"
 
-#: ../e-util/e-html-editor-page-dialog.c:557
+#: ../e-util/e-html-editor-page-dialog.c:638
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
 msgid "_Template:"
 msgstr "_Mall:"
 
-#: ../e-util/e-html-editor-page-dialog.c:565
+#: ../e-util/e-html-editor-page-dialog.c:646
 #: ../e-util/e-import-assistant.c:283
 msgid "Select a file"
 msgstr "Välj en fil"
 
-#: ../e-util/e-html-editor-page-dialog.c:572
+#: ../e-util/e-html-editor-page-dialog.c:653
 msgid "_Custom:"
 msgstr "An_passad:"
 
-#: ../e-util/e-html-editor-page-dialog.c:599
+#: ../e-util/e-html-editor-page-dialog.c:680
 msgid "Page Properties"
 msgstr "Sidegenskaper"
 
@@ -12778,76 +13146,76 @@ msgstr "Ersätt"
 msgid "<b>Suggestions for '%s'</b>"
 msgstr "<b>Förslag för ”%s”</b>"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:501
+#: ../e-util/e-html-editor-spell-check-dialog.c:505
 msgid "<b>Suggestions</b>"
 msgstr "<b>Förslag</b>"
 
 #. Replace
-#: ../e-util/e-html-editor-spell-check-dialog.c:536
+#: ../e-util/e-html-editor-spell-check-dialog.c:540
 msgid "Replace"
 msgstr "Ersätt"
 
 #. Replace All
-#: ../e-util/e-html-editor-spell-check-dialog.c:545
+#: ../e-util/e-html-editor-spell-check-dialog.c:549
 msgid "Replace All"
 msgstr "Ersätt alla"
 
 #. Ignore
-#: ../e-util/e-html-editor-spell-check-dialog.c:554
+#: ../e-util/e-html-editor-spell-check-dialog.c:558
 #: ../mail/mail.error.xml.h:109
 msgid "Ignore"
 msgstr "Ignorera"
 
 #. Skip
-#: ../e-util/e-html-editor-spell-check-dialog.c:563
+#: ../e-util/e-html-editor-spell-check-dialog.c:567
 msgid "Skip"
 msgstr "Hoppa över"
 
 #. Back
-#: ../e-util/e-html-editor-spell-check-dialog.c:572
+#: ../e-util/e-html-editor-spell-check-dialog.c:576
 msgid "Back"
 msgstr "Bakåt"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:581
+#: ../e-util/e-html-editor-spell-check-dialog.c:585
 msgid "<b>Dictionary</b>"
 msgstr "<b>Ordbok</b>"
 
 #. Add Word button
-#: ../e-util/e-html-editor-spell-check-dialog.c:601
+#: ../e-util/e-html-editor-spell-check-dialog.c:605
 msgid "Add word"
 msgstr "Lägg till ord"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:618
-#: ../mail/mail-config.ui.h:37
+#: ../e-util/e-html-editor-spell-check-dialog.c:622
+#: ../mail/mail-config.ui.h:38
 msgid "Spell Checking"
 msgstr "Stavningskontroll"
 
-#: ../e-util/e-html-editor-table-dialog.c:778
+#: ../e-util/e-html-editor-table-dialog.c:788
 msgid "_Rows:"
 msgstr "_Rader:"
 
-#: ../e-util/e-html-editor-table-dialog.c:795
+#: ../e-util/e-html-editor-table-dialog.c:805
 msgid "C_olumns:"
 msgstr "K_olumner:"
 
-#: ../e-util/e-html-editor-table-dialog.c:846
+#: ../e-util/e-html-editor-table-dialog.c:856
 msgid "_Spacing:"
 msgstr "_Mellanrum:"
 
-#: ../e-util/e-html-editor-table-dialog.c:863
+#: ../e-util/e-html-editor-table-dialog.c:873
 msgid "_Padding:"
 msgstr "_Utfyllnad:"
 
-#: ../e-util/e-html-editor-table-dialog.c:927
+#: ../e-util/e-html-editor-table-dialog.c:937
 #: ../e-util/e-html-editor-text-dialog.c:261
 msgid "_Color:"
 msgstr "_Färg:"
 
-#: ../e-util/e-html-editor-table-dialog.c:953
+#: ../e-util/e-html-editor-table-dialog.c:963
 msgid "Image:"
 msgstr "Bild:"
 
-#: ../e-util/e-html-editor-table-dialog.c:980
+#: ../e-util/e-html-editor-table-dialog.c:990
 msgid "Table Properties"
 msgstr "Tabellegenskaper"
 
@@ -12859,30 +13227,14 @@ msgstr "_Storlek:"
 msgid "Text Properties"
 msgstr "Textegenskaper"
 
-#: ../e-util/e-html-editor-view.c:4673
+#: ../e-util/e-html-editor-view.c:5359
 msgid "Changed property"
 msgstr "Ändrad egenskap"
 
-#: ../e-util/e-html-editor-view.c:4674
+#: ../e-util/e-html-editor-view.c:5360
 msgid "Whether editor changed"
 msgstr "Huruvida redigeraren ändrades"
 
-#: ../e-util/e-html-editor-view.c:8509
-msgid ""
-"Turning HTML mode off will cause the text to lose all formatting. Do you "
-"want to continue?"
-msgstr ""
-"Att slå av HTML-läget kommer få texten att förlora all formatering. Vill du "
-"fortsätta?"
-
-#: ../e-util/e-html-editor-view.c:8513
-msgid "_Don't lose formatting"
-msgstr "Förlora _inte formatering"
-
-#: ../e-util/e-html-editor-view.c:8514
-msgid "_Lose formatting"
-msgstr "För_lora formatering"
-
 #: ../e-util/e-import-assistant.c:256
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
@@ -12997,15 +13349,15 @@ msgstr "Stäng"
 msgid "_Save and Close"
 msgstr "_Spara och stäng"
 
-#: ../e-util/e-mail-signature-editor.c:531
+#: ../e-util/e-mail-signature-editor.c:529
 msgid "Edit Signature"
 msgstr "Redigera signatur"
 
-#: ../e-util/e-mail-signature-editor.c:564
+#: ../e-util/e-mail-signature-editor.c:562
 msgid "_Signature Name:"
 msgstr "_Signaturnamn:"
 
-#: ../e-util/e-mail-signature-editor.c:600
+#: ../e-util/e-mail-signature-editor.c:598
 msgid "Unnamed"
 msgstr "Namnlös"
 
@@ -13051,34 +13403,39 @@ msgstr ""
 "Musbaserad interaktiv kartwidget för val av tidszon. Tangentbordsanvändare "
 "bör istället välja tidszon ur den nedanstående kombinationsrutan."
 
-#: ../e-util/e-misc-utils.c:248
+#: ../e-util/e-misc-utils.c:251
 msgid "Could not open the link."
 msgstr "Kunde inte öppna länken."
 
-#: ../e-util/e-misc-utils.c:330
+#: ../e-util/e-misc-utils.c:334
 msgid "Could not display help for Evolution."
 msgstr "Kunde inte visa hjälp för Evolution."
 
-#: ../e-util/e-misc-utils.c:2383
+#: ../e-util/e-misc-utils.c:2387
 #, c-format
 msgid "Opening calendar '%s'"
 msgstr "Öppnar kalender ”%s”"
 
-#: ../e-util/e-misc-utils.c:2386
+#: ../e-util/e-misc-utils.c:2390
 #, c-format
 msgid "Opening memo list '%s'"
 msgstr "Öppnar memolista ”%s”"
 
-#: ../e-util/e-misc-utils.c:2389
+#: ../e-util/e-misc-utils.c:2393
 #, c-format
 msgid "Opening task list '%s'"
 msgstr "Öppnar uppgiftslista ”%s”"
 
-#: ../e-util/e-misc-utils.c:2392
+#: ../e-util/e-misc-utils.c:2396
 #, c-format
 msgid "Opening address book '%s'"
 msgstr "Öppnar adressboken ”%s”"
 
+#: ../e-util/e-misc-utils.c:3138
+#: ../modules/mailto-handler/evolution-mailto-handler.c:148
+msgid "_Do not show this message again"
+msgstr "Visa _inte detta meddelande igen"
+
 #: ../e-util/e-name-selector-dialog.c:277
 msgid "Show Contacts"
 msgstr "Visa kontakter"
@@ -13113,7 +13470,7 @@ msgid "Search"
 msgstr "Sök"
 
 #: ../e-util/e-name-selector-dialog.c:448
-#: ../mail/importers/pine-importer.c:427
+#: ../mail/importers/pine-importer.c:429
 msgid "Address Book"
 msgstr "Adressbok"
 
@@ -13128,30 +13485,30 @@ msgid "Select Contacts from Address Book"
 msgstr "Välj kontakt från adressbok"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../e-util/e-name-selector-entry.c:3183
+#: ../e-util/e-name-selector-entry.c:3186
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "Fä_ll ut %s inbäddat"
 
 #. Copy Contact Item
-#: ../e-util/e-name-selector-entry.c:3199
+#: ../e-util/e-name-selector-entry.c:3202
 #, c-format
 msgid "Cop_y %s"
 msgstr "Ko_piera %s"
 
 #. Cut Contact Item
-#: ../e-util/e-name-selector-entry.c:3210
+#: ../e-util/e-name-selector-entry.c:3213
 #, c-format
 msgid "C_ut %s"
 msgstr "Klipp _ut %s"
 
 #. Edit Contact item
-#: ../e-util/e-name-selector-entry.c:3228
+#: ../e-util/e-name-selector-entry.c:3231
 #, c-format
 msgid "_Edit %s"
 msgstr "_Redigera %s"
 
-#: ../e-util/e-name-selector-list.c:583
+#: ../e-util/e-name-selector-list.c:584
 #, c-format
 msgid "_Delete %s"
 msgstr "_Ta bort %s"
@@ -13256,6 +13613,12 @@ msgstr "Automatisk"
 msgid "Configuration _URL:"
 msgstr "Konfigurations-_URL:"
 
+#: ../e-util/e-proxy-editor.c:560
+#, fuzzy
+#| msgid "Custom Proxy"
+msgid "No proxy"
+msgstr "Anpassad proxy"
+
 #: ../e-util/e-proxy-editor.c:563
 msgid "Use a direct connection, no proxying required."
 msgstr "Använd en direktförbindelse, ingen proxy krävs."
@@ -13305,51 +13668,51 @@ msgstr "Redigera regel"
 msgid "Matches: %u"
 msgstr "Träffar: %u"
 
-#: ../e-util/e-search-bar.c:567
+#: ../e-util/e-search-bar.c:569
 msgid "Close the find bar"
 msgstr "Stäng sökraden"
 
-#: ../e-util/e-search-bar.c:575
+#: ../e-util/e-search-bar.c:577
 msgid "Fin_d:"
 msgstr "Sö_k:"
 
-#: ../e-util/e-search-bar.c:587
+#: ../e-util/e-search-bar.c:589
 msgid "Clear the search"
 msgstr "Töm sökfältet"
 
-#: ../e-util/e-search-bar.c:611
+#: ../e-util/e-search-bar.c:613
 msgid "_Previous"
 msgstr "_Föregående"
 
-#: ../e-util/e-search-bar.c:614
+#: ../e-util/e-search-bar.c:616
 msgid "Find the previous occurrence of the phrase"
 msgstr "Sök efter föregående förekomst av frasen"
 
-#: ../e-util/e-search-bar.c:623
+#: ../e-util/e-search-bar.c:625
 msgid "_Next"
 msgstr "_Nästa"
 
-#: ../e-util/e-search-bar.c:626
+#: ../e-util/e-search-bar.c:628
 msgid "Find the next occurrence of the phrase"
 msgstr "Sök efter nästa förekomst av frasen"
 
-#: ../e-util/e-search-bar.c:635
+#: ../e-util/e-search-bar.c:637
 msgid "Mat_ch case"
 msgstr "Mat_cha versaler/gemener"
 
-#: ../e-util/e-search-bar.c:663
+#: ../e-util/e-search-bar.c:665
 msgid "Reached bottom of page, continued from top"
 msgstr "Nådde slutet av sidan, fortsätter från början"
 
-#: ../e-util/e-search-bar.c:685
+#: ../e-util/e-search-bar.c:687
 msgid "Reached top of page, continued from bottom"
 msgstr "Nådde början av sidan, fortsätter från slutet"
 
-#: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:327
+#: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:329
 #: ../mail/importers/kmail-importer.c:253
-#: ../mail/importers/pine-importer.c:420
-#: ../modules/mail/e-mail-shell-view.c:1163
-#: ../smime/gui/certificate-manager.c:1669
+#: ../mail/importers/pine-importer.c:422
+#: ../modules/mail/e-mail-shell-view.c:1172
+#: ../smime/gui/certificate-manager.c:1671
 msgid "Mail"
 msgstr "E-post"
 
@@ -13518,11 +13881,11 @@ msgstr "Återställ påli_tlighet för SSL-certifikat"
 msgid "User"
 msgstr "Användare"
 
-#: ../e-util/e-source-selector-dialog.c:229
+#: ../e-util/e-source-selector-dialog.c:236
 msgid "_Destination"
 msgstr "_Mål"
 
-#: ../e-util/e-source-selector-dialog.c:342
+#: ../e-util/e-source-selector-dialog.c:364
 msgid "Select destination"
 msgstr "Välj mål"
 
@@ -13542,26 +13905,26 @@ msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #. no suggestions. Put something in the menu anyway...
-#: ../e-util/e-spell-entry.c:379
+#: ../e-util/e-spell-entry.c:408
 msgid "(no suggestions)"
 msgstr "(inga förslag)"
 
-#: ../e-util/e-spell-entry.c:403
+#: ../e-util/e-spell-entry.c:432
 msgid "More..."
 msgstr "Mer…"
 
 #. + Add to Dictionary
-#: ../e-util/e-spell-entry.c:488
+#: ../e-util/e-spell-entry.c:517
 #, c-format
 msgid "Add \"%s\" to Dictionary"
 msgstr "Lägg till ”%s” i ordbok"
 
 #. - Ignore All
-#: ../e-util/e-spell-entry.c:537
+#: ../e-util/e-spell-entry.c:566
 msgid "Ignore All"
 msgstr "Ignorera alla"
 
-#: ../e-util/e-spell-entry.c:569
+#: ../e-util/e-spell-entry.c:598
 msgid "Spelling Suggestions"
 msgstr "Stavningsförslag"
 
@@ -13665,7 +14028,7 @@ msgstr "Ett fel påträffades i memolistans bakändeservice &quot;{0}&quot;."
 msgid "The task list backend servicing &quot;{0}&quot; encountered an error."
 msgstr "Ett fel påträffades i uppgiftslistans bakändeservice &quot;{0}&quot;."
 
-#: ../e-util/e-table-click-to-add.c:684
+#: ../e-util/e-table-click-to-add.c:689
 #: ../e-util/gal-a11y-e-table-click-to-add.c:61
 #: ../e-util/gal-a11y-e-table-click-to-add.c:142
 msgid "click to add"
@@ -13716,8 +14079,6 @@ msgid "Choose the order of information to appear in the message list."
 msgstr "Välj den ordning som information ska visas i meddelandelistan."
 
 #: ../e-util/e-table-config.ui.h:2
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:367
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:367
 msgid "_Apply"
 msgstr "Tillämp_a"
 
@@ -13864,7 +14225,7 @@ msgstr "_Sortera efter"
 msgid "_Custom"
 msgstr "A_npassad"
 
-#: ../e-util/e-text.c:2114
+#: ../e-util/e-text.c:2134
 msgid "Select All"
 msgstr "Markera allt"
 
@@ -13923,99 +14284,111 @@ msgid "Flags"
 msgstr "Flaggor"
 
 #: ../e-util/evolution-source-viewer.c:728
-#: ../mail/e-mail-config-identity-page.c:722
+#: ../mail/e-mail-config-identity-page.c:721
 msgid "Identity"
 msgstr "Identitet"
 
-#: ../e-util/e-web-view.c:285
+#: ../e-util/e-web-view.c:316
 msgid "_Copy Link Location"
 msgstr "_Kopiera länkadress"
 
-#: ../e-util/e-web-view.c:287
+#: ../e-util/e-web-view.c:318
 msgid "Copy the link to the clipboard"
 msgstr "Kopiera länken till urklipp"
 
-#: ../e-util/e-web-view.c:295
+#: ../e-util/e-web-view.c:326
 msgid "_Open Link in Browser"
 msgstr "_Öppna länk i webbläsare"
 
-#: ../e-util/e-web-view.c:297
+#: ../e-util/e-web-view.c:328
 msgid "Open the link in a web browser"
 msgstr "Öppna länken i en webbläsare"
 
-#: ../e-util/e-web-view.c:305
+#: ../e-util/e-web-view.c:336
 msgid "_Copy Email Address"
 msgstr "Kopiera _e-postadress"
 
-#: ../e-util/e-web-view.c:322
+#: ../e-util/e-web-view.c:343
+#, fuzzy
+#| msgid "Copy _Email Address"
+msgid "Copy _Raw Email Address"
+msgstr "Kopiera _e-postadress"
+
+#: ../e-util/e-web-view.c:345
+#, fuzzy
+#| msgid "Copy the email address to the clipboard"
+msgid "Copy the raw email address to the clipboard"
+msgstr "Kopiera e-postadressen till urklipp"
+
+#: ../e-util/e-web-view.c:360
 msgid "_Copy Image"
 msgstr "_Kopiera bild"
 
-#: ../e-util/e-web-view.c:324
+#: ../e-util/e-web-view.c:362
 msgid "Copy the image to the clipboard"
 msgstr "Kopiera bilden till urklipp"
 
-#: ../e-util/e-web-view.c:329
+#: ../e-util/e-web-view.c:367
 msgid "Save _Image..."
 msgstr "Spara _bild…"
 
-#: ../e-util/e-web-view.c:331
+#: ../e-util/e-web-view.c:369
 msgid "Save the image to a file"
 msgstr "Spara bilden till en fil"
 
-#: ../e-util/e-web-view.c:351 ../e-util/e-web-view.c:1340
+#: ../e-util/e-web-view.c:389 ../e-util/e-web-view.c:1427
 msgid "Select all text and images"
 msgstr "Markera all text och bilder"
 
-#: ../e-util/e-web-view.c:1004
+#: ../e-util/e-web-view.c:1069
 #, c-format
 msgid "Click to call %s"
 msgstr "Klicka för att ringa till %s"
 
-#: ../e-util/e-web-view.c:1006
+#: ../e-util/e-web-view.c:1071
 msgid "Click to hide/unhide addresses"
 msgstr "Klicka för att dölja/visa adresser"
 
-#: ../e-util/e-web-view.c:1017
+#: ../e-util/e-web-view.c:1082
 #, c-format
 msgid "Go to the section %s of the message"
 msgstr "Gå till avsnittet %s av meddelandet"
 
-#: ../e-util/e-web-view.c:1019
+#: ../e-util/e-web-view.c:1084
 msgid "Go to the beginning of the message"
 msgstr "Gå till meddelandets början"
 
-#: ../e-util/e-web-view.c:1023
+#: ../e-util/e-web-view.c:1088
 #, c-format
 msgid "Click to open %s"
 msgstr "Klicka för att öppna %s"
 
-#: ../e-util/e-web-view.c:2941
+#: ../e-util/e-web-view.c:3039
 msgid "Copying image to clipboard"
 msgstr "Kopierar bild till urklipp"
 
-#: ../e-util/e-web-view.c:3129
+#: ../e-util/e-web-view.c:3227
 msgid "Save Image"
 msgstr "Spara bild"
 
-#: ../e-util/e-web-view.c:3165
+#: ../e-util/e-web-view.c:3263
 #, c-format
 msgid "Saving image to '%s'"
 msgstr "Sparar bild till ”%s”"
 
-#: ../e-util/e-widget-undo.c:429
+#: ../e-util/e-widget-undo.c:430
 msgid "Undo 'Insert text'"
 msgstr "Ångra ”Infoga text”"
 
-#: ../e-util/e-widget-undo.c:431
+#: ../e-util/e-widget-undo.c:432
 msgid "Redo 'Insert text'"
 msgstr "Gör om ”Infoga text”"
 
-#: ../e-util/e-widget-undo.c:445
+#: ../e-util/e-widget-undo.c:446
 msgid "Undo 'Delete text'"
 msgstr "Ångra ”Ta bort text”"
 
-#: ../e-util/e-widget-undo.c:447
+#: ../e-util/e-widget-undo.c:448
 msgid "Redo 'Delete text'"
 msgstr "Gör om ”Ta bort text”"
 
@@ -14091,7 +14464,7 @@ msgstr "den tid du anger"
 msgid "a time relative to the current time"
 msgstr "en tid relativ till aktuell tid"
 
-#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:86
+#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:87
 msgid "seconds"
 msgstr "sekunder"
 
@@ -14152,7 +14525,7 @@ msgstr ""
 "Meddelandedatumet kommer att jämföras med\n"
 "en tid som är relativ till den när filtret körs."
 
-#: ../e-util/gal-a11y-e-cell.c:122
+#: ../e-util/gal-a11y-e-cell.c:130
 msgid "Table Cell"
 msgstr "Tabellcell"
 
@@ -14162,7 +14535,7 @@ msgid "popup a child"
 msgstr "poppa upp ett barn"
 
 #. Translators: description of an "edit" action
-#: ../e-util/gal-a11y-e-cell-text.c:617
+#: ../e-util/gal-a11y-e-cell-text.c:631
 msgid "begin editing this cell"
 msgstr "börja redigera denna cell"
 
@@ -14319,38 +14692,38 @@ msgid "Invalid folder URI '%s'"
 msgstr "Ogiltig mapp-URI ”%s”"
 
 #. Some local folders
-#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-properties.c:410
+#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-properties.c:680
 #: ../mail/em-folder-tree-model.c:1174 ../mail/importers/kmail-libs.c:141
-#: ../modules/mail/e-mail-shell-view-private.c:1074
-#: ../modules/mail/e-mail-shell-view-private.c:1085
+#: ../modules/mail/e-mail-shell-view-private.c:1081
+#: ../modules/mail/e-mail-shell-view-private.c:1092
 msgid "Inbox"
 msgstr "Inkorg"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
 #: ../libemail-engine/e-mail-session.c:125 ../mail/em-folder-tree-model.c:1167
 #: ../mail/importers/kmail-libs.c:147
-#: ../modules/mail/e-mail-shell-view-private.c:1072
+#: ../modules/mail/e-mail-shell-view-private.c:1079
 msgid "Drafts"
 msgstr "Utkast"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
 #: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1178
 #: ../mail/importers/kmail-libs.c:143
-#: ../modules/mail/e-mail-shell-view-private.c:1076
+#: ../modules/mail/e-mail-shell-view-private.c:1083
 msgid "Outbox"
 msgstr "Utkorg"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
 #: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1182
 #: ../mail/importers/kmail-libs.c:145
-#: ../modules/mail/e-mail-shell-view-private.c:1078
+#: ../modules/mail/e-mail-shell-view-private.c:1085
 msgid "Sent"
 msgstr "Skickat"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
 #: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1170
 #: ../mail/importers/kmail-libs.c:149
-#: ../modules/mail/e-mail-shell-view-private.c:1080
+#: ../modules/mail/e-mail-shell-view-private.c:1087
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
 #: ../plugins/templates/templates.c:1176 ../plugins/templates/templates.c:1478
 #: ../plugins/templates/templates.c:1488
@@ -14381,31 +14754,31 @@ msgstr ""
 msgid "Waiting for '%s'"
 msgstr "Väntar på ”%s”"
 
-#: ../libemail-engine/e-mail-session-utils.c:539
+#: ../libemail-engine/e-mail-session-utils.c:540
 msgid "No mail transport service available"
 msgstr "Ingen transportservice för e-post tillgänglig"
 
-#: ../libemail-engine/e-mail-session-utils.c:629
-#: ../libemail-engine/mail-ops.c:718
+#: ../libemail-engine/e-mail-session-utils.c:630
+#: ../libemail-engine/mail-ops.c:719
 #, c-format
 msgid "Posting message to '%s'"
 msgstr "Postar meddelande till ”%s”"
 
-#: ../libemail-engine/e-mail-session-utils.c:666
-#: ../libemail-engine/mail-ops.c:754
+#: ../libemail-engine/e-mail-session-utils.c:667
+#: ../libemail-engine/mail-ops.c:755
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Misslyckades med att tillämpa utgående filter: %s"
 
-#: ../libemail-engine/e-mail-session-utils.c:696
-#: ../libemail-engine/e-mail-session-utils.c:731
-#: ../libemail-engine/mail-ops.c:778 ../libemail-engine/mail-ops.c:813
+#: ../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
 #, c-format
 msgid "Storing sent message to '%s'"
 msgstr "Lagrar skickat meddelande till ”%s”"
 
-#: ../libemail-engine/e-mail-session-utils.c:720
-#: ../libemail-engine/mail-ops.c:802
+#: ../libemail-engine/e-mail-session-utils.c:721
+#: ../libemail-engine/mail-ops.c:803
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14414,14 +14787,14 @@ msgstr ""
 "Misslyckades med att lägga till i %s: %s\n"
 "Lägger till i lokala ”Skickat”-mappen istället."
 
-#: ../libemail-engine/e-mail-session-utils.c:750
-#: ../libemail-engine/mail-ops.c:830
+#: ../libemail-engine/e-mail-session-utils.c:751
+#: ../libemail-engine/mail-ops.c:831
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Misslyckades med att lägga till i lokala ”Skickat”-mappen: %s"
 
-#: ../libemail-engine/e-mail-session-utils.c:952
-#: ../libemail-engine/mail-ops.c:978 ../libemail-engine/mail-ops.c:1080
+#: ../libemail-engine/e-mail-session-utils.c:953
+#: ../libemail-engine/mail-ops.c:979 ../libemail-engine/mail-ops.c:1081
 msgid "Sending message"
 msgstr "Skickar meddelande"
 
@@ -14462,7 +14835,7 @@ msgstr ""
 msgid "Fetching mail from '%s'"
 msgstr "Hämtar post från ”%s”"
 
-#: ../libemail-engine/mail-ops.c:748
+#: ../libemail-engine/mail-ops.c:749
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set "
@@ -14475,57 +14848,57 @@ msgstr ""
 "Redigera->Meddelandefilter.\n"
 "Ursprungligt fel var: %s"
 
-#: ../libemail-engine/mail-ops.c:989
+#: ../libemail-engine/mail-ops.c:990
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Skickar meddelande %d av %d"
 
-#: ../libemail-engine/mail-ops.c:1041
+#: ../libemail-engine/mail-ops.c:1042
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
 msgstr[0] "Misslyckades med att skicka ett meddelande"
 msgstr[1] "Misslyckades med att skicka %d av %d meddelanden"
 
-#: ../libemail-engine/mail-ops.c:1047
+#: ../libemail-engine/mail-ops.c:1048
 msgid "Canceled."
 msgstr "Avbruten."
 
-#: ../libemail-engine/mail-ops.c:1049
+#: ../libemail-engine/mail-ops.c:1050
 msgid "Complete."
 msgstr "Färdig."
 
-#: ../libemail-engine/mail-ops.c:1163
+#: ../libemail-engine/mail-ops.c:1164
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Flyttar meddelanden till ”%s”"
 
-#: ../libemail-engine/mail-ops.c:1164
+#: ../libemail-engine/mail-ops.c:1165
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Kopierar meddelanden till ”%s”"
 
-#: ../libemail-engine/mail-ops.c:1283
+#: ../libemail-engine/mail-ops.c:1284
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrar mappen ”%s”"
 
-#: ../libemail-engine/mail-ops.c:1411
+#: ../libemail-engine/mail-ops.c:1412
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Tömmer och lagrar kontot ”%s”"
 
-#: ../libemail-engine/mail-ops.c:1412
+#: ../libemail-engine/mail-ops.c:1413
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Lagrar kontot ”%s”"
 
-#: ../libemail-engine/mail-ops.c:1487
+#: ../libemail-engine/mail-ops.c:1488
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tömmer papperskorgen i ”%s”"
 
-#: ../libemail-engine/mail-ops.c:1579
+#: ../libemail-engine/mail-ops.c:1580
 #, c-format
 msgid "Processing folder changes in '%s'"
 msgstr "Behandlar mappförändringar i ”%s”"
@@ -14603,9 +14976,9 @@ msgid "De_fault"
 msgstr "_Standard"
 
 #: ../mail/e-mail-account-tree-view.c:83
-#: ../modules/mail/em-composer-prefs.c:1263
-#: ../modules/plugin-manager/evolution-plugin-manager.c:358
-#: ../plugins/publish-calendar/publish-calendar.c:896
+#: ../modules/mail/em-composer-prefs.c:1270
+#: ../modules/plugin-manager/evolution-plugin-manager.c:357
+#: ../plugins/publish-calendar/publish-calendar.c:855
 msgid "Enabled"
 msgstr "Aktiverad"
 
@@ -14621,12 +14994,12 @@ msgstr "Ingen e-postadress tillhandahölls"
 msgid "Missing domain in email address"
 msgstr "Domän saknas i e-postadress"
 
-#: ../mail/e-mail-browser.c:128 ../shell/e-shell-window-actions.c:903
+#: ../mail/e-mail-browser.c:129 ../shell/e-shell-window-actions.c:903
 #: ../shell/e-shell-window-actions.c:910 ../shell/e-shell-window-actions.c:917
 msgid "Close this window"
 msgstr "Stäng detta fönster"
 
-#: ../mail/e-mail-browser.c:285
+#: ../mail/e-mail-browser.c:286
 msgid "(No Subject)"
 msgstr "(Inget ämne)"
 
@@ -14648,7 +15021,7 @@ msgstr "Evolutions kontoguide"
 msgid "_Revise Details"
 msgstr "_Revidera detaljer"
 
-#: ../mail/e-mail-config-auth-check.c:349
+#: ../mail/e-mail-config-auth-check.c:339
 msgid "Check for Supported Types"
 msgstr "Kontrollera vilka typer som stöds"
 
@@ -14699,7 +15072,7 @@ msgid "Archi_ve Folder:"
 msgstr "Arki_vmapp:"
 
 #: ../mail/e-mail-config-defaults-page.c:638
-#: ../modules/mail/em-mailer-prefs.c:1079
+#: ../modules/mail/em-mailer-prefs.c:1397
 msgid "Choose a folder to archive messages to."
 msgstr "Välj en mapp att arkivera meddelanden i."
 
@@ -14774,45 +15147,49 @@ msgstr ""
 msgid "Account Information"
 msgstr "Kontoinformation"
 
-#: ../mail/e-mail-config-identity-page.c:319
-#: ../mail/e-mail-config-summary-page.c:331
+#: ../mail/e-mail-config-identity-page.c:346
+#: ../mail/e-mail-config-summary-page.c:352
+#, fuzzy
+#| msgid ""
+#| "Type the name by which you would like to refer to this account.\n"
+#| "For example, \"Work\" or \"Personal\"."
 msgid ""
-"Type the name by which you would like to refer to this account.\n"
-"For example, \"Work\" or \"Personal\"."
+"The above name will be used to identify this account.\n"
+"Use for example, \"Work\" or \"Personal\"."
 msgstr ""
 "Skriv in namnet som du vill använda för att referera till detta konto.\n"
 "Till exempel: ”Jobb” eller ”Personligt”."
 
-#: ../mail/e-mail-config-identity-page.c:364
+#: ../mail/e-mail-config-identity-page.c:363
 msgid "Required Information"
 msgstr "Nödvändig information"
 
-#: ../mail/e-mail-config-identity-page.c:373
+#: ../mail/e-mail-config-identity-page.c:372
 msgid "Full Nam_e:"
 msgstr "_Fullständigt namn:"
 
-#: ../mail/e-mail-config-identity-page.c:400
+#: ../mail/e-mail-config-identity-page.c:399
 msgid "Email _Address:"
 msgstr "E-post_adress:"
 
-#: ../mail/e-mail-config-identity-page.c:447
+#: ../mail/e-mail-config-identity-page.c:446
 #: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "Valfri information"
 
-#: ../mail/e-mail-config-identity-page.c:456
+#: ../mail/e-mail-config-identity-page.c:455
 msgid "Re_ply-To:"
 msgstr "Sva_ra till:"
 
-#: ../mail/e-mail-config-identity-page.c:483
+#: ../mail/e-mail-config-identity-page.c:482
 msgid "Or_ganization:"
 msgstr "Or_ganisation:"
 
-#: ../mail/e-mail-config-identity-page.c:538
+#: ../mail/e-mail-config-identity-page.c:537
 msgid "Add Ne_w Signature..."
 msgstr "Lägg till n_y signatur…"
 
-#: ../mail/e-mail-config-identity-page.c:556
+#: ../mail/e-mail-config-identity-page.c:555
 msgid "_Look up mail server details based on the entered e-mail address"
 msgstr ""
 "S_lå upp detaljer för e-postserver baserade på den angivna e-postadressen"
@@ -14846,8 +15223,8 @@ msgid "%s - %s"
 msgstr "%s - %s"
 
 #: ../mail/e-mail-config-security-page.c:340
-#: ../mail/em-folder-properties.c:334 ../mail/mail-config.ui.h:29
-#: ../modules/addressbook/autocompletion-config.c:114
+#: ../mail/em-folder-properties.c:603 ../mail/mail-config.ui.h:30
+#: ../modules/addressbook/autocompletion-config.c:113
 #: ../modules/calendar/e-calendar-preferences.ui.h:46
 #: ../modules/itip-formatter/plugin/config-ui.c:90
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
@@ -14871,22 +15248,22 @@ msgid "Si_gning algorithm:"
 msgstr "Algoritm för sign_ering:"
 
 #: ../mail/e-mail-config-security-page.c:429
-#: ../mail/e-mail-config-security-page.c:569 ../mail/mail-config.ui.h:70
+#: ../mail/e-mail-config-security-page.c:581 ../mail/mail-config.ui.h:71
 msgid "SHA1"
 msgstr "SHA1"
 
 #: ../mail/e-mail-config-security-page.c:432
-#: ../mail/e-mail-config-security-page.c:572 ../mail/mail-config.ui.h:71
+#: ../mail/e-mail-config-security-page.c:584 ../mail/mail-config.ui.h:72
 msgid "SHA256"
 msgstr "SHA256"
 
 #: ../mail/e-mail-config-security-page.c:435
-#: ../mail/e-mail-config-security-page.c:575 ../mail/mail-config.ui.h:72
+#: ../mail/e-mail-config-security-page.c:587 ../mail/mail-config.ui.h:73
 msgid "SHA384"
 msgstr "SHA384"
 
 #: ../mail/e-mail-config-security-page.c:438
-#: ../mail/e-mail-config-security-page.c:578 ../mail/mail-config.ui.h:73
+#: ../mail/e-mail-config-security-page.c:590 ../mail/mail-config.ui.h:74
 msgid "SHA512"
 msgstr "SHA512"
 
@@ -14895,49 +15272,55 @@ msgid "Al_ways sign outgoing messages when using this account"
 msgstr "Signera all_tid utgående meddelanden när detta konto används"
 
 #: ../mail/e-mail-config-security-page.c:466
+#, fuzzy
+#| msgid "Always encrypt outgoing messages when using this account"
+msgid "Always enc_rypt outgoing messages when using this account"
+msgstr "Kryptera alltid utgående meddelanden när detta konto används"
+
+#: ../mail/e-mail-config-security-page.c:478
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Kryptera alltid till _mig själv när krypterade meddelanden skickas"
 
-#: ../mail/e-mail-config-security-page.c:478
+#: ../mail/e-mail-config-security-page.c:490
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "_Lita alltid på nycklar i min nyckelring vid kryptering"
 
-#: ../mail/e-mail-config-security-page.c:502
+#: ../mail/e-mail-config-security-page.c:514
 msgid "Secure MIME (S/MIME)"
 msgstr "Secure MIME (S/MIME)"
 
-#: ../mail/e-mail-config-security-page.c:511
+#: ../mail/e-mail-config-security-page.c:523
 msgid "Sig_ning certificate:"
 msgstr "Certifikat för sig_nering:"
 
-#: ../mail/e-mail-config-security-page.c:535
-#: ../mail/e-mail-config-security-page.c:641
+#: ../mail/e-mail-config-security-page.c:547
+#: ../mail/e-mail-config-security-page.c:653
 msgid "Select"
 msgstr "Markera"
 
-#: ../mail/e-mail-config-security-page.c:544
-#: ../mail/e-mail-config-security-page.c:650 ../mail/mail-dialogs.ui.h:5
+#: ../mail/e-mail-config-security-page.c:556
+#: ../mail/e-mail-config-security-page.c:662 ../mail/mail-dialogs.ui.h:5
 #: ../shell/e-shell-window-actions.c:1006
 msgid "_Clear"
 msgstr "_Töm"
 
-#: ../mail/e-mail-config-security-page.c:553
+#: ../mail/e-mail-config-security-page.c:565
 msgid "Signing _algorithm:"
 msgstr "Algoritm för sign_ering:"
 
-#: ../mail/e-mail-config-security-page.c:594
+#: ../mail/e-mail-config-security-page.c:606
 msgid "Always sign outgoing messages when using this account"
 msgstr "Signera alltid utgående meddelanden när detta konto används"
 
-#: ../mail/e-mail-config-security-page.c:617
+#: ../mail/e-mail-config-security-page.c:629
 msgid "Encryption certificate:"
 msgstr "Krypteringscertifikat:"
 
-#: ../mail/e-mail-config-security-page.c:659
+#: ../mail/e-mail-config-security-page.c:671
 msgid "Always encrypt outgoing messages when using this account"
 msgstr "Kryptera alltid utgående meddelanden när detta konto används"
 
-#: ../mail/e-mail-config-security-page.c:679
+#: ../mail/e-mail-config-security-page.c:691
 msgid "Always encrypt to myself when sending encrypted messages"
 msgstr "Kryptera alltid till mig själv när krypterade meddelanden skickas"
 
@@ -14964,45 +15347,45 @@ msgstr ""
 "Detta är ett sammandrag av de inställningar som kommer att användas för att "
 "komma åt din e-post."
 
-#: ../mail/e-mail-config-summary-page.c:370
+#: ../mail/e-mail-config-summary-page.c:369
 msgid "Personal Details"
 msgstr "Personliga uppgifter"
 
-#: ../mail/e-mail-config-summary-page.c:379
+#: ../mail/e-mail-config-summary-page.c:378
 msgid "Full Name:"
 msgstr "Fullständigt namn:"
 
-#: ../mail/e-mail-config-summary-page.c:393
+#: ../mail/e-mail-config-summary-page.c:392
 msgid "Email Address:"
 msgstr "E-postadress:"
 
-#: ../mail/e-mail-config-summary-page.c:407
+#: ../mail/e-mail-config-summary-page.c:406
 msgid "Receiving"
 msgstr "Mottagning"
 
-#: ../mail/e-mail-config-summary-page.c:419
+#: ../mail/e-mail-config-summary-page.c:418
 msgid "Sending"
 msgstr "Sändning"
 
-#: ../mail/e-mail-config-summary-page.c:431
+#: ../mail/e-mail-config-summary-page.c:430
 msgid "Server Type:"
 msgstr "Servertyp:"
 
-#: ../mail/e-mail-config-summary-page.c:452
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:602
+#: ../mail/e-mail-config-summary-page.c:451
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:601
 msgid "Server:"
 msgstr "Server:"
 
-#: ../mail/e-mail-config-summary-page.c:473
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:691
+#: ../mail/e-mail-config-summary-page.c:472
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:690
 msgid "Username:"
 msgstr "Användarnamn:"
 
-#: ../mail/e-mail-config-summary-page.c:494
+#: ../mail/e-mail-config-summary-page.c:493
 msgid "Security:"
 msgstr "Säkerhet:"
 
-#: ../mail/e-mail-config-summary-page.c:785
+#: ../mail/e-mail-config-summary-page.c:784
 msgid "Account Summary"
 msgstr "Kontosammandrag"
 
@@ -15025,27 +15408,27 @@ msgstr "Välkommen"
 msgid "Account Editor"
 msgstr "Kontoredigerare"
 
-#: ../mail/e-mail-display.c:97
+#: ../mail/e-mail-display.c:103
 msgid "_Add to Address Book..."
 msgstr "_Lägg till i adressbok…"
 
-#: ../mail/e-mail-display.c:104
+#: ../mail/e-mail-display.c:110
 msgid "_To This Address"
 msgstr "_Till denna adress"
 
-#: ../mail/e-mail-display.c:111
+#: ../mail/e-mail-display.c:117
 msgid "_From This Address"
 msgstr "_Från denna adress"
 
-#: ../mail/e-mail-display.c:118
+#: ../mail/e-mail-display.c:124
 msgid "Send _Reply To..."
 msgstr "Skicka s_var till…"
 
-#: ../mail/e-mail-display.c:120
+#: ../mail/e-mail-display.c:126
 msgid "Send a reply message to this address"
 msgstr "Skicka ett svarsmeddelande till denna adress"
 
-#: ../mail/e-mail-display.c:127
+#: ../mail/e-mail-display.c:133
 msgid "Create Search _Folder"
 msgstr "Skapa s_ökmapp"
 
@@ -15067,44 +15450,44 @@ msgstr "Mapp_namn:"
 
 #. Translators: This is a name of a flag, the same as all strings in the 'ffe' context.
 #. The translated value should not contain spaces.
-#: ../mail/e-mail-free-form-exp.c:226
+#: ../mail/e-mail-free-form-exp.c:236
 msgctxt "ffe"
 msgid "Answered"
 msgstr "Besvarad"
 
-#: ../mail/e-mail-free-form-exp.c:227
+#: ../mail/e-mail-free-form-exp.c:237
 msgctxt "ffe"
 msgid "Deleted"
 msgstr "Borttagen"
 
-#: ../mail/e-mail-free-form-exp.c:228
+#: ../mail/e-mail-free-form-exp.c:238
 msgctxt "ffe"
 msgid "Draft"
 msgstr "Utkast"
 
-#: ../mail/e-mail-free-form-exp.c:229
+#: ../mail/e-mail-free-form-exp.c:239
 msgctxt "ffe"
 msgid "Flagged"
 msgstr "Flaggad"
 
-#: ../mail/e-mail-free-form-exp.c:230
+#: ../mail/e-mail-free-form-exp.c:240
 msgctxt "ffe"
 msgid "Seen"
 msgstr "Läst"
 
-#: ../mail/e-mail-free-form-exp.c:231
+#: ../mail/e-mail-free-form-exp.c:241
 msgctxt "ffe"
 msgid "Attachment"
 msgstr "Bilaga"
 
 # Används i en lista tillsammans med no och false
-#: ../mail/e-mail-free-form-exp.c:479
+#: ../mail/e-mail-free-form-exp.c:489
 msgctxt "ffe"
 msgid "no"
 msgstr "nej"
 
 # Används i en lista tillsammans med no och false
-#: ../mail/e-mail-free-form-exp.c:480
+#: ../mail/e-mail-free-form-exp.c:490
 msgctxt "ffe"
 msgid "false"
 msgstr "falskt"
@@ -15142,7 +15525,7 @@ msgid "_Later"
 msgstr "Se_nare"
 
 #: ../mail/e-mail-label-manager.c:171
-#: ../modules/mail/e-mail-shell-view-actions.c:1084
+#: ../modules/mail/e-mail-shell-view-actions.c:1143
 msgid "Add Label"
 msgstr "Lägg till etikett"
 
@@ -15190,668 +15573,695 @@ msgstr "Rubriknamn"
 msgid "Header Value"
 msgstr "Rubrikvärde"
 
-#: ../mail/e-mail-printer.c:124 ../mail/mail-config.ui.h:114
+#: ../mail/e-mail-printer.c:126 ../mail/mail-config.ui.h:119
 msgid "Headers"
 msgstr "Rubriker"
 
-#: ../mail/e-mail-printer.c:166
+#: ../mail/e-mail-printer.c:168
 #, c-format
 msgid "Page %d of %d"
 msgstr "Sida %d av %d"
 
-#: ../mail/e-mail-reader.c:346 ../mail/filtertypes.xml.in.h:63
+#: ../mail/e-mail-reader.c:351 ../mail/filtertypes.xml.in.h:62
 msgid "Move to Folder"
 msgstr "Flytta till mapp"
 
-#: ../mail/e-mail-reader.c:346 ../mail/filtertypes.xml.in.h:64
+#: ../mail/e-mail-reader.c:351 ../mail/filtertypes.xml.in.h:63
 msgid "Copy to Folder"
 msgstr "Kopiera till mapp"
 
-#: ../mail/e-mail-reader.c:350 ../mail/em-folder-utils.c:487
+#: ../mail/e-mail-reader.c:355 ../mail/em-folder-utils.c:487
+#: ../mail/mail.error.xml.h:144
 msgid "_Move"
 msgstr "_Flytta"
 
-#: ../mail/e-mail-reader.c:350 ../mail/em-folder-utils.c:487
+#: ../mail/e-mail-reader.c:355 ../mail/em-folder-utils.c:487
 msgid "C_opy"
 msgstr "_Kopiera"
 
-#: ../mail/e-mail-reader.c:1268 ../mail/e-mail-reader.c:1480
-#: ../mail/e-mail-reader.c:1520
+#: ../mail/e-mail-reader.c:1200 ../mail/e-mail-reader.c:1412
+#: ../mail/e-mail-reader.c:1452
 msgid "_Do not ask me again."
 msgstr "_Fråga mig inte igen."
 
-#: ../mail/e-mail-reader.c:1526
+#: ../mail/e-mail-reader.c:1458
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "Ignorera _alltid Svara till: för sändlistor."
 
-#: ../mail/e-mail-reader.c:1728
+#: ../mail/e-mail-reader.c:1661
 msgid "Failed to retrieve message:"
 msgstr "Misslyckades med att hämta meddelande:"
 
-#: ../mail/e-mail-reader.c:1773 ../mail/e-mail-reader.c:3014
+#: ../mail/e-mail-reader.c:1706 ../mail/e-mail-reader.c:3038
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Hämtar meddelandet ”%s”"
 
-#: ../mail/e-mail-reader.c:1961
+#: ../mail/e-mail-reader.c:1894
 msgid "A_dd Sender to Address Book"
 msgstr "L_ägg till avsändaren i adressboken"
 
-#: ../mail/e-mail-reader.c:1963
+#: ../mail/e-mail-reader.c:1896
 msgid "Add sender to address book"
 msgstr "Lägg till avsändaren i adressboken"
 
-#: ../mail/e-mail-reader.c:1968
+#: ../mail/e-mail-reader.c:1901
 msgid "_Archive..."
 msgstr "_Arkivera…"
 
-#: ../mail/e-mail-reader.c:1970
+#: ../mail/e-mail-reader.c:1903
 msgid "Move selected messages to the Archive folder for the account"
 msgstr "Flytta markerade meddelanden till kontots arkivmapp"
 
-#: ../mail/e-mail-reader.c:1975
+#: ../mail/e-mail-reader.c:1908
 msgid "Check for _Junk"
 msgstr "Leta efter _skräppost"
 
-#: ../mail/e-mail-reader.c:1977
+#: ../mail/e-mail-reader.c:1910
 msgid "Filter the selected messages for junk status"
 msgstr "Filtrera de markerade meddelandena med avseende på skräpstatus"
 
-#: ../mail/e-mail-reader.c:1982
+#: ../mail/e-mail-reader.c:1915
 msgid "_Copy to Folder..."
 msgstr "_Kopiera till mapp…"
 
-#: ../mail/e-mail-reader.c:1984
+#: ../mail/e-mail-reader.c:1917
 msgid "Copy selected messages to another folder"
 msgstr "Kopiera markerade meddelanden till en annan mapp"
 
-#: ../mail/e-mail-reader.c:1989
+#: ../mail/e-mail-reader.c:1922
 msgid "_Delete Message"
 msgstr "_Ta bort meddelande"
 
-#: ../mail/e-mail-reader.c:1991
+#: ../mail/e-mail-reader.c:1924
 msgid "Mark the selected messages for deletion"
 msgstr "Markera de markerade meddelandena för borttagning"
 
-#: ../mail/e-mail-reader.c:1996
+#: ../mail/e-mail-reader.c:1929
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "Skapa en filterregel för sänd_lista…"
 
-#: ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:1931
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Skapa en regel för att filtrera meddelanden till denna sändlista"
 
-#: ../mail/e-mail-reader.c:2003
+#: ../mail/e-mail-reader.c:1936
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "Skapa en filterregel för _mottagare…"
 
-#: ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:1938
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Skapa en regel för att filtrera meddelanden till dessa mottagare"
 
-#: ../mail/e-mail-reader.c:2010
+#: ../mail/e-mail-reader.c:1943
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "Skapa en filterregel för _avsändare…"
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:1945
 msgid "Create a rule to filter messages from this sender"
 msgstr "Skapa en regel för att filtrera meddelanden från denna avsändare"
 
-#: ../mail/e-mail-reader.c:2017
+#: ../mail/e-mail-reader.c:1950
 msgid "Create a Filter Rule for _Subject..."
 msgstr "Skapa en filterregel för _ämne…"
 
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:1952
 msgid "Create a rule to filter messages with this subject"
 msgstr "Skapa en regel för att filtrera meddelanden med detta ämne"
 
-#: ../mail/e-mail-reader.c:2024
+#: ../mail/e-mail-reader.c:1957
 msgid "A_pply Filters"
 msgstr "Tillä_mpa filter"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:1959
 msgid "Apply filter rules to the selected messages"
 msgstr "Tillämpa filterregler på de markerade meddelandena"
 
-#: ../mail/e-mail-reader.c:2031
+#: ../mail/e-mail-reader.c:1964
 msgid "_Find in Message..."
 msgstr "S_ök i meddelande…"
 
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:1966
 msgid "Search for text in the body of the displayed message"
 msgstr "Sök efter text i meddelandetexten på det visade meddelandet"
 
-#: ../mail/e-mail-reader.c:2038
+#: ../mail/e-mail-reader.c:1971
 msgid "_Clear Flag"
 msgstr "_Ta bort flagga"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:1973
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Ta bort uppföljningsflaggan från de markerade meddelandena"
 
-#: ../mail/e-mail-reader.c:2045
+#: ../mail/e-mail-reader.c:1978
 msgid "_Flag Completed"
 msgstr "_Flagga som färdig"
 
-#: ../mail/e-mail-reader.c:2047
+#: ../mail/e-mail-reader.c:1980
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Ställ in uppföljningsflaggan till färdig på alla markerade meddelanden"
 
-#: ../mail/e-mail-reader.c:2052
+#: ../mail/e-mail-reader.c:1985
 msgid "Follow _Up..."
 msgstr "Följ _upp…"
 
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:1987
 msgid "Flag the selected messages for follow-up"
 msgstr "Flagga de markerade meddelandena för uppföljning"
 
-#: ../mail/e-mail-reader.c:2059
+#: ../mail/e-mail-reader.c:1992
 msgid "_Attached"
 msgstr "_Bifogad"
 
-#: ../mail/e-mail-reader.c:2061 ../mail/e-mail-reader.c:2068
+#: ../mail/e-mail-reader.c:1994 ../mail/e-mail-reader.c:2001
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Vidarebefordra det markerade meddelandet till någon som en bilaga"
 
-#: ../mail/e-mail-reader.c:2066
+#: ../mail/e-mail-reader.c:1999
 msgid "Forward As _Attached"
 msgstr "Vidarebefordra som _bilaga"
 
-#: ../mail/e-mail-reader.c:2073
+#: ../mail/e-mail-reader.c:2006
 msgid "_Inline"
 msgstr "_Inuti"
 
-#: ../mail/e-mail-reader.c:2075 ../mail/e-mail-reader.c:2082
+#: ../mail/e-mail-reader.c:2008 ../mail/e-mail-reader.c:2015
 msgid "Forward the selected message in the body of a new message"
 msgstr ""
 "Vidarebefordra det markerade meddelandet i texten på ett nytt meddelande"
 
-#: ../mail/e-mail-reader.c:2080
+#: ../mail/e-mail-reader.c:2013
 msgid "Forward As _Inline"
 msgstr "Vidarebefordra som _infogad"
 
-#: ../mail/e-mail-reader.c:2087
+#: ../mail/e-mail-reader.c:2020
 msgid "_Quoted"
 msgstr "_Citerad"
 
-#: ../mail/e-mail-reader.c:2089 ../mail/e-mail-reader.c:2096
+#: ../mail/e-mail-reader.c:2022 ../mail/e-mail-reader.c:2029
 msgid "Forward the selected message quoted like a reply"
 msgstr "Vidarebefordra det markerade meddelandet citerat som ett svar"
 
-#: ../mail/e-mail-reader.c:2094
+#: ../mail/e-mail-reader.c:2027
 msgid "Forward As _Quoted"
 msgstr "Vidarebefordra som _citerad"
 
-#: ../mail/e-mail-reader.c:2101
+#: ../mail/e-mail-reader.c:2034
 msgid "_Load Images"
 msgstr "L_äs in bilder"
 
-#: ../mail/e-mail-reader.c:2103
+#: ../mail/e-mail-reader.c:2036
 msgid "Force images in HTML mail to be loaded"
 msgstr "Tvinga att bilder i HTML-epost läses in"
 
-#: ../mail/e-mail-reader.c:2108 ../mail/e-mail-reader.c:2486
+#: ../mail/e-mail-reader.c:2041 ../mail/e-mail-reader.c:2419
 msgid "_Ignore Subthread"
 msgstr "_Ignorera undertråd"
 
-#: ../mail/e-mail-reader.c:2110
+#: ../mail/e-mail-reader.c:2043
 msgid "Mark new mails in a subthread as read automatically"
 msgstr "Markera automatiskt ny e-post i en undertråd som läst"
 
-#: ../mail/e-mail-reader.c:2115 ../mail/e-mail-reader.c:2490
+#: ../mail/e-mail-reader.c:2048 ../mail/e-mail-reader.c:2423
 msgid "_Ignore Thread"
 msgstr "_Ignorera tråd"
 
-#: ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2050
 msgid "Mark new mails in this thread as read automatically"
 msgstr "Markera automatiskt ny e-post i denna tråd som läst"
 
-#: ../mail/e-mail-reader.c:2122
+#: ../mail/e-mail-reader.c:2055
 msgid "_Important"
 msgstr "_Viktigt"
 
-#: ../mail/e-mail-reader.c:2124
+#: ../mail/e-mail-reader.c:2057
 msgid "Mark the selected messages as important"
 msgstr "Markera de markerade meddelandena som viktiga"
 
-#: ../mail/e-mail-reader.c:2129
+#: ../mail/e-mail-reader.c:2062
 msgid "_Junk"
 msgstr "S_kräp"
 
-#: ../mail/e-mail-reader.c:2131
+#: ../mail/e-mail-reader.c:2064
 msgid "Mark the selected messages as junk"
 msgstr "Markera de markerade meddelandena som skräppost"
 
-#: ../mail/e-mail-reader.c:2136
+#: ../mail/e-mail-reader.c:2069
 msgid "_Not Junk"
 msgstr "I_nte skräppost"
 
-#: ../mail/e-mail-reader.c:2138
+#: ../mail/e-mail-reader.c:2071
 msgid "Mark the selected messages as not being junk"
 msgstr "Markera de markerade meddelandena som inte skräppost"
 
 # [Status] [är] [Läst]
-#: ../mail/e-mail-reader.c:2143
+#: ../mail/e-mail-reader.c:2076
 msgid "_Read"
 msgstr "_Läst"
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2078
 msgid "Mark the selected messages as having been read"
 msgstr "Markera de markerade meddelandena som lästa"
 
-#: ../mail/e-mail-reader.c:2150 ../mail/e-mail-reader.c:2510
+#: ../mail/e-mail-reader.c:2083 ../mail/e-mail-reader.c:2443
 msgid "Do not _Ignore Subthread"
 msgstr "_Ignorera inte undertråd"
 
-#: ../mail/e-mail-reader.c:2152
+#: ../mail/e-mail-reader.c:2085
 msgid "Do not mark new mails in a subthread as read automatically"
 msgstr "Markera inte automatiskt ny e-post i en undertråd som läst"
 
-#: ../mail/e-mail-reader.c:2157 ../mail/e-mail-reader.c:2514
+#: ../mail/e-mail-reader.c:2090 ../mail/e-mail-reader.c:2447
 msgid "Do not _Ignore Thread"
 msgstr "_Ignorera inte tråd"
 
-#: ../mail/e-mail-reader.c:2159
+#: ../mail/e-mail-reader.c:2092
 msgid "Do not mark new mails in this thread as read automatically"
 msgstr "Markera inte automatiskt ny e-post i denna tråd som läst"
 
-#: ../mail/e-mail-reader.c:2164
+#: ../mail/e-mail-reader.c:2097
 msgid "Uni_mportant"
 msgstr "Ovikti_gt"
 
-#: ../mail/e-mail-reader.c:2166
+#: ../mail/e-mail-reader.c:2099
 msgid "Mark the selected messages as unimportant"
 msgstr "Markera de markerade meddelandena som oviktiga"
 
-#: ../mail/e-mail-reader.c:2171
+#: ../mail/e-mail-reader.c:2104
 msgid "_Unread"
 msgstr "_Oläst"
 
-#: ../mail/e-mail-reader.c:2173
+#: ../mail/e-mail-reader.c:2106
 msgid "Mark the selected messages as not having been read"
 msgstr "Markera de markerade meddelandena som olästa"
 
-#: ../mail/e-mail-reader.c:2178
+#: ../mail/e-mail-reader.c:2111
 msgid "_Edit as New Message..."
 msgstr "_Redigera som nytt meddelande…"
 
-#: ../mail/e-mail-reader.c:2180
+#: ../mail/e-mail-reader.c:2113
 msgid "Open the selected messages in the composer for editing"
 msgstr "Öppna de markerade meddelandena i redigeraren för redigering"
 
-#: ../mail/e-mail-reader.c:2185
+#: ../mail/e-mail-reader.c:2118
 msgid "Compose _New Message"
 msgstr "Skriv ett _nytt meddelande"
 
-#: ../mail/e-mail-reader.c:2187
+#: ../mail/e-mail-reader.c:2120
 msgid "Open a window for composing a mail message"
 msgstr "Öppna ett fönster för skrivning av ett e-postmeddelande"
 
-#: ../mail/e-mail-reader.c:2192
+#: ../mail/e-mail-reader.c:2125
 msgid "_Open in New Window"
 msgstr "_Öppna i nytt fönster"
 
-#: ../mail/e-mail-reader.c:2194
+#: ../mail/e-mail-reader.c:2127
 msgid "Open the selected messages in a new window"
 msgstr "Öppna de markerade meddelandena i ett nytt fönster"
 
-#: ../mail/e-mail-reader.c:2199
+#: ../mail/e-mail-reader.c:2132
 msgid "_Move to Folder..."
 msgstr "_Flytta till mapp…"
 
-#: ../mail/e-mail-reader.c:2201
+#: ../mail/e-mail-reader.c:2134
 msgid "Move selected messages to another folder"
 msgstr "Flytta markerade meddelanden till en annan mapp"
 
-#: ../mail/e-mail-reader.c:2206
+#: ../mail/e-mail-reader.c:2139
 msgid "_Next Message"
 msgstr "_Nästa meddelande"
 
-#: ../mail/e-mail-reader.c:2208
+#: ../mail/e-mail-reader.c:2141
 msgid "Display the next message"
 msgstr "Visa nästa meddelande"
 
-#: ../mail/e-mail-reader.c:2213
+#: ../mail/e-mail-reader.c:2146
 msgid "Next _Important Message"
 msgstr "Nästa _viktiga meddelande"
 
-#: ../mail/e-mail-reader.c:2215
+#: ../mail/e-mail-reader.c:2148
 msgid "Display the next important message"
 msgstr "Visa nästa viktiga meddelande"
 
-#: ../mail/e-mail-reader.c:2220
+#: ../mail/e-mail-reader.c:2153
 msgid "Next _Thread"
 msgstr "Nästa _tråd"
 
-#: ../mail/e-mail-reader.c:2222
+#: ../mail/e-mail-reader.c:2155
 msgid "Display the next thread"
 msgstr "Visa nästa tråd"
 
-#: ../mail/e-mail-reader.c:2227
+#: ../mail/e-mail-reader.c:2160
 msgid "Next _Unread Message"
 msgstr "Nästa _olästa meddelande"
 
-#: ../mail/e-mail-reader.c:2229
+#: ../mail/e-mail-reader.c:2162
 msgid "Display the next unread message"
 msgstr "Visa nästa olästa meddelande"
 
-#: ../mail/e-mail-reader.c:2234
+#: ../mail/e-mail-reader.c:2167
 msgid "_Previous Message"
 msgstr "_Föregående meddelande"
 
-#: ../mail/e-mail-reader.c:2236
+#: ../mail/e-mail-reader.c:2169
 msgid "Display the previous message"
 msgstr "Visa föregående meddelande"
 
-#: ../mail/e-mail-reader.c:2241
+#: ../mail/e-mail-reader.c:2174
 msgid "Pr_evious Important Message"
 msgstr "Fö_regående viktiga meddelande"
 
-#: ../mail/e-mail-reader.c:2243
+#: ../mail/e-mail-reader.c:2176
 msgid "Display the previous important message"
 msgstr "Visa föregående viktiga meddelande"
 
-#: ../mail/e-mail-reader.c:2248
+#: ../mail/e-mail-reader.c:2181
 msgid "Previous T_hread"
 msgstr "Föregående trå_d"
 
-#: ../mail/e-mail-reader.c:2250
+#: ../mail/e-mail-reader.c:2183
 msgid "Display the previous thread"
 msgstr "Visa föregående tråd"
 
-#: ../mail/e-mail-reader.c:2255
+#: ../mail/e-mail-reader.c:2188
 msgid "P_revious Unread Message"
 msgstr "F_öregående olästa meddelande"
 
-#: ../mail/e-mail-reader.c:2257
+#: ../mail/e-mail-reader.c:2190
 msgid "Display the previous unread message"
 msgstr "Visa föregående olästa meddelande"
 
-#: ../mail/e-mail-reader.c:2264
+#: ../mail/e-mail-reader.c:2197
 msgid "Print this message"
 msgstr "Skriv ut detta meddelande"
 
-#: ../mail/e-mail-reader.c:2271
+#: ../mail/e-mail-reader.c:2204
 msgid "Preview the message to be printed"
 msgstr "Förhandsgranska meddelandet som ska skrivas ut"
 
-#: ../mail/e-mail-reader.c:2276
+#: ../mail/e-mail-reader.c:2209
 msgid "Re_direct"
 msgstr "_Dirigera om"
 
-#: ../mail/e-mail-reader.c:2278
+#: ../mail/e-mail-reader.c:2211
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Dirigera om (studsa) det markerade meddelandet till någon"
 
-#: ../mail/e-mail-reader.c:2283
+#: ../mail/e-mail-reader.c:2216
 msgid "Remo_ve Attachments"
 msgstr "Ta b_ort bilagor"
 
-#: ../mail/e-mail-reader.c:2285
+#: ../mail/e-mail-reader.c:2218
 msgid "Remove attachments"
 msgstr "Ta bort bilagor"
 
-#: ../mail/e-mail-reader.c:2290
+#: ../mail/e-mail-reader.c:2223
 msgid "Remove Du_plicate Messages"
 msgstr "Ta bort dub_bletta meddelanden"
 
-#: ../mail/e-mail-reader.c:2292
+#: ../mail/e-mail-reader.c:2225
 msgid "Checks selected messages for duplicates"
 msgstr "Letar efter dubbletter i markerade meddelanden"
 
-#: ../mail/e-mail-reader.c:2297 ../mail/mail.error.xml.h:27
+#: ../mail/e-mail-reader.c:2230 ../mail/mail.error.xml.h:27
 #: ../modules/calendar/e-cal-shell-view-actions.c:1387
 #: ../modules/mail/e-mail-attachment-handler.c:213
 msgid "Reply to _All"
 msgstr "Svara till _alla"
 
-#: ../mail/e-mail-reader.c:2299
+#: ../mail/e-mail-reader.c:2232
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Skriv ett svar till alla mottagare i det markerade meddelandet"
 
-#: ../mail/e-mail-reader.c:2304 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2237 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "Svara till _lista"
 
-#: ../mail/e-mail-reader.c:2306
+#: ../mail/e-mail-reader.c:2239
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Skriv ett svar till sändlistan till det markerade meddelandet"
 
-#: ../mail/e-mail-reader.c:2311
+#: ../mail/e-mail-reader.c:2244
 #: ../modules/mail/e-mail-attachment-handler.c:220
 msgid "_Reply to Sender"
 msgstr "Svara till avsän_daren"
 
-#: ../mail/e-mail-reader.c:2313
+#: ../mail/e-mail-reader.c:2246
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Skriv ett svar till avsändaren av det markerade meddelandet"
 
-#: ../mail/e-mail-reader.c:2318
+#: ../mail/e-mail-reader.c:2251
 msgid "_Save as mbox..."
 msgstr "_Spara som mbox…"
 
-#: ../mail/e-mail-reader.c:2320
+#: ../mail/e-mail-reader.c:2253
 msgid "Save selected messages as an mbox file"
 msgstr "Spara markerade meddelanden som en mbox-fil"
 
-#: ../mail/e-mail-reader.c:2325
+#: ../mail/e-mail-reader.c:2258
 msgid "_Message Source"
 msgstr "Me_ddelandekälla"
 
-#: ../mail/e-mail-reader.c:2327
+#: ../mail/e-mail-reader.c:2260
 msgid "Show the raw email source of the message"
 msgstr "Visa den råa e-postkällkoden till meddelandet"
 
-#: ../mail/e-mail-reader.c:2339
+#: ../mail/e-mail-reader.c:2272
 msgid "_Undelete Message"
 msgstr "_Ångra borttagning av meddelande"
 
-#: ../mail/e-mail-reader.c:2341
+#: ../mail/e-mail-reader.c:2274
 msgid "Undelete the selected messages"
 msgstr "Ångra borttagning av de markerade meddelandena"
 
-#: ../mail/e-mail-reader.c:2346
+#: ../mail/e-mail-reader.c:2279
 msgid "_Normal Size"
 msgstr "_Normal storlek"
 
-#: ../mail/e-mail-reader.c:2348
+#: ../mail/e-mail-reader.c:2281
 msgid "Reset the text to its original size"
 msgstr "Återställ texten till dess originalstorlek"
 
-#: ../mail/e-mail-reader.c:2353
+#: ../mail/e-mail-reader.c:2286
 msgid "_Zoom In"
 msgstr "_Zooma in"
 
-#: ../mail/e-mail-reader.c:2355
+#: ../mail/e-mail-reader.c:2288
 msgid "Increase the text size"
 msgstr "Öka textstorleken"
 
-#: ../mail/e-mail-reader.c:2362
+#: ../mail/e-mail-reader.c:2295
 msgid "Decrease the text size"
 msgstr "Minska textstorleken"
 
-#: ../mail/e-mail-reader.c:2369
+#: ../mail/e-mail-reader.c:2302
 msgid "Cre_ate"
 msgstr "S_kapa"
 
-#: ../mail/e-mail-reader.c:2376
+#: ../mail/e-mail-reader.c:2309
 msgid "Ch_aracter Encoding"
 msgstr "Tecken_kodning"
 
-#: ../mail/e-mail-reader.c:2383
+#: ../mail/e-mail-reader.c:2316
 msgid "F_orward As"
 msgstr "_Vidarebefordra som"
 
-#: ../mail/e-mail-reader.c:2390
+#: ../mail/e-mail-reader.c:2323
 msgid "_Group Reply"
 msgstr "_Gruppsvar"
 
-#: ../mail/e-mail-reader.c:2397
+#: ../mail/e-mail-reader.c:2330
 msgid "_Go To"
 msgstr "_Gå till"
 
-#: ../mail/e-mail-reader.c:2404
+#: ../mail/e-mail-reader.c:2337
 msgid "Mar_k As"
 msgstr "Mark_era som"
 
-#: ../mail/e-mail-reader.c:2411
+#: ../mail/e-mail-reader.c:2344
 msgid "_Message"
 msgstr "_Meddelande"
 
-#: ../mail/e-mail-reader.c:2418
+#: ../mail/e-mail-reader.c:2351
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../mail/e-mail-reader.c:2428
+#: ../mail/e-mail-reader.c:2361
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "Skapa en sökmapp från sänd_lista…"
 
-#: ../mail/e-mail-reader.c:2430
+#: ../mail/e-mail-reader.c:2363
 msgid "Create a search folder for this mailing list"
 msgstr "Skapa en sökmapp för denna sändlista"
 
-#: ../mail/e-mail-reader.c:2435
+#: ../mail/e-mail-reader.c:2368
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "Skapa en sökmapp från mot_tagare…"
 
-#: ../mail/e-mail-reader.c:2437
+#: ../mail/e-mail-reader.c:2370
 msgid "Create a search folder for these recipients"
 msgstr "Skapa en sökmapp för dessa mottagare"
 
-#: ../mail/e-mail-reader.c:2442
+#: ../mail/e-mail-reader.c:2375
 msgid "Create a Search Folder from Sen_der..."
 msgstr "Skapa en sökmapp från a_vsändare…"
 
-#: ../mail/e-mail-reader.c:2444
+#: ../mail/e-mail-reader.c:2377
 msgid "Create a search folder for this sender"
 msgstr "Skapa en sökmapp för denna avsändare"
 
-#: ../mail/e-mail-reader.c:2449
+#: ../mail/e-mail-reader.c:2382
 msgid "Create a Search Folder from S_ubject..."
 msgstr "Skapa en sökmapp från _ämne…"
 
-#: ../mail/e-mail-reader.c:2451
+#: ../mail/e-mail-reader.c:2384
 msgid "Create a search folder for this subject"
 msgstr "Skapa en sökmapp för detta ämne"
 
-#: ../mail/e-mail-reader.c:2478
+#: ../mail/e-mail-reader.c:2411
 msgid "Mark for Follo_w Up..."
 msgstr "Markera för uppf_öljning…"
 
-#: ../mail/e-mail-reader.c:2494
+#: ../mail/e-mail-reader.c:2427
 msgid "Mark as _Important"
 msgstr "Markera som _viktigt"
 
-#: ../mail/e-mail-reader.c:2498
+#: ../mail/e-mail-reader.c:2431
 msgid "Mark as _Junk"
 msgstr "Markera som _skräppost"
 
-#: ../mail/e-mail-reader.c:2502
+#: ../mail/e-mail-reader.c:2435
 msgid "Mark as _Not Junk"
 msgstr "Markera som _inte skräppost"
 
-#: ../mail/e-mail-reader.c:2506
+#: ../mail/e-mail-reader.c:2439
 msgid "Mar_k as Read"
 msgstr "_Markera som läst"
 
-#: ../mail/e-mail-reader.c:2518
+#: ../mail/e-mail-reader.c:2451
 msgid "Mark as Uni_mportant"
 msgstr "Markera som ovikt_igt"
 
-#: ../mail/e-mail-reader.c:2522
+#: ../mail/e-mail-reader.c:2455
 msgid "Mark as _Unread"
 msgstr "Markera som _oläst"
 
-#: ../mail/e-mail-reader.c:2566
+#: ../mail/e-mail-reader.c:2499
 msgid "_Caret Mode"
 msgstr "_Markörläge"
 
-#: ../mail/e-mail-reader.c:2568
+#: ../mail/e-mail-reader.c:2501
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Visa en blinkande markör i meddelandetexten på de visade meddelandena"
 
-#: ../mail/e-mail-reader.c:2574
+#: ../mail/e-mail-reader.c:2507
 msgid "All Message _Headers"
 msgstr "Alla meddelande_rubriker"
 
-#: ../mail/e-mail-reader.c:2576
+#: ../mail/e-mail-reader.c:2509
 msgid "Show messages with all email headers"
 msgstr "Visa meddelanden med alla e-postrubriker"
 
-#: ../mail/e-mail-reader.c:3020
+#: ../mail/e-mail-reader.c:3044
 msgid "Retrieving message"
 msgstr "Hämtar meddelande"
 
-#: ../mail/e-mail-reader.c:4033
+#: ../mail/e-mail-reader.c:4075
 #: ../modules/mail/e-mail-attachment-handler.c:206
 msgid "_Forward"
 msgstr "Vidare_befordra"
 
-#: ../mail/e-mail-reader.c:4034
+#: ../mail/e-mail-reader.c:4076
 msgid "Forward the selected message to someone"
 msgstr "Vidarebefordra det markerade meddelandet till någon"
 
-#: ../mail/e-mail-reader.c:4053
+#: ../mail/e-mail-reader.c:4095
 msgid "Group Reply"
 msgstr "Gruppsvar"
 
-#: ../mail/e-mail-reader.c:4054
+#: ../mail/e-mail-reader.c:4096
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Svara till sändlistan eller till alla mottagare"
 
-#: ../mail/e-mail-reader.c:4120 ../mail/filtertypes.xml.in.h:65
+#: ../mail/e-mail-reader.c:4162 ../mail/filtertypes.xml.in.h:64
 msgid "Delete"
 msgstr "Ta bort"
 
-#: ../mail/e-mail-reader.c:4132
+#: ../mail/e-mail-reader.c:4174
 #: ../modules/calendar/e-cal-shell-view-actions.c:1212
 msgid "Next"
 msgstr "Nästa"
 
-#: ../mail/e-mail-reader.c:4136
+#: ../mail/e-mail-reader.c:4178
 #: ../modules/calendar/e-cal-shell-view-actions.c:1205
 msgid "Previous"
 msgstr "Föregående"
 
-#: ../mail/e-mail-reader.c:4145 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:4187 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "Svara"
 
+#: ../mail/e-mail-reader.c:5246
+#, c-format
+msgid "Allow remote content for anyone from %s"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:5248
+#, c-format
+msgid "Allow remote content for %s"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:5265
+#, c-format
+msgid "Allow remote content from %s"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:5322
+#, fuzzy
+#| msgid "Header content"
+msgid "Load remote content"
+msgstr "Rubrikinnehåll"
+
 #: ../mail/e-mail-reader-utils.c:146
 msgid "Do not warn me again"
 msgstr "Varna mig inte igen"
 
-#: ../mail/e-mail-reader-utils.c:556
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1806
-#: ../modules/cal-config-google/e-google-chooser.c:1843
-#: ../plugins/face/face.c:170 ../shell/e-shell.c:867 ../shell/e-shell.c:888
+#: ../mail/e-mail-reader-utils.c:552
+#, fuzzy, c-format
+#| msgid "Removing folder '%s'"
+msgid "Refreshing folder '%s'"
+msgstr "Tar bort mappen ”%s”"
+
+#: ../mail/e-mail-reader-utils.c:620 ../mail/mail-send-recv.c:486
+#: ../mail/mail-send-recv.c:1285 ../plugins/face/face.c:176
+#: ../shell/e-shell.c:972 ../shell/e-shell.c:994
 #: ../smime/gui/certificate-manager.c:346
 msgid "Unknown error"
 msgstr "Okänt fel"
 
-#: ../mail/e-mail-reader-utils.c:1043
+#: ../mail/e-mail-reader-utils.c:1121
 msgid "Marking thread to be ignored"
 msgstr "Markerar tråd att ignorera"
 
-#: ../mail/e-mail-reader-utils.c:1047
+#: ../mail/e-mail-reader-utils.c:1125
 msgid "Unmarking thread from being ignored"
 msgstr "Avmarkerar tråd från att ignoreras"
 
-#: ../mail/e-mail-reader-utils.c:1051
+#: ../mail/e-mail-reader-utils.c:1129
 msgid "Marking subthread to be ignored"
 msgstr "Markerar undertråd att ignorera"
 
-#: ../mail/e-mail-reader-utils.c:1055
+#: ../mail/e-mail-reader-utils.c:1133
 msgid "Unmarking subthread from being ignored"
 msgstr "Avmarkerar undertråd från att ignoreras"
 
-#: ../mail/e-mail-reader-utils.c:1290
+#: ../mail/e-mail-reader-utils.c:1373
 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:1525
+#: ../mail/e-mail-reader-utils.c:1608
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -15866,7 +16276,7 @@ msgstr[1] ""
 "Mappen ”%s” innehåller %u dubbletta meddelanden. Är du säker på att du vill "
 "ta bort dessa?"
 
-#: ../mail/e-mail-reader-utils.c:2355
+#: ../mail/e-mail-reader-utils.c:2438
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Spara meddelande"
@@ -15877,17 +16287,17 @@ msgstr[1] "Spara meddelanden"
 #. * 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:2376
+#: ../mail/e-mail-reader-utils.c:2459
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Meddelande"
 msgstr[1] "Meddelanden"
 
-#: ../mail/e-mail-reader-utils.c:2749
+#: ../mail/e-mail-reader-utils.c:2832
 msgid "Parsing message"
 msgstr "Tolkar meddelande"
 
-#: ../mail/e-mail-request.c:199
+#: ../mail/e-mail-request.c:204
 msgid "The message has no text content."
 msgstr "Dessa meddelanden har inget textinnehåll."
 
@@ -15909,7 +16319,7 @@ msgstr "Hittade ingen datakälla för UID ”%s”"
 #. * 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:1534
+#: ../mail/em-composer-utils.c:1542
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -15917,24 +16327,24 @@ msgstr ""
 "${AbbrevWeekdayName} ${Year}-${Month}-${Day} klockan ${24Hour}:${Minute} "
 "${TimeZone} skrev ${Sender}:"
 
-#: ../mail/em-composer-utils.c:1540
+#: ../mail/em-composer-utils.c:1548
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Vidarebefordrat meddelande --------"
 
-#: ../mail/em-composer-utils.c:1545
+#: ../mail/em-composer-utils.c:1553
 msgid "-----Original Message-----"
 msgstr "-----Ursprungligt meddelande-----"
 
-#: ../mail/em-composer-utils.c:2698
+#: ../mail/em-composer-utils.c:2766
 msgid "an unknown sender"
 msgstr "en okänd avsändare"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../mail/em-composer-utils.c:3137
+#: ../mail/em-composer-utils.c:3204
 msgid "Posting destination"
 msgstr "Postdestination"
 
-#: ../mail/em-composer-utils.c:3142
+#: ../mail/em-composer-utils.c:3209
 msgid "Choose folders to post the message to."
 msgstr "Välj mappar att posta meddelandet till."
 
@@ -15951,35 +16361,107 @@ msgstr "Sedan"
 msgid "Add Ac_tion"
 msgstr "Lägg till åt_gärd"
 
-#: ../mail/em-folder-properties.c:177
+#: ../mail/em-folder-properties.c:178
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Olästa meddelanden:"
 msgstr[1] "Olästa meddelanden:"
 
-#: ../mail/em-folder-properties.c:188
+#: ../mail/em-folder-properties.c:189
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Totalt antal meddelanden:"
 msgstr[1] "Totalt antal meddelanden:"
 
-#: ../mail/em-folder-properties.c:209
+#: ../mail/em-folder-properties.c:210
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Kvotanvändning (%s):"
 
-#: ../mail/em-folder-properties.c:211
+#: ../mail/em-folder-properties.c:212
 #, c-format
 msgid "Quota usage"
 msgstr "Kvotanvändning"
 
 #. 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:286
+#: ../mail/em-folder-properties.c:287
 msgid "_Send Account Override:"
 msgstr "Överskugga av_sändarkonto:"
 
-#: ../mail/em-folder-properties.c:415
+#: ../mail/em-folder-properties.c:491
+msgid "_Archive this folder using these settings:"
+msgstr ""
+
+#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
+#: ../mail/em-folder-properties.c:500
+#, fuzzy
+#| msgid "Sent _Messages Folder:"
+msgctxt "autoarchive"
+msgid "_Cleanup messages older than"
+msgstr "Mapp för skickade _meddelanden:"
+
+#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
+#: ../mail/em-folder-properties.c:516
+#, fuzzy
+#| msgid "days"
+msgctxt "autoarchive"
+msgid "days"
+msgstr "dagar"
+
+#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
+#: ../mail/em-folder-properties.c:518
+#, fuzzy
+#| msgid "weeks"
+msgctxt "autoarchive"
+msgid "weeks"
+msgstr "veckor"
+
+#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
+#: ../mail/em-folder-properties.c:520
+#, fuzzy
+#| msgid "months"
+msgctxt "autoarchive"
+msgid "months"
+msgstr "månader"
+
+#: ../mail/em-folder-properties.c:526
+#, fuzzy
+#| msgid "Move selected messages to another folder"
+msgid "Move old messages to the default archive _folder"
+msgstr "Flytta markerade meddelanden till en annan mapp"
+
+#: ../mail/em-folder-properties.c:537
+#, fuzzy
+#| msgid "Moving messages to '%s'"
+msgid "_Move old messages to:"
+msgstr "Flyttar meddelanden till ”%s”"
+
+#: ../mail/em-folder-properties.c:541
+#, fuzzy
+#| msgid "Archi_ve Folder:"
+msgid "AutoArchive folder"
+msgstr "Arki_vmapp:"
+
+#: ../mail/em-folder-properties.c:541
+#, fuzzy
+#| msgid "Select folder to import into"
+msgid "Select folder to use for AutoArchive"
+msgstr "Välj mapp att importera till"
+
+#: ../mail/em-folder-properties.c:547
+#, fuzzy
+#| msgid "_Delete junk messages"
+msgid "_Delete old messages"
+msgstr "Ta _bort skräppost"
+
+#: ../mail/em-folder-properties.c:606
+#, fuzzy
+#| msgid "_Archive..."
+msgid "AutoArchive"
+msgstr "_Arkivera…"
+
+#: ../mail/em-folder-properties.c:685
 msgid "Folder Properties"
 msgstr "Mappegenskaper"
 
@@ -16059,79 +16541,79 @@ msgstr "Pren_umerera på visade"
 msgid "Subscribe To _All"
 msgstr "Prenumerera på _alla"
 
-#: ../mail/em-subscription-editor.c:969 ../mail/em-subscription-editor.c:1867
-#: ../modules/mail/e-mail-shell-view-actions.c:1692
+#: ../mail/em-subscription-editor.c:970 ../mail/em-subscription-editor.c:1869
+#: ../modules/mail/e-mail-shell-view-actions.c:1751
 msgid "_Unsubscribe"
 msgstr "_Säg upp prenumeration"
 
-#: ../mail/em-subscription-editor.c:978
+#: ../mail/em-subscription-editor.c:979
 msgid "Unsu_bscribe From Hidden"
 msgstr "Sä_g upp prenumeration på dolda"
 
-#: ../mail/em-subscription-editor.c:986
+#: ../mail/em-subscription-editor.c:987
 msgid "Unsubscribe From _All"
 msgstr "Säg upp prenumerationen på _dolda"
 
-#: ../mail/em-subscription-editor.c:1704
+#: ../mail/em-subscription-editor.c:1706
 msgid "Folder Subscriptions"
 msgstr "Mapprenumerationer"
 
-#: ../mail/em-subscription-editor.c:1743
+#: ../mail/em-subscription-editor.c:1745
 msgid "_Account:"
 msgstr "_Konto:"
 
-#: ../mail/em-subscription-editor.c:1756
+#: ../mail/em-subscription-editor.c:1758
 msgid "Clear Search"
 msgstr "Töm sökfältet"
 
-#: ../mail/em-subscription-editor.c:1773
+#: ../mail/em-subscription-editor.c:1775
 msgid "Sho_w items that contain:"
 msgstr "Visa objekt som inn_ehåller:"
 
-#: ../mail/em-subscription-editor.c:1820
+#: ../mail/em-subscription-editor.c:1822
 msgid "Subscribe to the selected folder"
 msgstr "Prenumerera på markerad mapp"
 
-#: ../mail/em-subscription-editor.c:1821
+#: ../mail/em-subscription-editor.c:1823
 msgid "Su_bscribe"
 msgstr "Pren_umerera"
 
-#: ../mail/em-subscription-editor.c:1866
-#: ../modules/mail/e-mail-shell-view-actions.c:1694
+#: ../mail/em-subscription-editor.c:1868
+#: ../modules/mail/e-mail-shell-view-actions.c:1753
 msgid "Unsubscribe from the selected folder"
 msgstr "Säg upp prenumeration på vald mapp"
 
-#: ../mail/em-subscription-editor.c:1906
+#: ../mail/em-subscription-editor.c:1908
 msgid "Collapse all folders"
 msgstr "Fäll in alla mappar"
 
-#: ../mail/em-subscription-editor.c:1907
+#: ../mail/em-subscription-editor.c:1909
 msgid "C_ollapse All"
 msgstr "Fäll i_n alla"
 
-#: ../mail/em-subscription-editor.c:1917
+#: ../mail/em-subscription-editor.c:1919
 msgid "Expand all folders"
 msgstr "Fäll ut alla mappar"
 
-#: ../mail/em-subscription-editor.c:1918
+#: ../mail/em-subscription-editor.c:1920
 msgid "E_xpand All"
 msgstr "Fä_ll ut alla"
 
-#: ../mail/em-subscription-editor.c:1928
+#: ../mail/em-subscription-editor.c:1930
 msgid "Refresh the folder list"
 msgstr "Uppdatera mapplistan"
 
-#: ../mail/em-subscription-editor.c:1929
-#: ../modules/mail/e-mail-shell-view-actions.c:1593
-#: ../modules/mail/e-mail-shell-view-actions.c:1664
+#: ../mail/em-subscription-editor.c:1931
+#: ../modules/mail/e-mail-shell-view-actions.c:1652
+#: ../modules/mail/e-mail-shell-view-actions.c:1723
 msgid "_Refresh"
 msgstr "_Uppdatera"
 
-#: ../mail/em-subscription-editor.c:1940
+#: ../mail/em-subscription-editor.c:1942
 msgid "Stop the current operation"
 msgstr "Stoppa aktuell åtgärd"
 
-#: ../mail/em-subscription-editor.c:1941
+#: ../mail/em-subscription-editor.c:1943
 #: ../modules/addressbook/e-book-shell-view-actions.c:979
 msgid "_Stop"
 msgstr "_Stopp"
@@ -16140,22 +16622,28 @@ msgstr "_Stopp"
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:75
+#: ../mail/em-utils.c:76
 #, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "Är du säker på att du vill öppna %d meddelande på en gång?"
 msgstr[1] "Är du säker på att du vill öppna %d meddelanden på en gång?"
 
-#: ../mail/em-utils.c:241
+#: ../mail/em-utils.c:177
 msgid "Message Filters"
 msgstr "Meddelandefilter"
 
-#: ../mail/em-utils.c:983
+#: ../mail/em-utils.c:923
 #, c-format
 msgid "Messages from %s"
 msgstr "Meddelanden från %s"
 
+#: ../mail/em-utils.c:1680
+#, fuzzy
+#| msgid "_Delete junk messages"
+msgid "Deleting old messages"
+msgstr "Ta _bort skräppost"
+
 #: ../mail/em-vfolder-editor.c:104
 msgid "Search _Folders"
 msgstr "Sökma_ppar"
@@ -16339,7 +16827,7 @@ msgstr "viktigt"
 msgid "Read"
 msgstr "Läst"
 
-#: ../mail/filtertypes.xml.in.h:39 ../mail/mail-config.ui.h:121
+#: ../mail/filtertypes.xml.in.h:39 ../mail/mail-config.ui.h:126
 #: ../mail/vfoldertypes.xml.in.h:42
 msgid "Junk"
 msgstr "Skräppost"
@@ -16361,130 +16849,129 @@ msgstr "är inte flaggad"
 
 #: ../mail/filtertypes.xml.in.h:43 ../mail/searchtypes.xml.in.h:45
 #: ../mail/vfoldertypes.xml.in.h:46
-msgid "Completed On"
-msgstr "Färdigt den"
+#, fuzzy
+#| msgid "% Completed"
+msgid "is Completed"
+msgstr "% färdigt"
 
 #: ../mail/filtertypes.xml.in.h:44 ../mail/searchtypes.xml.in.h:46
 #: ../mail/vfoldertypes.xml.in.h:47
-msgid "is set"
-msgstr "är inställt"
-
-#: ../mail/filtertypes.xml.in.h:45 ../mail/searchtypes.xml.in.h:47
-#: ../mail/vfoldertypes.xml.in.h:48
-msgid "is not set"
-msgstr "är inte inställt"
+#, fuzzy
+#| msgid "% Completed"
+msgid "is not Completed"
+msgstr "% färdigt"
 
-#: ../mail/filtertypes.xml.in.h:49 ../mail/searchtypes.xml.in.h:51
-#: ../mail/vfoldertypes.xml.in.h:52
+#: ../mail/filtertypes.xml.in.h:48 ../mail/searchtypes.xml.in.h:50
+#: ../mail/vfoldertypes.xml.in.h:51
 msgid "Mailing list"
 msgstr "Sändlista"
 
-#: ../mail/filtertypes.xml.in.h:50 ../mail/searchtypes.xml.in.h:52
-#: ../mail/vfoldertypes.xml.in.h:53
+#: ../mail/filtertypes.xml.in.h:49 ../mail/searchtypes.xml.in.h:51
+#: ../mail/vfoldertypes.xml.in.h:52
 msgid "Regex Match"
 msgstr "Reguljärt uttryck matchar"
 
-#: ../mail/filtertypes.xml.in.h:51 ../mail/searchtypes.xml.in.h:53
-#: ../mail/vfoldertypes.xml.in.h:54
+#: ../mail/filtertypes.xml.in.h:50 ../mail/searchtypes.xml.in.h:52
+#: ../mail/vfoldertypes.xml.in.h:53
 msgid "Message Header"
 msgstr "Meddelanderubrik"
 
-#: ../mail/filtertypes.xml.in.h:52
+#: ../mail/filtertypes.xml.in.h:51
 msgid "Source Account"
 msgstr "Källkonto"
 
 # Osäker.
-#: ../mail/filtertypes.xml.in.h:53
+#: ../mail/filtertypes.xml.in.h:52
 msgid "Pipe to Program"
 msgstr "Skicka till program"
 
-#: ../mail/filtertypes.xml.in.h:54
+#: ../mail/filtertypes.xml.in.h:53
 msgid "returns"
 msgstr "returnerar"
 
-#: ../mail/filtertypes.xml.in.h:55
+#: ../mail/filtertypes.xml.in.h:54
 msgid "does not return"
 msgstr "returnerar inte"
 
-#: ../mail/filtertypes.xml.in.h:56
+#: ../mail/filtertypes.xml.in.h:55
 msgid "returns greater than"
 msgstr "returnerar större än"
 
-#: ../mail/filtertypes.xml.in.h:57
+#: ../mail/filtertypes.xml.in.h:56
 msgid "returns less than"
 msgstr "returnerar mindre än"
 
-#: ../mail/filtertypes.xml.in.h:58
+#: ../mail/filtertypes.xml.in.h:57
 msgid "Junk Test"
 msgstr "Skräptest"
 
-#: ../mail/filtertypes.xml.in.h:59
+#: ../mail/filtertypes.xml.in.h:58
 msgid "Message is Junk"
 msgstr "Meddelandet är skräppost"
 
-#: ../mail/filtertypes.xml.in.h:60
+#: ../mail/filtertypes.xml.in.h:59
 msgid "Message is not Junk"
 msgstr "Meddelandet är inte skräppost"
 
-#: ../mail/filtertypes.xml.in.h:61 ../mail/vfoldertypes.xml.in.h:55
+#: ../mail/filtertypes.xml.in.h:60 ../mail/vfoldertypes.xml.in.h:54
 msgid "Message Location"
 msgstr "Meddelandets plats"
 
-#: ../mail/filtertypes.xml.in.h:62 ../mail/searchtypes.xml.in.h:54
-#: ../mail/vfoldertypes.xml.in.h:56
+#: ../mail/filtertypes.xml.in.h:61 ../mail/searchtypes.xml.in.h:53
+#: ../mail/vfoldertypes.xml.in.h:55
 msgid "Match All"
 msgstr "Matcha alla"
 
-#: ../mail/filtertypes.xml.in.h:66
+#: ../mail/filtertypes.xml.in.h:65
 msgid "Stop Processing"
 msgstr "Stoppa behandling"
 
-#: ../mail/filtertypes.xml.in.h:67
+#: ../mail/filtertypes.xml.in.h:66
 msgid "Set Label"
 msgstr "Ställ in etikett"
 
-#: ../mail/filtertypes.xml.in.h:68
+#: ../mail/filtertypes.xml.in.h:67
 msgid "Assign Color"
 msgstr "Tilldela färg"
 
-#: ../mail/filtertypes.xml.in.h:69
+#: ../mail/filtertypes.xml.in.h:68
 msgid "Unset Color"
 msgstr "Ta bort färg"
 
-#: ../mail/filtertypes.xml.in.h:70
+#: ../mail/filtertypes.xml.in.h:69
 msgid "Assign Score"
 msgstr "Tilldela poäng"
 
-#: ../mail/filtertypes.xml.in.h:71
+#: ../mail/filtertypes.xml.in.h:70
 msgid "Adjust Score"
 msgstr "Justera poäng"
 
-#: ../mail/filtertypes.xml.in.h:72
+#: ../mail/filtertypes.xml.in.h:71
 msgid "Set Status"
 msgstr "Ställ in status"
 
-#: ../mail/filtertypes.xml.in.h:73 ../mail/searchtypes.xml.in.h:38
+#: ../mail/filtertypes.xml.in.h:72 ../mail/searchtypes.xml.in.h:38
 #: ../mail/vfoldertypes.xml.in.h:38
 msgid "Deleted"
 msgstr "Borttagen"
 
-#: ../mail/filtertypes.xml.in.h:74
+#: ../mail/filtertypes.xml.in.h:73
 msgid "Unset Status"
 msgstr "Töm status"
 
-#: ../mail/filtertypes.xml.in.h:75
+#: ../mail/filtertypes.xml.in.h:74
 msgid "Beep"
 msgstr "Pip"
 
-#: ../mail/filtertypes.xml.in.h:76
+#: ../mail/filtertypes.xml.in.h:75
 msgid "Play Sound"
 msgstr "Spela ljud"
 
-#: ../mail/filtertypes.xml.in.h:77
+#: ../mail/filtertypes.xml.in.h:76
 msgid "Run Program"
 msgstr "Kör program"
 
-#: ../mail/filtertypes.xml.in.h:78
+#: ../mail/filtertypes.xml.in.h:77
 msgid "Forward to"
 msgstr "Vidarebefordra till"
 
@@ -16492,11 +16979,11 @@ msgstr "Vidarebefordra till"
 msgid "Importing Elm data"
 msgstr "Importerar Elm-data"
 
-#: ../mail/importers/elm-importer.c:374
+#: ../mail/importers/elm-importer.c:376
 msgid "Evolution Elm importer"
 msgstr "Evolutions Elm-importör"
 
-#: ../mail/importers/elm-importer.c:375
+#: ../mail/importers/elm-importer.c:377
 msgid "Import mail from Elm."
 msgstr "Importera e-post från Elm."
 
@@ -16555,27 +17042,27 @@ msgid "Import mail and contacts from KMail."
 msgstr "Importera e-post och kontakter från KMail."
 
 #: ../mail/importers/kmail-libs.c:152
-#: ../modules/mail/e-mail-shell-view-private.c:1082
+#: ../modules/mail/e-mail-shell-view-private.c:1089
 msgid "Trash"
 msgstr "Papperskorg"
 
-#: ../mail/importers/mail-importer.c:55
+#: ../mail/importers/mail-importer.c:54
 msgid "Importing mailbox"
 msgstr "Importerar brevlåda"
 
-#: ../mail/importers/mail-importer.c:61
+#: ../mail/importers/mail-importer.c:60
 msgid "Importing mail and contacts from KMail"
 msgstr "Importerar e-post och kontakter från KMail"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:187 ../mail/importers/mail-importer.c:314
+#: ../mail/importers/mail-importer.c:186 ../mail/importers/mail-importer.c:311
 #: ../plugins/dbx-import/dbx-importer.c:609
 #: ../plugins/pst-import/pst-importer.c:760
 #, c-format
 msgid "Importing '%s'"
 msgstr "Importerar ”%s”"
 
-#: ../mail/importers/mail-importer.c:570
+#: ../mail/importers/mail-importer.c:555
 #, c-format
 msgid "Scanning %s"
 msgstr "Söker igenom %s"
@@ -16584,11 +17071,11 @@ msgstr "Söker igenom %s"
 msgid "Importing Pine data"
 msgstr "Importerar Pine-data"
 
-#: ../mail/importers/pine-importer.c:475
+#: ../mail/importers/pine-importer.c:477
 msgid "Evolution Pine importer"
 msgstr "Evolutions Pine-importör"
 
-#: ../mail/importers/pine-importer.c:476
+#: ../mail/importers/pine-importer.c:478
 msgid "Import mail from Pine."
 msgstr "Importera e-post från Pine."
 
@@ -16666,110 +17153,110 @@ msgstr "Standardbeteende"
 msgid "For_mat messages in HTML"
 msgstr "For_matera meddelanden i HTML"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:10
 msgid "Automatically insert _emoticons"
 msgstr "Infoga automatiskt _humörsymboler"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:11
 msgid "Use Unicode characters for smile_ys"
 msgstr "Använd Unicode-tecken för sm_ilisar"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
 msgstr "Begär allti_d läskvitto"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
 msgid "Encode filenames in an _Outlook/GMail way"
 msgstr "Koda filnamn liknande _Outlook/GMail"
 
-#: ../mail/mail-config.ui.h:13
+#: ../mail/mail-config.ui.h:14
 msgid "Send messages through Outbo_x folder"
 msgstr "Skicka meddelanden via _Utkorg-mapp"
 
-#: ../mail/mail-config.ui.h:14
+#: ../mail/mail-config.ui.h:15
 msgid "Number of characters for word w_rapping:"
 msgstr "Antal tecken för _radbrytning mellan ord:"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:16
 msgid "Ch_aracter encoding:"
 msgstr "Tecken_kodning:"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:17
 msgid "Replies and Forwards"
 msgstr "Svar och vidarebefordringar"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:18
 msgid "_Reply style:"
 msgstr "_Svarsstil:"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:19
 msgid "_Forward style:"
 msgstr "Stil för _vidarebefordran:"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:20
 msgid "Start _typing at the bottom on replying"
 msgstr "Börja s_kriva längst ner vid svar"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:21
 msgid "_Keep signature above the original message on replying"
 msgstr "_Behåll signaturen ovanför det ursprungliga meddelandet vid svar"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:22
 msgid "Ig_nore Reply-To: for mailing lists"
 msgstr "Ig_norera Svara-till: för sändlistor"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:23
 msgid "Gro_up Reply goes only to mailing list, if possible"
 msgstr "Gr_uppsvar går endast till sändlistan, om möjligt"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:24
 msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
 msgstr ""
 "_Signera meddelanden digital när ursprungsmeddelandet är signerat (PGP eller "
 "S/MIME)"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:25
 msgctxt "ReplyForward"
 msgid "Attachment"
 msgstr "Bilaga"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:26
 msgctxt "ReplyForward"
 msgid "Inline (Outlook style)"
 msgstr "Inuti (Outlook-stil)"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:27
 msgctxt "ReplyForward"
 msgid "Quoted"
 msgstr "Citerad"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:28
 msgctxt "ReplyForward"
 msgid "Do Not Quote"
 msgstr "Citera inte"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:29
 msgctxt "ReplyForward"
 msgid "Inline"
 msgstr "Inuti"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:31
 msgid "Sig_natures"
 msgstr "Sig_naturer"
 
-#: ../mail/mail-config.ui.h:31
+#: ../mail/mail-config.ui.h:32
 msgid "Signatures"
 msgstr "Signaturer"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:33
 msgid "_Languages"
 msgstr "S_pråk"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:34
 msgid "Languages Table"
 msgstr "Språktabell"
 
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:35
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -16777,11 +17264,11 @@ msgstr ""
 "Listan med språk här återspeglar endast de språk för vilka en ordbok är "
 "installerad."
 
-#: ../mail/mail-config.ui.h:36
+#: ../mail/mail-config.ui.h:37
 msgid "Check spelling while I _type"
 msgstr "Kontrollera stavning när jag skri_ver"
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:39
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
@@ -16790,73 +17277,73 @@ msgstr ""
 "bekräftelse innan följande kryssmarkerade åtgärder genomförs:"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:41
 msgid "Sending a message with an _empty subject line"
 msgstr "Skickar ett meddelande med en _tom ämnesrad"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:43
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "Skickar ett meddelande med endast _blindkopiemottagare definierade"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:45
 msgid "Sending a _private reply to a mailing list message"
 msgstr "Skickar ett _privat svar på ett meddelande från en sändlista"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:47
 msgid "Sending a reply to a large _number of recipients"
 msgstr "Skickar ett svar till ett stort a_ntal mottagare"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:49
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr "Låter en sän_dlista omdirigera ett privat svar till listan"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:51
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr ""
 "Skickar ett meddelande med _mottagare som inte matats in som e-postadresser"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:53
 msgid "Sending a message using _key accelerator (Ctrl+Enter)"
 msgstr "Ett meddelande skickas med snabb_tangent (Ctrl+Enter)"
 
-#: ../mail/mail-config.ui.h:53
+#: ../mail/mail-config.ui.h:54
 msgid "Confirmations"
 msgstr "Bekräftelser"
 
 #. Translators: Label of a frame with a list of folders for which to use selected account in Send account 
overrides
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:58
 msgid "Use for Folders"
 msgstr "Använd för mappar"
 
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:59
 msgid "A_dd"
 msgstr "L_ägg till"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:61
 msgid "Re_move"
 msgstr "_Ta bort"
 
 #. Translators: Label of a frame with a list of recipients for whom to use selected account in Send account 
overrides
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:63
 msgid "Use for Recipients"
 msgstr "Använd för mottagare"
 
 #. Translators: Label of a frame with a list of configured accounts in Send account overrides
-#: ../mail/mail-config.ui.h:64 ../modules/mail/em-composer-prefs.c:863
+#: ../mail/mail-config.ui.h:65 ../modules/mail/em-composer-prefs.c:864
 msgid "Account"
 msgstr "Konto"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:66
 msgid "Send account overrides"
 msgstr "Överskuggningar för avsändarkonto"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:67
 msgid ""
 "Assign which account should be used as a send account for respective folders "
 "or recipients, an override for usual send account detection. List of "
@@ -16868,207 +17355,235 @@ msgstr ""
 "avsändarkonto. Lista av mottagare kan innehålla delar av adresser eller "
 "namn. Namn- och adressdel jämförs separat."
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:68
 msgid "_Folder override has precedence over Recipient override"
 msgstr "_Mappöverskuggning har företräde över Mottagaröverskuggning"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:69
 msgid "Send Account"
 msgstr "Avsändarkonto"
 
-#: ../mail/mail-config.ui.h:74 ../smime/gui/smime-ui.ui.h:1
+#: ../mail/mail-config.ui.h:75 ../smime/gui/smime-ui.ui.h:1
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:75 ../smime/gui/smime-ui.ui.h:2
+#: ../mail/mail-config.ui.h:76 ../smime/gui/smime-ui.ui.h:2
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:77
 msgid "Start up"
 msgstr "Uppstart"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:78
 msgid "Check for new _messages on start"
 msgstr "Leta efter nya _meddelanden vid uppstart"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:79
 msgid "Check for new messa_ges in all active accounts"
 msgstr "Leta efter n_ya meddelanden i alla aktiva konton"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:80
 msgid "Message Display"
 msgstr "Meddelandevisning"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:81
 msgid "_Use the same fonts as other applications"
 msgstr "_Använd samma typsnitt som andra program"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:82
 msgid "S_tandard Font:"
 msgstr "_Standardtypsnitt:"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:83
 msgid "Select HTML fixed width font"
 msgstr "Välj HTML-typsnitt med fast breddsteg"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:84
 msgid "Select HTML variable width font"
 msgstr "Välj HTML-typsnitt med variabelt breddsteg"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:85
 msgid "Fix_ed Width Font:"
 msgstr "Typsnitt med fast b_reddsteg:"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:86
 msgid "_Mark messages as read after"
 msgstr "_Markera meddelanden som lästa efter"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:88
 msgid "Highlight _quotations with"
 msgstr "Markera _citat med"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:89
 #: ../modules/calendar/e-calendar-preferences.ui.h:59
 msgid "Pick a color"
 msgstr "Välj en färg"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:90
 msgid "color"
 msgstr "färg"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:91
 msgid "Default character e_ncoding:"
 msgstr "Standardteckenko_dning:"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:92
 msgid "Apply the same _view settings to all folders"
 msgstr "Verkställ samma _visningsinställningar till alla mappar"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:93
 msgid "F_all back to threading messages by subject"
 msgstr "Fall tillbaka på trådning av meddelanden efter _ämne"
 
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:94
 msgid "Delete Mail"
 msgstr "Ta bort e-post"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:95
 msgid "Empty _trash folders"
 msgstr "_Töm papperskorgsmappar"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:96
 msgid "Confirm _when expunging a folder"
 msgstr "Bekräfta _vid tömning av en mapp"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:97
 msgid "Archive Mail"
 msgstr "Arkivera e-post"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:98
 msgid "On This Computer A_rchive folder:"
 msgstr "På denna dator-arkivmapp:"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:99
 msgid "Archive folder to use for On This Computer messages"
 msgstr "Arkivmapp att använda för På denna dator-meddelanden"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:101
 msgid "_Show animated images"
 msgstr "_Visa animerade bilder"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:102
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr ""
 "I_nformera när HTML-meddelanden skickas till kontakter som inte vill ha dem"
 
-#: ../mail/mail-config.ui.h:102
-msgid "Loading Images"
-msgstr "Inläsning av bilder"
-
 #: ../mail/mail-config.ui.h:103
-msgid "_Never load images from the Internet"
-msgstr "Läs al_drig in bilder från nätet"
+msgid "Loading Remote Content"
+msgstr ""
 
 #: ../mail/mail-config.ui.h:104
-msgid "_Load images only in messages from contacts"
-msgstr "_Läs endast in bilder i meddelanden från kontakter"
+#, fuzzy
+#| msgid "_Never load images from the Internet"
+msgid "_Never load remote content from the Internet"
+msgstr "Läs al_drig in bilder från nätet"
 
 #: ../mail/mail-config.ui.h:105
-msgid "_Always load images from the Internet"
-msgstr "Läs _alltid in bilder från nätet"
+#, fuzzy
+#| msgid "_Load images only in messages from contacts"
+msgid "_Load remote content only in messages from contacts"
+msgstr "_Läs endast in bilder i meddelanden från kontakter"
 
 #: ../mail/mail-config.ui.h:106
+#, fuzzy
+#| msgid "_Always load images from the Internet"
+msgid "_Always load remote content from the Internet"
+msgstr "Läs _alltid in bilder från nätet"
+
+#: ../mail/mail-config.ui.h:107
+#, fuzzy
+#| msgid "_Add"
+msgid "Add"
+msgstr "_Lägg till"
+
+#: ../mail/mail-config.ui.h:108
+#, fuzzy
+#| msgid "_Remove"
+msgid "Remove"
+msgstr "_Ta bort"
+
+#: ../mail/mail-config.ui.h:109
+msgid "Allow for sites:"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:110
+#, fuzzy
+#| msgid "All local folders"
+msgid "Allow for senders:"
+msgstr "Alla lokala mappar"
+
+#: ../mail/mail-config.ui.h:111
 msgid "HTML Messages"
 msgstr "HTML-meddelanden"
 
-#: ../mail/mail-config.ui.h:107 ../mail/message-list.etspec.h:19
+#: ../mail/mail-config.ui.h:112 ../mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Etiketter"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:113
 msgid "Sender Photograph"
 msgstr "Avsändarens fotografi"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:114
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Visa fotografiet på avsändaren i förhandsvisningen av meddelandet"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:115
 msgid "Search gra_vatar.com for the photograph of sender"
 msgstr "Sök på gra_vatar.com efter avsändarens foto"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:116
 msgid "Displayed Message Headers"
 msgstr "Visade meddelanderubriker"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:117
 msgid "Mail Headers Table"
 msgstr "Tabell över e-postrubriker"
 
-#: ../mail/mail-config.ui.h:113
-#: ../modules/addressbook/autocompletion-config.c:117
+#: ../mail/mail-config.ui.h:118
+#: ../modules/addressbook/autocompletion-config.c:116
 #: ../modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Date/Time Format"
 msgstr "Format för datum/tid"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:120
 msgid "Check incoming _messages for junk"
 msgstr "Kontrollera om inkommande _meddelanden är skräppost"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:121
 msgid "_Delete junk messages"
 msgstr "Ta _bort skräppost"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:122
 msgid "Junk Test Options"
 msgstr "Skräptestalternativ"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:123
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
 "Markera _inte meddelanden som skräppost om avsändaren finns i min adressbok"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:124
 msgid "_Lookup in local address book only"
 msgstr "Sl_å endast upp i lokal adressbok"
 
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:125
 msgid "Check cu_stom headers for junk"
 msgstr "L_eta i anpassade rubriker efter skräppost"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:127
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:224
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:174
 msgid "No encryption"
 msgstr "Ingen kryptering"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:128
 msgid "TLS encryption"
 msgstr "TLS-kryptering"
 
-#: ../mail/mail-config.ui.h:124
+#: ../mail/mail-config.ui.h:129
 msgid "SSL encryption"
 msgstr "SSL-kryptering"
 
@@ -17354,7 +17869,7 @@ msgstr ""
 "alla mappar?"
 
 #: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1579
+#: ../modules/mail/e-mail-shell-view-actions.c:1638
 msgid "_Empty Trash"
 msgstr "Töm papperskor_gen"
 
@@ -17568,7 +18083,6 @@ msgid "Do _Not Disable"
 msgstr "Inaktivera _inte"
 
 #: ../mail/mail.error.xml.h:90
-#: ../plugins/publish-calendar/publish-calendar.c:655
 msgid "_Disable"
 msgstr "_Inaktivera"
 
@@ -17780,12 +18294,22 @@ msgstr "Kopiera mapp i mappträd."
 msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
 msgstr "Är du säker på att du vill kopiera mapp ”{0}” till mapp ”{1}”?"
 
+#: ../mail/mail.error.xml.h:139
+#, fuzzy
+#| msgid "Do _not Send"
+msgid "Do _not copy"
+msgstr "Skicka i_nte"
+
 #: ../mail/mail.error.xml.h:140
-msgid "_Always"
+#, fuzzy
+#| msgid "_Always"
+msgid "_Always copy"
 msgstr "A_lltid"
 
 #: ../mail/mail.error.xml.h:141
-msgid "N_ever"
+#, fuzzy
+#| msgid "N_ever"
+msgid "N_ever copy"
 msgstr "Al_drig"
 
 #: ../mail/mail.error.xml.h:142
@@ -17796,7 +18320,25 @@ msgstr "Flytta mapp i mappträd."
 msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
 msgstr "Är du säker på att du vill flytta mapp ”{0}” till mapp ”{1}”?"
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:145
+#, fuzzy
+#| msgid "Do _not Send"
+msgid "Do _not move"
+msgstr "Skicka i_nte"
+
+#: ../mail/mail.error.xml.h:146
+#, fuzzy
+#| msgid "_Always"
+msgid "_Always move"
+msgstr "A_lltid"
+
+#: ../mail/mail.error.xml.h:147
+#, fuzzy
+#| msgid "N_ever"
+msgid "N_ever move"
+msgstr "Al_drig"
+
+#: ../mail/mail.error.xml.h:148
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -17804,70 +18346,70 @@ msgstr ""
 "Detta meddelande kan inte skickas eftersom kontot du valde att skicka det "
 "med inte är aktiverat"
 
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:149
 msgid "Please enable the account or send using another account."
 msgstr "Aktivera kontot eller skicka med ett annat konto."
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:150
 msgid "Mail Deletion Failed"
 msgstr "Misslyckades att ta bort post"
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:151
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Du har inte tillräckliga rättigheter för att ta bort den här posten."
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:152
 msgid "\"Check Junk\" Failed"
 msgstr "”Kontroll av skräppost” misslyckades"
 
-#: ../mail/mail.error.xml.h:149
+#: ../mail/mail.error.xml.h:153
 msgid "\"Report Junk\" Failed"
 msgstr "”Rapportering av skräppost” misslyckades"
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:154
 msgid "\"Report Not Junk\" Failed"
 msgstr "”Rapportera som inte skräppost” misslyckades"
 
-#: ../mail/mail.error.xml.h:151
+#: ../mail/mail.error.xml.h:155
 msgid "Remove duplicate messages?"
 msgstr "Ta bort dubbletta meddelanden?"
 
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:156
 msgid "No duplicate messages found."
 msgstr "Inga dubbletta meddelanden hittades."
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:158
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "Mappen ”{0}” innehåller inget dubblett meddelande."
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:159
 msgid "Failed to connect account &quot;{0}&quot;."
 msgstr "Misslyckades med att ansluta konto &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:160
 msgid "Failed to disconnect account &quot;{0}&quot;."
 msgstr "Misslyckades med att koppla från konto &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:161
 msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
 msgstr "Misslyckades med att säga upp prenumeration på mapp &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:162
 msgid "Unable to retrieve message."
 msgstr "Kunde inte hämta meddelandet."
 
 # Vad är detta?
 # http://bugzilla.ximian.com/show_bug.cgi?id=61062
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:163
 msgid "{0}"
 msgstr "{0}"
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:164
 msgid "Message is not available in offline mode."
 msgstr "Meddelande är inte tillgängligt i frånkopplat läge."
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:165
 msgid ""
 "This can be due to the message not being downloaded yet. The folder, or the "
 "account, can be marked for offline synchronization. Then, once the account "
@@ -17881,39 +18423,39 @@ msgstr ""
 "denna mapp är vald för att säkerställa att alla meddelanden i mappen kommer "
 "att vara tillgängliga i frånkopplat läge."
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:166
 msgid "Failed to open folder."
 msgstr "Misslyckades med att öppna mapp."
 
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:168
 msgid "Failed to find duplicate messages."
 msgstr "Misslyckades med att hitta dubbletta meddelanden."
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:169
 msgid "Failed to retrieve messages."
 msgstr "Misslyckades med att hämta meddelanden."
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:170
 msgid "Failed to mark messages as read."
 msgstr "Misslyckades med att markera meddelanden som lästa."
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:171
 msgid "Failed to remove attachments from messages."
 msgstr "Misslyckades med att ta bort bilagor från meddelanden."
 
-#: ../mail/mail.error.xml.h:168
+#: ../mail/mail.error.xml.h:172
 msgid "Failed to download messages for offline viewing."
 msgstr "Misslyckades med att hämta meddelanden för frånkopplat läge."
 
-#: ../mail/mail.error.xml.h:169
+#: ../mail/mail.error.xml.h:173
 msgid "Failed to save messages to disk."
 msgstr "Misslyckades med att spara meddelanden till disk."
 
-#: ../mail/mail.error.xml.h:170
+#: ../mail/mail.error.xml.h:174
 msgid "Hidden file is attached."
 msgstr "Dold fil är bifogad."
 
-#: ../mail/mail.error.xml.h:171
+#: ../mail/mail.error.xml.h:175
 msgid ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
@@ -17921,79 +18463,106 @@ msgstr ""
 "Bilagan med namnet {0} är en dold fil och kan innehålla känsligt data. "
 "Granska den innan du skickar iväg den."
 
-#: ../mail/mail.error.xml.h:172
+#: ../mail/mail.error.xml.h:176
 msgid "Printing failed."
 msgstr "Utskriften misslyckades."
 
-#: ../mail/mail.error.xml.h:173
+#: ../mail/mail.error.xml.h:177
 msgid "The printer replied &quot;{0}&quot;."
 msgstr "Skrivaren svarade &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:174
+#: ../mail/mail.error.xml.h:178
 msgid "Could not perform this operation on {0}."
 msgstr "Kunde inte genomföra denna åtgärd på {0}."
 
-#: ../mail/mail.error.xml.h:175
+#: ../mail/mail.error.xml.h:179
 msgid "You must be working online to complete this operation."
 msgstr "Du måste arbeta i anslutet läge för att färdigställa denna åtgärd."
 
-#: ../mail/mail.error.xml.h:176
+#: ../mail/mail.error.xml.h:180
 msgid "Message from &quot;{0}&quot; account:"
 msgstr "Meddelande från konto &quot;{0}&quot:"
 
-#: ../mail/mail.error.xml.h:177
+#: ../mail/mail.error.xml.h:181
 msgid "Failed to mark thread to be ignored in folder '{0}'"
 msgstr "Misslyckades med att markera tråd för ignorering i mappen ”{0}”"
 
-#: ../mail/mail.error.xml.h:178
+#: ../mail/mail.error.xml.h:182
 msgid "Failed to unmark thread from being ignored in folder '{0}'"
 msgstr "Misslyckades med att avmarkera tråd från att ignoreras i mapp ”{0}”"
 
-#: ../mail/mail.error.xml.h:179
+#: ../mail/mail.error.xml.h:183
 msgid "Failed to mark subthread to be ignored in folder '{0}'"
 msgstr "Misslyckades med att markera undertråd för ignorering i mappen ”{0}”"
 
-#: ../mail/mail.error.xml.h:180
+#: ../mail/mail.error.xml.h:184
 msgid "Failed to unmark subthread from being ignored in folder '{0}'"
 msgstr ""
 "Misslyckades med att avmarkera undertråd från att ignoreras i mappen ”{0}”"
 
+#: ../mail/mail.error.xml.h:185
+msgid "Remote content download had been blocked for this message."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:186
+msgid ""
+"You can download remote content manually, or set to remember to download "
+"remote content for this sender or used sites."
+msgstr ""
+
+#. Translators: This constructs a string like "Follow-up, Completed on Tuesday, January 13, 2009"
+#: ../mail/mail.error.xml.h:188
+#, fuzzy
+#| msgid " (Completed "
+msgid "{0}, Completed on {1}"
+msgstr " (Färdigt "
+
+#. Translators: This constructs a string like "Follow-up by Tuesday, January 13, 2009"
+#: ../mail/mail.error.xml.h:190
+msgid "{0} by {1}"
+msgstr ""
+
+#. Translators: This constructs a string like "Overdue: Follow-up by Tuesday, January 13, 2009"
+#: ../mail/mail.error.xml.h:192
+msgid "Overdue: {0} by {1}"
+msgstr ""
+
 #: ../mail/mail-send-recv.c:191
 msgid "Canceling..."
 msgstr "Avbryter…"
 
-#: ../mail/mail-send-recv.c:631
+#: ../mail/mail-send-recv.c:636
 msgid "Send & Receive Mail"
 msgstr "Skicka och ta emot e-post"
 
-#: ../mail/mail-send-recv.c:645
+#: ../mail/mail-send-recv.c:650
 msgid "Cancel _All"
 msgstr "Avbryt a_llt"
 
-#: ../mail/mail-send-recv.c:735 ../mail/mail-send-recv.c:1249
+#: ../mail/mail-send-recv.c:740 ../mail/mail-send-recv.c:1259
 msgid "Updating..."
 msgstr "Uppdaterar…"
 
-#: ../mail/mail-send-recv.c:735 ../mail/mail-send-recv.c:817
+#: ../mail/mail-send-recv.c:740 ../mail/mail-send-recv.c:822
 msgid "Waiting..."
 msgstr "Väntar…"
 
-#: ../mail/mail-send-recv.c:1220
+#: ../mail/mail-send-recv.c:1225
 #, c-format
 msgid "Checking for new mail at '%s'"
 msgstr "Kontrollerar ny e-post på '%s'"
 
-#: ../mail/mail-send-recv.c:1434
+#: ../mail/mail-send-recv.c:1452
 #, c-format
 msgid "Deleting junk and expunging trash at '%s'"
 msgstr "Tar bort skräppost och tömmer papperskorgen på ”%s”"
 
-#: ../mail/mail-send-recv.c:1436
+#: ../mail/mail-send-recv.c:1454
 #, c-format
 msgid "Deleting junk at '%s'"
 msgstr "Tar bort skräppost på ”%s”"
 
-#: ../mail/mail-send-recv.c:1438
+#: ../mail/mail-send-recv.c:1456
 #, c-format
 msgid "Expunging trash at '%s'"
 msgstr "Tömmer papperskorgen på ”%s”"
@@ -18050,7 +18619,7 @@ msgstr "Högre"
 msgid "Highest"
 msgstr "Högsta"
 
-#: ../mail/message-list.c:459 ../mail/message-list.c:6043
+#: ../mail/message-list.c:459 ../mail/message-list.c:6044
 msgid "Generating message list"
 msgstr "Genererar meddelandelista"
 
@@ -18080,16 +18649,16 @@ msgstr "%d %b %Y"
 msgid "Select all visible messages"
 msgstr "Markera alla synliga meddelanden"
 
-#: ../mail/message-list.c:3629 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3632 ../mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "Meddelanden"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4985
+#: ../mail/message-list.c:4988
 msgid "Follow-up"
 msgstr "Följ upp"
 
-#: ../mail/message-list.c:5980
+#: ../mail/message-list.c:5981
 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 "
@@ -18101,7 +18670,7 @@ msgstr ""
 "eller genom att göra en ny sökning antingen genom att rensa med Sök->Töm "
 "menyalternativet eller genom att ändra sökfrasen ovan."
 
-#: ../mail/message-list.c:5988
+#: ../mail/message-list.c:5989
 msgid "There are no messages in this folder."
 msgstr "Det finns inga meddelanden i denna mapp."
 
@@ -18137,59 +18706,59 @@ msgstr "Ämne - Nedkortat"
 msgid "Any header"
 msgstr "Någon rubrik"
 
-#: ../mail/searchtypes.xml.in.h:55
+#: ../mail/searchtypes.xml.in.h:54
 msgid "Subject or Addresses contains"
 msgstr "Ämne eller Adresser innehåller"
 
-#: ../mail/searchtypes.xml.in.h:56
-#: ../modules/mail/e-mail-shell-view-actions.c:2070
+#: ../mail/searchtypes.xml.in.h:55
+#: ../modules/mail/e-mail-shell-view-actions.c:2136
 msgid "Recipients contain"
 msgstr "Mottagare innehåller"
 
-#: ../mail/searchtypes.xml.in.h:57
-#: ../modules/mail/e-mail-shell-view-actions.c:2063
+#: ../mail/searchtypes.xml.in.h:56
+#: ../modules/mail/e-mail-shell-view-actions.c:2129
 msgid "Message contains"
 msgstr "Meddelandet innehåller"
 
-#: ../mail/searchtypes.xml.in.h:58
-#: ../modules/mail/e-mail-shell-view-actions.c:2084
+#: ../mail/searchtypes.xml.in.h:57
+#: ../modules/mail/e-mail-shell-view-actions.c:2150
 msgid "Subject contains"
 msgstr "Ämne innehåller"
 
-#: ../mail/searchtypes.xml.in.h:59
-#: ../modules/mail/e-mail-shell-view-actions.c:2077
+#: ../mail/searchtypes.xml.in.h:58
+#: ../modules/mail/e-mail-shell-view-actions.c:2143
 msgid "Sender contains"
 msgstr "Avsändare innehåller"
 
-#: ../mail/searchtypes.xml.in.h:60
-#: ../modules/mail/e-mail-shell-view-actions.c:2049
+#: ../mail/searchtypes.xml.in.h:59
+#: ../modules/mail/e-mail-shell-view-actions.c:2115
 msgid "Body contains"
 msgstr "Meddelandetexten innehåller"
 
-#: ../mail/searchtypes.xml.in.h:61
-#: ../modules/mail/e-mail-shell-view-actions.c:2056
+#: ../mail/searchtypes.xml.in.h:60
+#: ../modules/mail/e-mail-shell-view-actions.c:2122
 msgid "Free form expression"
 msgstr "Friformsuttryck"
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a 
date in message list
-#: ../modules/addressbook/autocompletion-config.c:123
-#: ../modules/mail/em-mailer-prefs.c:1234
+#: ../modules/addressbook/autocompletion-config.c:122
+#: ../modules/mail/em-mailer-prefs.c:1552
 msgid "_Table column:"
 msgstr "_Tabellkolumn:"
 
-#: ../modules/addressbook/autocompletion-config.c:126
+#: ../modules/addressbook/autocompletion-config.c:125
 msgid "Address formatting"
 msgstr "Adressformatering"
 
-#: ../modules/addressbook/autocompletion-config.c:129
+#: ../modules/addressbook/autocompletion-config.c:128
 msgid "_Format address according to standard of its destination country"
 msgstr "_Formatera adress enligt standarden i dess land"
 
-#: ../modules/addressbook/autocompletion-config.c:137
+#: ../modules/addressbook/autocompletion-config.c:136
 msgid "Autocompletion"
 msgstr "Automatisk ifyllning"
 
-#: ../modules/addressbook/autocompletion-config.c:140
+#: ../modules/addressbook/autocompletion-config.c:139
 msgid "Always _show address of the autocompleted contact"
 msgstr "Visa allti_d adressen för automatiskt kompletterad kontakt"
 
@@ -18248,10 +18817,6 @@ msgstr "Adress_bok"
 msgid "Create a new address book"
 msgstr "Skapa en ny adressbok"
 
-#: ../modules/addressbook/e-book-shell-backend.c:314
-msgid "Certificates"
-msgstr "Certifikat"
-
 #: ../modules/addressbook/e-book-shell-view-actions.c:197
 msgid "Address Book Properties"
 msgstr "Egenskaper för adressboken"
@@ -18321,7 +18886,7 @@ msgstr "Visa karta över alla kontakter i markerad adressbok"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1261
 #: ../modules/calendar/e-memo-shell-view-actions.c:585
 #: ../modules/calendar/e-task-shell-view-actions.c:710
-#: ../modules/mail/e-mail-shell-view-actions.c:1671
+#: ../modules/mail/e-mail-shell-view-actions.c:1730
 msgid "_Rename..."
 msgstr "_Byt namn…"
 
@@ -18402,7 +18967,7 @@ msgstr "_Åtgärder"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1058
 #: ../modules/calendar/e-memo-shell-view-actions.c:622
 #: ../modules/calendar/e-task-shell-view-actions.c:775
-#: ../modules/mail/e-mail-shell-view-actions.c:1836
+#: ../modules/mail/e-mail-shell-view-actions.c:1902
 msgid "_Preview"
 msgstr "F_örhandsgranskning"
 
@@ -18429,7 +18994,7 @@ msgstr "Visa kartor i förhandsvisningsfönstret för kontakter"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1140
 #: ../modules/calendar/e-memo-shell-view-actions.c:692
 #: ../modules/calendar/e-task-shell-view-actions.c:857
-#: ../modules/mail/e-mail-shell-view-actions.c:1966
+#: ../modules/mail/e-mail-shell-view-actions.c:2032
 msgid "_Classic View"
 msgstr "_Klassisk vy"
 
@@ -18440,7 +19005,7 @@ msgstr "Visa förhandsvisning av kontakter nedanför kontaktlistan"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1147
 #: ../modules/calendar/e-memo-shell-view-actions.c:699
 #: ../modules/calendar/e-task-shell-view-actions.c:864
-#: ../modules/mail/e-mail-shell-view-actions.c:1973
+#: ../modules/mail/e-mail-shell-view-actions.c:2039
 msgid "_Vertical View"
 msgstr "_Vertikal vy"
 
@@ -18459,7 +19024,7 @@ msgstr "Omatchade"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1604
 #: ../modules/calendar/e-memo-shell-view-actions.c:726
 #: ../modules/calendar/e-task-shell-view-actions.c:926
-#: ../modules/mail/e-mail-shell-view-actions.c:2042
+#: ../modules/mail/e-mail-shell-view-actions.c:2108
 #: ../shell/e-shell-content.c:657
 msgid "Advanced Search"
 msgstr "Avancerad sökning"
@@ -18540,35 +19105,40 @@ msgstr "Välj en fil att återställa från"
 msgid "Restore from Backup"
 msgstr "Återställ från säkerhetskopia"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:216
+#: ../modules/backup-restore/evolution-backup-restore.c:217
 msgid "Select name of the Evolution backup file"
 msgstr "Välj namnet på Evolution-säkerhetskopian"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:249
+#: ../modules/backup-restore/evolution-backup-restore.c:250
 msgid "_Restart Evolution after backup"
 msgstr "Starta _om Evolution efter säkerhetskopiering"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:276
+#: ../modules/backup-restore/evolution-backup-restore.c:285
+msgid "Re_start Evolution after restore"
+msgstr "Starta _om Evolution efter återställning"
+
+#: ../modules/backup-restore/evolution-backup-restore.c:327
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Välj namnet på Evolution-säkerhetskopian att återställa"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:289
-msgid "Re_start Evolution after restore"
-msgstr "Starta _om Evolution efter återställning"
+#: ../modules/backup-restore/evolution-backup-restore.c:336
+#, c-format
+msgid "Checking content of backup file '%s', please wait..."
+msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-restore.c:307
+#: ../modules/backup-restore/evolution-backup-restore.c:357
 msgid "_Back up Evolution Data..."
 msgstr "Sä_kerhetskopiera Evolution-data…"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:309
+#: ../modules/backup-restore/evolution-backup-restore.c:359
 msgid "Back up Evolution data and settings to an archive file"
 msgstr "Säkerhetskopiera data och inställningar i Evolution till en arkivfil"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:314
+#: ../modules/backup-restore/evolution-backup-restore.c:364
 msgid "R_estore Evolution Data..."
 msgstr "Återskapa Ev_olution-data…"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:316
+#: ../modules/backup-restore/evolution-backup-restore.c:366
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Återställ data och inställningar i Evolution från en arkivfil"
 
@@ -18637,41 +19207,41 @@ msgstr "Tar bort temporära säkerhetskopior"
 msgid "Reloading registry service"
 msgstr "Laddar om registreringsservice"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:867
+#: ../modules/backup-restore/evolution-backup-tool.c:866
 msgid "Evolution Back Up"
 msgstr "Säkerhetskopiera Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:868
+#: ../modules/backup-restore/evolution-backup-tool.c:867
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Säkerhetskopierar till mappen %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:872
+#: ../modules/backup-restore/evolution-backup-tool.c:871
 msgid "Evolution Restore"
 msgstr "Återställning av Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:873
+#: ../modules/backup-restore/evolution-backup-tool.c:872
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Återställer från mappen %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:942
+#: ../modules/backup-restore/evolution-backup-tool.c:941
 msgid "Backing up Evolution Data"
 msgstr "Säkerhetskopierar Evolution-data"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:943
+#: ../modules/backup-restore/evolution-backup-tool.c:942
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Vänta under tiden Evolution säkerhetskopierar ditt data."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:945
+#: ../modules/backup-restore/evolution-backup-tool.c:944
 msgid "Restoring Evolution Data"
 msgstr "Återställer Evolution-data"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:946
+#: ../modules/backup-restore/evolution-backup-tool.c:945
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Vänta under tiden Evolution återställer ditt data."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:968
+#: ../modules/backup-restore/evolution-backup-tool.c:967
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "Det kan ta lite tid beroende på mängden data som finns i ditt konto."
 
@@ -18680,8 +19250,10 @@ msgid "Invalid Evolution backup file"
 msgstr "Ogiltig Evolution-säkerhetskopia"
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid "Please select a valid backup file to restore."
-msgstr "Välj en giltig säkerhetskopia att återskapa från."
+#, fuzzy
+#| msgid "Invalid Evolution backup file"
+msgid "File '{0}' is not a valid Evolution backup file."
+msgstr "Ogiltig Evolution-säkerhetskopia"
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:3
 msgid "Are you sure you want to close Evolution?"
@@ -18731,30 +19303,30 @@ msgstr "Otillräckliga rättigheter"
 msgid "The selected folder is not writable."
 msgstr "Den valda mappen är inte skrivbar."
 
-#: ../modules/bogofilter/evolution-bogofilter.c:161
+#: ../modules/bogofilter/evolution-bogofilter.c:160
 #, c-format
 msgid "Failed to spawn Bogofilter (%s): "
 msgstr "Misslyckades med att starta Bogofilter (%s): "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:179
+#: ../modules/bogofilter/evolution-bogofilter.c:178
 msgid "Failed to stream mail message content to Bogofilter: "
 msgstr "Misslyckades med att strömma meddelandets innehåll till Bogofilter: "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:228
+#: ../modules/bogofilter/evolution-bogofilter.c:227
 msgid "Bogofilter either crashed or failed to process a mail message"
 msgstr ""
 "Bogofilter antingen kraschade eller misslyckades med att behandla ett "
 "meddelande"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:373
+#: ../modules/bogofilter/evolution-bogofilter.c:372
 msgid "Bogofilter Options"
 msgstr "Alternativ för Bogofilter"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:382
+#: ../modules/bogofilter/evolution-bogofilter.c:381
 msgid "Convert message text to _Unicode"
 msgstr "Konvertera meddelandetext till _Unicode"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:540
+#: ../modules/bogofilter/evolution-bogofilter.c:539
 #: ../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:1
 msgid "Bogofilter"
 msgstr "Bogofilter"
@@ -18763,67 +19335,67 @@ msgstr "Bogofilter"
 msgid "Junk filter using Bogofilter"
 msgstr "Skräppostfilter som använder Bogofilter"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:441
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:440
 msgid "Standard LDAP Port"
 msgstr "Standard LDAP-port"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:447
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:619
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:446
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:618
 msgid "LDAP over SSL (deprecated)"
 msgstr "LDAP över SSL (föråldrad)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:453
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:452
 msgid "Microsoft Global Catalog"
 msgstr "Microsoft Global Catalog"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:459
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:458
 msgid "Microsoft Global Catalog over SSL"
 msgstr "Microsoft Global Catalog över SSL"
 
 #. Page 1
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:564
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:563
 msgid "Connecting to LDAP"
 msgstr "Ansluter till LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:581
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:580
 msgid "Server Information"
 msgstr "Serverinformation"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:608
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:607
 msgid "Port:"
 msgstr "Port:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:622
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:621
 msgid "StartTLS (recommended)"
 msgstr "StartTLS (rekommenderad)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:623
 msgid "Encryption:"
 msgstr "Kryptering:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:648
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:647
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:245
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:195
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:671
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:670
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:674
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:673
 msgid "Using email address"
 msgstr "Använder e-postadress"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:677
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:676
 msgid "Using distinguished name (DN)"
 msgstr "Använder distinguished name (DN)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:678
 msgid "Method:"
 msgstr "Metod:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:684
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:683
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Using email address\" requires anonymous access to your "
@@ -18834,36 +19406,36 @@ msgstr ""
 "åtkomst till din LDAP-server."
 
 #. Page 2
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:699
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:698
 msgid "Using LDAP"
 msgstr "Använder LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:716
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:715
 #: ../modules/mail/e-mail-shell-view.c:120
 msgid "Searching"
 msgstr "Söker"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:738
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:737
 msgid "Search Base:"
 msgstr "Sökbas:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:742
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:741
 msgid "Find Possible Search Bases"
 msgstr "Sök möjliga sökbaser"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:764
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:763
 msgid "One Level"
 msgstr "En nivå"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:766
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:765
 msgid "Subtree"
 msgstr "Underträd"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:768
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:767
 msgid "Search Scope:"
 msgstr "Sökomfattning:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:773
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:772
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree.  A search scope of \"Subtree\" will include all entries "
@@ -18875,28 +19447,28 @@ msgstr ""
 "poster under din sökbas. En sökomfattning som är ”En nivå” kommer endast att "
 "inkludera de poster som är en nivå under din sökbas."
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:782
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:781
 msgid "Search Filter:"
 msgstr "Sökfilter:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:794
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:793
 msgid "Downloading"
 msgstr "Hämtning"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:815
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:814
 msgid "Limit:"
 msgstr "Gräns:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:826
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:825
 msgid "contacts"
 msgstr "kontakter"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:831
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:830
 msgid "Browse until limit is reached"
 msgstr "Bläddra tills gränsen nås"
 
 #: ../modules/book-config-webdav/evolution-book-config-webdav.c:135
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:220
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:299
 #: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:127
 msgid "URL:"
 msgstr "URL:"
@@ -18905,70 +19477,38 @@ msgstr "URL:"
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "Undvik IfMatch (behövs för Apache < 2.2.8)"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:422
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:431
-#: ../modules/cal-config-google/e-google-chooser.c:424
-#: ../modules/cal-config-google/e-google-chooser.c:433
-#, c-format
-msgid "HTTP Error: %s"
-msgstr "HTTP-fel: %s"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:460
-#: ../modules/cal-config-google/e-google-chooser.c:462
-msgid "Could not parse response"
-msgstr "Kunde inte tolka svaret"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:469
-#: ../modules/cal-config-google/e-google-chooser.c:471
-msgid "Empty response"
-msgstr "Tomt svar"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:477
-#: ../modules/cal-config-google/e-google-chooser.c:479
-msgid "Unexpected reply from server"
-msgstr "Oväntat svar från server"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1099
-#: ../modules/cal-config-google/e-google-chooser.c:1101
-msgid "Could not locate user's calendars"
-msgstr "Kunde inte hitta användarens kalendrar"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1321
-msgid "Path"
-msgstr "Sökväg"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:348
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:348
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:112
+#: ../modules/cal-config-google/e-google-chooser-button.c:213
 msgid "Choose a Calendar"
 msgstr "Välj en kalender"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:351
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:351
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:116
+#: ../modules/cal-config-google/e-google-chooser-button.c:217
 msgid "Choose a Memo List"
 msgstr "Välj en memolista"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:354
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:354
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:120
+#: ../modules/cal-config-google/e-google-chooser-button.c:221
 msgid "Choose a Task List"
 msgstr "Välj en uppgiftslista"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:234
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:313
 msgid "Find Calendars"
 msgstr "Sök kalendrar"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:237
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:316
 msgid "Find Memo Lists"
 msgstr "Sök memolistor"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:240
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:319
 msgid "Find Task Lists"
 msgstr "Sök uppgiftslistor"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:258
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:337
 msgid "Email:"
 msgstr "E-post:"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:263
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:342
 msgid "Server handles meeting invitations"
 msgstr "Servern hanterar mötesinbjudningar"
 
@@ -18980,27 +19520,27 @@ msgstr "Välj vilka adressböcker som ska användas."
 msgid "Use in Birthdays & Anniversaries calendar"
 msgstr "Använd i kalender för födelsedagar och jubileum"
 
-#: ../modules/cal-config-google/e-google-chooser-button.c:143
+#: ../modules/cal-config-google/e-google-chooser-button.c:145
 msgid "Default User Calendar"
 msgstr "Standardkalender"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:159
+#: ../modules/cal-config-local/evolution-cal-config-local.c:158
 msgid "Use an existing iCalendar (ics) file"
 msgstr "Använd en existerande iCalendar-fil (ics)"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:184
+#: ../modules/cal-config-local/evolution-cal-config-local.c:183
 msgid "iCalendar File"
 msgstr "iCalendar-fil"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:196
+#: ../modules/cal-config-local/evolution-cal-config-local.c:195
 msgid "Choose an iCalendar file"
 msgstr "Välj en iCalendar-fil"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:199
+#: ../modules/cal-config-local/evolution-cal-config-local.c:198
 msgid "File:"
 msgstr "Fil:"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:214
+#: ../modules/cal-config-local/evolution-cal-config-local.c:213
 msgid "Allow Evolution to update the file"
 msgstr "Tillåt att Evolution uppdaterar filen"
 
@@ -19010,29 +19550,29 @@ msgstr "Tillåt att Evolution uppdaterar filen"
 #. *
 #. * This string is just a fallback mechanism for systems on
 #. * which _NL_MEASUREMENT_MEASUREMENT is not available.
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:187
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:186
 msgctxt "locale-metric"
 msgid "default:mm"
 msgstr "standard:mm"
 
 #. Translators: This is the temperature in degrees
 #. * Fahrenheit. (\302\260 is U+00B0 DEGREE SIGN)
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:259
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:258
 msgid "Fahrenheit (°F)"
 msgstr "Fahrenheit (°F)"
 
 #. Translators: This is the temperature in degrees
 #. * Celsius. (\302\260 is U+00B0 DEGREE SIGN)
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:264
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:263
 msgid "Centigrade (°C)"
 msgstr "Celsius (°C)"
 
 #. Translators: This is the temperature in kelvin.
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:268
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:267
 msgid "Kelvin (K)"
 msgstr "Kelvin (K)"
 
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:270
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:269
 msgid "Units:"
 msgstr "Enheter:"
 
@@ -19092,57 +19632,57 @@ msgstr "Ny memolista"
 msgid "New Task List"
 msgstr "Ny uppgiftslista"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:540
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:554
 #, c-format
 msgid "Copying an event into the calendar '%s'"
 msgstr "Kopierar ett evenemang till kalendern ”%s”"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:541
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:555
 #, c-format
 msgid "Moving an event into the calendar '%s'"
 msgstr "Flyttar ett evenemang till kalendern ”%s”"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:546
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:560
 #, c-format
 msgid "Copying a memo into the memo list '%s'"
 msgstr "Kopierar ett memo till memolistan ”%s”"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:547
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:561
 #, c-format
 msgid "Moving a memo into the memo list '%s'"
 msgstr "Flyttar ett memo till memolistan ”%s”"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:552
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:566
 #, c-format
 msgid "Copying a task into the task list '%s'"
 msgstr "Kopierar en uppgift till uppgiftslistan ”%s”"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:553
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:567
 #, c-format
 msgid "Moving a task into the task list '%s'"
 msgstr "Flytta en uppgift till uppgiftslistan ”%s”"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:650
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:684
 msgid "Calendar Selector"
 msgstr "Kalenderväljare"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:656
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:690
 msgid "Memo List Selector"
 msgstr "Väljare för memolista"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:661
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:695
 msgid "Task List Selector"
 msgstr "Väljare för uppgiftslistor"
 
-#: ../modules/calendar/e-calendar-preferences.c:516
+#: ../modules/calendar/e-calendar-preferences.c:518
 msgid "Selected Calendars for Alarms"
 msgstr "Valda kalendrar för påminnelser"
 
-#: ../modules/calendar/e-calendar-preferences.c:924
+#: ../modules/calendar/e-calendar-preferences.c:932
 msgid "Ti_me and date:"
 msgstr "T_id och datum:"
 
-#: ../modules/calendar/e-calendar-preferences.c:925
+#: ../modules/calendar/e-calendar-preferences.c:933
 msgid "_Date only:"
 msgstr "Endast dat_um:"
 
@@ -19340,24 +19880,24 @@ msgid "before every anniversary/birthday"
 msgstr "innan varje jubileum/födelsedag"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:73
+msgid "Default _snooze time (in minutes)"
+msgstr ""
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
 msgid "Select the calendars for reminder notification"
 msgstr "Välj kalendrar för påminnelseavisering"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:74
+#: ../modules/calendar/e-calendar-preferences.ui.h:75
 msgid "Default Free/Busy Server"
 msgstr "Standardserver för ledig/upptagen"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:75
-msgid "Template:"
-msgstr "Mall:"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:77
+#: ../modules/calendar/e-calendar-preferences.ui.h:78
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
 msgstr ""
 "%u och %d kommer att ersättas med användaren och domänen från e-postadressen."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:78
+#: ../modules/calendar/e-calendar-preferences.ui.h:79
 msgid "Publishing Information"
 msgstr "Publiceringsinformation"
 
@@ -20546,7 +21086,7 @@ msgid "_Update Attendee Status"
 msgstr "_Uppdatera deltagandestatus"
 
 #: ../modules/itip-formatter/itip-view.c:1068
-#: ../smime/gui/certificate-manager.c:1664
+#: ../smime/gui/certificate-manager.c:1666
 msgid "_Update"
 msgstr "_Uppdatera"
 
@@ -20583,24 +21123,24 @@ msgstr "Behåll min _påminnelse"
 msgid "_Inherit reminder"
 msgstr "Ärv påm_innelse"
 
-#: ../modules/itip-formatter/itip-view.c:1911
+#: ../modules/itip-formatter/itip-view.c:1910
 msgid "_Tasks:"
 msgstr "_Uppgifter:"
 
-#: ../modules/itip-formatter/itip-view.c:1914
+#: ../modules/itip-formatter/itip-view.c:1913
 msgid "_Memos:"
 msgstr "_Memon:"
 
-#: ../modules/itip-formatter/itip-view.c:3220
+#: ../modules/itip-formatter/itip-view.c:3219
 msgid "Sa_ve"
 msgstr "S_para"
 
-#: ../modules/itip-formatter/itip-view.c:3682
-#: ../modules/itip-formatter/itip-view.c:5131
+#: ../modules/itip-formatter/itip-view.c:3681
+#: ../modules/itip-formatter/itip-view.c:5153
 msgid "Attendee status updated"
 msgstr "Deltagarstatusen är uppdaterad"
 
-#: ../modules/itip-formatter/itip-view.c:3862
+#: ../modules/itip-formatter/itip-view.c:3861
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Ett möte i kalendern ”%s” är i konflikt med detta sammanträde"
@@ -20610,137 +21150,137 @@ msgstr "Ett möte i kalendern ”%s” är i konflikt med detta sammanträde"
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Hittade mötet i kalendern ”%s”"
 
-#: ../modules/itip-formatter/itip-view.c:4004
+#: ../modules/itip-formatter/itip-view.c:4026
 msgid "Unable to find any calendars"
 msgstr "Kunde inte hitta några kalendrar"
 
-#: ../modules/itip-formatter/itip-view.c:4012
+#: ../modules/itip-formatter/itip-view.c:4034
 msgid "Unable to find this meeting in any calendar"
 msgstr "Kunde inte hitta detta sammanträde i någon kalender"
 
-#: ../modules/itip-formatter/itip-view.c:4017
+#: ../modules/itip-formatter/itip-view.c:4039
 msgid "Unable to find this task in any task list"
 msgstr "Kunde inte hitta denna uppgift i någon uppgiftslista"
 
-#: ../modules/itip-formatter/itip-view.c:4022
+#: ../modules/itip-formatter/itip-view.c:4044
 msgid "Unable to find this memo in any memo list"
 msgstr "Kunde inte hitta detta memo i någon memolista"
 
-#: ../modules/itip-formatter/itip-view.c:4367
+#: ../modules/itip-formatter/itip-view.c:4389
 msgid "Opening the calendar. Please wait..."
 msgstr "Öppnar kalendern. Vänta…"
 
-#: ../modules/itip-formatter/itip-view.c:4372
+#: ../modules/itip-formatter/itip-view.c:4394
 msgid "Searching for an existing version of this appointment"
 msgstr "Söker efter en befintlig version av detta möte"
 
-#: ../modules/itip-formatter/itip-view.c:4767
+#: ../modules/itip-formatter/itip-view.c:4789
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Kan inte skicka objekt till kalendern ”%s”.  %s"
 
-#: ../modules/itip-formatter/itip-view.c:4782
+#: ../modules/itip-formatter/itip-view.c:4804
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Skickade till kalendern ”%s” som accepterat"
 
-#: ../modules/itip-formatter/itip-view.c:4787
+#: ../modules/itip-formatter/itip-view.c:4809
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Skickade till kalendern ”%s” som preliminärt"
 
-#: ../modules/itip-formatter/itip-view.c:4793
+#: ../modules/itip-formatter/itip-view.c:4815
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Skickade till kalendern ”%s” som avslaget"
 
-#: ../modules/itip-formatter/itip-view.c:4799
+#: ../modules/itip-formatter/itip-view.c:4821
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Skickade till kalendern ”%s” som avbrutet"
 
-#: ../modules/itip-formatter/itip-view.c:4820
-#: ../modules/itip-formatter/itip-view.c:5278
-#: ../modules/itip-formatter/itip-view.c:5384
+#: ../modules/itip-formatter/itip-view.c:4842
+#: ../modules/itip-formatter/itip-view.c:5300
+#: ../modules/itip-formatter/itip-view.c:5406
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "Sparar ändringar i kalendern. Vänta…"
 
-#: ../modules/itip-formatter/itip-view.c:4861
+#: ../modules/itip-formatter/itip-view.c:4883
 msgid "Unable to parse item"
 msgstr "Kan inte tolka objekt"
 
-#: ../modules/itip-formatter/itip-view.c:5054
+#: ../modules/itip-formatter/itip-view.c:5076
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organisatören har tagit bort delegaten %s "
 
-#: ../modules/itip-formatter/itip-view.c:5071
+#: ../modules/itip-formatter/itip-view.c:5093
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Skickade ett avbokningsmeddelande till delegaten"
 
-#: ../modules/itip-formatter/itip-view.c:5075
+#: ../modules/itip-formatter/itip-view.c:5097
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Kunde inte skicka en avbokningsnotering till delegaten"
 
-#: ../modules/itip-formatter/itip-view.c:5123
+#: ../modules/itip-formatter/itip-view.c:5145
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Kan inte uppdatera deltagare. %s"
 
-#: ../modules/itip-formatter/itip-view.c:5167
+#: ../modules/itip-formatter/itip-view.c:5189
 msgid "The meeting is invalid and cannot be updated"
 msgstr "Sammanträdet är ogiltigt och kan inte uppdateras"
 
-#: ../modules/itip-formatter/itip-view.c:5243
+#: ../modules/itip-formatter/itip-view.c:5265
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Deltagarstatus kunde inte uppdateras eftersom statusen är ogiltig"
 
-#: ../modules/itip-formatter/itip-view.c:5315
-#: ../modules/itip-formatter/itip-view.c:5354
+#: ../modules/itip-formatter/itip-view.c:5337
+#: ../modules/itip-formatter/itip-view.c:5376
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Deltagarstatusen kan inte uppdateras eftersom objektet inte längre finns"
 
-#: ../modules/itip-formatter/itip-view.c:5417
+#: ../modules/itip-formatter/itip-view.c:5439
 msgid "Meeting information sent"
 msgstr "Sammanträdesinformation skickad"
 
-#: ../modules/itip-formatter/itip-view.c:5422
+#: ../modules/itip-formatter/itip-view.c:5444
 msgid "Task information sent"
 msgstr "Uppgiftsinformation skickad"
 
-#: ../modules/itip-formatter/itip-view.c:5427
+#: ../modules/itip-formatter/itip-view.c:5449
 msgid "Memo information sent"
 msgstr "Memoinformation skickad"
 
-#: ../modules/itip-formatter/itip-view.c:5438
+#: ../modules/itip-formatter/itip-view.c:5460
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Kunde inte skicka sammanträdesinformation, sammanträdet finns inte"
 
-#: ../modules/itip-formatter/itip-view.c:5443
+#: ../modules/itip-formatter/itip-view.c:5465
 msgid "Unable to send task information, the task does not exist"
 msgstr "Kunde inte skicka uppgiftsinformation, uppgiften finns inte"
 
-#: ../modules/itip-formatter/itip-view.c:5448
+#: ../modules/itip-formatter/itip-view.c:5470
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Kunde inte skicka memoinformation, memot finns inte"
 
 #. Translators: This is a default filename for a calendar.
-#: ../modules/itip-formatter/itip-view.c:5513
+#: ../modules/itip-formatter/itip-view.c:5535
 msgid "calendar.ics"
 msgstr "kalender.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5518
+#: ../modules/itip-formatter/itip-view.c:5540
 msgid "Save Calendar"
 msgstr "Spara kalender"
 
-#: ../modules/itip-formatter/itip-view.c:5567
-#: ../modules/itip-formatter/itip-view.c:5580
+#: ../modules/itip-formatter/itip-view.c:5589
+#: ../modules/itip-formatter/itip-view.c:5602
 msgid "The calendar attached is not valid"
 msgstr "Den bifogade kalendern är inte giltig"
 
-#: ../modules/itip-formatter/itip-view.c:5568
-#: ../modules/itip-formatter/itip-view.c:5581
+#: ../modules/itip-formatter/itip-view.c:5590
+#: ../modules/itip-formatter/itip-view.c:5603
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -20748,15 +21288,15 @@ msgstr ""
 "Meddelandet påstår sig innehålla en kalender, men kalendern är inte en "
 "giltig iCalendar."
 
-#: ../modules/itip-formatter/itip-view.c:5623
-#: ../modules/itip-formatter/itip-view.c:5653
-#: ../modules/itip-formatter/itip-view.c:5754
+#: ../modules/itip-formatter/itip-view.c:5645
+#: ../modules/itip-formatter/itip-view.c:5675
+#: ../modules/itip-formatter/itip-view.c:5776
 msgid "The item in the calendar is not valid"
 msgstr "Objektet i kalendern är inte giltigt"
 
-#: ../modules/itip-formatter/itip-view.c:5624
-#: ../modules/itip-formatter/itip-view.c:5654
-#: ../modules/itip-formatter/itip-view.c:5755
+#: ../modules/itip-formatter/itip-view.c:5646
+#: ../modules/itip-formatter/itip-view.c:5676
+#: ../modules/itip-formatter/itip-view.c:5777
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -20764,11 +21304,11 @@ msgstr ""
 "Meddelandet innehåller en kalender, men kalendern innehåller inga evenemang, "
 "uppgifter eller ledig-/upptageninformation"
 
-#: ../modules/itip-formatter/itip-view.c:5669
+#: ../modules/itip-formatter/itip-view.c:5691
 msgid "The calendar attached contains multiple items"
 msgstr "Den bifogade kalendern innehåller flera objekt"
 
-#: ../modules/itip-formatter/itip-view.c:5670
+#: ../modules/itip-formatter/itip-view.c:5692
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -20776,24 +21316,24 @@ msgstr ""
 "För att kunna behandla alla dessa objekt bör filen sparas och kalendern "
 "importeras"
 
-#: ../modules/itip-formatter/itip-view.c:6172
+#: ../modules/itip-formatter/itip-view.c:6195
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ingen"
 
-#: ../modules/itip-formatter/itip-view.c:6188
+#: ../modules/itip-formatter/itip-view.c:6211
 msgid "Tentatively Accepted"
 msgstr "Preliminärt accepterat"
 
-#: ../modules/itip-formatter/itip-view.c:6348
+#: ../modules/itip-formatter/itip-view.c:6371
 msgid "This meeting recurs"
 msgstr "Detta möte upprepas"
 
-#: ../modules/itip-formatter/itip-view.c:6351
+#: ../modules/itip-formatter/itip-view.c:6374
 msgid "This task recurs"
 msgstr "Denna uppgift upprepas"
 
-#: ../modules/itip-formatter/itip-view.c:6354
+#: ../modules/itip-formatter/itip-view.c:6377
 msgid "This memo recurs"
 msgstr "Detta memo upprepas"
 
@@ -20839,19 +21379,19 @@ msgstr "Itip-formaterare"
 msgid "Display \"text/calendar\" MIME parts in mail messages."
 msgstr "Visa MIME-delarna ”text/calendar” i e-postmeddelanden."
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:250
+#: ../modules/mail-config/e-mail-config-google-summary.c:259
 msgid "Google Features"
 msgstr "Google-funktioner"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:259
+#: ../modules/mail-config/e-mail-config-google-summary.c:268
 msgid "Add Google Ca_lendar to this account"
 msgstr "Lägg till Google-ka_lendrar till detta konto"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:267
+#: ../modules/mail-config/e-mail-config-google-summary.c:277
 msgid "Add Google Con_tacts to this account"
 msgstr "Lägg till Google-kon_takter till detta konto"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:275
+#: ../modules/mail-config/e-mail-config-google-summary.c:286
 msgid "You may need to enable IMAP access"
 msgstr "Du kan behöva att aktivera IMAP-åtkomst"
 
@@ -20976,366 +21516,390 @@ msgstr "Yahoo!-funktioner"
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr "Lägg till Yahoo!-ka_lendrar och uppgifter till detta konto"
 
-#: ../modules/mail/e-mail-attachment-handler.c:424
+#: ../modules/mail/e-mail-attachment-handler.c:440
 #, c-format
 msgid "%d attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "%d bifogat meddelande"
 msgstr[1] "%d bifogade meddelanden"
 
-#: ../modules/mail/e-mail-shell-backend.c:349
+#: ../modules/mail/e-mail-shell-backend.c:353
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_E-postmeddelande"
 
-#: ../modules/mail/e-mail-shell-backend.c:351
+#: ../modules/mail/e-mail-shell-backend.c:355
 msgid "Compose a new mail message"
 msgstr "Skriv ett nytt e-postmeddelande"
 
-#: ../modules/mail/e-mail-shell-backend.c:359
+#: ../modules/mail/e-mail-shell-backend.c:363
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "E-p_ostkonto"
 
-#: ../modules/mail/e-mail-shell-backend.c:361
+#: ../modules/mail/e-mail-shell-backend.c:365
 msgid "Create a new mail account"
 msgstr "Skapa ett nytt e-postkonto"
 
-#: ../modules/mail/e-mail-shell-backend.c:366
+#: ../modules/mail/e-mail-shell-backend.c:370
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "E-post_mapp"
 
-#: ../modules/mail/e-mail-shell-backend.c:368
+#: ../modules/mail/e-mail-shell-backend.c:372
 msgid "Create a new mail folder"
 msgstr "Skapa en ny e-postmapp"
 
-#: ../modules/mail/e-mail-shell-backend.c:683
+#: ../modules/mail/e-mail-shell-backend.c:687
 msgid "Mail Accounts"
 msgstr "E-postkonton"
 
-#: ../modules/mail/e-mail-shell-backend.c:692
+#: ../modules/mail/e-mail-shell-backend.c:696
 msgid "Mail Preferences"
 msgstr "E-postinställningar"
 
-#: ../modules/mail/e-mail-shell-backend.c:701
+#: ../modules/mail/e-mail-shell-backend.c:705
 msgid "Composer Preferences"
 msgstr "Redigerarinställningar"
 
-#: ../modules/mail/e-mail-shell-backend.c:711
+#: ../modules/mail/e-mail-shell-backend.c:715
 msgid "Network Preferences"
 msgstr "Nätverksinställningar"
 
 #. 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:1003
+#: ../modules/mail/e-mail-shell-backend.c:1007
 msgctxt "label"
 msgid "None"
 msgstr "Ingen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:712
+#: ../modules/mail/e-mail-shell-view-actions.c:713
 msgid "Marking messages as read..."
 msgstr "Markerar meddelanden som lästa…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1572
+#: ../modules/mail/e-mail-shell-view-actions.c:1038
+#, fuzzy
+#| msgid "Move to Folder"
+msgid "Go to Folder"
+msgstr "Flytta till mapp"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1042
+#, fuzzy
+#| msgid "Select"
+msgid "_Select"
+msgstr "Markera"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1631
 msgid "_Disable Account"
 msgstr "_Inaktivera konto"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1574
+#: ../modules/mail/e-mail-shell-view-actions.c:1633
 msgid "Disable this account"
 msgstr "Inaktivera detta konto"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1581
+#: ../modules/mail/e-mail-shell-view-actions.c:1640
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Ta bort alla borttagna meddelanden från alla mappar permanent"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1588
+#: ../modules/mail/e-mail-shell-view-actions.c:1647
 msgid "Edit properties of this account"
 msgstr "Redigera egenskaper för detta konto"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1595
+#: ../modules/mail/e-mail-shell-view-actions.c:1654
 msgid "Refresh list of folders of this account"
 msgstr "Uppdatera listan med mappar för detta konto"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1600
+#: ../modules/mail/e-mail-shell-view-actions.c:1659
 msgid "_Download Messages for Offline Usage"
 msgstr "_Hämta ner meddelanden för frånkopplad användning"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1602
+#: ../modules/mail/e-mail-shell-view-actions.c:1661
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 "Hämta meddelanden för konton och mappar markerade för frånkopplad användning"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1607
+#: ../modules/mail/e-mail-shell-view-actions.c:1666
 msgid "Fl_ush Outbox"
 msgstr "Tö_m utkorg"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1614
+#: ../modules/mail/e-mail-shell-view-actions.c:1673
 msgid "_Copy Folder To..."
 msgstr "_Kopiera mapp till…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1616
+#: ../modules/mail/e-mail-shell-view-actions.c:1675
 msgid "Copy the selected folder into another folder"
 msgstr "Kopiera den markerade mappen till en annan mapp"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1623
+#: ../modules/mail/e-mail-shell-view-actions.c:1682
 msgid "Permanently remove this folder"
 msgstr "Ta bort denna mapp permanent"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1628
+#: ../modules/mail/e-mail-shell-view-actions.c:1687
 msgid "E_xpunge"
 msgstr "T_öm"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1630
+#: ../modules/mail/e-mail-shell-view-actions.c:1689
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Ta bort alla borttagna meddelanden från denna mapp permanent"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1635
-#: ../modules/mail/e-mail-shell-view-actions.c:1736
+#: ../modules/mail/e-mail-shell-view-actions.c:1694
+#: ../modules/mail/e-mail-shell-view-actions.c:1802
 msgid "Mar_k All Messages as Read"
 msgstr "Markera a_lla meddelanden som lästa"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1637
-#: ../modules/mail/e-mail-shell-view-actions.c:1738
+#: ../modules/mail/e-mail-shell-view-actions.c:1696
+#: ../modules/mail/e-mail-shell-view-actions.c:1804
 msgid "Mark all messages in the folder as read"
 msgstr "Markera alla meddelanden i den här mappen som lästa"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1642
+#: ../modules/mail/e-mail-shell-view-actions.c:1701
 msgid "_Move Folder To..."
 msgstr "_Flytta mapp till…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1644
+#: ../modules/mail/e-mail-shell-view-actions.c:1703
 msgid "Move the selected folder into another folder"
 msgstr "Flytta den markerade mappen till en annan mapp"
 
 #. Translators: An action caption to create a new mail folder
-#: ../modules/mail/e-mail-shell-view-actions.c:1650
+#: ../modules/mail/e-mail-shell-view-actions.c:1709
 msgid "_New..."
 msgstr "_Ny…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1652
+#: ../modules/mail/e-mail-shell-view-actions.c:1711
 msgid "Create a new folder for storing mail"
 msgstr "Skapa en ny mapp för lagring av post"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1659
+#: ../modules/mail/e-mail-shell-view-actions.c:1718
 msgid "Change the properties of this folder"
 msgstr "Ändra egenskaperna för denna mapp"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1666
+#: ../modules/mail/e-mail-shell-view-actions.c:1725
 msgid "Refresh the folder"
 msgstr "Uppdatera mappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1673
+#: ../modules/mail/e-mail-shell-view-actions.c:1732
 msgid "Change the name of this folder"
 msgstr "Ändra namnet på denna mapp"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1678
+#: ../modules/mail/e-mail-shell-view-actions.c:1737
 msgid "Select Message _Thread"
 msgstr "Markera meddelandetr_åd"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1680
+#: ../modules/mail/e-mail-shell-view-actions.c:1739
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Markera alla meddelanden i samma tråd som det markerade meddelandet"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1685
+#: ../modules/mail/e-mail-shell-view-actions.c:1744
 msgid "Select Message S_ubthread"
 msgstr "Välj meddelandets _undertråd"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1687
+#: ../modules/mail/e-mail-shell-view-actions.c:1746
 msgid "Select all replies to the currently selected message"
 msgstr "Markera alla svar för det markerade meddelandet"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1699
+#: ../modules/mail/e-mail-shell-view-actions.c:1758
 msgid "Empty _Trash"
 msgstr "Töm _papperskorgen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1701
+#: ../modules/mail/e-mail-shell-view-actions.c:1760
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Ta bort alla borttagna meddelanden från alla konton permanent"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1706
+#: ../modules/mail/e-mail-shell-view-actions.c:1765
+#, fuzzy
+#| msgid "Move to Folder"
+msgid "Go to _Folder"
+msgstr "Flytta till mapp"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1767
+#, fuzzy
+#| msgid "Click here to select folders to post to"
+msgid "Opens a dialog to select a folder to go to"
+msgstr "Klicka här för att välja mappar att posta till"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1772
 msgid "_New Label"
 msgstr "_Ny etikett"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1715
+#: ../modules/mail/e-mail-shell-view-actions.c:1781
 msgid "N_one"
 msgstr "I_ngen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1729
+#: ../modules/mail/e-mail-shell-view-actions.c:1795
 msgid "_Manage Subscriptions"
 msgstr "_Hantera prenumerationer"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1731
-#: ../modules/mail/e-mail-shell-view-actions.c:1815
+#: ../modules/mail/e-mail-shell-view-actions.c:1797
+#: ../modules/mail/e-mail-shell-view-actions.c:1881
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Prenumerera eller säg upp prenumeration på mappar på fjärrservrar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1743
-#: ../modules/mail/e-mail-shell-view-actions.c:1764
+#: ../modules/mail/e-mail-shell-view-actions.c:1809
+#: ../modules/mail/e-mail-shell-view-actions.c:1830
 msgid "Send / _Receive"
 msgstr "Ski_cka / Ta emot"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1745
+#: ../modules/mail/e-mail-shell-view-actions.c:1811
 msgid "Send queued items and retrieve new items"
 msgstr "Skicka kölagda objekt och hämta nya objekt"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1750
+#: ../modules/mail/e-mail-shell-view-actions.c:1816
 msgid "R_eceive All"
 msgstr "Ta _emot alla"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1752
+#: ../modules/mail/e-mail-shell-view-actions.c:1818
 msgid "Receive new items from all accounts"
 msgstr "Ta emot nya objekt från alla konton"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1757
+#: ../modules/mail/e-mail-shell-view-actions.c:1823
 msgid "_Send All"
 msgstr "_Skicka alla"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1759
+#: ../modules/mail/e-mail-shell-view-actions.c:1825
 msgid "Send queued items in all accounts"
 msgstr "Skicka kölagda objekt i alla konton"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1787
+#: ../modules/mail/e-mail-shell-view-actions.c:1853
 msgid "Cancel the current mail operation"
 msgstr "Avbryt aktuell e-poståtgärd"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1792
+#: ../modules/mail/e-mail-shell-view-actions.c:1858
 msgid "Collapse All _Threads"
 msgstr "Fäll in alla _trådar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1794
+#: ../modules/mail/e-mail-shell-view-actions.c:1860
 msgid "Collapse all message threads"
 msgstr "Fäll in alla meddelandetrådar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1799
+#: ../modules/mail/e-mail-shell-view-actions.c:1865
 msgid "E_xpand All Threads"
 msgstr "Fäll ut alla tr_ådar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1801
+#: ../modules/mail/e-mail-shell-view-actions.c:1867
 msgid "Expand all message threads"
 msgstr "Fäll ut alla meddelandetrådar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1806
+#: ../modules/mail/e-mail-shell-view-actions.c:1872
 msgid "_Message Filters"
 msgstr "_Meddelandefilter"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1808
+#: ../modules/mail/e-mail-shell-view-actions.c:1874
 msgid "Create or edit rules for filtering new mail"
 msgstr "Skapa eller redigera regler för filtrering av ny post"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1813
+#: ../modules/mail/e-mail-shell-view-actions.c:1879
 msgid "_Subscriptions..."
 msgstr "_Prenumerationer…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1822
+#: ../modules/mail/e-mail-shell-view-actions.c:1888
 msgid "F_older"
 msgstr "Ma_pp"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1829
+#: ../modules/mail/e-mail-shell-view-actions.c:1895
 msgid "_Label"
 msgstr "E_tikett"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1846
+#: ../modules/mail/e-mail-shell-view-actions.c:1912
 msgid "C_reate Search Folder From Search..."
 msgstr "S_kapa sökmapp från sökning…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1853
+#: ../modules/mail/e-mail-shell-view-actions.c:1919
 msgid "Search F_olders"
 msgstr "Sök_mappar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1855
+#: ../modules/mail/e-mail-shell-view-actions.c:1921
 msgid "Create or edit search folder definitions"
 msgstr "Skapa eller redigera definitioner för sökmappar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1894
+#: ../modules/mail/e-mail-shell-view-actions.c:1960
 msgid "_New Folder..."
 msgstr "_Ny mapp…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1922
+#: ../modules/mail/e-mail-shell-view-actions.c:1988
 msgid "Show Message _Preview"
 msgstr "Visa _förhandsgranskning av meddelande"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1924
+#: ../modules/mail/e-mail-shell-view-actions.c:1990
 msgid "Show message preview pane"
 msgstr "Visa förhandsvisningspanel för meddelanden"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1930
+#: ../modules/mail/e-mail-shell-view-actions.c:1996
 msgid "Show _Deleted Messages"
 msgstr "Visa _borttagna meddelanden"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1932
+#: ../modules/mail/e-mail-shell-view-actions.c:1998
 msgid "Show deleted messages with a line through them"
 msgstr "Visa borttagna meddelanden som genomstrukna"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1938
+#: ../modules/mail/e-mail-shell-view-actions.c:2004
 msgid "_Group By Threads"
 msgstr "_Gruppera efter trådar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1940
+#: ../modules/mail/e-mail-shell-view-actions.c:2006
 msgid "Threaded message list"
 msgstr "Trådad meddelandelista"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1946
+#: ../modules/mail/e-mail-shell-view-actions.c:2012
 msgid "_Unmatched Folder Enabled"
 msgstr "_Omatchadmapp påslagen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1948
+#: ../modules/mail/e-mail-shell-view-actions.c:2014
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "Växlar huruvida Omatchade sökmappen är aktiverad"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1968
+#: ../modules/mail/e-mail-shell-view-actions.c:2034
 msgid "Show message preview below the message list"
 msgstr "Visa förhandsgranskning av meddelanden nedan i meddelandelistan"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1975
+#: ../modules/mail/e-mail-shell-view-actions.c:2041
 msgid "Show message preview alongside the message list"
 msgstr "Visa förhandsgranskning av meddelanden bredvid meddelandelistan"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1983
+#: ../modules/mail/e-mail-shell-view-actions.c:2049
 msgid "All Messages"
 msgstr "Alla meddelanden"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1990
+#: ../modules/mail/e-mail-shell-view-actions.c:2056
 msgid "Important Messages"
 msgstr "Viktiga meddelanden"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1997
+#: ../modules/mail/e-mail-shell-view-actions.c:2063
 msgid "Last 5 Days' Messages"
 msgstr "Meddelanden de senaste 5 dagarna"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2004
+#: ../modules/mail/e-mail-shell-view-actions.c:2070
 msgid "Messages Not Junk"
 msgstr "Meddelandet är inte skräppost"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2011
+#: ../modules/mail/e-mail-shell-view-actions.c:2077
 msgid "Messages with Attachments"
 msgstr "Meddelanden med bilagor"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2018
+#: ../modules/mail/e-mail-shell-view-actions.c:2084
 msgid "No Label"
 msgstr "Ingen etikett"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2025
+#: ../modules/mail/e-mail-shell-view-actions.c:2091
 msgid "Read Messages"
 msgstr "Lästa meddelanden"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2032
+#: ../modules/mail/e-mail-shell-view-actions.c:2098
 msgid "Unread Messages"
 msgstr "Olästa meddelanden"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2091
+#: ../modules/mail/e-mail-shell-view-actions.c:2157
 msgid "Subject or Addresses contain"
 msgstr "Ämne eller Adresser innehåller"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2101
+#: ../modules/mail/e-mail-shell-view-actions.c:2167
 msgid "All Accounts"
 msgstr "Alla konton"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2108
+#: ../modules/mail/e-mail-shell-view-actions.c:2174
 msgid "Current Account"
 msgstr "Aktuellt konto"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2115
+#: ../modules/mail/e-mail-shell-view-actions.c:2181
 msgid "Current Folder"
 msgstr "Aktuell mapp"
 
@@ -21398,42 +21962,51 @@ msgid_plural "%d unread, "
 msgstr[0] "%d oläst, "
 msgstr[1] "%d olästa, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1061
+#: ../modules/mail/e-mail-shell-view-private.c:1063
+#, fuzzy, c-format
+#| msgid "%d unread, "
+#| msgid_plural "%d unread, "
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d oläst, "
+msgstr[1] "%d olästa, "
+
+#: ../modules/mail/e-mail-shell-view-private.c:1068
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d totalt"
 msgstr[1] "%d totalt"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1569
+#: ../modules/mail/e-mail-shell-view-private.c:1581
 msgid "Send / Receive"
 msgstr "Skicka / Ta emot"
 
-#: ../modules/mail/em-composer-prefs.c:413
+#: ../modules/mail/em-composer-prefs.c:414
 msgid "Select Folder to Add"
 msgstr "Välj mapp att lägga till"
 
-#: ../modules/mail/em-composer-prefs.c:883
+#: ../modules/mail/em-composer-prefs.c:884
 msgid "Folder"
 msgstr "Mapp"
 
-#: ../modules/mail/em-composer-prefs.c:919
+#: ../modules/mail/em-composer-prefs.c:920
 msgid "Recipient"
 msgstr "Mottagare"
 
-#: ../modules/mail/em-composer-prefs.c:1192
+#: ../modules/mail/em-composer-prefs.c:1199
 msgid "Keep in Outbox"
 msgstr "Behåll i utkorgen"
 
-#: ../modules/mail/em-composer-prefs.c:1193
+#: ../modules/mail/em-composer-prefs.c:1200
 msgid "Send immediately"
 msgstr "Skicka omedelbart"
 
-#: ../modules/mail/em-composer-prefs.c:1194
+#: ../modules/mail/em-composer-prefs.c:1201
 msgid "Send after 5 minutes"
 msgstr "Skicka efter 5 minuter"
 
-#: ../modules/mail/em-composer-prefs.c:1267
+#: ../modules/mail/em-composer-prefs.c:1274
 msgid "Language(s)"
 msgstr "Språk"
 
@@ -21457,20 +22030,20 @@ msgstr "En gång per månad"
 msgid "Immediately, on folder leave"
 msgstr "Omedelbart, när mappen lämnas"
 
-#: ../modules/mail/em-mailer-prefs.c:356
+#: ../modules/mail/em-mailer-prefs.c:420
 msgid "Header"
 msgstr "Rubrik"
 
-#: ../modules/mail/em-mailer-prefs.c:360
+#: ../modules/mail/em-mailer-prefs.c:424
 msgid "Contains Value"
 msgstr "Innehåller värde"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail 
message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1236
+#: ../modules/mail/em-mailer-prefs.c:1554
 msgid "_Date header:"
 msgstr "_Datumrubrik:"
 
-#: ../modules/mail/em-mailer-prefs.c:1237
+#: ../modules/mail/em-mailer-prefs.c:1555
 msgid "Show _original header value"
 msgstr "Visa _ursprungligt rubrikvärde"
 
@@ -21542,20 +22115,20 @@ msgstr "Hanterare för insticksmoduler"
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Obs: En del ändringar kommer inte att börja gälla förrän omstart sker"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:297
+#: ../modules/plugin-manager/evolution-plugin-manager.c:296
 msgid "Overview"
 msgstr "Översikt"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:366
-#: ../modules/plugin-manager/evolution-plugin-manager.c:449
+#: ../modules/plugin-manager/evolution-plugin-manager.c:365
+#: ../modules/plugin-manager/evolution-plugin-manager.c:448
 msgid "Plugin"
 msgstr "Insticksmodul"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:487
+#: ../modules/plugin-manager/evolution-plugin-manager.c:486
 msgid "_Plugins"
 msgstr "Insticksm_oduler"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:488
+#: ../modules/plugin-manager/evolution-plugin-manager.c:487
 msgid "Enable and disable plugins"
 msgstr "Aktivera och inaktivera insticksmoduler"
 
@@ -21971,11 +22544,11 @@ msgstr "Visa delen som en adressbokskontakt"
 msgid "Evolution Web Inspector"
 msgstr "Evolutions webbinspektör"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:123
+#: ../plugins/attachment-reminder/attachment-reminder.c:126
 msgid "_Do not show this message again."
 msgstr "Visa _inte detta meddelande igen."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:584
+#: ../plugins/attachment-reminder/attachment-reminder.c:465
 #: ../plugins/templates/templates.c:478
 msgid "Keywords"
 msgstr "Nyckelord"
@@ -22168,8 +22741,8 @@ msgstr ""
 msgid "_Automatically launch when a new mail is edited"
 msgstr "Starta _automatiskt när ett nytt e-postmeddelande redigeras"
 
-#: ../plugins/external-editor/external-editor.c:469
-#: ../plugins/external-editor/external-editor.c:471
+#: ../plugins/external-editor/external-editor.c:484
+#: ../plugins/external-editor/external-editor.c:486
 msgid "Compose in External Editor"
 msgstr "Skriv i extern redigerare"
 
@@ -22218,23 +22791,29 @@ msgstr ""
 "Den externa redigeraren kör fortfarande. E-postfönstret kan inte stängas så "
 "länge som redigeraren är aktiv."
 
-#: ../plugins/face/face.c:288
+#: ../plugins/face/face.c:294
 msgid "Select a Face Picture"
 msgstr "Välj en ansiktsbild"
 
-#: ../plugins/face/face.c:298
+#: ../plugins/face/face.c:304
 msgid "Image files"
 msgstr "Bildfiler"
 
-#: ../plugins/face/face.c:357
+#: ../plugins/face/face.c:392
 msgid "_Insert Face picture by default"
 msgstr "_Infoga ansiktsbild som standard"
 
-#: ../plugins/face/face.c:370
+#: ../plugins/face/face.c:405
 msgid "Load new _Face picture"
 msgstr "Läs in ny ans_iktsbild"
 
-#: ../plugins/face/face.c:431
+#: ../plugins/face/face.c:449
+#, fuzzy
+#| msgid "Choose Background Image"
+msgid "Change Face Image"
+msgstr "Välj bakgrundsbild"
+
+#: ../plugins/face/face.c:537
 msgid "Include _Face"
 msgstr "Inkludera a_nsikte"
 
@@ -22255,15 +22834,31 @@ msgid "Invalid Image Size"
 msgstr "Ogiltig bildstorlek"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:4
-msgid "Please select an image of size 48 * 48"
-msgstr "Välj en bild med storleken 48 * 48"
+msgid ""
+"Please select a PNG image of size 48 * 48 pixels, whose file size doesn't "
+"exceed 723 bytes."
+msgstr ""
 
 #: ../plugins/face/org-gnome-face.error.xml.h:5
+msgid "Incorrect Face Image Byte Size"
+msgstr ""
+
+#: ../plugins/face/org-gnome-face.error.xml.h:6
+msgid ""
+"The Face image size is {0} bytes, while it should not be more than 723 "
+"bytes. Please select a PNG image of size 48 * 48 pixels, whose file size "
+"doesn't exceed 723 bytes."
+msgstr ""
+
+#: ../plugins/face/org-gnome-face.error.xml.h:7
 msgid "Not an image"
 msgstr "Inte en bild"
 
-#: ../plugins/face/org-gnome-face.error.xml.h:6
-msgid "The file you selected does not look like a valid .png image. Error: {0}"
+#: ../plugins/face/org-gnome-face.error.xml.h:8
+#, fuzzy
+#| msgid ""
+#| "The file you selected does not look like a valid .png image. Error: {0}"
+msgid "The file you selected does not look like a valid PNG image. Error: {0}"
 msgstr "Filen som du valde verkar inte vara en giltig .png-bild. Fel: {0}"
 
 #: ../plugins/mailing-list-actions/mailing-list-actions.c:364
@@ -22408,8 +23003,8 @@ msgstr ""
 "\n"
 "Rubrik: {0}"
 
-#: ../plugins/mail-notification/mail-notification.c:382
-#: ../plugins/mail-notification/mail-notification.c:418
+#: ../plugins/mail-notification/mail-notification.c:400
+#: ../plugins/mail-notification/mail-notification.c:436
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -22418,54 +23013,54 @@ msgstr[1] "Du har fått %d nya meddelanden."
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:393
+#: ../plugins/mail-notification/mail-notification.c:411
 #, c-format
 msgid "From: %s"
 msgstr "Från: %s"
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:407
+#: ../plugins/mail-notification/mail-notification.c:425
 #, c-format
 msgid "Subject: %s"
 msgstr "Ämne: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:424
+#: ../plugins/mail-notification/mail-notification.c:442
 msgid "New email in Evolution"
 msgstr "Ny e-post i Evolution"
 
 #. Translators: The '%s' is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../plugins/mail-notification/mail-notification.c:459
+#: ../plugins/mail-notification/mail-notification.c:483
 #, c-format
 msgid "Show %s"
 msgstr "Visa %s"
 
-#: ../plugins/mail-notification/mail-notification.c:661
+#: ../plugins/mail-notification/mail-notification.c:685
 msgid "_Play sound when a new message arrives"
 msgstr "Spela _upp ljud när nytt meddelande anländer"
 
-#: ../plugins/mail-notification/mail-notification.c:693
+#: ../plugins/mail-notification/mail-notification.c:717
 msgid "_Beep"
 msgstr "_Pip"
 
-#: ../plugins/mail-notification/mail-notification.c:706
+#: ../plugins/mail-notification/mail-notification.c:730
 msgid "Use sound _theme"
 msgstr "Använd ljud_tema"
 
-#: ../plugins/mail-notification/mail-notification.c:725
+#: ../plugins/mail-notification/mail-notification.c:749
 msgid "Play _file:"
 msgstr "Spela upp _ljudfil:"
 
-#: ../plugins/mail-notification/mail-notification.c:734
+#: ../plugins/mail-notification/mail-notification.c:758
 msgid "Select sound file"
 msgstr "Välj ljudfil"
 
-#: ../plugins/mail-notification/mail-notification.c:790
+#: ../plugins/mail-notification/mail-notification.c:835
 msgid "Notify new messages for _Inbox only"
 msgstr "Avisera om nya meddelanden endast för _inkorgen"
 
-#: ../plugins/mail-notification/mail-notification.c:800
+#: ../plugins/mail-notification/mail-notification.c:851
 msgid "Show _notification when a new message arrives"
 msgstr "Visa _avisering när ett nytt meddelande anländer"
 
@@ -22730,23 +23325,18 @@ msgstr "Publicering till %s lyckades"
 msgid "Mount of %s failed:"
 msgstr "Montering av %s misslyckades:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:655
-#: ../plugins/publish-calendar/publish-calendar.ui.h:35
-msgid "E_nable"
-msgstr "A_ktivera"
-
-#: ../plugins/publish-calendar/publish-calendar.c:805
+#: ../plugins/publish-calendar/publish-calendar.c:789
 msgid "Are you sure you want to remove this location?"
 msgstr "Är du säker på att du vill ta bort denna plats?"
 
 #. To Translators: This is shown to a user when creation of a new thread,
 #. * where the publishing should be done, fails. Basically, this shouldn't
 #. * ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1144
+#: ../plugins/publish-calendar/publish-calendar.c:1097
 msgid "Could not create publish thread."
 msgstr "Kunde inte skapa publiceringstråd."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1154
+#: ../plugins/publish-calendar/publish-calendar.c:1107
 msgid "_Publish Calendar Information"
 msgstr "_Publicera kalenderinformation"
 
@@ -22827,7 +23417,7 @@ msgid "_Username:"
 msgstr "_Användarnamn:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:29
-#: ../smime/gui/certificate-manager.c:772
+#: ../smime/gui/certificate-manager.c:774
 msgid "_Password:"
 msgstr "_Lösenord:"
 
@@ -22839,7 +23429,7 @@ msgstr "_Kom ihåg lösenord"
 msgid "Publishing Location"
 msgstr "Publiceringsplats"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:101
+#: ../plugins/publish-calendar/publish-format-fb.c:84
 #: ../plugins/publish-calendar/publish-format-ical.c:104
 #, c-format
 msgid "Invalid source UID '%s'"
@@ -23019,7 +23609,7 @@ msgstr "Förbereder att avsluta"
 msgid "Preparing to quit..."
 msgstr "Förbereder att avsluta…"
 
-#: ../shell/e-shell.c:915
+#: ../shell/e-shell.c:1024
 msgid "Credentials are required to connect to the destination host."
 msgstr "Inloggningsuppgifter krävs för att ansluta till målvärden."
 
@@ -23035,19 +23625,19 @@ msgstr "Spara sökning"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:930
+#: ../shell/e-shell-searchbar.c:926
 msgid "Sho_w:"
 msgstr "Vi_sa:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:955
+#: ../shell/e-shell-searchbar.c:951
 msgid "Sear_ch:"
 msgstr "Sö_k:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1023
+#: ../shell/e-shell-searchbar.c:1019
 msgid "i_n"
 msgstr "_i"
 
@@ -23360,13 +23950,13 @@ msgstr "Kör dessa sökparametrar"
 
 #. Translators: a 'New' toolbar button caption which is context sensitive and
 #. runs one of the actions under File->New menu
-#: ../shell/e-shell-window.c:505
+#: ../shell/e-shell-window.c:555
 msgctxt "toolbar-button"
 msgid "New"
 msgstr "Nytt"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:579
+#: ../shell/e-shell-window-private.c:632
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
@@ -23564,7 +24154,9 @@ msgid "Failed to invoke authenticate for '{0}'"
 msgstr "Misslyckades med att anropa autentisering för ”{0}”"
 
 #: ../shell/shell.error.xml.h:17
-msgid "Failed to connect to '{0}'"
+#, fuzzy
+#| msgid "Failed to connect to '{0}'"
+msgid "Failed to connect '{0}'"
 msgstr "Misslyckades med att ansluta till ”{0}”"
 
 #: ../shell/shell.error.xml.h:18
@@ -23572,21 +24164,81 @@ msgid "_Reconnect"
 msgstr "Åte_ranslut"
 
 #: ../shell/shell.error.xml.h:19
+#, fuzzy
+#| msgid "Failed to refresh address book '{0}'"
+msgid "Failed to connect address book '{0}'"
+msgstr "Misslyckades med att uppdatera adressboken ”{0}”"
+
+#: ../shell/shell.error.xml.h:20
+#, fuzzy
+#| msgid "Failed to open calendar '{0}'"
+msgid "Failed to connect calendar '{0}'"
+msgstr "Misslyckades med att öppna kalendern ”{0}”"
+
+#: ../shell/shell.error.xml.h:21
+#, fuzzy
+#| msgid "Failed to connect to '{0}'"
+msgid "Failed to connect mail account '{0}'"
+msgstr "Misslyckades med att ansluta till ”{0}”"
+
+#: ../shell/shell.error.xml.h:22
+#, fuzzy
+#| msgid "Failed to open memo list '{0}'"
+msgid "Failed to connect memo list '{0}'"
+msgstr "Misslyckades med att öppna memolistan ”{0}”"
+
+#: ../shell/shell.error.xml.h:23
+#, fuzzy
+#| msgid "Failed to open task list '{0}'"
+msgid "Failed to connect task list '{0}'"
+msgstr "Misslyckades med att öppna uppgiftslistan ”{0}”"
+
+#: ../shell/shell.error.xml.h:24
 msgid "Failed to prompt for credentials for '{0}'"
 msgstr "Misslyckades med att fråga efter inloggningsuppgifter för ”{0}”"
 
-#: ../shell/shell.error.xml.h:20
+#: ../shell/shell.error.xml.h:25
 msgid "Failed to finish trust prompt for '{0}'"
 msgstr "Misslyckades med att slutföra pålitlighetsfråga för ”{0}”"
 
-#: ../shell/shell.error.xml.h:21
+#: ../shell/shell.error.xml.h:26
 msgid "SSL certificate for '{0}' is not trusted."
 msgstr "SSL-certifikat för ”{0}” är ej betrott."
 
-#: ../shell/shell.error.xml.h:22
+#: ../shell/shell.error.xml.h:27
 msgid "Reason: {1}"
 msgstr "Orsak: {1}"
 
+#: ../shell/shell.error.xml.h:29
+#, fuzzy
+#| msgid "SSL certificate for '{0}' is not trusted."
+msgid "SSL certificate for address book '{0}' is not trusted."
+msgstr "SSL-certifikat för ”{0}” är ej betrott."
+
+#: ../shell/shell.error.xml.h:30
+#, fuzzy
+#| msgid "SSL certificate for '{0}' is not trusted."
+msgid "SSL certificate for calendar '{0}' is not trusted."
+msgstr "SSL-certifikat för ”{0}” är ej betrott."
+
+#: ../shell/shell.error.xml.h:31
+#, fuzzy
+#| msgid "SSL certificate for '{0}' is not trusted."
+msgid "SSL certificate for mail account '{0}' is not trusted."
+msgstr "SSL-certifikat för ”{0}” är ej betrott."
+
+#: ../shell/shell.error.xml.h:32
+#, fuzzy
+#| msgid "SSL certificate for '{0}' is not trusted."
+msgid "SSL certificate for memo list '{0}' is not trusted."
+msgstr "SSL-certifikat för ”{0}” är ej betrott."
+
+#: ../shell/shell.error.xml.h:33
+#, fuzzy
+#| msgid "SSL certificate for '{0}' is not trusted."
+msgid "SSL certificate for task list '{0}' is not trusted."
+msgstr "SSL-certifikat för ”{0}” är ej betrott."
+
 #: ../smime/gui/ca-trust-dialog.c:106
 #, c-format
 msgid ""
@@ -23673,7 +24325,7 @@ msgstr "MD5-fingeravtryck"
 msgid "Email Address"
 msgstr "E-postadress"
 
-#: ../smime/gui/certificate-manager.c:650
+#: ../smime/gui/certificate-manager.c:652
 msgid "Select a file to backup your key and certificate..."
 msgstr "Välj en fil för att säkerhetskopiera din nyckel och ditt certifikat…"
 
@@ -23682,36 +24334,31 @@ msgstr "Välj en fil för att säkerhetskopiera din nyckel och ditt certifikat
 #. * when a user wants to backup one of her/his private keys/certificates.
 #. * For example: gnomedev-backup.p12
 #.
-#: ../smime/gui/certificate-manager.c:662
+#: ../smime/gui/certificate-manager.c:664
 #, c-format
 msgid "%s-backup.p12"
 msgstr "%s-säkerhetskopia.p12"
 
-#: ../smime/gui/certificate-manager.c:676
-#: ../smime/gui/certificate-manager.c:965
-msgid "All files"
-msgstr "Alla filer"
-
-#: ../smime/gui/certificate-manager.c:728
+#: ../smime/gui/certificate-manager.c:730
 msgid "Backup Certificate"
 msgstr "Säkerhetskopiera certifikat"
 
 #. filename selection
-#: ../smime/gui/certificate-manager.c:742
+#: ../smime/gui/certificate-manager.c:744
 msgid "_File name:"
 msgstr "_Filnamn:"
 
 #. FIXME when gtk_file_chooser_button allows GTK_FILE_CHOOSER_ACTION_SAVE use it
-#: ../smime/gui/certificate-manager.c:747
+#: ../smime/gui/certificate-manager.c:749
 msgid "Please select a file..."
 msgstr "Välj en fil…"
 
-#: ../smime/gui/certificate-manager.c:761
+#: ../smime/gui/certificate-manager.c:763
 msgid "_Include certificate chain in the backup"
 msgstr "_Inkludera certifikatkedja i säkerhetskopian"
 
 #. To Translators: this text was copied from Firefox
-#: ../smime/gui/certificate-manager.c:767
+#: ../smime/gui/certificate-manager.c:769
 msgid ""
 "The certificate backup password you set here protects the backup file that "
 "you are about to create.\n"
@@ -23722,16 +24369,16 @@ msgstr ""
 "Du måste ange detta lösenord för att kunna fortsätta med "
 "säkerhetskopieringen."
 
-#: ../smime/gui/certificate-manager.c:786
+#: ../smime/gui/certificate-manager.c:788
 msgid "_Repeat Password:"
 msgstr "Upp_repa lösenord:"
 
-#: ../smime/gui/certificate-manager.c:805
+#: ../smime/gui/certificate-manager.c:807
 msgid "Passwords do not match"
 msgstr "Lösenord stämmer inte överens"
 
 #. To Translators: this text was copied from Firefox
-#: ../smime/gui/certificate-manager.c:813
+#: ../smime/gui/certificate-manager.c:815
 msgid ""
 "Important:\n"
 "If you forget your certificate backup password, you will not be able to "
@@ -23743,92 +24390,114 @@ msgstr ""
 "säkerhetskopia senare.\n"
 "Förvara det på en säker plats."
 
-#: ../smime/gui/certificate-manager.c:858
+#: ../smime/gui/certificate-manager.c:860
 msgid "No file name provided"
 msgstr "Inget filnamn tillhandahölls"
 
-#: ../smime/gui/certificate-manager.c:862
+#: ../smime/gui/certificate-manager.c:864
 msgid "Failed to backup key and certificate"
 msgstr "Misslyckades med att säkerhetskopiera nyckel och certifikat"
 
-#: ../smime/gui/certificate-manager.c:951
+#: ../smime/gui/certificate-manager.c:953
 msgid "Select a certificate to import..."
 msgstr "Välj ett certifikat att importera…"
 
-#: ../smime/gui/certificate-manager.c:1001
+#: ../smime/gui/certificate-manager.c:1003
 msgid "Failed to import certificate"
 msgstr "Misslyckades med att importera certifikatet"
 
-#: ../smime/gui/certificate-manager.c:1117
+#: ../smime/gui/certificate-manager.c:1119
 msgctxt "CamelTrust"
 msgid "Ask when used"
 msgstr "Fråga vid användning"
 
-#: ../smime/gui/certificate-manager.c:1119
+#: ../smime/gui/certificate-manager.c:1121
 msgctxt "CamelTrust"
 msgid "Never"
 msgstr "Aldrig"
 
-#: ../smime/gui/certificate-manager.c:1121
+#: ../smime/gui/certificate-manager.c:1123
+#, fuzzy
+#| msgctxt "CamelTrust"
+#| msgid "Marginal"
 msgctxt "CamelTrust"
-msgid "Marginal"
+msgid "Marginally"
 msgstr "Marginell"
 
-#: ../smime/gui/certificate-manager.c:1123
+#: ../smime/gui/certificate-manager.c:1125
 msgctxt "CamelTrust"
 msgid "Fully"
 msgstr "Fullständigt"
 
-#: ../smime/gui/certificate-manager.c:1125
+#: ../smime/gui/certificate-manager.c:1127
+#, fuzzy
+#| msgctxt "CamelTrust"
+#| msgid "Ultimate"
 msgctxt "CamelTrust"
-msgid "Ultimate"
+msgid "Ultimately"
 msgstr "Förbehållslös"
 
-#: ../smime/gui/certificate-manager.c:1127
+#: ../smime/gui/certificate-manager.c:1129
+#, fuzzy
+#| msgctxt "CamelTrust"
+#| msgid "Temporary"
 msgctxt "CamelTrust"
-msgid "Temporary"
+msgid "Temporarily"
 msgstr "Tillfällig"
 
-#: ../smime/gui/certificate-manager.c:1333
+#: ../smime/gui/certificate-manager.c:1335
 msgid "Change certificate trust"
 msgstr "Ändra tillit för certifikat"
 
-#: ../smime/gui/certificate-manager.c:1345
+#: ../smime/gui/certificate-manager.c:1347
 #, c-format
 msgid "Change trust for the host '%s':"
 msgstr "Ändra tillit för värden ”%s”:"
 
-#: ../smime/gui/certificate-manager.c:1369
+#: ../smime/gui/certificate-manager.c:1371
 msgctxt "CamelTrust"
 msgid "_Ask when used"
 msgstr "Fråga vid _användning"
 
-#: ../smime/gui/certificate-manager.c:1370
+#: ../smime/gui/certificate-manager.c:1372
+#, fuzzy
+#| msgid "Unset _trust for SSL certificate"
 msgctxt "CamelTrust"
-msgid "_Temporary (this session only)"
-msgstr "_Tillfällig (endast denna session)"
+msgid "_Never trust this certificate"
+msgstr "Återställ påli_tlighet för SSL-certifikat"
 
-#: ../smime/gui/certificate-manager.c:1371
+#: ../smime/gui/certificate-manager.c:1373
+#, fuzzy
+#| msgctxt "CamelTrust"
+#| msgid "_Temporary (this session only)"
 msgctxt "CamelTrust"
-msgid "_Never"
-msgstr "Al_drig"
+msgid "_Temporarily trusted (this session only)"
+msgstr "_Tillfällig (endast denna session)"
 
-#: ../smime/gui/certificate-manager.c:1372
+#: ../smime/gui/certificate-manager.c:1374
+#, fuzzy
+#| msgctxt "CamelTrust"
+#| msgid "_Marginal"
 msgctxt "CamelTrust"
-msgid "_Marginal"
+msgid "_Marginally trusted"
 msgstr "_Marginell"
 
-#: ../smime/gui/certificate-manager.c:1373
+#: ../smime/gui/certificate-manager.c:1375
+#, fuzzy
+#| msgid "R_eply requested"
 msgctxt "CamelTrust"
-msgid "_Fully"
-msgstr "_Fullständigt"
+msgid "_Fully trusted"
+msgstr "_Svar begärt"
 
-#: ../smime/gui/certificate-manager.c:1374
+#: ../smime/gui/certificate-manager.c:1376
+#, fuzzy
+#| msgctxt "CamelTrust"
+#| msgid "_Ultimate"
 msgctxt "CamelTrust"
-msgid "_Ultimate"
+msgid "_Ultimately trusted"
 msgstr "_Förbehållslös"
 
-#: ../smime/gui/certificate-manager.c:1378
+#: ../smime/gui/certificate-manager.c:1380
 msgid ""
 "Before trusting this site, you should examine its certificate and its policy "
 "and procedures (if available)."
@@ -23836,43 +24505,43 @@ msgstr ""
 "Innan du litar på denna plats bör du granska dess certifikat och dess policy "
 "och procedurer (om de är tillgängliga)."
 
-#: ../smime/gui/certificate-manager.c:1393
+#: ../smime/gui/certificate-manager.c:1395
 msgid "_Display certificate"
 msgstr "_Visa certifikat"
 
-#: ../smime/gui/certificate-manager.c:1598
+#: ../smime/gui/certificate-manager.c:1600
 msgid "You have certificates on file that identify these mail servers:"
 msgstr "Du har certifikat lagrade som identifierar dessa e-postservrar:"
 
-#: ../smime/gui/certificate-manager.c:1629
+#: ../smime/gui/certificate-manager.c:1631
 msgid "Host name"
 msgstr "Värdnamn"
 
-#: ../smime/gui/certificate-manager.c:1631
+#: ../smime/gui/certificate-manager.c:1633
 msgid "Issuer"
 msgstr "Utfärdare"
 
-#: ../smime/gui/certificate-manager.c:1632
+#: ../smime/gui/certificate-manager.c:1634
 msgid "Fingerprint"
 msgstr "Fingeravtryck"
 
-#: ../smime/gui/certificate-manager.c:1633
+#: ../smime/gui/certificate-manager.c:1635
 msgid "Trust"
 msgstr "Pålitlighet"
 
-#: ../smime/gui/certificate-manager.c:1654
+#: ../smime/gui/certificate-manager.c:1656
 msgid "_Edit Trust"
 msgstr "_Redigera pålitlighet"
 
-#: ../smime/gui/certificate-manager.c:1973
+#: ../smime/gui/certificate-manager.c:1975
 msgid "All PKCS12 files"
 msgstr "Alla PKCS12-filer"
 
-#: ../smime/gui/certificate-manager.c:1990
+#: ../smime/gui/certificate-manager.c:1992
 msgid "All email certificate files"
 msgstr "Alla e-postcertifikatfiler"
 
-#: ../smime/gui/certificate-manager.c:2007
+#: ../smime/gui/certificate-manager.c:2009
 msgid "All CA certificate files"
 msgstr "Alla certifikatutfärdarfiler"
 
@@ -23983,7 +24652,9 @@ msgstr ""
 "tillgängliga)."
 
 #: ../smime/gui/smime-ui.ui.h:25
-msgid "Certificate"
+#, fuzzy
+#| msgid "Certificate"
+msgid "C_ertificate:"
 msgstr "Certifikat"
 
 #: ../smime/gui/smime-ui.ui.h:26
@@ -24128,6 +24799,56 @@ msgstr "Med _förfallodatum"
 msgid "With _Status"
 msgstr "Med _status"
 
+#~ msgid "Completed On"
+#~ msgstr "Färdigt den"
+
+#~ msgid "is set"
+#~ msgstr "är inställt"
+
+#~ msgid "is not set"
+#~ msgstr "är inte inställt"
+
+#~ msgid "Loading Images"
+#~ msgstr "Inläsning av bilder"
+
+#~ msgid "Please select a valid backup file to restore."
+#~ msgstr "Välj en giltig säkerhetskopia att återskapa från."
+
+#~ msgid "HTTP Error: %s"
+#~ msgstr "HTTP-fel: %s"
+
+#~ msgid "Could not parse response"
+#~ msgstr "Kunde inte tolka svaret"
+
+#~ msgid "Empty response"
+#~ msgstr "Tomt svar"
+
+#~ msgid "Unexpected reply from server"
+#~ msgstr "Oväntat svar från server"
+
+#~ msgid "Could not locate user's calendars"
+#~ msgstr "Kunde inte hitta användarens kalendrar"
+
+#~ msgid "Path"
+#~ msgstr "Sökväg"
+
+#~ msgid "Template:"
+#~ msgstr "Mall:"
+
+#~ msgid "Please select an image of size 48 * 48"
+#~ msgstr "Välj en bild med storleken 48 * 48"
+
+#~ msgid "E_nable"
+#~ msgstr "A_ktivera"
+
+#~ msgctxt "CamelTrust"
+#~ msgid "_Never"
+#~ msgstr "Al_drig"
+
+#~ msgctxt "CamelTrust"
+#~ msgid "_Fully"
+#~ msgstr "_Fullständigt"
+
 #~ msgid "Enter Google password for user '%s'."
 #~ msgstr "Ange Google-lösenordet för användare ”%s”."
 


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