[evolution] Update British English translation



commit 0bdc8b4e3d22abfb460867403311c87556f33da1
Author: Zander Brown <zbrown gnome org>
Date:   Tue Aug 11 17:28:30 2020 +0000

    Update British English translation

 po/en_GB.po | 2728 ++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 1473 insertions(+), 1255 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 982f7398af..29ffd9a5ed 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -4,23 +4,23 @@
 # Gareth Owen <gowen72 yahoo com>, David Lodge <dave cirt net>, 2004.
 # Philip Withnall <philip tecnocode co uk>, 2010.
 # Chris Leonard <cjlhomeaddress gmail com>, 2012.
-# Zander Brown <zbrown gnome org>, 2019.
 # Bruce Cowan <bruce bcowan me uk>, 2009-2020.
+# Zander Brown <zbrown gnome org>, 2019-2020.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/evolution/issues\n";
-"POT-Creation-Date: 2020-02-14 10:50+0000\n"
-"PO-Revision-Date: 2020-02-25 20:36+0000\n"
-"Last-Translator: Bruce Cowan <bruce bcowan me uk>\n"
+"POT-Creation-Date: 2020-07-03 07:10+0000\n"
+"PO-Revision-Date: 2020-08-11 17:47+0100\n"
+"Last-Translator: Zander Brown <zbrown gnome org>\n"
 "Language-Team: English - United Kingdom <en_GB li org>\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 3.34.0\n"
+"X-Generator: Gtranslator 3.36.0\n"
 "X-Project-Style: gnome\n"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
@@ -985,11 +985,11 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:3
 msgid "List of disabled plugins"
-msgstr "List of disabled plugins"
+msgstr "List of disabled plug-ins"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:4
 msgid "The list of disabled plugins in Evolution"
-msgstr "The list of disabled plugins in Evolution"
+msgstr "The list of disabled plug-ins in Evolution"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:5
 msgid "The window’s X coordinate"
@@ -1398,7 +1398,7 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
 msgid "List of localized “Re”"
-msgstr "List of localized “Re”"
+msgstr "List of localised “Re”"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
 msgid ""
@@ -1406,7 +1406,7 @@ msgid ""
 "text when replying to a message, as an addition to the standard “Re” prefix. "
 "An example is “SV,AV”."
 msgstr ""
-"Comma-separated list of localized “Re” abbreviations to skip in a subject "
+"Comma-separated list of localised “Re” abbreviations to skip in a subject "
 "text when replying to a message, as an addition to the standard “Re” prefix. "
 "An example is “SV,AV”."
 
@@ -1669,12 +1669,14 @@ msgid "Show the photo of the sender in the message reading pane."
 msgstr "Show the photo of the sender in the message reading pane."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
-msgid "Search gravatar.com for photo of the sender"
-msgstr "Search gravatar.com for photo of the sender"
+#| msgid "Search gravatar.com for photo of the sender"
+msgid "Search libravatar.org for photo of the sender"
+msgstr "Search libravatar.org for photo of the sender"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
-msgid "Allow searching also at gravatar.com for photo of the sender."
-msgstr "Allow searching also at gravatar.com for photo of the sender."
+#| msgid "Allow searching also at gravatar.com for photo of the sender."
+msgid "Allow searching also at libravatar.org for photo of the sender."
+msgstr "Allow searching also at libravatar.org for photo of the sender."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid "Mark as Seen after specified timeout"
@@ -2307,7 +2309,7 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
 msgid "The default plugin for Junk hook"
-msgstr "The default plugin for Junk hook"
+msgstr "The default plug-in for Junk hook"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
 msgid ""
@@ -2315,9 +2317,9 @@ msgid ""
 "enabled. If the default listed plugin is disabled, then it won’t fall back "
 "to the other available plugins."
 msgstr ""
-"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 "
-"to the other available plugins."
+"This is the default junk plug-in, even though there are multiple plug-ins "
+"enabled. If the default listed plug-in is disabled, then it won’t fall back "
+"to the other available plug-ins."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
 msgid "Determines whether to lookup in address book for sender email"
@@ -2563,7 +2565,7 @@ msgid "Visually wrap long lines in composer"
 msgstr "Visually wrap long lines in composer"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:277
-#: ../src/composer/e-composer-actions.c:542
+#: ../src/composer/e-composer-actions.c:556
 msgid ""
 "Whether to visually wrap long lines of text to avoid horizontal scrolling"
 msgstr ""
@@ -2590,18 +2592,34 @@ msgstr ""
 "the bottom when using Alternative Reply."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:282
+#| msgid "Put personalized signatures at the top of replies"
+msgid "Put the signature at the top of the message"
+msgstr "Put the signature at the top of the message"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:283
+#| msgid ""
+#| "This determines whether the cursor is placed at the top of the message or "
+#| "the bottom when using Alternative Reply."
+msgid ""
+"This determines whether the signature is placed at the top of the message or "
+"the bottom when using Alternative Reply."
+msgstr ""
+"This determines whether the signature is placed at the top of the message or "
+"the bottom when using Alternative Reply."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:284
 msgid "Apply chosen template when using Alternative Reply"
 msgstr "Apply chosen template when using Alternative Reply"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:283
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:285
 msgid "Last chosen template’s folder URI for Alternative Reply"
 msgstr "Last chosen template’s folder URI for Alternative Reply"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:284
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:286
 msgid "Last chosen template’s message UID for Alternative Reply"
 msgstr "Last chosen template’s message UID for Alternative Reply"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:285
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:287
 msgid ""
 "Whether preserve original message subject when applying template for "
 "Alternative Reply"
@@ -2609,7 +2627,7 @@ msgstr ""
 "Whether preserve original message subject when applying template for "
 "Alternative Reply"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:286
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:288
 msgid ""
 "Whether set “body” in mailto: URI as Preformatted paragraph style. If set to "
 "“false”, then Normal paragraph style will be used."
@@ -2617,7 +2635,7 @@ msgstr ""
 "Whether set “body” in mailto: URI as Preformatted paragraph style. If set to "
 "“false”, then Normal paragraph style will be used."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:287
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:289
 msgid ""
 "Close the message browser window when the selected message is deleted or "
 "marked as Junk."
@@ -2625,7 +2643,7 @@ msgstr ""
 "Close the message browser window when the selected message is deleted or "
 "marked as Junk."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:288
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:290
 msgid ""
 "Collapse archive folders in Move/Copy message to Folder and Go to Folder "
 "selectors."
@@ -2633,7 +2651,7 @@ msgstr ""
 "Collapse archive folders in Move/Copy message to Folder and Go to Folder "
 "selectors."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:289
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:291
 msgid ""
 "Where to lookup recipient S/MIME certificates or PGP keys when encrypting "
 "messages."
@@ -2641,7 +2659,7 @@ msgstr ""
 "Where to lookup recipient S/MIME certificates or PGP keys when encrypting "
 "messages."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:290
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:292
 msgid ""
 "The “off” value completely disables certificate lookup; the “autocompleted” "
 "value provides certificates only for auto-completed contacts; the “books” "
@@ -2653,11 +2671,11 @@ msgstr ""
 "value uses certificates from auto-completed contacts and searches in books "
 "marked for auto-completion."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:291
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:293
 msgid "Whether Send/Receive should also download of messages for offline."
 msgstr "Whether Send/Receive should also download of messages for offline."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:292
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:294
 msgid ""
 "If enabled, whenever Send/Receive is run it also runs synchronization of "
 "messages for offline use. The option is disabled by default."
@@ -2665,11 +2683,11 @@ msgstr ""
 "If enabled, whenever Send/Receive is run it also runs synchronisation of "
 "messages for offline use. The option is disabled by default."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:293
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:295
 msgid "Whether display delivery notification parts inline."
 msgstr "Whether display delivery notification parts inline."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:294
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:296
 msgid ""
 "If enabled, the message/delivery-status and message/disposition-notification "
 "parts are shown automatically inline."
@@ -2677,12 +2695,11 @@ msgstr ""
 "If enabled, the message/delivery-status and message/disposition-notification "
 "parts are shown automatically inline."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:295
-#| msgid "Inherit theme colors in HTML format"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:297
 msgid "Whether unset colors provided in HTML mails."
 msgstr "Whether unset colours provided in HTML mails."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:296
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:298
 msgid ""
 "If enabled, unset colors in HTML messages, forcing use of desktop theme "
 "colors instead."
@@ -2690,11 +2707,11 @@ msgstr ""
 "If enabled, unset colours in HTML messages, forcing use of desktop theme "
 "colours instead."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:297
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:299
 msgid "(Deprecated) Default forward style"
 msgstr "(Deprecated) Default forward style"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:298
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:300
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“forward-style-name” instead."
@@ -2702,11 +2719,11 @@ msgstr ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“forward-style-name” instead."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:299
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:301
 msgid "(Deprecated) Default reply style"
 msgstr "(Deprecated) Default reply style"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:300
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:302
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“reply-style-name” instead."
@@ -2714,11 +2731,11 @@ msgstr ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“reply-style-name” instead."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:301
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:303
 msgid "(Deprecated) List of custom headers and whether they are enabled."
 msgstr "(Deprecated) List of custom headers and whether they are enabled."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:302
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:304
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“show-headers” instead."
@@ -2726,11 +2743,11 @@ msgstr ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“show-headers” instead."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:303
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:305
 msgid "(Deprecated) Load images for HTML messages over HTTP"
 msgstr "(Deprecated) Load images for HTML messages over HTTP"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:304
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:306
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“image-loading-policy” instead."
@@ -2738,7 +2755,7 @@ msgstr ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“image-loading-policy” instead."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:305
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:307
 msgid ""
 "(Deprecated) Asks whether to close the message window when the user forwards "
 "or replies to the message shown in the window"
@@ -2746,7 +2763,7 @@ msgstr ""
 "(Deprecated) Asks whether to close the message window when the user forwards "
 "or replies to the message shown in the window"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:306
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:308
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“browser-close-on-reply-policy” instead."
@@ -2766,7 +2783,7 @@ msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body"
 msgstr ""
-"List of clues for the attachment reminder plugin to look for in a message "
+"List of clues for the attachment reminder plug-in to look for in a message "
 "body"
 
 #: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:6
@@ -2774,7 +2791,7 @@ msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body."
 msgstr ""
-"List of clues for the attachment reminder plugin to look for in a message "
+"List of clues for the attachment reminder plug-in to look for in a message "
 "body."
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:1
@@ -3036,7 +3053,7 @@ msgid ""
 "List of keyword/value pairs for the Templates plugin to substitute in a "
 "message body."
 msgstr ""
-"List of keyword/value pairs for the Templates plugin to substitute in a "
+"List of keyword/value pairs for the Templates plug-in to substitute in a "
 "message body."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:1
@@ -3227,6 +3244,20 @@ msgstr ""
 "selection is escaped and appended to this string. The URI should start with "
 "https://.";
 
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:40
+msgid "Minimum font size to be used by WebKitGTK"
+msgstr "Minimum font size to be used by WebKitGTK"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:41
+msgid ""
+"The minimum font size in pixels used to display text in WebKitGTK. This "
+"setting controls the absolute smallest size. Values other than 0 can "
+"potentially break page layouts. Negative values are treated as 0."
+msgstr ""
+"The minimum font size in pixels used to display text in WebKitGTK. This "
+"setting controls the absolute smallest size. Values other than 0 can "
+"potentially break page layouts. Negative values are treated as 0."
+
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:1
 msgid "Use only local spam tests."
 msgstr "Use only local spam tests."
@@ -3283,9 +3314,9 @@ msgstr ""
 
 #: ../data/org.gnome.Evolution.appdata.xml.in.in.h:1
 #: ../data/org.gnome.Evolution.desktop.in.in.h:1
-#: ../src/mail/e-mail-browser.c:1295
+#: ../src/mail/e-mail-browser.c:1291
 #: ../src/modules/mailto-handler/evolution-mailto-handler.c:208
-#: ../src/shell/e-shell-window-private.c:240
+#: ../src/shell/e-shell-window-private.c:241
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -3342,13 +3373,13 @@ msgstr "Compose a Message"
 #: ../data/org.gnome.Evolution.desktop.in.in.h:8
 #: ../src/e-util/e-name-selector-dialog.c:448
 #: ../src/modules/addressbook/e-book-shell-backend.c:314
-#: ../src/modules/addressbook/e-book-shell-view.c:416
+#: ../src/modules/addressbook/e-book-shell-view.c:421
 msgid "Contacts"
 msgstr "Contacts"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:9
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1009
-#: ../src/e-util/e-collection-account-wizard.c:815
+#: ../src/e-util/e-collection-account-wizard.c:839
 #: ../src/e-util/e-send-options.c:544 ../src/e-util/e-webdav-browser.c:470
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:199
 #: ../src/modules/calendar/e-cal-shell-view.c:599
@@ -3360,14 +3391,14 @@ msgstr "Calendar"
 #: ../src/e-util/e-send-options.c:536 ../src/mail/importers/elm-importer.c:330
 #: ../src/mail/importers/kmail-importer.c:251
 #: ../src/mail/importers/pine-importer.c:423
-#: ../src/modules/mail/e-mail-shell-view.c:1493
+#: ../src/modules/mail/e-mail-shell-view.c:1624
 #: ../src/smime/gui/certificate-manager.c:1666
 msgid "Mail"
 msgstr "Mail"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:11
 #: ../src/calendar/gui/e-memo-table.c:457 ../src/e-util/e-webdav-browser.c:460
-#: ../src/modules/calendar/e-cal-shell-content.c:1769
+#: ../src/modules/calendar/e-cal-shell-content.c:1773
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:196
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:211
 #: ../src/modules/calendar/e-memo-shell-view.c:335
@@ -3380,10 +3411,10 @@ msgstr "Memos"
 #: ../src/calendar/importers/icalendar-importer.c:1141
 #: ../src/e-util/e-webdav-browser.c:461
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:72
-#: ../src/modules/calendar/e-cal-shell-content.c:1729
+#: ../src/modules/calendar/e-cal-shell-content.c:1733
 #: ../src/modules/calendar/e-task-shell-view-actions.c:220
 #: ../src/modules/calendar/e-task-shell-view-actions.c:235
-#: ../src/modules/calendar/e-task-shell-view.c:508
+#: ../src/modules/calendar/e-task-shell-view.c:515
 msgid "Tasks"
 msgstr "Tasks"
 
@@ -3688,11 +3719,11 @@ msgstr "For _Wide View"
 msgid "As Sent Folder for Wi_de View"
 msgstr "As Sent Folder for Wi_de View"
 
-#: ../data/views/memos/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2448
+#: ../data/views/memos/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2429
 msgid "_Memos"
 msgstr "_Memos"
 
-#: ../data/views/tasks/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2452
+#: ../data/views/tasks/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2433
 #: ../src/plugins/pst-import/pst-importer.c:571
 msgid "_Tasks"
 msgstr "_Tasks"
@@ -3904,7 +3935,7 @@ msgstr ""
 "to add it anyway?"
 
 #: ../src/addressbook/addressbook.error.xml.h:39
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1241
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1242
 msgid "Failed to delete contact"
 msgstr "Failed to delete contact"
 
@@ -4020,7 +4051,7 @@ msgid "Contact Editor"
 msgstr "Contact Editor"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:13
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2353
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2379
 #: ../src/mail/mail-config.ui.h:40
 msgid "Options"
 msgstr "Options"
@@ -4039,10 +4070,10 @@ msgstr "Options"
 #: ../src/addressbook/gui/widgets/eab-contact-merging.c:516
 #: ../src/addressbook/gui/widgets/eab-contact-merging.c:752
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:316
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1321
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1322
 #: ../src/calendar/gui/e-cal-dialogs.c:690
 #: ../src/calendar/gui/e-comp-editor-page-recurrence.c:304
-#: ../src/composer/e-composer-actions.c:228 ../src/e-util/e-activity-bar.c:357
+#: ../src/composer/e-composer-actions.c:242 ../src/e-util/e-activity-bar.c:370
 #: ../src/e-util/e-attachment-dialog.c:309
 #: ../src/e-util/e-attachment-store.c:658
 #: ../src/e-util/e-attachment-store.c:668
@@ -4051,8 +4082,8 @@ msgstr "Options"
 #: ../src/e-util/e-categories-dialog.c:80 ../src/e-util/e-category-editor.c:169
 #: ../src/e-util/e-category-editor.c:257 ../src/e-util/e-charset-combo-box.c:99
 #: ../src/e-util/e-collection-account-wizard.c:238
-#: ../src/e-util/e-collection-account-wizard.c:1837
-#: ../src/e-util/e-collection-account-wizard.c:2073
+#: ../src/e-util/e-collection-account-wizard.c:1868
+#: ../src/e-util/e-collection-account-wizard.c:2109
 #: ../src/e-util/e-color-chooser-widget.c:125
 #: ../src/e-util/e-filter-datespec.c:300
 #: ../src/e-util/e-html-editor-actions.c:342
@@ -4064,14 +4095,14 @@ msgstr "Options"
 #: ../src/e-util/e-rule-editor.c:187 ../src/e-util/e-rule-editor.c:298
 #: ../src/e-util/e-rule-editor.c:933 ../src/e-util/e-send-options.ui.h:16
 #: ../src/e-util/e-source-config-dialog.c:360
-#: ../src/e-util/e-source-selector-dialog.c:370
+#: ../src/e-util/e-source-selector-dialog.c:325
 #: ../src/e-util/e-table-config.c:548 ../src/e-util/e-table-config.ui.h:3
 #: ../src/e-util/e-timezone-dialog.ui.h:2
-#: ../src/e-util/evolution-source-viewer.c:835 ../src/e-util/e-web-view.c:3963
+#: ../src/e-util/evolution-source-viewer.c:835 ../src/e-util/e-web-view.c:3932
 #: ../src/e-util/gal-view-instance-save-as-dialog.c:267
 #: ../src/mail/e-mail-config-window.c:334 ../src/mail/e-mail-label-dialog.c:194
-#: ../src/mail/e-mail-tag-editor.c:160 ../src/mail/em-composer-utils.c:4044
-#: ../src/mail/em-folder-selector.c:318 ../src/mail/mail-config.ui.h:2
+#: ../src/mail/e-mail-tag-editor.c:160 ../src/mail/em-composer-utils.c:4050
+#: ../src/mail/em-folder-selector.c:333 ../src/mail/mail-config.ui.h:2
 #: ../src/mail/mail.error.xml.h:16 ../src/mail/mail-send-recv.c:874
 #: ../src/mail/mail-send-recv.c:955 ../src/mail/mail-vfolder-ui.c:149
 #: ../src/mail/mail-vfolder-ui.c:271
@@ -4100,12 +4131,12 @@ msgstr "_Cancel"
 #: ../src/addressbook/gui/widgets/eab-contact-merging.c:755
 #: ../src/calendar/calendar.error.xml.h:47
 #: ../src/calendar/gui/e-comp-editor.c:2158
-#: ../src/composer/e-composer-actions.c:228
-#: ../src/composer/e-composer-actions.c:340
+#: ../src/composer/e-composer-actions.c:242
+#: ../src/composer/e-composer-actions.c:354
 #: ../src/e-util/e-attachment-store.c:848
 #: ../src/e-util/e-attachment-store.c:855
 #: ../src/e-util/e-mail-signature-script-dialog.c:370
-#: ../src/e-util/e-webdav-browser.c:2476 ../src/e-util/e-web-view.c:3963
+#: ../src/e-util/e-webdav-browser.c:2457 ../src/e-util/e-web-view.c:3932
 #: ../src/e-util/gal-view-instance-save-as-dialog.c:268
 #: ../src/shell/e-shell-content.c:642 ../src/shell/e-shell-utils.c:133
 #: ../src/smime/gui/certificate-manager.c:651
@@ -4119,7 +4150,7 @@ msgstr "_Save"
 #: ../src/e-util/e-preferences-window.c:390
 #: ../src/e-util/e-send-options.ui.h:15
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
-#: ../src/shell/e-shell-window-actions.c:1053
+#: ../src/shell/e-shell-window-actions.c:1066
 msgid "_Help"
 msgstr "_Help"
 
@@ -4182,8 +4213,8 @@ msgid "_Home Page:"
 msgstr "_Home Page:"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:30
-#: ../src/calendar/gui/e-comp-editor-event.c:884
-#: ../src/modules/itip-formatter/itip-view.c:1907
+#: ../src/calendar/gui/e-comp-editor-event.c:877
+#: ../src/modules/itip-formatter/itip-view.c:1972
 msgid "_Calendar:"
 msgstr "_Calendar:"
 
@@ -4286,7 +4317,7 @@ msgstr "Birthday"
 
 #. Other options
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:54
-#: ../src/mail/e-mail-config-defaults-page.c:887
+#: ../src/mail/e-mail-config-defaults-page.c:888
 #: ../src/modules/addressbook/autocompletion-config.c:127
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Miscellaneous"
@@ -4394,7 +4425,7 @@ msgstr "Certificates"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:261
 #: ../src/calendar/gui/e-comp-editor.c:2090
-#: ../src/e-util/e-html-editor-actions.c:1004
+#: ../src/e-util/e-html-editor-actions.c:1107
 msgid "_Undo"
 msgstr "_Undo"
 
@@ -4406,7 +4437,7 @@ msgstr "Undo"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:268
 #: ../src/calendar/gui/e-comp-editor.c:2097
-#: ../src/e-util/e-html-editor-actions.c:990
+#: ../src/e-util/e-html-editor-actions.c:1093
 msgid "_Redo"
 msgstr "_Redo"
 
@@ -4556,12 +4587,12 @@ msgstr "Invalid contact."
 #: ../src/e-util/e-charset-combo-box.c:100
 #: ../src/e-util/e-color-chooser-widget.c:126
 #: ../src/e-util/e-filter-datespec.c:301
-#: ../src/e-util/e-html-editor-link-dialog.c:243
+#: ../src/e-util/e-html-editor-link-dialog.c:240
 #: ../src/e-util/e-passwords.c:469 ../src/e-util/e-rule-context.c:817
 #: ../src/e-util/e-rule-editor.c:188 ../src/e-util/e-rule-editor.c:299
 #: ../src/e-util/e-rule-editor.c:934 ../src/e-util/e-send-options.ui.h:17
 #: ../src/e-util/e-source-config-dialog.c:361
-#: ../src/e-util/e-source-selector-dialog.c:371
+#: ../src/e-util/e-source-selector-dialog.c:326
 #: ../src/e-util/e-table-config.c:549 ../src/e-util/e-table-config.ui.h:4
 #: ../src/e-util/e-timezone-dialog.ui.h:3
 #: ../src/mail/e-mail-config-window.c:335 ../src/mail/e-mail-tag-editor.c:162
@@ -4760,7 +4791,7 @@ msgstr "E-mail begins with"
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1295
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1692
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:807
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1015
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1022
 msgid "Any field contains"
 msgstr "Any field contains"
 
@@ -4775,22 +4806,22 @@ msgid "Copy _Email Address"
 msgstr "Copy _E-mail Address"
 
 #: ../src/addressbook/gui/widgets/eab-contact-display.c:187
-#: ../src/e-util/e-web-view.c:430
+#: ../src/e-util/e-web-view.c:429
 msgid "Copy the email address to the clipboard"
 msgstr "Copy the e-mail address to the clipboard"
 
 #: ../src/addressbook/gui/widgets/eab-contact-display.c:192
-#: ../src/e-util/e-web-view.c:442
+#: ../src/e-util/e-web-view.c:441
 msgid "_Send New Message To…"
 msgstr "_Send New Message To…"
 
 #: ../src/addressbook/gui/widgets/eab-contact-display.c:194
-#: ../src/e-util/e-web-view.c:444
+#: ../src/e-util/e-web-view.c:443
 msgid "Send a mail message to this address"
 msgstr "Send a mail message to this address"
 
 #: ../src/addressbook/gui/widgets/eab-contact-display.c:321
-#: ../src/e-util/e-web-view.c:1668
+#: ../src/e-util/e-misc-utils.c:4546
 #, c-format
 msgid "Click to mail %s"
 msgstr "Click to mail %s"
@@ -5130,71 +5161,71 @@ msgstr "Search Interrupted"
 msgid "Error modifying card"
 msgstr "Error modifying card"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:678
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:679
 msgid "Cut selected contacts to the clipboard"
 msgstr "Cut selected contacts to the clipboard"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:684
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:685
 msgid "Copy selected contacts to the clipboard"
 msgstr "Copy selected contacts to the clipboard"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:690
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:691
 msgid "Paste contacts from the clipboard"
 msgstr "Paste contacts from the clipboard"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:696
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:697
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1101
 msgid "Delete selected contacts"
 msgstr "Delete selected contacts"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:702
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Select all visible contacts"
 msgstr "Select all visible contacts"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1289
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1290
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Are you sure you want to delete these contact lists?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1293
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1294
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Are you sure you want to delete this contact list?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1297
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1298
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Are you sure you want to delete this contact list (%s)?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1303
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1304
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Are you sure you want to delete these contacts?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1307
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1308
 msgid "Are you sure you want to delete this contact?"
 msgstr "Are you sure you want to delete this contact?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1311
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1312
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Are you sure you want to delete this contact (%s)?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1322
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1323
 #: ../src/calendar/gui/e-comp-editor.c:2048
 #: ../src/e-util/e-accounts-window.c:1753 ../src/e-util/e-focus-tracker.c:816
 #: ../src/e-util/evolution-source-viewer.c:806
-#: ../src/e-util/e-webdav-browser.c:2697
+#: ../src/e-util/e-webdav-browser.c:2678
 #: ../src/mail/e-mail-account-manager.c:739
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1173
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1499
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:697
 #: ../src/modules/calendar/e-task-shell-view-actions.c:851
 #: ../src/modules/mail/e-mail-shell-view-actions.c:1628
-#: ../src/shell/e-shell-window-actions.c:911
+#: ../src/shell/e-shell-window-actions.c:917
 #: ../src/smime/gui/certificate-manager.c:1656 ../src/smime/gui/smime-ui.ui.h:8
 msgid "_Delete"
 msgstr "_Delete"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1470
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1471
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -5209,11 +5240,11 @@ msgstr[1] ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1478
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1479
 msgid "_Don’t Display"
 msgstr "_Don’t Display"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1479
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1480
 msgid "Display _All Contacts"
 msgstr "Display _All Contacts"
 
@@ -5397,9 +5428,9 @@ msgstr "Zoom _Out"
 
 #. Search button
 #: ../src/addressbook/gui/widgets/e-contact-map-window.c:447
-#: ../src/e-util/e-html-editor-actions.c:2081
+#: ../src/e-util/e-html-editor-actions.c:2206
 #: ../src/e-util/e-html-editor-find-dialog.c:244
-#: ../src/shell/e-shell-window-actions.c:981
+#: ../src/shell/e-shell-window-actions.c:994
 msgid "_Find"
 msgstr "_Find"
 
@@ -5644,13 +5675,17 @@ msgid "Phone"
 msgstr "Phone"
 
 #: ../src/calendar/calendar.error.xml.h:1
-msgid "Would you like to send all the participants a cancelation notice?"
+#| msgid "Would you like to send all the participants a cancelation notice?"
+msgid "Would you like to send all the participants a cancellation notice?"
 msgstr "Would you like to send all the participants a cancellation notice?"
 
 #: ../src/calendar/calendar.error.xml.h:2
+#| msgid ""
+#| "If you do not send a cancelation notice, the other participants may not "
+#| "know the meeting is canceled."
 msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the meeting is canceled."
+"If you do not send a cancellation notice, the other participants may not "
+"know the meeting is canceled."
 msgstr ""
 "If you do not send a cancellation notice, the other participants may not "
 "know the meeting is cancelled."
@@ -5676,9 +5711,12 @@ msgstr ""
 "All information on this meeting will be deleted and can not be restored."
 
 #: ../src/calendar/calendar.error.xml.h:8
+#| msgid ""
+#| "If you do not send a cancelation notice, the other participants may not "
+#| "know the task has been deleted."
 msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the task has been deleted."
+"If you do not send a cancellation notice, the other participants may not "
+"know the task has been deleted."
 msgstr ""
 "If you do not send a cancellation notice, the other participants may not "
 "know the task has been deleted."
@@ -5694,13 +5732,17 @@ msgid "All information on this task will be deleted and can not be restored."
 msgstr "All information on this task will be deleted and can not be restored."
 
 #: ../src/calendar/calendar.error.xml.h:11
-msgid "Would you like to send a cancelation notice for this memo?"
+#| msgid "Would you like to send a cancelation notice for this memo?"
+msgid "Would you like to send a cancellation notice for this memo?"
 msgstr "Would you like to send a cancellation notice for this memo?"
 
 #: ../src/calendar/calendar.error.xml.h:12
+#| msgid ""
+#| "If you do not send a cancelation notice, the other participants may not "
+#| "know the memo has been deleted."
 msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the memo has been deleted."
+"If you do not send a cancellation notice, the other participants may not "
+"know the memo has been deleted."
 msgstr ""
 "If you do not send a cancellation notice, the other participants may not "
 "know the memo has been deleted."
@@ -6345,7 +6387,7 @@ msgstr "does not contain"
 #: ../src/calendar/gui/memotypes.xml.in.h:4
 #: ../src/calendar/gui/tasktypes.xml.in.h:4
 #: ../src/e-util/e-attachment-tree-view.c:147
-#: ../src/e-util/e-collection-account-wizard.c:1929
+#: ../src/e-util/e-collection-account-wizard.c:1960
 #: ../src/e-util/e-table-config.ui.h:20
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Description"
@@ -6395,7 +6437,7 @@ msgstr "Private"
 #: ../src/calendar/gui/e-cal-list-view.c:265
 #: ../src/calendar/gui/e-cal-model.c:308 ../src/calendar/gui/e-task-table.c:447
 #: ../src/calendar/gui/memotypes.xml.in.h:12
-#: ../src/e-util/e-html-editor-page-dialog.c:113
+#: ../src/e-util/e-html-editor-page-dialog.c:116
 #: ../src/e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "Confidential"
@@ -6457,7 +6499,7 @@ msgid "Do Not Exist"
 msgstr "Do Not Exist"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:19
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2065
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2101
 msgid "Recurrence"
 msgstr "Recurrence"
 
@@ -6489,65 +6531,65 @@ msgstr "Summary Contains"
 msgid "Description Contains"
 msgstr "Description Contains"
 
-#: ../src/calendar/gui/comp-util.c:1544
-#: ../src/modules/itip-formatter/itip-view.c:2229
+#: ../src/calendar/gui/comp-util.c:1546
+#: ../src/modules/itip-formatter/itip-view.c:2294
 #, c-format
 msgid "with one guest"
 msgid_plural "with %d guests"
 msgstr[0] "with one guest"
 msgstr[1] "with %d guests"
 
-#: ../src/calendar/gui/comp-util.c:1603
+#: ../src/calendar/gui/comp-util.c:1605
 #, c-format
 msgid "Comments: %s"
 msgstr "Comments: %s"
 
-#: ../src/calendar/gui/comp-util.c:1617 ../src/calendar/gui/comp-util.c:1620
+#: ../src/calendar/gui/comp-util.c:1619 ../src/calendar/gui/comp-util.c:1622
 msgctxt "iCalendarStatus"
 msgid "None"
 msgstr "None"
 
-#: ../src/calendar/gui/comp-util.c:1618
+#: ../src/calendar/gui/comp-util.c:1620
 msgctxt "iCalendarStatus"
 msgid "Tentative"
 msgstr "Tentative"
 
-#: ../src/calendar/gui/comp-util.c:1619
+#: ../src/calendar/gui/comp-util.c:1621
 msgctxt "iCalendarStatus"
 msgid "Confirmed"
 msgstr "Confirmed"
 
-#: ../src/calendar/gui/comp-util.c:1621
+#: ../src/calendar/gui/comp-util.c:1623
 msgctxt "iCalendarStatus"
 msgid "Draft"
 msgstr "Draft"
 
-#: ../src/calendar/gui/comp-util.c:1622
+#: ../src/calendar/gui/comp-util.c:1624
 msgctxt "iCalendarStatus"
 msgid "Final"
 msgstr "Final"
 
-#: ../src/calendar/gui/comp-util.c:1623
+#: ../src/calendar/gui/comp-util.c:1625
 msgctxt "iCalendarStatus"
 msgid "Not Started"
 msgstr "Not Started"
 
-#: ../src/calendar/gui/comp-util.c:1624
+#: ../src/calendar/gui/comp-util.c:1626
 msgctxt "iCalendarStatus"
 msgid "Needs Action"
 msgstr "Needs Action"
 
-#: ../src/calendar/gui/comp-util.c:1625
+#: ../src/calendar/gui/comp-util.c:1627
 msgctxt "iCalendarStatus"
 msgid "In Progress"
 msgstr "In Progress"
 
-#: ../src/calendar/gui/comp-util.c:1626
+#: ../src/calendar/gui/comp-util.c:1628
 msgctxt "iCalendarStatus"
 msgid "Completed"
 msgstr "Completed"
 
-#: ../src/calendar/gui/comp-util.c:1627
+#: ../src/calendar/gui/comp-util.c:1629
 msgctxt "iCalendarStatus"
 msgid "Cancelled"
 msgstr "Cancelled"
@@ -6655,28 +6697,28 @@ msgstr "Click here, you can find more events."
 
 #. Translators: Part of: [ Play a sound ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../src/calendar/gui/e-alarm-list.c:387
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2188
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2214
 msgctxt "cal-reminders"
 msgid "Play a sound"
 msgstr "Play a sound"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../src/calendar/gui/e-alarm-list.c:391
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2186
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2212
 msgctxt "cal-reminders"
 msgid "Pop up an alert"
 msgstr "Pop up an alert"
 
 #. Translators: Part of: [ Send an email ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../src/calendar/gui/e-alarm-list.c:395
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2192
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2218
 msgctxt "cal-reminders"
 msgid "Send an email"
 msgstr "Send an e-mail"
 
 #. Translators: Part of: [ Run a program ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../src/calendar/gui/e-alarm-list.c:399
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2190
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2216
 msgctxt "cal-reminders"
 msgid "Run a program"
 msgstr "Run a program"
@@ -6769,7 +6811,7 @@ msgid "calendar view for one or more weeks"
 msgstr "calendar view for one or more weeks"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:237
-#: ../src/e-util/e-filter-rule.c:986 ../src/mail/e-mail-config-page.c:124
+#: ../src/e-util/e-filter-rule.c:1068 ../src/mail/e-mail-config-page.c:124
 msgid "Untitled"
 msgstr "Untitled"
 
@@ -6779,8 +6821,8 @@ msgstr "Categories:"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:288
 #: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:249
-#: ../src/modules/itip-formatter/itip-view.c:1635
-#: ../src/modules/itip-formatter/itip-view.c:1746
+#: ../src/modules/itip-formatter/itip-view.c:1700
+#: ../src/modules/itip-formatter/itip-view.c:1811
 msgid "Location:"
 msgstr "Location:"
 
@@ -6801,8 +6843,8 @@ msgid "Recurs:"
 msgstr "Recurs:"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:338
-#: ../src/modules/itip-formatter/itip-view.c:1638
-#: ../src/modules/itip-formatter/itip-view.c:1755
+#: ../src/modules/itip-formatter/itip-view.c:1703
+#: ../src/modules/itip-formatter/itip-view.c:1820
 msgid "Status:"
 msgstr "Status:"
 
@@ -6864,7 +6906,7 @@ msgstr "Creating view for task list “%s”"
 msgid "Creating view for memo list “%s”"
 msgstr "Creating view for memo list “%s”"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:217 ../src/calendar/gui/e-cal-ops.c:1976
+#: ../src/calendar/gui/e-cal-dialogs.c:217 ../src/calendar/gui/e-cal-ops.c:1991
 msgid "Destination is read only"
 msgstr "Destination is read only"
 
@@ -6984,13 +7026,13 @@ msgstr "This and Future Instances"
 msgid "All Instances"
 msgstr "All Instances"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:1173
-#: ../src/calendar/gui/e-cal-dialogs.c:1255
+#: ../src/calendar/gui/e-cal-dialogs.c:1171
+#: ../src/calendar/gui/e-cal-dialogs.c:1253
 msgid "Send my reminders with this event"
 msgstr "Send my reminders with this event"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:1175
-#: ../src/calendar/gui/e-cal-dialogs.c:1257
+#: ../src/calendar/gui/e-cal-dialogs.c:1173
+#: ../src/calendar/gui/e-cal-dialogs.c:1255
 msgid "Notify new attendees _only"
 msgstr "Notify new attendees _only"
 
@@ -7015,17 +7057,17 @@ msgid "Pasted text doesn’t contain valid iCalendar data"
 msgstr "Pasted text doesn’t contain valid iCalendar data"
 
 #: ../src/calendar/gui/e-calendar-view.c:917
-#: ../src/calendar/gui/e-cal-ops.c:1567
+#: ../src/calendar/gui/e-cal-ops.c:1582
 msgid "Default calendar not found"
 msgstr "Default calendar not found"
 
 #: ../src/calendar/gui/e-calendar-view.c:922
-#: ../src/calendar/gui/e-cal-ops.c:1570
+#: ../src/calendar/gui/e-cal-ops.c:1585
 msgid "Default memo list not found"
 msgstr "Default memo list not found"
 
 #: ../src/calendar/gui/e-calendar-view.c:927
-#: ../src/calendar/gui/e-cal-ops.c:1573
+#: ../src/calendar/gui/e-cal-ops.c:1588
 msgid "Default task list not found"
 msgstr "Default task list not found"
 
@@ -7049,7 +7091,7 @@ msgstr "Pasting iCalendar data"
 msgid "Organizer: %s <%s>"
 msgstr "Organiser: %s <%s>"
 
-#. With SunOne accouts, there may be no ':' in organiser.value
+#. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
 #: ../src/calendar/gui/e-calendar-view.c:1892
@@ -7179,8 +7221,8 @@ msgstr "Status"
 #: ../src/calendar/gui/e-task-table.etspec.h:3
 #: ../src/e-util/e-accounts-window.c:1443
 #: ../src/e-util/e-attachment-tree-view.c:205
-#: ../src/e-util/e-collection-account-wizard.c:1970
-#: ../src/e-util/e-webdav-browser.c:2390
+#: ../src/e-util/e-collection-account-wizard.c:2001
+#: ../src/e-util/e-webdav-browser.c:2371
 #: ../src/mail/e-mail-account-tree-view.c:158
 msgid "Type"
 msgstr "Type"
@@ -7192,31 +7234,31 @@ msgstr "Type"
 #: ../src/calendar/gui/e-meeting-store.c:170
 #: ../src/calendar/gui/e-meeting-store.c:215 ../src/calendar/gui/print.c:1265
 #: ../src/calendar/gui/print.c:1282 ../src/e-util/e-charset.c:49
-#: ../src/modules/itip-formatter/itip-view.c:3395
-#: ../src/modules/itip-formatter/itip-view.c:6440
+#: ../src/modules/itip-formatter/itip-view.c:3460
+#: ../src/modules/itip-formatter/itip-view.c:6505
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:97
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../src/calendar/gui/e-cal-model.c:1369 ../src/calendar/gui/e-cal-ops.c:615
-#: ../src/calendar/gui/e-cal-ops.c:1252
+#: ../src/calendar/gui/e-cal-model.c:1369 ../src/calendar/gui/e-cal-ops.c:626
+#: ../src/calendar/gui/e-cal-ops.c:1267
 #: ../src/modules/calendar/e-cal-base-shell-backend.c:391
 #, c-format
 msgid "Source with UID “%s” not found"
 msgstr "Source with UID “%s” not found"
 
 #: ../src/calendar/gui/e-cal-model.c:1480 ../src/calendar/gui/e-cal-ops.c:191
-#: ../src/calendar/gui/e-cal-ops.c:1369
+#: ../src/calendar/gui/e-cal-ops.c:1384
 msgid "Creating an event"
 msgstr "Creating an event"
 
 #: ../src/calendar/gui/e-cal-model.c:1484 ../src/calendar/gui/e-cal-ops.c:195
-#: ../src/calendar/gui/e-cal-ops.c:1373
+#: ../src/calendar/gui/e-cal-ops.c:1388
 msgid "Creating a memo"
 msgstr "Creating a memo"
 
 #: ../src/calendar/gui/e-cal-model.c:1488 ../src/calendar/gui/e-cal-ops.c:199
-#: ../src/calendar/gui/e-cal-ops.c:1377
+#: ../src/calendar/gui/e-cal-ops.c:1392
 msgid "Creating a task"
 msgstr "Creating a task"
 
@@ -7242,7 +7284,7 @@ msgstr "No"
 #: ../src/calendar/gui/e-meeting-list-view.c:208
 #: ../src/calendar/gui/e-meeting-store.c:179
 #: ../src/calendar/gui/e-meeting-store.c:202
-#: ../src/modules/itip-formatter/itip-view.c:6428
+#: ../src/modules/itip-formatter/itip-view.c:6493
 msgid "Accepted"
 msgstr "Accepted"
 
@@ -7250,7 +7292,7 @@ msgstr "Accepted"
 #: ../src/calendar/gui/e-meeting-list-view.c:209
 #: ../src/calendar/gui/e-meeting-store.c:181
 #: ../src/calendar/gui/e-meeting-store.c:204
-#: ../src/modules/itip-formatter/itip-view.c:6434
+#: ../src/modules/itip-formatter/itip-view.c:6499
 msgid "Declined"
 msgstr "Declined"
 
@@ -7266,7 +7308,7 @@ msgstr "Tentative"
 #: ../src/calendar/gui/e-meeting-list-view.c:211
 #: ../src/calendar/gui/e-meeting-store.c:185
 #: ../src/calendar/gui/e-meeting-store.c:208
-#: ../src/modules/itip-formatter/itip-view.c:6437
+#: ../src/modules/itip-formatter/itip-view.c:6502
 msgid "Delegated"
 msgstr "Delegated"
 
@@ -7299,166 +7341,166 @@ msgstr ""
 msgid "In Progress"
 msgstr "In Progress"
 
-#: ../src/calendar/gui/e-cal-ops.c:311
+#: ../src/calendar/gui/e-cal-ops.c:314
 msgid "Modifying an event"
 msgstr "Modifying an event"
 
-#: ../src/calendar/gui/e-cal-ops.c:315
+#: ../src/calendar/gui/e-cal-ops.c:318
 msgid "Modifying a memo"
 msgstr "Modifying a memo"
 
-#: ../src/calendar/gui/e-cal-ops.c:319
+#: ../src/calendar/gui/e-cal-ops.c:322
 msgid "Modifying a task"
 msgstr "Modifying a task"
 
-#: ../src/calendar/gui/e-cal-ops.c:417 ../src/calendar/gui/e-to-do-pane.c:2074
+#: ../src/calendar/gui/e-cal-ops.c:423 ../src/calendar/gui/e-to-do-pane.c:2074
 msgid "Removing an event"
 msgstr "Removing an event"
 
-#: ../src/calendar/gui/e-cal-ops.c:421 ../src/calendar/gui/e-to-do-pane.c:2078
+#: ../src/calendar/gui/e-cal-ops.c:427 ../src/calendar/gui/e-to-do-pane.c:2078
 msgid "Removing a memo"
 msgstr "Removing a memo"
 
-#: ../src/calendar/gui/e-cal-ops.c:425 ../src/calendar/gui/e-to-do-pane.c:2082
+#: ../src/calendar/gui/e-cal-ops.c:431 ../src/calendar/gui/e-to-do-pane.c:2082
 msgid "Removing a task"
 msgstr "Removing a task"
 
-#: ../src/calendar/gui/e-cal-ops.c:513
+#: ../src/calendar/gui/e-cal-ops.c:519
 #, c-format
 msgid "Deleting an event"
 msgid_plural "Deleting %d events"
 msgstr[0] "Deleting an event"
 msgstr[1] "Deleting %d events"
 
-#: ../src/calendar/gui/e-cal-ops.c:517
+#: ../src/calendar/gui/e-cal-ops.c:523
 #, c-format
 msgid "Deleting a memo"
 msgid_plural "Deleting %d memos"
 msgstr[0] "Deleting a memo"
 msgstr[1] "Deleting %d memos"
 
-#: ../src/calendar/gui/e-cal-ops.c:521
+#: ../src/calendar/gui/e-cal-ops.c:527
 #, c-format
 msgid "Deleting a task"
 msgid_plural "Deleting %d tasks"
 msgstr[0] "Deleting a task"
 msgstr[1] "Deleting %d tasks"
 
-#: ../src/calendar/gui/e-cal-ops.c:727
+#: ../src/calendar/gui/e-cal-ops.c:738
 #, c-format
 msgid "Pasting an event"
 msgid_plural "Pasting %d events"
 msgstr[0] "Pasting an event"
 msgstr[1] "Pasting %d events"
 
-#: ../src/calendar/gui/e-cal-ops.c:742
+#: ../src/calendar/gui/e-cal-ops.c:753
 #, c-format
 msgid "Pasting a memo"
 msgid_plural "Pasting %d memos"
 msgstr[0] "Pasting a memo"
 msgstr[1] "Pasting %d memos"
 
-#: ../src/calendar/gui/e-cal-ops.c:757
+#: ../src/calendar/gui/e-cal-ops.c:768
 #, c-format
 msgid "Pasting a task"
 msgid_plural "Pasting %d tasks"
 msgstr[0] "Pasting a task"
 msgstr[1] "Pasting %d tasks"
 
-#: ../src/calendar/gui/e-cal-ops.c:853
+#: ../src/calendar/gui/e-cal-ops.c:868
 msgid "Updating an event"
 msgstr "Updating an event"
 
-#: ../src/calendar/gui/e-cal-ops.c:857
+#: ../src/calendar/gui/e-cal-ops.c:872
 msgid "Updating a memo"
 msgstr "Updating a memo"
 
-#: ../src/calendar/gui/e-cal-ops.c:861
+#: ../src/calendar/gui/e-cal-ops.c:876
 msgid "Updating a task"
 msgstr "Updating a task"
 
-#: ../src/calendar/gui/e-cal-ops.c:974
+#: ../src/calendar/gui/e-cal-ops.c:989
 #, c-format
 msgid "Getting events to purge in the calendar “%s”"
 msgstr "Getting events to purge in the calendar “%s”"
 
-#: ../src/calendar/gui/e-cal-ops.c:978
+#: ../src/calendar/gui/e-cal-ops.c:993
 #, c-format
 msgid "Getting memos to purge in the memo list “%s”"
 msgstr "Getting memos to purge in the memo list “%s”"
 
-#: ../src/calendar/gui/e-cal-ops.c:982
+#: ../src/calendar/gui/e-cal-ops.c:997
 #, c-format
 msgid "Getting tasks to purge in the task list “%s”"
 msgstr "Getting tasks to purge in the task list “%s”"
 
-#: ../src/calendar/gui/e-cal-ops.c:1008
+#: ../src/calendar/gui/e-cal-ops.c:1023
 #, c-format
 msgid "Purging events in the calendar “%s”"
 msgstr "Purging events in the calendar “%s”"
 
-#: ../src/calendar/gui/e-cal-ops.c:1012
+#: ../src/calendar/gui/e-cal-ops.c:1027
 #, c-format
 msgid "Purging memos in the memo list “%s”"
 msgstr "Purging memos in the memo list “%s”"
 
-#: ../src/calendar/gui/e-cal-ops.c:1016
+#: ../src/calendar/gui/e-cal-ops.c:1031
 #, c-format
 msgid "Purging tasks in the task list “%s”"
 msgstr "Purging tasks in the task list “%s”"
 
-#: ../src/calendar/gui/e-cal-ops.c:1111
+#: ../src/calendar/gui/e-cal-ops.c:1126
 msgid "Purging events"
 msgstr "Purging events"
 
-#: ../src/calendar/gui/e-cal-ops.c:1115
+#: ../src/calendar/gui/e-cal-ops.c:1130
 msgid "Purging memos"
 msgstr "Purging memos"
 
-#: ../src/calendar/gui/e-cal-ops.c:1119
+#: ../src/calendar/gui/e-cal-ops.c:1134
 msgid "Purging tasks"
 msgstr "Purging tasks"
 
-#: ../src/calendar/gui/e-cal-ops.c:1221
+#: ../src/calendar/gui/e-cal-ops.c:1236
 msgid "Expunging completed tasks"
 msgstr "Expunging completed tasks"
 
-#: ../src/calendar/gui/e-cal-ops.c:2069
+#: ../src/calendar/gui/e-cal-ops.c:2084
 #, c-format
 msgid "Moving an event"
 msgid_plural "Moving %d events"
 msgstr[0] "Moving an event"
 msgstr[1] "Moving %d events"
 
-#: ../src/calendar/gui/e-cal-ops.c:2070
+#: ../src/calendar/gui/e-cal-ops.c:2085
 #, c-format
 msgid "Copying an event"
 msgid_plural "Copying %d events"
 msgstr[0] "Copying an event"
 msgstr[1] "Copying %d events"
 
-#: ../src/calendar/gui/e-cal-ops.c:2076
+#: ../src/calendar/gui/e-cal-ops.c:2091
 #, c-format
 msgid "Moving a memo"
 msgid_plural "Moving %d memos"
 msgstr[0] "Moving a memo"
 msgstr[1] "Moving %d memos"
 
-#: ../src/calendar/gui/e-cal-ops.c:2077
+#: ../src/calendar/gui/e-cal-ops.c:2092
 #, c-format
 msgid "Copying a memo"
 msgid_plural "Copying %d memos"
 msgstr[0] "Copying a memo"
 msgstr[1] "Copying %d memos"
 
-#: ../src/calendar/gui/e-cal-ops.c:2083
+#: ../src/calendar/gui/e-cal-ops.c:2098
 #, c-format
 msgid "Moving a task"
 msgid_plural "Moving %d tasks"
 msgstr[0] "Moving a task"
 msgstr[1] "Moving %d tasks"
 
-#: ../src/calendar/gui/e-cal-ops.c:2084
+#: ../src/calendar/gui/e-cal-ops.c:2099
 #, c-format
 msgid "Copying a task"
 msgid_plural "Copying %d tasks"
@@ -7515,12 +7557,14 @@ msgstr "Start time is not a valid time"
 #: ../src/calendar/gui/e-comp-editor-event.c:528
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:206
 #: ../src/calendar/gui/e-comp-editor.c:338
+#: ../src/composer/e-composer-actions.c:180
 #: ../src/em-format/e-mail-part-secure-button.c:97
-#: ../src/e-util/e-misc-utils.c:4262 ../src/e-util/e-misc-utils.c:4274
-#: ../src/e-util/e-misc-utils.c:4288 ../src/mail/e-mail-autoconfig.c:1041
-#: ../src/mail/e-mail-display.c:2359 ../src/mail/e-mail-reader-utils.c:805
-#: ../src/mail/em-composer-utils.c:3838 ../src/mail/em-composer-utils.c:3869
-#: ../src/mail/mail-send-recv.c:598 ../src/mail/mail-send-recv.c:1493
+#: ../src/e-util/e-misc-utils.c:3992 ../src/e-util/e-misc-utils.c:4004
+#: ../src/e-util/e-misc-utils.c:4018 ../src/mail/e-mail-autoconfig.c:1041
+#: ../src/mail/e-mail-display.c:2444 ../src/mail/e-mail-notes.c:875
+#: ../src/mail/e-mail-reader-utils.c:805 ../src/mail/em-composer-utils.c:3843
+#: ../src/mail/em-composer-utils.c:3874 ../src/mail/mail-send-recv.c:598
+#: ../src/mail/mail-send-recv.c:1493
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:172
 #: ../src/plugins/face/face.c:175 ../src/shell/e-shell.c:1235
 #: ../src/shell/e-shell.c:1260 ../src/smime/gui/certificate-manager.c:357
@@ -7536,155 +7580,161 @@ msgstr "End date is not a valid date"
 msgid "End time is not a valid time"
 msgstr "End time is not a valid time"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:726
-#: ../src/calendar/gui/e-comp-editor-memo.c:134
+#: ../src/calendar/gui/e-comp-editor-event.c:719
+#: ../src/calendar/gui/e-comp-editor-memo.c:256
 #: ../src/calendar/gui/e-comp-editor-task.c:704
 msgid "_Categories"
 msgstr "_Categories"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:728
-#: ../src/calendar/gui/e-comp-editor-memo.c:136
+#: ../src/calendar/gui/e-comp-editor-event.c:721
+#: ../src/calendar/gui/e-comp-editor-memo.c:258
 #: ../src/calendar/gui/e-comp-editor-task.c:706
 msgid "Toggles whether to display categories"
 msgstr "Toggles whether to display categories"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:734
+#: ../src/calendar/gui/e-comp-editor-event.c:727
 #: ../src/calendar/gui/e-comp-editor-task.c:712
 msgid "Time _Zone"
 msgstr "Time _Zone"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:736
+#: ../src/calendar/gui/e-comp-editor-event.c:729
 #: ../src/calendar/gui/e-comp-editor-task.c:714
 msgid "Toggles whether the time zone is displayed"
 msgstr "Toggles whether the time zone is displayed"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:742
+#: ../src/calendar/gui/e-comp-editor-event.c:735
 msgid "All _Day Event"
 msgstr "All _Day Event"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:744
+#: ../src/calendar/gui/e-comp-editor-event.c:737
 msgid "Toggles whether to have All Day Event"
 msgstr "Toggles whether to have All Day Event"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:750
+#: ../src/calendar/gui/e-comp-editor-event.c:743
 msgid "Show Time as _Busy"
 msgstr "Show Time as _Busy"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:752
+#: ../src/calendar/gui/e-comp-editor-event.c:745
 msgid "Toggles whether to show time as busy"
 msgstr "Toggles whether to show time as busy"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:761
+#: ../src/calendar/gui/e-comp-editor-event.c:754
 msgid "Pu_blic"
 msgstr "Pu_blic"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:763
+#: ../src/calendar/gui/e-comp-editor-event.c:756
 msgid "Classify as public"
 msgstr "Classify as public"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:768
+#: ../src/calendar/gui/e-comp-editor-event.c:761
 msgid "_Private"
 msgstr "_Private"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:770
+#: ../src/calendar/gui/e-comp-editor-event.c:763
 msgid "Classify as private"
 msgstr "Classify as private"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:775
+#: ../src/calendar/gui/e-comp-editor-event.c:768
 msgid "_Confidential"
 msgstr "_Confidential"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:777
+#: ../src/calendar/gui/e-comp-editor-event.c:770
 msgid "Classify as confidential"
 msgstr "Classify as confidential"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:895
+#: ../src/calendar/gui/e-comp-editor-event.c:888
 msgctxt "ECompEditor"
 msgid "_Start time:"
 msgstr "_Start time:"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:900
+#: ../src/calendar/gui/e-comp-editor-event.c:893
 msgctxt "ECompEditor"
 msgid "_End time:"
 msgstr "_End time:"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:910
+#: ../src/calendar/gui/e-comp-editor-event.c:903
 msgctxt "ECompEditor"
 msgid "All da_y event"
 msgstr "All da_y event"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:978
-#: ../src/calendar/gui/e-comp-editor-memo.c:232
+#: ../src/calendar/gui/e-comp-editor-event.c:971
+#: ../src/calendar/gui/e-comp-editor-memo.c:357
 #: ../src/calendar/gui/e-comp-editor-task.c:882
 msgctxt "ECompEditorPage"
 msgid "General"
 msgstr "General"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:981
+#: ../src/calendar/gui/e-comp-editor-event.c:974
 #: ../src/calendar/gui/e-comp-editor-task.c:905
 msgctxt "ECompEditorPage"
 msgid "Reminders"
 msgstr "Reminders"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:984
+#: ../src/calendar/gui/e-comp-editor-event.c:977
 #: ../src/calendar/gui/e-comp-editor-task.c:909
 msgctxt "ECompEditorPage"
 msgid "Recurrence"
 msgstr "Recurrence"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:987
-#: ../src/calendar/gui/e-comp-editor-memo.c:235
+#: ../src/calendar/gui/e-comp-editor-event.c:980
+#: ../src/calendar/gui/e-comp-editor-memo.c:360
 #: ../src/calendar/gui/e-comp-editor-task.c:913
 msgctxt "ECompEditorPage"
 msgid "Attachments"
 msgstr "Attachments"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:997
+#: ../src/calendar/gui/e-comp-editor-event.c:990
 msgctxt "ECompEditorPage"
 msgid "Schedule"
 msgstr "Schedule"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:1032
+#: ../src/calendar/gui/e-comp-editor-event.c:1025
 #, c-format
 msgid "Meeting — %s"
 msgstr "Meeting — %s"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:1033
+#: ../src/calendar/gui/e-comp-editor-event.c:1026
 #, c-format
 msgid "Appointment — %s"
 msgstr "Appointment — %s"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:96
+#: ../src/calendar/gui/e-comp-editor-memo.c:59
+#: ../src/calendar/gui/e-comp-editor-memo.c:88
+#| msgid "New Window"
+msgid "New note"
+msgstr "New note"
+
+#: ../src/calendar/gui/e-comp-editor-memo.c:218
 msgid ""
 "Memo cannot be edited, because the selected memo list could not be opened"
 msgstr ""
 "Memo cannot be edited, because the selected memo list could not be opened"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:98
+#: ../src/calendar/gui/e-comp-editor-memo.c:220
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "Memo cannot be edited, because the selected memo list is read only"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:100
+#: ../src/calendar/gui/e-comp-editor-memo.c:222
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "Memo cannot be fully edited, because you are not the organiser"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:196
+#: ../src/calendar/gui/e-comp-editor-memo.c:318
 #: ../src/calendar/gui/e-comp-editor-task.c:813
 msgid "_List:"
 msgstr "_List:"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:203
+#: ../src/calendar/gui/e-comp-editor-memo.c:325
 #: ../src/calendar/gui/e-comp-editor-task.c:823
 msgctxt "ECompEditor"
 msgid "Sta_rt date:"
 msgstr "Sta_rt date:"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:266
+#: ../src/calendar/gui/e-comp-editor-memo.c:392
 #, c-format
 msgid "Assigned Memo — %s"
 msgstr "Assigned Memo — %s"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:267
+#: ../src/calendar/gui/e-comp-editor-memo.c:393
 #, c-format
 msgid "Memo — %s"
 msgstr "Memo — %s"
@@ -7732,12 +7782,12 @@ msgstr ""
 "Attachment “%s” doesn’t have valid URI, remove it from the list, please"
 
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:633
-#: ../src/composer/e-composer-actions.c:312
+#: ../src/composer/e-composer-actions.c:326
 msgid "_Attachment…"
 msgstr "_Attachment…"
 
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:635
-#: ../src/composer/e-composer-actions.c:314
+#: ../src/composer/e-composer-actions.c:328
 #: ../src/e-util/e-attachment-view.c:343
 msgid "Attach a file"
 msgstr "Attach a file"
@@ -7750,12 +7800,12 @@ msgstr "_Attachments"
 msgid "Show attachments"
 msgstr "Show attachments"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:797
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:812
 #: ../src/e-util/e-attachment-bar.c:764 ../src/e-util/e-attachment-paned.c:725
 msgid "Icon View"
 msgstr "Icon View"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:799
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:814
 #: ../src/e-util/e-attachment-bar.c:766 ../src/e-util/e-attachment-paned.c:727
 msgid "List View"
 msgstr "List View"
@@ -7861,12 +7911,12 @@ msgid "Atte_ndees…"
 msgstr "Atte_ndees…"
 
 #: ../src/calendar/gui/e-comp-editor-page-general.c:1533
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2285
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2321
 #: ../src/calendar/gui/e-comp-editor.c:2113
 #: ../src/e-util/e-accounts-window.c:1745
-#: ../src/e-util/e-html-editor-actions.c:1013
+#: ../src/e-util/e-html-editor-actions.c:1116
 #: ../src/e-util/e-mail-signature-manager.c:358
-#: ../src/e-util/e-webdav-browser.c:2690 ../src/e-util/filter.ui.h:26
+#: ../src/e-util/e-webdav-browser.c:2671 ../src/e-util/filter.ui.h:26
 #: ../src/mail/e-mail-account-manager.c:730 ../src/mail/e-mail-browser.c:217
 #: ../src/mail/e-mail-label-manager.c:380
 #: ../src/mail/em-folder-properties.c:1333 ../src/mail/mail-config.ui.h:68
@@ -7874,7 +7924,7 @@ msgstr "Atte_ndees…"
 #: ../src/plugins/email-custom-header/email-custom-header.c:844
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:34
 #: ../src/plugins/templates/templates.c:469
-#: ../src/shell/e-shell-window-actions.c:1039 ../src/smime/gui/smime-ui.ui.h:11
+#: ../src/shell/e-shell-window-actions.c:1052 ../src/smime/gui/smime-ui.ui.h:11
 msgid "_Edit"
 msgstr "_Edit"
 
@@ -8032,122 +8082,122 @@ msgctxt "ECompEditorPageRecur"
 msgid "on the"
 msgstr "on the"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1011
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1091
 msgctxt "ECompEditorPageRecur"
 msgid "occurrences"
 msgstr "occurrences"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1520
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2077
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1556
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2113
 msgctxt "ECompEditorPageRecur"
 msgid "This appointment rec_urs"
 msgstr "This appointment rec_urs"
 
 #. Translators: Entire string is for example:     'This task recurs/Every[x][day(s)][for][1]occurrences' 
(combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1525
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1561
 msgctxt "ECompEditorPageRecur"
 msgid "This task rec_urs"
 msgstr "This task rec_urs"
 
 #. Translators: Entire string is for example:     'This memo recurs/Every[x][day(s)][for][1]occurrences' 
(combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1530
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1566
 msgctxt "ECompEditorPageRecur"
 msgid "This memo rec_urs"
 msgstr "This memo rec_urs"
 
 #. Translators: Entire string is for example:     'This component 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1535
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1571
 msgctxt "ECompEditorPageRecur"
 msgid "This component rec_urs"
 msgstr "This component rec_urs"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1906
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1942
 msgid "Recurrence exception date is invalid"
 msgstr "Recurrence exception date is invalid"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1962
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1998
 msgid "End time of the recurrence is before the start"
 msgstr "End time of the recurrence is before the start"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2005
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2041
 msgid "R_ecurrence"
 msgstr "R_ecurrence"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2007
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2043
 msgid "Set or unset recurrence"
 msgstr "Set or unset recurrence"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2109
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2145
 msgctxt "ECompEditorPageRecur"
 msgid "Every"
 msgstr "Every"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2144
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2180
 msgctxt "ECompEditorPageRecur"
 msgid "day(s)"
 msgstr "day(s)"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2146
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2182
 msgctxt "ECompEditorPageRecur"
 msgid "week(s)"
 msgstr "week(s)"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2148
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2184
 msgctxt "ECompEditorPageRecur"
 msgid "month(s)"
 msgstr "month(s)"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2150
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2186
 msgctxt "ECompEditorPageRecur"
 msgid "year(s)"
 msgstr "year(s)"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2179
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2215
 msgctxt "ECompEditorPageRecur"
 msgid "for"
 msgstr "for"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2181
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2217
 msgctxt "ECompEditorPageRecur"
 msgid "until"
 msgstr "until"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2183
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2219
 msgctxt "ECompEditorPageRecur"
 msgid "forever"
 msgstr "forever"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2199
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2235
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "This appointment contains recurrences that Evolution cannot edit."
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2212
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2248
 msgid "Exceptions"
 msgstr "Exceptions"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2277
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2142
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2313
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2168
 #: ../src/mail/e-mail-config-identity-page.c:854
 #: ../src/mail/mail-config.ui.h:67
 msgid "A_dd"
 msgstr "A_dd"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2293
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2150
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2329
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2176
 #: ../src/mail/mail-config.ui.h:69
 msgid "Re_move"
 msgstr "Re_move"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2301
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2337
 msgid "Preview"
 msgstr "Preview"
 
@@ -8155,16 +8205,16 @@ msgstr "Preview"
 msgid "Send To"
 msgstr "Send To"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1566
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1592
 msgid "_Reminders"
 msgstr "_Reminders"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1568
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1594
 msgid "Set or unset reminders"
 msgstr "Set or unset reminders"
 
 #. Translators: "None" for "No reminder set"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1680
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1706
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "None"
@@ -8172,275 +8222,284 @@ msgstr "None"
 #. Translators: This constructs predefined reminder's description, for example "15 minutes before",
 #. "1 hour before", "1 day before", but, if user has set, also more complicated strings like
 #. "2 days 13 hours 1 minute before".
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1690
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1716
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s before"
 msgstr "%s before"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1695
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1721
 msgctxt "cal-reminders"
 msgid "at the start"
 msgstr "at the start"
 
 #. Translators: "Custom" for "Custom reminder set"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1703
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1729
 msgctxt "cal-reminders"
 msgid "Custom"
 msgstr "Custom"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1849
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1875
 msgid "Set a custom predefined time to"
 msgstr "Set a custom predefined time to"
 
 #. Translators: this is part of: "Set a custom predefined time to [nnn] days [nnn] hours [nnn] minutes", 
where the text in "[]" means a separate widget
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1862
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1888
 msgctxt "cal-reminders"
 msgid "da_ys"
 msgstr "da_ys"
 
 #. Translators: this is part of: "Set a custom predefined time to [nnn] days [nnn] hours [nnn] minutes", 
where the text in "[]" means a separate widget
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1878
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1904
 msgctxt "cal-reminders"
 msgid "_hours"
 msgstr "_hours"
 
 #. Translators: this is part of: "Set a custom predefined time to [nnn] days [nnn] hours [nnn] minutes", 
where the text in "[]" means a separate widget
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1894
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1920
 msgctxt "cal-reminders"
 msgid "_minutes"
 msgstr "_minutes"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1900
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1926
 msgid "_Add time"
 msgstr "_Add time"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1980
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2006
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:73
 msgid "Reminders"
 msgstr "Reminders"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2005
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2031
 msgid "_Reminder"
 msgstr "_Reminder"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2030
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2056
 msgid "Add custom predefined time"
 msgstr "Add custom predefined time"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2038
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2064
 msgid "Remove custom predefined times"
 msgstr "Remove custom predefined times"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2223
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2249
 msgctxt "cal-reminders"
 msgid "minute(s)"
 msgstr "minute(s)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ hour(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2225
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2251
 msgctxt "cal-reminders"
 msgid "hour(s)"
 msgstr "hour(s)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ day(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2227
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2253
 msgctxt "cal-reminders"
 msgid "day(s)"
 msgstr "day(s)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2244
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2270
 msgctxt "cal-reminders"
 msgid "before"
 msgstr "before"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ after ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2246
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2272
 msgctxt "cal-reminders"
 msgid "after"
 msgstr "after"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2262
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2288
 msgctxt "cal-reminders"
 msgid "start"
 msgstr "start"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ end ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2264
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2290
 msgctxt "cal-reminders"
 msgid "end"
 msgstr "end"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2283
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2309
 msgid "Re_peat the reminder"
 msgstr "Re_peat the reminder"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2308
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2334
 msgctxt "cal-reminders"
 msgid "extra times every"
 msgstr "extra times every"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2345
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2371
 msgctxt "cal-reminders"
 msgid "minutes"
 msgstr "minutes"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ hours ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2347
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2373
 msgctxt "cal-reminders"
 msgid "hours"
 msgstr "hours"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ days ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2349
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2375
 msgctxt "cal-reminders"
 msgid "days"
 msgstr "days"
 
 #. page_reminders->priv->custom_email_entry is initialized on demand
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2386
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2543
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2412
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2569
 msgctxt "cal-reminders"
 msgid "Custom _message"
 msgstr "Custom _message"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2430
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2456
 msgctxt "cal-reminders"
 msgid "Custom reminder _sound"
 msgstr "Custom reminder _sound"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2441
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2467
 msgid "Select a sound file"
 msgstr "Select a sound file"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2469
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2495
 msgid "_Program:"
 msgstr "_Program:"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2494
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2520
 msgid "_Arguments:"
 msgstr "_Arguments:"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2526
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2552
 msgid "_Send To:"
 msgstr "_Send To:"
 
-#: ../src/calendar/gui/e-comp-editor-page-schedule.c:471
+#: ../src/calendar/gui/e-comp-editor-page-schedule.c:484
 msgid "_Schedule"
 msgstr "_Schedule"
 
-#: ../src/calendar/gui/e-comp-editor-page-schedule.c:473
+#: ../src/calendar/gui/e-comp-editor-page-schedule.c:486
 msgid "Query free / busy information for the attendees"
 msgstr "Query free / busy information for the attendees"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:91
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:92
 msgctxt "ECompEditor"
 msgid "_Summary:"
 msgstr "_Summary:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:340
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:341
 msgctxt "ECompEditor"
 msgid "_Location:"
 msgstr "_Location:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:473
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:474
 msgctxt "ECompEditor"
 msgid "_Categories…"
 msgstr "_Categories…"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:572
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:573
+#| msgid "Edit as Ne_w…"
+msgid "Edit as text"
+msgstr "Edit as text"
+
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:573
+msgid "View as HTML"
+msgstr "View as HTML"
+
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:656
 msgctxt "ECompEditor"
 msgid "_Description:"
 msgstr "_Description:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:704
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:892
 msgctxt "ECompEditor"
 msgid "_Web page:"
 msgstr "_Web page:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1075
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1263
 msgctxt "ECompEditor"
 msgid "D_ue date:"
 msgstr "D_ue date:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1169
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1357
 msgctxt "ECompEditor"
 msgid "Date _completed:"
 msgstr "Date _completed:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1185
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1373
 msgctxt "ECompEditor"
 msgid "Public"
 msgstr "Public"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1186
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1374
 msgctxt "ECompEditor"
 msgid "Private"
 msgstr "Private"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1187
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1375
 msgctxt "ECompEditor"
 msgid "Confidential"
 msgstr "Confidential"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1203
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1391
 msgctxt "ECompEditor"
 msgid "C_lassification:"
 msgstr "C_lassification:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1266
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1454
 msgctxt "ECompEditor"
 msgid "_Status:"
 msgstr "_Status:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1296
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1484
 msgctxt "ECompEditor"
 msgid "Undefined"
 msgstr "Undefined"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1297
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1485
 msgctxt "ECompEditor"
 msgid "High"
 msgstr "High"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1298
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1486
 msgctxt "ECompEditor"
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1299
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1487
 msgctxt "ECompEditor"
 msgid "Low"
 msgstr "Low"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1308
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1496
 msgctxt "ECompEditor"
 msgid "Priorit_y:"
 msgstr "Priorit_y:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1362
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1550
 msgctxt "ECompEditor"
 msgid "Percent complete:"
 msgstr "Percent complete:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1443
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1631
 msgctxt "ECompEditor"
 msgid "Time _zone:"
 msgstr "Time _zone:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1539
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1727
 msgctxt "ECompEditor"
 msgid "Show time as _busy"
 msgstr "Show time as _busy"
 
 #. Translators: This 'None' is meant for 'Color' in calendar component editor, like 'None color'
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1960
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:2148
 msgctxt "ECompEditor"
 msgid "None"
 msgstr "None"
@@ -8511,7 +8570,7 @@ msgid "Sending notifications to attendees…"
 msgstr "Sending notifications to attendees…"
 
 #: ../src/calendar/gui/e-comp-editor.c:985
-#: ../src/e-util/e-webdav-browser.c:1818
+#: ../src/e-util/e-webdav-browser.c:1799
 msgid "Saving changes…"
 msgstr "Saving changes…"
 
@@ -8521,21 +8580,21 @@ msgstr "No Summary"
 
 #. == Button box ==
 #: ../src/calendar/gui/e-comp-editor.c:2027
-#: ../src/composer/e-composer-actions.c:319
+#: ../src/composer/e-composer-actions.c:333
 #: ../src/e-util/e-accounts-window.c:1778
 #: ../src/e-util/e-html-editor-dialog.c:194
-#: ../src/e-util/e-mail-signature-editor.c:309
+#: ../src/e-util/e-mail-signature-editor.c:319
 #: ../src/e-util/e-name-selector-dialog.c:548
 #: ../src/e-util/e-preferences-window.c:399
 #: ../src/e-util/e-table-field-chooser-dialog.c:205
 #: ../src/mail/e-mail-browser.c:166
 #: ../src/mail/e-mail-folder-sort-order-dialog.c:758
-#: ../src/mail/e-mail-notes.c:964 ../src/mail/em-filter-editor.c:45
+#: ../src/mail/e-mail-notes.c:1015 ../src/mail/em-filter-editor.c:45
 #: ../src/mail/em-folder-properties.c:1458
 #: ../src/mail/em-subscription-editor.c:1741
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:306
-#: ../src/shell/e-shell-window-actions.c:348
-#: ../src/shell/e-shell-window-actions.c:876
+#: ../src/shell/e-shell-window-actions.c:354
+#: ../src/shell/e-shell-window-actions.c:882
 #: ../src/smime/gui/certificate-manager.c:2196
 msgid "_Close"
 msgstr "_Close"
@@ -8546,37 +8605,37 @@ msgstr "Close the current window"
 
 #. copy menu item
 #: ../src/calendar/gui/e-comp-editor.c:2034 ../src/e-util/e-focus-tracker.c:806
-#: ../src/e-util/e-html-editor-actions.c:969 ../src/e-util/e-text.c:2080
-#: ../src/e-util/e-web-view.c:469 ../src/mail/e-mail-browser.c:173
-#: ../src/mail/mail.error.xml.h:147 ../src/shell/e-shell-window-actions.c:897
+#: ../src/e-util/e-html-editor-actions.c:1072 ../src/e-util/e-text.c:2080
+#: ../src/e-util/e-web-view.c:468 ../src/mail/e-mail-browser.c:173
+#: ../src/mail/mail.error.xml.h:147 ../src/shell/e-shell-window-actions.c:903
 msgid "_Copy"
 msgstr "_Copy"
 
 #: ../src/calendar/gui/e-comp-editor.c:2036 ../src/e-util/e-focus-tracker.c:203
 #: ../src/e-util/e-focus-tracker.c:259 ../src/e-util/e-focus-tracker.c:312
-#: ../src/e-util/e-focus-tracker.c:807 ../src/e-util/e-web-view.c:471
-#: ../src/e-util/e-web-view.c:2044 ../src/mail/e-mail-browser.c:175
-#: ../src/shell/e-shell-window-actions.c:899
+#: ../src/e-util/e-focus-tracker.c:807 ../src/e-util/e-web-view.c:470
+#: ../src/e-util/e-web-view.c:1994 ../src/mail/e-mail-browser.c:175
+#: ../src/shell/e-shell-window-actions.c:905
 msgid "Copy the selection"
 msgstr "Copy the selection"
 
 #. cut menu item
 #: ../src/calendar/gui/e-comp-editor.c:2041 ../src/e-util/e-focus-tracker.c:801
-#: ../src/e-util/e-html-editor-actions.c:976 ../src/e-util/e-text.c:2066
-#: ../src/mail/e-mail-browser.c:180 ../src/shell/e-shell-window-actions.c:904
+#: ../src/e-util/e-html-editor-actions.c:1079 ../src/e-util/e-text.c:2066
+#: ../src/mail/e-mail-browser.c:180 ../src/shell/e-shell-window-actions.c:910
 msgid "Cu_t"
 msgstr "Cu_t"
 
 #: ../src/calendar/gui/e-comp-editor.c:2043 ../src/e-util/e-focus-tracker.c:196
 #: ../src/e-util/e-focus-tracker.c:252 ../src/e-util/e-focus-tracker.c:306
-#: ../src/e-util/e-focus-tracker.c:802 ../src/e-util/e-web-view.c:2053
-#: ../src/mail/e-mail-browser.c:182 ../src/shell/e-shell-window-actions.c:906
+#: ../src/e-util/e-focus-tracker.c:802 ../src/e-util/e-web-view.c:2003
+#: ../src/mail/e-mail-browser.c:182 ../src/shell/e-shell-window-actions.c:912
 msgid "Cut the selection"
 msgstr "Cut the selection"
 
 #: ../src/calendar/gui/e-comp-editor.c:2050 ../src/e-util/e-focus-tracker.c:217
 #: ../src/e-util/e-focus-tracker.c:273 ../src/e-util/e-focus-tracker.c:817
-#: ../src/shell/e-shell-window-actions.c:913
+#: ../src/shell/e-shell-window-actions.c:919
 msgid "Delete the selection"
 msgstr "Delete the selection"
 
@@ -8586,20 +8645,20 @@ msgstr "View help"
 
 #. paste menu item
 #: ../src/calendar/gui/e-comp-editor.c:2062 ../src/e-util/e-focus-tracker.c:811
-#: ../src/e-util/e-html-editor-actions.c:983 ../src/e-util/e-text.c:2092
-#: ../src/mail/e-mail-browser.c:187 ../src/shell/e-shell-window-actions.c:932
+#: ../src/e-util/e-html-editor-actions.c:1086 ../src/e-util/e-text.c:2092
+#: ../src/mail/e-mail-browser.c:187 ../src/shell/e-shell-window-actions.c:938
 msgid "_Paste"
 msgstr "_Paste"
 
 #: ../src/calendar/gui/e-comp-editor.c:2064 ../src/e-util/e-focus-tracker.c:210
 #: ../src/e-util/e-focus-tracker.c:266 ../src/e-util/e-focus-tracker.c:318
-#: ../src/e-util/e-focus-tracker.c:812 ../src/e-util/e-web-view.c:2062
-#: ../src/mail/e-mail-browser.c:189 ../src/shell/e-shell-window-actions.c:934
+#: ../src/e-util/e-focus-tracker.c:812 ../src/e-util/e-web-view.c:2012
+#: ../src/mail/e-mail-browser.c:189 ../src/shell/e-shell-window-actions.c:940
 msgid "Paste the clipboard"
 msgstr "Paste the clipboard"
 
 #: ../src/calendar/gui/e-comp-editor.c:2069
-#: ../src/composer/e-composer-actions.c:373 ../src/mail/e-mail-reader.c:2749
+#: ../src/composer/e-composer-actions.c:387 ../src/mail/e-mail-reader.c:2749
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1319
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1333
 msgid "_Print…"
@@ -8609,19 +8668,19 @@ msgstr "_Print…"
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1326
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1723
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:838
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1046
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1053
 msgid "Pre_view…"
 msgstr "Pre_view…"
 
 #: ../src/calendar/gui/e-comp-editor.c:2083 ../src/e-util/e-focus-tracker.c:821
-#: ../src/e-util/e-html-editor-actions.c:997 ../src/e-util/e-web-view.c:486
-#: ../src/mail/e-mail-browser.c:194 ../src/shell/e-shell-window-actions.c:1002
+#: ../src/e-util/e-html-editor-actions.c:1100 ../src/e-util/e-web-view.c:485
+#: ../src/mail/e-mail-browser.c:194 ../src/shell/e-shell-window-actions.c:1015
 msgid "Select _All"
 msgstr "Select _All"
 
 #: ../src/calendar/gui/e-comp-editor.c:2085 ../src/e-util/e-focus-tracker.c:224
 #: ../src/e-util/e-focus-tracker.c:280 ../src/e-util/e-focus-tracker.c:822
-#: ../src/mail/e-mail-browser.c:196 ../src/shell/e-shell-window-actions.c:1004
+#: ../src/mail/e-mail-browser.c:196 ../src/shell/e-shell-window-actions.c:1017
 msgid "Select all text"
 msgstr "Select all text"
 
@@ -8630,25 +8689,25 @@ msgid "_Classification"
 msgstr "_Classification"
 
 #: ../src/calendar/gui/e-comp-editor.c:2120
-#: ../src/e-util/e-html-editor-actions.c:1020
-#: ../src/e-util/e-mail-signature-editor.c:323 ../src/mail/e-mail-browser.c:210
-#: ../src/mail/e-mail-notes.c:978 ../src/shell/e-shell-window-actions.c:1046
+#: ../src/e-util/e-html-editor-actions.c:1123
+#: ../src/e-util/e-mail-signature-editor.c:333 ../src/mail/e-mail-browser.c:210
+#: ../src/mail/e-mail-notes.c:1029 ../src/shell/e-shell-window-actions.c:1059
 msgid "_File"
 msgstr "_File"
 
 #: ../src/calendar/gui/e-comp-editor.c:2134
-#: ../src/e-util/e-html-editor-actions.c:1041
+#: ../src/e-util/e-html-editor-actions.c:1144
 msgid "_Insert"
 msgstr "_Insert"
 
 #: ../src/calendar/gui/e-comp-editor.c:2141
-#: ../src/composer/e-composer-actions.c:363
+#: ../src/composer/e-composer-actions.c:377
 msgid "_Options"
 msgstr "_Options"
 
 #: ../src/calendar/gui/e-comp-editor.c:2148
-#: ../src/e-util/e-html-editor-actions.c:1062 ../src/mail/e-mail-browser.c:224
-#: ../src/shell/e-shell-window-actions.c:1089
+#: ../src/e-util/e-html-editor-actions.c:1165 ../src/mail/e-mail-browser.c:224
+#: ../src/shell/e-shell-window-actions.c:1102
 #: ../src/smime/gui/certificate-manager.c:1646 ../src/smime/gui/smime-ui.ui.h:3
 msgid "_View"
 msgstr "_View"
@@ -8658,7 +8717,7 @@ msgid "Save current changes"
 msgstr "Save current changes"
 
 #: ../src/calendar/gui/e-comp-editor.c:2165
-#: ../src/e-util/e-mail-signature-editor.c:318 ../src/mail/e-mail-notes.c:973
+#: ../src/e-util/e-mail-signature-editor.c:328 ../src/mail/e-mail-notes.c:1024
 msgid "Save and Close"
 msgstr "Save and Close"
 
@@ -9090,14 +9149,14 @@ msgstr "Completed: %s"
 #: ../src/calendar/gui/e-to-do-pane.c:1576 ../src/e-util/e-cell-date-edit.c:328
 #: ../src/e-util/e-datetime-format.c:207
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1821
-#: ../src/modules/itip-formatter/itip-view.c:256
+#: ../src/modules/itip-formatter/itip-view.c:259
 msgid "Today"
 msgstr "Today"
 
 #. strftime format of a weekday and a date.
 #: ../src/calendar/gui/e-to-do-pane.c:1578
 #: ../src/e-util/e-datetime-format.c:218
-#: ../src/modules/itip-formatter/itip-view.c:284
+#: ../src/modules/itip-formatter/itip-view.c:287
 msgid "Tomorrow"
 msgstr "Tomorrow"
 
@@ -9150,7 +9209,7 @@ msgstr "To Do"
 #. Translators: the first '%s' is replaced with a component summary;
 #. the second '%s' is replaced with an event location.
 #. Example: "Meet John Doe (Central Park)"
-#: ../src/calendar/gui/e-week-view.c:3705
+#: ../src/calendar/gui/e-week-view.c:3703
 #, c-format
 msgctxt "SummaryWithLocation"
 msgid "%s (%s)"
@@ -11230,145 +11289,145 @@ msgstr "Pacific/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pacific/Yap"
 
-#: ../src/composer/e-composer-actions.c:226
+#: ../src/composer/e-composer-actions.c:240
 msgid "Save as…"
 msgstr "Save as…"
 
-#: ../src/composer/e-composer-actions.c:321
+#: ../src/composer/e-composer-actions.c:335
 msgid "Close the current file"
 msgstr "Close the current file"
 
-#: ../src/composer/e-composer-actions.c:326
+#: ../src/composer/e-composer-actions.c:340
 msgid "New _Message"
 msgstr "New _Message"
 
-#: ../src/composer/e-composer-actions.c:328
+#: ../src/composer/e-composer-actions.c:342
 msgid "Open New Message window"
 msgstr "Open New Message window"
 
-#: ../src/composer/e-composer-actions.c:333
-#: ../src/shell/e-shell-window-actions.c:946
+#: ../src/composer/e-composer-actions.c:347
+#: ../src/shell/e-shell-window-actions.c:952
 msgid "_Preferences"
 msgstr "_Preferences"
 
-#: ../src/composer/e-composer-actions.c:335
-#: ../src/shell/e-shell-window-actions.c:948
+#: ../src/composer/e-composer-actions.c:349
+#: ../src/shell/e-shell-window-actions.c:954
 msgid "Configure Evolution"
 msgstr "Configure Evolution"
 
-#: ../src/composer/e-composer-actions.c:342
+#: ../src/composer/e-composer-actions.c:356
 msgid "Save the current file"
 msgstr "Save the current file"
 
-#: ../src/composer/e-composer-actions.c:347
+#: ../src/composer/e-composer-actions.c:361
 msgid "Save _As…"
 msgstr "Save _As…"
 
-#: ../src/composer/e-composer-actions.c:349
+#: ../src/composer/e-composer-actions.c:363
 msgid "Save the current file with a different name"
 msgstr "Save the current file with a different name"
 
-#: ../src/composer/e-composer-actions.c:356
+#: ../src/composer/e-composer-actions.c:370
 msgid "Character _Encoding"
 msgstr "Character _Encoding"
 
-#: ../src/composer/e-composer-actions.c:380
+#: ../src/composer/e-composer-actions.c:394
 msgid "Print Pre_view"
 msgstr "Print Pre_view"
 
-#: ../src/composer/e-composer-actions.c:387
+#: ../src/composer/e-composer-actions.c:401
 msgid "Save as _Draft"
 msgstr "Save as _Draft"
 
-#: ../src/composer/e-composer-actions.c:389
+#: ../src/composer/e-composer-actions.c:403
 msgid "Save as draft"
 msgstr "Save as draft"
 
-#: ../src/composer/e-composer-actions.c:394
+#: ../src/composer/e-composer-actions.c:408
 msgid "S_end"
 msgstr "S_end"
 
-#: ../src/composer/e-composer-actions.c:396
+#: ../src/composer/e-composer-actions.c:410
 msgid "Send this message"
 msgstr "Send this message"
 
-#: ../src/composer/e-composer-actions.c:404
+#: ../src/composer/e-composer-actions.c:418
 msgid "PGP _Encrypt"
 msgstr "PGP _Encrypt"
 
-#: ../src/composer/e-composer-actions.c:406
+#: ../src/composer/e-composer-actions.c:420
 msgid "Encrypt this message with PGP"
 msgstr "Encrypt this message with PGP"
 
-#: ../src/composer/e-composer-actions.c:412
+#: ../src/composer/e-composer-actions.c:426
 msgid "PGP _Sign"
 msgstr "PGP _Sign"
 
-#: ../src/composer/e-composer-actions.c:414
+#: ../src/composer/e-composer-actions.c:428
 msgid "Sign this message with your PGP key"
 msgstr "Sign this message with your PGP key"
 
-#: ../src/composer/e-composer-actions.c:420
+#: ../src/composer/e-composer-actions.c:434
 msgid "_Picture Gallery"
 msgstr "_Picture Gallery"
 
-#: ../src/composer/e-composer-actions.c:422
+#: ../src/composer/e-composer-actions.c:436
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "Show a collection of pictures that you can drag to your message"
 
-#: ../src/composer/e-composer-actions.c:428
+#: ../src/composer/e-composer-actions.c:442
 msgid "_Prioritize Message"
 msgstr "_Prioritise Message"
 
-#: ../src/composer/e-composer-actions.c:430
+#: ../src/composer/e-composer-actions.c:444
 msgid "Set the message priority to high"
 msgstr "Set the message priority to high"
 
-#: ../src/composer/e-composer-actions.c:436
+#: ../src/composer/e-composer-actions.c:450
 msgid "Re_quest Read Receipt"
 msgstr "Re_quest Read Receipt"
 
-#: ../src/composer/e-composer-actions.c:438
+#: ../src/composer/e-composer-actions.c:452
 msgid "Get delivery notification when your message is read"
 msgstr "Get delivery notification when your message is read"
 
-#: ../src/composer/e-composer-actions.c:444
+#: ../src/composer/e-composer-actions.c:458
 msgid "S/MIME En_crypt"
 msgstr "S/MIME En_crypt"
 
-#: ../src/composer/e-composer-actions.c:446
+#: ../src/composer/e-composer-actions.c:460
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Encrypt this message with your S/MIME Encryption Certificate"
 
-#: ../src/composer/e-composer-actions.c:452
+#: ../src/composer/e-composer-actions.c:466
 msgid "S/MIME Sig_n"
 msgstr "S/MIME Sig_n"
 
-#: ../src/composer/e-composer-actions.c:454
+#: ../src/composer/e-composer-actions.c:468
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Sign this message with your S/MIME Signature Certificate"
 
-#: ../src/composer/e-composer-actions.c:508
+#: ../src/composer/e-composer-actions.c:522
 msgid "_Bcc Field"
 msgstr "_Bcc Field"
 
-#: ../src/composer/e-composer-actions.c:510
+#: ../src/composer/e-composer-actions.c:524
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Toggles whether the Bcc field is displayed"
 
-#: ../src/composer/e-composer-actions.c:516
+#: ../src/composer/e-composer-actions.c:530
 msgid "_Cc Field"
 msgstr "_Cc Field"
 
-#: ../src/composer/e-composer-actions.c:518
+#: ../src/composer/e-composer-actions.c:532
 msgid "Toggles whether the CC field is displayed"
 msgstr "Toggles whether the Cc field is displayed"
 
-#: ../src/composer/e-composer-actions.c:524
+#: ../src/composer/e-composer-actions.c:538
 msgid "_From Override Field"
 msgstr "_From Override Field"
 
-#: ../src/composer/e-composer-actions.c:526
+#: ../src/composer/e-composer-actions.c:540
 msgid ""
 "Toggles whether the From override field to change name or email address is "
 "displayed"
@@ -11376,30 +11435,30 @@ msgstr ""
 "Toggles whether the From override field to change name or e-mail address is "
 "displayed"
 
-#: ../src/composer/e-composer-actions.c:532
+#: ../src/composer/e-composer-actions.c:546
 msgid "_Reply-To Field"
 msgstr "_Reply-To Field"
 
-#: ../src/composer/e-composer-actions.c:534
+#: ../src/composer/e-composer-actions.c:548
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Toggles whether the Reply-To field is displayed"
 
-#: ../src/composer/e-composer-actions.c:540
+#: ../src/composer/e-composer-actions.c:554
 msgid "Visually _Wrap Long Lines"
 msgstr "Visually _Wrap Long Lines"
 
-#: ../src/composer/e-composer-actions.c:597
+#: ../src/composer/e-composer-actions.c:611
 msgid "Attach"
 msgstr "Attach"
 
-#: ../src/composer/e-composer-actions.c:603
+#: ../src/composer/e-composer-actions.c:617
 msgid "Save Draft"
 msgstr "Save Draft"
 
 #: ../src/composer/e-composer-from-header.c:108
-#: ../src/e-util/e-collection-account-wizard.c:2002
+#: ../src/e-util/e-collection-account-wizard.c:2033
 #: ../src/e-util/e-mail-signature-script-dialog.c:416
-#: ../src/e-util/e-webdav-browser.c:2417
+#: ../src/e-util/e-webdav-browser.c:2398
 #: ../src/e-util/gal-view-instance-save-as-dialog.ui.h:2
 #: ../src/mail/e-mail-config-identity-page.c:551
 #: ../src/mail/e-mail-config-summary-page.c:334
@@ -11464,14 +11523,14 @@ msgstr "Click here for the address book"
 msgid "Click here to select folders to post to"
 msgstr "Click here to select folders to post to"
 
-#: ../src/composer/e-msg-composer.c:1003
+#: ../src/composer/e-msg-composer.c:1036
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 
-#: ../src/composer/e-msg-composer.c:1012
+#: ../src/composer/e-msg-composer.c:1045
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -11480,18 +11539,23 @@ msgstr ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 
-#: ../src/composer/e-msg-composer.c:1802 ../src/composer/e-msg-composer.c:2476
+#: ../src/composer/e-msg-composer.c:1818 ../src/composer/e-msg-composer.c:2492
 msgid "Compose Message"
 msgstr "Compose Message"
 
-#: ../src/composer/e-msg-composer.c:4906
-#| msgid "Remove attachments"
+#: ../src/composer/e-msg-composer.c:4362
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:352
+#| msgid "Loading Remote Content"
+msgid "Reading text content…"
+msgstr "Reading text content…"
+
+#: ../src/composer/e-msg-composer.c:5172
 msgid "Review attachment before sending."
 msgid_plural "Review attachments before sending."
 msgstr[0] "Review attachment before sending."
 msgstr[1] "Review attachments before sending."
 
-#: ../src/composer/e-msg-composer.c:4911
+#: ../src/composer/e-msg-composer.c:5177
 #, c-format
 msgid ""
 "There had been added %d attachment. Make sure it does not contain any "
@@ -11506,7 +11570,7 @@ msgstr[1] ""
 "There had been added %d attachments. Make sure they do not contain any "
 "sensitive information before sending the message."
 
-#: ../src/composer/e-msg-composer.c:5044
+#: ../src/composer/e-msg-composer.c:5310
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "The composer contains a non-text message body, which cannot be edited."
 
@@ -11656,7 +11720,7 @@ msgid "_Save to Outbox"
 msgstr "_Save to Outbox"
 
 #: ../src/composer/mail-composer.error.xml.h:34
-#: ../src/e-util/e-collection-account-wizard.c:674
+#: ../src/e-util/e-collection-account-wizard.c:694
 msgid "_Try Again"
 msgstr "_Try Again"
 
@@ -11817,7 +11881,7 @@ msgstr "(no subject)"
 msgid "Remote content download had been blocked for this message."
 msgstr "Remote content download had been blocked for this message."
 
-#. Translators: This message suggests to the receipients
+#. Translators: This message suggests to the recipients
 #. * that the sender of the mail is different from the one
 #. * listed in From field.
 #: ../src/em-format/e-mail-formatter-headers.c:359
@@ -11842,7 +11906,7 @@ msgid "Format part as an RFC822 message"
 msgstr "Format part as an RFC822 message"
 
 #: ../src/em-format/e-mail-formatter-print.c:50
-#: ../src/e-util/e-webdav-browser.c:2361
+#: ../src/e-util/e-webdav-browser.c:2342
 #: ../src/e-util/gal-view-instance-save-as-dialog.c:92
 #: ../src/mail/e-mail-label-tree-view.c:96
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:64
@@ -11869,8 +11933,8 @@ msgstr "Subject"
 #: ../src/em-format/e-mail-formatter-quote-headers.c:200
 #: ../src/em-format/e-mail-formatter-utils.c:360
 #: ../src/modules/mail/em-mailer-prefs.c:686
-#: ../src/modules/mail/em-mailer-prefs.c:1619
-#: ../src/modules/mail/em-mailer-prefs.c:1668
+#: ../src/modules/mail/em-mailer-prefs.c:1620
+#: ../src/modules/mail/em-mailer-prefs.c:1669
 msgid "Mailer"
 msgstr "Mailer"
 
@@ -11896,7 +11960,6 @@ msgstr "Format part as HTML"
 
 #: ../src/em-format/e-mail-formatter-quote-text-plain.c:121
 #: ../src/em-format/e-mail-formatter-text-plain.c:196
-#: ../src/e-util/e-html-editor-actions.c:1412
 msgid "Plain Text"
 msgstr "Plain Text"
 
@@ -12238,7 +12301,7 @@ msgstr "evolution calendar item"
 
 #: ../src/e-util/e-accounts-window.c:557 ../src/e-util/e-accounts-window.c:674
 #: ../src/e-util/e-accounts-window.c:894
-#: ../src/modules/mail/e-mail-shell-backend.c:910
+#: ../src/modules/mail/e-mail-shell-backend.c:914
 msgid "Mail Accounts"
 msgstr "Mail Accounts"
 
@@ -12310,7 +12373,7 @@ msgstr "Evolution Accounts"
 #. widget = gtk_button_new_with_mnemonic (_("_Permissions"));
 #. gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 #. webdav_browser->priv->permissions_button = widget;
-#: ../src/e-util/e-accounts-window.c:1761 ../src/e-util/e-webdav-browser.c:2708
+#: ../src/e-util/e-accounts-window.c:1761 ../src/e-util/e-webdav-browser.c:2689
 #: ../src/mail/em-subscription-editor.c:1952
 #: ../src/modules/mail/e-mail-shell-view-actions.c:1600
 #: ../src/modules/mail/e-mail-shell-view-actions.c:1678
@@ -12367,7 +12430,7 @@ msgid "Cancel"
 msgstr "Cancel"
 
 #. Translators: Escape is a keyboard binding.
-#: ../src/e-util/e-alert-bar.c:125
+#: ../src/e-util/e-alert-bar.c:204
 msgid "Close this message (Escape)"
 msgstr "Close this message (Escape)"
 
@@ -12440,8 +12503,8 @@ msgstr "F_ilename:"
 
 #: ../src/e-util/e-attachment-dialog.c:354
 #: ../src/e-util/e-html-editor-image-dialog.c:513
-#: ../src/e-util/e-html-editor-link-dialog.c:229
-#: ../src/e-util/e-webdav-browser.c:2456
+#: ../src/e-util/e-html-editor-link-dialog.c:226
+#: ../src/e-util/e-webdav-browser.c:2437
 msgid "_Description:"
 msgstr "_Description:"
 
@@ -12577,11 +12640,6 @@ msgstr "Autocomplete with this address book"
 msgid "Copy book content locally for offline operation"
 msgstr "Copy book content locally for offline operation"
 
-#. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../src/e-util/e-buffer-tagger.c:410
-msgid "Ctrl-click to open a link"
-msgstr "Ctrl-click to open a link"
-
 #: ../src/e-util/e-calendar.c:310
 msgid "Previous month"
 msgstr "Previous month"
@@ -12899,73 +12957,88 @@ msgid_plural "Found %d candidates"
 msgstr[0] "Found one candidate"
 msgstr[1] "Found %d candidates"
 
-#: ../src/e-util/e-collection-account-wizard.c:656
+#: ../src/e-util/e-collection-account-wizard.c:663
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:29
+msgid "_Username:"
+msgstr "_Username:"
+
+#: ../src/e-util/e-collection-account-wizard.c:675
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:30
 #: ../src/smime/gui/certificate-manager.c:766
 msgid "_Password:"
 msgstr "_Password:"
 
-#: ../src/e-util/e-collection-account-wizard.c:668
+#: ../src/e-util/e-collection-account-wizard.c:688
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:31
 msgid "_Remember password"
 msgstr "_Remember password"
 
-#: ../src/e-util/e-collection-account-wizard.c:811
+#: ../src/e-util/e-collection-account-wizard.c:835
 #: ../src/e-util/e-webdav-browser.c:474
 msgid "Collection"
 msgstr "Collection"
 
-#: ../src/e-util/e-collection-account-wizard.c:812
+#: ../src/e-util/e-collection-account-wizard.c:836
 msgid "Mail Receive"
 msgstr "Mail Receive"
 
-#: ../src/e-util/e-collection-account-wizard.c:813
+#: ../src/e-util/e-collection-account-wizard.c:837
 msgid "Mail Send"
 msgstr "Mail Send"
 
-#: ../src/e-util/e-collection-account-wizard.c:814
+#: ../src/e-util/e-collection-account-wizard.c:838
 #: ../src/e-util/e-name-selector-dialog.c:445
 #: ../src/mail/importers/pine-importer.c:430
 msgid "Address Book"
 msgstr "Address Book"
 
-#: ../src/e-util/e-collection-account-wizard.c:816
+#: ../src/e-util/e-collection-account-wizard.c:840
 msgid "Memo List"
 msgstr "Memo List"
 
-#: ../src/e-util/e-collection-account-wizard.c:817
+#: ../src/e-util/e-collection-account-wizard.c:841
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:64
 msgid "Task List"
 msgstr "Task List"
 
-#: ../src/e-util/e-collection-account-wizard.c:1153
+#: ../src/e-util/e-collection-account-wizard.c:1177
 msgid "Looking up LDAP server’s search base…"
 msgstr "Looking up LDAP server’s search base…"
 
-#: ../src/e-util/e-collection-account-wizard.c:1460
+#: ../src/e-util/e-collection-account-wizard.c:1310
+#| msgid "Failed to create a thread: "
+msgid "Failed to store password: "
+msgstr "Failed to store password: "
+
+#: ../src/e-util/e-collection-account-wizard.c:1320
+#| msgid "Failed to create a thread: "
+msgid "Failed to create sources: "
+msgstr "Failed to create sources: "
+
+#: ../src/e-util/e-collection-account-wizard.c:1487
 msgid "Saving account settings, please wait…"
 msgstr "Saving account settings, please wait…"
 
-#: ../src/e-util/e-collection-account-wizard.c:1611
+#: ../src/e-util/e-collection-account-wizard.c:1639
 msgid "User details"
 msgstr "User details"
 
-#: ../src/e-util/e-collection-account-wizard.c:1624
+#: ../src/e-util/e-collection-account-wizard.c:1652
 msgid "_Email Address or User name:"
 msgstr "_E-mail Address or User name:"
 
-#: ../src/e-util/e-collection-account-wizard.c:1655
+#: ../src/e-util/e-collection-account-wizard.c:1683
 msgid "_Advanced Options"
 msgstr "_Advanced Options"
 
-#: ../src/e-util/e-collection-account-wizard.c:1660
+#: ../src/e-util/e-collection-account-wizard.c:1688
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:217
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:173
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:25
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../src/e-util/e-collection-account-wizard.c:1679
+#: ../src/e-util/e-collection-account-wizard.c:1707
 msgid ""
 "Semicolon (“;”) separated list of servers to look up information for, in "
 "addition to the domain of the e-mail address."
@@ -12973,11 +13046,11 @@ msgstr ""
 "Semicolon (“;”) separated list of servers to look up information for, in "
 "addition to the domain of the e-mail address."
 
-#: ../src/e-util/e-collection-account-wizard.c:1869
+#: ../src/e-util/e-collection-account-wizard.c:1900
 msgid "Select which parts should be configured:"
 msgstr "Select which parts should be configured:"
 
-#: ../src/e-util/e-collection-account-wizard.c:1993
+#: ../src/e-util/e-collection-account-wizard.c:2024
 #: ../src/mail/e-mail-config-identity-page.c:542
 #: ../src/mail/e-mail-config-summary-page.c:325
 msgid "Account Information"
@@ -12987,7 +13060,8 @@ msgstr "Account Information"
 msgid "Choose custom color"
 msgstr "Choose custom colour"
 
-#: ../src/e-util/e-color-combo.c:488 ../src/mail/e-mail-account-tree-view.c:135
+#: ../src/e-util/e-color-combo.c:488 ../src/e-util/e-html-editor.c:127
+#: ../src/mail/e-mail-account-tree-view.c:135
 #: ../src/mail/e-mail-config-security-page.c:544
 #: ../src/mail/e-mail-config-security-page.c:708
 #: ../src/mail/e-mail-reader.c:4870 ../src/mail/mail-config.ui.h:78
@@ -13189,7 +13263,7 @@ msgstr "_Today"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. * is not permitted.
-#: ../src/e-util/e-dateedit.c:730
+#: ../src/e-util/e-dateedit.c:730 ../src/mail/em-folder-selector.c:334
 msgid "_None"
 msgstr "_None"
 
@@ -13558,23 +13632,23 @@ msgstr "Select a time to compare against"
 msgid "Choose a File"
 msgstr "Choose a File"
 
-#: ../src/e-util/e-filter-rule.c:979
+#: ../src/e-util/e-filter-rule.c:1061
 msgid "R_ule name:"
 msgstr "R_ule name:"
 
-#: ../src/e-util/e-filter-rule.c:1035
+#: ../src/e-util/e-filter-rule.c:1117
 msgid "all the following conditions"
 msgstr "all the following conditions"
 
-#: ../src/e-util/e-filter-rule.c:1036
+#: ../src/e-util/e-filter-rule.c:1118
 msgid "any of the following conditions"
 msgstr "any of the following conditions"
 
-#: ../src/e-util/e-filter-rule.c:1042
+#: ../src/e-util/e-filter-rule.c:1124
 msgid "_Find items which match:"
 msgstr "_Find items which match:"
 
-#: ../src/e-util/e-filter-rule.c:1065
+#: ../src/e-util/e-filter-rule.c:1147
 msgid "Find items that meet the following conditions"
 msgstr "Find items that meet the following conditions"
 
@@ -13582,8 +13656,8 @@ msgstr "Find items that meet the following conditions"
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../src/e-util/e-filter-rule.c:1080
-#: ../src/e-util/e-html-editor-page-dialog.c:59
+#: ../src/e-util/e-filter-rule.c:1162
+#: ../src/e-util/e-html-editor-page-dialog.c:62
 #: ../src/e-util/e-mail-identity-combo-box.c:694
 #: ../src/e-util/e-mail-signature-combo-box.c:422
 #: ../src/libemail-engine/camel-null-store.c:29
@@ -13593,89 +13667,112 @@ msgstr "Find items that meet the following conditions"
 msgid "None"
 msgstr "None"
 
-#: ../src/e-util/e-filter-rule.c:1081
+#: ../src/e-util/e-filter-rule.c:1163
 msgid "All related"
 msgstr "All related"
 
-#: ../src/e-util/e-filter-rule.c:1082 ../src/e-util/e-send-options.ui.h:24
+#: ../src/e-util/e-filter-rule.c:1164 ../src/e-util/e-send-options.ui.h:24
 msgid "Replies"
 msgstr "Replies"
 
-#: ../src/e-util/e-filter-rule.c:1083
+#: ../src/e-util/e-filter-rule.c:1165
 msgid "Replies and parents"
 msgstr "Replies and parents"
 
-#: ../src/e-util/e-filter-rule.c:1084
+#: ../src/e-util/e-filter-rule.c:1166
 msgid "No reply or parent"
 msgstr "No reply or parent"
 
-#: ../src/e-util/e-filter-rule.c:1087
+#: ../src/e-util/e-filter-rule.c:1169
 msgid "I_nclude threads:"
 msgstr "I_nclude threads:"
 
-#: ../src/e-util/e-filter-rule.c:1165
+#: ../src/e-util/e-filter-rule.c:1247
 msgid "A_dd Condition"
 msgstr "A_dd Condition"
 
-#: ../src/e-util/e-filter-rule.c:1485 ../src/e-util/filter.ui.h:1
+#: ../src/e-util/e-filter-rule.c:1567 ../src/e-util/filter.ui.h:1
 #: ../src/mail/em-filter-rule.c:1042 ../src/mail/em-utils.c:166
 msgid "Incoming"
 msgstr "Incoming"
 
-#: ../src/e-util/e-filter-rule.c:1485 ../src/mail/em-filter-rule.c:1043
+#: ../src/e-util/e-filter-rule.c:1567 ../src/mail/em-filter-rule.c:1043
 #: ../src/mail/em-utils.c:167
 msgid "Outgoing"
 msgstr "Outgoing"
 
 #: ../src/e-util/e-gtkemojichooser.c:753
+#| msgid "Recent"
+msgctxt "EmojiChooser"
 msgid "Recent"
 msgstr "Recent"
 
 #: ../src/e-util/e-gtkemojichooser.c:757
+#| msgid "Smileys & People"
+msgctxt "EmojiChooser"
 msgid "Smileys & People"
 msgstr "Smileys & People"
 
 #: ../src/e-util/e-gtkemojichooser.c:758
+#| msgid "Body & Clothing"
+msgctxt "EmojiChooser"
 msgid "Body & Clothing"
 msgstr "Body & Clothing"
 
 #: ../src/e-util/e-gtkemojichooser.c:759
+#| msgid "Animals & Nature"
+msgctxt "EmojiChooser"
 msgid "Animals & Nature"
 msgstr "Animals & Nature"
 
 #: ../src/e-util/e-gtkemojichooser.c:760
+#| msgid "Food & Drink"
+msgctxt "EmojiChooser"
 msgid "Food & Drink"
 msgstr "Food & Drink"
 
 #: ../src/e-util/e-gtkemojichooser.c:761
+#| msgid "Travel & Places"
+msgctxt "EmojiChooser"
 msgid "Travel & Places"
 msgstr "Travel & Places"
 
 #: ../src/e-util/e-gtkemojichooser.c:762
+#| msgid "Activities"
+msgctxt "EmojiChooser"
 msgid "Activities"
 msgstr "Activities"
 
 #: ../src/e-util/e-gtkemojichooser.c:763
-msgctxt "emoji category"
+#| msgctxt "emoji category"
+#| msgid "Objects"
+msgctxt "EmojiChooser"
 msgid "Objects"
 msgstr "Objects"
 
 #: ../src/e-util/e-gtkemojichooser.c:764
+#| msgid "Symbols"
+msgctxt "EmojiChooser"
 msgid "Symbols"
 msgstr "Symbols"
 
 #: ../src/e-util/e-gtkemojichooser.c:765
-#: ../src/e-util/evolution-source-viewer.c:677
+#| msgid "Flags"
+msgctxt "EmojiChooser"
 msgid "Flags"
 msgstr "Flags"
 
 #: ../src/e-util/e-gtkemojichooser.c:789
+#| msgid "No Results Found"
+msgctxt "EmojiChooser"
 msgid "No Results Found"
 msgstr "No Results Found"
 
 #: ../src/e-util/e-gtkemojichooser.c:797
+#| msgid "Try a different search"
+msgctxt "EmojiChooser"
 msgid "Try a different search"
-msgstr "No Results Found"
+msgstr "Try a different search"
 
 #: ../src/e-util/e-html-editor-actions.c:81
 msgid "Failed to insert HTML file."
@@ -13713,499 +13810,546 @@ msgstr "Insert text file"
 msgid "Text file"
 msgstr "Text file"
 
-#: ../src/e-util/e-html-editor-actions.c:971
+#: ../src/e-util/e-html-editor-actions.c:1074
 msgid "Copy selected text to the clipboard"
 msgstr "Copy selected text to the clipboard"
 
-#: ../src/e-util/e-html-editor-actions.c:978
+#: ../src/e-util/e-html-editor-actions.c:1081
 msgid "Cut selected text to the clipboard"
 msgstr "Cut selected text to the clipboard"
 
-#. Widgets are treating Ctrl + v shortcut themselves
-#: ../src/e-util/e-html-editor-actions.c:985
+#: ../src/e-util/e-html-editor-actions.c:1088
 msgid "Paste text from the clipboard"
 msgstr "Paste text from the clipboard"
 
-#: ../src/e-util/e-html-editor-actions.c:992
+#: ../src/e-util/e-html-editor-actions.c:1095
 msgid "Redo the last undone action"
 msgstr "Redo the last undone action"
 
-#: ../src/e-util/e-html-editor-actions.c:1006
+#: ../src/e-util/e-html-editor-actions.c:1109
 msgid "Undo the last action"
 msgstr "Undo the last action"
 
-#: ../src/e-util/e-html-editor-actions.c:1027
+#: ../src/e-util/e-html-editor-actions.c:1130
 msgid "For_mat"
 msgstr "For_mat"
 
-#: ../src/e-util/e-html-editor-actions.c:1034
+#: ../src/e-util/e-html-editor-actions.c:1137
 msgid "_Paragraph Style"
 msgstr "_Paragraph Style"
 
-#: ../src/e-util/e-html-editor-actions.c:1048
+#: ../src/e-util/e-html-editor-actions.c:1151
 #: ../src/e-util/e-html-editor-image-dialog.c:590
 msgid "_Alignment"
 msgstr "_Alignment"
 
-#: ../src/e-util/e-html-editor-actions.c:1055
+#: ../src/e-util/e-html-editor-actions.c:1158
 msgid "Current _Languages"
 msgstr "Current _Languages"
 
-#: ../src/e-util/e-html-editor-actions.c:1072
+#: ../src/e-util/e-html-editor-actions.c:1175
 msgid "_Increase Indent"
 msgstr "_Increase Indent"
 
-#: ../src/e-util/e-html-editor-actions.c:1074
+#: ../src/e-util/e-html-editor-actions.c:1177
 msgid "Increase Indent"
 msgstr "Increase Indent"
 
-#: ../src/e-util/e-html-editor-actions.c:1079
-#: ../src/e-util/e-html-editor-actions.c:2087
+#: ../src/e-util/e-html-editor-actions.c:1182
+#: ../src/e-util/e-html-editor-actions.c:2212
 msgid "E_moji"
 msgstr "E_moji"
 
-#: ../src/e-util/e-html-editor-actions.c:1081
+#: ../src/e-util/e-html-editor-actions.c:1184
+#: ../src/e-util/e-html-editor-actions.c:1191
 msgid "Insert Emoji"
 msgstr "Insert Emoji"
 
-#: ../src/e-util/e-html-editor-actions.c:1086
+#: ../src/e-util/e-html-editor-actions.c:1189
+#| msgid "Insert Emoji"
+msgid "Insert E_moji"
+msgstr "Insert E_moji"
+
+#: ../src/e-util/e-html-editor-actions.c:1196
 msgid "_HTML File…"
 msgstr "_HTML File…"
 
-#: ../src/e-util/e-html-editor-actions.c:1093
+#: ../src/e-util/e-html-editor-actions.c:1203
 msgid "Te_xt File…"
 msgstr "Te_xt File…"
 
-#: ../src/e-util/e-html-editor-actions.c:1100
+#: ../src/e-util/e-html-editor-actions.c:1210
 msgid "Paste _Quotation"
 msgstr "Paste _Quotation"
 
-#: ../src/e-util/e-html-editor-actions.c:1107
+#: ../src/e-util/e-html-editor-actions.c:1217
 msgid "_Find…"
 msgstr "_Find…"
 
-#: ../src/e-util/e-html-editor-actions.c:1109
+#: ../src/e-util/e-html-editor-actions.c:1219
 msgid "Search for text"
 msgstr "Search for text"
 
-#: ../src/e-util/e-html-editor-actions.c:1114
+#: ../src/e-util/e-html-editor-actions.c:1224
 msgid "Find A_gain"
 msgstr "Find A_gain"
 
-#: ../src/e-util/e-html-editor-actions.c:1121
+#: ../src/e-util/e-html-editor-actions.c:1231
 msgid "Re_place…"
 msgstr "Re_place…"
 
-#: ../src/e-util/e-html-editor-actions.c:1123
+#: ../src/e-util/e-html-editor-actions.c:1233
 msgid "Search for and replace text"
 msgstr "Search for and replace text"
 
-#: ../src/e-util/e-html-editor-actions.c:1128
+#: ../src/e-util/e-html-editor-actions.c:1238
 msgid "Check _Spelling…"
 msgstr "Check _Spelling…"
 
-#: ../src/e-util/e-html-editor-actions.c:1135
+#: ../src/e-util/e-html-editor-actions.c:1245
 msgid "_Decrease Indent"
 msgstr "_Decrease Indent"
 
-#: ../src/e-util/e-html-editor-actions.c:1137
+#: ../src/e-util/e-html-editor-actions.c:1247
 msgid "Decrease Indent"
 msgstr "Decrease Indent"
 
-#: ../src/e-util/e-html-editor-actions.c:1142
+#: ../src/e-util/e-html-editor-actions.c:1252
 msgid "_Wrap Lines"
 msgstr "_Wrap Lines"
 
 #. Center
-#: ../src/e-util/e-html-editor-actions.c:1152
-#: ../src/e-util/e-html-editor-paragraph-dialog.c:108
+#: ../src/e-util/e-html-editor-actions.c:1262
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:109
 msgid "_Center"
 msgstr "_Centre"
 
-#: ../src/e-util/e-html-editor-actions.c:1154
+#: ../src/e-util/e-html-editor-actions.c:1264
 msgid "Center Alignment"
 msgstr "Centre Alignment"
 
+#. Justified
+#: ../src/e-util/e-html-editor-actions.c:1269
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:127
+#| msgid "Justification"
+msgid "_Justified"
+msgstr "_Justified"
+
+#: ../src/e-util/e-html-editor-actions.c:1271
+msgid "Align Justified"
+msgstr "Align Justified"
+
 #. Left
-#: ../src/e-util/e-html-editor-actions.c:1159
-#: ../src/e-util/e-html-editor-paragraph-dialog.c:99
+#: ../src/e-util/e-html-editor-actions.c:1276
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:100
 msgid "_Left"
 msgstr "_Left"
 
-#: ../src/e-util/e-html-editor-actions.c:1161
+#: ../src/e-util/e-html-editor-actions.c:1278
 msgid "Left Alignment"
 msgstr "Left Alignment"
 
 #. Right
-#: ../src/e-util/e-html-editor-actions.c:1166
-#: ../src/e-util/e-html-editor-paragraph-dialog.c:117
+#: ../src/e-util/e-html-editor-actions.c:1283
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:118
 msgid "_Right"
 msgstr "_Right"
 
-#: ../src/e-util/e-html-editor-actions.c:1168
+#: ../src/e-util/e-html-editor-actions.c:1285
 msgid "Right Alignment"
 msgstr "Right Alignment"
 
-#: ../src/e-util/e-html-editor-actions.c:1176
+#: ../src/e-util/e-html-editor-actions.c:1293
 #: ../src/modules/text-highlight/languages.c:70
 msgid "_HTML"
 msgstr "_HTML"
 
-#: ../src/e-util/e-html-editor-actions.c:1178
+#: ../src/e-util/e-html-editor-actions.c:1295
 msgid "HTML editing mode"
 msgstr "HTML editing mode"
 
-#: ../src/e-util/e-html-editor-actions.c:1183
+#: ../src/e-util/e-html-editor-actions.c:1300
 msgid "Plain _Text"
 msgstr "Plain _Text"
 
-#: ../src/e-util/e-html-editor-actions.c:1185
+#: ../src/e-util/e-html-editor-actions.c:1302
 msgid "Plain text editing mode"
 msgstr "Plain text editing mode"
 
-#: ../src/e-util/e-html-editor-actions.c:1193
+#: ../src/e-util/e-html-editor-actions.c:1310
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../src/e-util/e-html-editor-actions.c:1200
+#: ../src/e-util/e-html-editor-actions.c:1317
 msgid "Heading _1"
 msgstr "Heading _1"
 
-#: ../src/e-util/e-html-editor-actions.c:1207
+#: ../src/e-util/e-html-editor-actions.c:1324
 msgid "Heading _2"
 msgstr "Heading _2"
 
-#: ../src/e-util/e-html-editor-actions.c:1214
+#: ../src/e-util/e-html-editor-actions.c:1331
 msgid "Heading _3"
 msgstr "Heading _3"
 
-#: ../src/e-util/e-html-editor-actions.c:1221
+#: ../src/e-util/e-html-editor-actions.c:1338
 msgid "Heading _4"
 msgstr "Heading _4"
 
-#: ../src/e-util/e-html-editor-actions.c:1228
+#: ../src/e-util/e-html-editor-actions.c:1345
 msgid "Heading _5"
 msgstr "Heading _5"
 
-#: ../src/e-util/e-html-editor-actions.c:1235
+#: ../src/e-util/e-html-editor-actions.c:1352
 msgid "Heading _6"
 msgstr "Heading _6"
 
-#: ../src/e-util/e-html-editor-actions.c:1242
+#: ../src/e-util/e-html-editor-actions.c:1359
 msgid "_Preformatted"
 msgstr "_Preformatted"
 
-#: ../src/e-util/e-html-editor-actions.c:1249
+#: ../src/e-util/e-html-editor-actions.c:1366
 msgid "A_ddress"
 msgstr "A_ddress"
 
-#: ../src/e-util/e-html-editor-actions.c:1256
+#: ../src/e-util/e-html-editor-actions.c:1373
 msgid "_Bulleted List"
 msgstr "_Bulleted List"
 
-#: ../src/e-util/e-html-editor-actions.c:1263
+#: ../src/e-util/e-html-editor-actions.c:1380
 msgid "_Roman Numeral List"
 msgstr "_Roman Numeral List"
 
-#: ../src/e-util/e-html-editor-actions.c:1270
+#: ../src/e-util/e-html-editor-actions.c:1387
 msgid "Numbered _List"
 msgstr "Numbered _List"
 
-#: ../src/e-util/e-html-editor-actions.c:1277
+#: ../src/e-util/e-html-editor-actions.c:1394
 msgid "_Alphabetical List"
 msgstr "_Alphabetical List"
 
-#: ../src/e-util/e-html-editor-actions.c:1293
-#: ../src/e-util/e-html-editor-actions.c:1331
+#: ../src/e-util/e-html-editor-actions.c:1410
+#: ../src/e-util/e-html-editor-actions.c:1448
 msgid "_Image…"
 msgstr "_Image…"
 
 #. Translators: This is an action tooltip
-#: ../src/e-util/e-html-editor-actions.c:1296
+#: ../src/e-util/e-html-editor-actions.c:1413
 msgid "Insert Image"
 msgstr "Insert Image"
 
-#: ../src/e-util/e-html-editor-actions.c:1301
-#: ../src/e-util/e-html-editor-actions.c:1338
+#: ../src/e-util/e-html-editor-actions.c:1418
+#: ../src/e-util/e-html-editor-actions.c:1455
 msgid "_Link…"
 msgstr "_Link…"
 
-#: ../src/e-util/e-html-editor-actions.c:1303
+#: ../src/e-util/e-html-editor-actions.c:1420
 msgid "Insert Link"
 msgstr "Insert Link"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1309
-#: ../src/e-util/e-html-editor-actions.c:1353
+#: ../src/e-util/e-html-editor-actions.c:1426
+#: ../src/e-util/e-html-editor-actions.c:1470
 msgid "_Rule…"
 msgstr "_Rule…"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1312
+#: ../src/e-util/e-html-editor-actions.c:1429
 msgid "Insert Rule"
 msgstr "Insert Rule"
 
-#: ../src/e-util/e-html-editor-actions.c:1317
-#: ../src/e-util/e-html-editor-actions.c:1360
+#: ../src/e-util/e-html-editor-actions.c:1434
+#: ../src/e-util/e-html-editor-actions.c:1477
 msgid "_Table…"
 msgstr "_Table…"
 
-#: ../src/e-util/e-html-editor-actions.c:1319
+#: ../src/e-util/e-html-editor-actions.c:1436
 msgid "Insert Table"
 msgstr "Insert Table"
 
-#: ../src/e-util/e-html-editor-actions.c:1324
+#: ../src/e-util/e-html-editor-actions.c:1441
 msgid "_Cell…"
 msgstr "_Cell…"
 
-#: ../src/e-util/e-html-editor-actions.c:1345
+#: ../src/e-util/e-html-editor-actions.c:1462
 msgid "Pa_ge…"
 msgstr "Pa_ge…"
 
-#: ../src/e-util/e-html-editor-actions.c:1369
+#: ../src/e-util/e-html-editor-actions.c:1486
 msgid "Font _Size"
 msgstr "Font _Size"
 
-#: ../src/e-util/e-html-editor-actions.c:1376
+#: ../src/e-util/e-html-editor-actions.c:1493
 msgid "_Font Style"
 msgstr "_Font Style"
 
-#: ../src/e-util/e-html-editor-actions.c:1383
+#: ../src/e-util/e-html-editor-actions.c:1500
 msgid "Paste As _Text"
 msgstr "Paste As _Text"
 
-#: ../src/e-util/e-html-editor-actions.c:1394
+#: ../src/e-util/e-html-editor-actions.c:1511
 #: ../src/e-util/e-html-editor-text-dialog.c:201
 msgid "_Bold"
 msgstr "_Bold"
 
-#: ../src/e-util/e-html-editor-actions.c:1396
+#: ../src/e-util/e-html-editor-actions.c:1513
 msgid "Bold"
 msgstr "Bold"
 
-#: ../src/e-util/e-html-editor-actions.c:1402
+#: ../src/e-util/e-html-editor-actions.c:1519
 #: ../src/e-util/e-html-editor-text-dialog.c:212
 msgid "_Italic"
 msgstr "_Italic"
 
-#: ../src/e-util/e-html-editor-actions.c:1404
+#: ../src/e-util/e-html-editor-actions.c:1521
 msgid "Italic"
 msgstr "Italic"
 
-#: ../src/e-util/e-html-editor-actions.c:1410
-msgid "_Plain Text"
-msgstr "_Plain Text"
-
-#: ../src/e-util/e-html-editor-actions.c:1418
+#: ../src/e-util/e-html-editor-actions.c:1527
 #: ../src/e-util/e-html-editor-text-dialog.c:233
 msgid "_Strikethrough"
 msgstr "_Strikethrough"
 
-#: ../src/e-util/e-html-editor-actions.c:1420
+#: ../src/e-util/e-html-editor-actions.c:1529
 msgid "Strikethrough"
 msgstr "Strikethrough"
 
-#: ../src/e-util/e-html-editor-actions.c:1426
+#: ../src/e-util/e-html-editor-actions.c:1535
+#| msgid "S_cript:"
+msgid "Subs_cript"
+msgstr "Subs_cript"
+
+#: ../src/e-util/e-html-editor-actions.c:1537
+#| msgid "_Subscribe"
+msgid "Subscript"
+msgstr "Subscript"
+
+#: ../src/e-util/e-html-editor-actions.c:1543
+#| msgid "S_cript:"
+msgid "Su_perscript"
+msgstr "Su_perscript"
+
+#: ../src/e-util/e-html-editor-actions.c:1545
+#| msgid "Description"
+msgid "Superscript"
+msgstr "Superscript"
+
+#: ../src/e-util/e-html-editor-actions.c:1551
 #: ../src/e-util/e-html-editor-text-dialog.c:223
 msgid "_Underline"
 msgstr "_Underline"
 
-#: ../src/e-util/e-html-editor-actions.c:1428
+#: ../src/e-util/e-html-editor-actions.c:1553
 msgid "Underline"
 msgstr "Underline"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1438
+#: ../src/e-util/e-html-editor-actions.c:1563
 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.
-#: ../src/e-util/e-html-editor-actions.c:1446
+#: ../src/e-util/e-html-editor-actions.c:1571
 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.
-#: ../src/e-util/e-html-editor-actions.c:1454
+#: ../src/e-util/e-html-editor-actions.c:1579
 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.
-#: ../src/e-util/e-html-editor-actions.c:1462
+#: ../src/e-util/e-html-editor-actions.c:1587
 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.
-#: ../src/e-util/e-html-editor-actions.c:1470
+#: ../src/e-util/e-html-editor-actions.c:1595
 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.
-#: ../src/e-util/e-html-editor-actions.c:1478
+#: ../src/e-util/e-html-editor-actions.c:1603
 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.
-#: ../src/e-util/e-html-editor-actions.c:1486
+#: ../src/e-util/e-html-editor-actions.c:1611
 msgid "+4"
 msgstr "+4"
 
-#: ../src/e-util/e-html-editor-actions.c:1505
+#: ../src/e-util/e-html-editor-actions.c:1630
 msgid "Cell Contents"
 msgstr "Cell Contents"
 
-#: ../src/e-util/e-html-editor-actions.c:1512
+#: ../src/e-util/e-html-editor-actions.c:1637
 msgid "Column"
 msgstr "Column"
 
-#: ../src/e-util/e-html-editor-actions.c:1519
+#: ../src/e-util/e-html-editor-actions.c:1644
 msgid "Row"
 msgstr "Row"
 
-#: ../src/e-util/e-html-editor-actions.c:1526
+#: ../src/e-util/e-html-editor-actions.c:1651
 msgid "Table"
 msgstr "Table"
 
 #. Translators: Popup menu item caption, containing all the Delete options for a table
-#: ../src/e-util/e-html-editor-actions.c:1536
+#: ../src/e-util/e-html-editor-actions.c:1661
 msgid "Table Delete"
 msgstr "Table Delete"
 
 #. Translators: Popup menu item caption, containing all the Insert options for a table
-#: ../src/e-util/e-html-editor-actions.c:1544
+#: ../src/e-util/e-html-editor-actions.c:1669
 msgid "Table Insert"
 msgstr "Table Insert"
 
-#: ../src/e-util/e-html-editor-actions.c:1551
+#: ../src/e-util/e-html-editor-actions.c:1676
 msgid "Properties"
 msgstr "Properties"
 
-#: ../src/e-util/e-html-editor-actions.c:1569
+#: ../src/e-util/e-html-editor-actions.c:1694
 msgid "Column After"
 msgstr "Column After"
 
-#: ../src/e-util/e-html-editor-actions.c:1576
+#: ../src/e-util/e-html-editor-actions.c:1701
 msgid "Column Before"
 msgstr "Column Before"
 
-#: ../src/e-util/e-html-editor-actions.c:1583
+#: ../src/e-util/e-html-editor-actions.c:1708
 msgid "Insert _Link"
 msgstr "Insert _Link"
 
-#: ../src/e-util/e-html-editor-actions.c:1590
+#: ../src/e-util/e-html-editor-actions.c:1715
 msgid "Row Above"
 msgstr "Row Above"
 
-#: ../src/e-util/e-html-editor-actions.c:1597
+#: ../src/e-util/e-html-editor-actions.c:1722
 msgid "Row Below"
 msgstr "Row Below"
 
-#: ../src/e-util/e-html-editor-actions.c:1604
+#: ../src/e-util/e-html-editor-actions.c:1729
 msgid "Cell…"
 msgstr "Cell…"
 
-#: ../src/e-util/e-html-editor-actions.c:1611
+#: ../src/e-util/e-html-editor-actions.c:1736
 msgid "Image…"
 msgstr "Image…"
 
-#: ../src/e-util/e-html-editor-actions.c:1618
+#: ../src/e-util/e-html-editor-actions.c:1743
 msgid "Link…"
 msgstr "Link…"
 
-#: ../src/e-util/e-html-editor-actions.c:1625
+#: ../src/e-util/e-html-editor-actions.c:1750
 msgid "Page…"
 msgstr "Page…"
 
-#: ../src/e-util/e-html-editor-actions.c:1632
+#: ../src/e-util/e-html-editor-actions.c:1757
 msgid "Paragraph…"
 msgstr "Paragraph…"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1640
+#: ../src/e-util/e-html-editor-actions.c:1765
 msgid "Rule…"
 msgstr "Rule…"
 
-#: ../src/e-util/e-html-editor-actions.c:1647
+#: ../src/e-util/e-html-editor-actions.c:1772
 msgid "Table…"
 msgstr "Table…"
 
-#: ../src/e-util/e-html-editor-actions.c:1654
+#: ../src/e-util/e-html-editor-actions.c:1779
 msgid "Text…"
 msgstr "Text…"
 
-#: ../src/e-util/e-html-editor-actions.c:1661
+#: ../src/e-util/e-html-editor-actions.c:1786
 msgid "Remove Link"
 msgstr "Remove Link"
 
-#: ../src/e-util/e-html-editor-actions.c:1678
+#: ../src/e-util/e-html-editor-actions.c:1803
 msgid "Add Word to Dictionary"
 msgstr "Add Word to Dictionary"
 
-#: ../src/e-util/e-html-editor-actions.c:1685
+#: ../src/e-util/e-html-editor-actions.c:1810
 msgid "Ignore Misspelled Word"
 msgstr "Ignore Misspelt Word"
 
-#: ../src/e-util/e-html-editor-actions.c:1692
+#: ../src/e-util/e-html-editor-actions.c:1817
 msgid "Add Word To"
 msgstr "Add Word To"
 
-#: ../src/e-util/e-html-editor-actions.c:1701
+#: ../src/e-util/e-html-editor-actions.c:1826
 msgid "More Suggestions"
 msgstr "More Suggestions"
 
 #. 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.
-#: ../src/e-util/e-html-editor-actions.c:1936
+#: ../src/e-util/e-html-editor-actions.c:2061
 #, c-format
 msgid "%s Dictionary"
 msgstr "%s Dictionary"
 
-#: ../src/e-util/e-html-editor-actions.c:2015
+#: ../src/e-util/e-html-editor-actions.c:2140
 msgid "_Emoticon"
 msgstr "_Emoticon"
 
-#: ../src/e-util/e-html-editor-actions.c:2016
+#: ../src/e-util/e-html-editor-actions.c:2141
 msgid "Insert Emoticon"
 msgstr "Insert Emoticon"
 
-#: ../src/e-util/e-html-editor-actions.c:2084
+#: ../src/e-util/e-html-editor-actions.c:2209
 msgid "Re_place"
 msgstr "Re_place"
 
-#: ../src/e-util/e-html-editor-actions.c:2090
+#: ../src/e-util/e-html-editor-actions.c:2215
 msgid "_Image"
 msgstr "_Image"
 
-#: ../src/e-util/e-html-editor-actions.c:2093
+#: ../src/e-util/e-html-editor-actions.c:2218
 msgid "_Link"
 msgstr "_Link"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:2097
+#: ../src/e-util/e-html-editor-actions.c:2222
 msgid "_Rule"
 msgstr "_Rule"
 
-#: ../src/e-util/e-html-editor-actions.c:2100
+#: ../src/e-util/e-html-editor-actions.c:2225
 #: ../src/e-util/e-html-editor-cell-dialog.c:448
 msgid "_Table"
 msgstr "_Table"
 
-#: ../src/e-util/e-html-editor.c:743
+#: ../src/e-util/e-html-editor.c:863
 msgid "Paragraph Style"
 msgstr "Paragraph Style"
 
-#: ../src/e-util/e-html-editor.c:757
+#: ../src/e-util/e-html-editor.c:877
 msgid "Editing Mode"
 msgstr "Editing Mode"
 
-#: ../src/e-util/e-html-editor.c:769
+#: ../src/e-util/e-html-editor.c:889
 msgid "Font Color"
 msgstr "Font Colour"
 
-#: ../src/e-util/e-html-editor.c:779
+#: ../src/e-util/e-html-editor.c:900
+#| msgid "_Background:"
+msgid "Background Color"
+msgstr "Background Colour"
+
+#: ../src/e-util/e-html-editor.c:910
 msgid "Font Size"
 msgstr "Font Size"
 
+#: ../src/e-util/e-html-editor.c:919
+#| msgid "Account Name"
+msgid "Font Name"
+msgstr "Font Name"
+
+#: ../src/e-util/e-html-editor.c:1523
+#| msgid "Failed to insert text file."
+msgid "Failed to obtain content of editor"
+msgstr "Failed to obtain content of editor"
+
 #: ../src/e-util/e-html-editor-cell-dialog.c:408
 msgid "<b>Scope</b>"
 msgstr "<b>Scope</b>"
@@ -14227,20 +14371,20 @@ msgid "<b>Alignment &amp; Behavior</b>"
 msgstr "<b>Alignment &amp; Behaviour</b>"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:484
-#: ../src/e-util/e-html-editor-hrule-dialog.c:328
-#: ../src/e-util/e-html-editor-table-dialog.c:648
+#: ../src/e-util/e-html-editor-hrule-dialog.c:306
+#: ../src/e-util/e-html-editor-table-dialog.c:639
 msgid "Left"
 msgstr "Left"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:485
-#: ../src/e-util/e-html-editor-hrule-dialog.c:330
-#: ../src/e-util/e-html-editor-table-dialog.c:649
+#: ../src/e-util/e-html-editor-hrule-dialog.c:308
+#: ../src/e-util/e-html-editor-table-dialog.c:640
 msgid "Center"
 msgstr "Centre"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:486
-#: ../src/e-util/e-html-editor-hrule-dialog.c:332
-#: ../src/e-util/e-html-editor-table-dialog.c:650
+#: ../src/e-util/e-html-editor-hrule-dialog.c:310
+#: ../src/e-util/e-html-editor-table-dialog.c:641
 msgid "Right"
 msgstr "Right"
 
@@ -14279,7 +14423,7 @@ msgstr "_Header Style"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:540
 #: ../src/e-util/e-html-editor-image-dialog.c:520
-#: ../src/e-util/e-html-editor-table-dialog.c:560
+#: ../src/e-util/e-html-editor-table-dialog.c:551
 msgid "<b>Layout</b>"
 msgstr "<b>Layout</b>"
 
@@ -14297,12 +14441,12 @@ msgid "Co_lumn Span:"
 msgstr "Co_lumn Span:"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:612
-#: ../src/e-util/e-html-editor-table-dialog.c:664
+#: ../src/e-util/e-html-editor-table-dialog.c:655
 msgid "<b>Background</b>"
 msgstr "<b>Background</b>"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:625
-#: ../src/e-util/e-html-editor-table-dialog.c:677
+#: ../src/e-util/e-html-editor-table-dialog.c:668
 msgid "Transparent"
 msgstr "Transparent"
 
@@ -14312,7 +14456,7 @@ msgstr "C_olour:"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:640
 #: ../src/e-util/e-html-editor-image-dialog.c:476
-#: ../src/e-util/e-html-editor-table-dialog.c:692
+#: ../src/e-util/e-html-editor-table-dialog.c:683
 msgid "Images"
 msgstr "Images"
 
@@ -14320,8 +14464,8 @@ msgstr "Images"
 #: ../src/e-util/e-html-editor-cell-dialog.c:648
 #: ../src/e-util/e-html-editor-image-dialog.c:481
 #: ../src/e-util/e-html-editor-image-dialog.c:484
-#: ../src/e-util/e-html-editor-table-dialog.c:697
-#: ../src/e-util/e-html-editor-table-dialog.c:702
+#: ../src/e-util/e-html-editor-table-dialog.c:688
+#: ../src/e-util/e-html-editor-table-dialog.c:693
 msgid "Choose Background Image"
 msgstr "Choose Background Image"
 
@@ -14330,8 +14474,8 @@ msgid "_Image:"
 msgstr "_Image:"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:669
-#: ../src/e-util/e-html-editor-page-dialog.c:495
-#: ../src/e-util/e-html-editor-table-dialog.c:723
+#: ../src/e-util/e-html-editor-page-dialog.c:545
+#: ../src/e-util/e-html-editor-table-dialog.c:714
 msgid "_Remove image"
 msgstr "_Remove image"
 
@@ -14361,42 +14505,42 @@ msgstr "_Wrap Search"
 msgid "Find"
 msgstr "Find"
 
-#: ../src/e-util/e-html-editor-hrule-dialog.c:263
+#: ../src/e-util/e-html-editor-hrule-dialog.c:241
 msgid "<b>Size</b>"
 msgstr "<b>Size</b>"
 
 #. Width
-#: ../src/e-util/e-html-editor-hrule-dialog.c:283
+#: ../src/e-util/e-html-editor-hrule-dialog.c:261
 #: ../src/e-util/e-html-editor-image-dialog.c:538
-#: ../src/e-util/e-html-editor-table-dialog.c:571
+#: ../src/e-util/e-html-editor-table-dialog.c:562
 msgid "_Width:"
 msgstr "_Width:"
 
-#: ../src/e-util/e-html-editor-hrule-dialog.c:308
+#: ../src/e-util/e-html-editor-hrule-dialog.c:286
 msgid "_Size:"
 msgstr "_Size:"
 
-#: ../src/e-util/e-html-editor-hrule-dialog.c:315
+#: ../src/e-util/e-html-editor-hrule-dialog.c:293
 msgid "<b>Style</b>"
 msgstr "<b>Style</b>"
 
-#: ../src/e-util/e-html-editor-hrule-dialog.c:340
-#: ../src/e-util/e-html-editor-table-dialog.c:657
+#: ../src/e-util/e-html-editor-hrule-dialog.c:318
+#: ../src/e-util/e-html-editor-table-dialog.c:648
 msgid "_Alignment:"
 msgstr "_Alignment:"
 
 #. Shaded
-#: ../src/e-util/e-html-editor-hrule-dialog.c:346
+#: ../src/e-util/e-html-editor-hrule-dialog.c:324
 msgid "S_haded"
 msgstr "S_haded"
 
-#: ../src/e-util/e-html-editor-hrule-dialog.c:363
+#: ../src/e-util/e-html-editor-hrule-dialog.c:341
 msgid "Rule properties"
 msgstr "Rule properties"
 
 #: ../src/e-util/e-html-editor-image-dialog.c:465
-#: ../src/e-util/e-html-editor-paragraph-dialog.c:64
-#: ../src/e-util/e-html-editor-table-dialog.c:514
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:65
+#: ../src/e-util/e-html-editor-table-dialog.c:505
 msgid "<b>General</b>"
 msgstr "<b>General</b>"
 
@@ -14417,7 +14561,7 @@ msgid "_Y-Padding:"
 msgstr "_Y-Padding:"
 
 #: ../src/e-util/e-html-editor-image-dialog.c:635
-#: ../src/e-util/e-html-editor-table-dialog.c:638
+#: ../src/e-util/e-html-editor-table-dialog.c:629
 msgid "_Border:"
 msgstr "_Border:"
 
@@ -14426,7 +14570,7 @@ msgid "<b>Link</b>"
 msgstr "<b>Link</b>"
 
 #: ../src/e-util/e-html-editor-image-dialog.c:663
-#: ../src/e-util/e-html-editor-link-dialog.c:213
+#: ../src/e-util/e-html-editor-link-dialog.c:210
 msgid "_URL:"
 msgstr "_URL:"
 
@@ -14438,95 +14582,110 @@ msgstr "_Test URL…"
 msgid "Image Properties"
 msgstr "Image Properties"
 
-#: ../src/e-util/e-html-editor-link-dialog.c:236
+#: ../src/e-util/e-html-editor-link-dialog.c:233
 msgid "_Remove Link"
 msgstr "_Remove Link"
 
-#: ../src/e-util/e-html-editor-link-dialog.c:261
+#: ../src/e-util/e-html-editor-link-dialog.c:258
 msgid "Link Properties"
 msgstr "Link Properties"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:68
+#: ../src/e-util/e-html-editor-page-dialog.c:71
 msgid "Perforated Paper"
 msgstr "Perforated Paper"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:77
+#: ../src/e-util/e-html-editor-page-dialog.c:80
 msgid "Blue Ink"
 msgstr "Blue Ink"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:86
+#: ../src/e-util/e-html-editor-page-dialog.c:89
 msgid "Paper"
 msgstr "Paper"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:95
+#: ../src/e-util/e-html-editor-page-dialog.c:98
 msgid "Ribbon"
 msgstr "Ribbon"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:104
+#: ../src/e-util/e-html-editor-page-dialog.c:107
 msgid "Midnight"
 msgstr "Midnight"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:122
+#: ../src/e-util/e-html-editor-page-dialog.c:125
 #: ../src/mail/filtertypes.xml.in.h:38 ../src/mail/searchtypes.xml.in.h:41
 #: ../src/mail/vfoldertypes.xml.in.h:41
 msgid "Draft"
 msgstr "Draft"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:131
+#: ../src/e-util/e-html-editor-page-dialog.c:134
 msgid "Graph Paper"
 msgstr "Graph Paper"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:379
-msgid "<b>Colors</b>"
-msgstr "<b>Colours</b>"
+#. == Colors ==
+#: ../src/e-util/e-html-editor-page-dialog.c:402
+#| msgid "Color"
+msgid "Colors"
+msgstr "Colours"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:398
+#: ../src/e-util/e-html-editor-page-dialog.c:422
 msgid "_Text:"
 msgstr "_Text:"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:413
+#: ../src/e-util/e-html-editor-page-dialog.c:437
 msgid "_Link:"
 msgstr "_Link:"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:428
+#: ../src/e-util/e-html-editor-page-dialog.c:452
 msgid "_Visited Link:"
 msgstr "_Visited Link:"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:443
+#: ../src/e-util/e-html-editor-page-dialog.c:467
 msgid "_Background:"
 msgstr "_Background:"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:451
-msgid "<b>Background Image</b>"
-msgstr "<b>Background Image</b>"
+#. == Text ==
+#: ../src/e-util/e-html-editor-page-dialog.c:475
+#| msgid "_Text:"
+msgid "Text"
+msgstr "Text"
+
+#: ../src/e-util/e-html-editor-page-dialog.c:493
+#| msgid "_Folder Name:"
+msgid "_Font Name:"
+msgstr "_Font Name:"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:473
+#. == Background Image ==
+#: ../src/e-util/e-html-editor-page-dialog.c:500
+#| msgid "Choose Background Image"
+msgid "Background Image"
+msgstr "Background Image"
+
+#: ../src/e-util/e-html-editor-page-dialog.c:523
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:90
 msgid "_Template:"
 msgstr "_Template:"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:481
+#: ../src/e-util/e-html-editor-page-dialog.c:531
 #: ../src/e-util/e-import-assistant.c:287
 msgid "Select a file"
 msgstr "Select a file"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:488
+#: ../src/e-util/e-html-editor-page-dialog.c:538
 msgid "_Custom:"
 msgstr "_Custom:"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:515
+#: ../src/e-util/e-html-editor-page-dialog.c:567
 msgid "Page Properties"
 msgstr "Page Properties"
 
-#: ../src/e-util/e-html-editor-paragraph-dialog.c:81
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:82
 msgid "_Style:"
 msgstr "_Style:"
 
-#: ../src/e-util/e-html-editor-paragraph-dialog.c:88
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:89
 msgid "<b>Alignment</b>"
 msgstr "<b>Alignment</b>"
 
-#: ../src/e-util/e-html-editor-paragraph-dialog.c:153
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:163
 msgid "Paragraph Properties"
 msgstr "Paragraph Properties"
 
@@ -14620,33 +14779,33 @@ msgstr "Add word"
 msgid "Spell Checking"
 msgstr "Spell Checking"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:536
+#: ../src/e-util/e-html-editor-table-dialog.c:527
 msgid "_Rows:"
 msgstr "_Rows:"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:553
+#: ../src/e-util/e-html-editor-table-dialog.c:544
 msgid "C_olumns:"
 msgstr "C_olumns:"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:604
+#: ../src/e-util/e-html-editor-table-dialog.c:595
 msgid "_Spacing:"
 msgstr "_Spacing:"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:621
+#: ../src/e-util/e-html-editor-table-dialog.c:612
 msgid "_Padding:"
 msgstr "_Padding:"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:685
+#: ../src/e-util/e-html-editor-table-dialog.c:676
 #: ../src/e-util/e-html-editor-text-dialog.c:248
-#: ../src/e-util/e-webdav-browser.c:2427
+#: ../src/e-util/e-webdav-browser.c:2408
 msgid "_Color:"
 msgstr "_Colour:"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:716
+#: ../src/e-util/e-html-editor-table-dialog.c:707
 msgid "Image:"
 msgstr "Image:"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:743
+#: ../src/e-util/e-html-editor-table-dialog.c:734
 msgid "Table Properties"
 msgstr "Table Properties"
 
@@ -14787,23 +14946,23 @@ msgstr "days"
 msgid "Autogenerated"
 msgstr "Autogenerated"
 
-#: ../src/e-util/e-mail-signature-editor.c:311 ../src/mail/e-mail-notes.c:966
+#: ../src/e-util/e-mail-signature-editor.c:321 ../src/mail/e-mail-notes.c:1017
 msgid "Close"
 msgstr "Close"
 
-#: ../src/e-util/e-mail-signature-editor.c:316 ../src/mail/e-mail-notes.c:971
+#: ../src/e-util/e-mail-signature-editor.c:326 ../src/mail/e-mail-notes.c:1022
 msgid "_Save and Close"
 msgstr "_Save and Close"
 
-#: ../src/e-util/e-mail-signature-editor.c:558
+#: ../src/e-util/e-mail-signature-editor.c:568
 msgid "Edit Signature"
 msgstr "Edit Signature"
 
-#: ../src/e-util/e-mail-signature-editor.c:591
+#: ../src/e-util/e-mail-signature-editor.c:601
 msgid "_Signature Name:"
 msgstr "_Signature Name:"
 
-#: ../src/e-util/e-mail-signature-editor.c:627
+#: ../src/e-util/e-mail-signature-editor.c:637
 msgid "Unnamed"
 msgstr "Unnamed"
 
@@ -14882,7 +15041,7 @@ msgstr "Opening address book “%s”"
 msgid "_Do not show this message again"
 msgstr "_Do not show this message again"
 
-#: ../src/e-util/e-misc-utils.c:4249
+#: ../src/e-util/e-misc-utils.c:3979
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -14890,18 +15049,18 @@ msgstr ""
 "This address book server might be unreachable, the server name may be "
 "misspelt, or your network connection could be down."
 
-#: ../src/e-util/e-misc-utils.c:4261
+#: ../src/e-util/e-misc-utils.c:3991
 #, c-format
 msgid "Failed to set protocol version to LDAPv3 (%d): %s"
 msgstr "Failed to set protocol version to LDAPv3 (%d): %s"
 
-#: ../src/e-util/e-misc-utils.c:4273
+#: ../src/e-util/e-misc-utils.c:4003
 #, c-format
 msgid "Failed to authenticate with LDAP server (%d): %s"
 msgstr "Failed to authenticate with LDAP server (%d): %s"
 
 #  addressbook:ldap-search-base secondary
-#: ../src/e-util/e-misc-utils.c:4287
+#: ../src/e-util/e-misc-utils.c:4017
 #, c-format
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
@@ -14917,7 +15076,7 @@ msgstr ""
 "Detailed error (%d): %s"
 
 #  addressbook:ldap-search-base secondary
-#: ../src/e-util/e-misc-utils.c:4298
+#: ../src/e-util/e-misc-utils.c:4028
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
@@ -14927,12 +15086,12 @@ msgstr ""
 "this functionality or it may be misconfigured. Ask your administrator for "
 "supported search bases."
 
-#: ../src/e-util/e-misc-utils.c:4331
+#: ../src/e-util/e-misc-utils.c:4061
 msgid "Evolution had not been compiled with LDAP support"
 msgstr "Evolution had not been compiled with LDAP support"
 
 #. Translators: %s is the language ISO code.
-#: ../src/e-util/e-misc-utils.c:4654
+#: ../src/e-util/e-misc-utils.c:4384
 #, c-format
 msgctxt "language"
 msgid "Unknown (%s)"
@@ -14940,12 +15099,35 @@ msgstr "Unknown (%s)"
 
 #. Translators: The first %s is the language name, and the
 #. * second is the country name. Example: "French (France)"
-#: ../src/e-util/e-misc-utils.c:4663
+#: ../src/e-util/e-misc-utils.c:4393
 #, c-format
 msgctxt "language"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
+#: ../src/e-util/e-misc-utils.c:4551
+#, c-format
+msgid "Click to call %s"
+msgstr "Click to call %s"
+
+#: ../src/e-util/e-misc-utils.c:4553
+msgid "Click to hide/unhide addresses"
+msgstr "Click to hide/unhide addresses"
+
+#: ../src/e-util/e-misc-utils.c:4566
+#, c-format
+msgid "Go to the section %s of the message"
+msgstr "Go to the section %s of the message"
+
+#: ../src/e-util/e-misc-utils.c:4568
+msgid "Go to the beginning of the message"
+msgstr "Go to the beginning of the message"
+
+#: ../src/e-util/e-misc-utils.c:4574
+#, c-format
+msgid "Click to open %s"
+msgstr "Click to open %s"
+
 #: ../src/e-util/e-name-selector-dialog.c:274
 msgid "Show Contacts"
 msgstr "Show Contacts"
@@ -15349,7 +15531,7 @@ msgstr "Type:"
 msgid "Name:"
 msgstr "Name:"
 
-#: ../src/e-util/e-source-config.c:850 ../src/e-util/e-webdav-browser.c:1752
+#: ../src/e-util/e-source-config.c:850 ../src/e-util/e-webdav-browser.c:1733
 msgid "Name cannot be empty"
 msgstr "Name cannot be empty"
 
@@ -15379,7 +15561,7 @@ msgstr "Show"
 msgid "Group name"
 msgstr "Group name"
 
-#: ../src/e-util/e-source-selector.c:3397 ../src/mail/e-mail-display.c:714
+#: ../src/e-util/e-source-selector.c:3397 ../src/mail/e-mail-display.c:717
 msgid "_Hide"
 msgstr "_Hide"
 
@@ -15396,11 +15578,7 @@ msgstr "Manage Groups"
 msgid "Available Groups:"
 msgstr "Available Groups:"
 
-#: ../src/e-util/e-source-selector-dialog.c:234
-msgid "_Destination"
-msgstr "_Destination"
-
-#: ../src/e-util/e-source-selector-dialog.c:362
+#: ../src/e-util/e-source-selector-dialog.c:317
 msgid "Select destination"
 msgstr "Select destination"
 
@@ -15742,7 +15920,7 @@ msgid "Format Column_s…"
 msgstr "Format Column_s…"
 
 #: ../src/e-util/e-table-header-item.c:1675
-#: ../src/shell/e-shell-window-actions.c:1226
+#: ../src/shell/e-shell-window-actions.c:1239
 msgid "Custo_mize Current View…"
 msgstr "Custo_mise Current View…"
 
@@ -15813,6 +15991,10 @@ msgstr "Evolution Source Viewer"
 msgid "Display Name"
 msgstr "Display Name"
 
+#: ../src/e-util/evolution-source-viewer.c:677
+msgid "Flags"
+msgstr "Flags"
+
 #: ../src/e-util/evolution-source-viewer.c:729
 #: ../src/mail/e-mail-config-identity-page.c:1231
 msgid "Identity"
@@ -15827,214 +16009,191 @@ msgid "Events"
 msgstr "Events"
 
 #: ../src/e-util/e-webdav-browser.c:515 ../src/mail/em-folder-tree-model.c:1555
-#: ../src/mail/em-folder-tree-model.c:1932
+#: ../src/mail/em-folder-tree-model.c:1936
 msgid "Loading…"
 msgstr "Loading…"
 
-#: ../src/e-util/e-webdav-browser.c:1387
+#: ../src/e-util/e-webdav-browser.c:1368
 msgid "Searching collection children…"
 msgstr "Searching collection children…"
 
-#: ../src/e-util/e-webdav-browser.c:1389
+#: ../src/e-util/e-webdav-browser.c:1370
 msgid "Failed to search for collection children"
 msgstr "Failed to search for collection children"
 
-#: ../src/e-util/e-webdav-browser.c:1423
+#: ../src/e-util/e-webdav-browser.c:1404
 msgid "Searching for user home, please wait…"
 msgstr "Searching for user home, please wait…"
 
-#: ../src/e-util/e-webdav-browser.c:1425
+#: ../src/e-util/e-webdav-browser.c:1406
 msgid "Failed to search for user home"
 msgstr "Failed to search for user home"
 
-#: ../src/e-util/e-webdav-browser.c:1768
+#: ../src/e-util/e-webdav-browser.c:1749
 msgid "At least one component type should be set"
 msgstr "At least one component type should be set"
 
-#: ../src/e-util/e-webdav-browser.c:1787
+#: ../src/e-util/e-webdav-browser.c:1768
 msgid "Failed to get selected collection HREF"
 msgstr "Failed to get selected collection HREF"
 
-#: ../src/e-util/e-webdav-browser.c:1819
+#: ../src/e-util/e-webdav-browser.c:1800
 msgid "Failed to save changes"
 msgstr "Failed to save changes"
 
-#: ../src/e-util/e-webdav-browser.c:1821
+#: ../src/e-util/e-webdav-browser.c:1802
 msgid "Creating new book…"
 msgstr "Creating new book…"
 
-#: ../src/e-util/e-webdav-browser.c:1822
+#: ../src/e-util/e-webdav-browser.c:1803
 msgid "Failed to create new book"
 msgstr "Failed to create new book"
 
-#: ../src/e-util/e-webdav-browser.c:1824
+#: ../src/e-util/e-webdav-browser.c:1805
 msgid "Creating new calendar…"
 msgstr "Creating new calendar…"
 
-#: ../src/e-util/e-webdav-browser.c:1825
+#: ../src/e-util/e-webdav-browser.c:1806
 msgid "Failed to create new calendar"
 msgstr "Failed to create new calendar"
 
-#: ../src/e-util/e-webdav-browser.c:1827
+#: ../src/e-util/e-webdav-browser.c:1808
 msgid "Creating new collection…"
 msgstr "Creating new collection…"
 
-#: ../src/e-util/e-webdav-browser.c:1828
+#: ../src/e-util/e-webdav-browser.c:1809
 msgid "Failed to create new collection"
 msgstr "Failed to create new collection"
 
-#: ../src/e-util/e-webdav-browser.c:1967
+#: ../src/e-util/e-webdav-browser.c:1948
 msgid "It is not allowed to create book under another book or calendar"
 msgstr "It is not allowed to create book under another book or calendar"
 
 #. if (button == webdav_browser->priv->create_calendar_button)
-#: ../src/e-util/e-webdav-browser.c:1969
+#: ../src/e-util/e-webdav-browser.c:1950
 msgid "It is not allowed to create calendar under another book or calendar"
 msgstr "It is not allowed to create calendar under another book or calendar"
 
-#: ../src/e-util/e-webdav-browser.c:2198
+#: ../src/e-util/e-webdav-browser.c:2179
 msgid "Deleting book…"
 msgstr "Deleting book…"
 
-#: ../src/e-util/e-webdav-browser.c:2199
+#: ../src/e-util/e-webdav-browser.c:2180
 msgid "Failed to delete book"
 msgstr "Failed to delete book"
 
-#: ../src/e-util/e-webdav-browser.c:2202
+#: ../src/e-util/e-webdav-browser.c:2183
 msgid "Deleting calendar…"
 msgstr "Deleting calendar…"
 
-#: ../src/e-util/e-webdav-browser.c:2203
+#: ../src/e-util/e-webdav-browser.c:2184
 msgid "Failed to delete calendar"
 msgstr "Failed to delete calendar"
 
-#: ../src/e-util/e-webdav-browser.c:2206
+#: ../src/e-util/e-webdav-browser.c:2187
 msgid "Deleting collection…"
 msgstr "Deleting collection…"
 
-#: ../src/e-util/e-webdav-browser.c:2207
+#: ../src/e-util/e-webdav-browser.c:2188
 msgid "Failed to delete collection"
 msgstr "Failed to delete collection"
 
-#: ../src/e-util/e-webdav-browser.c:2438
+#: ../src/e-util/e-webdav-browser.c:2419
 msgid "For Components:"
 msgstr "For Components:"
 
-#: ../src/e-util/e-webdav-browser.c:2444
+#: ../src/e-util/e-webdav-browser.c:2425
 msgid "_Events"
 msgstr "_Events"
 
-#: ../src/e-util/e-webdav-browser.c:2634
+#: ../src/e-util/e-webdav-browser.c:2615
 msgid "WebDAV server:"
 msgstr "WebDAV server:"
 
-#: ../src/e-util/e-webdav-browser.c:2669
+#: ../src/e-util/e-webdav-browser.c:2650
 msgid "Create _Book"
 msgstr "Create _Book"
 
-#: ../src/e-util/e-webdav-browser.c:2676
+#: ../src/e-util/e-webdav-browser.c:2657
 msgid "Create _Calendar"
 msgstr "Create _Calendar"
 
-#: ../src/e-util/e-webdav-browser.c:2683
+#: ../src/e-util/e-webdav-browser.c:2664
 msgid "Create Collectio_n"
 msgstr "Create Collectio_n"
 
-#: ../src/e-util/e-web-view.c:408
+#: ../src/e-util/e-web-view.c:407
 msgid "_Copy Link Location"
 msgstr "_Copy Link Location"
 
-#: ../src/e-util/e-web-view.c:410
+#: ../src/e-util/e-web-view.c:409
 msgid "Copy the link to the clipboard"
 msgstr "Copy the link to the clipboard"
 
-#: ../src/e-util/e-web-view.c:418
+#: ../src/e-util/e-web-view.c:417
 msgid "_Open Link in Browser"
 msgstr "_Open Link in Browser"
 
-#: ../src/e-util/e-web-view.c:420
+#: ../src/e-util/e-web-view.c:419
 msgid "Open the link in a web browser"
 msgstr "Open the link in a web browser"
 
-#: ../src/e-util/e-web-view.c:428
+#: ../src/e-util/e-web-view.c:427
 msgid "_Copy Email Address"
 msgstr "_Copy E-mail Address"
 
-#: ../src/e-util/e-web-view.c:435
+#: ../src/e-util/e-web-view.c:434
 msgid "Copy _Raw Email Address"
 msgstr "Copy _Raw E-mail Address"
 
-#: ../src/e-util/e-web-view.c:437
+#: ../src/e-util/e-web-view.c:436
 msgid "Copy the raw email address to the clipboard"
 msgstr "Copy the raw e-mail address to the clipboard"
 
-#: ../src/e-util/e-web-view.c:452
+#: ../src/e-util/e-web-view.c:451
 msgid "_Copy Image"
 msgstr "_Copy Image"
 
-#: ../src/e-util/e-web-view.c:454
+#: ../src/e-util/e-web-view.c:453
 msgid "Copy the image to the clipboard"
 msgstr "Copy the image to the clipboard"
 
-#: ../src/e-util/e-web-view.c:459
+#: ../src/e-util/e-web-view.c:458
 msgid "Save _Image…"
 msgstr "Save _Image…"
 
-#: ../src/e-util/e-web-view.c:461
+#: ../src/e-util/e-web-view.c:460
 msgid "Save the image to a file"
 msgstr "Save the image to a file"
 
-#: ../src/e-util/e-web-view.c:476 ../src/mail/e-mail-browser.c:201
+#: ../src/e-util/e-web-view.c:475 ../src/mail/e-mail-browser.c:201
 #: ../src/mail/e-mail-reader.c:2819
 msgid "Search _Web…"
 msgstr "Search _Web…"
 
-#: ../src/e-util/e-web-view.c:478 ../src/mail/e-mail-browser.c:203
+#: ../src/e-util/e-web-view.c:477 ../src/mail/e-mail-browser.c:203
 #: ../src/mail/e-mail-reader.c:2821
 msgid "Search the Web with the selected text"
 msgstr "Search the Web with the selected text"
 
-#: ../src/e-util/e-web-view.c:488 ../src/e-util/e-web-view.c:2066
+#: ../src/e-util/e-web-view.c:487 ../src/e-util/e-web-view.c:2016
 msgid "Select all text and images"
 msgstr "Select all text and images"
 
-#: ../src/e-util/e-web-view.c:1673
-#, c-format
-msgid "Click to call %s"
-msgstr "Click to call %s"
-
-#: ../src/e-util/e-web-view.c:1675
-msgid "Click to hide/unhide addresses"
-msgstr "Click to hide/unhide addresses"
-
-#: ../src/e-util/e-web-view.c:1686
-#, c-format
-msgid "Go to the section %s of the message"
-msgstr "Go to the section %s of the message"
-
-#: ../src/e-util/e-web-view.c:1688
-msgid "Go to the beginning of the message"
-msgstr "Go to the beginning of the message"
-
-#: ../src/e-util/e-web-view.c:1692
-#, c-format
-msgid "Click to open %s"
-msgstr "Click to open %s"
-
-#: ../src/e-util/e-web-view.c:3773
+#: ../src/e-util/e-web-view.c:3742
 msgid "Copying image to clipboard"
 msgstr "Copying image to clipboard"
 
-#: ../src/e-util/e-web-view.c:3961
+#: ../src/e-util/e-web-view.c:3930
 msgid "Save Image"
 msgstr "Save Image"
 
-#: ../src/e-util/e-web-view.c:3998
+#: ../src/e-util/e-web-view.c:3967
 #, c-format
 msgid "Saving image to “%s”"
 msgstr "Saving image to “%s”"
 
-#: ../src/e-util/e-web-view.c:4145
+#: ../src/e-util/e-web-view.c:4114
 #, c-format
 msgid "Cannot get URI “%s”, do not know how to download it."
 msgstr "Cannot get URI “%s”, do not know how to download it."
@@ -16135,7 +16294,7 @@ msgstr "the time you specify"
 msgid "a time relative to the current time"
 msgstr "a time relative to the current time"
 
-#: ../src/e-util/filter.ui.h:5 ../src/mail/mail-config.ui.h:95
+#: ../src/e-util/filter.ui.h:5 ../src/mail/mail-config.ui.h:98
 msgid "seconds"
 msgstr "seconds"
 
@@ -16295,48 +16454,48 @@ msgstr "Could not get selected text."
 msgid "Saving message to folder “%s”"
 msgstr "Saving message to folder “%s”"
 
-#: ../src/libemail-engine/e-mail-folder-utils.c:565
+#: ../src/libemail-engine/e-mail-folder-utils.c:567
 msgid "Forwarded messages"
 msgstr "Forwarded messages"
 
-#: ../src/libemail-engine/e-mail-folder-utils.c:675
-#: ../src/libemail-engine/e-mail-folder-utils.c:937
+#: ../src/libemail-engine/e-mail-folder-utils.c:677
+#: ../src/libemail-engine/e-mail-folder-utils.c:939
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Retrieving %d message"
 msgstr[1] "Retrieving %d messages"
 
-#: ../src/libemail-engine/e-mail-folder-utils.c:777
+#: ../src/libemail-engine/e-mail-folder-utils.c:779
 msgid "Scanning messages for duplicates"
 msgstr "Scanning messages for duplicates"
 
-#: ../src/libemail-engine/e-mail-folder-utils.c:1150
+#: ../src/libemail-engine/e-mail-folder-utils.c:1152
 #, c-format
 msgid "Removing folder “%s”"
 msgstr "Removing folder “%s”"
 
-#: ../src/libemail-engine/e-mail-folder-utils.c:1331
+#: ../src/libemail-engine/e-mail-folder-utils.c:1333
 #, c-format
 msgid "File “%s” has been removed."
 msgstr "File “%s” has been removed."
 
-#: ../src/libemail-engine/e-mail-folder-utils.c:1335
+#: ../src/libemail-engine/e-mail-folder-utils.c:1337
 msgid "File has been removed."
 msgstr "File has been removed."
 
-#: ../src/libemail-engine/e-mail-folder-utils.c:1411
+#: ../src/libemail-engine/e-mail-folder-utils.c:1413
 msgid "Removing attachments"
 msgstr "Removing attachments"
 
-#: ../src/libemail-engine/e-mail-folder-utils.c:1583
+#: ../src/libemail-engine/e-mail-folder-utils.c:1585
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Saving %d message"
 msgstr[1] "Saving %d messages"
 
-#: ../src/libemail-engine/e-mail-folder-utils.c:1961
+#: ../src/libemail-engine/e-mail-folder-utils.c:1963
 #, c-format
 msgid "Invalid folder URI “%s”"
 msgstr "Invalid folder URI “%s”"
@@ -16346,8 +16505,8 @@ msgstr "Invalid folder URI “%s”"
 #: ../src/mail/em-folder-properties.c:1444
 #: ../src/mail/em-folder-tree-model.c:1503
 #: ../src/mail/importers/kmail-libs.c:138
-#: ../src/modules/mail/e-mail-shell-view-private.c:1015
-#: ../src/modules/mail/e-mail-shell-view-private.c:1026
+#: ../src/modules/mail/e-mail-shell-view-private.c:1011
+#: ../src/modules/mail/e-mail-shell-view-private.c:1022
 msgid "Inbox"
 msgstr "Inbox"
 
@@ -16355,7 +16514,7 @@ msgstr "Inbox"
 #: ../src/libemail-engine/e-mail-session.c:121
 #: ../src/mail/em-folder-tree-model.c:1497
 #: ../src/mail/importers/kmail-libs.c:144
-#: ../src/modules/mail/e-mail-shell-view-private.c:1013
+#: ../src/modules/mail/e-mail-shell-view-private.c:1009
 msgid "Drafts"
 msgstr "Drafts"
 
@@ -16363,7 +16522,7 @@ msgstr "Drafts"
 #: ../src/libemail-engine/e-mail-session.c:122
 #: ../src/mail/em-folder-tree-model.c:1507
 #: ../src/mail/importers/kmail-libs.c:140
-#: ../src/modules/mail/e-mail-shell-view-private.c:1017
+#: ../src/modules/mail/e-mail-shell-view-private.c:1013
 msgid "Outbox"
 msgstr "Outbox"
 
@@ -16371,7 +16530,7 @@ msgstr "Outbox"
 #: ../src/libemail-engine/e-mail-session.c:123
 #: ../src/mail/em-folder-tree-model.c:1511
 #: ../src/mail/importers/kmail-libs.c:142
-#: ../src/modules/mail/e-mail-shell-view-private.c:1019
+#: ../src/modules/mail/e-mail-shell-view-private.c:1015
 msgid "Sent"
 msgstr "Sent"
 
@@ -16380,17 +16539,17 @@ msgstr "Sent"
 #: ../src/mail/e-mail-templates-store.c:2211
 #: ../src/mail/em-folder-tree-model.c:1499
 #: ../src/mail/importers/kmail-libs.c:146
-#: ../src/modules/mail/e-mail-shell-view-private.c:1021
+#: ../src/modules/mail/e-mail-shell-view-private.c:1017
 #: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:1
 msgid "Templates"
 msgstr "Templates"
 
-#: ../src/libemail-engine/e-mail-session.c:1519
+#: ../src/libemail-engine/e-mail-session.c:1514
 #, c-format
 msgid "User cancelled operation"
 msgstr "User cancelled operation"
 
-#: ../src/libemail-engine/e-mail-session.c:1580
+#: ../src/libemail-engine/e-mail-session.c:1575
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
@@ -16399,26 +16558,26 @@ msgstr ""
 "No destination address provided, forwarding of the message has been "
 "cancelled."
 
-#: ../src/libemail-engine/e-mail-session.c:1593
+#: ../src/libemail-engine/e-mail-session.c:1588
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr ""
 "No identity found to use, forwarding of the message has been cancelled."
 
-#: ../src/libemail-engine/e-mail-session.c:1794
+#: ../src/libemail-engine/e-mail-session.c:1789
 #, c-format
 msgid "Corresponding source for service with UID “%s” not found"
 msgstr "Corresponding source for service with UID “%s” not found"
 
-#: ../src/libemail-engine/e-mail-session.c:1914
+#: ../src/libemail-engine/e-mail-session.c:1909
 msgid "Looking up recipient S/MIME certificates in address books…"
 msgstr "Looking up recipient S/MIME certificates in address books…"
 
-#: ../src/libemail-engine/e-mail-session.c:1916
+#: ../src/libemail-engine/e-mail-session.c:1911
 msgid "Looking up recipient PGP keys in address books…"
 msgstr "Looking up recipient PGP keys in address books…"
 
-#: ../src/libemail-engine/e-mail-session.c:2963
+#: ../src/libemail-engine/e-mail-session.c:2958
 #, c-format
 msgid "Waiting for “%s”"
 msgstr "Waiting for “%s”"
@@ -16428,26 +16587,26 @@ msgid "No mail transport service available"
 msgstr "No mail transport service available"
 
 #: ../src/libemail-engine/e-mail-session-utils.c:613
-#: ../src/libemail-engine/mail-ops.c:707
+#: ../src/libemail-engine/mail-ops.c:708
 #, c-format
 msgid "Posting message to “%s”"
 msgstr "Posting message to “%s”"
 
 #: ../src/libemail-engine/e-mail-session-utils.c:650
-#: ../src/libemail-engine/mail-ops.c:743
+#: ../src/libemail-engine/mail-ops.c:744
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Failed to apply outgoing filters: %s"
 
 #: ../src/libemail-engine/e-mail-session-utils.c:683
 #: ../src/libemail-engine/e-mail-session-utils.c:718
-#: ../src/libemail-engine/mail-ops.c:771 ../src/libemail-engine/mail-ops.c:806
+#: ../src/libemail-engine/mail-ops.c:772 ../src/libemail-engine/mail-ops.c:807
 #, c-format
 msgid "Storing sent message to “%s”"
 msgstr "Storing sent message to “%s”"
 
 #: ../src/libemail-engine/e-mail-session-utils.c:707
-#: ../src/libemail-engine/mail-ops.c:795
+#: ../src/libemail-engine/mail-ops.c:796
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -16457,14 +16616,14 @@ msgstr ""
 "Appending to local “Sent” folder instead."
 
 #: ../src/libemail-engine/e-mail-session-utils.c:737
-#: ../src/libemail-engine/mail-ops.c:823
+#: ../src/libemail-engine/mail-ops.c:824
 #, c-format
 msgid "Failed to append to local “Sent” folder: %s"
 msgstr "Failed to append to local “Sent” folder: %s"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:929
-#: ../src/libemail-engine/mail-ops.c:1019
-#: ../src/libemail-engine/mail-ops.c:1134 ../src/mail/mail-send-recv.c:665
+#: ../src/libemail-engine/e-mail-session-utils.c:930
+#: ../src/libemail-engine/mail-ops.c:1020
+#: ../src/libemail-engine/mail-ops.c:1135 ../src/mail/mail-send-recv.c:665
 msgid "Sending message"
 msgstr "Sending message"
 
@@ -16507,7 +16666,7 @@ msgstr ""
 msgid "Fetching mail from “%s”"
 msgstr "Fetching mail from “%s”"
 
-#: ../src/libemail-engine/mail-ops.c:737
+#: ../src/libemail-engine/mail-ops.c:738
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set "
@@ -16520,7 +16679,7 @@ msgstr ""
 "Filters.\n"
 "Original error was: %s"
 
-#: ../src/libemail-engine/mail-ops.c:1030
+#: ../src/libemail-engine/mail-ops.c:1031
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sending message %d of %d"
@@ -16528,52 +16687,52 @@ msgstr "Sending message %d of %d"
 #. Translators: The string is distinguished by total
 #. * count of messages to be sent.  Failed messages is
 #. * always more than zero.
-#: ../src/libemail-engine/mail-ops.c:1088
+#: ../src/libemail-engine/mail-ops.c:1089
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
 msgstr[0] "Failed to send a message"
 msgstr[1] "Failed to send %d of %d messages"
 
-#: ../src/libemail-engine/mail-ops.c:1094
+#: ../src/libemail-engine/mail-ops.c:1095
 msgid "Cancelled."
 msgstr "Cancelled."
 
-#: ../src/libemail-engine/mail-ops.c:1096
+#: ../src/libemail-engine/mail-ops.c:1097
 msgid "Complete."
 msgstr "Complete."
 
-#: ../src/libemail-engine/mail-ops.c:1220
+#: ../src/libemail-engine/mail-ops.c:1221
 #, c-format
 msgid "Moving messages to “%s”"
 msgstr "Moving messages to “%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1221
+#: ../src/libemail-engine/mail-ops.c:1222
 #, c-format
 msgid "Copying messages to “%s”"
 msgstr "Copying messages to “%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1340
+#: ../src/libemail-engine/mail-ops.c:1341
 #, c-format
 msgid "Storing folder “%s”"
 msgstr "Storing folder “%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1468
+#: ../src/libemail-engine/mail-ops.c:1469
 #, c-format
 msgid "Expunging and storing account “%s”"
 msgstr "Expunging and storing account “%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1469
+#: ../src/libemail-engine/mail-ops.c:1470
 #, c-format
 msgid "Storing account “%s”"
 msgstr "Storing account “%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1544
+#: ../src/libemail-engine/mail-ops.c:1545
 #, c-format
 msgid "Emptying trash in “%s”"
 msgstr "Emptying wastebasket in “%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1636
+#: ../src/libemail-engine/mail-ops.c:1644
 #, c-format
 msgid "Processing folder changes in “%s”"
 msgstr "Processing folder changes in “%s”"
@@ -16614,7 +16773,7 @@ msgstr "Forwarded message"
 msgid "Setting up Search Folder: %s"
 msgstr "Setting up Search Folder: %s"
 
-#: ../src/libemail-engine/mail-vfolder.c:302
+#: ../src/libemail-engine/mail-vfolder.c:303
 #, c-format
 msgid "Updating Search Folders for “%s : %s”"
 msgstr "Updating Search Folders for “%s : %s”"
@@ -16624,7 +16783,7 @@ msgstr "Updating Search Folders for “%s : %s”"
 #. * removed folder. For more than one search folder is
 #. * each of them on a separate line, with four spaces
 #. * in front of its name, without quotes.
-#: ../src/libemail-engine/mail-vfolder.c:666
+#: ../src/libemail-engine/mail-vfolder.c:667
 #, c-format
 msgid ""
 "The Search Folder “%s” has been modified to account for the deleted folder\n"
@@ -16707,25 +16866,26 @@ msgid "Missing domain in email address"
 msgstr "Missing domain in e-mail address"
 
 #: ../src/mail/e-mail-autoconfig.c:1321
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:82
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:83
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:87
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:88
 msgid "IMAP server"
 msgstr "IMAP server"
 
 #: ../src/mail/e-mail-autoconfig.c:1328
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:84
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:85
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:89
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:90
 msgid "POP3 server"
 msgstr "POP3 server"
 
 #: ../src/mail/e-mail-autoconfig.c:1335
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:86
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:91
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:92
 msgid "SMTP server"
 msgstr "SMTP server"
 
-#: ../src/mail/e-mail-browser.c:168 ../src/shell/e-shell-window-actions.c:871
-#: ../src/shell/e-shell-window-actions.c:878
-#: ../src/shell/e-shell-window-actions.c:885
+#: ../src/mail/e-mail-browser.c:168 ../src/shell/e-shell-window-actions.c:877
+#: ../src/shell/e-shell-window-actions.c:884
+#: ../src/shell/e-shell-window-actions.c:891
 msgid "Close this window"
 msgstr "Close this window"
 
@@ -16820,12 +16980,12 @@ msgid "Language for Reply and Forward attribution text"
 msgstr "Language for Reply and Forward attribution text"
 
 #: ../src/mail/e-mail-config-composing-page.c:524
-#: ../src/mail/em-composer-utils.c:4142 ../src/mail/mail-config.ui.h:22
+#: ../src/mail/em-composer-utils.c:4148 ../src/mail/mail-config.ui.h:22
 msgid "Start _typing at the bottom"
 msgstr "Start _typing at the bottom"
 
 #: ../src/mail/e-mail-config-composing-page.c:531
-#: ../src/mail/mail-config.ui.h:23
+#: ../src/mail/em-composer-utils.c:4151 ../src/mail/mail-config.ui.h:23
 msgid "_Keep signature above the original message"
 msgstr "_Keep signature above the original message"
 
@@ -16904,39 +17064,39 @@ msgstr "Archi_ve Folder:"
 msgid "Choose a folder to archive messages to."
 msgstr "Choose a folder to archive messages to."
 
-#: ../src/mail/e-mail-config-defaults-page.c:799
+#: ../src/mail/e-mail-config-defaults-page.c:800
 msgid "_Templates Folder:"
 msgstr "_Templates Folder:"
 
-#: ../src/mail/e-mail-config-defaults-page.c:809
+#: ../src/mail/e-mail-config-defaults-page.c:810
 msgid "Choose a folder to use for template messages."
 msgstr "Choose a folder to use for template messages."
 
-#: ../src/mail/e-mail-config-defaults-page.c:831
+#: ../src/mail/e-mail-config-defaults-page.c:832
 msgid "_Restore Defaults"
 msgstr "_Restore Defaults"
 
-#: ../src/mail/e-mail-config-defaults-page.c:848
+#: ../src/mail/e-mail-config-defaults-page.c:849
 msgid "_Lookup Folders"
 msgstr "_Lookup Folders"
 
-#: ../src/mail/e-mail-config-defaults-page.c:866
+#: ../src/mail/e-mail-config-defaults-page.c:867
 msgid "Use a Real Folder for _Trash:"
 msgstr "Use a Real Folder for _Wastebasket:"
 
-#: ../src/mail/e-mail-config-defaults-page.c:867
+#: ../src/mail/e-mail-config-defaults-page.c:868
 msgid "Choose a folder for deleted messages."
 msgstr "Choose a folder for deleted messages."
 
-#: ../src/mail/e-mail-config-defaults-page.c:876
+#: ../src/mail/e-mail-config-defaults-page.c:877
 msgid "Use a Real Folder for _Junk:"
 msgstr "Use a Real Folder for _Junk:"
 
-#: ../src/mail/e-mail-config-defaults-page.c:877
+#: ../src/mail/e-mail-config-defaults-page.c:878
 msgid "Choose a folder for junk messages."
 msgstr "Choose a folder for junk messages."
 
-#: ../src/mail/e-mail-config-defaults-page.c:995
+#: ../src/mail/e-mail-config-defaults-page.c:996
 msgid "Defaults"
 msgstr "Defaults"
 
@@ -17056,7 +17216,7 @@ msgstr "%s — %s"
 #: ../src/modules/addressbook/autocompletion-config.c:115
 #: ../src/modules/calendar/e-calendar-preferences.c:621
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:48
-#: ../src/modules/mail/e-mail-shell-backend.c:802
+#: ../src/modules/mail/e-mail-shell-backend.c:806
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "General"
 msgstr "General"
@@ -17136,7 +17296,7 @@ msgstr "Select"
 
 #: ../src/mail/e-mail-config-security-page.c:686
 #: ../src/mail/e-mail-config-security-page.c:784
-#: ../src/shell/e-shell-window-actions.c:967
+#: ../src/shell/e-shell-window-actions.c:980
 msgid "_Clear"
 msgstr "_Clear"
 
@@ -17239,55 +17399,55 @@ msgstr "Welcome"
 msgid "Account Editor"
 msgstr "Account Editor"
 
-#: ../src/mail/e-mail-display.c:138
+#: ../src/mail/e-mail-display.c:141
 msgid "_Add to Address Book…"
 msgstr "_Add to Address Book…"
 
-#: ../src/mail/e-mail-display.c:145
+#: ../src/mail/e-mail-display.c:148
 msgid "_To This Address"
 msgstr "_To this Address"
 
-#: ../src/mail/e-mail-display.c:152
+#: ../src/mail/e-mail-display.c:155
 msgid "_From This Address"
 msgstr "_From This Address"
 
-#: ../src/mail/e-mail-display.c:159
+#: ../src/mail/e-mail-display.c:162
 msgid "Send _Reply To…"
 msgstr "Send _Reply To…"
 
-#: ../src/mail/e-mail-display.c:161
+#: ../src/mail/e-mail-display.c:164
 msgid "Send a reply message to this address"
 msgstr "Send a reply message to this address"
 
-#: ../src/mail/e-mail-display.c:168
+#: ../src/mail/e-mail-display.c:171
 msgid "Create Search _Folder"
 msgstr "Create Search _Folder"
 
-#: ../src/mail/e-mail-display.c:721
+#: ../src/mail/e-mail-display.c:724
 msgid "Hid_e All"
 msgstr "Hid_e All"
 
-#: ../src/mail/e-mail-display.c:728
+#: ../src/mail/e-mail-display.c:731
 msgid "_View Inline"
 msgstr "_View Inline"
 
-#: ../src/mail/e-mail-display.c:735
+#: ../src/mail/e-mail-display.c:738
 msgid "Vie_w All Inline"
 msgstr "Vie_w All Inline"
 
-#: ../src/mail/e-mail-display.c:742
+#: ../src/mail/e-mail-display.c:745
 msgid "_Zoom to 100%"
 msgstr "_Zoom to 100%"
 
-#: ../src/mail/e-mail-display.c:744
+#: ../src/mail/e-mail-display.c:747
 msgid "Zoom the image to its natural size"
 msgstr "Zoom the image to its natural size"
 
-#: ../src/mail/e-mail-display.c:749
+#: ../src/mail/e-mail-display.c:752
 msgid "_Zoom to window"
 msgstr "_Zoom to window"
 
-#: ../src/mail/e-mail-display.c:751
+#: ../src/mail/e-mail-display.c:754
 msgid "Zoom large images to not be wider than the window width"
 msgstr "Zoom large images to not be wider than the window width"
 
@@ -17423,23 +17583,28 @@ msgstr ""
 msgid "Color"
 msgstr "Colour"
 
-#: ../src/mail/e-mail-notes.c:319 ../src/mail/e-mail-notes.c:740
+#: ../src/mail/e-mail-notes.c:322 ../src/mail/e-mail-notes.c:725
 msgid "Message Note"
 msgstr "Message Note"
 
-#: ../src/mail/e-mail-notes.c:660
+#: ../src/mail/e-mail-notes.c:645
 msgid "Cannot find message in its folder summary"
 msgstr "Cannot find message in its folder summary"
 
-#: ../src/mail/e-mail-notes.c:863
+#: ../src/mail/e-mail-notes.c:870
+#| msgid "Failed to remove attachments from messages."
+msgid "Failed to convert text to message"
+msgstr "Failed to convert text to message"
+
+#: ../src/mail/e-mail-notes.c:884 ../src/mail/e-mail-notes.c:909
 msgid "Storing changes…"
 msgstr "Storing changes…"
 
-#: ../src/mail/e-mail-notes.c:1001
+#: ../src/mail/e-mail-notes.c:1052
 msgid "Edit Message Note"
 msgstr "Edit Message Note"
 
-#: ../src/mail/e-mail-notes.c:1157
+#: ../src/mail/e-mail-notes.c:1207
 msgid "Retrieving message…"
 msgstr "Retrieving message…"
 
@@ -17471,7 +17636,7 @@ msgstr "Header Name"
 msgid "Header Value"
 msgstr "Header Value"
 
-#: ../src/mail/e-mail-printer.c:103 ../src/mail/mail-config.ui.h:132
+#: ../src/mail/e-mail-printer.c:103 ../src/mail/mail-config.ui.h:135
 msgid "Headers"
 msgstr "Headers"
 
@@ -17943,7 +18108,7 @@ msgstr "Remove Du_plicate Messages"
 msgid "Checks selected messages for duplicates"
 msgstr "Checks selected messages for duplicates"
 
-#: ../src/mail/e-mail-reader.c:2784 ../src/mail/em-composer-utils.c:4096
+#: ../src/mail/e-mail-reader.c:2784 ../src/mail/em-composer-utils.c:4102
 #: ../src/mail/mail.error.xml.h:28
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1452
 #: ../src/modules/mail/e-mail-attachment-handler.c:396
@@ -17963,7 +18128,7 @@ msgstr "Al_ternative Reply…"
 msgid "Choose reply options for the selected message"
 msgstr "Choose reply options for the selected message"
 
-#: ../src/mail/e-mail-reader.c:2798 ../src/mail/em-composer-utils.c:4091
+#: ../src/mail/e-mail-reader.c:2798 ../src/mail/em-composer-utils.c:4097
 #: ../src/mail/mail.error.xml.h:26
 #: ../src/modules/mail/e-mail-attachment-handler.c:403
 msgid "Reply to _List"
@@ -18363,7 +18528,7 @@ msgstr "Waiting for attachments to load…"
 #. * 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.
-#: ../src/mail/em-composer-utils.c:2027
+#: ../src/mail/em-composer-utils.c:2032
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -18371,79 +18536,79 @@ msgstr ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 
-#: ../src/mail/em-composer-utils.c:2033
+#: ../src/mail/em-composer-utils.c:2038
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Forwarded Message --------"
 
-#: ../src/mail/em-composer-utils.c:2038
+#: ../src/mail/em-composer-utils.c:2043
 msgid "-----Original Message-----"
 msgstr "-----Original Message-----"
 
 #. Translators: This is a reply attribution in the message reply subject. The %s is replaced with the 
subject of the original message. Both 'Re'-s in the 'reply-attribution' translation context should translate 
into the same string, the same as the ':' separator.
-#: ../src/mail/em-composer-utils.c:2799
+#: ../src/mail/em-composer-utils.c:2804
 #, c-format
 msgctxt "reply-attribution"
 msgid "Re: %s"
 msgstr "Re: %s"
 
-#: ../src/mail/em-composer-utils.c:3417
+#: ../src/mail/em-composer-utils.c:3422
 msgid "an unknown sender"
 msgstr "an unknown sender"
 
-#: ../src/mail/em-composer-utils.c:4042
+#: ../src/mail/em-composer-utils.c:4048
 msgid "Alternative Reply"
 msgstr "Alternative Reply"
 
-#: ../src/mail/em-composer-utils.c:4045
+#: ../src/mail/em-composer-utils.c:4051
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1445
 msgid "_Reply"
 msgstr "_Reply"
 
-#: ../src/mail/em-composer-utils.c:4058
+#: ../src/mail/em-composer-utils.c:4064
 msgid "Recipients:"
 msgstr "Recipients:"
 
-#: ../src/mail/em-composer-utils.c:4086
+#: ../src/mail/em-composer-utils.c:4092
 msgid "Reply to _Sender"
 msgstr "Reply to _Sender"
 
-#: ../src/mail/em-composer-utils.c:4108
+#: ../src/mail/em-composer-utils.c:4114
 msgid "Reply style:"
 msgstr "Reply style:"
 
-#: ../src/mail/em-composer-utils.c:4116
+#: ../src/mail/em-composer-utils.c:4122
 msgid "_Default"
 msgstr "_Default"
 
-#: ../src/mail/em-composer-utils.c:4120
+#: ../src/mail/em-composer-utils.c:4126
 msgid "Attach_ment"
 msgstr "Attach_ment"
 
-#: ../src/mail/em-composer-utils.c:4124
+#: ../src/mail/em-composer-utils.c:4130
 msgid "Inline (_Outlook style)"
 msgstr "Inline (_Outlook style)"
 
-#: ../src/mail/em-composer-utils.c:4128
+#: ../src/mail/em-composer-utils.c:4134
 msgid "_Quote"
 msgstr "_Quote"
 
-#: ../src/mail/em-composer-utils.c:4132
+#: ../src/mail/em-composer-utils.c:4138
 msgid "Do _Not Quote"
 msgstr "Do _Not Quote"
 
-#: ../src/mail/em-composer-utils.c:4139
+#: ../src/mail/em-composer-utils.c:4145
 msgid "_Format message in HTML"
 msgstr "_Format message in HTML"
 
-#: ../src/mail/em-composer-utils.c:4149
+#: ../src/mail/em-composer-utils.c:4158
 msgid "Apply t_emplate"
 msgstr "Apply t_emplate"
 
-#: ../src/mail/em-composer-utils.c:4161
+#: ../src/mail/em-composer-utils.c:4170
 msgid "Preserve original message S_ubject"
 msgstr "Preserve original message S_ubject"
 
-#: ../src/mail/em-composer-utils.c:4227
+#: ../src/mail/em-composer-utils.c:4236
 #, c-format
 msgid "one recipient"
 msgid_plural "%d recipients"
@@ -18451,11 +18616,11 @@ msgstr[0] "one recipient"
 msgstr[1] "%d recipients"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../src/mail/em-composer-utils.c:4636
+#: ../src/mail/em-composer-utils.c:4669
 msgid "Posting destination"
 msgstr "Posting destination"
 
-#: ../src/mail/em-composer-utils.c:4641
+#: ../src/mail/em-composer-utils.c:4674
 msgid "Choose folders to post the message to."
 msgstr "Choose folders to post the message to."
 
@@ -18631,7 +18796,7 @@ msgstr "Appearance"
 msgid "Archive"
 msgstr "Archive"
 
-#: ../src/mail/em-folder-properties.c:1377 ../src/mail/mail-config.ui.h:123
+#: ../src/mail/em-folder-properties.c:1377 ../src/mail/mail-config.ui.h:126
 #: ../src/mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Labels"
@@ -18644,15 +18809,15 @@ msgstr "Folder Properties"
 msgid "Gathering folder properties"
 msgstr "Gathering folder properties"
 
-#: ../src/mail/em-folder-selection-button.c:77
+#: ../src/mail/em-folder-selection-button.c:80
 msgid "<click here to select a folder>"
 msgstr "<click here to select a folder>"
 
-#: ../src/mail/em-folder-selector.c:399
+#: ../src/mail/em-folder-selector.c:422
 msgid "Create a new folder"
 msgstr "Create a new folder"
 
-#: ../src/mail/em-folder-tree.c:685
+#: ../src/mail/em-folder-tree.c:684
 msgid "Folder names cannot contain “/”"
 msgstr "Folder names cannot contain “/”"
 
@@ -18674,37 +18839,37 @@ msgstr "Folder names cannot contain “/”"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../src/mail/em-folder-tree.c:879
+#: ../src/mail/em-folder-tree.c:878
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../src/mail/em-folder-tree.c:1741
+#: ../src/mail/em-folder-tree.c:1740
 msgid "Mail Folder Tree"
 msgstr "Mail Folder Tree"
 
-#: ../src/mail/em-folder-tree.c:2290
+#: ../src/mail/em-folder-tree.c:2289
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moving folder %s"
 
-#: ../src/mail/em-folder-tree.c:2293
+#: ../src/mail/em-folder-tree.c:2292
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copying folder %s"
 
-#: ../src/mail/em-folder-tree.c:2300 ../src/mail/message-list.c:2632
+#: ../src/mail/em-folder-tree.c:2299 ../src/mail/message-list.c:2632
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moving messages into folder %s"
 
-#: ../src/mail/em-folder-tree.c:2304 ../src/mail/message-list.c:2634
+#: ../src/mail/em-folder-tree.c:2303 ../src/mail/message-list.c:2634
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copying messages into folder %s"
 
-#: ../src/mail/em-folder-tree.c:2323
+#: ../src/mail/em-folder-tree.c:2322
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Cannot drop message(s) into toplevel store"
@@ -18770,9 +18935,9 @@ msgid "Unsubscribe From _All"
 msgstr "Unsubscribe From _All"
 
 #: ../src/mail/em-subscription-editor.c:1315
-#: ../src/modules/mail/e-mail-shell-view-private.c:916
-#: ../src/modules/mail/e-mail-shell-view-private.c:948
-#: ../src/modules/mail/e-mail-shell-view-private.c:992
+#: ../src/modules/mail/e-mail-shell-view-private.c:912
+#: ../src/modules/mail/e-mail-shell-view-private.c:944
+#: ../src/modules/mail/e-mail-shell-view-private.c:988
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -18780,7 +18945,7 @@ msgstr[0] "%d unread, "
 msgstr[1] "%d unread, "
 
 #: ../src/mail/em-subscription-editor.c:1319
-#: ../src/modules/mail/e-mail-shell-view-private.c:1002
+#: ../src/modules/mail/e-mail-shell-view-private.c:998
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -19068,7 +19233,7 @@ msgstr "Important"
 msgid "Read"
 msgstr "Read"
 
-#: ../src/mail/filtertypes.xml.in.h:41 ../src/mail/mail-config.ui.h:139
+#: ../src/mail/filtertypes.xml.in.h:41 ../src/mail/mail-config.ui.h:142
 #: ../src/mail/vfoldertypes.xml.in.h:44
 msgid "Junk"
 msgstr "Junk"
@@ -19280,7 +19445,7 @@ msgid "Import mail and contacts from KMail."
 msgstr "Import mail and contacts from KMail."
 
 #: ../src/mail/importers/kmail-libs.c:149
-#: ../src/modules/mail/e-mail-shell-view-private.c:1023
+#: ../src/modules/mail/e-mail-shell-view-private.c:1019
 msgid "Trash"
 msgstr "Wastebasket"
 
@@ -19634,184 +19799,195 @@ msgid "Fix_ed Width Font:"
 msgstr "Fix_ed Width Font:"
 
 #: ../src/mail/mail-config.ui.h:94
+#| msgid "Font _Size"
+msgid "Minimum Font _Size:"
+msgstr "Minimum Font _Size:"
+
+#. Translators: This is part of 'Minimum Font Size: [ spin button ] (in pixels)'
+#: ../src/mail/mail-config.ui.h:96
+msgid "(in pixels)"
+msgstr "(in pixels)"
+
+#: ../src/mail/mail-config.ui.h:97
 msgid "_Mark messages as read after"
 msgstr "_Mark messages as read after"
 
-#: ../src/mail/mail-config.ui.h:96
+#: ../src/mail/mail-config.ui.h:99
 msgid "Highlight _quotations with"
 msgstr "Highlight _quotations with"
 
-#: ../src/mail/mail-config.ui.h:97
+#: ../src/mail/mail-config.ui.h:100
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:66
 msgid "Pick a color"
 msgstr "Pick a colour"
 
-#: ../src/mail/mail-config.ui.h:98
+#: ../src/mail/mail-config.ui.h:101
 msgid "color"
 msgstr "colour"
 
-#: ../src/mail/mail-config.ui.h:99
+#: ../src/mail/mail-config.ui.h:102
 msgid "Default character e_ncoding:"
 msgstr "Default character e_ncoding:"
 
-#: ../src/mail/mail-config.ui.h:100
+#: ../src/mail/mail-config.ui.h:103
 msgid "Apply the same _view settings to all folders"
 msgstr "Apply the same _view settings to all folders"
 
-#: ../src/mail/mail-config.ui.h:101
+#: ../src/mail/mail-config.ui.h:104
 msgid "F_all back to threading messages by subject"
 msgstr "F_all back to threading messages by subject"
 
-#: ../src/mail/mail-config.ui.h:102
+#: ../src/mail/mail-config.ui.h:105
 msgid "Delete Mail"
 msgstr "Delete Mail"
 
-#: ../src/mail/mail-config.ui.h:103
+#: ../src/mail/mail-config.ui.h:106
 msgid "Empty _trash folders"
 msgstr "Empty wastebaske_t folders"
 
-#: ../src/mail/mail-config.ui.h:104
+#: ../src/mail/mail-config.ui.h:107
 msgid "Confirm _when expunging a folder"
 msgstr "Confirm _when expunging a folder"
 
-#: ../src/mail/mail-config.ui.h:105
+#: ../src/mail/mail-config.ui.h:108
 msgid "Confirm when emptying a _Junk folder"
 msgstr "Confirm when emptying a _Junk folder"
 
-#: ../src/mail/mail-config.ui.h:106
+#: ../src/mail/mail-config.ui.h:109
 msgid "Go to the previ_ous message after message deletion"
 msgstr "Go to the previ_ous message after message deletion"
 
-#: ../src/mail/mail-config.ui.h:107
+#: ../src/mail/mail-config.ui.h:110
 msgid "Archive Mail"
 msgstr "Archive Mail"
 
-#: ../src/mail/mail-config.ui.h:108
+#: ../src/mail/mail-config.ui.h:111
 msgid "Archive folder to use for On This Computer messages"
 msgstr "Archive folder to use for On This Computer messages"
 
-#: ../src/mail/mail-config.ui.h:109
+#: ../src/mail/mail-config.ui.h:112
 msgid "On This Computer A_rchive folder:"
 msgstr "On This Computer A_rchive folder:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../src/mail/mail-config.ui.h:111
+#: ../src/mail/mail-config.ui.h:114
 msgid "_Show animated images"
 msgstr "_Show animated images"
 
-#: ../src/mail/mail-config.ui.h:112
+#: ../src/mail/mail-config.ui.h:115
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Prompt on sending HTML mail to contacts that do not want them"
 
-#: ../src/mail/mail-config.ui.h:113
+#: ../src/mail/mail-config.ui.h:116
 msgid "Loading Remote Content"
 msgstr "Loading Remote Content"
 
-#: ../src/mail/mail-config.ui.h:114
+#: ../src/mail/mail-config.ui.h:117
 msgid "_Never load remote content from the Internet"
 msgstr "_Never load remote content from the Internet"
 
-#: ../src/mail/mail-config.ui.h:115
+#: ../src/mail/mail-config.ui.h:118
 msgid "_Load remote content only in messages from contacts"
 msgstr "_Load remote content only in messages from contacts"
 
-#: ../src/mail/mail-config.ui.h:116
+#: ../src/mail/mail-config.ui.h:119
 msgid "_Always load remote content from the Internet"
 msgstr "_Always load remote content from the Internet"
 
-#: ../src/mail/mail-config.ui.h:117
+#: ../src/mail/mail-config.ui.h:120
 msgid "Notify about _missing remote content in the message preview"
 msgstr "Notify about _missing remote content in the message preview"
 
-#: ../src/mail/mail-config.ui.h:118
+#: ../src/mail/mail-config.ui.h:121
 msgid "Add"
 msgstr "Add"
 
-#: ../src/mail/mail-config.ui.h:119
+#: ../src/mail/mail-config.ui.h:122
 msgid "Remove"
 msgstr "Remove"
 
-#: ../src/mail/mail-config.ui.h:120
+#: ../src/mail/mail-config.ui.h:123
 msgid "Allow for sites:"
 msgstr "Allow for sites:"
 
-#: ../src/mail/mail-config.ui.h:121
+#: ../src/mail/mail-config.ui.h:124
 msgid "Allow for senders:"
 msgstr "Allow for senders:"
 
-#: ../src/mail/mail-config.ui.h:122
+#: ../src/mail/mail-config.ui.h:125
 msgid "HTML Messages"
 msgstr "HTML Messages"
 
-#: ../src/mail/mail-config.ui.h:124
+#: ../src/mail/mail-config.ui.h:127
 msgid "Sender Photograph"
 msgstr "Sender Photograph"
 
-#: ../src/mail/mail-config.ui.h:125
+#: ../src/mail/mail-config.ui.h:128
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Show the photograph of sender in the message preview"
 
-#: ../src/mail/mail-config.ui.h:126
-msgid "Search gra_vatar.com for the photograph of sender"
-msgstr "Search gra_vatar.com for the photograph of sender"
+#: ../src/mail/mail-config.ui.h:129
+#| msgid "Search gra_vatar.com for the photograph of sender"
+msgid "Search libra_vatar.org for the photograph of sender"
+msgstr "Search libra_vatar.org for the photograph of sender"
 
-#: ../src/mail/mail-config.ui.h:127
+#: ../src/mail/mail-config.ui.h:130
 msgid "Displayed Message Headers"
 msgstr "Displayed Message Headers"
 
-#: ../src/mail/mail-config.ui.h:128
+#: ../src/mail/mail-config.ui.h:131
 msgid "Show _full mail addresses in message preview"
 msgstr "Show _full mail addresses in message preview"
 
-#: ../src/mail/mail-config.ui.h:129
+#: ../src/mail/mail-config.ui.h:132
 msgid "Mail Headers Table"
 msgstr "Mail Headers Table"
 
-#: ../src/mail/mail-config.ui.h:130
+#: ../src/mail/mail-config.ui.h:133
 msgid "Re_set"
 msgstr "Re_set"
 
-#: ../src/mail/mail-config.ui.h:131
+#: ../src/mail/mail-config.ui.h:134
 #: ../src/modules/addressbook/autocompletion-config.c:118
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Date/Time Format"
 msgstr "Date/Time Format"
 
-#: ../src/mail/mail-config.ui.h:133
+#: ../src/mail/mail-config.ui.h:136
 msgid "Check incoming _messages for junk"
 msgstr "Check incoming _messages for junk"
 
-#: ../src/mail/mail-config.ui.h:134
+#: ../src/mail/mail-config.ui.h:137
 msgid "_Delete junk messages"
 msgstr "_Delete junk messages"
 
-#: ../src/mail/mail-config.ui.h:135
+#: ../src/mail/mail-config.ui.h:138
 msgid "Junk Test Options"
 msgstr "Junk Test Options"
 
-#: ../src/mail/mail-config.ui.h:136
+#: ../src/mail/mail-config.ui.h:139
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "Do not mar_k messages as junk if sender is in my address book"
 
-#: ../src/mail/mail-config.ui.h:137
+#: ../src/mail/mail-config.ui.h:140
 msgid "_Lookup in local address book only"
 msgstr "_Look up in local address book only"
 
-#: ../src/mail/mail-config.ui.h:138
+#: ../src/mail/mail-config.ui.h:141
 msgid "Check cu_stom headers for junk"
 msgstr "Check cu_stom headers for junk"
 
-#: ../src/mail/mail-config.ui.h:140
+#: ../src/mail/mail-config.ui.h:143
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:303
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:246
 msgid "No encryption"
 msgstr "No encryption"
 
-#: ../src/mail/mail-config.ui.h:141
+#: ../src/mail/mail-config.ui.h:144
 msgid "TLS encryption"
 msgstr "TLS encryption"
 
-#: ../src/mail/mail-config.ui.h:142
+#: ../src/mail/mail-config.ui.h:145
 msgid "SSL encryption"
 msgstr "SSL encryption"
 
@@ -20919,7 +21095,7 @@ msgstr "Generating message list"
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
 #: ../src/mail/message-list.c:2154
-#: ../src/modules/itip-formatter/itip-view.c:270
+#: ../src/modules/itip-formatter/itip-view.c:273
 msgid "Today %l:%M %p"
 msgstr "Today %l:%M %p"
 
@@ -20939,20 +21115,20 @@ msgstr "%d %b %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../src/mail/message-list.c:3311
+#: ../src/mail/message-list.c:3361
 msgid "Select all visible messages"
 msgstr "Select all visible messages"
 
-#: ../src/mail/message-list.c:4076 ../src/mail/message-list.etspec.h:17
+#: ../src/mail/message-list.c:4135 ../src/mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "Messages"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../src/mail/message-list.c:5645
+#: ../src/mail/message-list.c:5704
 msgid "Follow-up"
 msgstr "Follow-up"
 
-#: ../src/mail/message-list.c:6708
+#: ../src/mail/message-list.c:6791
 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 "
@@ -20964,11 +21140,11 @@ msgstr ""
 "running a new search either by clearing it with Search→Clear menu item or by "
 "changing the query above."
 
-#: ../src/mail/message-list.c:6716
+#: ../src/mail/message-list.c:6799
 msgid "There are no messages in this folder."
 msgstr "There are no messages in this folder."
 
-#: ../src/mail/message-list.c:6792
+#: ../src/mail/message-list.c:6875
 msgid "Generating message list…"
 msgstr "Generating message list…"
 
@@ -21120,7 +21296,7 @@ msgstr ""
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a 
date in message list
 #: ../src/modules/addressbook/autocompletion-config.c:124
-#: ../src/modules/mail/em-mailer-prefs.c:1696
+#: ../src/modules/mail/em-mailer-prefs.c:1697
 msgid "_Table column:"
 msgstr "_Table column:"
 
@@ -21419,14 +21595,14 @@ msgstr "Show contact preview alongside the contact list"
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1278
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1675
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:790
-#: ../src/modules/calendar/e-task-shell-view-actions.c:998
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1005
 msgid "Unmatched"
 msgstr "Unmatched"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1288
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1685
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:800
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1008
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1015
 #: ../src/modules/mail/e-mail-shell-view-actions.c:2083
 #: ../src/shell/e-shell-content.c:639
 msgid "Advanced Search"
@@ -21744,6 +21920,8 @@ msgstr "Choose an Address Book"
 #: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:334
 #: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:147
 #: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:168
+#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:302
+#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:323
 msgid "URL:"
 msgstr "URL:"
 
@@ -21758,6 +21936,7 @@ msgstr "Avoid IfMatch (needed on Apache < 2.2.8)"
 #: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:352
 #: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:453
 #: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:233
+#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:401
 msgid "URL is not a valid http:// nor https:// URL"
 msgstr "URL is not a valid http:// nor https:// URL"
 
@@ -22032,6 +22211,16 @@ msgstr "Units:"
 msgid "Location cannot be empty"
 msgstr "Location cannot be empty"
 
+#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:106
+#| msgid "Show Notes"
+msgid "Choose Notes"
+msgstr "Choose Notes"
+
+#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:337
+#| msgid "_Find Now"
+msgid "Find Notes"
+msgstr "Find Notes"
+
 #: ../src/modules/calendar/e-cal-attachment-handler.c:283
 #: ../src/smime/gui/smime-ui.ui.h:7
 msgid "I_mport"
@@ -22772,13 +22961,13 @@ msgstr "Occurs Less Than 5 Times"
 
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1699
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:814
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1022
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1029
 msgid "Description contains"
 msgstr "Description contains"
 
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1706
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:821
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1029
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1036
 msgid "Summary contains"
 msgstr "Summary contains"
 
@@ -22788,8 +22977,8 @@ msgstr "Summary contains"
 #: ../src/modules/calendar/e-cal-shell-view-taskpad.c:363
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:831
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:845
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1039
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1053
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1046
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1060
 msgid "Print…"
 msgstr "Print…"
 
@@ -22805,7 +22994,7 @@ msgstr "Preview the calendar to be printed"
 #: ../src/modules/calendar/e-cal-shell-view-memopad.c:279
 #: ../src/modules/calendar/e-cal-shell-view-taskpad.c:373
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:862
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1070
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1077
 msgid "_Save as iCalendar…"
 msgstr "_Save as iCalendar…"
 
@@ -22934,7 +23123,7 @@ msgid "View the selected task"
 msgstr "View the selected task"
 
 #: ../src/modules/calendar/e-cal-shell-view-taskpad.c:365
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1055
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1062
 msgid "Print the selected task"
 msgstr "Print the selected task"
 
@@ -23194,30 +23383,35 @@ msgid "Completed Tasks"
 msgstr "Completed Tasks"
 
 #: ../src/modules/calendar/e-task-shell-view-actions.c:977
+#| msgid "Completed Tasks"
+msgid "Uncompleted Tasks"
+msgstr "Uncompleted Tasks"
+
+#: ../src/modules/calendar/e-task-shell-view-actions.c:984
 msgid "Next 7 Days’ Tasks"
 msgstr "Next 7 Days’ Tasks"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:984
+#: ../src/modules/calendar/e-task-shell-view-actions.c:991
 msgid "Overdue Tasks"
 msgstr "Overdue Tasks"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:991
+#: ../src/modules/calendar/e-task-shell-view-actions.c:998
 msgid "Tasks with Attachments"
 msgstr "Tasks with Attachments"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1041
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1048
 msgid "Print the list of tasks"
 msgstr "Print the list of tasks"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1048
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1055
 msgid "Preview the list of tasks to be printed"
 msgstr "Preview the list of tasks to be printed"
 
-#: ../src/modules/calendar/e-task-shell-view.c:346
+#: ../src/modules/calendar/e-task-shell-view.c:353
 msgid "Delete Tasks"
 msgstr "Delete Tasks"
 
-#: ../src/modules/calendar/e-task-shell-view.c:348
+#: ../src/modules/calendar/e-task-shell-view.c:355
 msgid "Delete Task"
 msgstr "Delete Task"
 
@@ -23228,11 +23422,11 @@ msgid_plural "%d tasks"
 msgstr[0] "%d task"
 msgstr[1] "%d tasks"
 
-#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:326
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:380
 msgid "Convert to M_eeting"
 msgstr "Convert to M_eeting"
 
-#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:328
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:382
 msgid "Convert the message to a meeting request"
 msgstr "Convert the message to a meeting request"
 
@@ -23248,53 +23442,54 @@ msgstr "Convert to the mail message"
 msgid "Look up configuration with e-mail domain"
 msgstr "Look up configuration with e-mail domain"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:82
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:83
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:87
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:88
 msgid "Looking up IMAP server…"
 msgstr "Looking up IMAP server…"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:84
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:85
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:89
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:90
 msgid "Looking up POP3 server…"
 msgstr "Looking up POP3 server…"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:86
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:91
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:92
 msgid "Looking up SMTP server…"
 msgstr "Looking up SMTP server…"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:87
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:88
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:93
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:94
 #: ../src/modules/config-lookup/e-webdav-config-lookup.c:118
 msgid "CalDAV server"
 msgstr "CalDAV server"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:87
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:88
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:93
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:94
 msgid "Looking up CalDAV server…"
 msgstr "Looking up CalDAV server…"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:89
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:90
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:95
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:96
 #: ../src/modules/config-lookup/e-webdav-config-lookup.c:118
 msgid "CardDAV server"
 msgstr "CardDAV server"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:89
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:90
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:95
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:96
 msgid "Looking up CardDAV server…"
 msgstr "Looking up CardDAV server…"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:91
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:92
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:97
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:98
 msgid "LDAP server"
 msgstr "LDAP server"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:91
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:92
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:97
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:98
 msgid "Looking up LDAP server…"
 msgstr "Looking up LDAP server…"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:279
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:285
 msgid "Look up in SRV records"
 msgstr "Look up in SRV records"
 
@@ -23326,194 +23521,205 @@ msgstr "Display part as an invitation"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:261
+#: ../src/modules/itip-formatter/itip-view.c:264
 msgid "Today %H:%M"
 msgstr "Today %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:265
+#: ../src/modules/itip-formatter/itip-view.c:268
 msgid "Today %H:%M:%S"
 msgstr "Today %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:274
+#: ../src/modules/itip-formatter/itip-view.c:277
 msgid "Today %l:%M:%S %p"
 msgstr "Today %l:%M:%S %p"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:289
+#: ../src/modules/itip-formatter/itip-view.c:292
 msgid "Tomorrow %H:%M"
 msgstr "Tomorrow %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:293
+#: ../src/modules/itip-formatter/itip-view.c:296
 msgid "Tomorrow %H:%M:%S"
 msgstr "Tomorrow %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:298
+#: ../src/modules/itip-formatter/itip-view.c:301
 msgid "Tomorrow %l:%M %p"
 msgstr "Tomorrow %l:%M %p"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:302
+#: ../src/modules/itip-formatter/itip-view.c:305
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Tomorrow %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../src/modules/itip-formatter/itip-view.c:321
+#: ../src/modules/itip-formatter/itip-view.c:324
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:326
+#: ../src/modules/itip-formatter/itip-view.c:329
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:330
+#: ../src/modules/itip-formatter/itip-view.c:333
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:335
+#: ../src/modules/itip-formatter/itip-view.c:338
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:339
+#: ../src/modules/itip-formatter/itip-view.c:342
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. * without a year.
-#: ../src/modules/itip-formatter/itip-view.c:348
+#: ../src/modules/itip-formatter/itip-view.c:353
 msgid "%A, %B %e"
 msgstr "%A %e %B"
 
 #. strftime format of a weekday, a date
 #. * without a year and a time,
 #. * in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:354
+#: ../src/modules/itip-formatter/itip-view.c:359
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e %B %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:358
+#: ../src/modules/itip-formatter/itip-view.c:363
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e %B %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:363
+#: ../src/modules/itip-formatter/itip-view.c:368
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e %B %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:367
+#: ../src/modules/itip-formatter/itip-view.c:372
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e %B %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../src/modules/itip-formatter/itip-view.c:373
+#: ../src/modules/itip-formatter/itip-view.c:380
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e %B, %Y"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:378
+#: ../src/modules/itip-formatter/itip-view.c:385
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e %B, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:382
+#: ../src/modules/itip-formatter/itip-view.c:389
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e %B, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:387
+#: ../src/modules/itip-formatter/itip-view.c:394
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e %B, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:391
+#: ../src/modules/itip-formatter/itip-view.c:398
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e %B, %Y %l:%M:%S %p"
 
-#: ../src/modules/itip-formatter/itip-view.c:429
-#: ../src/modules/itip-formatter/itip-view.c:430
-#: ../src/modules/itip-formatter/itip-view.c:519
-#: ../src/modules/itip-formatter/itip-view.c:520
-#: ../src/modules/itip-formatter/itip-view.c:609
+#. Translators: The first '%s' is replaced with an abbreviated date/time of an appointment start or end, 
like "Tomorrow" or "Tomorrow 10:30";
+#. the second '%s' is replaced with the actual date, to know what the 'Tomorrow' means. What the date looks 
like depends on the user settings.
+#. Example: 'Tomorrow 10:30 (20.2.2020)'
+#: ../src/modules/itip-formatter/itip-view.c:425
+#, c-format
+#| msgctxt "SummaryWithLocation"
+#| msgid "%s (%s)"
+msgctxt "cal-itip"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../src/modules/itip-formatter/itip-view.c:463
+#: ../src/modules/itip-formatter/itip-view.c:464
+#: ../src/modules/itip-formatter/itip-view.c:553
+#: ../src/modules/itip-formatter/itip-view.c:554
+#: ../src/modules/itip-formatter/itip-view.c:643
 msgid "An unknown person"
 msgstr "An unknown person"
 
-#: ../src/modules/itip-formatter/itip-view.c:434
-#: ../src/modules/itip-formatter/itip-view.c:524
-#: ../src/modules/itip-formatter/itip-view.c:613
+#: ../src/modules/itip-formatter/itip-view.c:468
+#: ../src/modules/itip-formatter/itip-view.c:558
+#: ../src/modules/itip-formatter/itip-view.c:647
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "Please respond on behalf of %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:436
-#: ../src/modules/itip-formatter/itip-view.c:526
-#: ../src/modules/itip-formatter/itip-view.c:615
+#: ../src/modules/itip-formatter/itip-view.c:470
+#: ../src/modules/itip-formatter/itip-view.c:560
+#: ../src/modules/itip-formatter/itip-view.c:649
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "Received on behalf of %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:441
+#: ../src/modules/itip-formatter/itip-view.c:475
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr "%s through %s has published the following meeting information:"
 
-#: ../src/modules/itip-formatter/itip-view.c:443
+#: ../src/modules/itip-formatter/itip-view.c:477
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s has published the following meeting information:"
 
-#: ../src/modules/itip-formatter/itip-view.c:448
+#: ../src/modules/itip-formatter/itip-view.c:482
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s has delegated the following meeting to you:"
 
-#: ../src/modules/itip-formatter/itip-view.c:451
+#: ../src/modules/itip-formatter/itip-view.c:485
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "%s through %s requests your presence at the following meeting:"
 
-#: ../src/modules/itip-formatter/itip-view.c:453
+#: ../src/modules/itip-formatter/itip-view.c:487
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "%s requests your presence at the following meeting:"
 
-#: ../src/modules/itip-formatter/itip-view.c:459
+#: ../src/modules/itip-formatter/itip-view.c:493
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "%s through %s wishes to add to an existing meeting:"
 
-#: ../src/modules/itip-formatter/itip-view.c:461
+#: ../src/modules/itip-formatter/itip-view.c:495
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "%s wishes to add to an existing meeting:"
 
-#: ../src/modules/itip-formatter/itip-view.c:465
+#: ../src/modules/itip-formatter/itip-view.c:499
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -23522,87 +23728,87 @@ msgstr ""
 "%s through %s wishes to receive the latest information for the following "
 "meeting:"
 
-#: ../src/modules/itip-formatter/itip-view.c:467
+#: ../src/modules/itip-formatter/itip-view.c:501
 #, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "%s wishes to receive the latest information for the following meeting:"
 
-#: ../src/modules/itip-formatter/itip-view.c:471
+#: ../src/modules/itip-formatter/itip-view.c:505
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "%s through %s has sent back the following meeting response:"
 
-#: ../src/modules/itip-formatter/itip-view.c:473
+#: ../src/modules/itip-formatter/itip-view.c:507
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "%s has sent back the following meeting response:"
 
-#: ../src/modules/itip-formatter/itip-view.c:477
+#: ../src/modules/itip-formatter/itip-view.c:511
 #, c-format
 msgid "%s through %s has cancelled the following meeting:"
 msgstr "%s through %s has cancelled the following meeting:"
 
-#: ../src/modules/itip-formatter/itip-view.c:479
+#: ../src/modules/itip-formatter/itip-view.c:513
 #, c-format
 msgid "%s has cancelled the following meeting:"
 msgstr "%s has cancelled the following meeting:"
 
-#: ../src/modules/itip-formatter/itip-view.c:483
+#: ../src/modules/itip-formatter/itip-view.c:517
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "%s through %s has proposed the following meeting changes."
 
-#: ../src/modules/itip-formatter/itip-view.c:485
+#: ../src/modules/itip-formatter/itip-view.c:519
 #, c-format
 msgid "%s has proposed the following meeting changes:"
 msgstr "%s has proposed the following meeting changes:"
 
-#: ../src/modules/itip-formatter/itip-view.c:489
+#: ../src/modules/itip-formatter/itip-view.c:523
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "%s through %s has declined the following meeting changes:"
 
-#: ../src/modules/itip-formatter/itip-view.c:491
+#: ../src/modules/itip-formatter/itip-view.c:525
 #, c-format
 msgid "%s has declined the following meeting changes:"
 msgstr "%s has declined the following meeting changes:"
 
-#: ../src/modules/itip-formatter/itip-view.c:531
+#: ../src/modules/itip-formatter/itip-view.c:565
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr "%s through %s has published the following task:"
 
-#: ../src/modules/itip-formatter/itip-view.c:533
+#: ../src/modules/itip-formatter/itip-view.c:567
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s has published the following task:"
 
-#: ../src/modules/itip-formatter/itip-view.c:538
+#: ../src/modules/itip-formatter/itip-view.c:572
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "%s requests the assignment of %s to the following task:"
 
-#: ../src/modules/itip-formatter/itip-view.c:541
+#: ../src/modules/itip-formatter/itip-view.c:575
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s through %s has assigned you a task:"
 
-#: ../src/modules/itip-formatter/itip-view.c:543
+#: ../src/modules/itip-formatter/itip-view.c:577
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s has assigned you a task:"
 
-#: ../src/modules/itip-formatter/itip-view.c:549
+#: ../src/modules/itip-formatter/itip-view.c:583
 #, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "%s through %s wishes to add to an existing task:"
 
-#: ../src/modules/itip-formatter/itip-view.c:551
+#: ../src/modules/itip-formatter/itip-view.c:585
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "%s wishes to add to an existing task:"
 
-#: ../src/modules/itip-formatter/itip-view.c:555
+#: ../src/modules/itip-formatter/itip-view.c:589
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -23611,212 +23817,212 @@ msgstr ""
 "%s through %s wishes to receive the latest information for the following "
 "assigned task:"
 
-#: ../src/modules/itip-formatter/itip-view.c:557
+#: ../src/modules/itip-formatter/itip-view.c:591
 #, c-format
 msgid ""
 "%s wishes to receive the latest information for the following assigned task:"
 msgstr ""
 "%s wishes to receive the latest information for the following assigned task:"
 
-#: ../src/modules/itip-formatter/itip-view.c:561
+#: ../src/modules/itip-formatter/itip-view.c:595
 #, c-format
 msgid "%s through %s has sent back the following assigned task response:"
 msgstr "%s through %s has sent back the following assigned task response:"
 
-#: ../src/modules/itip-formatter/itip-view.c:563
+#: ../src/modules/itip-formatter/itip-view.c:597
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "%s has sent back the following assigned task response:"
 
-#: ../src/modules/itip-formatter/itip-view.c:567
+#: ../src/modules/itip-formatter/itip-view.c:601
 #, c-format
 msgid "%s through %s has cancelled the following assigned task:"
 msgstr "%s through %s has cancelled the following assigned task:"
 
-#: ../src/modules/itip-formatter/itip-view.c:569
+#: ../src/modules/itip-formatter/itip-view.c:603
 #, c-format
 msgid "%s has cancelled the following assigned task:"
 msgstr "%s has cancelled the following assigned task:"
 
-#: ../src/modules/itip-formatter/itip-view.c:573
+#: ../src/modules/itip-formatter/itip-view.c:607
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "%s through %s has proposed the following task assignment changes:"
 
-#: ../src/modules/itip-formatter/itip-view.c:575
+#: ../src/modules/itip-formatter/itip-view.c:609
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "%s has proposed the following task assignment changes:"
 
-#: ../src/modules/itip-formatter/itip-view.c:579
+#: ../src/modules/itip-formatter/itip-view.c:613
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "%s through %s has declined the following assigned task:"
 
-#: ../src/modules/itip-formatter/itip-view.c:581
+#: ../src/modules/itip-formatter/itip-view.c:615
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s has declined the following assigned task:"
 
-#: ../src/modules/itip-formatter/itip-view.c:620
+#: ../src/modules/itip-formatter/itip-view.c:654
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "%s through %s has published the following memo:"
 
-#: ../src/modules/itip-formatter/itip-view.c:622
+#: ../src/modules/itip-formatter/itip-view.c:656
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s has published the following memo:"
 
-#: ../src/modules/itip-formatter/itip-view.c:627
+#: ../src/modules/itip-formatter/itip-view.c:661
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "%s through %s wishes to add to an existing memo:"
 
-#: ../src/modules/itip-formatter/itip-view.c:629
+#: ../src/modules/itip-formatter/itip-view.c:663
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "%s wishes to add to an existing memo:"
 
-#: ../src/modules/itip-formatter/itip-view.c:633
+#: ../src/modules/itip-formatter/itip-view.c:667
 #, c-format
 msgid "%s through %s has cancelled the following shared memo:"
 msgstr "%s through %s has cancelled the following shared memo:"
 
-#: ../src/modules/itip-formatter/itip-view.c:635
+#: ../src/modules/itip-formatter/itip-view.c:669
 #, c-format
 msgid "%s has cancelled the following shared memo:"
 msgstr "%s has cancelled the following shared memo:"
 
-#: ../src/modules/itip-formatter/itip-view.c:798
+#: ../src/modules/itip-formatter/itip-view.c:857
 msgid "All day:"
 msgstr "All day:"
 
-#: ../src/modules/itip-formatter/itip-view.c:804
+#: ../src/modules/itip-formatter/itip-view.c:863
 msgid "Start day:"
 msgstr "Start day:"
 
-#: ../src/modules/itip-formatter/itip-view.c:804
-#: ../src/modules/itip-formatter/itip-view.c:1636
+#: ../src/modules/itip-formatter/itip-view.c:863
+#: ../src/modules/itip-formatter/itip-view.c:1701
 msgid "Start time:"
 msgstr "Start time:"
 
-#: ../src/modules/itip-formatter/itip-view.c:813
+#: ../src/modules/itip-formatter/itip-view.c:872
 msgid "End day:"
 msgstr "End day:"
 
-#: ../src/modules/itip-formatter/itip-view.c:813
-#: ../src/modules/itip-formatter/itip-view.c:1637
+#: ../src/modules/itip-formatter/itip-view.c:872
+#: ../src/modules/itip-formatter/itip-view.c:1702
 msgid "End time:"
 msgstr "End time:"
 
-#: ../src/modules/itip-formatter/itip-view.c:1183
+#: ../src/modules/itip-formatter/itip-view.c:1248
 msgid "Ope_n Calendar"
 msgstr "Ope_n Calendar"
 
-#: ../src/modules/itip-formatter/itip-view.c:1186
+#: ../src/modules/itip-formatter/itip-view.c:1251
 msgid "_Decline all"
 msgstr "_Decline all"
 
-#: ../src/modules/itip-formatter/itip-view.c:1189
+#: ../src/modules/itip-formatter/itip-view.c:1254
 msgid "_Decline"
 msgstr "_Decline"
 
-#: ../src/modules/itip-formatter/itip-view.c:1192
+#: ../src/modules/itip-formatter/itip-view.c:1257
 msgid "_Tentative all"
 msgstr "_Tentative all"
 
-#: ../src/modules/itip-formatter/itip-view.c:1195
+#: ../src/modules/itip-formatter/itip-view.c:1260
 msgid "_Tentative"
 msgstr "_Tentative"
 
-#: ../src/modules/itip-formatter/itip-view.c:1198
+#: ../src/modules/itip-formatter/itip-view.c:1263
 msgid "Acce_pt all"
 msgstr "Acce_pt all"
 
-#: ../src/modules/itip-formatter/itip-view.c:1201
+#: ../src/modules/itip-formatter/itip-view.c:1266
 msgid "Acce_pt"
 msgstr "Acce_pt"
 
-#: ../src/modules/itip-formatter/itip-view.c:1204
+#: ../src/modules/itip-formatter/itip-view.c:1269
 msgid "Send _Information"
 msgstr "Send _Information"
 
-#: ../src/modules/itip-formatter/itip-view.c:1207
+#: ../src/modules/itip-formatter/itip-view.c:1272
 msgid "_Update Attendee Status"
 msgstr "_Update Attendee Status"
 
-#: ../src/modules/itip-formatter/itip-view.c:1210
+#: ../src/modules/itip-formatter/itip-view.c:1275
 #: ../src/smime/gui/certificate-manager.c:1661
 msgid "_Update"
 msgstr "_Update"
 
-#: ../src/modules/itip-formatter/itip-view.c:1639
-#: ../src/modules/itip-formatter/itip-view.c:1687
-#: ../src/modules/itip-formatter/itip-view.c:1758
+#: ../src/modules/itip-formatter/itip-view.c:1704
+#: ../src/modules/itip-formatter/itip-view.c:1752
+#: ../src/modules/itip-formatter/itip-view.c:1823
 msgid "Comment:"
 msgstr "Comment:"
 
 #. RSVP area
-#: ../src/modules/itip-formatter/itip-view.c:1675
+#: ../src/modules/itip-formatter/itip-view.c:1740
 msgid "Send reply to sender"
 msgstr "Send reply to sender"
 
 #. Updates
-#: ../src/modules/itip-formatter/itip-view.c:1690
+#: ../src/modules/itip-formatter/itip-view.c:1755
 msgid "Send _updates to attendees"
 msgstr "Send _updates to attendees"
 
 #. The recurrence check button
-#: ../src/modules/itip-formatter/itip-view.c:1693
+#: ../src/modules/itip-formatter/itip-view.c:1758
 msgid "_Apply to all instances"
 msgstr "_Apply to all instances"
 
-#: ../src/modules/itip-formatter/itip-view.c:1694
+#: ../src/modules/itip-formatter/itip-view.c:1759
 msgid "Show time as _free"
 msgstr "Show time as _free"
 
-#: ../src/modules/itip-formatter/itip-view.c:1695
+#: ../src/modules/itip-formatter/itip-view.c:1760
 msgid "_Preserve my reminder"
 msgstr "_Preserve my reminder"
 
-#: ../src/modules/itip-formatter/itip-view.c:1696
+#: ../src/modules/itip-formatter/itip-view.c:1761
 msgid "_Inherit reminder"
 msgstr "_Inherit reminder"
 
-#: ../src/modules/itip-formatter/itip-view.c:1910
+#: ../src/modules/itip-formatter/itip-view.c:1975
 msgid "_Tasks:"
 msgstr "_Tasks:"
 
-#: ../src/modules/itip-formatter/itip-view.c:1913
+#: ../src/modules/itip-formatter/itip-view.c:1978
 msgid "_Memos:"
 msgstr "_Memos:"
 
-#: ../src/modules/itip-formatter/itip-view.c:2909
+#: ../src/modules/itip-formatter/itip-view.c:2974
 msgid "Sa_ve"
 msgstr "Sa_ve"
 
-#: ../src/modules/itip-formatter/itip-view.c:3470
-#: ../src/modules/itip-formatter/itip-view.c:5222
+#: ../src/modules/itip-formatter/itip-view.c:3535
+#: ../src/modules/itip-formatter/itip-view.c:5287
 msgid "Attendee status updated"
 msgstr "Attendee status updated"
 
-#: ../src/modules/itip-formatter/itip-view.c:3680
+#: ../src/modules/itip-formatter/itip-view.c:3745
 #, c-format
 msgid "An appointment “%s” in the calendar “%s” conflicts with this meeting"
 msgstr "An appointment “%s” in the calendar “%s” conflicts with this meeting"
 
-#: ../src/modules/itip-formatter/itip-view.c:3687
+#: ../src/modules/itip-formatter/itip-view.c:3752
 #, c-format
 msgid "A task “%s” in the task list “%s” conflicts with this task"
 msgstr "A task “%s” in the task list “%s” conflicts with this task"
 
-#: ../src/modules/itip-formatter/itip-view.c:3694
+#: ../src/modules/itip-formatter/itip-view.c:3759
 #, c-format
 msgid "A memo “%s” in the memo list “%s” conflicts with this memo"
 msgstr "A memo “%s” in the memo list “%s” conflicts with this memo"
 
-#: ../src/modules/itip-formatter/itip-view.c:3705
+#: ../src/modules/itip-formatter/itip-view.c:3770
 #, c-format
 msgid ""
 "The calendar “%s” contains an appointment which conflicts with this meeting"
@@ -23827,7 +24033,7 @@ msgstr[0] ""
 msgstr[1] ""
 "The calendar “%s” contains %d appointments which conflict with this meeting"
 
-#: ../src/modules/itip-formatter/itip-view.c:3714
+#: ../src/modules/itip-formatter/itip-view.c:3779
 #, c-format
 msgid "The task list “%s” contains a task which conflicts with this task"
 msgid_plural ""
@@ -23835,7 +24041,7 @@ msgid_plural ""
 msgstr[0] "The task list “%s” contains a task which conflicts with this task"
 msgstr[1] "The task list “%s” contains %d tasks which conflict with this task"
 
-#: ../src/modules/itip-formatter/itip-view.c:3723
+#: ../src/modules/itip-formatter/itip-view.c:3788
 #, c-format
 msgid "The memo list “%s” contains a memo which conflicts with this memo"
 msgid_plural ""
@@ -23843,219 +24049,221 @@ msgid_plural ""
 msgstr[0] "The memo list “%s” contains a memo which conflicts with this memo"
 msgstr[1] "The memo list “%s” contains %d memos which conflict with this memo"
 
-#: ../src/modules/itip-formatter/itip-view.c:3761
+#: ../src/modules/itip-formatter/itip-view.c:3826
 #, c-format
 msgid "Found the appointment in the calendar “%s”"
 msgstr "Found the appointment in the calendar “%s”"
 
-#: ../src/modules/itip-formatter/itip-view.c:3766
+#: ../src/modules/itip-formatter/itip-view.c:3831
 #, c-format
 msgid "Found the task in the task list “%s”"
 msgstr "Found the task in the task list “%s”"
 
-#: ../src/modules/itip-formatter/itip-view.c:3771
+#: ../src/modules/itip-formatter/itip-view.c:3836
 #, c-format
 msgid "Found the memo in the memo list “%s”"
 msgstr "Found the memo in the memo list “%s”"
 
-#: ../src/modules/itip-formatter/itip-view.c:3782
+#: ../src/modules/itip-formatter/itip-view.c:3847
 msgid "This meeting invitation is obsolete. It had been updated."
 msgstr "This meeting invitation is obsolete. It had been updated."
 
-#: ../src/modules/itip-formatter/itip-view.c:3924
+#: ../src/modules/itip-formatter/itip-view.c:3989
 msgid "Unable to find any calendars"
 msgstr "Unable to find any calendars"
 
-#: ../src/modules/itip-formatter/itip-view.c:3932
+#: ../src/modules/itip-formatter/itip-view.c:3997
 msgid "Unable to find this meeting in any calendar"
 msgstr "Unable to find this meeting in any calendar"
 
-#: ../src/modules/itip-formatter/itip-view.c:3937
+#: ../src/modules/itip-formatter/itip-view.c:4002
 msgid "Unable to find this task in any task list"
 msgstr "Unable to find this task in any task list"
 
-#: ../src/modules/itip-formatter/itip-view.c:3942
+#: ../src/modules/itip-formatter/itip-view.c:4007
 msgid "Unable to find this memo in any memo list"
 msgstr "Unable to find this memo in any memo list"
 
-#: ../src/modules/itip-formatter/itip-view.c:4236
+#: ../src/modules/itip-formatter/itip-view.c:4301
 msgid "Searching for an existing version of this appointment"
 msgstr "Searching for an existing version of this appointment"
 
-#: ../src/modules/itip-formatter/itip-view.c:4240
+#: ../src/modules/itip-formatter/itip-view.c:4305
 msgid "Searching for an existing version of this task"
 msgstr "Searching for an existing version of this task"
 
-#: ../src/modules/itip-formatter/itip-view.c:4244
+#: ../src/modules/itip-formatter/itip-view.c:4309
 msgid "Searching for an existing version of this memo"
 msgstr "Searching for an existing version of this memo"
 
-#: ../src/modules/itip-formatter/itip-view.c:4302
+#: ../src/modules/itip-formatter/itip-view.c:4367
 msgid "Opening the calendar. Please wait…"
 msgstr "Opening the calendar. Please wait…"
 
-#: ../src/modules/itip-formatter/itip-view.c:4718
+#: ../src/modules/itip-formatter/itip-view.c:4783
 #, c-format
 msgid "Unable to send item to calendar “%s”. %s"
 msgstr "Unable to send item to calendar “%s”. %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:4726
+#: ../src/modules/itip-formatter/itip-view.c:4791
 #, c-format
 msgid "Unable to send item to task list “%s”. %s"
 msgstr "Unable to send item to task list “%s”. %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:4734
+#: ../src/modules/itip-formatter/itip-view.c:4799
 #, c-format
 msgid "Unable to send item to memo list “%s”. %s"
 msgstr "Unable to send item to memo list “%s”. %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:4754
+#: ../src/modules/itip-formatter/itip-view.c:4819
 #, c-format
 msgid "Sent to calendar “%s” as accepted"
 msgstr "Sent to calendar “%s” as accepted"
 
-#: ../src/modules/itip-formatter/itip-view.c:4759
+#: ../src/modules/itip-formatter/itip-view.c:4824
 #, c-format
 msgid "Sent to task list “%s” as accepted"
 msgstr "Sent to task list “%s” as accepted"
 
-#: ../src/modules/itip-formatter/itip-view.c:4764
+#: ../src/modules/itip-formatter/itip-view.c:4829
 #, c-format
 msgid "Sent to memo list “%s” as accepted"
 msgstr "Sent to memo list “%s” as accepted"
 
-#: ../src/modules/itip-formatter/itip-view.c:4774
+#: ../src/modules/itip-formatter/itip-view.c:4839
 #, c-format
 msgid "Sent to calendar “%s” as tentative"
 msgstr "Sent to calendar “%s” as tentative"
 
-#: ../src/modules/itip-formatter/itip-view.c:4779
+#: ../src/modules/itip-formatter/itip-view.c:4844
 #, c-format
 msgid "Sent to task list “%s” as tentative"
 msgstr "Sent to task list “%s” as tentative"
 
-#: ../src/modules/itip-formatter/itip-view.c:4784
+#: ../src/modules/itip-formatter/itip-view.c:4849
 #, c-format
 msgid "Sent to memo list “%s” as tentative"
 msgstr "Sent to memo list “%s” as tentative"
 
-#: ../src/modules/itip-formatter/itip-view.c:4794
+#: ../src/modules/itip-formatter/itip-view.c:4859
 #, c-format
 msgid "Sent to calendar “%s” as declined"
 msgstr "Sent to calendar “%s” as declined"
 
-#: ../src/modules/itip-formatter/itip-view.c:4799
+#: ../src/modules/itip-formatter/itip-view.c:4864
 #, c-format
 msgid "Sent to task list “%s” as declined"
 msgstr "Sent to task list “%s” as declined"
 
-#: ../src/modules/itip-formatter/itip-view.c:4804
+#: ../src/modules/itip-formatter/itip-view.c:4869
 #, c-format
 msgid "Sent to memo list “%s” as declined"
 msgstr "Sent to memo list “%s” as declined"
 
-#: ../src/modules/itip-formatter/itip-view.c:4814
+#: ../src/modules/itip-formatter/itip-view.c:4879
 #, c-format
 msgid "Sent to calendar “%s” as cancelled"
 msgstr "Sent to calendar “%s” as cancelled"
 
-#: ../src/modules/itip-formatter/itip-view.c:4819
+#: ../src/modules/itip-formatter/itip-view.c:4884
 #, c-format
 msgid "Sent to task list “%s” as cancelled"
 msgstr "Sent to task list “%s” as cancelled"
 
-#: ../src/modules/itip-formatter/itip-view.c:4824
+#: ../src/modules/itip-formatter/itip-view.c:4889
 #, c-format
 msgid "Sent to memo list “%s” as cancelled"
 msgstr "Sent to memo list “%s” as cancelled"
 
-#: ../src/modules/itip-formatter/itip-view.c:4842
+#: ../src/modules/itip-formatter/itip-view.c:4907
 msgid "Saving changes to the calendar. Please wait…"
 msgstr "Saving changes to the calendar. Please wait…"
 
-#: ../src/modules/itip-formatter/itip-view.c:4845
+#: ../src/modules/itip-formatter/itip-view.c:4910
 msgid "Saving changes to the task list. Please wait…"
 msgstr "Saving changes to the task list. Please wait…"
 
-#: ../src/modules/itip-formatter/itip-view.c:4848
+#: ../src/modules/itip-formatter/itip-view.c:4913
 msgid "Saving changes to the memo list. Please wait…"
 msgstr "Saving changes to the memo list. Please wait…"
 
-#: ../src/modules/itip-formatter/itip-view.c:4939
+#: ../src/modules/itip-formatter/itip-view.c:5004
 msgid "Unable to parse item"
 msgstr "Unable to parse item"
 
-#: ../src/modules/itip-formatter/itip-view.c:5147
+#: ../src/modules/itip-formatter/itip-view.c:5212
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organiser has removed the delegate %s "
 
-#: ../src/modules/itip-formatter/itip-view.c:5164
-msgid "Sent a cancelation notice to the delegate"
+#: ../src/modules/itip-formatter/itip-view.c:5229
+#| msgid "Sent a cancelation notice to the delegate"
+msgid "Sent a cancellation notice to the delegate"
 msgstr "Sent a cancellation notice to the delegate"
 
-#: ../src/modules/itip-formatter/itip-view.c:5168
-msgid "Could not send the cancelation notice to the delegate"
+#: ../src/modules/itip-formatter/itip-view.c:5233
+#| msgid "Could not send the cancelation notice to the delegate"
+msgid "Could not send the cancellation notice to the delegate"
 msgstr "Could not send the cancellation notice to the delegate"
 
-#: ../src/modules/itip-formatter/itip-view.c:5214
+#: ../src/modules/itip-formatter/itip-view.c:5279
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Unable to update attendee. %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:5247
+#: ../src/modules/itip-formatter/itip-view.c:5312
 msgid "The meeting is invalid and cannot be updated"
 msgstr "The meeting is invalid and cannot be updated"
 
-#: ../src/modules/itip-formatter/itip-view.c:5332
+#: ../src/modules/itip-formatter/itip-view.c:5397
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Attendee status could not be updated because the status is invalid"
 
-#: ../src/modules/itip-formatter/itip-view.c:5407
-#: ../src/modules/itip-formatter/itip-view.c:5445
+#: ../src/modules/itip-formatter/itip-view.c:5472
+#: ../src/modules/itip-formatter/itip-view.c:5510
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Attendee status can not be updated because the item no longer exists"
 
-#: ../src/modules/itip-formatter/itip-view.c:5506
+#: ../src/modules/itip-formatter/itip-view.c:5571
 msgid "Meeting information sent"
 msgstr "Meeting information sent"
 
-#: ../src/modules/itip-formatter/itip-view.c:5511
+#: ../src/modules/itip-formatter/itip-view.c:5576
 msgid "Task information sent"
 msgstr "Task information sent"
 
-#: ../src/modules/itip-formatter/itip-view.c:5516
+#: ../src/modules/itip-formatter/itip-view.c:5581
 msgid "Memo information sent"
 msgstr "Memo information sent"
 
-#: ../src/modules/itip-formatter/itip-view.c:5527
+#: ../src/modules/itip-formatter/itip-view.c:5592
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Unable to send meeting information, the meeting does not exist"
 
-#: ../src/modules/itip-formatter/itip-view.c:5532
+#: ../src/modules/itip-formatter/itip-view.c:5597
 msgid "Unable to send task information, the task does not exist"
 msgstr "Unable to send task information, the task does not exist"
 
-#: ../src/modules/itip-formatter/itip-view.c:5537
+#: ../src/modules/itip-formatter/itip-view.c:5602
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Unable to send memo information, the memo does not exist"
 
 #. Translators: This is a default filename for a calendar.
-#: ../src/modules/itip-formatter/itip-view.c:5582
+#: ../src/modules/itip-formatter/itip-view.c:5647
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../src/modules/itip-formatter/itip-view.c:5587
+#: ../src/modules/itip-formatter/itip-view.c:5652
 msgid "Save Calendar"
 msgstr "Save Calendar"
 
-#: ../src/modules/itip-formatter/itip-view.c:5635
-#: ../src/modules/itip-formatter/itip-view.c:5648
+#: ../src/modules/itip-formatter/itip-view.c:5700
+#: ../src/modules/itip-formatter/itip-view.c:5713
 msgid "The calendar attached is not valid"
 msgstr "The calendar attached is not valid"
 
-#: ../src/modules/itip-formatter/itip-view.c:5636
-#: ../src/modules/itip-formatter/itip-view.c:5649
+#: ../src/modules/itip-formatter/itip-view.c:5701
+#: ../src/modules/itip-formatter/itip-view.c:5714
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -24063,15 +24271,15 @@ msgstr ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 
-#: ../src/modules/itip-formatter/itip-view.c:5731
-#: ../src/modules/itip-formatter/itip-view.c:5815
-#: ../src/modules/itip-formatter/itip-view.c:5919
+#: ../src/modules/itip-formatter/itip-view.c:5796
+#: ../src/modules/itip-formatter/itip-view.c:5880
+#: ../src/modules/itip-formatter/itip-view.c:5984
 msgid "The item in the calendar is not valid"
 msgstr "The item in the calendar is not valid"
 
-#: ../src/modules/itip-formatter/itip-view.c:5732
-#: ../src/modules/itip-formatter/itip-view.c:5816
-#: ../src/modules/itip-formatter/itip-view.c:5920
+#: ../src/modules/itip-formatter/itip-view.c:5797
+#: ../src/modules/itip-formatter/itip-view.c:5881
+#: ../src/modules/itip-formatter/itip-view.c:5985
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -24079,11 +24287,11 @@ msgstr ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 
-#: ../src/modules/itip-formatter/itip-view.c:5825
+#: ../src/modules/itip-formatter/itip-view.c:5890
 msgid "The calendar attached contains multiple items"
 msgstr "The calendar attached contains multiple items"
 
-#: ../src/modules/itip-formatter/itip-view.c:5826
+#: ../src/modules/itip-formatter/itip-view.c:5891
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -24091,12 +24299,12 @@ msgstr ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 
-#: ../src/modules/itip-formatter/itip-view.c:6413
+#: ../src/modules/itip-formatter/itip-view.c:6478
 msgctxt "cal-itip"
 msgid "None"
 msgstr "None"
 
-#: ../src/modules/itip-formatter/itip-view.c:6431
+#: ../src/modules/itip-formatter/itip-view.c:6496
 msgid "Tentatively Accepted"
 msgstr "Tentatively Accepted"
 
@@ -24331,65 +24539,65 @@ msgid "Create a new mail folder"
 msgstr "Create a new mail folder"
 
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
-#. it to some user-frienly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:782
+#. it to some user-friendly form, or keep it as is.
+#: ../src/modules/mail/e-mail-shell-backend.c:786
 msgctxt "NetworkMonitor"
 msgid "base"
 msgstr "base"
 
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
-#. it to some user-frienly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:785
+#. it to some user-friendly form, or keep it as is.
+#: ../src/modules/mail/e-mail-shell-backend.c:789
 msgctxt "NetworkMonitor"
 msgid "netlink"
 msgstr "netlink"
 
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
-#. it to some user-frienly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:788
+#. it to some user-friendly form, or keep it as is.
+#: ../src/modules/mail/e-mail-shell-backend.c:792
 msgctxt "NetworkMonitor"
 msgid "networkmanager"
 msgstr "networkmanager"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:818
+#: ../src/modules/mail/e-mail-shell-backend.c:822
 msgctxt "NetworkMonitor"
 msgid "Method to detect _online state:"
 msgstr "Method to detect _online state:"
 
 #. Translators: The '%s' is replaced with the actual name of the GNetworkMonitor implementation
-#: ../src/modules/mail/e-mail-shell-backend.c:829
+#: ../src/modules/mail/e-mail-shell-backend.c:833
 #, c-format
 msgctxt "NetworkMonitor"
 msgid "Default (%s)"
 msgstr "Default (%s)"
 
 #. Always as the first
-#: ../src/modules/mail/e-mail-shell-backend.c:833
+#: ../src/modules/mail/e-mail-shell-backend.c:837
 msgctxt "NetworkMonitor"
 msgid "Default"
 msgstr "Default"
 
 #. Always as the last
-#: ../src/modules/mail/e-mail-shell-backend.c:850
+#: ../src/modules/mail/e-mail-shell-backend.c:854
 msgctxt "NetworkMonitor"
 msgid "Always Online"
 msgstr "Always Online"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:919
+#: ../src/modules/mail/e-mail-shell-backend.c:923
 msgid "Mail Preferences"
 msgstr "Mail Preferences"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:928
+#: ../src/modules/mail/e-mail-shell-backend.c:932
 msgid "Composer Preferences"
 msgstr "Composer Preferences"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:937
+#: ../src/modules/mail/e-mail-shell-backend.c:941
 msgid "Network Preferences"
 msgstr "Network Preferences"
 
 #. Translators: The first item in the list, to be
 #. * able to set rule: [Label] [is/is-not] [None]
-#: ../src/modules/mail/e-mail-shell-backend.c:1298
+#: ../src/modules/mail/e-mail-shell-backend.c:1302
 msgctxt "label"
 msgid "None"
 msgstr "None"
@@ -24759,70 +24967,70 @@ msgstr "Current Folder"
 msgid "Current Folder and Subfolders"
 msgstr "Current Folder and Subfolders"
 
-#: ../src/modules/mail/e-mail-shell-view.c:895
+#: ../src/modules/mail/e-mail-shell-view.c:1028
 msgid "Current Folder and Subfolders Search"
 msgstr "Current Folder and Subfolders Search"
 
-#: ../src/modules/mail/e-mail-shell-view.c:1017
+#: ../src/modules/mail/e-mail-shell-view.c:1150
 msgid "All Account Search"
 msgstr "All Account Search"
 
-#: ../src/modules/mail/e-mail-shell-view.c:1127
+#: ../src/modules/mail/e-mail-shell-view.c:1260
 msgid "Account Search"
 msgstr "Account Search"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:909
+#: ../src/modules/mail/e-mail-shell-view-private.c:905
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d selected, "
 msgstr[1] "%d selected, "
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:924
-#: ../src/modules/mail/e-mail-shell-view-private.c:941
+#: ../src/modules/mail/e-mail-shell-view-private.c:920
+#: ../src/modules/mail/e-mail-shell-view-private.c:937
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d deleted"
 msgstr[1] "%d deleted"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:955
-#: ../src/modules/mail/e-mail-shell-view-private.c:961
+#: ../src/modules/mail/e-mail-shell-view-private.c:951
+#: ../src/modules/mail/e-mail-shell-view-private.c:957
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d junk"
 msgstr[1] "%d junk"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:968
+#: ../src/modules/mail/e-mail-shell-view-private.c:964
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d draft"
 msgstr[1] "%d drafts"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:974
+#: ../src/modules/mail/e-mail-shell-view-private.c:970
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d unsent"
 msgstr[1] "%d unsent"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:980
+#: ../src/modules/mail/e-mail-shell-view-private.c:976
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d sent"
 msgstr[1] "%d sent"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:997
+#: ../src/modules/mail/e-mail-shell-view-private.c:993
 #, c-format
 msgid "%d unread"
 msgid_plural "%d unread"
 msgstr[0] "%d unread"
 msgstr[1] "%d unread"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:1515
+#: ../src/modules/mail/e-mail-shell-view-private.c:1511
 msgid "Send / Receive"
 msgstr "Send / Receive"
 
@@ -24887,11 +25095,11 @@ msgid "Contains Value"
 msgstr "Contains Value"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail 
message window/preview
-#: ../src/modules/mail/em-mailer-prefs.c:1698
+#: ../src/modules/mail/em-mailer-prefs.c:1699
 msgid "_Date header:"
 msgstr "_Date header:"
 
-#: ../src/modules/mail/em-mailer-prefs.c:1699
+#: ../src/modules/mail/em-mailer-prefs.c:1700
 msgid "Show _original header value"
 msgstr "Show _original header value"
 
@@ -24970,7 +25178,7 @@ msgstr "Author(s)"
 
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:303
 msgid "Plugin Manager"
-msgstr "Plugin Manager"
+msgstr "Plug-in Manager"
 
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:318
 msgid "Note: Some changes will not take effect until restart"
@@ -24983,15 +25191,15 @@ msgstr "Overview"
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:415
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:498
 msgid "Plugin"
-msgstr "Plugin"
+msgstr "Plug-in"
 
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:536
 msgid "_Plugins"
-msgstr "_Plugins"
+msgstr "_Plug-ins"
 
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:537
 msgid "Enable and disable plugins"
-msgstr "Enable and disable plugins"
+msgstr "Enable and disable plug-ins"
 
 #: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:138
 msgid "Display plain text version"
@@ -25462,40 +25670,40 @@ msgstr "Attachment Reminder"
 msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr "Reminds you when you forgot to add an attachment to a mail message."
 
-#: ../src/plugins/bbdb/bbdb.c:756 ../src/plugins/bbdb/bbdb.c:879
+#: ../src/plugins/bbdb/bbdb.c:715 ../src/plugins/bbdb/bbdb.c:838
 #: ../src/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatic Contacts"
 
 #. Enable BBDB checkbox
-#: ../src/plugins/bbdb/bbdb.c:771
+#: ../src/plugins/bbdb/bbdb.c:730
 msgid "Create _address book entries when sending mails"
 msgstr "Create _address book entries when sending mails"
 
 #. File Under setting
-#: ../src/plugins/bbdb/bbdb.c:782
+#: ../src/plugins/bbdb/bbdb.c:741
 msgid "Set File _under as “First Last”, instead of “Last, First”"
 msgstr "Set File _under as “First Last”, instead of “Last, First”"
 
-#: ../src/plugins/bbdb/bbdb.c:793
+#: ../src/plugins/bbdb/bbdb.c:752
 msgid "Select Address book for Automatic Contacts"
 msgstr "Select Address book for Automatic Contacts"
 
-#: ../src/plugins/bbdb/bbdb.c:813
+#: ../src/plugins/bbdb/bbdb.c:772
 msgid "Instant Messaging Contacts"
 msgstr "Instant Messaging Contacts"
 
 #. Enable Gaim Checkbox
-#: ../src/plugins/bbdb/bbdb.c:828
+#: ../src/plugins/bbdb/bbdb.c:787
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "_Synchronise contact info and images from Pidgin buddy list"
 
-#: ../src/plugins/bbdb/bbdb.c:838
+#: ../src/plugins/bbdb/bbdb.c:797
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Select Address book for Pidgin buddy list"
 
 #. Synchronize now button.
-#: ../src/plugins/bbdb/bbdb.c:854
+#: ../src/plugins/bbdb/bbdb.c:813
 msgid "Synchronize with _buddy list now"
 msgstr "Synchronise with _buddy list now"
 
@@ -25610,11 +25818,11 @@ msgstr "Add custom headers to outgoing mail messages."
 msgid "Email Custom Header"
 msgstr "E-mail Custom Header"
 
-#: ../src/plugins/external-editor/external-editor.c:111
+#: ../src/plugins/external-editor/external-editor.c:108
 msgid "Command to be executed to launch the editor: "
 msgstr "Command to be executed to launch the editor: "
 
-#: ../src/plugins/external-editor/external-editor.c:112
+#: ../src/plugins/external-editor/external-editor.c:109
 msgid ""
 "For XEmacs use “xemacs”\n"
 "For Vim use “gvim -f”"
@@ -25622,12 +25830,12 @@ msgstr ""
 "For XEmacs use “xemacs”\n"
 "For Vim use “gvim -f”"
 
-#: ../src/plugins/external-editor/external-editor.c:122
+#: ../src/plugins/external-editor/external-editor.c:119
 msgid "_Automatically launch when a new mail is edited"
 msgstr "_Automatically launch when a new mail is edited"
 
-#: ../src/plugins/external-editor/external-editor.c:455
-#: ../src/plugins/external-editor/external-editor.c:457
+#: ../src/plugins/external-editor/external-editor.c:489
+#: ../src/plugins/external-editor/external-editor.c:491
 msgid "Compose in External Editor"
 msgstr "Compose in External Editor"
 
@@ -25648,7 +25856,7 @@ msgid ""
 "The external editor set in your plugin preferences cannot be launched. Try "
 "setting a different editor."
 msgstr ""
-"The external editor set in your plugin preferences cannot be launched. Try "
+"The external editor set in your plug-in preferences cannot be launched. Try "
 "setting a different editor."
 
 #: ../src/plugins/external-editor/org-gnome-external-editor.error.xml.h:3
@@ -26321,10 +26529,6 @@ msgstr "_File:"
 msgid "P_ort:"
 msgstr "P_ort:"
 
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:29
-msgid "_Username:"
-msgstr "_Username:"
-
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:32
 msgid "Publishing Location"
 msgstr "Publishing Location"
@@ -26474,7 +26678,7 @@ msgid ""
 "$ORIG[from], $ORIG[to], $ORIG[body], $ORIG[quoted-body] or $ORIG[reply-"
 "credits], which will be replaced by values from an email you are replying to."
 msgstr ""
-"Drafts based template plugin. You can use variables like $ORIG[subject], "
+"Drafts based template plug-in. You can use variables like $ORIG[subject], "
 "$ORIG[from], $ORIG[to], $ORIG[body], $ORIG[quoted-body] or $ORIG[reply-"
 "credits], which will be replaced by values from an email you are replying to."
 
@@ -26567,304 +26771,309 @@ msgstr ""
 msgid "Website"
 msgstr "Website"
 
-#: ../src/shell/e-shell-view.c:295
+#: ../src/shell/e-shell-view.c:296
 msgid "Saving user interface state"
 msgstr "Saving user interface state"
 
-#: ../src/shell/e-shell-window-actions.c:345
+#: ../src/shell/e-shell-window-actions.c:351
 msgid "Categories Editor"
 msgstr "Categories Editor"
 
-#: ../src/shell/e-shell-window-actions.c:648
+#: ../src/shell/e-shell-window-actions.c:654
 msgid "Bug Buddy is not installed."
 msgstr "Bug Buddy is not installed."
 
-#: ../src/shell/e-shell-window-actions.c:649
+#: ../src/shell/e-shell-window-actions.c:655
 msgid "Bug Buddy could not be run."
 msgstr "Bug Buddy could not be run."
 
-#: ../src/shell/e-shell-window-actions.c:845
+#: ../src/shell/e-shell-window-actions.c:851
 msgid "Collect_ion Account"
 msgstr "Collect_ion Account"
 
-#: ../src/shell/e-shell-window-actions.c:847
+#: ../src/shell/e-shell-window-actions.c:853
 msgid "Create a new collection account"
 msgstr "Create a new collection account"
 
-#: ../src/shell/e-shell-window-actions.c:855
+#: ../src/shell/e-shell-window-actions.c:861
 msgid "_About"
 msgstr "_About"
 
-#: ../src/shell/e-shell-window-actions.c:857
+#: ../src/shell/e-shell-window-actions.c:863
 msgid "Show information about Evolution"
 msgstr "Show information about Evolution"
 
-#: ../src/shell/e-shell-window-actions.c:862
+#: ../src/shell/e-shell-window-actions.c:868
 msgid "_Accounts"
 msgstr "_Accounts"
 
-#: ../src/shell/e-shell-window-actions.c:864
+#: ../src/shell/e-shell-window-actions.c:870
 msgid "Configure Evolution Accounts"
 msgstr "Configure Evolution Accounts"
 
-#: ../src/shell/e-shell-window-actions.c:869
-#: ../src/shell/e-shell-window-actions.c:883
+#: ../src/shell/e-shell-window-actions.c:875
+#: ../src/shell/e-shell-window-actions.c:889
 msgid "_Close Window"
 msgstr "_Close Window"
 
-#: ../src/shell/e-shell-window-actions.c:890
+#: ../src/shell/e-shell-window-actions.c:896
 msgid "_Contents"
 msgstr "_Contents"
 
-#: ../src/shell/e-shell-window-actions.c:892
+#: ../src/shell/e-shell-window-actions.c:898
 msgid "Open the Evolution User Guide"
 msgstr "Open the Evolution User Guide"
 
-#: ../src/shell/e-shell-window-actions.c:918
+#: ../src/shell/e-shell-window-actions.c:924
 msgid "I_mport…"
 msgstr "I_mport…"
 
-#: ../src/shell/e-shell-window-actions.c:920
+#: ../src/shell/e-shell-window-actions.c:926
 msgid "Import data from other programs"
 msgstr "Import data from other programs"
 
-#: ../src/shell/e-shell-window-actions.c:925
+#: ../src/shell/e-shell-window-actions.c:931
 msgid "New _Window"
 msgstr "New _Window"
 
-#: ../src/shell/e-shell-window-actions.c:927
+#: ../src/shell/e-shell-window-actions.c:933
 msgid "Create a new window displaying this view"
 msgstr "Create a new window displaying this view"
 
-#: ../src/shell/e-shell-window-actions.c:939
+#: ../src/shell/e-shell-window-actions.c:945
 msgid "Available Cate_gories"
 msgstr "Available Cate_gories"
 
-#: ../src/shell/e-shell-window-actions.c:941
+#: ../src/shell/e-shell-window-actions.c:947
 msgid "Manage available categories"
 msgstr "Manage available categories"
 
-#: ../src/shell/e-shell-window-actions.c:953
+#: ../src/shell/e-shell-window-actions.c:959
 msgid "_Quit"
 msgstr "_Quit"
 
-#: ../src/shell/e-shell-window-actions.c:955
+#: ../src/shell/e-shell-window-actions.c:961
 msgid "Exit the program"
 msgstr "Exit the program"
 
-#: ../src/shell/e-shell-window-actions.c:960
+#: ../src/shell/e-shell-window-actions.c:966
+#| msgid "Save Search"
+msgid "_Saved Searches"
+msgstr "_Saved Searches"
+
+#: ../src/shell/e-shell-window-actions.c:973
 msgid "_Advanced Search…"
 msgstr "_Advanced Search…"
 
-#: ../src/shell/e-shell-window-actions.c:962
+#: ../src/shell/e-shell-window-actions.c:975
 msgid "Construct a more advanced search"
 msgstr "Construct a more advanced search"
 
-#: ../src/shell/e-shell-window-actions.c:969
+#: ../src/shell/e-shell-window-actions.c:982
 msgid "Clear the current search parameters"
 msgstr "Clear the current search parameters"
 
-#: ../src/shell/e-shell-window-actions.c:974
+#: ../src/shell/e-shell-window-actions.c:987
 msgid "_Edit Saved Searches…"
 msgstr "_Edit Saved Searches…"
 
-#: ../src/shell/e-shell-window-actions.c:976
+#: ../src/shell/e-shell-window-actions.c:989
 msgid "Manage your saved searches"
 msgstr "Manage your saved searches"
 
-#: ../src/shell/e-shell-window-actions.c:983
+#: ../src/shell/e-shell-window-actions.c:996
 msgid "Click here to change the search type"
 msgstr "Click here to change the search type"
 
-#: ../src/shell/e-shell-window-actions.c:988
+#: ../src/shell/e-shell-window-actions.c:1001
 msgid "_Find Now"
 msgstr "_Find Now"
 
-#: ../src/shell/e-shell-window-actions.c:990
+#: ../src/shell/e-shell-window-actions.c:1003
 msgid "Execute the current search parameters"
 msgstr "Execute the current search parameters"
 
-#: ../src/shell/e-shell-window-actions.c:995
+#: ../src/shell/e-shell-window-actions.c:1008
 msgid "_Save Search…"
 msgstr "_Save Search…"
 
-#: ../src/shell/e-shell-window-actions.c:997
+#: ../src/shell/e-shell-window-actions.c:1010
 msgid "Save the current search parameters"
 msgstr "Save the current search parameters"
 
-#: ../src/shell/e-shell-window-actions.c:1009
+#: ../src/shell/e-shell-window-actions.c:1022
 msgid "_Keyboard Shortcuts"
 msgstr "_Keyboard Shortcuts"
 
-#: ../src/shell/e-shell-window-actions.c:1011
+#: ../src/shell/e-shell-window-actions.c:1024
 msgid "Show keyboard shortcuts"
 msgstr "Show keyboard shortcuts"
 
-#: ../src/shell/e-shell-window-actions.c:1016
+#: ../src/shell/e-shell-window-actions.c:1029
 msgid "Submit _Bug Report…"
 msgstr "Submit _Bug Report…"
 
-#: ../src/shell/e-shell-window-actions.c:1018
+#: ../src/shell/e-shell-window-actions.c:1031
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Submit a bug report using Bug Buddy"
 
-#: ../src/shell/e-shell-window-actions.c:1023
+#: ../src/shell/e-shell-window-actions.c:1036
 msgid "_Work Offline"
 msgstr "_Work Offline"
 
-#: ../src/shell/e-shell-window-actions.c:1025
+#: ../src/shell/e-shell-window-actions.c:1038
 msgid "Put Evolution into offline mode"
 msgstr "Put Evolution into offline mode"
 
-#: ../src/shell/e-shell-window-actions.c:1030
+#: ../src/shell/e-shell-window-actions.c:1043
 msgid "_Work Online"
 msgstr "_Work Online"
 
-#: ../src/shell/e-shell-window-actions.c:1032
+#: ../src/shell/e-shell-window-actions.c:1045
 msgid "Put Evolution into online mode"
 msgstr "Put Evolution into online mode"
 
-#: ../src/shell/e-shell-window-actions.c:1060
+#: ../src/shell/e-shell-window-actions.c:1073
 msgid "Lay_out"
 msgstr "Lay_out"
 
 #. Translators: This is a New menu item caption, under File->New
-#: ../src/shell/e-shell-window-actions.c:1068
+#: ../src/shell/e-shell-window-actions.c:1081
 msgid "_New"
 msgstr "_New"
 
-#: ../src/shell/e-shell-window-actions.c:1075
+#: ../src/shell/e-shell-window-actions.c:1088
 msgid "_Search"
 msgstr "_Search"
 
-#: ../src/shell/e-shell-window-actions.c:1082
+#: ../src/shell/e-shell-window-actions.c:1095
 msgid "_Switcher Appearance"
 msgstr "_Switcher Appearance"
 
-#: ../src/shell/e-shell-window-actions.c:1096
+#: ../src/shell/e-shell-window-actions.c:1109
 msgid "_Window"
 msgstr "_Window"
 
-#: ../src/shell/e-shell-window-actions.c:1125
+#: ../src/shell/e-shell-window-actions.c:1138
 msgid "Show _Menu Bar"
 msgstr "Show _Menu Bar"
 
-#: ../src/shell/e-shell-window-actions.c:1127
+#: ../src/shell/e-shell-window-actions.c:1140
 msgid "Show the menu bar"
 msgstr "Show the menu bar"
 
-#: ../src/shell/e-shell-window-actions.c:1133
+#: ../src/shell/e-shell-window-actions.c:1146
 msgid "Show Side _Bar"
 msgstr "Show Side _Bar"
 
-#: ../src/shell/e-shell-window-actions.c:1135
+#: ../src/shell/e-shell-window-actions.c:1148
 msgid "Show the side bar"
 msgstr "Show the side bar"
 
-#: ../src/shell/e-shell-window-actions.c:1141
+#: ../src/shell/e-shell-window-actions.c:1154
 msgid "Show _Buttons"
 msgstr "Show _Buttons"
 
-#: ../src/shell/e-shell-window-actions.c:1143
+#: ../src/shell/e-shell-window-actions.c:1156
 msgid "Show the switcher buttons"
 msgstr "Show the switcher buttons"
 
-#: ../src/shell/e-shell-window-actions.c:1149
+#: ../src/shell/e-shell-window-actions.c:1162
 msgid "Show _Status Bar"
 msgstr "Show _Status Bar"
 
-#: ../src/shell/e-shell-window-actions.c:1151
+#: ../src/shell/e-shell-window-actions.c:1164
 msgid "Show the status bar"
 msgstr "Show the status bar"
 
-#: ../src/shell/e-shell-window-actions.c:1157
+#: ../src/shell/e-shell-window-actions.c:1170
 msgid "Show _Tool Bar"
 msgstr "Show _Tool Bar"
 
-#: ../src/shell/e-shell-window-actions.c:1159
+#: ../src/shell/e-shell-window-actions.c:1172
 msgid "Show the tool bar"
 msgstr "Show the tool bar"
 
-#: ../src/shell/e-shell-window-actions.c:1181
+#: ../src/shell/e-shell-window-actions.c:1194
 msgid "_Icons Only"
 msgstr "_Icons Only"
 
-#: ../src/shell/e-shell-window-actions.c:1183
+#: ../src/shell/e-shell-window-actions.c:1196
 msgid "Display window buttons with icons only"
 msgstr "Display window buttons with icons only"
 
-#: ../src/shell/e-shell-window-actions.c:1188
+#: ../src/shell/e-shell-window-actions.c:1201
 msgid "_Text Only"
 msgstr "_Text Only"
 
-#: ../src/shell/e-shell-window-actions.c:1190
+#: ../src/shell/e-shell-window-actions.c:1203
 msgid "Display window buttons with text only"
 msgstr "Display window buttons with text only"
 
-#: ../src/shell/e-shell-window-actions.c:1195
+#: ../src/shell/e-shell-window-actions.c:1208
 msgid "Icons _and Text"
 msgstr "Icons _and Text"
 
-#: ../src/shell/e-shell-window-actions.c:1197
+#: ../src/shell/e-shell-window-actions.c:1210
 msgid "Display window buttons with icons and text"
 msgstr "Display window buttons with icons and text"
 
-#: ../src/shell/e-shell-window-actions.c:1202
+#: ../src/shell/e-shell-window-actions.c:1215
 msgid "Tool_bar Style"
 msgstr "Tool_bar Style"
 
-#: ../src/shell/e-shell-window-actions.c:1204
+#: ../src/shell/e-shell-window-actions.c:1217
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "Display window buttons using the desktop toolbar setting"
 
-#: ../src/shell/e-shell-window-actions.c:1212
+#: ../src/shell/e-shell-window-actions.c:1225
 msgid "Delete Current View"
 msgstr "Delete Current View"
 
-#: ../src/shell/e-shell-window-actions.c:1219
+#: ../src/shell/e-shell-window-actions.c:1232
 msgid "Save Custom View…"
 msgstr "Save Custom View…"
 
-#: ../src/shell/e-shell-window-actions.c:1221
+#: ../src/shell/e-shell-window-actions.c:1234
 msgid "Save current custom view"
 msgstr "Save current custom view"
 
-#: ../src/shell/e-shell-window-actions.c:1235
+#: ../src/shell/e-shell-window-actions.c:1248
 msgid "C_urrent View"
 msgstr "C_urrent View"
 
-#: ../src/shell/e-shell-window-actions.c:1245
+#: ../src/shell/e-shell-window-actions.c:1258
 msgid "Custom View"
 msgstr "Custom View"
 
-#: ../src/shell/e-shell-window-actions.c:1247
+#: ../src/shell/e-shell-window-actions.c:1260
 msgid "Current view is a customized view"
 msgstr "Current view is a customised view"
 
-#: ../src/shell/e-shell-window-actions.c:1255
+#: ../src/shell/e-shell-window-actions.c:1268
 msgid "Page Set_up…"
 msgstr "Page Set_up…"
 
-#: ../src/shell/e-shell-window-actions.c:1257
+#: ../src/shell/e-shell-window-actions.c:1270
 msgid "Change the page settings for your current printer"
 msgstr "Change the page settings for your current printer"
 
-#: ../src/shell/e-shell-window-actions.c:1627
+#: ../src/shell/e-shell-window-actions.c:1640
 #, c-format
 msgid "Switch to %s"
 msgstr "Switch to %s"
 
-#: ../src/shell/e-shell-window-actions.c:1751
+#: ../src/shell/e-shell-window-actions.c:1764
 #, c-format
 msgid "Select view: %s"
 msgstr "Select view: %s"
 
-#: ../src/shell/e-shell-window-actions.c:1768
+#: ../src/shell/e-shell-window-actions.c:1781
 #, c-format
 msgid "Delete view: %s"
 msgstr "Delete view: %s"
 
-#: ../src/shell/e-shell-window-actions.c:1878
+#: ../src/shell/e-shell-window-actions.c:1896
 msgid "Execute these search parameters"
 msgstr "Execute these search parameters"
 
@@ -26876,7 +27085,7 @@ msgid "New"
 msgstr "New"
 
 #. Translators: This is used for the main window title.
-#: ../src/shell/e-shell-window-private.c:786
+#: ../src/shell/e-shell-window-private.c:822
 #, c-format
 msgid "%s — Evolution"
 msgstr "%s — Evolution"
@@ -26959,7 +27168,7 @@ msgstr "Forcibly shut down Evolution"
 
 #: ../src/shell/main.c:341
 msgid "Disable loading of any plugins."
-msgstr "Disable loading of any plugins."
+msgstr "Disable loading of any plug-ins."
 
 #: ../src/shell/main.c:343
 msgid "Disable preview pane of Mail, Contacts and Tasks."
@@ -27617,6 +27826,21 @@ msgstr "Unable to write store to disk, err_code: %i"
 msgid "Imported Certificate"
 msgstr "Imported Certificate"
 
+#~ msgid "Ctrl-click to open a link"
+#~ msgstr "Ctrl-click to open a link"
+
+#~ msgid "_Plain Text"
+#~ msgstr "_Plain Text"
+
+#~ msgid "<b>Colors</b>"
+#~ msgstr "<b>Colours</b>"
+
+#~ msgid "<b>Background Image</b>"
+#~ msgstr "<b>Background Image</b>"
+
+#~ msgid "_Destination"
+#~ msgstr "_Destination"
+
 #~ msgid "Image file"
 #~ msgstr "Image file"
 
@@ -33077,9 +33301,6 @@ msgstr "Imported Certificate"
 #~ msgid "Anchor"
 #~ msgstr "Anchor"
 
-#~ msgid "Justification"
-#~ msgstr "Justification"
-
 #~ msgid "Clip Width"
 #~ msgstr "Clip Width"
 
@@ -33703,9 +33924,6 @@ msgstr "Imported Certificate"
 #~ msgid "Open Other User's Folder"
 #~ msgstr "Open Other User's Folder"
 
-#~ msgid "_Folder Name:"
-#~ msgstr "_Folder Name:"
-
 #~ msgid "Secure Password"
 #~ msgstr "Secure Password"
 


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